@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | /** |
404 | 404 | * @note Added for compatibility with Symfony's HttpKernel\Kernel. |
405 | 405 | * |
406 | - * @return null|ServiceManager\ServiceManager |
|
406 | + * @return ServiceManager\ServiceManager |
|
407 | 407 | */ |
408 | 408 | public function getContainer() |
409 | 409 | { |
@@ -601,7 +601,7 @@ discard block |
||
601 | 601 | /** |
602 | 602 | * Creates and initializes a ServiceManager instance. |
603 | 603 | * |
604 | - * @return ServiceManager The compiled service manager |
|
604 | + * @return ServiceManagerBuilder The compiled service manager |
|
605 | 605 | */ |
606 | 606 | protected function buildServiceManager() |
607 | 607 | { |
@@ -651,7 +651,7 @@ discard block |
||
651 | 651 | /** |
652 | 652 | * Logs with an arbitrary level. |
653 | 653 | * |
654 | - * @param mixed $level |
|
654 | + * @param string $level |
|
655 | 655 | * @param string $message |
656 | 656 | * @param array $context |
657 | 657 | */ |
@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | public function getRootDir() |
382 | 382 | { |
383 | 383 | if (null === $this->rootDir) { |
384 | - $this->rootDir = realpath(getcwd().'/app'); |
|
384 | + $this->rootDir = realpath(getcwd() . '/app'); |
|
385 | 385 | } |
386 | 386 | |
387 | 387 | return $this->rootDir; |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | */ |
471 | 471 | public function getCacheDir() |
472 | 472 | { |
473 | - return $this->rootDir.'/cache/'.$this->environment; |
|
473 | + return $this->rootDir . '/cache/' . $this->environment; |
|
474 | 474 | } |
475 | 475 | |
476 | 476 | /** |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | */ |
483 | 483 | public function getLogDir() |
484 | 484 | { |
485 | - return $this->rootDir.'/logs'; |
|
485 | + return $this->rootDir . '/logs'; |
|
486 | 486 | } |
487 | 487 | |
488 | 488 | /** |
@@ -505,8 +505,8 @@ discard block |
||
505 | 505 | public function getConfigManager() |
506 | 506 | { |
507 | 507 | if (null === $this->configManager) { |
508 | - $cachePath = $this->getCacheDir().'/application-config-cache.'.$this->getName().'.php'; |
|
509 | - $this->configManager = new ConfigManager($cachePath, !$this->debug, $this->rootDir.'/config'); |
|
508 | + $cachePath = $this->getCacheDir() . '/application-config-cache.' . $this->getName() . '.php'; |
|
509 | + $this->configManager = new ConfigManager($cachePath, !$this->debug, $this->rootDir . '/config'); |
|
510 | 510 | } |
511 | 511 | |
512 | 512 | return $this->configManager; |
@@ -10,7 +10,6 @@ |
||
10 | 10 | |
11 | 11 | namespace PPI\Framework\Router\Loader; |
12 | 12 | |
13 | -use Illuminate\Routing\Router; |
|
14 | 13 | use Illuminate\Routing\Router as LaravelRouter; |
15 | 14 | |
16 | 15 | /** |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * This file is part of the PPI Framework. |
|
4 | - * |
|
5 | - * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | - * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | - * |
|
8 | - * @link http://www.ppi.io |
|
9 | - */ |
|
3 | + * This file is part of the PPI Framework. |
|
4 | + * |
|
5 | + * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | + * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | + * |
|
8 | + * @link http://www.ppi.io |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | namespace PPI\Framework; |
12 | 12 |
@@ -122,7 +122,7 @@ |
||
122 | 122 | protected function getResourcesPath($module) |
123 | 123 | { |
124 | 124 | if (is_callable(array($module, 'getResourcesPath'))) { |
125 | - $resourcesPath = $module->getResourcesPath(); |
|
125 | + $resourcesPath = $module->getResourcesPath(); |
|
126 | 126 | } else { |
127 | 127 | $resourcesPath = $module->getPath(); |
128 | 128 | } |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * This file is part of the PPI Framework. |
|
4 | - * |
|
5 | - * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | - * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | - * |
|
8 | - * @link http://www.ppi.io |
|
9 | - */ |
|
3 | + * This file is part of the PPI Framework. |
|
4 | + * |
|
5 | + * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | + * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | + * |
|
8 | + * @link http://www.ppi.io |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | namespace PPI\Framework; |
12 | 12 |
@@ -144,7 +144,7 @@ |
||
144 | 144 | } |
145 | 145 | |
146 | 146 | // The included file must return the laravel router |
147 | - $getRouteCollector = function () use ($routeCollector, $path) { |
|
147 | + $getRouteCollector = function() use ($routeCollector, $path) { |
|
148 | 148 | $r = $routeCollector; |
149 | 149 | include $path; |
150 | 150 |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * This file is part of the PPI Framework. |
|
4 | - * |
|
5 | - * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | - * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | - * |
|
8 | - * @link http://www.ppi.io |
|
9 | - */ |
|
3 | + * This file is part of the PPI Framework. |
|
4 | + * |
|
5 | + * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | + * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | + * |
|
8 | + * @link http://www.ppi.io |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | namespace PPI\Framework; |
12 | 12 |
@@ -58,37 +58,37 @@ |
||
58 | 58 | foreach ($allModuleRoutes as $moduleName => $moduleRoutingResponse) { |
59 | 59 | switch (true) { |
60 | 60 | // @todo - move this to a separate method() |
61 | - case $moduleRoutingResponse instanceof SymfonyRouteCollection: |
|
62 | - $sfRouter = new SymfonyRouter($requestContext, $moduleRoutingResponse, $routerOptions, $logger); |
|
63 | - $sfRouterWrapper = new SymfonyRouterWrapper($sfRouter); |
|
64 | - $chainRouter->add($sfRouterWrapper); |
|
65 | - break; |
|
61 | + case $moduleRoutingResponse instanceof SymfonyRouteCollection: |
|
62 | + $sfRouter = new SymfonyRouter($requestContext, $moduleRoutingResponse, $routerOptions, $logger); |
|
63 | + $sfRouterWrapper = new SymfonyRouterWrapper($sfRouter); |
|
64 | + $chainRouter->add($sfRouterWrapper); |
|
65 | + break; |
|
66 | 66 | |
67 | - // @todo - move this to a separate method() |
|
68 | - case $moduleRoutingResponse instanceof AuraRouter: |
|
69 | - $auraRouterWrapper = new AuraRouterWrapper($moduleRoutingResponse); |
|
70 | - $chainRouter->add($auraRouterWrapper); |
|
71 | - break; |
|
67 | + // @todo - move this to a separate method() |
|
68 | + case $moduleRoutingResponse instanceof AuraRouter: |
|
69 | + $auraRouterWrapper = new AuraRouterWrapper($moduleRoutingResponse); |
|
70 | + $chainRouter->add($auraRouterWrapper); |
|
71 | + break; |
|
72 | 72 | |
73 | - // @todo - move this to a separate method() |
|
74 | - case $moduleRoutingResponse instanceof LaravelRouter: |
|
75 | - $laravelRequest = new LaravelRequest(); |
|
76 | - $laravelUrlGenerator = new LaravelUrlGenerator($moduleRoutingResponse->getRoutes(), $laravelRequest); |
|
77 | - $laravelRouterWrapper = new LaravelRouterWrapper( |
|
78 | - $moduleRoutingResponse, $laravelRequest, $laravelUrlGenerator |
|
79 | - ); |
|
80 | - // @todo - solve this problem |
|
73 | + // @todo - move this to a separate method() |
|
74 | + case $moduleRoutingResponse instanceof LaravelRouter: |
|
75 | + $laravelRequest = new LaravelRequest(); |
|
76 | + $laravelUrlGenerator = new LaravelUrlGenerator($moduleRoutingResponse->getRoutes(), $laravelRequest); |
|
77 | + $laravelRouterWrapper = new LaravelRouterWrapper( |
|
78 | + $moduleRoutingResponse, $laravelRequest, $laravelUrlGenerator |
|
79 | + ); |
|
80 | + // @todo - solve this problem |
|
81 | 81 | // $laravelRouterWrapper->setModuleName($this->getName()); |
82 | - $chainRouter->add($laravelRouterWrapper); |
|
83 | - break; |
|
82 | + $chainRouter->add($laravelRouterWrapper); |
|
83 | + break; |
|
84 | 84 | |
85 | - case $moduleRoutingResponse instanceof FastRouteWrapper: |
|
86 | - $chainRouter->add($moduleRoutingResponse); |
|
87 | - break; |
|
85 | + case $moduleRoutingResponse instanceof FastRouteWrapper: |
|
86 | + $chainRouter->add($moduleRoutingResponse); |
|
87 | + break; |
|
88 | 88 | |
89 | - default: |
|
90 | - throw new \Exception('Unexpected routes value return from module: ' . $moduleName . |
|
91 | - '. found value of type: ' . gettype($moduleRoutingResponse)); |
|
89 | + default: |
|
90 | + throw new \Exception('Unexpected routes value return from module: ' . $moduleName . |
|
91 | + '. found value of type: ' . gettype($moduleRoutingResponse)); |
|
92 | 92 | } |
93 | 93 | } |
94 | 94 |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * This file is part of the PPI Framework. |
|
4 | - * |
|
5 | - * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | - * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | - * |
|
8 | - * @link http://www.ppi.io |
|
9 | - */ |
|
3 | + * This file is part of the PPI Framework. |
|
4 | + * |
|
5 | + * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | + * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | + * |
|
8 | + * @link http://www.ppi.io |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | namespace PPI\Framework\Module\Controller; |
12 | 12 |
@@ -1,12 +1,12 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * This file is part of the PPI Framework. |
|
4 | - * |
|
5 | - * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | - * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | - * |
|
8 | - * @link http://www.ppi.io |
|
9 | - */ |
|
3 | + * This file is part of the PPI Framework. |
|
4 | + * |
|
5 | + * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | + * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | + * |
|
8 | + * @link http://www.ppi.io |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | namespace PPI\Framework\Console\Command; |
12 | 12 | |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | rename( |
235 | 235 | $moduleDir . DIRECTORY_SEPARATOR . $routingFiles[0], |
236 | 236 | str_replace('IndexInvoke', 'Index', $moduleDir . DIRECTORY_SEPARATOR . $routingFiles[0] |
237 | - )); |
|
237 | + )); |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | // Success |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * This file is part of the PPI Framework. |
|
4 | - * |
|
5 | - * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | - * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | - * |
|
8 | - * @link http://www.ppi.io |
|
9 | - */ |
|
3 | + * This file is part of the PPI Framework. |
|
4 | + * |
|
5 | + * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | + * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | + * |
|
8 | + * @link http://www.ppi.io |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | namespace PPI\Framework\Module\Controller; |
12 | 12 |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * This file is part of the PPI Framework. |
|
4 | - * |
|
5 | - * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | - * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | - * |
|
8 | - * @link http://www.ppi.io |
|
9 | - */ |
|
3 | + * This file is part of the PPI Framework. |
|
4 | + * |
|
5 | + * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | + * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | + * |
|
8 | + * @link http://www.ppi.io |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | namespace PPI\Framework\Module\Controller; |
12 | 12 |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * This file is part of the PPI Framework. |
|
4 | - * |
|
5 | - * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | - * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | - * |
|
8 | - * @link http://www.ppi.io |
|
9 | - */ |
|
3 | + * This file is part of the PPI Framework. |
|
4 | + * |
|
5 | + * @copyright Copyright (c) 2011-2016 Paul Dragoonis <[email protected]> |
|
6 | + * @license http://opensource.org/licenses/mit-license.php MIT |
|
7 | + * |
|
8 | + * @link http://www.ppi.io |
|
9 | + */ |
|
10 | 10 | |
11 | 11 | namespace PPI\Framework\Module\Controller; |
12 | 12 |