From: ArthurHoaro <arthur@hoa.ro>
Date: Tue, 22 Sep 2020 12:08:54 +0000 (+0200)
Subject: Merge pull request #1539 from ArthurHoaro/feature/manual-root-url
X-Git-Tag: v0.12.0-beta-1~12
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=98e7a59ca21b51cbd86d09cd5d217c0c8bf3db77;hp=-c;p=github%2Fshaarli%2FShaarli.git

Merge pull request #1539 from ArthurHoaro/feature/manual-root-url
---

98e7a59ca21b51cbd86d09cd5d217c0c8bf3db77
diff --combined tests/front/controller/visitor/FrontControllerMockHelper.php
index 927e7f0a,fe6ac9b0..6c53289b
--- a/tests/front/controller/visitor/FrontControllerMockHelper.php
+++ b/tests/front/controller/visitor/FrontControllerMockHelper.php
@@@ -79,8 -79,9 +79,9 @@@ trait FrontControllerMockHelpe
          $this->container->environment = [
              'SERVER_NAME' => 'shaarli',
              'SERVER_PORT' => '80',
-             'REQUEST_URI' => '/daily-rss',
+             'REQUEST_URI' => '/subfolder/daily-rss',
              'REMOTE_ADDR' => '1.2.3.4',
+             'SCRIPT_NAME' => '/subfolder/index.php',
          ];
  
          $this->container->basePath = '/subfolder';
@@@ -94,6 -95,7 +95,6 @@@
      protected function assignTemplateVars(array &$variables): void
      {
          $this->container->pageBuilder
 -            ->expects(static::atLeastOnce())
              ->method('assign')
              ->willReturnCallback(function ($key, $value) use (&$variables) {
                  $variables[$key] = $value;