@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | /** |
| 70 | - * @param $appVersion |
|
| 70 | + * @param string $appVersion |
|
| 71 | 71 | * |
| 72 | 72 | * @return $this |
| 73 | 73 | */ |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * This method uses plain PHP functions like header() and echo to output |
| 129 | 129 | * the response. |
| 130 | 130 | * |
| 131 | - * @param \Exception|FlattenException $exception An \Exception instance |
|
| 131 | + * @param \Exception $exception An \Exception instance |
|
| 132 | 132 | */ |
| 133 | 133 | public function sendPhpResponse($exception) |
| 134 | 134 | { |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | /** |
| 148 | 148 | * Creates the error Response associated with the given Exception. |
| 149 | 149 | * |
| 150 | - * @param \Exception|FlattenException $exception An \Exception instance |
|
| 150 | + * @param \Exception $exception An \Exception instance |
|
| 151 | 151 | * |
| 152 | 152 | * @return Response A Response instance |
| 153 | 153 | */ |
@@ -299,6 +299,10 @@ discard block |
||
| 299 | 299 | EOT; |
| 300 | 300 | } |
| 301 | 301 | |
| 302 | + /** |
|
| 303 | + * @param string $content |
|
| 304 | + * @param string $css |
|
| 305 | + */ |
|
| 302 | 306 | private function decorate($content, $css) |
| 303 | 307 | { |
| 304 | 308 | $baseStylesheet = $this->getBaseStylesheet(); |
@@ -180,11 +180,11 @@ |
||
| 180 | 180 | public function getContent(FlattenException $exception, $showAll = true) |
| 181 | 181 | { |
| 182 | 182 | switch ($exception->getStatusCode()) { |
| 183 | - case 404: |
|
| 184 | - $title = "The page you are looking for could not be found"; |
|
| 185 | - break; |
|
| 186 | - default: |
|
| 187 | - $title = "Oh noes, something's broken"; |
|
| 183 | + case 404: |
|
| 184 | + $title = "The page you are looking for could not be found"; |
|
| 185 | + break; |
|
| 186 | + default: |
|
| 187 | + $title = "Oh noes, something's broken"; |
|
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | $content = ''; |
@@ -367,7 +367,7 @@ |
||
| 367 | 367 | $formattedValue = sprintf("<em>object</em>(%s)", $this->abbrClass($item[1])); |
| 368 | 368 | } elseif ('array' === $item[0]) { |
| 369 | 369 | $formattedValue = sprintf("<em>array</em>(%s)", is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]); |
| 370 | - } elseif ('string' === $item[0]) { |
|
| 370 | + } elseif ('string' === $item[0]) { |
|
| 371 | 371 | $formattedValue = sprintf("'%s'", htmlspecialchars($item[1], ENT_QUOTES | ENT_SUBSTITUTE, $this->charset)); |
| 372 | 372 | } elseif ('null' === $item[0]) { |
| 373 | 373 | $formattedValue = '<em>null</em>'; |
@@ -92,7 +92,7 @@ |
||
| 92 | 92 | * |
| 93 | 93 | * After the stream has been detached, the stream is in an unusable state. |
| 94 | 94 | * |
| 95 | - * @return resource|null |
|
| 95 | + * @return resource |
|
| 96 | 96 | */ |
| 97 | 97 | public function detach() |
| 98 | 98 | { |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | public function __toString() |
| 69 | 69 | { |
| 70 | - if (! $this->isReadable()) { |
|
| 70 | + if (!$this->isReadable()) { |
|
| 71 | 71 | return ''; |
| 72 | 72 | } |
| 73 | 73 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | public function close() |
| 81 | 81 | { |
| 82 | - if (! $this->resource) { |
|
| 82 | + if (!$this->resource) { |
|
| 83 | 83 | return; |
| 84 | 84 | } |
| 85 | 85 | |
@@ -116,8 +116,8 @@ discard block |
||
| 116 | 116 | public function attach($resource, $mode = 'r') |
| 117 | 117 | { |
| 118 | 118 | $error = null; |
| 119 | - if (! is_resource($resource) && is_string($resource)) { |
|
| 120 | - set_error_handler(function ($e) use (&$error) { |
|
| 119 | + if (!is_resource($resource) && is_string($resource)) { |
|
| 120 | + set_error_handler(function($e) use (&$error) { |
|
| 121 | 121 | $error = $e; |
| 122 | 122 | }, E_WARNING); |
| 123 | 123 | $resource = fopen($resource, $mode); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | throw new InvalidArgumentException('Invalid stream reference provided'); |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - if (! is_resource($resource)) { |
|
| 131 | + if (!is_resource($resource)) { |
|
| 132 | 132 | throw new InvalidArgumentException( |
| 133 | 133 | 'Invalid stream provided; must be a string stream identifier or resource' |
| 134 | 134 | ); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | public function tell() |
| 162 | 162 | { |
| 163 | - if (! $this->resource) { |
|
| 163 | + if (!$this->resource) { |
|
| 164 | 164 | return false; |
| 165 | 165 | } |
| 166 | 166 | |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | */ |
| 175 | 175 | public function eof() |
| 176 | 176 | { |
| 177 | - if (! $this->resource) { |
|
| 177 | + if (!$this->resource) { |
|
| 178 | 178 | return true; |
| 179 | 179 | } |
| 180 | 180 | |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | */ |
| 189 | 189 | public function isSeekable() |
| 190 | 190 | { |
| 191 | - if (! $this->resource) { |
|
| 191 | + if (!$this->resource) { |
|
| 192 | 192 | return false; |
| 193 | 193 | } |
| 194 | 194 | |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | */ |
| 215 | 215 | public function seek($offset, $whence = SEEK_SET) |
| 216 | 216 | { |
| 217 | - if (! $this->resource || ! $this->isSeekable()) { |
|
| 217 | + if (!$this->resource || !$this->isSeekable()) { |
|
| 218 | 218 | return false; |
| 219 | 219 | } |
| 220 | 220 | |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | */ |
| 231 | 231 | public function rewind() |
| 232 | 232 | { |
| 233 | - if (! $this->isSeekable()) { |
|
| 233 | + if (!$this->isSeekable()) { |
|
| 234 | 234 | return false; |
| 235 | 235 | } |
| 236 | 236 | |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | */ |
| 247 | 247 | public function isWritable() |
| 248 | 248 | { |
| 249 | - if (! $this->resource) { |
|
| 249 | + if (!$this->resource) { |
|
| 250 | 250 | return false; |
| 251 | 251 | } |
| 252 | 252 | |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | */ |
| 266 | 266 | public function write($string) |
| 267 | 267 | { |
| 268 | - if (! $this->resource) { |
|
| 268 | + if (!$this->resource) { |
|
| 269 | 269 | return false; |
| 270 | 270 | } |
| 271 | 271 | |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | */ |
| 280 | 280 | public function isReadable() |
| 281 | 281 | { |
| 282 | - if (! $this->resource) { |
|
| 282 | + if (!$this->resource) { |
|
| 283 | 283 | return false; |
| 284 | 284 | } |
| 285 | 285 | |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | */ |
| 303 | 303 | public function read($length) |
| 304 | 304 | { |
| 305 | - if (! $this->resource || ! $this->isReadable()) { |
|
| 305 | + if (!$this->resource || !$this->isReadable()) { |
|
| 306 | 306 | return false; |
| 307 | 307 | } |
| 308 | 308 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | */ |
| 321 | 321 | public function getContents() |
| 322 | 322 | { |
| 323 | - if (! $this->isReadable()) { |
|
| 323 | + if (!$this->isReadable()) { |
|
| 324 | 324 | return ''; |
| 325 | 325 | } |
| 326 | 326 | |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | $metadata = stream_get_meta_data($this->resource); |
| 344 | - if (! array_key_exists($key, $metadata)) { |
|
| 344 | + if (!array_key_exists($key, $metadata)) { |
|
| 345 | 345 | return; |
| 346 | 346 | } |
| 347 | 347 | |
@@ -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 | |
@@ -40,6 +40,9 @@ |
||
| 40 | 40 | $this->add($uri, 'post', $callback); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | + /** |
|
| 44 | + * @param string $method |
|
| 45 | + */ |
|
| 43 | 46 | public function add($uri, $method, $callback) |
| 44 | 47 | { |
| 45 | 48 | $this->routes[md5($uri . $method)] = array( |
@@ -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\View; |
| 12 | 12 | |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | use Symfony\Component\Routing\Matcher\UrlMatcher as UrlMatcher; |
| 15 | 15 | use Symfony\Component\Routing\Route as Route; |
| 16 | 16 | use Symfony\Component\Routing\RouteCollection; |
| 17 | -use Symfony\Component\Routing\Router; |
|
| 18 | 17 | |
| 19 | 18 | /** |
| 20 | 19 | * The PPI MicroApp bootstrap class. |
@@ -458,7 +458,7 @@ |
||
| 458 | 458 | * Get an option from the controller. |
| 459 | 459 | * |
| 460 | 460 | * @param string $option The option name |
| 461 | - * @param null $default The default value if the option does not exist |
|
| 461 | + * @param string $default The default value if the option does not exist |
|
| 462 | 462 | * |
| 463 | 463 | * @return mixed |
| 464 | 464 | */ |
@@ -254,34 +254,34 @@ |
||
| 254 | 254 | { |
| 255 | 255 | switch ($key = strtolower($key)) { |
| 256 | 256 | |
| 257 | - case 'ajax': |
|
| 258 | - if (!isset($this->isCache['ajax'])) { |
|
| 259 | - return $this->isCache['ajax'] = $this->getService('Request')->isXmlHttpRequest(); |
|
| 260 | - } |
|
| 261 | - |
|
| 262 | - return $this->isCache['ajax']; |
|
| 263 | - |
|
| 264 | - case 'put': |
|
| 265 | - case 'delete': |
|
| 266 | - case 'post': |
|
| 267 | - case 'patch': |
|
| 268 | - if (!isset($this->isCache['requestMethod'][$key])) { |
|
| 269 | - $this->isCache['requestMethod'][$key] = $this->getService('Request')->getMethod() === strtoupper($key); |
|
| 270 | - } |
|
| 271 | - |
|
| 272 | - return $this->isCache['requestMethod'][$key]; |
|
| 273 | - |
|
| 274 | - case 'ssl': |
|
| 275 | - case 'https': |
|
| 276 | - case 'secure': |
|
| 277 | - if (!isset($this->isCache['secure'])) { |
|
| 278 | - $this->isCache['secure'] = $this->getService('Request')->isSecure(); |
|
| 279 | - } |
|
| 280 | - |
|
| 281 | - return $this->isCache['secure']; |
|
| 282 | - |
|
| 283 | - default: |
|
| 284 | - throw new \InvalidArgumentException("Invalid 'is' key supplied: {$key}"); |
|
| 257 | + case 'ajax': |
|
| 258 | + if (!isset($this->isCache['ajax'])) { |
|
| 259 | + return $this->isCache['ajax'] = $this->getService('Request')->isXmlHttpRequest(); |
|
| 260 | + } |
|
| 261 | + |
|
| 262 | + return $this->isCache['ajax']; |
|
| 263 | + |
|
| 264 | + case 'put': |
|
| 265 | + case 'delete': |
|
| 266 | + case 'post': |
|
| 267 | + case 'patch': |
|
| 268 | + if (!isset($this->isCache['requestMethod'][$key])) { |
|
| 269 | + $this->isCache['requestMethod'][$key] = $this->getService('Request')->getMethod() === strtoupper($key); |
|
| 270 | + } |
|
| 271 | + |
|
| 272 | + return $this->isCache['requestMethod'][$key]; |
|
| 273 | + |
|
| 274 | + case 'ssl': |
|
| 275 | + case 'https': |
|
| 276 | + case 'secure': |
|
| 277 | + if (!isset($this->isCache['secure'])) { |
|
| 278 | + $this->isCache['secure'] = $this->getService('Request')->isSecure(); |
|
| 279 | + } |
|
| 280 | + |
|
| 281 | + return $this->isCache['secure']; |
|
| 282 | + |
|
| 283 | + default: |
|
| 284 | + throw new \InvalidArgumentException("Invalid 'is' key supplied: {$key}"); |
|
| 285 | 285 | |
| 286 | 286 | } |
| 287 | 287 | } |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * This file is part of the PPI Framework. |
|
| 4 | - * |
|
| 5 | - * @copyright Copyright (c) 2012 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) 2012 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\View\Twig\Loader; |
| 12 | 12 | |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | /** |
| 32 | 32 | * Given a request object, find the matching route |
| 33 | 33 | * |
| 34 | - * @param Request $request |
|
| 34 | + * @param SymfonyRequest $request |
|
| 35 | 35 | * @return \Illuminate\Routing\Route |
| 36 | 36 | */ |
| 37 | 37 | public function matchRequest(SymfonyRequest $request) |
@@ -22,7 +22,6 @@ |
||
| 22 | 22 | use PPI\Framework\View\TemplateLocator; |
| 23 | 23 | use PPI\Framework\View\TemplateNameParser; |
| 24 | 24 | // Mustache |
| 25 | -use Symfony\Bundle\FrameworkBundle\Templating\Loader\FilesystemLoader; |
|
| 26 | 25 | use Symfony\Component\Templating\Helper\AssetsHelper; |
| 27 | 26 | // Twig |
| 28 | 27 | |
@@ -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-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\Config; |
| 12 | 12 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | $serviceManager->get('templating.helper.assets'), |
| 125 | 125 | new RouterHelper($serviceManager->get('router')), |
| 126 | 126 | new SessionHelper($serviceManager->get('session')), |
| 127 | - ) |
|
| 127 | + ) |
|
| 128 | 128 | ); |
| 129 | 129 | |
| 130 | 130 | $engine->addGlobal('app', $serviceManager->get('templating.globals')); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | /* |
| 76 | 76 | * Templating Locator. |
| 77 | 77 | */ |
| 78 | - $serviceManager->setFactory('templating.locator', function ($serviceManager) use ($appCacheDir) { |
|
| 78 | + $serviceManager->setFactory('templating.locator', function($serviceManager) use ($appCacheDir) { |
|
| 79 | 79 | return new TemplateLocator( |
| 80 | 80 | $serviceManager->get('file_locator'), |
| 81 | 81 | $appCacheDir |
@@ -85,28 +85,28 @@ discard block |
||
| 85 | 85 | /* |
| 86 | 86 | * Templating Name Parser. |
| 87 | 87 | */ |
| 88 | - $serviceManager->setFactory('templating.name_parser', function ($serviceManager) { |
|
| 88 | + $serviceManager->setFactory('templating.name_parser', function($serviceManager) { |
|
| 89 | 89 | return new TemplateNameParser($serviceManager->get('modulemanager')); |
| 90 | 90 | }); |
| 91 | 91 | |
| 92 | 92 | /* |
| 93 | 93 | * Filesystem Loader. |
| 94 | 94 | */ |
| 95 | - $serviceManager->setFactory('templating.loader.filesystem', function ($serviceManager) { |
|
| 95 | + $serviceManager->setFactory('templating.loader.filesystem', function($serviceManager) { |
|
| 96 | 96 | return new FileSystemLoader($serviceManager->get('templating.locator')); |
| 97 | 97 | }); |
| 98 | 98 | |
| 99 | 99 | /* |
| 100 | 100 | * Templating assets helper. |
| 101 | 101 | */ |
| 102 | - $serviceManager->setFactory('templating.helper.assets', function ($serviceManager) { |
|
| 102 | + $serviceManager->setFactory('templating.helper.assets', function($serviceManager) { |
|
| 103 | 103 | return new AssetsHelper($serviceManager->get('request')->getBasePath()); |
| 104 | 104 | }); |
| 105 | 105 | |
| 106 | 106 | /* |
| 107 | 107 | * Templating globals. |
| 108 | 108 | */ |
| 109 | - $serviceManager->setFactory('templating.globals', function ($serviceManager) { |
|
| 109 | + $serviceManager->setFactory('templating.globals', function($serviceManager) { |
|
| 110 | 110 | return new GlobalVariables($serviceManager->get('servicemanager')); |
| 111 | 111 | }); |
| 112 | 112 | |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | * |
| 116 | 116 | * TODO: Migrate to Symfony\Bundle\FrameworkBundle\Templating\PhpEngine |
| 117 | 117 | */ |
| 118 | - $serviceManager->setFactory('templating.engine.php', function ($serviceManager) use ($appCharset) { |
|
| 118 | + $serviceManager->setFactory('templating.engine.php', function($serviceManager) use ($appCharset) { |
|
| 119 | 119 | $engine = new PhpEngine( |
| 120 | 120 | $serviceManager->get('templating.name_parser'), |
| 121 | 121 | $serviceManager->get('templating.loader'), |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | /* |
| 137 | 137 | * Twig Engine |
| 138 | 138 | */ |
| 139 | - $serviceManager->setFactory('templating.engine.twig', function ($serviceManager) { |
|
| 139 | + $serviceManager->setFactory('templating.engine.twig', function($serviceManager) { |
|
| 140 | 140 | |
| 141 | 141 | if (!class_exists('Twig_Environment')) { |
| 142 | 142 | throw new \Exception('PPI\Framework\TwigModule not found. Composer require: ppi/twig-module'); |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | /* |
| 160 | 160 | * Smarty Engine. |
| 161 | 161 | */ |
| 162 | - $serviceManager->setFactory('templating.engine.smarty', function ($serviceManager) use ($appCacheDir) { |
|
| 162 | + $serviceManager->setFactory('templating.engine.smarty', function($serviceManager) use ($appCacheDir) { |
|
| 163 | 163 | |
| 164 | 164 | if (!class_exists('NoiseLabs\Bundle\SmartyBundle\SmartyEngine')) { |
| 165 | 165 | throw new \Exception('PPI\Framework\SmartyModule not found. Composer require: ppi/smarty-module'); |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | }); |
| 189 | 189 | |
| 190 | 190 | // Mustache Engine |
| 191 | - $serviceManager->setFactory('templating.engine.mustache', function ($serviceManager, $appCacheDir) { |
|
| 191 | + $serviceManager->setFactory('templating.engine.mustache', function($serviceManager, $appCacheDir) { |
|
| 192 | 192 | |
| 193 | 193 | if (!class_exists('Mustache_Engine')) { |
| 194 | 194 | throw new \Exception('PPI\Framework\MustacheModule not found. Composer require: ppi/mustache-module'); |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | /* |
| 207 | 207 | * Delegating Engine. |
| 208 | 208 | */ |
| 209 | - $serviceManager->setFactory('templating.engine.delegating', function ($serviceManager) use ($engineIds) { |
|
| 209 | + $serviceManager->setFactory('templating.engine.delegating', function($serviceManager) use ($engineIds) { |
|
| 210 | 210 | $delegatingEngine = new DelegatingEngine(); |
| 211 | 211 | // @todo - lazy load this |
| 212 | 212 | foreach ($engineIds as $id) { |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | * |
| 26 | 26 | * @param ServiceLocatorInterface $serviceLocator |
| 27 | 27 | * |
| 28 | - * @return \PPI\Framework\Router\RouterListener |
|
| 28 | + * @return RequestContext |
|
| 29 | 29 | */ |
| 30 | 30 | public function createService(ServiceLocatorInterface $serviceLocator) |
| 31 | 31 | { |
@@ -61,7 +61,6 @@ |
||
| 61 | 61 | $defaults = $defaults['framework']['router']; |
| 62 | 62 | |
| 63 | 63 | return isset($config['framework']['router']) ? |
| 64 | - $this->mergeConfiguration($defaults, $config['framework']['router']) : |
|
| 65 | - $defaults; |
|
| 64 | + $this->mergeConfiguration($defaults, $config['framework']['router']) : $defaults; |
|
| 66 | 65 | } |
| 67 | 66 | } |
@@ -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 | |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | /** |
| 71 | 71 | * Renders a template. |
| 72 | 72 | * |
| 73 | - * @param mixed $name A template name |
|
| 73 | + * @param string $name A template name |
|
| 74 | 74 | * @param array $parameters An array of parameters to pass to the template |
| 75 | 75 | * |
| 76 | 76 | * @throws \InvalidArgumentException if the template does not exist |
@@ -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 | |