Revert "[10.x] add Storage::json() method to read and decode a json f…

…ile (#46548)" This reverts commit 706a076.
laravel · Mar 23, 2023 · 33db631 · 33db631
1 parent 3a1201b
commit 33db631
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 31 deletions.
diff --git a/src/Illuminate/Filesystem/Filesystem.php b/src/Illuminate/Filesystem/Filesystem.php
@@ -63,15 +63,14 @@ public function get($path, $lock = false)
      * Get the contents of a file as decoded JSON.
      *
      * @param  string  $path
-     * @param  int  $flags
      * @param  bool  $lock
      * @return array
      *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function json($path, $flags = 0, $lock = false)
+    public function json($path, $lock = false)
     {
-        return json_decode($this->get($path, $lock), true, 512, $flags);
+        return json_decode($this->get($path, $lock), true);
     }
 
     /**

diff --git a/src/Illuminate/Filesystem/FilesystemAdapter.php b/src/Illuminate/Filesystem/FilesystemAdapter.php
@@ -262,20 +262,6 @@ public function get($path)
         }
     }
 
-    /**
-     * Get the contents of a file as decoded JSON.
-     *
-     * @param  string  $path
-     * @param  int  $flags
-     * @return array|null
-     */
-    public function json($path, $flags = 0)
-    {
-        $content = $this->get($path);
-
-        return is_null($content) ? null : json_decode($content, true, 512, $flags);
-    }
-
     /**
      * Create a streamed response for a given file.
      *

diff --git a/tests/Filesystem/FilesystemAdapterTest.php b/tests/Filesystem/FilesystemAdapterTest.php
@@ -184,20 +184,6 @@ public function testGetFileNotFound()
         $this->assertNull($filesystemAdapter->get('file.txt'));
     }
 
-    public function testJsonReturnsDecodedJsonData()
-    {
-        $this->filesystem->write('file.json', '{"foo": "bar"}');
-        $filesystemAdapter = new FilesystemAdapter($this->filesystem, $this->adapter);
-        $this->assertSame(['foo' => 'bar'], $filesystemAdapter->json('file.json'));
-    }
-
-    public function testJsonReturnsNullIfJsonDataIsInvalid()
-    {
-        $this->filesystem->write('file.json', '{"foo":');
-        $filesystemAdapter = new FilesystemAdapter($this->filesystem, $this->adapter);
-        $this->assertNull($filesystemAdapter->json('file.json'));
-    }
-
     public function testMimeTypeNotDetected()
     {
         $this->filesystem->write('unknown.mime-type', '');