Bump php from 8.0-alpine to 8.1.0-alpine (#75)

Author: dependabot[bot]

Dockerfile

@@ -1,19 +1,19 @@
 # Image page: <https://hub.docker.com/_/php>
-FROM php:8.0-alpine
+FROM php:8.1.0-alpine
 
 ENV COMPOSER_HOME="/tmp/composer"
 
 # Image page: <https://hub.docker.com/_/composer>
-COPY --from=composer:2.1.3 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2.1.14 /usr/bin/composer /usr/bin/composer
 
 # Image page: <https://hub.docker.com/r/spiralscout/roadrunner>
-COPY --from=spiralscout/roadrunner:2.3.1 /usr/bin/rr /usr/bin/rr
+COPY --from=spiralscout/roadrunner:2.6.1 /usr/bin/rr /usr/bin/rr
 
 RUN set -x \
     && apk add --no-cache binutils git \
     && apk add --no-cache --virtual .build-deps autoconf pkgconf make g++ gcc 1>/dev/null \
     # install xdebug (for testing with code coverage), but do not enable it
-    && pecl install xdebug-3.0.4 1>/dev/null \
+    && pecl install xdebug-3.1.2 1>/dev/null \
     && docker-php-ext-install sockets pcntl \
     && apk del .build-deps \
     && mkdir --parents --mode=777 /src ${COMPOSER_HOME}/cache/repo ${COMPOSER_HOME}/cache/files \

composer.json

@@ -49,7 +49,7 @@
         "laravel/socialite": "^5.0",
         "laravel/telescope": "^4.5",
         "mockery/mockery": "^1.3.2",
-        "phpstan/phpstan": "~0.12.80",
+        "phpstan/phpstan": "~1.2",
         "phpunit/phpunit": "^8.0 || ^9.3",
         "livewire/livewire": "^2.7"
     },

helpers/helpers.php

@@ -7,6 +7,7 @@
 use Illuminate\Container\Container;
 use Spiral\RoadRunner\Http\PSR7Worker;
 use Spiral\RoadRunnerLaravel\Dumper\Dumper;
+use Illuminate\Contracts\Container\BindingResolutionException;
 
 if (!\function_exists('\\rr\\dump')) {
     /**
@@ -59,10 +60,16 @@ function dd(...$vars): void
      *
      * @return PSR7Worker
      *
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException If called outside of RR worker context
+     * @throws BindingResolutionException If called outside of RR worker context
      */
     function worker(): PSR7Worker
     {
-        return Container::getInstance()->make(PSR7Worker::class);
+        $worker = Container::getInstance()->make(PSR7Worker::class);
+
+        if ($worker instanceof PSR7Worker) {
+            return $worker;
+        }
+
+        throw new BindingResolutionException;
     }
 }

src/Console/Commands/StartCommand.php

@@ -30,8 +30,6 @@ class StartCommand extends \Symfony\Component\Console\Command\Command
 
     /**
      * Create a new command instance.
-     *
-     * @var string|null $laravel_base_path
      */
     public function __construct(?string $laravel_base_path = null)
     {

src/Dumper/Exceptions/DumperException.php

@@ -82,14 +82,21 @@ public function render(?Request $request = null): Response
 
         if ($this->stack->count() > 0) {
             foreach ($this->stack->all() as $item) {
-                /* @var \Symfony\Component\VarDumper\Cloner\Data $item */
-                $content = $this->renderer->dump($item, true) . \PHP_EOL . $content;
+                if ($item instanceof \Symfony\Component\VarDumper\Cloner\Data) {
+                    $content = $this->renderer->dump($item, true) . \PHP_EOL . $content;
+                }
             }
         } else {
             $content .= '(╯°□°)╯︵ ┻━┻';
         }
 
-        return new Response($this->generateView($content), $this->getCode());
+        $code = Response::HTTP_INTERNAL_SERVER_ERROR;
+
+        if (\is_int($current_code = $this->getCode())) {
+            $code = $current_code;
+        }
+
+        return new Response($this->generateView($content), $code);
     }
 
     /**

src/Dumper/Middleware.php

@@ -48,8 +48,9 @@ public function handle(Request $request, Closure $next)
             $dumped = '';
 
             foreach ($this->stack->all() as $item) {
-                /* @var \Symfony\Component\VarDumper\Cloner\Data $item */
-                $dumped = $this->renderer->dump($item, true) . \PHP_EOL . $dumped;
+                if ($item instanceof \Symfony\Component\VarDumper\Cloner\Data) {
+                    $dumped = $this->renderer->dump($item, true) . \PHP_EOL . $dumped;
+                }
             }
 
             $response->setContent($dumped . $response->getContent());

src/Listeners/ClearInstancesListener.php

@@ -24,7 +24,9 @@ public function handle($event): void
 
             if ($app instanceof Container) {
                 /** @var ConfigRepository $config */
-                $config    = $app->make(ConfigRepository::class);
+                $config = $app->make(ConfigRepository::class);
+
+                /** @var array<string> $abstracts */
                 $abstracts = (array) $config->get(ServiceProvider::getConfigRootKey() . '.clear', []);
 
                 foreach ($abstracts as $abstract) {

src/Listeners/CloneConfigListener.php

@@ -20,7 +20,10 @@ public function handle($event): void
         if ($event instanceof WithApplication) {
             $app = $event->application();
 
-            $app->instance('config', clone $app->make(ConfigRepository::class));
+            /** @var ConfigRepository $config */
+            $config = $app->make(ConfigRepository::class);
+
+            $app->instance('config', clone $config);
         }
     }
 }

src/Listeners/FlushArrayCacheListener.php

@@ -31,8 +31,8 @@ public function handle($event): void
             /** @var CacheManager $cache_manager */
             $cache_manager = $app->make($cache_abstract);
 
-            foreach ($config->get('cache.stores') as $name => $options) {
-                if (($options['driver'] ?? '') === 'array') {
+            foreach ((array) $config->get('cache.stores') as $name => $options) {
+                if (\is_array($options) && ($options['driver'] ?? '') === 'array') {
                     $cache_manager->store($name)->getStore()->flush();
                 }
             }

src/Listeners/RebindMailManagerListener.php

@@ -31,7 +31,7 @@ public function handle($event): void
                 return;
             }
 
-            /* @var MailManager $mail_manager */
+            /** @var MailManager $mail_manager */
             $mail_manager = $app->make($mail_manager_abstract);
 
             /**