Merge pull request #14092 from phalcon/4.0.x

4.0.0-alpha.5

.ci/install-prereqs.sh

@@ -19,7 +19,7 @@ PHP_INI="$(phpenv root)/versions/$(phpenv version-name)/etc/php.ini"
 
 : ${ZEPHIR_PARSER_VERSION:=master}
 
-# {{{ Install latest APC(u)
+# 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}"
@@ -31,56 +31,52 @@ extension      = "apc.so"
 apc.enabled    = 1
 apc.enable_cli = 1
 EOT
-# }}}
 
-# {{{ Install latest memcached
+# 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
+# Install latest msgpack
+printf "\n" | pecl install --force msgpack 1> /dev/null
+# echo 'extension="msgpack.so"' > $(phpenv root)/versions/$(phpenv version-name)/etc/conf.d/msgpack.ini
+
+# Install latest xdebug
 phpenv config-rm xdebug.ini 2>&1 >/dev/null || true
-if [[ "$PHP_VERNUM" -lt "70300" ]];
-then
+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
+# 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
+# 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
+# Install redis
 redis_ext=`$(phpenv which php-config) --extension-dir`/redis.so
-if [[ ! -f "${redis_ext}" ]];
-then
+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
+# vim600: noet sw=4 ts=4
 # vim<600: noet sw=4 ts=4

.editorconfig

@@ -11,7 +11,7 @@ indent_size              = 4
 charset                  = utf-8
 trim_trailing_whitespace = true
 
-[*.{c,h,awk,w32,bat,mk,Makefile,frag,zep,lemon,re,psm1,sh}]
+[*.{c,h,awk,w32,bat,mk,Makefile,frag,lemon,re,psm1,sh}]
 indent_style = tab
 tab_width = 4
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,7 +8,8 @@ Hello!
 - [ ] I have read and understood the [Contributing Guidelines](https://github.com/phalcon/cphalcon/blob/master/CONTRIBUTING.md)
 - [ ] I have checked that another pull request for this purpose does not exist
 - [ ] I wrote some tests for this PR
-- [ ] I updated the CHANGELOG
+- [ ] I have updated the relevant CHANGELOG
+- [ ] I have created a PR for the [documentation](https://github.com/phalcon/docs) about this change
 
 Small description of change:
 

.gitignore

@@ -57,3 +57,5 @@ php_test_results_*.txt
 docker-compose.yml
 build/gccarch
 tests/_cache
+
+.php_cs.cache

.php_cs.dist

@@ -0,0 +1,51 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in('tests/')
+    ->exclude('syntax/volt/')
+    ->exclude('_data/fixtures/Annotations/');
+
+return PhpCsFixer\Config::create()
+    ->setRules(
+        [
+            '@PSR2'                                         => true,
+            'array_syntax'                                  => ['syntax' => 'short'],
+            'align_multiline_comment'                       => true,
+            'blank_line_before_statement'                   => true,
+            'combine_consecutive_issets'                    => true,
+            'combine_consecutive_unsets'                    => true,
+            'dir_constant'                                  => true,
+            'fully_qualified_strict_types'                  => true,
+            'include'                                       => true,
+            'new_with_braces'                               => true,
+            'no_blank_lines_after_class_opening'            => true,
+            'no_empty_comment'                              => true,
+            'no_empty_phpdoc'                               => true,
+            'no_empty_statement'                            => true,
+            'no_superfluous_phpdoc_tags'                    => true,
+            'no_trailing_whitespace'                        => true,
+            'no_trailing_whitespace_in_comment'             => true,
+            'no_unused_imports'                             => true,
+            'object_operator_without_whitespace'            => true,
+            'ordered_imports'                               => true,
+            'php_unit_strict'                               => true,
+            'phpdoc_no_access'                              => true,
+            'phpdoc_no_package'                             => true,
+            'phpdoc_single_line_var_spacing'                => true,
+            'phpdoc_scalar'                                 => true,
+            'phpdoc_trim'                                   => true,
+            'phpdoc_trim_consecutive_blank_line_separation' => true,
+            'phpdoc_var_without_name'                       => true,
+            'single_blank_line_at_eof'                      => true,
+            'single_import_per_statement'                   => true,
+            'single_line_after_imports'                     => true,
+            'single_quote'                                  => true,
+            'standardize_not_equals'                        => true,
+            'standardize_increment'                         => true,
+            'strict_param'                                  => true,
+            'ternary_operator_spaces'                       => true,
+            'trailing_comma_in_multiline_array'             => true,
+            'visibility_required'                           => true,
+        ]
+    )
+    ->setFinder($finder);

.travis.yml

@@ -19,7 +19,6 @@ branches:
 addons:
   apt:
     packages:
-      - beanstalkd
       - gdb
       - lcov
   postgresql: "9.4"
@@ -40,7 +39,6 @@ cache:
 
 services:
   - mysql
-  - beanstalkd
   - mongodb
   - redis-server
   - postgresql
@@ -93,7 +91,7 @@ install:
 
 before_script:
   - |
-    # Setting up Tavis' PHP
+    # Setting up Travis' 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