Format code

Author: limingxinleo

src/Concerns/ConditionallyLoadsAttributes.php

@@ -77,9 +77,9 @@ protected function mergeData(array $data, int $index, array $merge, bool $numeri
             ));
         }
 
-        return $this->removeMissingValues(array_slice($data, 0, $index, true) +
-            $merge +
-            $this->filter(array_slice($data, $index + 1, null, true)));
+        return $this->removeMissingValues(array_slice($data, 0, $index, true)
+            + $merge
+            + $this->filter(array_slice($data, $index + 1, null, true)));
     }
 
     /**

tests/HttpResponse.php

@@ -236,10 +236,10 @@ public function assertJsonFragment(array $data)
 
             PHPUnit::assertTrue(
                 Str::contains($actual, $expected),
-                'Unable to find JSON fragment: ' . PHP_EOL . PHP_EOL .
-                '[' . json_encode([$key => $value]) . ']' . PHP_EOL . PHP_EOL .
-                'within' . PHP_EOL . PHP_EOL .
-                "[{$actual}]."
+                'Unable to find JSON fragment: ' . PHP_EOL . PHP_EOL
+                . '[' . json_encode([$key => $value]) . ']' . PHP_EOL . PHP_EOL
+                . 'within' . PHP_EOL . PHP_EOL
+                . "[{$actual}]."
             );
         }
 
@@ -267,10 +267,10 @@ public function assertJsonMissing(array $data, $exact = false)
 
             PHPUnit::assertFalse(
                 Str::contains($actual, $unexpected),
-                'Found unexpected JSON fragment: ' . PHP_EOL . PHP_EOL .
-                '[' . json_encode([$key => $value]) . ']' . PHP_EOL . PHP_EOL .
-                'within' . PHP_EOL . PHP_EOL .
-                "[{$actual}]."
+                'Found unexpected JSON fragment: ' . PHP_EOL . PHP_EOL
+                . '[' . json_encode([$key => $value]) . ']' . PHP_EOL . PHP_EOL
+                . 'within' . PHP_EOL . PHP_EOL
+                . "[{$actual}]."
             );
         }
 
@@ -297,10 +297,10 @@ public function assertJsonMissingExact(array $data)
         }
 
         PHPUnit::fail(
-            'Found unexpected JSON fragment: ' . PHP_EOL . PHP_EOL .
-            '[' . json_encode($data) . ']' . PHP_EOL . PHP_EOL .
-            'within' . PHP_EOL . PHP_EOL .
-            "[{$actual}]."
+            'Found unexpected JSON fragment: ' . PHP_EOL . PHP_EOL
+            . '[' . json_encode($data) . ']' . PHP_EOL . PHP_EOL
+            . 'within' . PHP_EOL . PHP_EOL
+            . "[{$actual}]."
         );
     }
 
@@ -381,8 +381,8 @@ public function assertJsonValidationErrors($keys)
         $errors = $this->json()['errors'] ?? [];
 
         $errorMessage = $errors
-            ? 'Response has the following JSON validation errors:' .
-            PHP_EOL . PHP_EOL . json_encode($errors, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE) . PHP_EOL
+            ? 'Response has the following JSON validation errors:'
+            . PHP_EOL . PHP_EOL . json_encode($errors, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE) . PHP_EOL
             : 'Response does not have JSON validation errors.';
 
         foreach ($keys as $key) {
@@ -416,8 +416,8 @@ public function assertJsonMissingValidationErrors($keys = null)
 
         if (is_null($keys) && count($errors) > 0) {
             PHPUnit::fail(
-                'Response has unexpected validation errors: ' . PHP_EOL . PHP_EOL .
-                json_encode($errors, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
+                'Response has unexpected validation errors: ' . PHP_EOL . PHP_EOL
+                . json_encode($errors, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
             );
         }
 
@@ -489,10 +489,10 @@ protected function assertJsonMessage(array $data)
 
         $actual = json_encode($this->decodeResponseJson(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 
-        return 'Unable to find JSON: ' . PHP_EOL . PHP_EOL .
-            "[{$expected}]" . PHP_EOL . PHP_EOL .
-            'within response JSON:' . PHP_EOL . PHP_EOL .
-            "[{$actual}]." . PHP_EOL . PHP_EOL;
+        return 'Unable to find JSON: ' . PHP_EOL . PHP_EOL
+            . "[{$expected}]" . PHP_EOL . PHP_EOL
+            . 'within response JSON:' . PHP_EOL . PHP_EOL
+            . "[{$actual}]." . PHP_EOL . PHP_EOL;
     }
 
     /**