Merge branch 'master' into dependabot/composer/phpstan/phpstan-1.10.37

slimphp · Oct 3, 2023 · e5355c1 · e5355c1
2 parents e31a947 + 5903f67
commit e5355c1
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 46 deletions.
diff --git a/composer.json b/composer.json
@@ -42,9 +42,9 @@
     },
     "require-dev": {
         "adriansuter/php-autoload-override": "^1.4",
-        "laminas/laminas-diactoros": "^2.18.1",
-        "nyholm/psr7": "^1.7",
-        "php-http/psr7-integration-tests": "1.1.1",
+        "laminas/laminas-diactoros": "^3.1.0",
+        "nyholm/psr7": "^1.8.0",
+        "php-http/psr7-integration-tests": "^1.3.0",
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^9.6",
         "doctrine/instantiator": "^1.3.1",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/Psr7Integration/Laminas/ServerRequestTest.php b/tests/Psr7Integration/Laminas/ServerRequestTest.php
@@ -22,6 +22,10 @@
 
 class ServerRequestTest extends ServerRequestIntegrationTest
 {
+    protected $skippedTests = [
+        'testUriPreserveHost_NoHost_Host' => 'laminas-diactoros is not compliant.'
+    ];
+
     public static function setUpBeforeClass(): void
     {
         if (!defined('URI_FACTORY')) {

diff --git a/tests/Psr7Integration/Nyholm/ServerRequestTest.php b/tests/Psr7Integration/Nyholm/ServerRequestTest.php
@@ -20,6 +20,10 @@
 
 class ServerRequestTest extends ServerRequestIntegrationTest
 {
+    protected $skippedTests = [
+        'testUriPreserveHost_NoHost_Host' => 'Nyholm Psr-7 is not compliant.'
+    ];
+
     public static function setUpBeforeClass(): void
     {
         if (!defined('URI_FACTORY')) {

diff --git a/tests/UriTest.php b/tests/UriTest.php
@@ -12,7 +12,9 @@
 
 use InvalidArgumentException;
 use Slim\Http\Factory\DecoratedUriFactory;
+use Slim\Tests\Http\Providers\LaminasDiactorosPsr17FactoryProvider;
 use Slim\Tests\Http\Providers\Psr17FactoryProvider;
+use TypeError;
 
 use function property_exists;
 
@@ -244,14 +246,19 @@ public function testWithPortInvalidInt()
 
     public function testWithPortInvalidString()
     {
-        $this->expectException(InvalidArgumentException::class);
-
         foreach ($this->factoryProviders as $factoryProvider) {
             /** @var Psr17FactoryProvider $provider */
             $provider = new $factoryProvider();
             $decoratedUriFactory = new DecoratedUriFactory($provider->getUriFactory());
 
             $uri = $decoratedUriFactory->createUri('https://google.com');
+
+            if ($factoryProvider === LaminasDiactorosPsr17FactoryProvider::class) {
+                $this->expectException(TypeError::class);
+            } else {
+                $this->expectException(InvalidArgumentException::class);
+            }
+
             $uri->withPort('invalid');
         }
     }