@@ -3,10 +3,7 @@ |
||
| 3 | 3 | |
| 4 | 4 | use keeko\core\model\Application; |
| 5 | 5 | use keeko\core\model\Localization; |
| 6 | -use keeko\core\module\ModuleManager; |
|
| 7 | 6 | use Symfony\Component\HttpFoundation\Request; |
| 8 | -use keeko\core\package\PackageManager; |
|
| 9 | -use keeko\core\auth\AuthManager; |
|
| 10 | 7 | use keeko\core\service\ServiceContainer; |
| 11 | 8 | use keeko\core\utils\TwigTrait; |
| 12 | 9 | use keeko\core\package\RunnableInterface; |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | |
| 4 | 4 | use Symfony\Component\Yaml\Yaml; |
| 5 | 5 | use Symfony\Component\Config\Definition\Processor; |
| 6 | -use keeko\core\config\definition\DevelopmentDefinition; |
|
| 7 | 6 | use keeko\core\config\definition\GeneralDefinition; |
| 8 | 7 | |
| 9 | 8 | class GeneralConfiguration extends AbstractConfigurationLoader { |
@@ -1,16 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace keeko\core\installer; |
| 3 | 3 | |
| 4 | -use Composer\Script\Event; |
|
| 5 | 4 | use Composer\Script\PackageEvent; |
| 6 | -use Composer\DependencyResolver\Operation\InstallOperation; |
|
| 7 | -use Composer\DependencyResolver\Operation\UpdateOperation; |
|
| 8 | -use Composer\DependencyResolver\Operation\UninstallOperation; |
|
| 9 | -use Composer\Package\CompletePackageInterface; |
|
| 10 | -use Composer\Package\Package; |
|
| 11 | -use Composer\Script\CommandEvent; |
|
| 12 | 5 | use Composer\Package\PackageInterface; |
| 13 | -use Composer\Repository\WritableRepositoryInterface; |
|
| 14 | 6 | |
| 15 | 7 | class DelegateInstaller { |
| 16 | 8 | |
@@ -64,15 +64,15 @@ |
||
| 64 | 64 | */ |
| 65 | 65 | private function getInstaller(PackageInterface $package) { |
| 66 | 66 | switch ($package->getType()) { |
| 67 | - case 'keeko-app': |
|
| 68 | - return new AppInstaller(); |
|
| 69 | - break; |
|
| 70 | - case 'keeko-module': |
|
| 71 | - return new ModuleInstaller(); |
|
| 72 | - break; |
|
| 73 | - default: |
|
| 74 | - return new DummyInstaller(); |
|
| 75 | - break; |
|
| 67 | + case 'keeko-app': |
|
| 68 | + return new AppInstaller(); |
|
| 69 | + break; |
|
| 70 | + case 'keeko-module': |
|
| 71 | + return new ModuleInstaller(); |
|
| 72 | + break; |
|
| 73 | + default: |
|
| 74 | + return new DummyInstaller(); |
|
| 75 | + break; |
|
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | |
@@ -1,15 +1,11 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace keeko\core\installer; |
| 3 | 3 | |
| 4 | -use keeko\core\module\ModuleManager; |
|
| 5 | 4 | use keeko\core\model\Localization; |
| 6 | -use keeko\core\model\Module; |
|
| 7 | 5 | use keeko\core\model\ApplicationUri; |
| 8 | 6 | use Propel\Runtime\Propel; |
| 9 | 7 | use keeko\core\model\Application; |
| 10 | 8 | use Composer\IO\IOInterface; |
| 11 | -use Composer\Composer; |
|
| 12 | -use keeko\core\package\PackageManager; |
|
| 13 | 9 | use Composer\IO\NullIO; |
| 14 | 10 | use Symfony\Component\HttpFoundation\Request; |
| 15 | 11 | use keeko\core\model\User; |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Symfony\Component\OptionsResolver\OptionsResolver; |
| 7 | 7 | use keeko\core\model\Module; |
| 8 | 8 | use keeko\core\model\ModuleQuery; |
| 9 | -use Symfony\Component\OptionsResolver\Exception\MissingOptionsException; |
|
| 10 | 9 | use keeko\core\service\ServiceContainer; |
| 11 | 10 | |
| 12 | 11 | class ModuleInstaller extends AbstractPackageInstaller { |
@@ -2,13 +2,9 @@ |
||
| 2 | 2 | namespace keeko\core\module; |
| 3 | 3 | |
| 4 | 4 | use keeko\core\exceptions\ModuleException; |
| 5 | -use keeko\core\application\Keeko; |
|
| 6 | 5 | use keeko\core\model\Action; |
| 7 | 6 | use keeko\core\model\Module; |
| 8 | 7 | use keeko\core\model\ActionQuery; |
| 9 | -use keeko\core\application\AbstractApplication; |
|
| 10 | -use keeko\core\package\PackageManager; |
|
| 11 | -use keeko\core\auth\AuthManager; |
|
| 12 | 8 | use keeko\core\model\User; |
| 13 | 9 | use keeko\core\exceptions\PermissionDeniedException; |
| 14 | 10 | use keeko\core\service\ServiceContainer; |
@@ -2,12 +2,9 @@ |
||
| 2 | 2 | namespace keeko\core\module; |
| 3 | 3 | |
| 4 | 4 | use keeko\core\exceptions\ModuleException; |
| 5 | -use keeko\core\package\PackageManager; |
|
| 6 | -use keeko\core\application\AbstractApplication; |
|
| 7 | 5 | use keeko\core\model\ModuleQuery; |
| 8 | 6 | use keeko\core\model\Module; |
| 9 | 7 | use keeko\core\model\Action; |
| 10 | -use keeko\core\installer\ModuleInstaller; |
|
| 11 | 8 | use keeko\core\model\Api; |
| 12 | 9 | use keeko\core\service\ServiceContainer; |
| 13 | 10 | use keeko\core\model\GroupQuery; |
@@ -164,17 +164,17 @@ |
||
| 164 | 164 | |
| 165 | 165 | private function getGroup($name) { |
| 166 | 166 | switch ($name) { |
| 167 | - case 'guest': |
|
| 168 | - return GroupQuery::create()->filterByIsGuest(true)->findOne(); |
|
| 169 | - break; |
|
| 167 | + case 'guest': |
|
| 168 | + return GroupQuery::create()->filterByIsGuest(true)->findOne(); |
|
| 169 | + break; |
|
| 170 | 170 | |
| 171 | - case 'user': |
|
| 172 | - return GroupQuery::create()->filterByIsDefault(true)->findOne(); |
|
| 173 | - break; |
|
| 171 | + case 'user': |
|
| 172 | + return GroupQuery::create()->filterByIsDefault(true)->findOne(); |
|
| 173 | + break; |
|
| 174 | 174 | |
| 175 | - case 'admin': |
|
| 176 | - return GroupQuery::create()->findOneById(3); |
|
| 177 | - break; |
|
| 175 | + case 'admin': |
|
| 176 | + return GroupQuery::create()->findOneById(3); |
|
| 177 | + break; |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Composer\Package\Loader\ArrayLoader; |
| 6 | 6 | use keeko\core\exceptions\PackageException; |
| 7 | 7 | use Composer\Package\CompletePackageInterface; |
| 8 | -use Composer\Package\Loader\ValidatingArrayLoader; |
|
| 9 | 8 | use Composer\Json\JsonFile; |
| 10 | 9 | |
| 11 | 10 | class PackageManager { |
@@ -1,13 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace keeko\core\routing; |
| 3 | 3 | |
| 4 | -use Symfony\Component\Routing\Generator\UrlGenerator; |
|
| 5 | -use Symfony\Component\Routing\Matcher\UrlMatcher; |
|
| 6 | -use Symfony\Component\Routing\RequestContext; |
|
| 7 | 4 | use Symfony\Component\Routing\Route; |
| 8 | 5 | use Symfony\Component\Routing\RouteCollection; |
| 9 | -use Symfony\Component\OptionsResolver\OptionsResolver; |
|
| 10 | -use Symfony\Component\OptionsResolver\OptionsResolverInterface; |
|
| 11 | 6 | use keeko\core\handler\ModuleActionHandler; |
| 12 | 7 | |
| 13 | 8 | class ModuleActionRouter extends AbstractRouter implements RouterInterface { |