bump to phpunit 11.5, remove deprecations

Limenius · Oct 15, 2024 · 9968466 · 9968466
1 parent d9c5b0a
commit 9968466
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -30,9 +30,10 @@
   "require-dev": {
     "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
     "escapestudios/symfony2-coding-standard": "^3.0",
-    "phpunit/phpunit": "^10.5",
+    "phpunit/phpunit": "^11.4",
     "phpcompatibility/php-compatibility": "^9.3",
-    "phpstan/phpstan": "^1.8"
+    "phpstan/phpstan": "^1.8",
+    "rector/rector": "^1.2"
   },
   "scripts": {
     "test": "phpunit",

diff --git a/rector.php b/rector.php
@@ -4,14 +4,18 @@
 
 use Rector\Config\RectorConfig;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
+use Rector\PHPUnit\Set\PHPUnitSetList;
 
 return RectorConfig::configure()
     ->withPaths([
         __DIR__ . '/src',
         __DIR__ . '/tests',
     ])
     // uncomment to reach your current PHP version
-     ->withPhpSets(php82: true)
+    ->withPhpSets(php83: true)
+    ->withSets([
+        PHPUnitSetList::PHPUNIT_110
+    ])
     ->withRules([
         AddVoidReturnTypeWhereNoReturnRector::class,
     ]);
diff --git a/tests/Limenius/Liform/Tests/Transformer/ChoiceTransformerTest.php b/tests/Limenius/Liform/Tests/Transformer/ChoiceTransformerTest.php
@@ -39,13 +39,12 @@ public function testChoice(): void
         // 4 times: firstName, form, and the two choices
         $this->translator->expects($this->exactly(4))
             ->method('trans')
-            ->will($this->returnCallback(fn($str) => $str.'-translated'));
+            ->willReturnCallback(fn($str) => $str.'-translated');
 
         $resolver = new Resolver();
         $resolver->setTransformer('choice', new Transformer\ChoiceTransformer($this->translator, null));
         $transformer = new CompoundTransformer($this->translator, $resolver);
         $transformed = $transformer->transform($form);
-        $this->assertTrue(is_array($transformed));
         $this->assertArrayHasKey('enum_titles', $transformed['properties']['firstName']);
         $this->assertArrayHasKey('enum_titles', $transformed['properties']['firstName']['options']);
         $this->assertEquals(['a-translated', 'b-translated'], $transformed['properties']['firstName']['enum_titles']);
@@ -69,13 +68,12 @@ public function testChoiceExpanded(): void
         // 4 times: firstName, form, and the two choices
         $this->translator->expects($this->exactly(4))
             ->method('trans')
-            ->will($this->returnCallback(fn($str) => $str.'-translated'));
+            ->willReturnCallback(fn($str) => $str.'-translated');
 
         $resolver = new Resolver();
         $resolver->setTransformer('choice', new Transformer\ChoiceTransformer($this->translator, null));
         $transformer = new CompoundTransformer($this->translator, $resolver);
         $transformed = $transformer->transform($form);
-        $this->assertTrue(is_array($transformed));
         $this->assertArrayHasKey('enum_titles', $transformed['properties']['firstName']);
         $this->assertArrayHasKey('enum_titles', $transformed['properties']['firstName']['options']);
         $this->assertEquals(['a-translated', 'b-translated'], $transformed['properties']['firstName']['enum_titles']);
@@ -102,7 +100,6 @@ public function testChoiceMultiple(): void
         $resolver->setTransformer('choice', new Transformer\ChoiceTransformer($this->translator, null));
         $transformer = new CompoundTransformer($this->translator, $resolver);
         $transformed = $transformer->transform($form);
-        $this->assertTrue(is_array($transformed));
         $this->assertArrayHasKey('items', $transformed['properties']['firstName']);
         $this->assertEquals('array', $transformed['properties']['firstName']['type']);
         $this->assertArrayNotHasKey('widget', $transformed['properties']['firstName']);

diff --git a/tests/Limenius/Liform/Tests/Transformer/CommonTransformerTest.php b/tests/Limenius/Liform/Tests/Transformer/CommonTransformerTest.php
@@ -38,7 +38,6 @@ public function testRequired(): void
         $transformer = new CompoundTransformer($this->translator, $resolver);
         $transformed = $transformer->transform($form);
 
-        $this->assertTrue(is_array($transformed));
         $this->assertArrayHasKey('required', $transformed);
         $this->assertTrue(is_array($transformed['required']));
         $this->assertContains('firstName', $transformed['required']);
@@ -56,11 +55,10 @@ public function testDescription(): void
         $resolver->setTransformer('text', new StringTransformer($this->translator));
 
         $this->translator->method('trans')
-            ->will($this->returnCallback(fn($description) => $description));
+            ->willReturnCallback(fn($description) => $description);
         $transformer = new CompoundTransformer($this->translator, $resolver);
         $transformed = $transformer->transform($form);
 
-        $this->assertTrue(is_array($transformed));
         $this->assertArrayHasKey('description', $transformed['properties']['firstName']);
         $this->assertSame($description, $transformed['properties']['firstName']['description']);
     }
@@ -79,11 +77,10 @@ public function testDescriptionFromFormHelp(): void
         $resolver = new Resolver();
         $resolver->setTransformer('text', new StringTransformer($this->translator));
         $this->translator->method('trans')
-            ->will($this->returnCallback(fn($description) => $description));
+            ->willReturnCallback(fn($description) => $description);
         $transformer = new CompoundTransformer($this->translator, $resolver);
         $transformed = $transformer->transform($form);
 
-        $this->assertTrue(is_array($transformed));
         $this->assertArrayHasKey('description', $transformed['properties']['firstName']);
         $this->assertSame($description, $transformed['properties']['firstName']['description']);
     }
@@ -106,10 +103,9 @@ public function testDescriptionFromFormHelpOverriddenByLiformDescription(): void
         $resolver->setTransformer('text', new StringTransformer($this->translator));
         $transformer = new CompoundTransformer($this->translator, $resolver);
         $this->translator->method('trans')
-            ->will($this->returnCallback(fn($description) => $description));
+            ->willReturnCallback(fn($description) => $description);
         $transformed = $transformer->transform($form);
 
-        $this->assertTrue(is_array($transformed));
         $this->assertArrayHasKey('description', $transformed['properties']['firstName']);
         $this->assertSame($description, $transformed['properties']['firstName']['description']);
     }

diff --git a/tests/Limenius/Liform/Tests/Transformer/StringTransformerTest.php b/tests/Limenius/Liform/Tests/Transformer/StringTransformerTest.php
@@ -37,7 +37,6 @@ public function testPattern(): void
         $resolver->setTransformer('text', new StringTransformer($this->translator));
         $transformer = new CompoundTransformer($this->translator, $resolver);
         $transformed = $transformer->transform($form);
-        $this->assertTrue(is_array($transformed));
         $this->assertEquals('.{5,}', $transformed['properties']['firstName']['pattern']);
     }
 }