Refactor the tests for newer Phpunit version

rdlowrey · Nov 26, 2024 · d6c1584 · d6c1584
1 parent 9b07c50
commit d6c1584
Show file tree

Hide file tree

Showing 7 changed files with 471 additions and 480 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -0,0 +1,8 @@
+<?php
+
+return (new \PhpCsFixer\Config())
+    ->setFinder(
+        (new \PhpCsFixer\Finder())
+            ->in(__DIR__ . "/lib")
+            ->in(__DIR__ . "/test")
+    );
diff --git a/.php_cs b/.php_cs
diff --git a/composer.json b/composer.json
@@ -28,9 +28,9 @@
         "php": ">=7.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
-        "fabpot/php-cs-fixer": "~1.9",
-        "athletic/athletic": "~0.1"
+        "phpunit/phpunit": ">=7",
+        "friendsofphp/php-cs-fixer": "^3",
+        "athletic/athletic": "^0.1"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -6,7 +6,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
         >
     <testsuites>

diff --git a/test/InjectorTest.php b/test/InjectorTest.php
diff --git a/test/fixtures.php b/test/fixtures.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Auryn\Test;
+namespace Auryn;
 
 class InaccessibleExecutableClassMethod
 {
@@ -158,6 +158,7 @@ class SpecdTestDependency extends TestDependency
 
 class TestNeedsDep
 {
+    public $testDep;
     public function __construct(TestDependency $testDep)
     {
         $this->testDep = $testDep;
@@ -174,6 +175,8 @@ public function __construct($val = 42)
 
 class TestMultiDepsNeeded
 {
+    public $testDep;
+
     public function __construct(TestDependency $val1, TestDependency2 $val2)
     {
         $this->testDep = $val1;
@@ -184,6 +187,8 @@ public function __construct(TestDependency $val1, TestDependency2 $val2)
 
 class TestMultiDepsWithCtor
 {
+    public $testDep;
+
     public function __construct(TestDependency $val1, TestNeedsDep $val2)
     {
         $this->testDep = $val1;

diff --git a/test/fixtures_5_6.php b/test/fixtures_5_6.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Auryn\Test;
+namespace Auryn;
 
 class NoTypehintNoDefaultConstructorVariadicClass
 {
@@ -18,4 +18,4 @@ public function __construct(TestDependency ...$arg)
     {
         $this->testParam = $arg;
     }
-}
+}