Merge pull request #6441 from CarsonF/bugfix/whoops-rm-usage

What's a ResourceManager?
bolt · Mar 2, 2017 · 5e8538d · 5e8538d
2 parents 60a3747 + 6548b2e
commit 5e8538d
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 32 deletions.
diff --git a/src/Cache.php b/src/Cache.php
@@ -6,7 +6,6 @@
 use Bolt\Filesystem\Exception\IOException;
 use Bolt\Filesystem\Handler\DirectoryInterface;
 use Bolt\Filesystem\Handler\HandlerInterface;
-use Bolt\Legacy\Deprecation;
 use Doctrine\Common\Cache\FilesystemCache;
 
 /**

diff --git a/src/Provider/UploadServiceProvider.php b/src/Provider/UploadServiceProvider.php
@@ -59,8 +59,7 @@ function () use ($app) {
         );
 
         // This allows multiple upload locations, all prefixed with a namespace. The default is /files
-        // Note, if you want to provide an alternative namespace, you must set a path on the $app['resources']
-        // service
+        // Note, this must be a name of a mounted filesystem (see FilesystemServiceProvider)
         $app['upload.namespace'] = 'files';
 
         // This gets prepended to all file saves, can be reset to "" or add your own closure for more complex ones.

diff --git a/tests/phpunit/unit/BoltUnitTest.php b/tests/phpunit/unit/BoltUnitTest.php
@@ -6,14 +6,14 @@
 use Bolt\AccessControl\Permissions;
 use Bolt\AccessControl\Token;
 use Bolt\Application;
-use Bolt\Cache;
 use Bolt\Configuration as Config;
 use Bolt\Legacy\Storage;
 use Bolt\Logger\FlashLogger;
 use Bolt\Logger\Manager;
 use Bolt\Storage\Entity;
 use Bolt\Tests\Mocks\LoripsumMock;
 use Bolt\Users;
+use Doctrine\Common\Cache\VoidCache;
 use GuzzleHttp\Client;
 use Monolog\Logger;
 use PHPUnit_Framework_MockObject_MockObject;
@@ -334,27 +334,12 @@ protected function getMockAccessChecker($app, $methods = ['isValidSession'])
     }
 
     /**
-     * @param null $path
-     *
-     * @return Cache|PHPUnit_Framework_MockObject_MockObject
+     * @return VoidCache|PHPUnit_Framework_MockObject_MockObject
      */
-    protected function getMockCache($path = null)
+    protected function getMockCache()
     {
-        $app = $this->getApp();
-        if ($path === null) {
-            $path = $app['resources']->getPath('cache');
-        }
-
-        $params = [
-            $path,
-            Cache::EXTENSION,
-            0002,
-            $app['filesystem'],
-        ];
-
-        return $this->getMockBuilder(Cache::class)
+        return $this->getMockBuilder(VoidCache::class)
             ->setMethods(['flushAll'])
-            ->setConstructorArgs($params)
             ->getMock()
         ;
     }

diff --git a/tests/phpunit/unit/Composer/Action/DumpAutoloadTest.php b/tests/phpunit/unit/Composer/Action/DumpAutoloadTest.php
@@ -1,8 +1,6 @@
 <?php
 namespace Bolt\Tests\Composer\Action;
 
-use Bolt\Composer\Action\DumpAutoload;
-
 /**
  * Class to test src/Composer/Action/DumpAutoload.
  *
@@ -13,9 +11,9 @@ class DumpAutoloadTest extends ActionUnitTest
     public function testConstruct()
     {
         $app = $this->getApp();
-        $autoload = $app['resources']->getPath('extensionspath/vendor/autoload.php');
+        $autoload = $app['path_resolver']->resolve('%extensions%/vendor/autoload.php');
         @unlink($autoload);
         $app['extend.action']['autoload']->execute();
-        $this->assertTrue(is_readable($app['resources']->getPath('extensionspath/vendor/autoload.php')));
+        $this->assertTrue(is_readable($autoload));
     }
 }
diff --git a/tests/phpunit/unit/Controller/Backend/GeneralTest.php b/tests/phpunit/unit/Controller/Backend/GeneralTest.php
@@ -181,7 +181,7 @@ public function testTranslation()
         $this->assertTrue($response instanceof RedirectResponse);
         $this->assertTrue($response->isRedirect('/bolt/tr/contenttypes/en_CY'));
 
-        $this->rmdir($this->getService('resources')->getPath('app/resources/translations/en_CY'));
+        $this->rmdir($this->getService('path_resolver')->resolve('%app%/resources/translations/en_CY'));
 
         // Check that YML parse errors get caught
         $this->setRequest(Request::create(

diff --git a/tests/phpunit/unit/Nut/CacheClearTest.php b/tests/phpunit/unit/Nut/CacheClearTest.php
@@ -27,7 +27,7 @@ public function testSuccessfulClear()
     public function testWithFailures()
     {
         $app = $this->getApp();
-        $app['cache'] = $this->getMockCache(null, false);
+        $app['cache'] = $this->getMockCache(false);
         $command = new CacheClear($app);
         $tester = new CommandTester($command);
 
@@ -36,9 +36,9 @@ public function testWithFailures()
         $this->assertRegExp('/Failed to clear cache/', $result);
     }
 
-    protected function getMockCache($path = null, $flushResult = true)
+    protected function getMockCache($flushResult = true)
     {
-        $cache = parent::getMockCache($path);
+        $cache = parent::getMockCache();
         $cache->expects($this->once())
             ->method('flushAll')
             ->will($this->returnValue($flushResult))

diff --git a/tests/phpunit/unit/Nut/ConfigGetTest.php b/tests/phpunit/unit/Nut/ConfigGetTest.php
@@ -39,7 +39,6 @@ public function testDefaultFile()
 
         $command = new ConfigGet($app);
         $tester = new CommandTester($command);
-        $app['resources']->setPath('config', PHPUNIT_ROOT . '/resources');
         $tester->execute(['key' => 'sitename']);
         $this->assertEquals("sitename: A sample site\n", $tester->getDisplay());
     }

diff --git a/tests/phpunit/unit/Nut/ConfigSetTest.php b/tests/phpunit/unit/Nut/ConfigSetTest.php
@@ -40,7 +40,6 @@ public function testDefaultFile()
 
         $command = new ConfigSet($app);
         $tester = new CommandTester($command);
-        $app['resources']->setPath('config', PHPUNIT_ROOT . '/resources');
         $tester->execute(['key' => 'nonexistent', 'value' => 'test']);
         $this->assertEquals("The key 'nonexistent' was not found in config.yml.\n", $tester->getDisplay());
     }