fixing more tests and deprications

patrick-blom · Nov 3, 2022 · 1bccae0 · 1bccae0
1 parent c407124
commit 1bccae0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -12,6 +12,7 @@
         "ocramius/package-versions": "2.6.0",
         "symfony/apache-pack": "^1.0",
         "symfony/console": "5.4.*",
+        "symfony/doctrine-bridge": "5.4.*",
         "symfony/dotenv": "5.4.*",
         "symfony/flex": "^2.2",
         "symfony/framework-bundle": "5.4.*",

diff --git a/composer.lock b/composer.lock
diff --git a/public/index.php b/public/index.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Kernel;
-use Symfony\Component\Debug\Debug;
+use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\HttpFoundation\Request;
 
 require dirname(__DIR__).'/config/bootstrap.php';
@@ -13,7 +13,7 @@
 }
 
 if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
-    Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
+    Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_FOR ^ Request::HEADER_X_FORWARDED_HOST);
 }
 
 if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {

diff --git a/tests/Functional/Controller/UriControllerTest.php b/tests/Functional/Controller/UriControllerTest.php
@@ -72,7 +72,6 @@ public function testGetUriActionWithShortCode(): void
             ['HTTP_AUTHORIZATION' => '$ecretf0rt3st'],
             $url
         );
-
         $this->assertEquals(201, $this->client->getResponse()->getStatusCode());
 
         $shortCode = $this->client->getResponse()->getContent();
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,7 +72,6 @@ public function testGetUriActionWithShortCode(): void @@
                 ['HTTP_AUTHORIZATION' => '$ecretf0rt3st'],
                 $url
             );
             $this->assertEquals(201, $this->client->getResponse()->getStatusCode());
             $shortCode = $this->client->getResponse()->getContent();
@@ Expand Down @@