Using renamed method to get all enabled modules

Fix the typehint to use the correct class
parent 14f71669
...@@ -7,6 +7,7 @@ use Modules\Core\Http\Controllers\Admin\AdminBaseController; ...@@ -7,6 +7,7 @@ use Modules\Core\Http\Controllers\Admin\AdminBaseController;
use Modules\Core\Traits\CanRequireAssets; use Modules\Core\Traits\CanRequireAssets;
use Modules\Setting\Http\Requests\SettingRequest; use Modules\Setting\Http\Requests\SettingRequest;
use Modules\Setting\Repositories\SettingRepository; use Modules\Setting\Repositories\SettingRepository;
use Nwidart\Modules\Contracts\RepositoryInterface;
use Nwidart\Modules\Module; use Nwidart\Modules\Module;
class SettingController extends AdminBaseController class SettingController extends AdminBaseController
...@@ -17,7 +18,7 @@ class SettingController extends AdminBaseController ...@@ -17,7 +18,7 @@ class SettingController extends AdminBaseController
*/ */
private $setting; private $setting;
/** /**
* @var Module * @var RepositoryInterface
*/ */
private $module; private $module;
/** /**
...@@ -51,7 +52,7 @@ class SettingController extends AdminBaseController ...@@ -51,7 +52,7 @@ class SettingController extends AdminBaseController
{ {
$this->session->put('module', $currentModule->getLowerName()); $this->session->put('module', $currentModule->getLowerName());
$modulesWithSettings = $this->setting->moduleSettings($this->module->enabled()); $modulesWithSettings = $this->setting->moduleSettings($this->module->allEnabled());
$translatableSettings = $this->setting->translatableModuleSettings($currentModule->getLowerName()); $translatableSettings = $this->setting->translatableModuleSettings($currentModule->getLowerName());
$plainSettings = $this->setting->plainModuleSettings($currentModule->getLowerName()); $plainSettings = $this->setting->plainModuleSettings($currentModule->getLowerName());
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
namespace Modules\User\Permissions; namespace Modules\User\Permissions;
use Nwidart\Modules\Module; use Nwidart\Modules\Contracts\RepositoryInterface;
class PermissionManager class PermissionManager
{ {
/** /**
* @var Module * @var RepositoryInterface
*/ */
private $module; private $module;
...@@ -25,7 +25,7 @@ class PermissionManager ...@@ -25,7 +25,7 @@ class PermissionManager
public function all() public function all()
{ {
$permissions = []; $permissions = [];
foreach ($this->module->enabled() as $enabledModule) { foreach ($this->module->allEnabled() as $enabledModule) {
$configuration = config(strtolower('asgard.' . $enabledModule->getName()) . '.permissions'); $configuration = config(strtolower('asgard.' . $enabledModule->getName()) . '.permissions');
if ($configuration) { if ($configuration) {
$permissions[$enabledModule->getName()] = $configuration; $permissions[$enabledModule->getName()] = $configuration;
......
...@@ -264,7 +264,7 @@ class SentinelUserRepository implements UserRepository ...@@ -264,7 +264,7 @@ class SentinelUserRepository implements UserRepository
return Activation::remove($user); return Activation::remove($user);
} }
if (!Activation::completed($user) && $data['activated']) { if (!Activation::completed($user) && $data['is_activated']) {
$activation = Activation::create($user); $activation = Activation::create($user);
return Activation::complete($user, $activation->code); return Activation::complete($user, $activation->code);
......
...@@ -5,13 +5,14 @@ namespace Modules\Workshop\Manager; ...@@ -5,13 +5,14 @@ namespace Modules\Workshop\Manager;
use Illuminate\Config\Repository as Config; use Illuminate\Config\Repository as Config;
use Illuminate\Filesystem\Filesystem; use Illuminate\Filesystem\Filesystem;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Nwidart\Modules\Contracts\RepositoryInterface;
use Nwidart\Modules\Module; use Nwidart\Modules\Module;
use Symfony\Component\Yaml\Parser; use Symfony\Component\Yaml\Parser;
class ModuleManager class ModuleManager
{ {
/** /**
* @var Module * @var RepositoryInterface
*/ */
private $module; private $module;
/** /**
...@@ -68,7 +69,7 @@ class ModuleManager ...@@ -68,7 +69,7 @@ class ModuleManager
*/ */
public function enabled() public function enabled()
{ {
return $this->module->enabled(); return $this->module->allEnabled();
} }
/** /**
...@@ -89,7 +90,7 @@ class ModuleManager ...@@ -89,7 +90,7 @@ class ModuleManager
*/ */
public function getFlippedEnabledModules() public function getFlippedEnabledModules()
{ {
$enabledModules = $this->module->enabled(); $enabledModules = $this->module->allEnabled();
$enabledModules = array_map(function (Module $module) { $enabledModules = array_map(function (Module $module) {
return $module->getName(); return $module->getName();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment