Merge pull request #158 from leroy-merlin-br/chore/bump-mongolid-version

chore(deps): bump mongolid to v3.4

.github/workflows/push.yml

@@ -9,7 +9,6 @@ jobs:
     strategy:
       matrix:
         php:
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"

.gitignore

@@ -4,3 +4,4 @@ build
 .phpunit.result.cache
 phpcs.xml
 .idea
+docker-compose.override.yml

composer.json

@@ -20,17 +20,17 @@
         }
     ],
     "require": {
-        "php": ">=7.3",
-        "leroy-merlin-br/mongolid": "v3.3-beta2",
+        "php": ">=7.4",
+        "leroy-merlin-br/mongolid": "v3.4",
         "illuminate/support": "^5.4 || ^6.0 || ^7.0 || ^8.0",
         "illuminate/auth": "^5.4 || ^6.0 || ^7.0 || ^8.0",
         "illuminate/queue": "^5.4 || ^6.0 || ^7.0 || ^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.25",
+        "phpunit/phpunit": "^9.5.27",
         "orchestra/testbench": "^6.25.1",
         "mockery/mockery": "^1.5.1",
-        "leroy-merlin-br/coding-standard": "^3.0.2"
+        "leroy-merlin-br/coding-standard": "^3.1.0"
     },
     "autoload": {
         "psr-4": {

docker/Dockerfile

@@ -1,19 +1,39 @@
-FROM leroymerlinbr/php:7.3
+FROM php:7.4-fpm
 LABEL maintainer="[email protected]"
 
 USER root:root
 
-RUN docker-php-ext-enable xdebug
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
+
+RUN apt-get update -qq \
+  && apt-get install -qq --no-install-recommends \
+    git zip unzip \
+    libzip-dev libssl-dev \
+    zlib1g-dev libicu-dev \
+    && apt-get clean
+
+RUN pecl install xdebug-3.1.6 mongodb \
+  && docker-php-ext-enable \
+    mongodb xdebug \
+  && docker-php-ext-configure  \
+    intl \
+  && docker-php-ext-install  \
+    intl pcntl zip \
+  && rm -rf /tmp/*
 
 ARG UID=1000
 ARG GID=1000
 
 RUN groupmod -g ${GID} www-data \
   && usermod -u ${UID} -g www-data www-data \
+  && mkdir -p /var/www/html \
   && chown -hR www-data:www-data \
     /var/www \
     /usr/local/
 
 COPY custom.ini /usr/local/etc/php/conf.d/custom.ini
 
 USER www-data:www-data
+
+WORKDIR /var/www/html
+ENV PATH=$PATH:/var/www/.composer/vendor/bin

phpcs.xml.dist

@@ -32,6 +32,37 @@
         <exclude-pattern>src/MongolidModel.php</exclude-pattern>
     </rule>
 
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint">
+        <exclude-pattern>src/LaravelCacheComponent.php</exclude-pattern>
+        <exclude-pattern>src/MigrationServiceProvider.php</exclude-pattern>
+        <exclude-pattern>src/MongolidServiceProvider.php</exclude-pattern>
+        <exclude-pattern>src/Validation/Rules.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/Migration.php</exclude-pattern>
+        <exclude-pattern>src/MongolidFailedJobProvider.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/Commands/MigrateCommand.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/Commands/FreshCommand.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/Commands/InstallCommand.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/MigrationCreator.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/Commands/RollbackCommand.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/Commands/MigrateMakeCommand.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/Commands/StatusCommand.php</exclude-pattern>
+        <exclude-pattern>src/LaravelEventTrigger.php</exclude-pattern>
+        <exclude-pattern>src/FailedJobsService.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/Commands/RefreshCommand.php</exclude-pattern>
+        <exclude-pattern>src/MongolidUserProvider.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/MongolidMigrationRepository.php</exclude-pattern>
+        <exclude-pattern>src/LegacyMongolidModel.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/Migrator.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/Commands/ResetCommand.php</exclude-pattern>
+        <exclude-pattern>src/Migrations/Commands/ResetCommand.php</exclude-pattern>
+        <exclude-pattern>src/MongolidModel.php</exclude-pattern>
+        <exclude-pattern>tests/Stubs</exclude-pattern>
+    </rule>
+
+    <rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference.ClassNameReferencedViaFunctionCall">
+        <exclude-pattern>tests/MongolidUserProviderTest.php</exclude-pattern>
+    </rule>
+
     <rule ref="SlevomatCodingStandard.TypeHints.DisallowMixedTypeHint.DisallowedMixedTypeHint">
         <type>warning</type>
     </rule>

src/LaravelCacheComponent.php

@@ -43,7 +43,10 @@ public function get(string $key)
             return $this->inMemoryCache[$key];
         }
 
-        return $this->inMemoryCache[$key] = $this->laravelCache->get($key, null);
+        return $this->inMemoryCache[$key] = $this->laravelCache->get(
+            $key,
+            null
+        );
     }
 
     /**

src/LegacyMongolidModel.php

@@ -131,7 +131,11 @@ public function isValid()
         }
 
         // Creates validator with attributes and the rules of the object
-        $validator = app(ValidationFactory::class)->make($attributes, $rules, $this->messages());
+        $validator = app(ValidationFactory::class)->make(
+            $attributes,
+            $rules,
+            $this->messages()
+        );
 
         // Validate and attach errors
         if ($hasErrors = $validator->fails()) {
@@ -335,7 +339,9 @@ protected function localMockShouldReceive(string $method)
      */
     protected function localMockHasExpectationsFor(string $method): bool
     {
-        return $this->hasLocalMock() && $this->getLocalMock()->mockery_getExpectationsFor($method);
+        return $this->hasLocalMock() && $this->getLocalMock()->mockery_getExpectationsFor(
+            $method
+        );
     }
 
     /**

src/MigrationServiceProvider.php

@@ -100,7 +100,10 @@ protected function registerRepository()
             function ($app) {
                 $collection = $app['config']['database.mongodb.default.migrations'] ?? 'migrations';
 
-                return new MongolidMigrationRepository($app[Connection::class], $collection);
+                return new MongolidMigrationRepository(
+                    $app[Connection::class],
+                    $collection
+                );
             }
         );
     }
@@ -170,7 +173,9 @@ protected function registerMigrateInstallCommand()
         $this->app->singleton(
             'command.mongolid-migrate.install',
             function ($app) {
-                return new InstallCommand($app['mongolid.migration.repository']);
+                return new InstallCommand(
+                    $app['mongolid.migration.repository']
+                );
             }
         );
     }

src/Migrations/Commands/BaseCommand.php

@@ -45,7 +45,9 @@ function ($path) {
      */
     protected function usingRealPath()
     {
-        return $this->input->hasOption('realpath') && $this->option('realpath');
+        return $this->input->hasOption('realpath') && $this->option(
+            'realpath'
+        );
     }
 
     /**

src/Migrations/Commands/MigrateMakeCommand.php

@@ -114,6 +114,8 @@ protected function getMigrationPath()
      */
     protected function usingRealPath()
     {
-        return $this->input->hasOption('realpath') && $this->option('realpath');
+        return $this->input->hasOption('realpath') && $this->option(
+            'realpath'
+        );
     }
 }

src/Migrations/Commands/StatusCommand.php

@@ -80,7 +80,9 @@ protected function getStatusFor(array $ran, array $batches)
         return Collection::make($this->getAllMigrationFiles())
             ->map(
                 function ($migration) use ($ran, $batches) {
-                    $migrationName = $this->migrator->getMigrationName($migration);
+                    $migrationName = $this->migrator->getMigrationName(
+                        $migration
+                    );
 
                     return in_array($migrationName, $ran)
                         ? ['<info>Yes</info>', $migrationName, $batches[$migrationName]]

src/Migrations/MigrationCreator.php

@@ -107,7 +107,9 @@ public function getFilesystem()
     protected function ensureMigrationDoesntAlreadyExist($name)
     {
         if (class_exists($className = $this->getClassName($name))) {
-            throw new InvalidArgumentException("A {$className} class already exists.");
+            throw new InvalidArgumentException(
+                "A {$className} class already exists."
+            );
         }
     }
 

src/Migrations/Migrator.php

@@ -188,7 +188,9 @@ public function reset($paths = [])
      */
     public function resolve($file)
     {
-        $class = Str::studly(implode('_', array_slice(explode('_', $file), 4)));
+        $class = Str::studly(
+            implode('_', array_slice(explode('_', $file), 4))
+        );
 
         return new $class($this->output);
     }
@@ -407,7 +409,9 @@ protected function rollbackMigrations(array $migrations, $paths)
             $migration = (object) $migration;
 
             if (!$file = Arr::get($files, $migration->migration)) {
-                $this->note("<fg=red>Migration not found:</> {$migration->migration}");
+                $this->note(
+                    "<fg=red>Migration not found:</> {$migration->migration}"
+                );
 
                 continue;
             }

src/MongolidFailedJobProvider.php

@@ -112,7 +112,10 @@ private function presentJob($job)
             'queue' => $job['queue'],
             'payload' => $job['payload'],
             'exception' => $job['exception'],
-            'failed_at' => LocalDateTime::format($job['failed_at'], DateTime::ATOM),
+            'failed_at' => LocalDateTime::format(
+                $job['failed_at'],
+                DateTime::ATOM
+            ),
         ];
     }
 }

