coding style updates

Author: deminy

tests/unit/BasicTest.php

@@ -57,6 +57,21 @@ public function setUp(): void
         BackgroundProcessing::reset();
     }
 
+    /**
+     * @param array<array{0: \Closure, ?mixed}> $closures
+     * @dataProvider dataRun
+     * @covers \CrowdStar\BackgroundProcessing\BackgroundProcessing::run()
+     * @throws AlreadyInvokedException|InvalidEnvironmentException
+     */
+    public function testRun(int $expected, array $closures, string $message): void
+    {
+        foreach ($closures as $closure) {
+            BackgroundProcessing::add(...$closure);
+        }
+        BackgroundProcessing::run();
+        $this->assertSame($expected, self::$counter, $message);
+    }
+
     /**
      * @return array<array<mixed>>
      */
@@ -101,21 +116,6 @@ public static function dataRun(): array
         ];
     }
 
-    /**
-     * @param array<array{0: \Closure, ?mixed}> $closures
-     * @dataProvider dataRun
-     * @covers \CrowdStar\BackgroundProcessing\BackgroundProcessing::run()
-     * @throws AlreadyInvokedException|InvalidEnvironmentException
-     */
-    public function testRun(int $expected, array $closures, string $message): void
-    {
-        foreach ($closures as $closure) {
-            BackgroundProcessing::add(...$closure);
-        }
-        BackgroundProcessing::run();
-        $this->assertSame($expected, self::$counter, $message);
-    }
-
     /**
      * @covers \CrowdStar\BackgroundProcessing\BackgroundProcessing::run()
      */

tests/unit/DockerizedTest.php

@@ -32,6 +32,27 @@
  */
 class DockerizedTest extends TestCase
 {
+    /**
+     * @dataProvider dataRun
+     * @covers \CrowdStar\BackgroundProcessing\BackgroundProcessing::run()
+     */
+    public function testRun(string $expectedHttpResponse, string $expectedFinalValue, string $start, string $end): void
+    {
+        $client = new Client(['base_uri' => 'http://web']);
+        $client->get('/', ['query' => ['reset' => true]]); // Wipe cached data.
+
+        $this->assertSame(
+            $expectedHttpResponse,
+            (string) $client->get('/', ['query' => ['start' => $start, 'end' => $end]])->getBody(),
+            "HTTP response should be {$expectedHttpResponse} while final value in APCu should be {$expectedFinalValue}"
+        );
+        $this->assertSame(
+            $expectedFinalValue,
+            (string) $client->get('/')->getBody(),
+            "Final value in APCu should be {$expectedFinalValue} while HTTP response should be {$expectedHttpResponse}"
+        );
+    }
+
     /**
      * @return array<array<string, string>>
      */
@@ -68,25 +89,4 @@ public static function dataRun(): array
             ],
         ];
     }
-
-    /**
-     * @dataProvider dataRun
-     * @covers \CrowdStar\BackgroundProcessing\BackgroundProcessing::run()
-     */
-    public function testRun(string $expectedHttpResponse, string $expectedFinalValue, string $start, string $end): void
-    {
-        $client = new Client(['base_uri' => 'http://web']);
-        $client->get('/', ['query' => ['reset' => true]]); // Wipe cached data.
-
-        $this->assertSame(
-            $expectedHttpResponse,
-            (string) $client->get('/', ['query' => ['start' => $start, 'end' => $end]])->getBody(),
-            "HTTP response should be {$expectedHttpResponse} while final value in APCu should be {$expectedFinalValue}"
-        );
-        $this->assertSame(
-            $expectedFinalValue,
-            (string) $client->get('/')->getBody(),
-            "Final value in APCu should be {$expectedFinalValue} while HTTP response should be {$expectedHttpResponse}"
-        );
-    }
 }