Verified Commit 31d4a1a1 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2341553 by GoZ, DuaelFr, smustgrave, Prashant.c, Rajender Rajan,... 

Issue #2341553 by GoZ, DuaelFr, smustgrave, Prashant.c, Rajender Rajan, Lendude, marvin_B8, voleger, dawehner: Use routing to generate update.php url

(cherry picked from commit 2a9221d5)
parent fcf7e662

core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ public function __construct(TranslationInterface $string_translation) { 
    $title = $this->t('Drupal already installed');

    $replacements = [

      ':base-url' => $GLOBALS['base_url'],

      // We cannot use the route system.db_update here because we are too early

      // in the execution stack.

      ':update-url' => $GLOBALS['base_path'] . 'update.php',

    ];

    $message = $this->t('<ul>

core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\Tests\locale\Functional;



use Drupal\Core\Url;

use Drupal\language\Entity\ConfigurableLanguage;

use Drupal\Tests\BrowserTestBase;

use Drupal\Tests\RequirementsPageTrait;
@@ -71,7 +72,7 @@ public function testTranslatedUpdate() { 
    // Visit the update page to collect any strings that may be translatable.

    $user = $this->drupalCreateUser(['administer software updates']);

    $this->drupalLogin($user);

    $update_url = $GLOBALS['base_url'] . '/update.php';

    $update_url = Url::fromRoute('system.db_update')->setAbsolute()->toString();



    // Collect strings from the PHP warning page, if applicable, as well as the

    // main update page.

core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\Tests\system\Functional\UpdateSystem;



use Drupal\Core\Url;

use Drupal\Tests\BrowserTestBase;

use Drupal\Tests\RequirementsPageTrait;
@@ -52,7 +53,7 @@ protected function setUp(): void { 
    parent::setUp();

    require_once $this->root . '/core/includes/update.inc';



    $this->updateUrl = $GLOBALS['base_url'] . '/update.php';

    $this->updateUrl = Url::fromRoute('system.db_update')->setAbsolute()->toString();

    $this->updateUser = $this->drupalCreateUser([

      'administer software updates',

    ]);

core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\Tests\system\Functional\UpdateSystem;



use Drupal\Core\Url;

use Drupal\Tests\BrowserTestBase;

use Drupal\Tests\RequirementsPageTrait;
@@ -45,7 +46,7 @@ class UpdatesWith7xTest extends BrowserTestBase { 
  protected function setUp(): void {

    parent::setUp();

    require_once $this->root . '/core/includes/update.inc';

    $this->updateUrl = $GLOBALS['base_url'] . '/update.php';

    $this->updateUrl = Url::fromRoute('system.db_update')->setAbsolute()->toString();

    $this->updateUser = $this->drupalCreateUser([

      'administer software updates',

    ]);