locomotivemtl / charcoal-app

src/Charcoal/App/Route/TemplateRouteConfig.php

Spacing +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
     public function setRedirectMode($redirectMode)
     {
         $redirectMode = (int)$redirectMode;
-        if ($redirectMode < 300 || $redirectMode  >= 400) {
+        if ($redirectMode < 300 || $redirectMode >= 400) {
             throw new InvalidArgumentException(
                 'Invalid HTTP status for redirect mode'
             );

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use InvalidArgumentException;
 
 // From 'charcoal-translator'
-use Charcoal\Translator\Translation;
 
 // From 'charcoal-app'
 use Charcoal\App\App;

src/Charcoal/App/Module/AbstractModule.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
     {
         if (!isset($this->routeManager)) {
             $config = $this->config();
-            $routes = (isset($config['routes']) ? $config['routes'] : [] );
+            $routes = (isset($config['routes']) ? $config['routes'] : []);
 
             $this->routeManager = new RouteManager([
                 'config' => $routes,

src/Charcoal/App/CallableResolverAwareTrait.php

Spacing +4 added lines, -4 removed lines

@@ -87,22 +87,22 @@
                 $method = $matches[2];
 
                 if (is_object($context)) {
-                    $callable = [ $context, $method ];
+                    $callable = [$context, $method];
                 }
 
                 if (!is_callable($callable)) {
                     switch ($class) {
                         case '':
                         case 'self':
-                            $callable = [ $this, $method ];
+                            $callable = [$this, $method];
                             break;
 
                         case 'static':
-                            $callable = [ static::class, $method ];
+                            $callable = [static::class, $method];
                             break;
 
                         case 'parent':
-                            $callable = [ $this, 'parent::'.$method ];
+                            $callable = [$this, 'parent::'.$method];
                             break;
                     }
                 }

src/Charcoal/App/Script/ArgScriptTrait.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         foreach ($params as $key => $param) {
             $setter = $this->setter($key);
 
-            if (!is_callable([ $this, $setter ])) {
+            if (!is_callable([$this, $setter])) {
                 continue;
             }
 

src/Charcoal/App/Script/PathScriptTrait.php

Spacing +3 added lines, -3 removed lines

@@ -38,8 +38,8 @@ 
     public function processMultiplePaths($paths)
     {
         $paths = $this->parseAsArray($paths);
-        $paths = array_map([ $this, 'filterPath' ], $paths);
-        $paths = array_filter($paths, [ $this, 'pathExists' ]);
+        $paths = array_map([$this, 'filterPath'], $paths);
+        $paths = array_filter($paths, [$this, 'pathExists']);
 
         if ($paths === false) {
             throw new InvalidArgumentException('Received invalid paths.');
@@ -161,7 +161,7 @@ 
 
         $depth = 1;
         $files = glob($pattern, $flags);
-        foreach (glob(dirname($pattern).'/*', (GLOB_ONLYDIR|GLOB_NOSORT)) as $dir) {
+        foreach (glob(dirname($pattern).'/*', (GLOB_ONLYDIR | GLOB_NOSORT)) as $dir) {
             $files = array_merge($files, $this->globRecursive($dir.'/'.basename($pattern), $flags));
             $depth++;
             if ($maxDepth > 0 && $depth >= $maxDepth) {

src/Charcoal/App/AppContainer.php

Indentation +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
     private function registerProviderFactory()
     {
         /**
-        * @return Factory
-        */
+         * @return Factory
+         */
         if (!isset($this['provider/factory'])) {
             $this['provider/factory'] = function () {
                 return new Factory([

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         * @return Factory
         */
         if (!isset($this['provider/factory'])) {
-            $this['provider/factory'] = function () {
+            $this['provider/factory'] = function() {
                 return new Factory([
                     'base_class'       => ServiceProviderInterface::class,
                     'resolver_options' => [

src/Charcoal/App/ServiceProvider/AppServiceProvider.php

Indentation +2 added lines, -2 removed lines

@@ -473,8 +473,8 @@
                                 $hash  = isset($parts['fragment']) ? $parts['fragment'] : '';
 
                                 $uri = $baseUrl->withPath($path)
-                                               ->withQuery($query)
-                                               ->withFragment($hash);
+                                                ->withQuery($query)
+                                                ->withFragment($hash);
                             }
                         }
                     }

Unused Use Statements -7 removed lines

@@ -32,29 +32,22 @@
 
 // From 'charcoal-app'
 use Charcoal\App\AppConfig;
-
 use Charcoal\App\Action\ActionInterface;
 use Charcoal\App\Script\ScriptInterface;
 use Charcoal\App\Module\ModuleInterface;
-
 use Charcoal\App\Middleware\IpMiddleware;
-
 use Charcoal\App\Route\ActionRoute;
 use Charcoal\App\Route\RouteInterface;
 use Charcoal\App\Route\ScriptRoute;
 use Charcoal\App\Route\TemplateRoute;
-
 use Charcoal\App\Handler\Error;
 use Charcoal\App\Handler\PhpError;
 use Charcoal\App\Handler\Maintenance;
 use Charcoal\App\Handler\NotAllowed;
 use Charcoal\App\Handler\NotFound;
-
 use Charcoal\App\Template\TemplateInterface;
-use Charcoal\App\Template\TemplateBuilder;
 use Charcoal\App\Template\WidgetInterface;
 use Charcoal\App\Template\WidgetBuilder;
-
 use Charcoal\App\ServiceProvider\DatabaseServiceProvider;
 use Charcoal\App\ServiceProvider\FilesystemServiceProvider;
 use Charcoal\App\ServiceProvider\LoggerServiceProvider;

Spacing +23 added lines, -23 removed lines

@@ -121,7 +121,7 @@ 
              * @param Container $container
              * @return boolean
              */
-            $container['debug'] = function (Container $container) {
+            $container['debug'] = function(Container $container) {
                 if (isset($container['config']['debug'])) {
                     $debug = !!$container['config']['debug'];
                 } elseif (isset($container['config']['dev_mode'])) {
@@ -142,7 +142,7 @@ 
              * @param Container $container
              * @return \Psr\Http\Message\UriInterface
              */
-            $container['base-url'] = function (Container $container) {
+            $container['base-url'] = function(Container $container) {
                 if (isset($container['config']['base_url'])) {
                     $baseUrl = $container['config']['base_url'];
                 } else {
@@ -178,7 +178,7 @@ 
              * @param  Container               $container A container instance.
              * @return \Charcoal\App\Handler\HandlerInterface
              */
-            $container->extend('notFoundHandler', function ($handler, Container $container) use ($config) {
+            $container->extend('notFoundHandler', function($handler, Container $container) use ($config) {
                 if ($handler instanceof \Slim\Handlers\NotFound) {
                     $notFoundConfig = isset($config['notFound']) ? $config['notFound'] : [];
                     $handler = new NotFound($container, $notFoundConfig);
@@ -197,7 +197,7 @@ 
              * @param  Container               $container A container instance.
              * @return \Charcoal\App\Handler\HandlerInterface
              */
-            $container->extend('notAllowedHandler', function ($handler, Container $container) use ($config) {
+            $container->extend('notAllowedHandler', function($handler, Container $container) use ($config) {
                 if ($handler instanceof \Slim\Handlers\NotAllowed) {
                     $notAllowedConfig = isset($config['notAllowed']) ? $config['notAllowed'] : [];
                     $handler = new NotAllowed($container, $notAllowedConfig);
@@ -216,7 +216,7 @@ 
              * @param  Container               $container A container instance.
              * @return \Charcoal\App\Handler\HandlerInterface
              */
-            $container->extend('phpErrorHandler', function ($handler, Container $container) use ($config) {
+            $container->extend('phpErrorHandler', function($handler, Container $container) use ($config) {
                 if ($handler instanceof \Slim\Handlers\PhpError) {
                     $phpErrorConfig = isset($config['phpError']) ? $config['phpError'] : [];
                     $handler = new PhpError($container, $phpErrorConfig);
@@ -235,7 +235,7 @@ 
              * @param  Container               $container A container instance.
              * @return \Charcoal\App\Handler\HandlerInterface
              */
-            $container->extend('errorHandler', function ($handler, Container $container) use ($config) {
+            $container->extend('errorHandler', function($handler, Container $container) use ($config) {
                 if ($handler instanceof \Slim\Handlers\Error) {
                     $errorConfig = isset($config['error']) ? $config['error'] : [];
                     $handler = new Error($container, $errorConfig);
@@ -255,7 +255,7 @@ 
              * @param  Container $container A Pimple DI container.
              * @return \Charcoal\App\Handler\HandlerInterface
              */
-            $container['maintenanceHandler'] = function (Container $container) use ($config) {
+            $container['maintenanceHandler'] = function(Container $container) use ($config) {
                 $maintenanceConfig = isset($config['maintenance']) ? $config['maintenance'] : [];
                 $handler = new Maintenance($container, $maintenanceConfig);
 
@@ -285,7 +285,7 @@ 
          * @param Container $container A container instance.
          * @return \Charcoal\Factory\FactoryInterface
          */
-        $container['route/factory'] = function (Container $container) {
+        $container['route/factory'] = function(Container $container) {
             return new Factory([
                 'base_class'       => RouteInterface::class,
                 'resolver_options' => [
@@ -329,7 +329,7 @@ 
          * @param Container $container A container instance.
          * @return \Charcoal\Factory\FactoryInterface
          */
-        $container['action/factory'] = function (Container $container) {
+        $container['action/factory'] = function(Container $container) {
             return new Factory([
                 'base_class'       => ActionInterface::class,
                 'resolver_options' => [
@@ -352,7 +352,7 @@ 
          * @param Container $container A container instance.
          * @return \Charcoal\Factory\FactoryInterface
          */
-        $container['script/factory'] = function (Container $container) {
+        $container['script/factory'] = function(Container $container) {
             return new Factory([
                 'base_class'       => ScriptInterface::class,
                 'resolver_options' => [
@@ -376,7 +376,7 @@ 
          * @param Container $container A container instance.
          * @return \Charcoal\Factory\FactoryInterface
          */
-        $container['template/factory'] = function (Container $container) {
+        $container['template/factory'] = function(Container $container) {
             return new Factory([
                 'base_class'       => TemplateInterface::class,
                 'resolver_options' => [
@@ -398,7 +398,7 @@ 
          * @param Container $container A container instance.
          * @return \Charcoal\Factory\FactoryInterface
          */
-        $container['widget/factory'] = function (Container $container) {
+        $container['widget/factory'] = function(Container $container) {
             return new Factory([
                 'base_class'       => WidgetInterface::class,
                 'resolver_options' => [
@@ -415,7 +415,7 @@ 
          * @param Container $container A container instance.
          * @return WidgetBuilder
          */
-        $container['widget/builder'] = function (Container $container) {
+        $container['widget/builder'] = function(Container $container) {
             return new WidgetBuilder($container['widget/factory'], $container);
         };
     }
@@ -434,7 +434,7 @@ 
          * @param Container $container A container instance.
          * @return \Charcoal\Factory\FactoryInterface
          */
-        $container['module/factory'] = function (Container $container) {
+        $container['module/factory'] = function(Container $container) {
             return new Factory([
                 'base_class'       => ModuleInterface::class,
                 'resolver_options' => [
@@ -452,7 +452,7 @@ 
          * @param Container $container A container instance.
          * @return array
          */
-        $container['module/classes'] = function (Container $container) {
+        $container['module/classes'] = function(Container $container) {
             $appConfig = $container['config'];
 
             $modules = $appConfig['modules'];
@@ -462,11 +462,11 @@ 
                 'suffix' => 'Module'
             ]);
 
-            $modules = array_map(function ($module) use ($moduleResolver) {
+            $modules = array_map(function($module) use ($moduleResolver) {
                 return $moduleResolver->resolve($module);
             }, $modules);
 
-            array_filter($modules, function ($class) {
+            array_filter($modules, function($class) {
                 return class_exists($class);
             });
 
@@ -484,7 +484,7 @@ 
          * @param Container $container A container instance.
          * @return null|\League\CLImate\Util\Reader\ReaderInterface
          */
-        $container['climate/reader'] = function (Container $container) {
+        $container['climate/reader'] = function(Container $container) {
             return null;
         };
 
@@ -492,7 +492,7 @@ 
          * @param Container $container A container instance.
          * @return CLImate
          */
-        $container['climate'] = function () {
+        $container['climate'] = function() {
             $climate = new CLImate();
             return $climate;
         };
@@ -507,7 +507,7 @@ 
     protected function registerViewServices(Container $container)
     {
         if (!isset($container['view/mustache/helpers'])) {
-            $container['view/mustache/helpers'] = function () {
+            $container['view/mustache/helpers'] = function() {
                 return [];
             };
         }
@@ -517,7 +517,7 @@ 
          *
          * @return array
          */
-        $container->extend('view/mustache/helpers', function (array $helpers, Container $container) {
+        $container->extend('view/mustache/helpers', function(array $helpers, Container $container) {
             $baseUrl = $container['base-url'];
             $urls = [
                 /**
@@ -544,7 +544,7 @@ 
                  * @param  string $uri A URI path to wrap.
                  * @return UriInterface|null
                  */
-                'withBaseUrl' => function ($uri, LambdaHelper $helper = null) use ($baseUrl) {
+                'withBaseUrl' => function($uri, LambdaHelper $helper = null) use ($baseUrl) {
                     if ($helper) {
                         $uri = $helper->render($uri);
                     }
@@ -555,7 +555,7 @@ 
                     } else {
                         $parts = parse_url($uri);
                         if (!isset($parts['scheme'])) {
-                            if (!in_array($uri[0], [ '/', '#', '?' ])) {
+                            if (!in_array($uri[0], ['/', '#', '?'])) {
                                 $path  = isset($parts['path']) ? $parts['path'] : '';
                                 $query = isset($parts['query']) ? $parts['query'] : '';
                                 $hash  = isset($parts['fragment']) ? $parts['fragment'] : '';

src/Charcoal/App/Handler/NotAllowed.php

Doc Comments +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
     /**
      * Set the HTTP methods allowed by the current request.
      *
-     * @param  array $methods Case-sensitive array of methods.
+     * @param  string[] $methods Case-sensitive array of methods.
      * @return self
      */
     protected function setMethods(array $methods)

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 
         return $this->respondWith(
             $response->withStatus($status)
-                     ->withHeader('Allow', $this->getMethods()),
+                        ->withHeader('Allow', $this->getMethods()),
             $contentType,
             $output
         );

src/Charcoal/App/Handler/TemplateableHandlerTrait.php

Unused Use Statements -4 removed lines

@@ -6,14 +6,10 @@
 
 // From PSR-7
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\UriInterface;
 
 // From Pimple
-use Pimple\Container;
 
 // From 'charcoal-translator'
-use Charcoal\Translator\Translator;
 
 // From 'charcoal-view'
 use Charcoal\View\ViewInterface;

Doc Comments +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
     /**
      * Retrieve the final handler data for rendering the view.
      *
-     * @return array Finalized template data.
+     * @return string Finalized template data.
      */
     final protected function templatePartial()
     {