Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e176401

Browse filesBrowse files
jarnovanleeuwentaylorotwell
authored andcommitted
Fixes for Symfony 3.3 compatibility (#19404)
* Fixes for Symfony 3.3 compatibility * Update FoundationExceptionsHandlerTest.php
1 parent 92ffcb3 commit e176401
Copy full SHA for e176401

File tree

Expand file treeCollapse file tree

2 files changed

+3
-3
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+3
-3
lines changed

‎tests/Foundation/FoundationExceptionsHandlerTest.php

Copy file name to clipboardExpand all lines: tests/Foundation/FoundationExceptionsHandlerTest.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ public function testReturnsHtmlPageWithStackTraceWhenHtmlRequestAndDebugTrue()
5555
$response = $this->handler->render($this->request, new Exception('My custom error message'))->getContent();
5656

5757
$this->assertContains('<!DOCTYPE html>', $response);
58-
$this->assertContains('<h1>Whoops, looks like something went wrong.</h1>', $response);
58+
$this->assertContains('Whoops, looks like something went wrong.', $response);
5959
$this->assertContains('My custom error message', $response);
60-
$this->assertContains('::main()', $response);
6160
$this->assertNotContains('"message":', $response);
6261
}
6362

‎tests/Routing/RoutingUrlGeneratorTest.php

Copy file name to clipboardExpand all lines: tests/Routing/RoutingUrlGeneratorTest.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Illuminate\Routing\UrlGenerator;
99
use Illuminate\Routing\RouteCollection;
1010
use Illuminate\Contracts\Routing\UrlRoutable;
11+
use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
1112

1213
class RoutingUrlGeneratorTest extends TestCase
1314
{
@@ -372,7 +373,7 @@ public function testHttpsRoutesWithDomains()
372373

373374
public function testRoutesWithDomainsThroughProxy()
374375
{
375-
Request::setTrustedProxies(['10.0.0.1']);
376+
Request::setTrustedProxies(['10.0.0.1'], SymfonyRequest::HEADER_X_FORWARDED_ALL);
376377

377378
$url = new UrlGenerator(
378379
$routes = new RouteCollection,

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.