refactor(phpstan): Enable "inferPrivatePropertyTypeFromConstructor" p…

…arameter

- Fix issues found by phpstan after enabling "inferPrivatePropertyTypeFromConstructor" parameter
- Upgrade dependencies

composer.json

@@ -74,7 +74,7 @@
             "php tests/Fixtures/Symfony/app/console --ansi"
         ],
         "static-analyse-src": [
-            "phpstan analyze src -l 7 --ansi"
+            "phpstan analyze src -l 7 -c phpstan.neon.dist --ansi"
         ],
         "static-analyse-tests": [
             "phpstan analyze tests -l 4 -c phpstan.tests.neon --ansi"
@@ -84,9 +84,7 @@
         ],
         "analyse": [
             "@static-analyse-src",
-            "",
             "@static-analyse-tests",
-            "",
             "@cs-analyse"
         ],
         "test": [

phpstan.neon.dist

@@ -1,5 +1,6 @@
 parameters:
+    inferPrivatePropertyTypeFromConstructor: true
     excludes_analyse:
+        - src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php
     ignoreErrors:
         # Put false positives here
-        - '#Parameter \#2 \$callback of method Swoole\\Server::on\(\) expects callable\(\): mixed, array\(mixed, .{1}handle.{1}\) given#'

phpstan.tests.neon

@@ -1,4 +1,5 @@
 parameters:
+    inferPrivatePropertyTypeFromConstructor: true
     excludes_analyse:
         - tests/Fixtures/Symfony/app/var
         - tests/Fixtures/Symfony/app/TestAppKernel

src/Bridge/Symfony/Bundle/Command/ServerReloadCommand.php

@@ -4,6 +4,7 @@
 
 namespace K911\Swoole\Bridge\Symfony\Bundle\Command;
 
+use Assert\Assertion;
 use K911\Swoole\Server\HttpServer;
 use K911\Swoole\Server\HttpServerConfiguration;
 use Symfony\Component\Console\Command\Command;
@@ -51,7 +52,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
-        $this->serverConfiguration->daemonize($input->getOption('pid-file'));
+        $pidFile = $input->getOption('pid-file');
+        Assertion::nullOrString($pidFile);
+
+        $this->serverConfiguration->daemonize($pidFile);
 
         try {
             $this->server->reload();

src/Bridge/Symfony/Bundle/Command/ServerStopCommand.php

@@ -4,6 +4,7 @@
 
 namespace K911\Swoole\Bridge\Symfony\Bundle\Command;
 
+use Assert\Assertion;
 use K911\Swoole\Server\HttpServer;
 use K911\Swoole\Server\HttpServerConfiguration;
 use Symfony\Component\Console\Command\Command;
@@ -51,7 +52,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
-        $this->serverConfiguration->daemonize($input->getOption('pid-file'));
+        $pidFile = $input->getOption('pid-file');
+        Assertion::nullOrString($pidFile);
+
+        $this->serverConfiguration->daemonize($pidFile);
 
         try {
             $this->server->shutdown();

src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php

@@ -29,11 +29,7 @@ public function __construct(TreeBuilder $builder)
      */
     public function getConfigTreeBuilder(): TreeBuilder
     {
-        $rootNode = \method_exists($this->builder, 'getRootNode') ?
-            $this->builder->getRootNode() :
-            $this->builder->root(self::CONFIG_NAME);
-
-        $rootNode
+        $this->builder->getRootNode()
             ->children()
                 ->arrayNode('http_server')
                     ->addDefaultsIfNotSet()

src/Bridge/Symfony/HttpFoundation/CloudFrontRequestFactory.php

@@ -25,7 +25,9 @@ public function make(SwooleRequest $request): HttpFoundationRequest
     {
         $httpFoundationRequest = $this->decorated->make($request);
         if ($httpFoundationRequest->headers->has('cloudfront_forwarded_proto')) {
-            $httpFoundationRequest->headers->set('x_forwarded_proto', $httpFoundationRequest->headers->get('cloudfront_forwarded_proto'));
+            /** @var string|string[] $cloudFrontForwardedProto */
+            $cloudFrontForwardedProto = $httpFoundationRequest->headers->get('cloudfront_forwarded_proto');
+            $httpFoundationRequest->headers->set('x_forwarded_proto', $cloudFrontForwardedProto);
         }
 
         return $httpFoundationRequest;

src/Bridge/Symfony/HttpKernel/DebugHttpKernelRequestHandler.php

@@ -10,6 +10,8 @@
 use Swoole\Http\Response;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\HttpKernel\Profiler\Profiler;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 final class DebugHttpKernelRequestHandler implements RequestHandlerInterface
 {
@@ -37,10 +39,13 @@ public function handle(Request $request, Response $response): void
 
         if ($this->kernel->isDebug()) {
             if ($this->container->has('debug.stopwatch')) {
-                $this->container->get('debug.stopwatch')->reset();
+                /** @var Stopwatch $stopwatch */
+                $stopwatch = $this->container->get('debug.stopwatch');
+                $stopwatch->reset();
             }
 
             if ($this->container->has('profiler')) {
+                /** @var Profiler $profiler */
                 $profiler = $this->container->get('profiler');
                 $profiler->reset();
                 $profiler->enable();

src/Server/HttpServerConfiguration.php

@@ -108,7 +108,7 @@ public function servingStaticContent(): bool
 
     public function hasPublicDir(): bool
     {
-        return isset($this->settings[self::SWOOLE_HTTP_SERVER_CONFIG_PUBLIC_DIR]);
+        return !empty($this->settings[self::SWOOLE_HTTP_SERVER_CONFIG_PUBLIC_DIR]);
     }
 
     /**
@@ -203,11 +203,11 @@ public function getServerSocket(): Socket
     /**
      * @throws \Assert\AssertionFailedException
      *
-     * @return null|string
+     * @return string
      */
-    public function getPublicDir(): ?string
+    public function getPublicDir(): string
     {
-        Assertion::keyIsset($this->settings, self::SWOOLE_HTTP_SERVER_CONFIG_PUBLIC_DIR, 'Setting "%s" is not set.');
+        Assertion::true($this->hasPublicDir(), \sprintf('Setting "%s" is not set or empty.', self::SWOOLE_HTTP_SERVER_CONFIG_PUBLIC_DIR));
 
         return $this->settings[self::SWOOLE_HTTP_SERVER_CONFIG_PUBLIC_DIR];
     }

src/Server/RequestHandler/AdvancedStaticFilesServer.php

@@ -87,9 +87,13 @@ final class AdvancedStaticFilesServer implements RequestHandlerInterface, Bootab
     ];
 
     private $decorated;
-    private $cachedMimeTypes;
     private $configuration;
 
+    /**
+     * @var array<string,string>
+     */
+    private $cachedMimeTypes;
+
     /**
      * @var string
      */