Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

merge-requests/2653/head
Alex Pott 2022-09-29 18:01:55 +01:00
parent c58a486d8f
commit 2a9221d556
No known key found for this signature in database
GPG Key ID: BDA67E7EE836E5CE
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php
View File

@ -21,6 +21,8 @@ class AlreadyInstalledException extends InstallerException {
$title = $this->t('Drupal already installed'); $title = $this->t('Drupal already installed');
$replacements = [ $replacements = [
':base-url' => $GLOBALS['base_url'], ':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', ':update-url' => $GLOBALS['base_path'] . 'update.php',
]; ];
$message = $this->t('<ul> $message = $this->t('<ul>

3
core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
View File

@ -2,6 +2,7 @@
namespace Drupal\Tests\locale\Functional; namespace Drupal\Tests\locale\Functional;
use Drupal\Core\Url;
use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\Tests\BrowserTestBase; use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\RequirementsPageTrait; use Drupal\Tests\RequirementsPageTrait;
@ -71,7 +72,7 @@ class LocaleTranslatedSchemaDefinitionTest extends BrowserTestBase {
// Visit the update page to collect any strings that may be translatable. // Visit the update page to collect any strings that may be translatable.
$user = $this->drupalCreateUser(['administer software updates']); $user = $this->drupalCreateUser(['administer software updates']);
$this->drupalLogin($user); $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 // Collect strings from the PHP warning page, if applicable, as well as the
// main update page. // main update page.

3
core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php
View File

@ -2,6 +2,7 @@
namespace Drupal\Tests\system\Functional\UpdateSystem; namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Core\Url;
use Drupal\Tests\BrowserTestBase; use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\RequirementsPageTrait; use Drupal\Tests\RequirementsPageTrait;
@ -52,7 +53,7 @@ class InvalidUpdateHookTest extends BrowserTestBase {
parent::setUp(); parent::setUp();
require_once $this->root . '/core/includes/update.inc'; 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([ $this->updateUser = $this->drupalCreateUser([
'administer software updates', 'administer software updates',
]); ]);

3
core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php
View File

@ -2,6 +2,7 @@
namespace Drupal\Tests\system\Functional\UpdateSystem; namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Core\Url;
use Drupal\Tests\BrowserTestBase; use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\RequirementsPageTrait; use Drupal\Tests\RequirementsPageTrait;
@ -45,7 +46,7 @@ class UpdatesWith7xTest extends BrowserTestBase {
protected function setUp(): void { protected function setUp(): void {
parent::setUp(); parent::setUp();
require_once $this->root . '/core/includes/update.inc'; 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([ $this->updateUser = $this->drupalCreateUser([
'administer software updates', 'administer software updates',
]); ]);