Merge branch 'feature/psr12'

Author: xel1045

CONTRIBUTING.md

@@ -7,7 +7,7 @@ We accept contributions via Pull Requests on [Github](https://github.com/eXolnet
 
 ## Pull Requests
 
-- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - Check the code style with ``$ composer lint`` and fix it with ``$ composer lint-fix``.
+- **[PSR-12 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-12-extended-coding-style-guide.md)** - Check the code style with ``$ composer lint`` and fix it with ``$ composer lint-fix``.
 
 - **Add tests!** - Your patch won't be accepted if it doesn't have tests.
 

composer.json

@@ -37,8 +37,8 @@
         }
     },
     "scripts": {
-        "lint": "vendor/bin/phpcs -p --standard=PSR2 config src tests",
-        "lint-fix": "vendor/bin/phpcbf -p --standard=PSR2 config src tests",
+        "lint": "vendor/bin/phpcs -p --standard=PSR12 config src tests",
+        "lint-fix": "vendor/bin/phpcbf -p --standard=PSR12 config src tests",
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
     },

src/Console/DbUpgradeCommand.php

@@ -20,12 +20,12 @@ class DbUpgradeCommand extends Command
     /**
      * @var string
      */
-    const UPGRADE_CONTENT_FILENAME = 'content.sql';
+    protected const UPGRADE_CONTENT_FILENAME = 'content.sql';
 
     /**
      * @var string
      */
-    const UPGRADE_BACKUP_FILENAME = 'backup.sql';
+    protected const UPGRADE_BACKUP_FILENAME = 'backup.sql';
 
     /**
      * The name and signature of the console command.
@@ -309,7 +309,7 @@ protected function importContent(): void
         $config = $this->getDatabaseConfig();
         $contentFile = $this->getTemporaryUpgradePath(static::UPGRADE_CONTENT_FILENAME);
 
-        $command = 'cat "' . $contentFile . '" | "' .$this->commandMysql .
+        $command = 'cat "' . $contentFile . '" | "' . $this->commandMysql .
             '" -h "' . $config['host'] .
             '" -u "' . $config['username'] . '" ' .
             ($config['password'] ? '-p"' . $config['password'] . '"' : '') .
@@ -358,7 +358,7 @@ protected function checkExistingDatabase(): void
 
         foreach ($this->getExpectedTables() as $table) {
             if (! Schema::hasTable($table)) {
-                throw new PreConditionNotMetException('Could not find required table "'. $table .'".');
+                throw new PreConditionNotMetException('Could not find required table "' . $table . '".');
             }
         }
     }
@@ -373,7 +373,7 @@ protected function getTemporaryUpgradePath($path = null): string
             $this->temporaryPathPrefix = now()->toDateTimeString();
         }
 
-        return storage_path(rtrim('upgrade-'. $this->temporaryPathPrefix .'/' . $path, '/'));
+        return storage_path(rtrim('upgrade-' . $this->temporaryPathPrefix . '/' . $path, '/'));
     }
 
     /**

src/DbUpgradeServiceProvider.php

@@ -16,7 +16,7 @@ public function boot()
         }
 
         $this->publishes([
-            __DIR__.'/../config/db-upgrade.php' => config_path('db-upgrade.php'),
+            __DIR__ . '/../config/db-upgrade.php' => config_path('db-upgrade.php'),
         ], 'config');
     }