-

Author: GromNaN

phpcs.xml.dist

@@ -24,6 +24,11 @@
         <exclude name="SlevomatCodingStandard.ControlStructures.NewWithParentheses"/>
         <exclude name="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly"/>
         <exclude name="SlevomatCodingStandard.Functions.ArrowFunctionDeclaration"/>
+        <exclude name="SlevomatCodingStandard.Functions.StaticClosure"/>
+
+        <!-- Type changes needs to be synchronized with laravel/framework -->
         <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint"/>
     </rule>
 </ruleset>

src/Auth/DatabaseTokenRepository.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MongoDB\Laravel\Auth;
 
 use DateTime;
@@ -8,11 +10,12 @@
 use Illuminate\Support\Facades\Date;
 use MongoDB\BSON\UTCDateTime;
 
+use function date_default_timezone_get;
+use function is_array;
+
 class DatabaseTokenRepository extends BaseDatabaseTokenRepository
 {
-    /**
-     * @inheritdoc
-     */
+    /** @inheritdoc */
     protected function getPayload($email, $token)
     {
         return [
@@ -22,19 +25,15 @@ protected function getPayload($email, $token)
         ];
     }
 
-    /**
-     * @inheritdoc
-     */
+    /** @inheritdoc */
     protected function tokenExpired($createdAt)
     {
         $createdAt = $this->convertDateTime($createdAt);
 
         return parent::tokenExpired($createdAt);
     }
 
-    /**
-     * @inheritdoc
-     */
+    /** @inheritdoc */
     protected function tokenRecentlyCreated($createdAt)
     {
         $createdAt = $this->convertDateTime($createdAt);
@@ -50,7 +49,7 @@ private function convertDateTime($createdAt)
             $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
             $createdAt = $date->format('Y-m-d H:i:s');
         } elseif (is_array($createdAt) && isset($createdAt['date'])) {
-            $date = new DateTime($createdAt['date'], new DateTimeZone(isset($createdAt['timezone']) ? $createdAt['timezone'] : 'UTC'));
+            $date = new DateTime($createdAt['date'], new DateTimeZone($createdAt['timezone'] ?? 'UTC'));
             $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
             $createdAt = $date->format('Y-m-d H:i:s');
         }

src/Auth/PasswordBrokerManager.php

@@ -1,14 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MongoDB\Laravel\Auth;
 
 use Illuminate\Auth\Passwords\PasswordBrokerManager as BasePasswordBrokerManager;
 
 class PasswordBrokerManager extends BasePasswordBrokerManager
 {
-    /**
-     * @inheritdoc
-     */
+    /** @inheritdoc */
     protected function createTokenRepository(array $config)
     {
         return new DatabaseTokenRepository(
@@ -17,7 +17,7 @@ protected function createTokenRepository(array $config)
             $config['table'],
             $this->app['config']['app.key'],
             $config['expire'],
-            $config['throttle'] ?? 0
+            $config['throttle'] ?? 0,
         );
     }
 }

src/Auth/PasswordResetServiceProvider.php

@@ -1,14 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MongoDB\Laravel\Auth;
 
 use Illuminate\Auth\Passwords\PasswordResetServiceProvider as BasePasswordResetServiceProvider;
 
 class PasswordResetServiceProvider extends BasePasswordResetServiceProvider
 {
-    /**
-     * @inheritdoc
-     */
+    /** @inheritdoc */
     protected function registerPasswordBroker()
     {
         $this->app->singleton('auth.password', function ($app) {

src/Auth/User.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MongoDB\Laravel\Auth;
 
 use Illuminate\Auth\Authenticatable;
@@ -16,5 +18,8 @@ class User extends Model implements
     AuthorizableContract,
     CanResetPasswordContract
 {
-    use Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail;
+    use Authenticatable;
+    use Authorizable;
+    use CanResetPassword;
+    use MustVerifyEmail;
 }

src/Collection.php

@@ -1,14 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MongoDB\Laravel;
 
 use Exception;
 use MongoDB\BSON\ObjectID;
 use MongoDB\Collection as MongoCollection;
 
-/**
- * @mixin MongoCollection
- */
+use function array_walk_recursive;
+use function implode;
+use function json_encode;
+use function microtime;
+
+/** @mixin MongoCollection */
 class Collection
 {
     /**
@@ -25,10 +30,6 @@ class Collection
      */
     protected $collection;
 
-    /**
-     * @param  Connection  $connection
-     * @param  MongoCollection  $collection
-     */
     public function __construct(Connection $connection, MongoCollection $collection)
     {
         $this->connection = $connection;
@@ -38,13 +39,14 @@ public function __construct(Connection $connection, MongoCollection $collection)
     /**
      * Handle dynamic method calls.
      *
-     * @param  string  $method
+     * @param  string $method
      * @param  array  $parameters
+     *
      * @return mixed
      */
     public function __call(string $method, array $parameters)
     {
-        $start = microtime(true);
+        $start  = microtime(true);
         $result = $this->collection->$method(...$parameters);
 
         // Once we have run the query we will calculate the time that it took to run and
@@ -56,21 +58,23 @@ public function __call(string $method, array $parameters)
 
         // Convert the query parameters to a json string.
         array_walk_recursive($parameters, function (&$item, $key) {
-            if ($item instanceof ObjectID) {
-                $item = (string) $item;
+            if (! ($item instanceof ObjectID)) {
+                return;
             }
+
+            $item = (string) $item;
         });
 
         // Convert the query parameters to a json string.
         foreach ($parameters as $parameter) {
             try {
                 $query[] = json_encode($parameter);
-            } catch (Exception $e) {
+            } catch (Exception) {
                 $query[] = '{...}';
             }
         }
 
-        $queryString = $this->collection->getCollectionName().'.'.$method.'('.implode(',', $query).')';
+        $queryString = $this->collection->getCollectionName() . '.' . $method . '(' . implode(',', $query) . ')';
 
         $this->connection->logQuery($queryString, [], $time);
 

src/Concerns/ManagesTransactions.php

@@ -1,29 +1,28 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MongoDB\Laravel\Concerns;
 
 use Closure;
 use MongoDB\Client;
 use MongoDB\Driver\Exception\RuntimeException;
 use MongoDB\Driver\Session;
-use function MongoDB\with_transaction;
 use Throwable;
 
-/**
- * @see https://docs.mongodb.com/manual/core/transactions/
- */
+use function MongoDB\with_transaction;
+
+/** @see https://docs.mongodb.com/manual/core/transactions/ */
 trait ManagesTransactions
 {
-    protected ?Session $session = null;
+    protected Session|null $session = null;
 
     protected $transactions = 0;
 
-    /**
-     * @return Client
-     */
+    /** @return Client */
     abstract public function getMongoClient();
 
-    public function getSession(): ?Session
+    public function getSession(): Session|null
     {
         return $this->session;
     }
@@ -78,13 +77,13 @@ public function rollBack($toLevel = null): void
     /**
      * Static transaction function realize the with_transaction functionality provided by MongoDB.
      *
-     * @param  int  $attempts
+     * @param  int $attempts
      */
     public function transaction(Closure $callback, $attempts = 1, array $options = []): mixed
     {
-        $attemptsLeft = $attempts;
+        $attemptsLeft   = $attempts;
         $callbackResult = null;
-        $throwable = null;
+        $throwable      = null;
 
         $callbackFunction = function (Session $session) use ($callback, &$attemptsLeft, &$callbackResult, &$throwable) {
             $attemptsLeft--;