Merge branch '9.6' into 10.2

sebastianbergmann · Jul 18, 2023 · c5beea7 · c5beea7
2 parents 7007076 + 19c72d4
commit c5beea7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -68,8 +68,6 @@ jobs:
       PHP_EXTENSIONS: none, curl, dom, json, libxml, mbstring, openssl, phar, soap, tokenizer, xml, xmlwriter
       PHP_INI_VALUES: memory_limit=-1, assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On
 
-    continue-on-error: ${{ matrix.experimental }}
-
     strategy:
       fail-fast: false
       matrix:
@@ -80,18 +78,7 @@ jobs:
         php-version:
           - "8.1"
           - "8.2"
-
-        experimental:
-          - false
-
-        include:
-          - os: ubuntu-latest
-            php-version: "8.3"
-            experimental: true
-
-          - os: windows-latest
-            php-version: "8.3"
-            experimental: true
+          - "8.3"
 
     steps:
       - name: Configure Git to avoid issues with line endings
@@ -127,8 +114,6 @@ jobs:
       PHP_EXTENSIONS: none, curl, dom, json, libxml, mbstring, openssl, phar, soap, tokenizer, xml, xmlwriter
       PHP_INI_VALUES: assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On
 
-    continue-on-error: ${{ matrix.experimental }}
-
     strategy:
       fail-fast: false
       matrix:
@@ -139,18 +124,7 @@ jobs:
         php-version:
           - "8.1"
           - "8.2"
-
-        experimental:
-          - false
-
-        include:
-          - os: ubuntu-latest
-            php-version: "8.3"
-            experimental: true
-
-          - os: windows-latest
-            php-version: "8.3"
-            experimental: true
+          - "8.3"
 
     steps:
       - name: Configure Git to avoid issues with line endings

diff --git a/tests/end-to-end/regression/1348.phpt b/tests/end-to-end/regression/1348.phpt
@@ -1,5 +1,7 @@
 --TEST--
 https://github.com/sebastianbergmann/phpunit/issues/1348
+--XFAIL--
+https://github.com/sebastianbergmann/phpunit/issues/5356
 --SKIPIF--
 <?php declare(strict_types=1);
 if (defined('HHVM_VERSION') || defined('PHPDBG_VERSION')) {