Merge pull request #13795 from phalcon/4.0.x

v4.0.0-alpha.2

Author: sergeyklay

.ci/appveyor.psm1

@@ -0,0 +1,64 @@
+# This file is part of the Phalcon Framework.
+#
+# (c) Phalcon Team <[email protected]>
+#
+# For the full copyright and license information, please view
+# the LICENSE.txt file that was distributed with this source code.
+
+function InitializeBuildVars {
+	switch ($Env:VC_VERSION) {
+		'14' {
+			if (-not (Test-Path $Env:VS120COMNTOOLS)) {
+				throw 'The VS120COMNTOOLS environment variable is not set. Check your MS VS installation'
+			}
+			$Env:VSCOMNTOOLS = $Env:VS120COMNTOOLS -replace '\\$', ''
+
+			break
+		}
+		'15' {
+			if (-not (Test-Path $Env:VS140COMNTOOLS)) {
+				throw 'The VS140COMNTOOLS environment variable is not set. Check your MS VS installation'
+			}
+			$Env:VSCOMNTOOLS = $Env:VS140COMNTOOLS -replace '\\$', ''
+			break
+		}
+		default {
+			throw 'This script is designed to run with MS VS 14/15. Check your MS VS installation'
+			break
+		}
+	}
+
+	if ($Env:PLATFORM -eq 'x64') {
+		$Env:ARCH = 'x86_amd64'
+	} else {
+		$Env:ARCH = 'x86'
+	}
+
+	$SearchFilter = 'vcvarsall.bat'
+	$SearchInFolder = "${Env:VSCOMNTOOLS}\..\..\"
+
+	$Env:VCVARSALL_FILE = Get-ChildItem -Path $SearchInFolder -Filter $SearchFilter -Recurse -ErrorAction SilentlyContinue |
+	ForEach-Object { $_.FullName }
+}
+
+function InitializeReleaseVars {
+	if ($Env:BUILD_TYPE -Match "nts-Win32") {
+		$Env:RELEASE_ZIPBALL = "phalcon_${Env:PLATFORM}_vc${Env:VC_VERSION}_php${Env:PHP_MINOR}_${Env:APPVEYOR_BUILD_VERSION}_nts"
+
+		if ($Env:PLATFORM -eq 'x86') {
+			$Env:RELEASE_FOLDER = "Release"
+		} else {
+			$Env:RELEASE_FOLDER = "x64\Release"
+		}
+	} else {
+		$Env:RELEASE_ZIPBALL = "phalcon_${Env:PLATFORM}_vc${Env:VC_VERSION}_php${Env:PHP_MINOR}_${Env:APPVEYOR_BUILD_VERSION}"
+
+		if ($Env:PLATFORM -eq 'x86') {
+			$Env:RELEASE_FOLDER = "Release_TS"
+		} else {
+			$Env:RELEASE_FOLDER = "x64\Release_TS"
+		}
+	}
+
+	$Env:RELEASE_DLL_PATH = "${Env:APPVEYOR_BUILD_FOLDER}\build\php7\safe\${Env:RELEASE_FOLDER}\php_phalcon.dll"
+}

