chore: bump packages

composer.json

@@ -25,7 +25,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "leroy-merlin-br/mongolid": "v3.7",
+        "leroy-merlin-br/mongolid": "chore/bump-packages-fix-dev",
         "illuminate/support": "^9.0 || ^10.0",
         "illuminate/auth": "^9.0 || ^10.0",
         "illuminate/queue": "^9.0 || ^10.0"
@@ -34,7 +34,8 @@
         "phpunit/phpunit": "^9.0",
         "orchestra/testbench": "^7.0 || ^8.0",
         "mockery/mockery": "^1.5.1",
-        "leroy-merlin-br/coding-standard": "^3.1.0"
+        "leroy-merlin-br/coding-standard": "^3.1.0",
+        "ext-mongodb": "*"
     },
     "autoload": {
         "psr-4": {

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   php:
     build: docker

src/LaravelCacheComponent.php

@@ -20,10 +20,8 @@ class LaravelCacheComponent implements CacheComponentInterface
 
     /**
      * Copy cache result in memory array.
-     *
-     * @var mixed[]
      */
-    private $inMemoryCache = [];
+    private array $inMemoryCache = [];
 
     /**
      * Injects the dependencies of LaravelCacheComponent.
@@ -42,7 +40,7 @@ public function __construct(Repository $laravelCache)
      *
      * @return mixed
      */
-    public function get(string $key)
+    public function get(string $key): mixed
     {
         if (isset($this->inMemoryCache[$key])) {
             return $this->inMemoryCache[$key];
@@ -61,7 +59,7 @@ public function get(string $key)
      * @param mixed  $value   value being stored in cache
      * @param float  $minutes cache ttl
      */
-    public function put(string $key, $value, float $minutes)
+    public function put(string $key, $value, float $minutes): void
     {
         if (is_array($value)) {
             foreach ($value as $index => $document) {

src/LaravelEventTrigger.php

@@ -12,10 +12,8 @@ class LaravelEventTrigger implements EventTriggerInterface
 {
     /**
      * Laravel's Event dispatcher.
-     *
-     * @var \Illuminate\Contracts\Events\Dispatcher
      */
-    protected $dispatcher;
+    protected Dispatcher $dispatcher;
 
     /**
      * Injects a Laravel's event dispatcher instance.
@@ -39,12 +37,13 @@ public function __construct(Dispatcher $dispatcher)
      *
      * @return mixed Event handler return. The importance of this return is determined by $halt
      */
-    public function fire(string $event, $payload, bool $halt)
+    public function fire(string $event, mixed $payload, bool $halt): mixed
     {
         if (method_exists($this->dispatcher, 'fire')) {
             return $this->dispatcher->fire($event, $payload, $halt);
         }
+        $this->dispatcher->dispatch($event, $payload, $halt);
 
-        return $this->dispatcher->dispatch($event, $payload, $halt);
+        return true;
     }
 }

src/LegacyMongolidModel.php

@@ -228,7 +228,7 @@ public static function firstOrFail(
         $query = [],
         array $projection = [],
         bool $useCache = false
-    ) {
+    ): mixed {
         return static::callMockOrParent('firstOrFail', func_get_args());
     }
 

src/MongolidModel.php

@@ -11,14 +11,15 @@
 use Mongolid\Cursor\CursorInterface;
 use Mongolid\LegacyRecord;
 use Mongolid\Model\AbstractModel;
+use stdClass;
 
 /**
  * This class extends the Mongolid\LegacyRecord, so, in order
  * to understand the ODM implementation make sure to check the
  * base class.
  *
  * The MongolidLaravel\MongolidModel simply extends the original
- * and framework agnostic model of MongoLid and implements some
+ * and framework-agnostic model of MongoLid and implements some
  * validation rules using Laravel validation components.
  *
  * Remember, this package is meant to be used with Laravel while
@@ -124,7 +125,7 @@ public function isValid()
         $attributes = $this->getDocumentAttributes();
 
         // Verify attributes that are hashed and that have not changed
-        // those doesn't need to be validated.
+        // this doesn't need to be validated.
         foreach ($this->hashedAttributes as $hashedAttr) {
             if (isset($this->original[$hashedAttr]) && $this->$hashedAttr == $this->original[$hashedAttr]) {
                 unset($rules[$hashedAttr]);
@@ -181,7 +182,7 @@ public function messages(): array
      *
      * @return Expectation
      */
-    public function shouldReceiveSave()
+    public function shouldReceiveSave(): Expectation
     {
         return $this->localMockShouldReceive('save');
     }
@@ -191,7 +192,7 @@ public function shouldReceiveSave()
      *
      * @return Expectation
      */
-    public function shouldReceiveDelete()
+    public function shouldReceiveDelete(): Expectation
     {
         return $this->localMockShouldReceive('delete');
     }
@@ -209,7 +210,7 @@ public static function first(
         $query = [],
         array $projection = [],
         bool $useCache = false
-    ) {
+    ): stdClass|static|null {
         return static::callMockOrParent('first', func_get_args());
     }
 
@@ -229,7 +230,7 @@ public static function firstOrFail(
         $query = [],
         array $projection = [],
         bool $useCache = false
-    ) {
+    ): stdClass|static|null {
         return static::callMockOrParent('firstOrFail', func_get_args());
     }
 
@@ -242,7 +243,7 @@ public static function firstOrFail(
      *
      * @return LegacyRecord
      */
-    public static function firstOrNew($id)
+    public static function firstOrNew(mixed $id): stdClass|static|null
     {
         return static::callMockOrParent('firstOrNew', func_get_args());
     }
@@ -283,7 +284,7 @@ protected function collection(): Collection
      * Hashes the attributes specified in the hashedAttributes
      * array.
      */
-    protected function hashAttributes()
+    protected function hashAttributes(): void
     {
         foreach ($this->hashedAttributes as $attr) {
             // Hash attribute if changed
@@ -334,7 +335,7 @@ protected function localMockShouldReceive(string $method)
     }
 
     /**
-     * Check for a expectation for given method on local mock.
+     * Check for an expectation for given method on local mock.
      *
      * @param string $method name of the method being checked
      */

tests/MongolidModelTest.php

@@ -138,7 +138,7 @@ public function testShouldSave()
         $dataMapper = $this->instance(Builder::class, m::mock(Builder::class));
 
         $model = new class () extends MongolidModel {
-            protected $collection = 'users';
+            protected ?string $collection = 'users';
         };
 
         // Expectations
@@ -185,7 +185,7 @@ public function testShouldHashAttributesOnSaveAndUpdate($method)
         $hasher = $this->instance(Hasher::class, m::mock(Hasher::class));
 
         $model = new class () extends MongolidModel {
-            protected $collection = 'users';
+            protected ?string $collection = 'users';
 
             protected $hashedAttributes = ['password'];
         };
@@ -280,7 +280,7 @@ public function testShouldDelete()
         $dataMapper = $this->instance(Builder::class, m::mock(Builder::class));
 
         $model = new class () extends MongolidModel {
-            protected $collection = 'collection_name';
+           protected ?string $collection = 'collection_name';
         };
 
         // Expectations
@@ -323,7 +323,7 @@ public function testShouldGetFirst()
         $dataMapper = $this->instance(Builder::class, m::mock(Builder::class));
 
         $model = new class () extends MongolidModel {
-            protected $collection = 'collection_name';
+           protected ?string $collection = 'collection_name';
         };
 
         // Expectations
@@ -345,7 +345,7 @@ public function testShouldMockFirst()
     {
         // Set
         $model = new class () extends MongolidModel {
-            protected $collection = 'collection_name';
+           protected ?string $collection = 'collection_name';
         };
 
         // Expectations
@@ -367,7 +367,7 @@ public function testShouldGetFirstOrNew()
         $dataMapper = $this->instance(Builder::class, m::mock(Builder::class));
 
         $model = new class () extends MongolidModel {
-            protected $collection = 'collection_name';
+           protected ?string $collection = 'collection_name';
         };
 
         // Expectations
@@ -389,7 +389,7 @@ public function testShouldMockFirstOrNew()
     {
         // Set
         $model = new class () extends MongolidModel {
-            protected $collection = 'collection_name';
+           protected ?string $collection = 'collection_name';
         };
 
         // Expectations
@@ -411,7 +411,7 @@ public function testShouldGetFirstOrFailAndFoundIt()
         $dataMapper = $this->instance(Builder::class, m::mock(Builder::class));
 
         $model = new class () extends MongolidModel {
-            protected $collection = 'collection_name';
+           protected ?string $collection = 'collection_name';
         };
 
         // Expectations
@@ -435,7 +435,7 @@ public function testShouldGetFirstOrFailAndFail()
         $dataMapper = $this->instance(Builder::class, m::mock(Builder::class));
 
         $model = new class () extends MongolidModel {
-            protected $collection = 'collection_name';
+           protected ?string $collection = 'collection_name';
         };
 
         // Expectations
@@ -456,7 +456,7 @@ public function testShouldMockFirstOrFail()
     {
         // Set
         $model = new class () extends MongolidModel {
-            protected $collection = 'collection_name';
+           protected ?string $collection = 'collection_name';
         };
 
         // Expectations
@@ -479,7 +479,7 @@ public function testShouldGetWhere()
         $cursor = m::mock(CursorInterface::class);
 
         $model = new class () extends MongolidModel {
-            protected $collection = 'collection_name';
+           protected ?string $collection = 'collection_name';
         };
 
         // Expectations
@@ -504,7 +504,7 @@ public function testShouldGetAll()
         $cursor = m::mock(CursorInterface::class);
 
         $model = new class () extends MongolidModel {
-            protected $collection = 'collection_name';
+           protected ?string $collection = 'collection_name';
         };
 
         // Expectations
@@ -547,7 +547,7 @@ public function testShouldGetCollection()
         $client = m::mock(Client::class);
 
         $model = new class () extends MongolidModel {
-            protected $collection = 'collection_name';
+           protected ?string $collection = 'collection_name';
 
             public function rawCollection()
             {

tests/MongolidUserProviderTest.php

@@ -6,6 +6,7 @@
 use Illuminate\Foundation\Auth\User;
 use Mockery as m;
 use MongoDB\BSON\ObjectID;
+use stdClass;
 
 class MongolidUserProviderTest extends TestCase
 {
@@ -78,7 +79,8 @@ public static function first(
                 $query = [],
                 array $projection = [],
                 bool $useCache = false
-            ) {
+            ): stdClass|static|null {
+                return null;
             }
         };
 
@@ -121,7 +123,7 @@ public static function first(
                 $query = [],
                 array $projection = [],
                 bool $useCache = false
-            ) {
+            ): stdClass|static|null {
                 return m::mock(MongolidModel::class);
             }
         };

tests/Stubs/LegacyMongolidModelStub.php

@@ -9,7 +9,7 @@ class LegacyMongolidModelStub extends LegacyMongolidModel
     /**
      * @var ?string
      */
-    protected $collection = 'collection_name';
+    protected ?string $collection = 'collection_name';
 
     /**
      * @var string[]