Skip to content

Commit

Permalink
Merge pull request #15196 from phalcon/4.1.x
Browse files Browse the repository at this point in the history
4.1.0
  • Loading branch information
niden authored Oct 31, 2020
2 parents 634e723 + e5b529d commit 81561d8
Show file tree
Hide file tree
Showing 1,187 changed files with 508,508 additions and 411,698 deletions.
File renamed without changes.
File renamed without changes.
10 changes: 6 additions & 4 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:

- name: Setup Environment Variables
run: |
echo "::set-env name=ZEPHIR_PARSER_VERSION::v1.3.3"
echo "::set-env name=ZEPHIR_VERSION::0.12.17"
echo "::set-env name=ZEPHIR_PARSER_VERSION::v1.3.4"
echo "::set-env name=ZEPHIR_VERSION::0.12.19"
- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:
DATA_REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
DATA_MEMCACHED_PORT: ${{ job.services.memcached.ports['11211'] }}
DATA_MYSQL_USER: root
run: vendor/bin/codecept run --ext DotReporter database --env mysql -g mysql
run: vendor/bin/codecept run database --env mysql -g mysql

- name: Run Database Tests (Sqlite)
env:
Expand Down Expand Up @@ -326,6 +326,8 @@ jobs:

- name: Install Package
run: |
sudo xcode-select -s /Applications/Xcode_12.app
xcodebuild -version
export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
sudo pecl -v install phalcon-pecl/phalcon-pecl.tgz
Expand Down Expand Up @@ -389,7 +391,7 @@ jobs:
php-version: ${{ matrix.php-versions }}
ini-values: apc.enable_cli=on, session.save_path=C:\temp
tools: pecl, prestissimo
extensions: mbstring, intl, json, yaml, apcu, psr, imagick, gd, redis, igbinary, msgpack-beta, sqlite3
extensions: mbstring, intl, json, yaml, apcu, psr, imagick, gd, redis, igbinary, sqlite3, msgpack
env:
PHPTS: ${{ matrix.ts }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codecoverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ jobs:

- name: Setup Environment Variables
run: |
echo "::set-env name=ZEPHIR_PARSER_VERSION::v1.3.3"
echo "::set-env name=ZEPHIR_VERSION::0.12.17"
echo "::set-env name=ZEPHIR_PARSER_VERSION::v1.3.4"
echo "::set-env name=ZEPHIR_VERSION::0.12.19"
- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ services:
env:
global:
- CC="gcc"
- ZEPHIR_VERSION="0.12.17"
- ZEPHIR_PARSER_VERSION="v1.3.2"
- ZEPHIR_VERSION="0.12.19"
- ZEPHIR_PARSER_VERSION="v1.3.4"
- REPORT_COVERAGE=0
- PATH="${HOME}/.composer/vendor/bin:${PATH}"
- TRAVIS_COMMIT_LOG="$(git log --format=fuller -5)"
Expand Down
9 changes: 9 additions & 0 deletions BACKERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,24 @@ Thanks for the support
<a href="https://github.com/vlad-light"><img src="https://avatars1.githubusercontent.com/u/277235?s=460&v=4" title="Vladimir L" width="60" height="60"></a>
<a href="https://github.com/alrieckert"><img src="https://avatars1.githubusercontent.com/u/452786?s=460&v=4" title="Anton Rieckert" width="60" height="60"></a>
<a href="https://github.com/sinbadxiii"><img src="https://avatars2.githubusercontent.com/u/900273?s=460&v=4" title="Sergey Mukhin" width="60" height="60"></a>
<a href="https://github.com/pfz"><img src="https://avatars2.githubusercontent.com/u/1042926?s=460&u=2ef2c7abef6e873562b3fa10dbab56fc046e04f1&v=4" title="Francois Paulin" width="60" height="60"></a>
<a href="https://github.com/niden"><img src="https://avatars2.githubusercontent.com/u/1073784?s=460&v=4" title="Nikolaos Dimopoulos" width="60" height="60"></a>
<a href="https://github.com/qmegas"><img src="https://avatars3.githubusercontent.com/u/2444896?s=460&v=4" title="qmegas" width="60" height="60"></a>
<a href="https://github.com/gwijnja"><img src="https://avatars1.githubusercontent.com/u/2666867?s=460&u=7f358f88d53208909d808db17b382ae44d9eb48a&v=4" title="Gerben Wijnja" width="60" height="60"></a>
<a href="https://github.com/terolblade"><img src="https://avatars3.githubusercontent.com/u/3078649?s=460&v=4" title="Stanislav Sviridenko" width="60" height="60"></a>
<a href="https://github.com/Ruzgfpegk"><img src="https://avatars1.githubusercontent.com/u/3818364?s=460&v=4" title="Ruzgfpegk" width="60" height="60"></a>
<a href="https://github.com/zsilbi"><img src="https://avatars2.githubusercontent.com/u/3886658?s=460&v=4" title="Balázs Németh" width="60" height="60"></a>
<a href="https://github.com/RayHughes"><img src="https://avatars3.githubusercontent.com/u/4381883?s=460&u=16dbf2e3fbfae0892a858d6d4cc8869bfde6dd74&v=4" title="Ray Hughes" width="60" height="60"></a>
<a href="https://github.com/uchoamaster"><img src="https://avatars2.githubusercontent.com/u/5197047?s=460&v=4" title="Carlos Jr Uchôa Oliveira" width="60" height="60"></a>
<a href="https://github.com/educury"><img src="https://avatars2.githubusercontent.com/u/5339278?s=460&v=4" title="educury" width="60" height="60"></a>
<a href="https://github.com/emagus"><img src="https://avatars3.githubusercontent.com/u/5857789?s=460&v=4" title="emagus" width="60" height="60"></a>
<a href="https://github.com/ruudboon"><img src="https://avatars3.githubusercontent.com/u/7444246?s=460&v=4" title="Ruud Boon" width="60" height="60"></a>
<a href="https://github.com/kirill-voronov"><img src="https://avatars2.githubusercontent.com/u/10974617?s=460&u=3e2de3fc425f00606dc1679fb1de99d84183a050&v=4" title="Kirill Voronov" width="60" height="60"></a>
<a href="https://github.com/sitchi"><img src="https://avatars0.githubusercontent.com/u/11546683?s=460&v=4" title="Nikoloz Sitchinava" width="60" height="60"></a>
<a href="https://github.com/tacxticx88"><img src="https://avatars3.githubusercontent.com/u/12997062?s=460&u=5af0fbe438391ac46fb19befe0c20a4b1374e187&v=4" title="Clément" width="60" height="60"></a>
<a href="https://github.com/Montana"><img src="https://avatars3.githubusercontent.com/u/20936398?s=460&v=4" title="Montana Mendy" width="60" height="60"></a>
<a href="https://github.com/ak1113"><img src="https://avatars0.githubusercontent.com/u/38716832?s=460&v=4" title="Akira Kato" width="60" height="60"></a>
<a href="https://github.com/dredasss"><img src="https://avatars1.githubusercontent.com/u/38747389?s=460&u=ee99a8bb28ee6bedbbea6325d49d4eb99080d421&v=4" title="Nerijus Alex" width="60" height="60"></a>

[//]: github-sponsors

Expand Down
Loading

0 comments on commit 81561d8

Please sign in to comment.