chore: Code cleanup (#112)

Author: tarampampam

CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
 
+## v5.11.0
+
+### Added
+
+- Listener `FlushDatabaseQueryDurationListener` [#112]
+- Listener `RebindPaginatorListener` [#112]
+
+### Changed
+
+- Methods invoking in listeners replaced with normal function calls [#112]
+
+[#112]:https://github.com/spiral/roadrunner-laravel/pull/112
+
 ## v5.10.0
 
 ### Added

src/Defaults.php

@@ -45,6 +45,7 @@ public static function beforeLoopIteration(): array
             Listeners\RebindPipelineHubListener::class,
             Listeners\RebindQueueManagerListener::class,
             Listeners\RebindValidationFactoryListener::class,
+            Listeners\RebindPaginatorListener::class,
             Listeners\UnqueueCookiesListener::class,
             Listeners\FlushAuthenticationStateListener::class,
             Listeners\ResetSessionListener::class,
@@ -102,6 +103,7 @@ public static function afterLoopIteration(): array
             Listeners\FlushTranslatorCacheListener::class,
             Listeners\ResetDatabaseRecordModificationStateListener::class,
             Listeners\FlushDatabaseQueryLogListener::class,
+            Listeners\FlushDatabaseQueryDurationListener::class,
             Listeners\ClearInstancesListener::class,
         ];
     }

src/Listeners/ClearInstancesListener.php

@@ -23,6 +23,8 @@ public function handle($event): void
             $app = $event->application();
 
             if ($app instanceof Container) {
+                $app->forgetScopedInstances();
+
                 /** @var ConfigRepository $config */
                 $config = $app->make(ConfigRepository::class);
 

src/Listeners/FlushAuthenticationStateListener.php

@@ -34,25 +34,8 @@ public function handle($event): void
             /** @var \Illuminate\Auth\AuthManager $auth */
             $auth = $app->make($auth_abstract);
 
-            /**
-             * Method `setApplication` for the Auth Manager available since Laravel v8.35.0.
-             *
-             * @link https://git.io/JsgTx Source code (v8.35.0)
-             * @see  \Illuminate\Auth\AuthManager::setApplication()
-             */
-            if (! $this->invokeMethod($auth, 'setApplication', $app)) {
-                $this->setProperty($auth, 'app', $app);
-            }
-
-            /**
-             * Method `forgetGuards` for the Auth Manager available since Laravel v8.35.0.
-             *
-             * @link https://git.io/Jsgkt Source code (v8.35.0)
-             * @see  \Illuminate\Auth\AuthManager::forgetGuards()
-             */
-            if (! $this->invokeMethod($auth, 'forgetGuards')) {
-                $this->setProperty($auth, 'guards', []);
-            }
+            $auth->setApplication($app);
+            $auth->forgetGuards();
         }
     }
 }

src/Listeners/FlushDatabaseQueryDurationListener.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spiral\RoadRunnerLaravel\Listeners;
+
+use Illuminate\Database\Connection;
+use Illuminate\Database\DatabaseManager;
+use Spiral\RoadRunnerLaravel\Events\Contracts\WithApplication;
+
+/**
+ * @link https://github.com/laravel/octane/blob/1.x/src/Listeners/RefreshQueryDurationHandling.php
+ */
+class FlushDatabaseQueryDurationListener implements ListenerInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function handle($event): void
+    {
+        if ($event instanceof WithApplication) {
+            $app = $event->application();
+
+            if (!$app->resolved($database_abstract = 'db')) {
+                return;
+            }
+
+            /** @var DatabaseManager $database_manager */
+            $database_manager = $app->make($database_abstract);
+
+            foreach ($database_manager->getConnections() as $connection) {
+                if ($connection instanceof Connection) {
+                    $connection->resetTotalQueryDuration();
+                    $connection->allowQueryDurationHandlersToRunAgain();
+                }
+            }
+        }
+    }
+}

src/Listeners/FlushLogContextListener.php

