Skip to content

Commit

Permalink
Merge branch '4.0.x' into master-check
Browse files Browse the repository at this point in the history
* 4.0.x: (202 commits)
  Updated changelog
  Changing the interface to return null for getEventsManager
  Correcting interface
  Correcting tests
  Fixed Firewall\Adapter\AbstractAdapter::setEventsManager
  Remove void return type for constructors
  Fixed return types for various methods to satisfy interface declaration
  Constructors should never declare return type [skip appveyor]
  Updated changelog
  Styling fix changelog
  Fixed remove() not removing service #14396
  Forgot to push changelog
  Use write connection on create to prevent replica lag. Fix #14256
  Added license information in README
  Moved license files to 3rdparty/license. Added more licenses
  Update issue templates
  Backup old template file
  Update issue templates
  [4.0.x] - Corrected test
  [4.0.x] - Fixing stupid error
  ...
  • Loading branch information
niden committed Sep 22, 2019
2 parents da5eb91 + 902910a commit 874e4f1
Show file tree
Hide file tree
Showing 5,251 changed files with 16,442 additions and 38,964 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions .ci/after-failure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This file is part of the Phalcon Framework.
#
# (c) Phalcon Team <team@phalconphp.com>
# (c) Phalcon Team <team@phalcon.io>
#
# For the full copyright and license information, please view
# the LICENSE.txt file that was distributed with this source code.
Expand Down Expand Up @@ -31,7 +31,7 @@ then
fi

