Adapt SubFolder middleware changes (#571)

Author: rustamwin

blog-api/composer.json

@@ -60,9 +60,9 @@
         "yiisoft/translator": "^3.0",
         "yiisoft/translator-message-php": "^1.1",
         "yiisoft/user": "^2.0",
-        "yiisoft/validator": "^3.0@dev",
+        "yiisoft/validator": "^1.0",
         "yiisoft/yii-console": "^2.0",
-        "yiisoft/yii-cycle": "^3.0@dev",
+        "yiisoft/yii-cycle": "dev-master",
         "yiisoft/yii-debug": "^3.0@dev",
         "yiisoft/yii-event": "^2.0",
         "yiisoft/yii-http": "^1.0",

blog-api/config/common/bootstrap.php

@@ -2,9 +2,4 @@
 
 declare(strict_types=1);
 
-return [
-    function (Psr\Container\ContainerInterface $container) {
-        $urlGenerator = $container->get(\Yiisoft\Router\UrlGeneratorInterface::class);
-        $urlGenerator->setUriPrefix($_ENV['BASE_URL']);
-    },
-];
+return [];

blog-api/config/common/params.php

@@ -36,7 +36,7 @@
             '@root' => dirname(__DIR__, 2),
             '@assets' => '@public/assets',
             '@assetsUrl' => '@baseUrl/assets',
-            '@baseUrl' => $_ENV['BASE_URL'],
+            '@baseUrl' => '',
             '@data' => '@root/data',
             '@messages' => '@resources/messages',
             '@public' => '@root/public',

blog-api/config/web/di/application.php

@@ -26,4 +26,9 @@
             'ignoredRequests' => $params['locale']['ignoredRequests'],
         ],
     ],
+    \Yiisoft\Yii\Middleware\SubFolder::class => [
+        '__construct()' => [
+            'prefix' => !empty(trim($_ENV['BASE_URL'] ?? '', '/')) ? $_ENV['BASE_URL'] : null,
+        ],
+    ],
 ];

blog/composer.json

@@ -70,7 +70,7 @@
         "yiisoft/translator": "^3.0",
         "yiisoft/translator-message-php": "^1.1.1",
         "yiisoft/user": "^2.0",
-        "yiisoft/validator": "3.0.x-dev",
+        "yiisoft/validator": "^1.0",
         "yiisoft/var-dumper": "^1.0",
         "yiisoft/view": "^8.0",
         "yiisoft/widget": "^2.0",

blog/config/common/bootstrap.php

@@ -2,9 +2,4 @@
 
 declare(strict_types=1);
 
-return [
-    function (Psr\Container\ContainerInterface $container) {
-        $urlGenerator = $container->get(\Yiisoft\Router\UrlGeneratorInterface::class);
-        $urlGenerator->setUriPrefix($_ENV['BASE_URL']);
-    },
-];
+return [];

blog/config/common/params.php

@@ -30,7 +30,7 @@
             '@root' => dirname(__DIR__, 2),
             '@assets' => '@root/public/assets',
             '@assetsUrl' => '@baseUrl/assets',
-            '@baseUrl' => $_ENV['BASE_URL'],
+            '@baseUrl' => '',
             '@messages' => '@resources/messages',
             '@npm' => '@root/node_modules',
             '@public' => '@root/public',

blog/config/web/di/application.php

@@ -7,6 +7,7 @@
 use Yiisoft\Definitions\Reference;
 use Yiisoft\Middleware\Dispatcher\MiddlewareDispatcher;
 use Yiisoft\Yii\Middleware\Locale;
+use Yiisoft\Yii\Middleware\SubFolder;
 
 /** @var array $params */
 
@@ -26,4 +27,9 @@
             'ignoredRequests' => $params['locale']['ignoredRequests'],
         ],
     ],
+    SubFolder::class => [
+        '__construct()' => [
+            'prefix' => !empty(trim($_ENV['BASE_URL'] ?? '', '/')) ? $_ENV['BASE_URL'] : null,
+        ],
+    ],
 ];

blog/config/web/params.php

@@ -8,6 +8,7 @@
 use Yiisoft\Session\SessionMiddleware;
 use Yiisoft\User\Login\Cookie\CookieLoginMiddleware;
 use Yiisoft\Yii\Middleware\Locale;
+use Yiisoft\Yii\Middleware\SubFolder;
 use Yiisoft\Yii\Sentry\SentryMiddleware;
 
 return [
@@ -17,6 +18,7 @@
         SessionMiddleware::class,
         CookieMiddleware::class,
         CookieLoginMiddleware::class,
+        SubFolder::class,
         Locale::class,
         Router::class,
     ],