Move isWebAliasSetDynamically to RequestTrait, add isWebrootAliasSetD…

…ynamically #3798
craftcms · Feb 8, 2019 · e9e4d36 · e9e4d36
1 parent 3fc4bf8
commit e9e4d36
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/src/base/RequestTrait.php b/src/base/RequestTrait.php
@@ -19,6 +19,19 @@
  */
 trait RequestTrait
 {
+    // Properties
+    // =========================================================================
+
+    /**
+     * @var bool
+     */
+    public $isWebrootAliasSetDynamically = false;
+
+    /**
+     * @var bool
+     */
+    public $isWebAliasSetDynamically = false;
+
     // Public Methods
     // =========================================================================
 

diff --git a/src/console/Request.php b/src/console/Request.php
@@ -43,9 +43,11 @@ public function init()
                 }
             }
             Craft::setAlias('@webroot', $dir);
+            $this->isWebrootAliasSetDynamically = true;
         }
         if (Craft::getRootAlias('@web') === false) {
             Craft::setAlias('@web', '/');
+            $this->isWebAliasSetDynamically = true;
         }
     }
 

diff --git a/src/web/Request.php b/src/web/Request.php
@@ -104,11 +104,6 @@ class Request extends \yii\web\Request
      */
     private $_actionSegments;
 
-    /**
-     * @var bool
-     */
-    private $_isWebAliasSetDynamically = false;
-
     /**
      * @var bool
      */
@@ -158,10 +153,11 @@ public function init()
         // in case a site's base URL requires @web, and so we can include the host info in @web
         if (Craft::getRootAlias('@webroot') === false) {
             Craft::setAlias('@webroot', dirname($this->getScriptFile()));
+            $this->isWebrootAliasSetDynamically = true;
         }
         if (Craft::getRootAlias('@web') === false) {
             Craft::setAlias('@web', $this->getHostInfo() . $this->getBaseUrl());
-            $this->_isWebAliasSetDynamically = true;
+            $this->isWebAliasSetDynamically = true;
         }
 
         $generalConfig = Craft::$app->getConfig()->getGeneral();
@@ -453,16 +449,6 @@ public function getActionSegments()
         return $this->_actionSegments;
     }
 
-    /**
-     * Returns whether the `@web` alias is set dynamically.
-     *
-     * @return bool Whether the `@web` alias is set dynamically.
-     */
-    public function getIsWebAliasSetDynamically(): bool
-    {
-        return $this->_isWebAliasSetDynamically;
-    }
-
     /**
      * Returns whether this is a Live Preview request.
      *