Merge pull request #14853 from phalcon/4.0.x

4.0.4 Release

Author: ruudboon

.ci/setup-dbs.sh

@@ -8,21 +8,21 @@
 # LICENSE.txt file that was distributed with this source code.
 
 (>&1 echo "Create MySQL database...")
-mysql -u root -e "CREATE DATABASE IF NOT EXISTS phalcon_test charset=utf8mb4 collate=utf8mb4_unicode_ci;"
-mysql -u root phalcon_test < ./tests/_data/assets/db/schemas/mysql_schema.sql
+mysql -u root -e "CREATE DATABASE IF NOT EXISTS phalcon charset=utf8mb4 collate=utf8mb4_unicode_ci;"
+#mysql -u root phalcon_test < ./tests/_data/assets/db/schemas/mysql_schema.sql
 (>&1 echo "Done.")
 
 (>&1 echo "Create PostgreSQL database...")
-psql -c 'create database phalcon_test;' -U postgres
-psql -U postgres phalcon_test -q -f ./tests/_data/assets/db/schemas/postgresql_schema.sql
+psql -c 'create database phalcon;' -U postgres
+#psql -U postgres phalcon_test -q -f ./tests/_data/assets/db/schemas/postgresql_schema.sql
 (>&1 echo "Done.")
 
-(>&1 echo "Create SQLite database...")
-sqlite3 ./tests/_output/phalcon_test.sqlite < ./tests/_data/assets/db/schemas/sqlite_schema.sql
-(>&1 echo "Done.")
+#(>&1 echo "Create SQLite database...")
+#sqlite3 ./tests/_output/phalcon_test.sqlite < ./tests/_data/assets/db/schemas/sqlite_schema.sql
+#(>&1 echo "Done.")
 
-(>&1 echo "Create translations SQLite database...")
-sqlite3 ./tests/_output/translations.sqlite < ./tests/_data/assets/db/schemas/sqlite_translations_schema.sql
-(>&1 echo "Done.")
+#(>&1 echo "Create translations SQLite database...")
+#sqlite3 ./tests/_output/translations.sqlite < ./tests/_data/assets/db/schemas/sqlite_translations_schema.sql
+#(>&1 echo "Done.")
 
 wait

.ci/vsenv.bat

