@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * This file is part of the PPI Framework. |
|
| 4 | - * |
|
| 5 | - * @copyright Copyright (c) 2011-2015 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-2015 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\Router; |
| 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-2013 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-2013 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\ServiceManager; |
| 12 | 12 | |
@@ -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 | */ |
@@ -60,37 +60,37 @@ |
||
| 60 | 60 | |
| 61 | 61 | switch(true) { |
| 62 | 62 | // @todo - move this to a separate method() |
| 63 | - case $moduleRoutingResponse instanceof SymfonyRouteCollection: |
|
| 64 | - $sfRouter = new SymfonyRouter($requestContext, $moduleRoutingResponse, $routerOptions, $logger); |
|
| 65 | - $sfRouterWrapper = new SymfonyRouterWrapper($sfRouter); |
|
| 66 | - $chainRouter->add($sfRouterWrapper); |
|
| 67 | - break; |
|
| 68 | - |
|
| 69 | - // @todo - move this to a separate method() |
|
| 70 | - case $moduleRoutingResponse instanceof AuraRouter: |
|
| 71 | - $auraRouterWrapper = new AuraRouterWrapper($moduleRoutingResponse); |
|
| 72 | - $chainRouter->add($auraRouterWrapper); |
|
| 73 | - break; |
|
| 74 | - |
|
| 75 | - // @todo - move this to a separate method() |
|
| 76 | - case $moduleRoutingResponse instanceof LaravelRouter: |
|
| 77 | - $laravelRequest = new LaravelRequest(); |
|
| 78 | - $laravelUrlGenerator = new LaravelUrlGenerator($moduleRoutingResponse->getRoutes(), $laravelRequest); |
|
| 79 | - $laravelRouterWrapper = new LaravelRouterWrapper( |
|
| 80 | - $moduleRoutingResponse, $laravelRequest, $laravelUrlGenerator |
|
| 81 | - ); |
|
| 82 | - // @todo - solve this problem |
|
| 63 | + case $moduleRoutingResponse instanceof SymfonyRouteCollection: |
|
| 64 | + $sfRouter = new SymfonyRouter($requestContext, $moduleRoutingResponse, $routerOptions, $logger); |
|
| 65 | + $sfRouterWrapper = new SymfonyRouterWrapper($sfRouter); |
|
| 66 | + $chainRouter->add($sfRouterWrapper); |
|
| 67 | + break; |
|
| 68 | + |
|
| 69 | + // @todo - move this to a separate method() |
|
| 70 | + case $moduleRoutingResponse instanceof AuraRouter: |
|
| 71 | + $auraRouterWrapper = new AuraRouterWrapper($moduleRoutingResponse); |
|
| 72 | + $chainRouter->add($auraRouterWrapper); |
|
| 73 | + break; |
|
| 74 | + |
|
| 75 | + // @todo - move this to a separate method() |
|
| 76 | + case $moduleRoutingResponse instanceof LaravelRouter: |
|
| 77 | + $laravelRequest = new LaravelRequest(); |
|
| 78 | + $laravelUrlGenerator = new LaravelUrlGenerator($moduleRoutingResponse->getRoutes(), $laravelRequest); |
|
| 79 | + $laravelRouterWrapper = new LaravelRouterWrapper( |
|
| 80 | + $moduleRoutingResponse, $laravelRequest, $laravelUrlGenerator |
|
| 81 | + ); |
|
| 82 | + // @todo - solve this problem |
|
| 83 | 83 | // $laravelRouterWrapper->setModuleName($this->getName()); |
| 84 | - $chainRouter->add($laravelRouterWrapper); |
|
| 85 | - break; |
|
| 84 | + $chainRouter->add($laravelRouterWrapper); |
|
| 85 | + break; |
|
| 86 | 86 | |
| 87 | - case $moduleRoutingResponse instanceof FastRouteWrapper: |
|
| 88 | - $chainRouter->add($moduleRoutingResponse); |
|
| 89 | - break; |
|
| 87 | + case $moduleRoutingResponse instanceof FastRouteWrapper: |
|
| 88 | + $chainRouter->add($moduleRoutingResponse); |
|
| 89 | + break; |
|
| 90 | 90 | |
| 91 | - default: |
|
| 92 | - throw new \Exception('Unexpected routes value return from module: ' . $moduleName . |
|
| 93 | - '. found value of type: ' . gettype($moduleRoutingResponse)); |
|
| 91 | + default: |
|
| 92 | + throw new \Exception('Unexpected routes value return from module: ' . $moduleName . |
|
| 93 | + '. found value of type: ' . gettype($moduleRoutingResponse)); |
|
| 94 | 94 | } |
| 95 | 95 | } |
| 96 | 96 | |
@@ -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-2015 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-2015 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\Router; |
| 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-2015 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-2015 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\Router; |
| 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-2015 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-2015 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\Router; |
| 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-2015 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-2015 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\Router; |
| 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-2015 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-2015 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\Router; |
| 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-2015 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-2015 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\Router; |
| 12 | 12 | |