Merge pull request #310 from clue-labs/php8.3

WyriHaximus · web-flow · commit 0cd247cd554e · 2023-10-28T10:42:19.000+02:00
Test on PHP 8.3 and update test environment
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,6 +14,7 @@ jobs:
           - ubuntu-22.04
           - windows-2022
         php:
+          - 8.3
           - 8.2
           - 8.1
           - 8.0
@@ -27,7 +28,7 @@ jobs:
           - 5.4
           - 5.3
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
@@ -46,10 +47,10 @@ jobs:
     runs-on: macos-12
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           coverage: xdebug
       - run: composer install
       - run: vendor/bin/phpunit --coverage-text
@@ -59,7 +60,7 @@ jobs:
     runs-on: ubuntu-22.04
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: cp "$(which composer)" composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
       - name: Run hhvm composer.phar install
         uses: docker://hhvm/hhvm:3.30-lts-latest
diff --git a/composer.json b/composer.json
@@ -34,19 +34,19 @@
         "react/stream": "^1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
+        "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
         "react/async": "^4 || ^3 || ^2",
         "react/promise-stream": "^1.4",
         "react/promise-timer": "^1.10"
     },
     "autoload": {
         "psr-4": {
-            "React\\Socket\\": "src"
+            "React\\Socket\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "React\\Tests\\Socket\\": "tests"
+            "React\\Tests\\Socket\\": "tests/"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- PHPUnit configuration file with new format for PHPUnit 9.5+ -->
+<!-- PHPUnit configuration file with new format for PHPUnit 9.6+ -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          cacheResult="false"
          colors="true"
@@ -20,7 +20,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
-        <!-- <ini name="zend.assertions=1" value="1" /> -->
+        <!-- <ini name="zend.assertions" value="1" /> -->
         <ini name="assert.active" value="1" />
         <ini name="assert.exception" value="1" />
         <ini name="assert.bail" value="0" />
diff --git a/phpunit.xml.legacy b/phpunit.xml.legacy
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older -->
+<!-- PHPUnit configuration file with old format for legacy PHPUnit -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
          bootstrap="vendor/autoload.php"
@@ -18,7 +18,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
-        <!-- <ini name="zend.assertions=1" value="1" /> -->
+        <!-- <ini name="zend.assertions" value="1" /> -->
         <ini name="assert.active" value="1" />
         <ini name="assert.exception" value="1" />
         <ini name="assert.bail" value="0" />

Original file line number	Diff line number	Diff line change
`@@ -34,19 +34,19 @@`
`34`	`34`	`"react/stream": "^1.2"`
`35`	`35`	`},`
`36`	`36`	`"require-dev": {`
`37`		`- "phpunit/phpunit": "^9.5 \|\| ^5.7 \|\| ^4.8.35",`
	`37`	`+ "phpunit/phpunit": "^9.6 \|\| ^5.7 \|\| ^4.8.36",`
`38`	`38`	`"react/async": "^4 \|\| ^3 \|\| ^2",`
`39`	`39`	`"react/promise-stream": "^1.4",`
`40`	`40`	`"react/promise-timer": "^1.10"`
`41`	`41`	`},`
`42`	`42`	`"autoload": {`
`43`	`43`	`"psr-4": {`
`44`		`- "React\\Socket\\": "src"`
	`44`	`+ "React\\Socket\\": "src/"`
`45`	`45`	`}`
`46`	`46`	`},`
`47`	`47`	`"autoload-dev": {`
`48`	`48`	`"psr-4": {`
`49`		`- "React\\Tests\\Socket\\": "tests"`
	`49`	`+ "React\\Tests\\Socket\\": "tests/"`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`