fix

box-project · Dec 16, 2023 · 5dcfec2 · 5dcfec2
1 parent 6f918b0
commit 5dcfec2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/src/Configuration/Configuration.php b/src/Configuration/Configuration.php
@@ -1826,11 +1826,14 @@ private static function retrieveComposerArtifact(string $path): ?ComposerArtifac
         }
 
         try {
-            $contents = json_decode($path, true);
+            $contents = json_decode(
+                FS::getFileContents($path),
+                true,
+            );
         } catch (JsonException $exception) {
             throw new InvalidArgumentException(
                 sprintf(
-                    'Expected the file "%s" to be a valid composer.json file but an error has been found: %s',
+                    'Expected the file "%s" to be a valid JSON file but an error has been found: %s',
                     $path,
                     $exception->getMessage(),
                 ),

diff --git a/tests/Configuration/ConfigurationTest.php b/tests/Configuration/ConfigurationTest.php
@@ -18,6 +18,7 @@
 use DateTimeInterface;
 use Fidry\FileSystem\FS;
 use InvalidArgumentException;
+use JsonException;
 use KevinGH\Box\Compactor\InvalidCompactor;
 use KevinGH\Box\Compactor\NullCompactor;
 use KevinGH\Box\Compactor\Php;
@@ -34,7 +35,6 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 use RuntimeException;
-use Seld\JsonLint\ParsingException;
 use stdClass;
 use function abs;
 use function array_fill_keys;
@@ -356,17 +356,12 @@ public function test_it_throws_an_error_when_a_composer_file_is_found_but_invali
         } catch (InvalidArgumentException $exception) {
             $composerJson = $this->tmp.'/composer.json';
 
-            self::assertSame(
-                <<<EOF
-                    Expected the file "{$composerJson}" to be a valid composer.json file but an error has been found: Parse error on line 1:
-
-                    ^
-                    Expected one of: 'STRING', 'NUMBER', 'NULL', 'TRUE', 'FALSE', '{', '['
-                    EOF,
+            self::assertStringStartsWith(
+                "Expected the file \"{$composerJson}\" to be a valid JSON file but an error has been found: ",
                 $exception->getMessage(),
             );
             self::assertSame(0, $exception->getCode());
-            self::assertInstanceOf(ParsingException::class, $exception->getPrevious());
+            self::assertInstanceOf(JsonException::class, $exception->getPrevious());
         }
     }
 
@@ -381,17 +376,12 @@ public function test_it_throws_an_error_when_a_composer_lock_is_found_but_invali
         } catch (InvalidArgumentException $exception) {
             $composerLock = $this->tmp.'/composer.lock';
 
-            self::assertSame(
-                <<<EOF
-                    Expected the file "{$composerLock}" to be a valid composer.json file but an error has been found: Parse error on line 1:
-
-                    ^
-                    Expected one of: 'STRING', 'NUMBER', 'NULL', 'TRUE', 'FALSE', '{', '['
-                    EOF,
+            self::assertStringStartsWith(
+                "Expected the file \"{$composerLock}\" to be a valid JSON file but an error has been found: ",
                 $exception->getMessage(),
             );
             self::assertSame(0, $exception->getCode());
-            self::assertInstanceOf(ParsingException::class, $exception->getPrevious());
+            self::assertInstanceOf(JsonException::class, $exception->getPrevious());
         }
     }