-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2881 from briannesbitt/3.x-merge
Merge master into 3.x
- Loading branch information
Showing
68 changed files
with
980 additions
and
630 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: composer | ||
| directory: / | ||
| schedule: | ||
| interval: weekly | ||
|
|
||
| - package-ecosystem: github-actions | ||
| directory: / | ||
| schedule: | ||
| interval: weekly |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| name: Linting | ||
| name: PHP-CS-Fixer | ||
|
|
||
| on: [ pull_request, push ] | ||
|
|
||
|
|
@@ -10,7 +10,7 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Checkout the code | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Check for code style violation with PHP-CS-Fixer | ||
| uses: OskarStark/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,10 +40,6 @@ jobs: | |
| - php: 8.1 | ||
| setup: lowest | ||
|
|
||
| - php: 8.1 | ||
| laravel: true | ||
| reference: 9.x | ||
|
|
||
| - php: 8.2 | ||
| - php: 8.2 | ||
| setup: lowest | ||
|
|
@@ -54,20 +50,20 @@ jobs: | |
|
|
||
| - php: 8.1 | ||
| laravel: true | ||
| reference: 9.x | ||
| reference: 10.x | ||
|
|
||
| - php: 8.1 | ||
| laravel: true | ||
| reference: 9.x | ||
| reference: 10.x | ||
| classmap-authoritative: true | ||
|
|
||
| - php: 8.2 | ||
| laravel: true | ||
| reference: 9.x | ||
| reference: master | ||
|
|
||
| - php: 8.2 | ||
| laravel: true | ||
| reference: 9.x | ||
| reference: master | ||
| classmap-authoritative: true | ||
|
|
||
| - php: 8.2 | ||
|
|
@@ -77,7 +73,7 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Checkout the code | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup PHP | ||
| uses: shivammathur/setup-php@v2 | ||
|
|
@@ -86,7 +82,7 @@ jobs: | |
| extensions: json, msgpack${{ matrix.laravel && ', dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-phpredis/[email protected], igbinary, msgpack, lzf, zstd, lz4, memcached, gmp' || '' }} | ||
| ini-values: error_reporting=${{ (matrix.setup != 'lowest') && '32767' || '8191' }} | ||
| tools: composer:v2 | ||
| coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} | ||
| coverage: ${{ matrix.coverage && 'pcov' || 'none' }} | ||
| env: | ||
| REDIS_CONFIGURE_OPTS: --enable-redis --enable-redis-igbinary --enable-redis-msgpack --enable-redis-lzf --with-liblzf --enable-redis-zstd --with-libzstd --enable-redis-lz4 --with-liblz4 | ||
| REDIS_LIBS: liblz4-dev, liblzf-dev, libzstd-dev | ||
|
|
@@ -97,26 +93,27 @@ jobs: | |
| sudo apt-get install tzdata locales -y && sudo locale-gen fr_FR.UTF-8 sr_ME.UTF-8 ar_AE.UTF-8 zh_TW.UTF-8 zh_CN.UTF-8 yo_NG.UTF-8 en_US.UTF-8 || echo 'Apt failure ignored' | ||
| - name: Set Minimum PHP 8.1 Versions | ||
| uses: nick-invision/retry@v1 | ||
| uses: nick-invision/retry@v2 | ||
| with: | ||
| timeout_minutes: 5 | ||
| max_attempts: 5 | ||
| command: composer require ramsey/collection:^1.2 brick/math:^0.9.3 --no-interaction --no-update | ||
| if: matrix.laravel | ||
|
|
||
| - name: Get composer cache directory | ||
| id: composer-cache | ||
| run: echo "::set-output name=dir::$(composer config cache-files-dir)" | ||
| id: composer-cache-ubuntu | ||
| run: echo "dir=$(composer config cache-files-dir)" > $GITHUB_OUTPUT | ||
|
|
||
| - name: Cache composer dependencies | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ${{ steps.composer-cache.outputs.dir }} | ||
| key: "php-${{ matrix.php }}-{{ matrix.setup }}-ubuntu-${{ hashFiles('**/composer.json') }}" | ||
| restore-keys: "php-${{ matrix.php }}-{{ matrix.setup }}-ubuntu-${{ hashFiles('**/composer.json') }}" | ||
| path: ${{ steps.composer-cache-ubuntu.outputs.dir }} | ||
| key: "php-${{ matrix.php }}-${{ matrix.setup }}-ubuntu-${{ hashFiles('**/composer.json') }}" | ||
| restore-keys: "php-${{ matrix.php }}-${{ matrix.setup }}-ubuntu-${{ hashFiles('**/composer.json') }}" | ||
|
|
||
| - name: Install dependencies | ||
| uses: nick-fields/retry@v2 | ||
| if: steps.composer-cache.outputs.cache-hit != 'true' | ||
| with: | ||
| timeout_minutes: 10 | ||
| max_attempts: 3 | ||
|
|
@@ -128,9 +125,10 @@ jobs: | |
| composer update --prefer-dist --no-progress --prefer-${{ matrix.setup || 'stable' }} ${{ matrix.classmap-authoritative && '--classmap-authoritative' || '' }}${{ matrix.php >= 8.2 && ' --ignore-platform-reqs' || '' }}; | ||
| - name: Run test suite | ||
| continue-on-error: ${{ matrix.laravel || 'false' }} | ||
| run: | | ||
| if [[ "${{ matrix.laravel }}" != 'true' && "${{ matrix.coverage }}" = 'true' ]]; then | ||
| php -d memory_limit=-1 -d zend.enable_gc=0 -d error_reporting=-1 vendor/phpunit/phpunit/phpunit --coverage-clover=coverage.xml --coverage-text; | ||
| php -d memory_limit=-1 -d zend.enable_gc=0 -d error_reporting=-1 vendor/phpunit/phpunit/phpunit --coverage-clover=clover.xml --coverage-text; | ||
| fi; | ||
| if [[ "${{ matrix.laravel }}" != 'true' && "${{ matrix.coverage }}" != 'true' ]]; then | ||
| php -d memory_limit=-1 -d zend.enable_gc=0 -d error_reporting=-1 vendor/phpunit/phpunit/phpunit; | ||
|
|
@@ -156,7 +154,7 @@ jobs: | |
| continue-on-error: true | ||
|
|
||
| - name: Coverage | ||
| uses: codecov/codecov-action@v1 | ||
| uses: codecov/codecov-action@v3 | ||
| if: matrix.coverage | ||
|
|
||
| windows: | ||
|
|
@@ -182,7 +180,7 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Checkout the code | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup PHP | ||
| uses: shivammathur/setup-php@v2 | ||
|
|
@@ -193,15 +191,16 @@ jobs: | |
| coverage: none | ||
|
|
||
| - name: Get composer cache directory | ||
| id: composer-cache | ||
| run: echo "::set-output name=dir::$(composer config cache-files-dir)" | ||
| id: composer-cache-windows | ||
| shell: bash | ||
| run: echo "dir=$(composer config cache-files-dir)" > $GITHUB_OUTPUT | ||
|
|
||
| - name: Cache composer dependencies | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ${{ steps.composer-cache.outputs.dir }} | ||
| key: "php-${{ matrix.php }}-{{ matrix.setup }}-windows-${{ hashFiles('**/composer.json') }}" | ||
| restore-keys: "php-${{ matrix.php }}-{{ matrix.setup }}-windows-${{ hashFiles('**/composer.json') }}" | ||
| path: ${{ steps.composer-cache-windows.outputs.dir }} | ||
| key: "php-${{ matrix.php }}-${{ matrix.setup }}-windows-${{ hashFiles('**/composer.json') }}" | ||
| restore-keys: "php-${{ matrix.php }}-${{ matrix.setup }}-windows-${{ hashFiles('**/composer.json') }}" | ||
|
|
||
| - name: Install dependencies | ||
| uses: nick-fields/retry@v2 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.