Fixed #2099

craftcms · Nov 9, 2017 · a58bb47 · a58bb47
1 parent 71aa7ea
commit a58bb47
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -6,6 +6,9 @@
 ### Changed
 - The default `trustedHosts` config setting value is now `['any']`, meaning all hosts are trusted.
 
+### Fixed
+- Fixed a PHP error that occurred when running the `cache/flush-all` command. ([#2099](https://github.com/craftcms/cms/issues/2099))
+
 ## 3.0.0-beta.34 - 2017-11-09
 
 ### Added

diff --git a/src/config/app/main.php b/src/config/app/main.php
@@ -176,20 +176,6 @@
         // Dynamically configured components
         // -------------------------------------------------------------------------
 
-        'assetManager' => function() {
-            $generalConfig = Craft::$app->getConfig()->getGeneral();
-
-            $config = [
-                'class' => craft\web\AssetManager::class,
-                'basePath' => $generalConfig->resourceBasePath,
-                'baseUrl' => $generalConfig->resourceBaseUrl,
-                'fileMode' => $generalConfig->defaultFileMode,
-                'dirMode' => $generalConfig->defaultDirMode,
-            ];
-
-            return Craft::createObject($config);
-        },
-
         'cache' => function() {
             $generalConfig = Craft::$app->getConfig()->getGeneral();
 

diff --git a/src/config/app/web.php b/src/config/app/web.php
@@ -3,6 +3,17 @@
 return [
     'class' => \craft\web\Application::class,
     'components' => [
+        'assetManager' => function() {
+            $generalConfig = Craft::$app->getConfig()->getGeneral();
+            $config = [
+                'class' => craft\web\AssetManager::class,
+                'basePath' => $generalConfig->resourceBasePath,
+                'baseUrl' => $generalConfig->resourceBaseUrl,
+                'fileMode' => $generalConfig->defaultFileMode,
+                'dirMode' => $generalConfig->defaultDirMode,
+            ];
+            return Craft::createObject($config);
+        },
         'request' => function() {
             $generalConfig = Craft::$app->getConfig()->getGeneral();
             $config = [