diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..9a897b6 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Ignored default folder with query files +/queries/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/laravel-idea-personal.xml b/.idea/laravel-idea-personal.xml new file mode 100644 index 0000000..425e121 --- /dev/null +++ b/.idea/laravel-idea-personal.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/laravel-idea.xml b/.idea/laravel-idea.xml new file mode 100644 index 0000000..d8e17dd --- /dev/null +++ b/.idea/laravel-idea.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/laravel-modules.iml b/.idea/laravel-modules.iml new file mode 100644 index 0000000..0bdd624 --- /dev/null +++ b/.idea/laravel-modules.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..1561d05 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000..29059d0 --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Commands/GeneratorCommand.php b/src/Commands/GeneratorCommand.php index 35c7a3a..7f7b7e4 100755 --- a/src/Commands/GeneratorCommand.php +++ b/src/Commands/GeneratorCommand.php @@ -5,6 +5,7 @@ namespace mpba\Modules\Commands; use Illuminate\Console\Command; use mpba\Modules\Exceptions\FileAlreadyExistException; use mpba\Modules\Generators\FileGenerator; +use mpba\Modules\Module; abstract class GeneratorCommand extends Command { @@ -77,7 +78,7 @@ abstract class GeneratorCommand extends Command /** * Get class namespace. * - * @param \mpba\Modules\Module $module + * @param Module $module * @return string */ public function getClassNamespace($module) diff --git a/src/Commands/LaravelModulesV6Migrator.php b/src/Commands/LaravelModulesV6Migrator.php deleted file mode 100755 index 0a50215..0000000 --- a/src/Commands/LaravelModulesV6Migrator.php +++ /dev/null @@ -1,40 +0,0 @@ -laravel['modules']; - - $modules = $modules->all(); - /** @var Module $module */ - foreach ($modules as $module) { - if ($module->json()->get('active') === 1) { - $module->enable(); - $moduleStatuses[] = [$module->getName(), 'Enabled']; - } - if ($module->json()->get('active') === 0) { - $module->disable(); - $moduleStatuses[] = [$module->getName(), 'Disabled']; - } - } - $this->info('All modules have been migrated.'); - $this->table(['Module name', 'Status'], $moduleStatuses); - - return 0; - } -} diff --git a/src/FileRepository.php b/src/FileRepository.php index e20eafe..6a275a9 100755 --- a/src/FileRepository.php +++ b/src/FileRepository.php @@ -6,6 +6,7 @@ use Countable; use Illuminate\Cache\CacheManager; use Illuminate\Container\Container; use Illuminate\Contracts\Config\Repository as ConfigRepository; +use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Routing\UrlGenerator; use Illuminate\Filesystem\Filesystem; use Illuminate\Support\Str; @@ -23,7 +24,7 @@ abstract class FileRepository implements Countable, RepositoryInterface /** * Application instance. * - * @var \Illuminate\Contracts\Foundation\Application|\Laravel\Lumen\Application + * @var Application|\Laravel\Lumen\Application */ protected $app; diff --git a/src/Generators/ModuleGenerator.php b/src/Generators/ModuleGenerator.php index aa8c30f..0c50673 100755 --- a/src/Generators/ModuleGenerator.php +++ b/src/Generators/ModuleGenerator.php @@ -8,6 +8,7 @@ use Illuminate\Filesystem\Filesystem; use Illuminate\Support\Str; use mpba\Modules\Contracts\ActivatorInterface; use mpba\Modules\FileRepository; +use mpba\Modules\Module; use mpba\Modules\Support\Config\GenerateConfigReader; use mpba\Modules\Support\Stub; @@ -51,7 +52,7 @@ class ModuleGenerator extends Generator /** * The module instance. * - * @var \mpba\Modules\Module + * @var Module */ protected $module; @@ -216,7 +217,7 @@ class ModuleGenerator extends Generator /** * Get the module instance. * - * @return \mpba\Modules\Module + * @return Module */ public function getModule() { diff --git a/src/Module.php b/src/Module.php index 69aaf6e..388e041 100755 --- a/src/Module.php +++ b/src/Module.php @@ -4,6 +4,7 @@ namespace mpba\Modules; use Illuminate\Cache\CacheManager; use Illuminate\Container\Container; +use Illuminate\Contracts\Foundation\Application; use Illuminate\Filesystem\Filesystem; use Illuminate\Support\Arr; use Illuminate\Support\Str; @@ -18,7 +19,7 @@ abstract class Module /** * The laravel|lumen application instance. * - * @var \Illuminate\Contracts\Foundation\Application|\Laravel\Lumen\Application + * @var Application|\Laravel\Lumen\Application */ protected $app; diff --git a/src/Process/Installer.php b/src/Process/Installer.php index 2ec6141..ae40f4a 100755 --- a/src/Process/Installer.php +++ b/src/Process/Installer.php @@ -131,7 +131,7 @@ class Installer /** * Run the installation process. * - * @return \Symfony\Component\Process\Process + * @return Process */ public function run() { @@ -151,7 +151,7 @@ class Installer /** * Get process instance. * - * @return \Symfony\Component\Process\Process + * @return Process */ public function getProcess() { @@ -257,7 +257,7 @@ class Installer /** * Install the module via git. * - * @return \Symfony\Component\Process\Process + * @return Process */ public function installViaGit() { @@ -274,7 +274,7 @@ class Installer /** * Install the module via git subtree. * - * @return \Symfony\Component\Process\Process + * @return Process */ public function installViaSubtree() { @@ -292,7 +292,7 @@ class Installer /** * Install the module via composer. * - * @return \Symfony\Component\Process\Process + * @return Process */ public function installViaComposer() { diff --git a/src/Process/Updater.php b/src/Process/Updater.php index bef16ae..d2d563e 100755 --- a/src/Process/Updater.php +++ b/src/Process/Updater.php @@ -2,7 +2,7 @@ namespace mpba\Modules\Process; -use laraveluse mpba\Modules\Module; +use mpba\Modules\Module; class Updater extends Runner { diff --git a/src/Publishing/LangPublisher.php b/src/Publishing/LangPublisher.php index a8f7301..f3f3732 100755 --- a/src/Publishing/LangPublisher.php +++ b/src/Publishing/LangPublisher.php @@ -2,7 +2,7 @@ namespace mpba\Modules\Publishing; -use laraveluse mpba\Modules\Support\Config\GenerateConfigReader; +use mpba\Modules\Support\Config\GenerateConfigReader; class LangPublisher extends Publisher { diff --git a/src/Publishing/Publisher.php b/src/Publishing/Publisher.php index 24384eb..6481fa2 100755 --- a/src/Publishing/Publisher.php +++ b/src/Publishing/Publisher.php @@ -3,6 +3,7 @@ namespace mpba\Modules\Publishing; use Illuminate\Console\Command; +use Illuminate\Filesystem\Filesystem; use mpba\Modules\Contracts\PublisherInterface; use mpba\Modules\Contracts\RepositoryInterface; use mpba\Modules\Module; @@ -26,7 +27,7 @@ abstract class Publisher implements PublisherInterface /** * The laravel console instance. * - * @var \Illuminate\Console\Command + * @var Command */ protected $console; @@ -131,7 +132,7 @@ abstract class Publisher implements PublisherInterface /** * Get console instance. * - * @return \Illuminate\Console\Command + * @return Command */ public function getConsole() { @@ -141,7 +142,7 @@ abstract class Publisher implements PublisherInterface /** * Get laravel filesystem instance. * - * @return \Illuminate\Filesystem\Filesystem + * @return Filesystem */ public function getFilesystem() {