Merge pull request #6439 from CarsonF/rm-fire

Deprecated ResourceManager Completely

app/bootstrap.php

@@ -140,7 +140,7 @@
 
         // Set any non-standard paths
         foreach ((array) $config['paths'] as $name => $path) {
-            $resources->setPath($name, $path);
+            $resources->setPath($name, $path, false);
         }
 
         $resources->verify();
@@ -164,6 +164,7 @@
         'path_resolver_factory' => $pathResolverFactoryFactory,
         'path_resolver.root'    => $rootPath,
         'path_resolver.paths'   => (array) $config['paths'],
+        'resources.bootstrap'   => $config['resources'] !== null,
     ]);
 
     foreach ((array) $config['services'] as $service) {

composer.json

@@ -10,7 +10,7 @@
     ],
     "license": "MIT",
     "require": {
-        "bolt/filesystem": "^2.0",
+        "bolt/filesystem": "^2.2",
         "bolt/pathogen": "~0.6",
         "bolt/thumbs": "^3.1.1",
         "brandonwamboldt/utilphp": "^1.0",

src/Application.php

@@ -4,6 +4,7 @@
 
 use Bolt\Events\ControllerEvents;
 use Bolt\Events\MountEvent;
+use Bolt\Legacy\AppSingleton;
 use Bolt\Provider\LoggerServiceProvider;
 use Bolt\Provider\PathServiceProvider;
 use Cocur\Slugify\Bridge\Silex\SlugifyServiceProvider;
@@ -27,6 +28,9 @@ public function __construct(array $values = [])
     {
         parent::__construct();
 
+        /** @deprecated since 3.3, to be removed in 4.0. */
+        AppSingleton::set($this);
+
         /** @deprecated since 3.0, to be removed in 4.0. */
         $values['bolt_version'] = Version::VERSION;
         /** @deprecated since 3.0, to be removed in 4.0. */

src/Config.php

@@ -11,6 +11,7 @@
 use Bolt\Filesystem\Handler\JsonFile;
 use Bolt\Filesystem\Handler\ParsableInterface;
 use Bolt\Helpers\Arr;
+use Bolt\Helpers\Deprecated;
 use Bolt\Helpers\Html;
 use Bolt\Helpers\Str;
 use Bolt\Translation\Translator;
@@ -93,7 +94,7 @@ public function initialize()
         $this->fields = new Storage\Field\Manager();
         $this->defaultConfig = $this->getDefaults();
 
-        $this->cacheFile = $this->app['filesystem.cache']->getFile('config-cache.json');
+        $this->cacheFile = $this->app['filesystem']->getFile('cache://config-cache.json');
 
         $data = $this->loadCache();
         if ($data === null) {
@@ -122,7 +123,7 @@ private function loadTheme()
         }
         $this->invalidateCache();
 
-        $themeDir = $this->app['filesystem.themes']->getDir($this->get('general/theme'));
+        $themeDir = $this->app['filesystem']->getDir('themes://' . $this->get('general/theme'));
 
         $this->data['theme'] = $this->parseTheme($themeDir, $this->data['general']);
     }
@@ -137,12 +138,19 @@ private function loadTheme()
      */
     protected function parseConfigYaml($filename, DirectoryInterface $directory = null)
     {
-        $directory = $directory ?: $this->app['filesystem.config']->getDir('');
+        $directory = $directory ?: $this->app['filesystem']->getDir('config://');
 
         try {
             $file = $directory->get($filename);
         } catch (FileNotFoundException $e) {
-            return [];
+            // Copy in dist files if applicable
+            $distFiles = ['config.yml', 'contenttypes.yml', 'menu.yml', 'permissions.yml', 'routing.yml', 'taxonomy.yml'];
+            if ($directory->getMountPoint() !== 'config' || !in_array($filename, $distFiles)) {
+                return [];
+            }
+
+            $this->app['filesystem']->copy("bolt://app/config/$filename.dist", "config://$filename");
+            $file = $directory->get($filename);
         }
 
         if (!$file instanceof ParsableInterface) {
@@ -1213,6 +1221,8 @@ protected function getDefaults()
      */
     public function getTwigPath()
     {
+        Deprecated::method(3.3);
+
         $themepath = $this->app['resources']->getPath('templatespath');
 
         $twigpath = [];
@@ -1300,7 +1310,7 @@ private function isCacheValid()
         $cachedConfigTimestamp = $this->cacheFile->getTimestamp();
 
         /** @var \Bolt\Filesystem\Filesystem $configFs */
-        $configFs = $this->app['filesystem.config'];
+        $configFs = $this->app['filesystem']->getFilesystem('config');
 
         $configFiles = [
             'config.yml',
@@ -1336,7 +1346,7 @@ private function isThemeCacheValid()
             return false;
         }
 
-        $themeDir = $this->app['filesystem.themes']->getDir($this->get('general/theme'));
+        $themeDir = $this->app['filesystem']->getDir('themes://' . $this->get('general/theme'));
 
         // Check the timestamp for the theme's configuration file
         $timestampTheme = 0;
@@ -1397,6 +1407,8 @@ protected function checkValidCache()
      */
     public function getTimestamp($when)
     {
+        Deprecated::method(3.3);
+
         $timezone = $this->get('general/timezone');
         $now = date_format(new \DateTime($when, new \DateTimeZone($timezone)), 'Y-m-d H:i:s');
 
@@ -1410,6 +1422,8 @@ public function getTimestamp($when)
      */
     public function getCurrentTimestamp()
     {
+        Deprecated::method(3.3);
+
         $timezone = $this->get('general/timezone');
         $now = date_format(new \DateTime($timezone), 'Y-m-d H:i:s');
 
@@ -1436,6 +1450,8 @@ public function getCurrentTimestamp()
      */
     public function getWhichEnd()
     {
+        Deprecated::method(3.0);
+
         $zone = $this->determineZone();
         $this->app['end'] = $zone; // This is also deprecated
 

src/Configuration/Composer.php

@@ -2,6 +2,7 @@
 
 namespace Bolt\Configuration;
 
+use Bolt\Helpers\Deprecated;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -30,6 +31,8 @@ public function __construct($path, Request $request = null, PathResolverFactory
 
     public function getVerifier()
     {
+        Deprecated::method(3.3);
+
         if (! $this->verifier) {
             $this->verifier = new ComposerChecks($this);
         }

src/Configuration/LowlevelChecks.php

@@ -40,6 +40,8 @@ class LowlevelChecks
      */
     public function __construct($config = null)
     {
+        Deprecated::cls(static::class, 3.1);
+
         $this->config = $config;
         $this->magicQuotes = get_magic_quotes_gpc();
         $this->safeMode = ini_get('safe_mode');

src/Configuration/PathResolverFactory.php

@@ -73,7 +73,7 @@ public function setPaths(array $paths)
      */
     public function addPaths(array $paths)
     {
-        $this->paths = $paths + $this->paths;
+        $this->paths = array_replace($this->paths, $paths);
 
         return $this;
     }

src/Configuration/PathsProxy.php

@@ -2,6 +2,8 @@
 
 namespace Bolt\Configuration;
 
+use Bolt\Helpers\Deprecated;
+
 /**
  * Bolt\Configuration\ResourceManager::getPaths() is proxied here, which used to return a simple array.
  *
@@ -39,6 +41,13 @@ public function offsetExists($offset)
      */
     public function offsetGet($offset)
     {
+        Deprecated::warn(
+            "\$app['paths']['$offset'] in PHP and {{ paths.$offset }} in Twig",
+            3.0,
+            'Instead use UrlGenerator or Asset Packages for urls, and Bolt\Filesystem (recommended)' .
+            ' or PathResolver::resolve for filesystem paths.'
+        );
+
         try {
             return $this->resources->getRequest($offset);
         } catch (\InvalidArgumentException $e) {
@@ -62,7 +71,7 @@ public function offsetGet($offset)
      */
     public function offsetSet($offset, $value)
     {
-        throw new \LogicException('Use Bolt\Configuration\ResourceManager::setUrl() or setPath() instead.');
+        throw new \LogicException('You cannot change urls or paths.');
     }
 
     /**