Skip to content

Commit f83f0db

Browse files
minor #32800 Improve some URLs (Arman-Hosseini)
This PR was squashed before being merged into the 3.4 branch (closes #32800). Discussion ---------- Improve some URLs | Q | A | ------------- | --- | Branch? | 3.4 <!-- see below --> | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | N/A <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | N/A <!-- required for new features --> <!-- Replace this notice by a short README for your feature/bugfix. This will help people understand your PR and can be used as a start for the documentation. Additionally (see https://symfony.com/roadmap): - Bug fixes must be submitted against the lowest maintained branch where they apply (lowest branches are regularly merged to upper ones so they get the fixes too). - Features and deprecations must be submitted against branch 4.4. - Legacy code removals go to the master branch. --> Commits ------- fab17a4487 Improve some URLs
2 parents f3e596a + 5f3760a commit f83f0db

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public function load(array $configs, ContainerBuilder $container)
234234

235235
if ($this->isConfigEnabled($container, $config['session'])) {
236236
if (!\extension_loaded('session')) {
237-
throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://www.php.net/session.installation for instructions.');
237+
throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://php.net/session.installation for instructions.');
238238
}
239239

240240
$this->sessionConfigEnabled = true;

Templating/Helper/CodeHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function fileExcerpt($file, $line)
125125
}
126126

127127
// highlight_file could throw warnings
128-
// see https://bugs.php.net/bug.php?id=25725
128+
// see https://bugs.php.net/25725
129129
$code = @highlight_file($file, true);
130130
// remove main code/span tags
131131
$code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);

Tests/Controller/ControllerTraitTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,10 @@ public function testGenerateUrl()
425425
public function testRedirect()
426426
{
427427
$controller = $this->createController();
428-
$response = $controller->redirect('http://dunglas.fr', 301);
428+
$response = $controller->redirect('https://dunglas.fr', 301);
429429

430430
$this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $response);
431-
$this->assertSame('http://dunglas.fr', $response->getTargetUrl());
431+
$this->assertSame('https://dunglas.fr', $response->getTargetUrl());
432432
$this->assertSame(301, $response->getStatusCode());
433433
}
434434

0 commit comments

Comments
 (0)