locomotivemtl / charcoal-app

src/Charcoal/App/ServiceProvider/AppServiceProvider.php

Unused Use Statements -9 removed lines

@@ -14,7 +14,6 @@ 
 use Slim\Http\Uri;
 
 // From 'league/climate'
-use League\CLImate\CLImate;
 
 // From Mustache
 use Mustache_LambdaHelper as LambdaHelper;
@@ -33,28 +32,20 @@ 
 
 // 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\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\ScriptServiceProvider;

Spacing +20 added lines, -20 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);
 
@@ -282,7 +282,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' => [
@@ -326,7 +326,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' => [
@@ -349,7 +349,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' => [
@@ -371,7 +371,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' => [
@@ -388,7 +388,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);
         };
     }
@@ -407,7 +407,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' => [
@@ -425,7 +425,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'];
@@ -435,11 +435,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);
             });
 
@@ -456,7 +456,7 @@ 
     protected function registerViewServices(Container $container)
     {
         if (!isset($container['view/mustache/helpers'])) {
-            $container['view/mustache/helpers'] = function () {
+            $container['view/mustache/helpers'] = function() {
                 return [];
             };
         }
@@ -466,7 +466,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 = [
                 /**
@@ -493,7 +493,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);
                     }
@@ -504,7 +504,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/ServiceProvider/ScriptServiceProvider.php

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 
 // From 'charcoal-factory'
 use Charcoal\Factory\GenericFactory as Factory;
-
 use Charcoal\App\Route\ScriptRoute;
 use Charcoal\App\Script\ScriptInterface;
 

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,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' => [
@@ -79,7 +79,7 @@ 
          * @param Container $container A container instance.
          * @return null|\League\CLImate\Util\Reader\ReaderInterface
          */
-        $container['script/climate/reader'] = function () {
+        $container['script/climate/reader'] = function() {
             return null;
         };
 
@@ -87,7 +87,7 @@ 
          * @param Container $container A container instance.
          * @return CLImate
          */
-        $container['script/climate'] = function () {
+        $container['script/climate'] = function() {
             $climate = new CLImate();
             return $climate;
         };