Skip to content

Commit

Permalink
Merge pull request #589 from Chris53897/feature/add-ci-tests-for-php82
Browse files Browse the repository at this point in the history
chore: add ci tests for php 8.2, fix ci deprecations
  • Loading branch information
danielmorell authored Jan 9, 2023
2 parents de2388d + 4190f8b commit 21b1754
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci-1.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
# compatible version as well as the most-recent stable version. This will
# fail-fast by default, so we include our edgiest versions (currently 7.4)
# first as they're most likely to fail.
# @seealso https://freek.dev/1546
# @seealso https://www.dereuromark.de/2019/01/04/test-composer-dependencies-with-prefer-lowest/
# @seealso https://github.com/actions/starter-workflows/blob/main/ci/php.yml
# @see https://freek.dev/1546
# @see https://www.dereuromark.de/2019/01/04/test-composer-dependencies-with-prefer-lowest/
# @see https://github.com/actions/starter-workflows/blob/main/ci/php.yml
php-tests:
strategy:
matrix:
Expand All @@ -45,13 +45,13 @@ jobs:
steps:
- name: Checkout the next/1.x/main branch during scheduled builds
if: github.ref == 'refs/heads/master'
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: 'next/1.x/main'

- name: Checkout the pushed branch
if: github.ref != 'refs/heads/master'
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install PHP and composer environment
uses: shivammathur/setup-php@v2
Expand All @@ -63,10 +63,10 @@ jobs:

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ matrix.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ matrix.dependency }}-
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci-2.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
# compatible version as well as the most-recent stable version. This will
# fail-fast by default, so we include our edgiest versions (currently 7.4)
# first as they're most likely to fail.
# @seealso https://freek.dev/1546
# @seealso https://www.dereuromark.de/2019/01/04/test-composer-dependencies-with-prefer-lowest/
# @seealso https://github.com/actions/starter-workflows/blob/main/ci/php.yml
# @see https://freek.dev/1546
# @see https://www.dereuromark.de/2019/01/04/test-composer-dependencies-with-prefer-lowest/
# @see https://github.com/actions/starter-workflows/blob/main/ci/php.yml
php-tests:
strategy:
matrix:
Expand Down Expand Up @@ -70,13 +70,13 @@ jobs:
steps:
- name: Checkout the next/2.x/main branch during scheduled builds
if: github.ref == 'refs/heads/master'
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: 'next/2.x/main'

- name: Checkout the pushed branch
if: github.ref != 'refs/heads/master'
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install PHP and composer environment
uses: shivammathur/setup-php@v2
Expand All @@ -88,10 +88,10 @@ jobs:

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ matrix.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ matrix.dependency }}-
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
# compatible version as well as the most-recent stable version. This will
# fail-fast by default, so we include our edgiest versions (currently 7.4)
# first as they're most likely to fail.
# @seealso https://freek.dev/1546
# @seealso https://www.dereuromark.de/2019/01/04/test-composer-dependencies-with-prefer-lowest/
# @see https://freek.dev/1546
# @see https://www.dereuromark.de/2019/01/04/test-composer-dependencies-with-prefer-lowest/
php-tests:
strategy:
matrix:
# All the versions, OS, and dependency levels we want to support
php: [8.0, 8.1]
php: [8.0, 8.1, 8.2]
dependency: [stable] # TODO: lowest
os: [ubuntu] # TODO: windows, macos
# Our code has paths for with- and without- XDebug, and we want to test
Expand All @@ -46,7 +46,7 @@ jobs:
runs-on: ${{ matrix.os }}-latest
steps:
- name: Checkout the code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install PHP and composer environment
uses: shivammathur/setup-php@v2
Expand All @@ -58,10 +58,10 @@ jobs:

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ matrix.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ matrix.dependency }}-
Expand Down
4 changes: 3 additions & 1 deletion src/ErrorWrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
class ErrorWrapper extends \Exception
{
private static $constName;


public $isUncaught;

private $utilities;

private static function getConstName($const)
Expand Down

0 comments on commit 21b1754

Please sign in to comment.