]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #1539 from ArthurHoaro/feature/manual-root-url
authorArthurHoaro <arthur@hoa.ro>
Tue, 22 Sep 2020 12:08:54 +0000 (14:08 +0200)
committerGitHub <noreply@github.com>
Tue, 22 Sep 2020 12:08:54 +0000 (14:08 +0200)
1  2 
tests/front/controller/visitor/FrontControllerMockHelper.php

index 927e7f0a15eef7acda822afc5ef1eaf6322e3571,fe6ac9b0c246241d16053d7a77546d5daed234e3..6c53289bd01c83ba018003e2bf4dc32a27da1139
@@@ -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;