locomotivemtl / charcoal-app

config/config.php

Indentation +46 added lines, -46 removed lines

@@ -1,54 +1,54 @@
 <?php
 return [
 
-	'logger'=>[
-		'level'=>'debug'
-	],
+    'logger'=>[
+        'level'=>'debug'
+    ],
 
-	'view'=>[
-		'path'=>[
-			'../templates/'
-		],
+    'view'=>[
+        'path'=>[
+            '../templates/'
+        ],
         'default_template'=>'default',
-		'default_engine'=>'mustache'
-	],
+        'default_engine'=>'mustache'
+    ],
 
-	'routes' => [
-		'templates' => [
-			'default' => [
-				'ident'=>'default'
-			],
-			'example' => [
-				'ident'=>'example',
-				'controller'=>null,
-				'methods'=>['GET'],
-				'group'=>null,
-				'template'=>'example',
-				'engine'=>'mustache',
-				'cache'=>[
-					'active'=>true,
-					'key'=>'route/{{ident}}/{{lang}}/'
-				],
-				'options'=>[]
-			]
-		],
-		'actions' => [
-			'default' => [],
-			'example' => [
-				'ident'=>'example',
-				'controller'=>null,
-				'methods'=>['POST'],
-				'group'=>null
-			]
-		],
-		'scripts' => [
-			'example' => [
-				'ident'=>'example',
-				'controller'=>null,
-				'methods'=>['GET'],
-				'group'=>null
-			]
-		]
-	]
+    'routes' => [
+        'templates' => [
+            'default' => [
+                'ident'=>'default'
+            ],
+            'example' => [
+                'ident'=>'example',
+                'controller'=>null,
+                'methods'=>['GET'],
+                'group'=>null,
+                'template'=>'example',
+                'engine'=>'mustache',
+                'cache'=>[
+                    'active'=>true,
+                    'key'=>'route/{{ident}}/{{lang}}/'
+                ],
+                'options'=>[]
+            ]
+        ],
+        'actions' => [
+            'default' => [],
+            'example' => [
+                'ident'=>'example',
+                'controller'=>null,
+                'methods'=>['POST'],
+                'group'=>null
+            ]
+        ],
+        'scripts' => [
+            'example' => [
+                'ident'=>'example',
+                'controller'=>null,
+                'methods'=>['GET'],
+                'group'=>null
+            ]
+        ]
+    ]
 ];
 

config/dependencies.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 $container = $app->getContainer();
 
 // PSR-3 logger with monolog
