[TASK] Migrate to rawr/phpunit-data-provider

The package `rawr/cross-data-providers` that we used has been
abandoned and should not be used anymore.

Also autoformat the affected classes and fix a typo in a data
provider name.

Author: oliverklee

composer.json

@@ -33,7 +33,7 @@
         "phpstan/phpstan-phpunit": "1.4.2 || 2.0.4",
         "phpstan/phpstan-strict-rules": "1.6.2 || 2.0.3",
         "phpunit/phpunit": "8.5.41",
-        "rawr/cross-data-providers": "2.4.0",
+        "rawr/phpunit-data-provider": "3.3.1",
         "rector/rector": "1.2.10 || 2.0.7",
         "rector/type-perfect": "1.0.0 || 2.0.2"
     },

tests/Unit/Comment/CommentContainerTest.php

@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use Sabberworm\CSS\Comment\Comment;
 use Sabberworm\CSS\Tests\Unit\Comment\Fixtures\ConcreteCommentContainer;
-use TRegx\DataProvider\DataProviders;
+use TRegx\PhpUnit\DataProviders\DataProvider;
 
 /**
  * @covers \Sabberworm\CSS\Comment\CommentContainer
@@ -42,10 +42,12 @@ public function provideCommentArray(): array
         return [
             'no comment' => [[]],
             'one comment' => [[new Comment('Is this really a spoon?')]],
-            'two comments' => [[
-                new Comment('I’m a teapot.'),
-                new Comment('I’m a cafetière.'),
-            ]],
+            'two comments' => [
+                [
+                    new Comment('I’m a teapot.'),
+                    new Comment('I’m a cafetière.'),
+                ],
+            ],
         ];
     }
 
@@ -87,10 +89,12 @@ public function provideAlternativeCommentArray(): array
         return [
             'no comment' => [[]],
             'one comment' => [[new Comment('Can I eat it with my hands?')]],
-            'two comments' => [[
-                new Comment('I’m a beer barrel.'),
-                new Comment('I’m a vineyard.'),
-            ]],
+            'two comments' => [
+                [
+                    new Comment('I’m a beer barrel.'),
+                    new Comment('I’m a vineyard.'),
+                ],
+            ],
         ];
     }
 
@@ -110,22 +114,22 @@ public function provideAlternativeNonemptyCommentArray(): array
      * This provider crosses two comment arrays (0, 1 or 2 comments) with different comments,
      * so that all combinations can be tested.
      *
-     * @return array<non-empty-string, array{0: list<Comment>, 1: list<Comment>}>
+     * @return DataProvider<non-empty-string, array{0: list<Comment>, 1: list<Comment>}>
      */
-    public function provideTwoDistinctCommentArrays(): array
+    public function provideTwoDistinctCommentArrays(): DataProvider
     {
-        return DataProviders::cross($this->provideCommentArray(), $this->provideAlternativeCommentArray());
+        return DataProvider::cross($this->provideCommentArray(), $this->provideAlternativeCommentArray());
     }
 
     /**
-     * @return array<non-empty-string, array{0: list<Comment>, 1: non-empty-list<Comment>}>
+     * @return DataProvider<non-empty-string, array{0: list<Comment>, 1: non-empty-list<Comment>}>
      */
-    public function provideTwoDistinctCommentArraysWithSecondNonempty(): array
+    public function provideTwoDistinctCommentArraysWithSecondNonempty(): DataProvider
     {
-        return DataProviders::cross($this->provideCommentArray(), $this->provideAlternativeNonemptyCommentArray());
+        return DataProvider::cross($this->provideCommentArray(), $this->provideAlternativeNonemptyCommentArray());
     }
 
-    private static function createContainsContstraint(Comment $comment): TraversableContains
+    private static function createContainsConstraint(Comment $comment): TraversableContains
     {
         return new TraversableContains($comment);
     }
@@ -135,9 +139,9 @@ private static function createContainsContstraint(Comment $comment): Traversable
      *
      * @return non-empty-list<TraversableContains>
      */
-    private static function createContainsContstraints(array $comments): array
+    private static function createContainsConstraints(array $comments): array
     {
-        return \array_map([self::class, 'createContainsContstraint'], $comments);
+        return \array_map([self::class, 'createContainsConstraint'], $comments);
     }
 
     /**
@@ -156,7 +160,7 @@ public function addCommentsKeepsOriginalComments(array $commentsToAdd, array $or
 
         self::assertThat(
             $this->subject->getComments(),
-            LogicalAnd::fromConstraints(...self::createContainsContstraints($originalComments))
+            LogicalAnd::fromConstraints(...self::createContainsConstraints($originalComments))
         );
     }
 
@@ -176,7 +180,7 @@ public function addCommentsAfterCommentsSetAddsCommentsProvided(array $originalC
 
         self::assertThat(
             $this->subject->getComments(),
-            LogicalAnd::fromConstraints(...self::createContainsContstraints($commentsToAdd))
+            LogicalAnd::fromConstraints(...self::createContainsConstraints($commentsToAdd))
         );
     }
 

tests/Unit/Position/PositionTest.php

@@ -6,7 +6,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Sabberworm\CSS\Tests\Unit\Position\Fixtures\ConcretePosition;
-use TRegx\DataProvider\DataProviders;
+use TRegx\PhpUnit\DataProviders\DataProvider;
 
 /**
  * @covers \Sabberworm\CSS\Position\Position
@@ -157,11 +157,11 @@ public function setPositionWithNullForColumnNumberClearsColumnNumber(): void
     }
 
     /**
-     * @return array<non-empty-string, array{0: int<1, max>, 1: int<0, max>}>
+     * @return DataProvider<non-empty-string, array{0: int<1, max>, 1: int<0, max>}>
      */
-    public function provideLineAndColumnNumber(): array
+    public function provideLineAndColumnNumber(): DataProvider
     {
-        return DataProviders::cross($this->provideLineNumber(), $this->provideColumnNumber());
+        return DataProvider::cross($this->provideLineNumber(), $this->provideColumnNumber());
     }
 
     /**