.ci/install-prereqs.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+#
+# This file is part of the Phalcon Framework.
+#
+# (c) Phalcon Team <[email protected]>
+#
+# For the full copyright and license information, please view the
+# LICENSE.txt file that was distributed with this source code.
+
+# Ensure that this is being run inside a CI container
+if [ "${CI}" != "true" ];
+then
+	>&2 echo "This script is designed to run inside a CI container only."
+	>&2 echo "Aborting."
+	exit 1
+fi
+
+PHP_INI="$(phpenv root)/versions/$(phpenv version-name)/etc/php.ini"
+
+: ${ZEPHIR_PARSER_VERSION:=master}
+
+# {{{ Install latest APC(u)
+printf "\n" | pecl install --force apcu_bc 1> /dev/null
+# See https://pear.php.net/bugs/bug.php?id=21007
+awk '/extension.*apcu?\.so"?/{$0=""}1' "${PHP_INI}" > php.ini.patch && mv php.ini.patch "${PHP_INI}"
+cat <<EOT >> $(phpenv root)/versions/$(phpenv version-name)/etc/conf.d/apcu.ini
+[apc]
+extension      = "apcu.so"
+extension      = "apc.so"
+
+apc.enabled    = 1
+apc.enable_cli = 1
+EOT
+# }}}
+
+# {{{ Install latest memcached
+printf "\n" | pecl install --force memcached 1> /dev/null
+echo 'extension="memcached.so"' > $(phpenv root)/versions/$(phpenv version-name)/etc/conf.d/memcached.ini
+# }}}
+
+# {{{ Install latest xdebug
+phpenv config-rm xdebug.ini 2>&1 >/dev/null || true
+if [[ "$PHP_VERNUM" -lt "70300" ]];
+then
+	printf "\n" | pecl install --force xdebug 1> /dev/null
+	awk '/zend_extension.*xdebug.so"?/{$0=""}1' "${PHP_INI}" > php.ini.patch && mv php.ini.patch "${PHP_INI}"
+	echo 'zend_extension="xdebug.so"' > $(phpenv root)/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
+fi
+# }}}
+
+# {{{ Install latest igbinary, imagick, psr and yaml
+printf "\n" | pecl install --force igbinary 1> /dev/null
+printf "\n" | pecl install --force imagick 1> /dev/null
+printf "\n" | pecl install --force psr 1> /dev/null
+printf "\n" | pecl install --force yaml 1> /dev/null
+# }}}
+
+# {{{ install zephir_parser
+git clone -b "${ZEPHIR_PARSER_VERSION}" --depth 1 -q https://github.com/phalcon/php-zephir-parser
+cd php-zephir-parser
+$(phpenv which phpize)
+./configure --silent --with-php-config=$(phpenv which php-config) --enable-zephir_parser
+make --silent -j"$(getconf _NPROCESSORS_ONLN)"
+make --silent install
+echo 'extension="zephir_parser.so"' > "$(phpenv root)/versions/$(phpenv version-name)/etc/conf.d/zephir_parser.ini"
+# }}}
+
+# {{{ Install redis
+redis_ext=`$(phpenv which php-config) --extension-dir`/redis.so
+if [[ ! -f "${redis_ext}" ]];
+then
+	printf "\n" | pecl install --force redis 1> /dev/null
+fi
+
+if [[ "$(php -m | grep redis | wc -l)" = "0" ]] && [[ -f "${redis_ext}" ]];
+then
+	echo 'extension="redis.so"' > "$(phpenv root)/versions/$(phpenv version-name)/etc/conf.d/redis.ini"
+fi
+# }}}
+
+# Local variables:
+# tab-width: 4
+# c-basic-offset: 4
+# End:
+# vim600: noet sw=4 ts=4 fdm=marker
+# vim<600: noet sw=4 ts=4

.ci/run-volt-tests.sh

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+#
+# This file is part of the Phalcon Framework.
+#
+# (c) Phalcon Team <[email protected]>
+#
+# For the full copyright and license information, please view the
+# LICENSE.txt file that was distributed with this source code.
+
+PROJECT_ROOT=$(cd "$(dirname $0)/../"; pwd -P)
+
+export NO_INTERACTION=1
+export REPORT_EXIT_STATUS=1
+export TEST_PHP_EXECUTABLE=$(phpenv which php)
+export TEST_PHP_ARGS="--show-diff"
+
+phpenv config-rm xdebug.ini 2>&1 >/dev/null || true
+
+php ${PROJECT_ROOT}/ext/run-tests.php \
+	-d "error_reporting=32767" \
+	-d "display_errors=1" \
+	-d "display_startup_errors=1" \
+	-d "log_errors=0" \
+	-d "report_memleaks=1" \
+	-d "report_zend_debug=0" \
+	-d "zend.assertions=1" \
+	-d "extension=$(php-config --extension-dir)/psr.so" \
+	-d "extension=${PROJECT_ROOT}/ext/modules/phalcon.so" \
+	--offline \
+	--show-diff \
+	--set-timeout 120 \
+	-n \
+	-g "FAIL,XFAIL,SKIP,BORK,WARN,LEAK" \
+	${PROJECT_ROOT}/tests/syntax