-$container['logger'] = function ($c) {
+$container['logger'] = function($c) {
     $logger = new MonologLogger('Charcoal');
     $logger->pushProcessor(new UidProcessor());
     $logger->pushHandler(new MonologStreamHandler('charcoal.app.log', \Monolog\Logger::DEBUG));

src/Charcoal/App/Language/Language.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
         if ($name instanceof TranslationStringInterface) {
             $config = $name->available_langs();
         } elseif (is_array($name)) {
-            $config = [ 'languages' => array_keys($name) ];
+            $config = ['languages' => array_keys($name)];
         } else {
             $config = null;
         }

src/Charcoal/App/App.php

Spacing +4 added lines, -4 removed lines

@@ -101,7 +101,7 @@ 
     {
         if ($this->module_manager == null) {
             $config  = $this->config();
-            $modules = (isset($config['modules']) ? $config['modules'] : [] );
+            $modules = (isset($config['modules']) ? $config['modules'] : []);
             $this->module_manager = new ModuleManager([
                 'config' => $modules,
                 'app'    => $this->app,
@@ -118,7 +118,7 @@ 
     {
         if ($this->route_manager === null) {
             $config = $this->config();
-            $routes = (isset($config['routes']) ? $config['routes'] : [] );
+            $routes = (isset($config['routes']) ? $config['routes'] : []);
             $route_manager = new RouteManager([
                 'config' => $routes,
                 'app'    => $this->app,
@@ -135,7 +135,7 @@ 
     {
         if ($this->middleware_manager === null) {
             $config = $this->config();
-            $middlewares = (isset($config['middlewares']) ? $config['middlewares'] : [] );
+            $middlewares = (isset($config['middlewares']) ? $config['middlewares'] : []);
             $middleware_manager = new MiddlewareManager([
                 'config' => $middlewares,
                 'app'    => $this->app,
@@ -227,7 +227,7 @@ 
         // For now, need to rely on a catch-all...
         $this->app->get(
             '{catchall:.*}',
-            function (
+            function(
                 RequestInterface $request,
                 ResponseInterface $response,
                 $args

Doc Comments +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
      * Initialize the Charcoal App before running (with SlimApp).
      *
      * @param boolean $silent If true, will run in silent mot (no response).
-     * @return App Chainable
+     * @return ResponseInterface Chainable
      */
     public function run($silent = false)
     {

www/index.php

Indentation +3 added lines, -3 removed lines

@@ -51,11 +51,11 @@
     {
         return $c['response']
             ->withStatus(500)
-			->withHeader('Content-Type', 'text/html')
-			->write(
+            ->withHeader('Content-Type', 'text/html')
+            ->write(
                 sprintf('Something went wrong! (%s)'."\n", $exception->getMessage())
             );
-	};
+    };
 };
 
 // Slim is the main app

Spacing +10 added lines, -10 removed lines

@@ -27,32 +27,32 @@ 
 
 $container['charcoal/app/config'] = function($c) {
     $config = new AppConfig();
-    $config->add_file(__DIR__.'/../config/config.php');
+    $config->add_file(__DIR__ . '/../config/config.php');
     return $config;
 };
 
 // Handle "404 Not Found"
-$container['notFoundHandler'] = function ($c) 
+$container['notFoundHandler'] = function($c) 
 { 
-    return function ($request, $response) use ($c) 
+    return function($request, $response) use ($c) 
     { 
         return $c['response'] 
             ->withStatus(404) 
             ->withHeader('Content-Type', 'text/html')
-            ->write('Page not found'."\n"); 
+            ->write('Page not found' . "\n"); 
     }; 
 };
 
 // Handle "500 Server Error" 
-$container['errorHandler'] = function ($c) 
+$container['errorHandler'] = function($c) 
 {
-    return function ($request, $response, $exception) use ($c) 
+    return function($request, $response, $exception) use ($c) 
     {
         return $c['response']
             ->withStatus(500)
 			->withHeader('Content-Type', 'text/html')
 			->write(
-                sprintf('Something went wrong! (%s)'."\n", $exception->getMessage())
+                sprintf('Something went wrong! (%s)' . "\n", $exception->getMessage())
             );
 	};
 };
@@ -61,11 +61,11 @@ 
 $app = new App($container);
 
 // Set up dependencies
-require __DIR__.'/../config/dependencies.php';
+require __DIR__ . '/../config/dependencies.php';
 // Register middlewares
-require __DIR__.'/../config/middlewares.php';
+require __DIR__ . '/../config/middlewares.php';
 // Register routes
-require __DIR__.'/../config/routes.php';
+require __DIR__ . '/../config/routes.php';
 
 $app->set_logger($container['logger']);
 

src/Charcoal/App/Language/LanguageManager.php

Doc Comments +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
      * Resolve a string identifier for a given Language.
      *
      * @param  LanguageInterface $lang  The instance that needs resolution.
-     * @param  mixed             $ident Optional key/index of $config in previous method.
+     * @param  string|null             $ident Optional key/index of $config in previous method.
      * @throws InvalidArgumentException If the language ident is null.
      * @return void
      */

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
         }
 
         if (isset($config['languages'])) {
-            $available_langs = array_filter($config['languages'], function ($config) {
+            $available_langs = array_filter($config['languages'], function($config) {
                 return (!isset($config['active']) || $config['active']);
             });
 
@@ -138,7 +138,7 @@ 
     public static function language_index()
     {
         if (!isset(self::$language_index)) {
-            self::$language_index = new GenericConfig(__DIR__.'/../../../../config/languages.json');
+            self::$language_index = new GenericConfig(__DIR__ . '/../../../../config/languages.json');
         }
 
         return self::$language_index;
@@ -152,7 +152,7 @@ 
      * @throws InvalidArgumentException If the language ident is null.
      * @return void
      */
-    public function resolve_ident(LanguageInterface &$lang, $ident = null)
+    public function resolve_ident(LanguageInterface & $lang, $ident = null)
     {
         if (is_string($ident)) {
             $lang->set_ident($ident);

src/Charcoal/App/Routable/RoutableTrait.php

Doc Comments +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 
     /**
      * @param boolean $routable Routable flag, if the object is routable or not.
-     * @return RoutableInterface Chainable
+     * @return RoutableTrait Chainable
      */
     public function set_routable($routable)
     {
@@ -51,7 +51,7 @@ 
 
     /**
      * @param mixed $pattern The slug / URL / route pattern (translation string).
-     * @return RoutableInterface Chainable
+     * @return RoutableTrait Chainable
      */
     public function set_slug_pattern($pattern)
     {
@@ -69,7 +69,7 @@ 
 
     /**
      * @param mixed $slug The slug value (translation string).
-     * @return RoutableInterface Chainable
+     * @return RoutableTrait Chainable
      */
     public function set_slug($slug)
     {

src/Charcoal/App/Script/CronScriptTrait.php

Indentation +3 added lines, -3 removed lines

@@ -49,9 +49,9 @@
         $lock_file = sys_get_temp_dir().'/'.$lock_name;
         $this->lock_fp = fopen($lock_file, 'w');
         if (!$this->lock_fp) {
-             throw new Exception(
-                 'Can not run action. Lock file not available.'
-             );
+                throw new Exception(
+                    'Can not run action. Lock file not available.'
+                );
         }
         if (flock($this->lock_fp, LOCK_EX)) {
             return true;

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     public function start_lock()
     {
         $lock_name = str_replace('\\', '-', get_class($this));
-        $lock_file = sys_get_temp_dir().'/'.$lock_name;
+        $lock_file = sys_get_temp_dir() . '/' . $lock_name;
         $this->lock_fp = fopen($lock_file, 'w');
         if (!$this->lock_fp) {
              throw new Exception(

src/Charcoal/App/Template/AbstractTemplate.php

Doc Comments +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 
     /**
      * @param App $app The template's parent charcoal app instance.
-     * @return App Chainable
+     * @return AbstractTemplate Chainable
      */
     public function set_app(App $app)
     {
@@ -61,7 +61,7 @@ 
      * The default Template View is a simple GenericView.
      *
      * @param array $data The data array (as [key=>value] pair) to set.
-     * @return AbtractTemplate Chainable
+     * @return AbstractTemplate Chainable
      */
     public function set_data(array $data)
     {

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
     public function set_data(array $data)
     {
         foreach ($data as $prop => $val) {
-            $func = [$this, 'set_'.$prop];
+            $func = [$this, 'set_' . $prop];
 
             if ($val === null) {
                 continue;