Merge pull request #3798 from carlcs/develop

Don’t warn about manually set @web

src/templates/_includes/forms.html

@@ -259,9 +259,9 @@
                     : 'This can be set to an environment variable.'|t('app'))
                     ~ ' <a href="https://docs.craftcms.com/v3/config/environments.html" class="go">' ~ 'Learn more'|t('app') ~ '</a>'
             }) %}
-        {% elseif config.warning is not defined and (value == '@web' or value[0:5] == '@web/') %}
+        {% elseif config.warning is not defined and (value == '@web' or value[0:5] == '@web/') and craft.app.request.isWebAliasSetDynamically %}
             {% set config = config|merge({
-                warning: 'The `@web` alias is not recommended.'|t('app')
+                warning: 'The `@web` alias is not recommended if it is determined automatically.'|t('app')
             }) %}
         {% endif %}
     {% endif %}

src/web/Request.php

@@ -104,6 +104,11 @@ class Request extends \yii\web\Request
      */
     private $_actionSegments;
 
+    /**
+     * @var bool
+     */
+    private $_isWebAliasSetDynamically = false;
+
     /**
      * @var bool
      */
@@ -156,6 +161,7 @@ public function init()
         }
         if (Craft::getRootAlias('@web') === false) {
             Craft::setAlias('@web', $this->getHostInfo() . $this->getBaseUrl());
+            $this->_isWebAliasSetDynamically = true;
         }
 
         $generalConfig = Craft::$app->getConfig()->getGeneral();
@@ -447,6 +453,16 @@ 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.
      *