@@ -0,0 +1,41 @@
+@echo off
+rem This file is part of Phalcon.
+rem
+rem (c) Phalcon Team <[email protected]>
+rem
+rem For the full copyright and license information, please view
+rem the LICENSE file that was distributed with this source code.
+cls
+
+rem For more see: https://github.com/microsoft/vswhere/wiki/Find-VC
+rem
+rem For the software installed on GitHub-hosted runners see:
+rem https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners
+rem
+echo "Find VC..."
+SET VSWHERE="C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere"
+
+for /f "usebackq tokens=*" %%i in (`%VSWHERE% -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
+  set InstallDir=%%i
+)
+
+if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
+  echo "Found %InstallDir%\Common7\Tools\vsdevcmd.bat"
+  call "%InstallDir%\Common7\Tools\vsdevcmd.bat" %*
+) else "VC not found"
+
+echo "------------- phpsdk-starter ---------------------------"
+call "%PHP_SDK_PATH%\phpsdk-vs16-%PHP_ARCH%.bat"
+
+echo "------------- phpsdk_setvars ---------------------------"
+call "%PHP_SDK_PATH%\bin\phpsdk_setvars.bat"
+
+rem Loop over all environment variables and make them global using set-env.
+rem
+rem See: https://help.github.com/en/articles/development-tools-for-github-actions#set-an-environment-variable-set-env
+rem See: https://stackoverflow.com/questions/39183272/loop-through-all-environmental-variables-and-take-actions-depending-on-prefix
+setlocal
+for /f "delims== tokens=1,2" %%a in ('set') do (
+  echo ::set-env name=%%a::%%b
+)
+endlocal

.ci/win-ci-tools.psm1

@@ -0,0 +1,260 @@
+# This file is part of Phalcon.
+#
+# (c) Phalcon Team <[email protected]>
+#
+# For the full copyright and license information, please view
+# the LICENSE file that was distributed with this source code.
+
+Function SetupCommonEnvironment {
+    If (-not (Test-Path 'C:\Downloads')) {
+        New-Item -ItemType Directory -Force -Path 'C:\Downloads' | Out-Null
+    }
+
+    If (-not (Test-Path 'C:\Downloads\Choco')) {
+        New-Item -ItemType Directory -Force -Path 'C:\Downloads\Choco' | Out-Null
+    }
+
+    # Hide "You are in 'detached HEAD' state" message
+    git config --global advice.detachedHead false
+    git config --global core.autocrlf false
+}
+
+Function InstallPhpSdk {
+    Write-Output "Install PHP SDK binary tools: ${env:PHP_SDK_VERSION}"
+
+    $RemoteUrl = "https://github.com/microsoft/php-sdk-binary-tools/archive/php-sdk-${env:PHP_SDK_VERSION}.zip"
+    $DestinationPath = "C:\Downloads\php-sdk-${env:PHP_SDK_VERSION}.zip"
+
+    If (-not (Test-Path $env:PHP_SDK_PATH)) {
+        If (-not [System.IO.File]::Exists($DestinationPath)) {
+            Write-Output "Downloading PHP SDK binary tools: $RemoteUrl ..."
+            DownloadFile $RemoteUrl $DestinationPath
+        }
+
+        $DestinationUnzipPath = "${env:Temp}\php-sdk-binary-tools-php-sdk-${env:PHP_SDK_VERSION}"
+
+        If (-not (Test-Path "$DestinationUnzipPath")) {
+            Expand-Item7zip $DestinationPath $env:Temp
+        }
+
+        Move-Item -Path $DestinationUnzipPath -Destination $env:PHP_SDK_PATH
+    }
+}
+
+Function DownloadPhpSrc {
+    Write-Output "Download PHP Src: ${env:PHP_VERSION}"
+
+    $RemoteUrl = "http://windows.php.net/downloads/releases/php-${env:PHP_VERSION}-src.zip"
+    $DestinationPath = "C:\Downloads\php-${env:PHP_VERSION}-src.zip"
+
+    If (-not (Test-Path $env:PHP_SRC_PATH)) {
+        If (-not [System.IO.File]::Exists($DestinationPath)) {
+            Write-Output "Downloading PHP Dev pack: ${RemoteUrl} ..."
+            DownloadFile $RemoteUrl $DestinationPath
+        }
+
+        $DestinationUnzipPath = "${env:Temp}\php-${env:PHP_VERSION}-src"
+
+        If (-not (Test-Path "$DestinationUnzipPath")) {
+            Expand-Item7zip $DestinationPath $env:Temp
+        }
+
+        Move-Item -Path $DestinationUnzipPath -Destination $env:PHP_SRC_PATH
+    }
+}
+
+Function InstallPhpDevPack {
+    Write-Output "Install PHP Dev pack: ${env:PHP_VERSION}"
+
+    $RemoteUrl = "http://windows.php.net/downloads/releases/php-devel-pack-${env:PHP_VERSION}-${env:BUILD_TYPE}-vc${env:VC_VERSION}-${env:PHP_ARCH}.zip"
+    $DestinationPath = "C:\Downloads\php-devel-pack-${env:PHP_VERSION}-${env:BUILD_TYPE}-VC${env:VC_VERSION}-${env:PHP_ARCH}.zip"
+
+    If (-not (Test-Path $env:PHP_DEVPACK)) {
+        If (-not [System.IO.File]::Exists($DestinationPath)) {
+            Write-Output "Downloading PHP Dev pack: ${RemoteUrl} ..."
+            DownloadFile $RemoteUrl $DestinationPath
+        }
+
+        $DestinationUnzipPath = "${env:Temp}\php-${env:PHP_VERSION}-devel-VC${env:VC_VERSION}-${env:PHP_ARCH}"
+
+        If (-not (Test-Path "$DestinationUnzipPath")) {
+            Expand-Item7zip $DestinationPath $env:Temp
+        }
+
+        Move-Item -Path $DestinationUnzipPath -Destination $env:PHP_DEVPACK
+    }
+}
+
+
+Function Expand-Item7zip {
+    Param(
+        [Parameter(Mandatory=$true)][System.String] $Archive,
+        [Parameter(Mandatory=$true)][System.String] $Destination
+    )
+
+    If (-not (Test-Path -Path $Archive -PathType Leaf)) {
+        Throw "Specified archive File is invalid: [$Archive]"
+    }
+
+    If (-not (Test-Path -Path $Destination -PathType Container)) {
+        New-Item $Destination -ItemType Directory | Out-Null
+    }
+
+    $Result = (& 7z x "$Archive" "-o$Destination" -aoa -bd -y -r)
+
+    If ($LastExitCode -ne 0) {
+        Write-Output "An error occurred while unzipping [$Archive] to [$Destination]. Error code was: ${LastExitCode}"
+        Exit $LastExitCode
+    }
+}
+
+Function DownloadFile {
+    Param(
+        [Parameter(Mandatory=$true)][System.String] $RemoteUrl,
+        [Parameter(Mandatory=$true)][System.String] $DestinationPath
+    )
+
+    $RetryMax   = 5
+    $RetryCount = 0
+    $Completed  = $false
+
+    $WebClient = New-Object System.Net.WebClient
+    $WebClient.Headers.Add('User-Agent', 'GitHub Actions PowerShell Script')
+
+    While (-not $Completed) {
+        Try {
+            $WebClient.DownloadFile($RemoteUrl, $DestinationPath)
+            $Completed = $true
+        } Catch {
+            If ($RetryCount -ge $RetryMax) {
+                $ErrorMessage = $_.Exception.Message
+                Write-Output "Error downloadingig ${RemoteUrl}: $ErrorMessage"
+                $Completed = $true
+            } Else {
+                $RetryCount++
+            }
+        }
+    }
+}
+
+Function PrintLogs {
+    If (Test-Path -Path "${env:GITHUB_WORKSPACE}\compile-errors.log") {
+        Get-Content -Path "${env:GITHUB_WORKSPACE}\compile-errors.log"
+    }
+
+    If (Test-Path -Path "${env:GITHUB_WORKSPACE}\compile.log") {
+        Get-Content -Path "${env:GITHUB_WORKSPACE}\compile.log"
+    }
+
+    If (Test-Path -Path "${env:GITHUB_WORKSPACE}\ext\configure.js") {
+        Get-Content -Path "${env:GITHUB_WORKSPACE}\ext\configure.js"
+    }
+}
+
+Function PrintEnvVars {
+    Write-Output ($env:Path).Replace(';', "`n")
+    Get-ChildItem env:
+}
+
+Function PrintDirectoriesContent {
+    Get-ChildItem -Path "${env:GITHUB_WORKSPACE}"
+
+    If (Test-Path -Path "C:\Downloads") {
+        Get-ChildItem -Path "C:\Downloads"
+    }
+
+    If (Test-Path -Path "C:\Projects") {
+        Get-ChildItem -Path "C:\Projects"
+    }
+
+    If (Test-Path -Path "${env:PHPROOT}\ext") {
+        Get-ChildItem -Path "${env:PHPROOT}\ext"
+    }
+
+     $ReleasePath = Split-Path -Path "${env:RELEASE_DLL_PATH}"
+     If (Test-Path -Path "${ReleasePath}") {
+         Get-ChildItem -Path "${ReleasePath}"
+     }
+
+     $BuildPath = Split-Path -Path "${ReleasePath}"
+     If (Test-Path -Path "${BuildPath}") {
+         Get-ChildItem -Path "${BuildPath}"
+     }
+}
+
+# TODO(klay): Add phpize and phpconfig here
+Function PrintPhpInfo {
+    $IniFile = "${env:PHPROOT}\php.ini"
+    $PhpExe = "${env:PHPROOT}\php.exe"
+
+    If (Test-Path -Path "${PhpExe}") {
+        Write-Output ""
+        & "${PhpExe}" -v
+
+        Write-Output ""
+        & "${PhpExe}" -m
+
+        Write-Output ""
+        & "${PhpExe}" -i
+    } ElseIf (Test-Path -Path "${IniFile}") {
+        Get-Content -Path "${IniFile}"
+    }
+}
+
+Function PrintBuildDetails {
+    $BuildDate = Get-Date -Format g
+
+    Write-Output "Build date: ${BuildDate}"
+    Write-Output "Git commit: ${env:GITHUB_SHA}"
+    Write-Output "Target PHP version: ${env:PHP_MINOR}"
+    Write-Output "PHP SDK Toolset Version: ${env:PHP_SDK_VC_TOOLSET_VER}"
+    Write-Output "Build Worker Image Version: ${env:ImageVersion}"
+    Write-Output "Processor ID: ${env:PROCESSOR_IDENTIFIER}"
+    Write-Output "Processor Architecture: ${env:PROCESSOR_ARCHITECTURE}"
+    Write-Output "Number of Processors: ${env:NUMBER_OF_PROCESSORS}"
+    Write-Output "Visual Studio Version: ${env:VisualStudioVersion}"
+    Write-Output "Host Architecture: ${env:VSCMD_ARG_HOST_ARCH}"
+    Write-Output "Target Architecture: ${env:VSCMD_ARG_TGT_ARCH}"
+    Write-Output "VC Tools Version: ${env:VCToolsVersion}"
+    Write-Output "Windows SDK Version: ${env:WindowsSDKVersion}"
+}
+
+
+Function InitializeReleaseVars {
+    If ($env:BUILD_TYPE -Match "nts-Win32") {
+        $env:RELEASE_ZIPBALL = "${env:PACKAGE_PREFIX}_${env:PHP_ARCH}_vc${env:VC_VERSION}_php${env:PHP_MINOR}_nts"
+
+        If ($env:PHP_ARCH -eq 'x86') {
+            $env:RELEASE_FOLDER = "Release"
+        } Else {
+            $env:RELEASE_FOLDER = "x64\Release"
+        }
+    } Else {
+        $env:RELEASE_ZIPBALL = "${env:PACKAGE_PREFIX}_${env:PHP_ARCH}_vc${env:VC_VERSION}_php${env:PHP_MINOR}"
+
+        If ($env:PHP_ARCH -eq 'x86') {
+            $env:RELEASE_FOLDER = "Release_TS"
+        } Else {
+            $env:RELEASE_FOLDER = "x64\Release_TS"
+        }
+    }
+
+    $env:RELEASE_DLL_PATH = "${env:PHP_PECL_PATH}\phalcon\phalcon-${env:PHALCON_VERSION}\${env:RELEASE_FOLDER}\${env:EXTENSION_FILE}"
+
+    Write-Output "::set-env name=RELEASE_ZIPBALL::${env:RELEASE_ZIPBALL}"
+    Write-Output "::set-env name=RELEASE_DLL_PATH::${env:RELEASE_DLL_PATH}"
+}
+
+Function EnablePhalconExtension {
+    if (-not (Test-Path env:RELEASE_DLL_PATH)) {
+        InitializeReleaseVars
+    }
+
+    If (-not (Test-Path "${env:RELEASE_DLL_PATH}")) {
+        Throw "Unable to locate extension path: ${env:RELEASE_DLL_PATH}"
+    }
+
+    Copy-Item "${env:RELEASE_DLL_PATH}" "${env:PHPROOT}\ext\${env:EXTENSION_FILE}"
+
+    Enable-PhpExtension -Extension "${env:EXTENSION_NAME}" -Path "${env:PHPROOT}"
+}

.gitattributes

@@ -8,3 +8,5 @@ build/php5/* linguist-vendored
 build/php7/* linguist-vendored
 
 *.png   binary
+
+tests/_data/assets/assets/*  -text