@@ -28,16 +28,11 @@ public function handle($event): void
             /** @var \Illuminate\Log\LogManager $log_manager */
             $log_manager = $app->make($log_abstract);
 
-            /** @var \Psr\Log\LoggerInterface|\Illuminate\Log\Logger $logger */
-            $logger = $log_manager->driver();
-
-            /**
-             * Method `withoutContext` for the Logger available since Laravel v8.49.0.
-             *
-             * @link https://github.com/illuminate/log/blob/v8.49.0/Logger.php#L202-L212 Source code (v8.49.0)
-             * @see  \Illuminate\Log\Logger::withoutContext
-             */
-            $this->invokeMethod($logger, 'withoutContext');
+            $log_manager->flushSharedContext();
+
+            if (($logger = $log_manager->driver()) instanceof \Illuminate\Log\Logger) {
+                $logger->withoutContext();
+            }
         }
     }
 }

src/Listeners/FlushStrCacheListener.php

@@ -18,16 +18,6 @@ class FlushStrCacheListener implements ListenerInterface
      */
     public function handle($event): void
     {
-        /**
-         * Method `flushCache` for the Str available since Laravel v8.81.0.
-         *
-         * @link https://github.com/illuminate/support/blob/v8.81.0/Str.php#L994
-         * @see  \Illuminate\Support\Str::flushCache
-         */
-        if (! $this->invokeStaticMethod($class = Str::class, 'flushCache')) {
-            foreach (['snakeCache', 'camelCache', 'studlyCache'] as $property) {
-                $this->setStaticProperty($class, $property, []);
-            }
-        }
+        Str::flushCache();
     }
 }

src/Listeners/FlushTranslatorCacheListener.php

@@ -31,15 +31,7 @@ public function handle($event): void
             $translator = $app->make($translator_abstract);
 
             if ($translator instanceof NamespacedItemResolver) {
-                /**
-                 * Method `flushParsedKeys` for the Translator available since Laravel v8.70.0.
-                 *
-                 * @link https://git.io/JXd0v Source code (v8.70.0)
-                 * @see  Translator::flushParsedKeys()
-                 */
-                if (! $this->invokeMethod($translator, 'flushParsedKeys')) {
-                    $this->setProperty($translator, 'parsed', []);
-                }
+                $translator->flushParsedKeys();
             }
         }
     }

src/Listeners/RebindAuthorizationGateListener.php

@@ -26,18 +26,10 @@ public function handle($event): void
                 return;
             }
 
-            /** @var Gate $gate */
+            /** @var \Illuminate\Auth\Access\Gate $gate */
             $gate = $app->make($gate_abstract);
 
-            /**
-             * Method `setContainer` for the Gate implementation available since Laravel v8.35.0.
-             *
-             * @link https://git.io/JszTs Source code (v8.35.0)
-             * @see  \Illuminate\Auth\Access\Gate::setContainer
-             */
-            if (! $this->invokeMethod($gate, 'setContainer', $app)) {
-                $this->setProperty($gate, 'container', $app);
-            }
+            $gate->setContainer($app);
         }
     }
 }

src/Listeners/RebindBroadcastManagerListener.php

@@ -29,15 +29,7 @@ public function handle($event): void
             /** @var BroadcastManager $broadcast_manager */
             $broadcast_manager = $app->make($broadcast_manager_abstract);
 
-            /**
-             * Method `setApplication` for the BroadcastManager available since Laravel v8.35.0.
-             *
-             * @link https://git.io/Jszm3 Source code (v8.35.0)
-             * @see  \Illuminate\Broadcasting\BroadcastManager::setApplication
-             */
-            if (! $this->invokeMethod($broadcast_manager, 'setApplication', $app)) {
-                $this->setProperty($broadcast_manager, 'app', $app);
-            }
+            $broadcast_manager->setApplication($app);
 
             // Forgetting drivers will flush all channel routes which is unwanted...
             // $broadcast_manager->forgetDrivers();