ppi / framework

src/Debug/ExceptionHandler.php

Doc Comments +7 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
     }
 
     /**
-     * @param $appVersion
+     * @param string $appVersion
      *
      * @return $this
      */
@@ -128,7 +128,7 @@ 
      * This method uses plain PHP functions like header() and echo to output
      * the response.
      *
-     * @param \Exception|FlattenException $exception An \Exception instance
+     * @param \Exception $exception An \Exception instance
      */
     public function sendPhpResponse($exception)
     {
@@ -147,7 +147,7 @@ 
     /**
      * Creates the error Response associated with the given Exception.
      *
-     * @param \Exception|FlattenException $exception An \Exception instance
+     * @param \Exception $exception An \Exception instance
      *
      * @return Response A Response instance
      */
@@ -299,6 +299,10 @@ 
 EOT;
     }
 
+    /**
+     * @param string $content
+     * @param string $css
+     */
     private function decorate($content, $css)
     {
         $baseStylesheet = $this->getBaseStylesheet();

Switch Indentation +5 added lines, -5 removed lines

@@ -180,11 +180,11 @@
     public function getContent(FlattenException $exception, $showAll = true)
     {
         switch ($exception->getStatusCode()) {
-            case 404:
-                $title = "The page you are looking for could not be found";
-                break;
-            default:
-                $title = "Oh noes, something's broken";
+        case 404:
+            $title = "The page you are looking for could not be found";
+            break;
+        default:
+            $title = "Oh noes, something's broken";
         }
 
         $content = '';

Spacing +1 added lines, -1 removed lines

@@ -367,7 +367,7 @@
                 $formattedValue = sprintf("<em>object</em>(%s)", $this->abbrClass($item[1]));
             } elseif ('array' === $item[0]) {
                 $formattedValue = sprintf("<em>array</em>(%s)", is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
-            } elseif ('string'  === $item[0]) {
+            } elseif ('string' === $item[0]) {
                 $formattedValue = sprintf("'%s'", htmlspecialchars($item[1], ENT_QUOTES | ENT_SUBSTITUTE, $this->charset));
             } elseif ('null' === $item[0]) {
                 $formattedValue = '<em>null</em>';

src/MicroApp.php

Doc Comments +3 added lines

@@ -40,6 +40,9 @@
         $this->add($uri, 'post', $callback);
     }
 
+    /**
+     * @param string $method
+     */
     public function add($uri, $method, $callback)
     {
         $this->routes[md5($uri . $method)] = array(

Unused Use Statements -2 removed lines

@@ -12,10 +12,8 @@
 
 use PPI\Framework\App as BaseApp;
 use Symfony\Component\Routing\Matcher\UrlMatcher as UrlMatcher;
-use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route as Route;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Router;
 
 /**
  * The PPI MicroApp bootstrap class.

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * This file is part of the PPI Framework.
- *
- * @copyright  Copyright (c) 2011-2013 Paul Dragoonis <paul@ppi.io>
- * @license    http://opensource.org/licenses/mit-license.php MIT
- *
- * @link       http://www.ppi.io
- */
+     * This file is part of the PPI Framework.
+     *
+     * @copyright  Copyright (c) 2011-2013 Paul Dragoonis <paul@ppi.io>
+     * @license    http://opensource.org/licenses/mit-license.php MIT
+     *
+     * @link       http://www.ppi.io
+     */
 
 namespace PPI\Framework\View;
 

src/Module/Controller.php

Doc Comments +1 added lines, -1 removed lines

@@ -458,7 +458,7 @@
      * Get an option from the controller.
      *
      * @param string $option  The option name
-     * @param null   $default The default value if the option does not exist
+     * @param string   $default The default value if the option does not exist
      *
      * @return mixed
      */

Switch Indentation +28 added lines, -28 removed lines

@@ -254,34 +254,34 @@
     {
         switch ($key = strtolower($key)) {
 
-            case 'ajax':
-                if (!isset($this->isCache['ajax'])) {
-                    return $this->isCache['ajax'] = $this->getService('Request')->isXmlHttpRequest();
-                }
-
-                return $this->isCache['ajax'];
-
-            case 'put':
-            case 'delete':
-            case 'post':
-            case 'patch':
-                if (!isset($this->isCache['requestMethod'][$key])) {
-                    $this->isCache['requestMethod'][$key] = $this->getService('Request')->getMethod() === strtoupper($key);
-                }
-
-                return $this->isCache['requestMethod'][$key];
-
-            case 'ssl':
-            case 'https':
-            case 'secure':
-                if (!isset($this->isCache['secure'])) {
-                    $this->isCache['secure'] = $this->getService('Request')->isSecure();
-                }
-
-                return $this->isCache['secure'];
-
-            default:
-                throw new \InvalidArgumentException("Invalid 'is' key supplied: {$key}");
+        case 'ajax':
+            if (!isset($this->isCache['ajax'])) {
+                return $this->isCache['ajax'] = $this->getService('Request')->isXmlHttpRequest();
+            }
+
+            return $this->isCache['ajax'];
+
+        case 'put':
+        case 'delete':
+        case 'post':
+        case 'patch':
+            if (!isset($this->isCache['requestMethod'][$key])) {
+                $this->isCache['requestMethod'][$key] = $this->getService('Request')->getMethod() === strtoupper($key);
+            }
+
+            return $this->isCache['requestMethod'][$key];
+
+        case 'ssl':
+        case 'https':
+        case 'secure':
+            if (!isset($this->isCache['secure'])) {
+                $this->isCache['secure'] = $this->getService('Request')->isSecure();
+            }
+
+            return $this->isCache['secure'];
+
+        default:
+            throw new \InvalidArgumentException("Invalid 'is' key supplied: {$key}");
 
         }
     }

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * This file is part of the PPI Framework.
- *
- * @copyright  Copyright (c) 2012 Paul Dragoonis <paul@ppi.io>
- * @license    http://opensource.org/licenses/mit-license.php MIT
- *
- * @link       http://www.ppi.io
- */
+     * This file is part of the PPI Framework.
+     *
+     * @copyright  Copyright (c) 2012 Paul Dragoonis <paul@ppi.io>
+     * @license    http://opensource.org/licenses/mit-license.php MIT
+     *
+     * @link       http://www.ppi.io
+     */
 
 namespace PPI\Framework\View\Twig\Loader;
 

src/Module/Listener/DefaultListenerAggregate.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 use Zend\ModuleManager\Listener\ModuleResolverListener;
 use Zend\ModuleManager\ModuleEvent;
 use Zend\Stdlib\ArrayUtils;
-use Aura\Router\Router as AuraRouter;
 
 /**
  * DefaultListenerAggregate class.

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * This file is part of the PPI Framework.
- *
- * @copyright  Copyright (c) 2011-2015 Paul Dragoonis <paul@ppi.io>
- * @license    http://opensource.org/licenses/mit-license.php MIT
- *
- * @link       http://www.ppi.io
- */
+     * This file is part of the PPI Framework.
+     *
+     * @copyright  Copyright (c) 2011-2015 Paul Dragoonis <paul@ppi.io>
+     * @license    http://opensource.org/licenses/mit-license.php MIT
+     *
+     * @link       http://www.ppi.io
+     */
 
 namespace PPI\Framework\Router;
 

src/Router/LaravelRouter.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     /**
      * Given a request object, find the matching route
      *
-     * @param Request $request
+     * @param SymfonyRequest $request
      * @return \Illuminate\Routing\Route
      */
     public function matchRequest(SymfonyRequest $request)

src/Router/Loader/LaravelRoutesLoader.php

Unused Use Statements -7 removed lines

@@ -9,13 +9,6 @@
 
 namespace PPI\Framework\Router\Loader;
 
-use Illuminate\Http\Request;
-use Illuminate\Routing\Route;
-use Illuminate\Routing\Router;
-use Illuminate\Events\Dispatcher;
-use Illuminate\Container\Container;
-use Symfony\Component\HttpFoundation\Response;
-
 use Illuminate\Routing\Router as LaravelRouter;
 
 /**

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
     public function load($path)
     {
 
-        if(!is_readable($path)) {
+        if (!is_readable($path)) {
             throw new \InvalidArgumentException('Invalid laravel routes path found: ' . $path);
         }
 
@@ -54,7 +54,7 @@ 
         // The included file must return the laravel router
         include $path;
 
-        if(!($router instanceof LaravelRouter)) {
+        if (!($router instanceof LaravelRouter)) {
             throw new \Exception('Invalid return value from '
                 . pathinfo($path, PATHINFO_FILENAME)
                 . ' expected instance of LaravelRouter'

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * This file is part of the PPI Framework.
- *
- * @copyright  Copyright (c) 2011-2015 Paul Dragoonis <paul@ppi.io>
- * @license    http://opensource.org/licenses/mit-license.php MIT
- * @link       http://www.ppi.io
- */
+     * This file is part of the PPI Framework.
+     *
+     * @copyright  Copyright (c) 2011-2015 Paul Dragoonis <paul@ppi.io>
+     * @license    http://opensource.org/licenses/mit-license.php MIT
+     * @link       http://www.ppi.io
+     */
 
 namespace PPI\Framework\Router\Wrapper;
 

src/ServiceManager/Config/TemplatingConfig.php

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
 use PPI\Framework\View\TemplateLocator;
 use PPI\Framework\View\TemplateNameParser;
 // Mustache
-use Symfony\Bundle\FrameworkBundle\Templating\Loader\FilesystemLoader;
 use Symfony\Component\Templating\Helper\AssetsHelper;
 // Twig
 

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * This file is part of the PPI Framework.
- *
- * @copyright   Copyright (c) 2011-2013 Paul Dragoonis <paul@ppi.io>
- * @license     http://opensource.org/licenses/mit-license.php MIT
- *
- * @link        http://www.ppi.io
- */
+     * This file is part of the PPI Framework.
+     *
+     * @copyright   Copyright (c) 2011-2013 Paul Dragoonis <paul@ppi.io>
+     * @license     http://opensource.org/licenses/mit-license.php MIT
+     *
+     * @link        http://www.ppi.io
+     */
 
 namespace PPI\Framework\ServiceManager\Config;
 
@@ -124,7 +124,7 @@ 
                     $serviceManager->get('templating.helper.assets'),
                     new RouterHelper($serviceManager->get('router')),
                     new SessionHelper($serviceManager->get('session')),
-                 )
+                    )
             );
 
             $engine->addGlobal('app', $serviceManager->get('templating.globals'));

Spacing +10 added lines, -10 removed lines

@@ -75,7 +75,7 @@ 
         /*
          * Templating Locator.
          */
-        $serviceManager->setFactory('templating.locator', function ($serviceManager) use ($appCacheDir) {
+        $serviceManager->setFactory('templating.locator', function($serviceManager) use ($appCacheDir) {
             return new TemplateLocator(
                 $serviceManager->get('file_locator'),
                 $appCacheDir
@@ -85,28 +85,28 @@ 
         /*
          * Templating Name Parser.
          */
-        $serviceManager->setFactory('templating.name_parser', function ($serviceManager) {
+        $serviceManager->setFactory('templating.name_parser', function($serviceManager) {
             return new TemplateNameParser($serviceManager->get('modulemanager'));
         });
 
         /*
          * Filesystem Loader.
          */
-        $serviceManager->setFactory('templating.loader.filesystem', function ($serviceManager) {
+        $serviceManager->setFactory('templating.loader.filesystem', function($serviceManager) {
             return new FileSystemLoader($serviceManager->get('templating.locator'));
         });
 
         /*
          * Templating assets helper.
          */
-        $serviceManager->setFactory('templating.helper.assets', function ($serviceManager) {
+        $serviceManager->setFactory('templating.helper.assets', function($serviceManager) {
             return new AssetsHelper($serviceManager->get('request')->getBasePath());
         });
 
         /*
          * Templating globals.
          */
-        $serviceManager->setFactory('templating.globals', function ($serviceManager) {
+        $serviceManager->setFactory('templating.globals', function($serviceManager) {
             return new GlobalVariables($serviceManager->get('servicemanager'));
         });
 
@@ -115,7 +115,7 @@ 
          *
          * TODO: Migrate to Symfony\Bundle\FrameworkBundle\Templating\PhpEngine
          */
-        $serviceManager->setFactory('templating.engine.php', function ($serviceManager) use ($appCharset) {
+        $serviceManager->setFactory('templating.engine.php', function($serviceManager) use ($appCharset) {
             $engine = new PhpEngine(
                 $serviceManager->get('templating.name_parser'),
                 $serviceManager->get('templating.loader'),
@@ -136,7 +136,7 @@ 
         /*
          * Twig Engine
          */
-        $serviceManager->setFactory('templating.engine.twig', function ($serviceManager) {
+        $serviceManager->setFactory('templating.engine.twig', function($serviceManager) {
 
             if (!class_exists('Twig_Environment')) {
                 throw new \Exception('PPI\Framework\TwigModule not found. Composer require: ppi/twig-module');
@@ -159,7 +159,7 @@ 
         /*
          * Smarty Engine.
          */
-        $serviceManager->setFactory('templating.engine.smarty', function ($serviceManager) use ($appCacheDir) {
+        $serviceManager->setFactory('templating.engine.smarty', function($serviceManager) use ($appCacheDir) {
 
             if (!class_exists('NoiseLabs\Bundle\SmartyBundle\SmartyEngine')) {
                 throw new \Exception('PPI\Framework\SmartyModule not found. Composer require: ppi/smarty-module');
@@ -188,7 +188,7 @@ 
         });
 
         // Mustache Engine
-        $serviceManager->setFactory('templating.engine.mustache', function ($serviceManager, $appCacheDir) {
+        $serviceManager->setFactory('templating.engine.mustache', function($serviceManager, $appCacheDir) {
 
             if (!class_exists('Mustache_Engine')) {
                 throw new \Exception('PPI\Framework\MustacheModule not found. Composer require: ppi/mustache-module');
@@ -206,7 +206,7 @@ 
         /*
          * Delegating Engine.
          */
-        $serviceManager->setFactory('templating.engine.delegating', function ($serviceManager) use ($engineIds) {
+        $serviceManager->setFactory('templating.engine.delegating', function($serviceManager) use ($engineIds) {
             $delegatingEngine = new DelegatingEngine();
             // @todo - lazy load this
             foreach ($engineIds as $id) {

src/ServiceManager/Factory/RouterFactory.php

Unused Use Statements -3 removed lines

@@ -14,16 +14,13 @@
 use PPI\Framework\Router\ChainRouter;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-
 use PPI\Framework\Router\Router as SymfonyRouter;
 use PPI\Framework\Router\Wrapper\SymfonyRouterWrapper;
 use Symfony\Component\Routing\RouteCollection as SymfonyRouteCollection;
-
 use Illuminate\Http\Request as LaravelRequest;
 use Illuminate\Routing\Router as LaravelRouter;
 use Illuminate\Routing\UrlGenerator as LaravelUrlGenerator;
 use PPI\LaravelRouting\Wrapper\LaravelRouterWrapper;
-
 use Aura\Router\Router as AuraRouter;
 use PPI\Framework\Router\Wrapper\AuraRouterWrapper;
 

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         // For each module, add a matching instance type to the chain router
         foreach ($allModuleRoutes as $moduleName => $moduleRoutingResponse) {
 
-            switch(true) {
+            switch (true) {
                 // @todo - move this to a separate method()
                 case $moduleRoutingResponse instanceof SymfonyRouteCollection:
                     $sfRouter = new SymfonyRouter($requestContext, $moduleRoutingResponse, $routerOptions, $logger);

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * This file is part of the PPI Framework.
- *
- * @copyright   Copyright (c) 2011-2015 Paul Dragoonis <paul@ppi.io>
- * @license     http://opensource.org/licenses/mit-license.php MIT
- *
- * @link        http://www.ppi.io
- */
+     * This file is part of the PPI Framework.
+     *
+     * @copyright   Copyright (c) 2011-2015 Paul Dragoonis <paul@ppi.io>
+     * @license     http://opensource.org/licenses/mit-license.php MIT
+     *
+     * @link        http://www.ppi.io
+     */
 
 namespace PPI\Framework\ServiceManager;
 

Switch Indentation +28 added lines, -28 removed lines

@@ -60,37 +60,37 @@
 
             switch(true) {
                 // @todo - move this to a separate method()
-                case $moduleRoutingResponse instanceof SymfonyRouteCollection:
-                    $sfRouter = new SymfonyRouter($requestContext, $moduleRoutingResponse, $routerOptions, $logger);
-                    $sfRouterWrapper = new SymfonyRouterWrapper($sfRouter);
-                    $chainRouter->add($sfRouterWrapper);
-                    break;
-
-                // @todo - move this to a separate method()
-                case $moduleRoutingResponse instanceof AuraRouter:
-                    $auraRouterWrapper = new AuraRouterWrapper($moduleRoutingResponse);
-                    $chainRouter->add($auraRouterWrapper);
-                    break;
-
-                // @todo - move this to a separate method()
-                case $moduleRoutingResponse instanceof LaravelRouter:
-                    $laravelRequest = new LaravelRequest();
-                    $laravelUrlGenerator = new LaravelUrlGenerator($moduleRoutingResponse->getRoutes(), $laravelRequest);
-                    $laravelRouterWrapper = new LaravelRouterWrapper(
-                        $moduleRoutingResponse, $laravelRequest, $laravelUrlGenerator
-                    );
-                    // @todo - solve this problem
+            case $moduleRoutingResponse instanceof SymfonyRouteCollection:
+                $sfRouter = new SymfonyRouter($requestContext, $moduleRoutingResponse, $routerOptions, $logger);
+                $sfRouterWrapper = new SymfonyRouterWrapper($sfRouter);
+                $chainRouter->add($sfRouterWrapper);
+                break;
+
+            // @todo - move this to a separate method()
+            case $moduleRoutingResponse instanceof AuraRouter:
+                $auraRouterWrapper = new AuraRouterWrapper($moduleRoutingResponse);
+                $chainRouter->add($auraRouterWrapper);
+                break;
+
+            // @todo - move this to a separate method()
+            case $moduleRoutingResponse instanceof LaravelRouter:
+                $laravelRequest = new LaravelRequest();
+                $laravelUrlGenerator = new LaravelUrlGenerator($moduleRoutingResponse->getRoutes(), $laravelRequest);
+                $laravelRouterWrapper = new LaravelRouterWrapper(
+                    $moduleRoutingResponse, $laravelRequest, $laravelUrlGenerator
+                );
+                // @todo - solve this problem
 //                    $laravelRouterWrapper->setModuleName($this->getName());
-                    $chainRouter->add($laravelRouterWrapper);
-                    break;
+                $chainRouter->add($laravelRouterWrapper);
+                break;
 
-                case $moduleRoutingResponse instanceof FastRouteWrapper:
-                    $chainRouter->add($moduleRoutingResponse);
-                    break;
+            case $moduleRoutingResponse instanceof FastRouteWrapper:
+                $chainRouter->add($moduleRoutingResponse);
+                break;
 
-                default:
-                    throw new \Exception('Unexpected routes value return from module: ' . $moduleName .
-                        '. found value of type: ' . gettype($moduleRoutingResponse));
+            default:
+                throw new \Exception('Unexpected routes value return from module: ' . $moduleName .
+                    '. found value of type: ' . gettype($moduleRoutingResponse));
             }
         }
 

src/ServiceManager/Factory/RouterListenerFactory.php

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 namespace PPI\Framework\ServiceManager\Factory;
 
 use PPI\Framework\Router\RouterListener;
-use Symfony\Component\Routing\RequestContext;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * This file is part of the PPI Framework.
- *
- * @copyright   Copyright (c) 2011-2013 Paul Dragoonis <paul@ppi.io>
- * @license     http://opensource.org/licenses/mit-license.php MIT
- *
- * @link        http://www.ppi.io
- */
+     * This file is part of the PPI Framework.
+     *
+     * @copyright   Copyright (c) 2011-2013 Paul Dragoonis <paul@ppi.io>
+     * @license     http://opensource.org/licenses/mit-license.php MIT
+     *
+     * @link        http://www.ppi.io
+     */
 
 namespace PPI\Framework\ServiceManager;