src/MongolidModel.php

@@ -132,7 +132,11 @@ public function isValid()
         }
 
         // Creates validator with attributes and the rules of the object
-        $validator = app(ValidationFactory::class)->make($attributes, $rules, $this->messages());
+        $validator = app(ValidationFactory::class)->make(
+            $attributes,
+            $rules,
+            $this->messages()
+        );
 
         // Validate and attach errors
         if ($hasErrors = $validator->fails()) {
@@ -336,7 +340,9 @@ protected function localMockShouldReceive(string $method)
      */
     protected function localMockHasExpectationsFor(string $method): bool
     {
-        return $this->hasLocalMock() && $this->getLocalMock()->mockery_getExpectationsFor($method);
+        return $this->hasLocalMock() && $this->getLocalMock()->mockery_getExpectationsFor(
+            $method
+        );
     }
 
     /**

src/MongolidServiceProvider.php

@@ -51,12 +51,18 @@ public function registerConnector()
         $this->app->singleton(
             Connection::class,
             function ($app) {
-                $config = $app['config']->get('database.mongodb.default') ?? [];
+                $config = $app['config']->get(
+                    'database.mongodb.default'
+                ) ?? [];
                 $connectionString = $this->buildConnectionString($config);
                 $options = $config['options'] ?? [];
                 $driverOptions = $config['driver_options'] ?? [];
 
-                $connection = new Connection($connectionString, $options, $driverOptions);
+                $connection = new Connection(
+                    $connectionString,
+                    $options,
+                    $driverOptions
+                );
                 $connection->defaultDatabase = $config['database'] ?? 'mongolid';
 
                 return $connection;
@@ -66,7 +72,9 @@ function ($app) {
             EventTriggerService::class,
             function ($app) {
                 $eventService = new EventTriggerService();
-                $eventService->registerEventDispatcher($app->make(LaravelEventTrigger::class));
+                $eventService->registerEventDispatcher(
+                    $app->make(LaravelEventTrigger::class)
+                );
 
                 return $eventService;
             }
@@ -113,7 +121,11 @@ protected function buildConnectionString(array $config): string
 
         // If username is present, append "<username>:<password>@"
         if (isset($config['username'])) {
-            $result .= sprintf('%s:%s@', $config['username'], $config['password'] ?? '');
+            $result .= sprintf(
+                '%s:%s@',
+                $config['username'],
+                $config['password'] ?? ''
+            );
         }
 
         // Append "<hostname>/<database>"
@@ -143,13 +155,21 @@ private function buildHostname(array $config): string
     {
         if (isset($config['cluster'])) {
             foreach ($config['cluster']['nodes'] as $node) {
-                $nodes[] = sprintf('%s:%s', $node['host'] ?? '127.0.0.1', $node['port'] ?? 27017);
+                $nodes[] = sprintf(
+                    '%s:%s',
+                    $node['host'] ?? '127.0.0.1',
+                    $node['port'] ?? 27017
+                );
             }
 
             return implode(',', $nodes ?? ['127.0.0.1:27017']);
         }
 
-        return sprintf('%s:%s', $config['host'] ?? '127.0.0.1', $config['port'] ?? 27017);
+        return sprintf(
+            '%s:%s',
+            $config['host'] ?? '127.0.0.1',
+            $config['port'] ?? 27017
+        );
     }
 
     /**

src/Validation/Rules.php

@@ -72,7 +72,10 @@ public function exists(string $attribute, $value, array $parameters)
         $collection = $parameters[0];
         $field = $parameters[1] ?? $attribute;
 
-        return $this->hasResults($collection, [$field => $this->transformIfId($value)]);
+        return $this->hasResults(
+            $collection,
+            [$field => $this->transformIfId($value)]
+        );
     }
 
     /**
@@ -127,7 +130,9 @@ public function objectIdMessage(string $message, string $attribute, string $rule
     private function requireParameterCount(int $count, array $parameters, string $rule): void
     {
         if (count($parameters) < $count) {
-            throw new InvalidArgumentException("Validation rule {$rule} requires at least {$count} parameters.");
+            throw new InvalidArgumentException(
+                "Validation rule {$rule} requires at least {$count} parameters."
+            );
         }
     }