Merge pull request #67 from Codeception/phpunit11

Naktibalda · web-flow · commit d9fbf1ca5297 · 2024-02-02T22:36:15.000+02:00
Support PHPUnit 11
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      COMPOSER_ROOT_VERSION: 3.99.99
+      COMPOSER_ROOT_VERSION: 4.99.99
 
     strategy:
       matrix:
-        php: [8.1, 8.2]
+        php: [8.1, 8.2, 8.3]
 
     steps:
     - name: Checkout code
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "ext-mbstring": "*",
         "codeception/codeception": "^5.0.8",
         "codeception/lib-web": "^1.0.1",
-        "phpunit/phpunit": "^10.0",
+        "phpunit/phpunit": "^10.0 || ^11.0",
         "symfony/browser-kit": "^4.4.24 || ^5.4 || ^6.0 || ^7.0",
         "symfony/dom-crawler": "^4.4.30 || ^5.4 || ^6.0 || ^7.0"
     },
diff --git a/tests/data/app/data.php b/tests/data/app/data.php
@@ -30,8 +30,10 @@ public static function clean()
     protected static function load()
     {
         $data = file_get_contents(__DIR__.self::$filename);
-        $data = $data ? unserialize($data) : $data = array();
-        if (!is_array($data)) $data = array();
+        $data = $data ? unserialize(trim($data)) : [];
+        if (!is_array($data)) {
+            $data = [];
+        }
         return $data;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,10 @@ public static function clean()`
`30`	`30`	`protected static function load()`
`31`	`31`	`{`
`32`	`32`	`$data = file_get_contents(__DIR__.self::$filename);`
`33`		`- $data = $data ? unserialize($data) : $data = array();`
`34`		`- if (!is_array($data)) $data = array();`
	`33`	`+ $data = $data ? unserialize(trim($data)) : [];`
	`34`	`+ if (!is_array($data)) {`
	`35`	`+ $data = [];`
	`36`	`+ }`
`35`	`37`	`return $data;`
`36`	`38`	`}`
`37`	`39`