# for some reason Ubuntu 18.04 on Travis CI doesn't install gdb
function install_gcc() {
function install_gdb() {
if [ "${CI}" = "true" ] && [ "$(command -v gdb 2>/dev/null)" = "" ]
then
(>&1 echo "Install gdb...")
Expand All @@ -40,7 +40,7 @@ function install_gcc() {
}

for i in /tmp/core.php.*; do
install_gcc
install_gdb
(>&1 printf "Found core dump file: %s\\n\\n" "$i")
gdb -q "$(phpenv which php)" "$i" <<EOF
set pagination 0
Expand Down
2 changes: 1 addition & 1 deletion .ci/appveyor.psm1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is part of the Phalcon Framework.
#
# (c) Phalcon Team <team@phalconphp.com>
# (c) Phalcon Team <team@phalcon.io>
#
# For the full copyright and license information, please view
# the LICENSE.txt file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion .ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This file is part of the Phalcon Framework.
#
# (c) Phalcon Team <team@phalconphp.com>
# (c) Phalcon Team <team@phalcon.io>
#
# For the full copyright and license information, please view the
# LICENSE.txt file that was distributed with this source code.
Expand Down
10 changes: 1 addition & 9 deletions .ci/export-variables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This file is part of the Phalcon Framework.
#
# (c) Phalcon Team <team@phalconphp.com>
# (c) Phalcon Team <team@phalcon.io>
#
# For the full copyright and license information, please view the
# LICENSE.txt file that was distributed with this source code.
Expand All @@ -13,11 +13,3 @@ source ./tests/_ci/environment

# shellcheck disable=SC2046
export $(cut -d= -f1 tests/_ci/environment)

# Export build environment variables
PHP_MAJOR="$(php -r 'echo phpversion();' | cut -d '.' -f 1)"
PHP_MINOR="$(php -r 'echo phpversion();' | cut -d '.' -f 2)"
PHP_VERNUM="$(php-config --vernum)"
PHP_PEAR_PHP_BIN=$(phpenv which php)

export PHP_MAJOR PHP_MINOR PHP_VERNUM PHP_PEAR_PHP_BIN
23 changes: 0 additions & 23 deletions .ci/install-mysql-5.7.sh

This file was deleted.

6 changes: 3 additions & 3 deletions .ci/install-php-extensions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This file is part of the Phalcon Framework.
#
# (c) Phalcon Team <team@phalconphp.com>
# (c) Phalcon Team <team@phalcon.io>
#
# For the full copyright and license information, please view the
# LICENSE.txt file that was distributed with this source code.
Expand All @@ -11,8 +11,8 @@
# -u Treat unset variables as an error when substituting.
set -eu

PHP_INI="$(phpenv root)/versions/$(phpenv version-name)/etc/php.ini"
PHP_CONF_D="$(phpenv root)/versions/$(phpenv version-name)/etc/conf.d"
PHP_INI="$(phpenv prefix)/etc/php.ini"
PHP_CONF_D="$(phpenv prefix)/etc/conf.d"

(>&1 echo 'Install apcu extension ...')
printf "\\n" | pecl install --force apcu_bc 1> /dev/null
Expand Down
86 changes: 0 additions & 86 deletions .ci/install-re2c.sh

This file was deleted.

4 changes: 2 additions & 2 deletions .ci/install-zephir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This file is part of the Phalcon Framework.
#
# (c) Phalcon Team <team@phalconphp.com>
# (c) Phalcon Team <team@phalcon.io>
#
# For the full copyright and license information, please view the
# LICENSE.txt file that was distributed with this source code.
Expand All @@ -20,7 +20,7 @@ $(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"
echo 'extension="zephir_parser.so"' > "$(phpenv prefix)/etc/conf.d/zephir_parser.ini"

# Install zephir
if [[ ! $ZEPHIR_VERSION =~ ^(master|development)$ ]]
Expand Down
58 changes: 0 additions & 58 deletions .ci/pear-setup.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .ci/phalcon.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;
; This file is part of the Phalcon Framework.
;
; (c) Phalcon Team <team@phalconphp.com>
; (c) Phalcon Team <team@phalcon.io>
;
; For the full copyright and license information, please view the
; LICENSE.txt file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion .ci/run-volt-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This file is part of the Phalcon Framework.
#
# (c) Phalcon Team <team@phalconphp.com>
# (c) Phalcon Team <team@phalcon.io>
#
# For the full copyright and license information, please view the
# LICENSE.txt file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion .ci/setup-dbs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This file is part of the Phalcon Framework.
#
# (c) Phalcon Team <team@phalconphp.com>
# (c) Phalcon Team <team@phalcon.io>
#
# For the full copyright and license information, please view the
# LICENSE.txt file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md.bak
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
> Questions should go to https://forum.phalconphp.com
> Questions should go to https://phalcon.link/forum
> Documentation issues should go to https://github.com/phalcon/docs/issues

### Expected and Actual Behavior

> **Describe what you are trying to achieve and what goes wrong.**

> Provide output if related. Provide coredump if any. Use https://docs.phalconphp.com/en/latest/generating-backtrace as reference
> Provide output if related. Provide coredump if any. Use https://docs.phalcon.io/latest/en/generating-backtrace as reference

```php
// paste output here
Expand Down
4 changes: 2 additions & 2 deletions .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ staleLabel: stale

# Comment to post when marking as stale. Set to `false` to disable
markComment: >
Thank you for contributing to this issue. As it has been 90 days since the last activity, we are automatically closing the issue. This is often because the request was already solved in some way and it just wasn't updated or it's no longer applicable. If that's not the case, please feel free to either reopen this issue or open a new one. We will be more than happy to look at it again! You can read more here: https://blog.phalconphp.com/post/github-closing-old-issues
Thank you for contributing to this issue. As it has been 90 days since the last activity, we are automatically closing the issue. This is often because the request was already solved in some way and it just wasn't updated or it's no longer applicable. If that's not the case, please feel free to either reopen this issue or open a new one. We will be more than happy to look at it again! You can read more here: https://blog.phalcon.io/post/github-closing-old-issues
# Comment to post when removing the stale label.
# unmarkComment: >
# Your comment here.

# Comment to post when closing a stale Issue or Pull Request.
#closeComment: >
# Thank you for contributing to this issue. As it has been 90 days since the last activity, we are automatically closing the issue. This is often because the request was already solved in some way and it just wasn't updated or it's no longer applicable. If that's not the case, please feel free to either reopen this issue or open a new one. We will be more than happy to look at it again! You can read more here: https://blog.phalconphp.com/post/github-closing-old-issues
# Thank you for contributing to this issue. As it has been 90 days since the last activity, we are automatically closing the issue. This is often because the request was already solved in some way and it just wasn't updated or it's no longer applicable. If that's not the case, please feel free to either reopen this issue or open a new one. We will be more than happy to look at it again! You can read more here: https://blog.phalcon.io/post/github-closing-old-issues

# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30
Expand Down
17 changes: 9 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ cache:
timeout: 604800
directories:
- ${HOME}/.composer/cache
- ${HOME}/pear
- ${HOME}/.local/opt

services:
- mysql
Expand All @@ -42,7 +40,6 @@ env:
- CC="gcc"
- ZEPHIR_VERSION="0.12.2"
- ZEPHIR_PARSER_VERSION="v1.3.1"
- RE2C_VERSION="1.1.1"
- REPORT_COVERAGE=1
- PATH="${HOME}/.composer/vendor/bin:${PATH}"
- TRAVIS_COMMIT_LOG="$(git log --format=fuller -5)"
Expand All @@ -59,26 +56,30 @@ before_install:
fi
[ -d ~/bin ] || mkdir ~/bin
export DEFAULT_COMPOSER_FLAGS=("--no-interaction" "--no-ansi" "--no-progress" "--no-suggest")
export PHP_PEAR_PHP_BIN="$(phpenv which php)"
DEFAULT_COMPOSER_FLAGS=("--no-interaction" "--no-ansi" "--no-progress" "--no-suggest")
if [ "$(php-config --vernum)" -ge "70400" ]
then
DEFAULT_COMPOSER_FLAGS+=("--ignore-platform-reqs")
fi
export DEFAULT_COMPOSER_FLAGS
# Hide "You are in 'detached HEAD' state" message
git config --global advice.detachedHead false
- source .ci/export-variables.sh

install:
- .ci/install-mysql-5.7.sh
- .ci/setup-dbs.sh
- .ci/pear-setup.sh
- .ci/install-re2c.sh
- .ci/install-zephir.sh
- .ci/install-php-extensions.sh
- travis_retry composer install ${DEFAULT_COMPOSER_FLAGS[*]}

before_script:
- |
# Setting up Travis' PHP
cat .ci/travis.ini >> "$(phpenv root)/versions/$(phpenv version-name)/etc/conf.d/travis.ini"
cat .ci/travis.ini >> "$(phpenv prefix)/etc/conf.d/travis.ini"
if [ "$(php-config --vernum)" -ge "70400" ]
then
export REPORT_COVERAGE=0
Expand Down
Loading

0 comments on commit 874e4f1

Please sign in to comment.