.gitignore

@@ -20,6 +20,7 @@ ext/config.nice
 ext/config.status
 ext/config.sub
 ext/configure
+ext/configure.ac
 ext/configure.in
 ext/install-sh
 ext/libtool
@@ -48,10 +49,10 @@ autom4te.cache/
 /ide/
 
 .zephir/
+
 boxfile.yml
 composer.lock
 php_test_results_*.txt
 docker-compose.yml
 build/gccarch
 tests/_cache
-.zephir/

.travis.yml

@@ -2,18 +2,19 @@ sudo: false
 
 language: php
 php:
-  - 'master'
+  # PHP 7.4 does not ready yet
+  # - 'master'
   - '7.3'
   - '7.2'
 
 git:
   depth: 1
 
-# TODO - Remove this when we go deploy this
-#branches:
-#  only:
-#    - master
-#    - /^(4|5)\.\d+\.(\d+|x)$/
+branches:
+  only:
+    - master
+    - /^(4|5)\.\d+\.(\d+|x)$/
+    - /^T\d+-[a-zA-Z-]+/
 
 addons:
   apt:
@@ -29,14 +30,14 @@ addons:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - php: 'master'
+  # PHP 7.4 does not ready yet
+  # allow_failures:
+  #  - php: 'master'
 
 cache:
   apt: true
   timeout: 604800
   directories:
-    - ${HOME}/beanstalk
     - ${HOME}/.composer/cache
     - ${HOME}/pear
     - ${HOME}/.local/opt
@@ -50,55 +51,89 @@ services:
 
 env:
   global:
-    - secure: "eL8spffzdRIDAjdxG+OPJPeUCdpc/jVz6PEVYcs3z4nOnjsKDURm8cmBmGeyHMxvkdHZ6g0PO/srIKAYufZkjDCeK0vl7OBv6kNlGEuO3M7SUCAVX+J2OSg+hNlK467woxsPeMB19/vkC1HmytgpdAefFGtFp4+zsMT41YVupuA="
     - CC="gcc"
-    - ZEPHIR_VERSION="0.11.8"
+    - ZEPHIR_VERSION="0.11.9"
+    - ZEPHIR_PARSER_VERSION="v1.2.0"
     - RE2C_VERSION="1.1.1"
-    - REPORT_EXIT_STATUS=1
     - REPORT_COVERAGE=1
-    - NO_INTERACTION=1
-    - TEST_PHP_ARGS="--show-diff"
-    - PATH="${HOME}/bin:${HOME}/.composer/vendor/bin:${PATH}"
+    - PATH="${HOME}/.composer/vendor/bin:${PATH}"
     - DEFAULT_COMPOSER_FLAGS="--no-interaction --no-ansi --no-progress --no-suggest"
 
 before_install:
-  - if [ ! -z "${GITHUB_TOKEN}" ]; then composer config github-oauth.github.com ${GITHUB_TOKEN}; echo "Add Github token"; fi
-  - export PHP_MAJOR="$(php -r 'echo phpversion();' | cut -d '.' -f 1)"
-  - export PHP_MINOR="$(php -r 'echo phpversion();' | cut -d '.' -f 2)"
-  - export PHP_VERNUM="$(php-config --vernum)"
-  - tests/_ci/pear-setup.sh
-  - tests/_ci/setup-dbs.sh
-  - source tests/_ci/environment
-  - export $(cut -d= -f1 tests/_ci/environment)
-  - wget --no-clobber -O $HOME/bin/zephir https://github.com/phalcon/zephir/releases/download/${ZEPHIR_VERSION}/zephir.phar
-  - chmod +x $HOME/bin/zephir
+  - |
+    # General settings
+    set -e
+    stty cols 120
+    ulimit -c unlimited -S || true
+
+    if [ ! -z "${GITHUB_TOKEN}" ]; then
+      composer config github-oauth.github.com ${GITHUB_TOKEN}
+      printf "Add GitHub token\n"
+    fi
+
+    [ -d ~/bin ] || mkdir ~/bin
+
+    git config --global advice.detachedHead false
+
+    # Export tests environment variables
+    source tests/_ci/environment
+    export $(cut -d= -f1 tests/_ci/environment)
+
+    # Export build environment variables
+    export PHP_MAJOR="$(php -r 'echo phpversion();' | cut -d '.' -f 1)"
+    export PHP_MINOR="$(php -r 'echo phpversion();' | cut -d '.' -f 2)"
+    export PHP_VERNUM="$(php-config --vernum)"
+    export PHP_PEAR_PHP_BIN=$(phpenv which php)
 
 install:
-  - tests/_ci/install-prereqs.sh
+  - tests/_ci/setup-dbs.sh
+  - tests/_ci/pear-setup.sh
+  - .ci/install-prereqs.sh
   - tests/_ci/install-re2c.sh
-  - travis_retry composer install ${DEFAULT_COMPOSER_FLAGS}
-  - travis_retry composer global require ${DEFAULT_COMPOSER_FLAGS} "phalcon/zephir:${ZEPHIR_VERSION}"
-  - tests/_ci/build.sh
+  - travis_retry composer install $DEFAULT_COMPOSER_FLAGS
+  - wget --no-clobber -O $HOME/bin/zephir https://github.com/phalcon/zephir/releases/download/${ZEPHIR_VERSION}/zephir.phar
+  - chmod +x $HOME/bin/zephir
 
 before_script:
-  - ulimit -c unlimited -S || true
-  - phpenv config-add tests/_ci/999-default.ini
+  - |
+    # Setting up Tavis' PHP
+    echo 'variables_order = EGPCS'    >> $(phpenv root)/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+    echo 'session.save_path = "/tmp"' >> $(phpenv root)/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+    echo 'opcache.enable_cli = 1'     >> $(phpenv root)/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
+  - tests/_ci/build.sh
 
 script:
-  - vendor/bin/phpcs
-  - vendor/bin/codecept build
-  # TODO: Add `cli' suite and refactor current cli-tests
-#  - vendor/bin/codecept run -v
-  - vendor/bin/codecept run -v -n tests/cli/
-  - vendor/bin/codecept run -v -n tests/integration/
-  - vendor/bin/codecept run -v -n tests/unit/
-  - phpenv config-rm xdebug.ini || true
-  - tests/_ci/volt-tests.sh
+  # Does not ready to work PHP 7.3
+  - if [ "$PHP_VERNUM" -ge "70300" ]; then phpenv config-rm xdebug.ini || true; fi
+
+  - vendor/bin/codecept build --quiet
+  - vendor/bin/codecept run --ext DotReporter tests/cli/
+  - vendor/bin/codecept run --ext DotReporter tests/integration/
+  - vendor/bin/codecept run --ext DotReporter tests/unit/
+
+  - .ci/run-volt-tests.sh
+
+jobs:
+  include:
+    - stage: Static Code Analysis
+      php: 7.2
+      env:
+        - REPORT_COVERAGE=0
+      install:
+        - travis_retry composer install $DEFAULT_COMPOSER_FLAGS --ignore-platform-reqs
+      before_script:
+        - phpenv config-rm xdebug.ini || true
+      script:
+        - vendor/bin/phpcs
 
 after_failure:
   - tests/_ci/after-failure.sh
 
 after_success:
+  # Does not ready to work PHP 7.3
+  - if [ "$PHP_VERNUM" -ge "70300" ]; then export REPORT_COVERAGE=0; fi
+
   - tests/_ci/after-success.sh
 
 notifications: