From 0727f3d6d49fce92353e6c4063da7e9e5ad92b94 Mon Sep 17 00:00:00 2001 From: luceos Date: Sun, 30 May 2021 09:53:09 +0000 Subject: [PATCH] Apply fixes from StyleCI [ci skip] [skip ci] --- src/Database/MigrationSourceRepository.php | 20 ++++++++++++++------ src/Database/Migrator.php | 3 ++- src/Extension/Extension.php | 1 - 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/Database/MigrationSourceRepository.php b/src/Database/MigrationSourceRepository.php index ceae9d0db..228dad138 100644 --- a/src/Database/MigrationSourceRepository.php +++ b/src/Database/MigrationSourceRepository.php @@ -1,11 +1,17 @@ hasMigrations()) return []; + if (! $extension->hasMigrations()) { + return []; + } return $extension->getMigrations(); } @@ -36,12 +44,12 @@ class MigrationSourceRepository { // We read every file from the latest major/minor version migrations directory. // Including the create__table statements. - $files = glob(__DIR__ . '/../../migrations/' . $this->installedVersion(true) . '/[0-9_]{15}_*.php'); + $files = glob(__DIR__.'/../../migrations/'.$this->installedVersion(true).'/[0-9_]{15}_*.php'); // Sort by timestamp. sort($files); - $create = glob(__DIR__ . '/../../migrations/' . $this->installedVersion(true) . '/create_*.php'); + $create = glob(__DIR__.'/../../migrations/'.$this->installedVersion(true).'/create_*.php'); return array_merge($create, $files); } @@ -51,7 +59,7 @@ class MigrationSourceRepository $files = []; $add = false; - $directories = glob(__DIR__ . '/../../migrations/', GLOB_ONLYDIR); + $directories = glob(__DIR__.'/../../migrations/', GLOB_ONLYDIR); sort($directories, SORT_NATURAL); // Upgrade @@ -65,7 +73,7 @@ class MigrationSourceRepository if ($add) { // Selectively add files, but only include those matching the format YYYY_MM_DD_HHIISS_.php // This excludes the create_
_table. - $files = array_merge($files, glob(__DIR__ . "/../../migrations/$directory/[0-9_]{15}_*.php")); + $files = array_merge($files, glob(__DIR__."/../../migrations/$directory/[0-9_]{15}_*.php")); } // Once we found the version that is installed, we can quit. diff --git a/src/Database/Migrator.php b/src/Database/Migrator.php index 299157f50..96a2678fb 100644 --- a/src/Database/Migrator.php +++ b/src/Database/Migrator.php @@ -212,7 +212,8 @@ class Migrator public function getMigrationFiles(string $path, Extension $extension = null): array { $files = $extension ? $this->source->extension($extension) : $this->source->flarum(); -dd($files); + dd($files); + return array_map(function ($file) { return str_replace('.php', '', basename($file)); }, $files); diff --git a/src/Extension/Extension.php b/src/Extension/Extension.php index ef8e4719d..0700ce5ba 100644 --- a/src/Extension/Extension.php +++ b/src/Extension/Extension.php @@ -9,7 +9,6 @@ namespace Flarum\Extension; -use Flarum\Database\Migrator; use Flarum\Extend\LifecycleInterface; use Flarum\Extension\Exception\ExtensionBootError; use Illuminate\Contracts\Container\Container;