Merge pull request #18 from kynx/renovate/all-minor-patch

Update dependency php to ~8.3.0 || ~8.4.0 || ~8.5.0

Author: kynx

composer.json

@@ -26,25 +26,24 @@
         }
     },
     "require": {
-        "php": "~8.3.0 || ~8.4.0",
+        "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
         "ext-fileinfo": "*",
         "composer-runtime-api": "^2.2",
-        "kynx/code-utils": "^2.3",
-        "kynx/mezzio-authentication-apikey": "^1.2",
+        "kynx/code-utils": "^2.4.1",
+        "kynx/mezzio-authentication-apikey": "^1.3",
         "kynx/mezzio-openapi": "^0.8",
-        "laminas/laminas-cli": "^1.7",
-        "laminas/laminas-diactoros": "^3.2",
-        "laminas/laminas-filter": "^2.30",
+        "laminas/laminas-cli": "^1.11",
+        "laminas/laminas-diactoros": "^3.6",
+        "laminas/laminas-filter": "^2.41",
         "mezzio/mezzio-authentication-basic": "^1.9",
-        "nette/php-generator": "^v4.1"
+        "nette/php-generator": "^4.2"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "^3.0",
-        "phpunit/phpunit": "^10.5.37",
-        "psalm/plugin-phpunit": "^0.19",
+        "laminas/laminas-coding-standard": "^3.1",
+        "phpunit/phpunit": "^12.5",
+        "psalm/plugin-phpunit": "^0.19.5",
         "roave/security-advisories": "dev-master",
-        "squizlabs/php_codesniffer": "^3.10",
-        "vimeo/psalm": "^5.26"
+        "vimeo/psalm": "^6.14.2"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -7,6 +7,7 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     findUnusedBaselineEntry="true"
     findUnusedCode="true"
+    ensureOverrideAttribute="false"
 >
     <projectFiles>
         <directory name="src"/>

psalm.xml

@@ -17,6 +17,7 @@
 use Nette\PhpGenerator\PhpNamespace;
 
 use function asort;
+use function assert;
 use function current;
 use function ksort;
 use function ltrim;
@@ -47,6 +48,7 @@ public function generate(
             ->setFinal();
 
         $namespace = current($file->getNamespaces());
+        assert($namespace instanceof PhpNamespace);
         $namespace->addUse(InvokableFactory::class)
             ->addUse(OpenApiConfigProvider::class)
             ->addUse(Application::class)

src/ConfigProvider/ConfigProviderGenerator.php

@@ -75,7 +75,7 @@ public static function getAlias(string $shortName): string
 
     public static function normalizePropertyName(PropertyInterface $property): string
     {
-        return preg_replace('/^\$/', '', $property->getName());
+        return (string) preg_replace('/^\$/', '', $property->getName());
     }
 
     /**
@@ -85,6 +85,6 @@ public static function formatAsList(Dumper $dumper, array $list): string
     {
         /** @psalm-suppress ImpureMethodCall */
         $dump = $dumper->dump($list);
-        return preg_replace('/^\s*\[(.*)]\s*$/s', '$1', $dump);
+        return (string) preg_replace('/^\s*\[(.*)]\s*$/s', '$1', $dump);
     }
 }

src/GeneratorUtil.php

@@ -7,8 +7,10 @@
 use Kynx\Mezzio\OpenApi\Attribute\OpenApiHandlerFactory;
 use Kynx\Mezzio\OpenApi\Serializer\SerializerInterface;
 use Nette\PhpGenerator\PhpFile;
+use Nette\PhpGenerator\PhpNamespace;
 use Psr\Container\ContainerInterface;
 
+use function assert;
 use function current;
 
 final class HandlerFactoryGenerator
@@ -26,6 +28,7 @@ public function generate(HandlerModel $handler): PhpFile
             ->addAttribute(OpenApiHandlerFactory::class, [$pointer]);
 
         $namespace = current($file->getNamespaces());
+        assert($namespace instanceof PhpNamespace);
         $namespace->addUse(ContainerInterface::class)
             ->addUse(OpenApiHandlerFactory::class)
             ->addUse($operation->getResponseFactoryClassName());

src/Handler/HandlerFactoryGenerator.php

@@ -15,6 +15,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+use function assert;
 use function current;
 
 /**
@@ -41,6 +42,7 @@ public function generate(HandlerModel $handler): PhpFile
             ->addAttribute(OpenApiHandler::class, [$pointer]);
 
         $namespace = current($file->getNamespaces());
+        assert($namespace instanceof PhpNamespace);
 
         $namespace->addUse(OpenApiHandler::class)
             ->addUse(RequestHandlerInterface::class)

src/Handler/HandlerGenerator.php

@@ -61,7 +61,10 @@ public function getProperty(
             if (count($types) > 1) {
                 return new UnionProperty($name, $originalName, $metadata, null, ...$types);
             }
-            return new SimpleProperty($name, $originalName, $metadata, array_pop($types));
+
+            $type = array_pop($types);
+            assert($type instanceof PropertyType);
+            return new SimpleProperty($name, $originalName, $metadata, $type);
         }
 
         if (! empty($schema->oneOf)) {

src/Model/Property/PropertyBuilder.php

@@ -57,7 +57,7 @@ public function getNamedSpecifications(string $baseName, array $mediaTypes): arr
 
             // add content type to name if they're not all pointing at same schema
             if ($numPointers > 1) {
-                $name = $baseName . ' ' . preg_replace('/[^a-z0-9]+/i', ' ', (string) $type);
+                $name = $baseName . ' ' . (string) preg_replace('/[^a-z0-9]+/i', ' ', (string) $type);
             } else {
                 $name = $baseName;
             }

src/Model/Schema/MediaTypeLocator.php

@@ -57,7 +57,7 @@ public function getNamedSchemas(string $baseName, Response $response): array
 
     public function normalizeHeaderName(string $name): string
     {
-        $parts = preg_split('/[^a-z0-9]+/i', strtolower($name));
+        $parts = preg_split('/[^a-z0-9]+/i', strtolower($name)) ?: [];
         return implode('', array_map('ucfirst', $parts)) . 'Header';
     }
 }