Remove dependency on php unit mocking hacks.

thephpleague · Oct 13, 2019 · ff1c940 · ff1c940
1 parent 90e3f83
commit ff1c940
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/tests/FlysystemStreamTests.php b/tests/FlysystemStreamTests.php
@@ -1,6 +1,9 @@
 <?php
 
+use League\Flysystem\Adapter\Local;
+use League\Flysystem\AdapterInterface;
 use League\Flysystem\Filesystem;
+use League\Flysystem\FilesystemInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 
@@ -26,7 +29,7 @@ public function testWriteStream()
      */
     public function testWriteStreamFail()
     {
-        $filesystem = new Filesystem($this->createMock('League\Flysystem\AdapterInterface'));
+        $filesystem = new Filesystem(new Local(__DIR__));
         $filesystem->writeStream('file.txt', 'not a resource');
     }
 
@@ -51,7 +54,7 @@ public function testUpdateStream()
      */
     public function testUpdateStreamFail()
     {
-        $filesystem = new Filesystem($this->createMock('League\Flysystem\AdapterInterface'));
+        $filesystem = new Filesystem(new Local(__DIR__));
         $filesystem->updateStream('file.txt', 'not a resource');
     }
 

diff --git a/tests/MountManagerTests.php b/tests/MountManagerTests.php
@@ -18,7 +18,7 @@ public function testInstantiable()
 
     public function testConstructorInjection()
     {
-        $mock = $this->createMock('League\Flysystem\FilesystemInterface');
+        $mock = $this->prophesize(FilesystemInterface::class)->reveal();
         $manager = new MountManager([
             'prefix' => $mock,
         ]);
@@ -30,8 +30,9 @@ public function testConstructorInjection()
      */
     public function testInvalidPrefix()
     {
+        $filesystem = $this->prophesize(FilesystemInterface::class)->reveal();
         $manager = new MountManager();
-        $manager->mountFilesystem(false, $this->createMock('League\Flysystem\FilesystemInterface'));
+        $manager->mountFilesystem(false, $filesystem);
     }
 
     /**

diff --git a/tests/PHPUnitHacks.php b/tests/PHPUnitHacks.php
@@ -13,22 +13,4 @@ public function expectException($exception)
 
         parent::setExpectedException($exception);
     }
-
-    /**
-     * Returns a test double for the specified class.
-     *
-     * @param string $originalClassName
-     *
-     * @return PHPUnit_Framework_MockObject_MockObject
-     *
-     * @throws PHPUnit_Framework_Exception
-     */
-    protected function createMock($originalClassName)
-    {
-        if (is_callable('parent::createMock')) {
-            return parent::createMock($originalClassName);
-        }
-
-        return $this->getMock($originalClassName);
-    }
 }
diff --git a/tests/PluginTests.php b/tests/PluginTests.php
@@ -1,5 +1,6 @@
 <?php
 
+use League\Flysystem\Adapter\Local;
 use League\Flysystem\File;
 use League\Flysystem\Filesystem;
 use League\Flysystem\FilesystemInterface;
@@ -63,7 +64,7 @@ class PluginTests extends TestCase
 
     public function setup()
     {
-        $this->filesystem = new Filesystem($this->createMock('League\Flysystem\AdapterInterface'));
+        $this->filesystem = new Filesystem(new Local(__DIR__));
     }
 
     /**