Merge pull request #15467 from phalcon/5.0.x

Release 5.0.0-alpha.2
phalcon · May 5, 2021 · 2ddd6a5 · 2ddd6a5
2 parents 4dc8ee7 + 198e459
commit 2ddd6a5
Show file tree

Hide file tree

Showing 1,098 changed files with 103,611 additions and 908,033 deletions.
diff --git a/.ci/appveyor.psm1 b/.ci/appveyor.psm1
diff --git a/.ci/export-variables.sh b/.ci/export-variables.sh
@@ -9,7 +9,7 @@
 
 # Export tests environment variables
 # shellcheck disable=SC1091
-source ./tests/_ci/environment
+source ./tests/_config/environment
 
 # shellcheck disable=SC2046
-export $(cut -d= -f1 tests/_ci/environment)
+export $(cut -d= -f1 tests/_config/environment)
diff --git a/.ci/genparsers.sh b/.ci/genparsers.sh
@@ -64,10 +64,10 @@ function generate_parser() {
   local tprefix="$3"
 
   cp "$BASE_PATH/3rdparty/lemon/lempar.c" .
-  "$BASE_PATH/.ci/lemon" -s parser.php7.lemon
+  "$BASE_PATH/.ci/lemon" -s parser.php.lemon
 
   echo '#include "php_phalcon.h"' > parser.c
-  cat parser.php7.c >> parser.c
+  cat parser.php.c >> parser.c
   cat base.c >> parser.c
 
   replace 's|#line|//|g' parser.c

diff --git a/.ci/travis.ini b/.ci/travis.ini
diff --git a/.ci/vsenv.bat b/.ci/vsenv.bat
@@ -25,7 +25,7 @@ if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
 ) else "VC not found"
 
 echo "------------- phpsdk-starter ---------------------------"
-call "%PHP_SDK_PATH%\phpsdk-vs16-%PHP_ARCH%.bat"
+call "%PHP_SDK_PATH%\phpsdk-%VC_VERSION%-%PHP_ARCH%.bat"
 
 echo "------------- phpsdk_setvars ---------------------------"
 call "%PHP_SDK_PATH%\bin\phpsdk_setvars.bat"

diff --git a/.ci/win-ci-tools.psm1 b/.ci/win-ci-tools.psm1
@@ -255,15 +255,15 @@ function PrintBuildDetails {
 
 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"
+        $env:RELEASE_ZIPBALL = "${env:PACKAGE_PREFIX}_${env:PHP_ARCH}_${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}"
+        $env:RELEASE_ZIPBALL = "${env:PACKAGE_PREFIX}_${env:PHP_ARCH}_${env:VC_VERSION}_php${env:PHP_MINOR}"
 
         if ($env:PHP_ARCH -eq 'x86') {
             $env:RELEASE_FOLDER = "Release_TS"
@@ -274,20 +274,39 @@ function InitializeReleaseVars {
 
     $env:RELEASE_DLL_PATH = "${env:PHP_PECL_PATH}\phalcon\phalcon-${env:PHALCON_VERSION}\${env:RELEASE_FOLDER}\${env:EXTENSION_FILE}"
 
+    Write-Output "RELEASE_FOLDER=${env:RELEASE_FOLDER}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     Write-Output "RELEASE_ZIPBALL=${env:RELEASE_ZIPBALL}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     Write-Output "RELEASE_DLL_PATH=${env:RELEASE_DLL_PATH}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 }
 
 function EnablePhalconExtension {
-    if (-not (Test-Path env:RELEASE_DLL_PATH)) {
+    if (-not (Test-Path $env:RELEASE_DLL_PATH)) {
         InitializeReleaseVars
     }
 
-    if (-not (Test-Path "${env:RELEASE_DLL_PATH}")) {
+    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}"
 }
+
+function EnablePsrExtension {
+    if (-not (Test-Path $env:RELEASE_FOLDER)) {
+        InitializeReleaseVars
+    }
+
+    # C:\tools\pecl\psr\psr-1.0.1\x64\Release\php_psr.dll
+    $env:PSR_EXT_NAME = 'php_psr.dll'
+    $env:PSR_DLL_PATH = "${env:PHP_PECL_PATH}\psr\psr-${env:PSR_VERSION}\${env:RELEASE_FOLDER}\${env:PSR_EXT_NAME}"
+
+    if (-not (Test-Path ${env:PSR_DLL_PATH})) {
+        throw "Unable to locate extension path: ${env:PSR_DLL_PATH}"
+    }
+
+    Copy-Item "${env:PSR_DLL_PATH}" "${env:PHPROOT}\ext\${env:PSR_EXT_NAME}"
+
+    Enable-PhpExtension -Extension 'psr' -Path "${env:PHPROOT}"
+}