Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
17 merge requests!8506Draft: Issue #3456536 by ibrahim tameme,!5646Issue #3350972 by nod_: [random test failure]...,!5600Issue #3350972 by nod_: [random test failure]...,!5343Issue #3305066 by quietone, Rename RedirectLeadingSlashesSubscriber,!3603#ISSUE 3346218 Add a different message on edit comment,!3555Issue #2473873: Views entity operations lack cacheability support, resulting in incorrect dropbuttons,!3494Issue #3327018 by Spokje, longwave, xjm, mondrake: Update PHPStan to 1.9.3 and...,!3410Issue #3340128: UserLoginForm::submitForm has some dead code,!3389Issue #3325184 by Spokje, andypost, xjm, smustgrave: $this->configFactory is...,!3381Issue #3332363: Refactor Claro's menus-and-lists stylesheet,!3307Issue #3326193: CKEditor 5 can grow past the viewport when there is a lot of content,!3236Issue #3332419: Refactor Claro's messages stylesheet,!3231Draft: Issue #3049525 by longwave, fougere, larowlan, kim.pepper, AaronBauman, Wim...,!3212Issue #3294003: Refactor Claro's entity-meta stylesheet,!3194Issue #3330981: Fix PHPStan L1 error "Relying on entity queries to check access by default is deprecated...",!3143Issue #3313342: [PHP 8.1] Deprecated function: strpos(): Passing null to parameter #1 LayoutBuilderUiCacheContext.php on line 28,!2972Issue #1845004: Replace custom password hashing library with PHP 5.5 password_hash()
......@@ -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>
......
......@@ -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.
......
......@@ -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',
]);
......
......@@ -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',
]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment