From a3d883f501cb799e18fe8dde87255ad714a20ec2 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sun, 25 Dec 2022 11:40:29 +0100 Subject: [PATCH 1/2] chore: add ci tests for php 8.2, fix ci deprecations (bump github action versions) --- .github/workflows/ci-1.x.yml | 14 +++++++------- .github/workflows/ci-2.x.yml | 14 +++++++------- .github/workflows/ci.yml | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci-1.x.yml b/.github/workflows/ci-1.x.yml index 10a8ef55..4d175ca4 100644 --- a/.github/workflows/ci-1.x.yml +++ b/.github/workflows/ci-1.x.yml @@ -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: @@ -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 @@ -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 }}- diff --git a/.github/workflows/ci-2.x.yml b/.github/workflows/ci-2.x.yml index 557e6371..ec618487 100644 --- a/.github/workflows/ci-2.x.yml +++ b/.github/workflows/ci-2.x.yml @@ -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: @@ -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 @@ -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 }}- diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35b64822..1781d1c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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 }}- From 4190f8b67ad3ae11b8e0fac76ceab2981f902bb8 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Tue, 3 Jan 2023 22:56:04 +0100 Subject: [PATCH 2/2] chore: add ci tests for php 8.2, fix ci deprecations (bump github action versions) --- src/ErrorWrapper.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ErrorWrapper.php b/src/ErrorWrapper.php index 4c0a92a9..0806865c 100644 --- a/src/ErrorWrapper.php +++ b/src/ErrorWrapper.php @@ -5,7 +5,9 @@ class ErrorWrapper extends \Exception { private static $constName; - + + public $isUncaught; + private $utilities; private static function getConstName($const)