Erdiko / core

src/AjaxController.php

Indentation +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
 class AjaxController extends Controller
 {
 
-  /**
-   * Contructor
-   */
+    /**
+     * Contructor
+     */
     public function __construct()
     {
         $this->_webroot = ERDIKO_ROOT;

src/Logger.php

Indentation +9 added lines, -9 removed lines

@@ -162,17 +162,17 @@
      */
     public function removeLogFile($key)
     {
-         $arrayKey=strtolower($key);
-         unset($this->_logFiles[$arrayKey]);
-         return true;
+            $arrayKey=strtolower($key);
+            unset($this->_logFiles[$arrayKey]);
+            return true;
     }
 
-     /**
-      * Clear Log
-      *
-      * @param string $logKey
-      * @return bool
-      */
+        /**
+         * Clear Log
+         *
+         * @param string $logKey
+         * @return bool
+         */
     public function clearLog($logKey = null)
     {
         $ret=true;

Spacing +9 added lines, -9 removed lines

@@ -108,8 +108,8 @@ 
     public function addRecord($level, $message, array $context = array())
     {
         $message = (string) $message;
-        $logString=date('Y-m-d H:i:s')." ".$level.": ".$this->interpolate($message, $context).PHP_EOL;
-        $logFileName=$this->_logFiles["default"]; // If log key is null use the default log file
+        $logString = date('Y-m-d H:i:s')." ".$level.": ".$this->interpolate($message, $context).PHP_EOL;
+        $logFileName = $this->_logFiles["default"]; // If log key is null use the default log file
 
         return $this->write($logString, $logFileName, null, "a");
     }
@@ -130,9 +130,9 @@ 
         $replace = array();
         foreach ($context as $key => $val) {
             if ($key == "exception" && $val instanceof \Exception) {
-                $replace['{' . $key . '}'] = $val->getMessage();
+                $replace['{'.$key.'}'] = $val->getMessage();
             } else {
-                $replace['{' . $key . '}'] = $val;
+                $replace['{'.$key.'}'] = $val;
             }
         }
 
@@ -150,7 +150,7 @@ 
      */
     public function addLogFile($key, $logFileName)
     {
-        $arrayKey=strtolower($key);
+        $arrayKey = strtolower($key);
         return $this->_logFiles[$arrayKey] = $logFileName;
     }
 
@@ -162,7 +162,7 @@ 
      */
     public function removeLogFile($key)
     {
-         $arrayKey=strtolower($key);
+         $arrayKey = strtolower($key);
          unset($this->_logFiles[$arrayKey]);
          return true;
     }
@@ -175,14 +175,14 @@ 
       */
     public function clearLog($logKey = null)
     {
-        $ret=true;
-        if ($logKey==null) {
+        $ret = true;
+        if ($logKey == null) {
             foreach ($this->_logFiles as $key => $logFile) {
                 $ret = $ret && $this->write("", $logFile);
             }
             return $ret;
         } else {
-            $arrayKey=strtolower($logKey);
+            $arrayKey = strtolower($logKey);
             if (isset($this->_logFiles[$arrayKey])) {
                 return $this->write("", $this->_logFiles[$arrayKey]);
             } else {

Doc Comments +13 added lines, -12 removed lines

@@ -56,7 +56,7 @@ 
      * @param string $level
      * @param string or an object with a __toString() method$ message
      * @param array $context
-     * @return bool
+     * @return integer
      */
     public function log($level, $message, array $context = array())
     {
@@ -92,7 +92,8 @@ 
      * @param string $level
      * @param string or an object with a __toString() method$ message
      * @param array $context
-     * @return bool
+     * @param string $message
+     * @return integer
      */
     public function addRecord($level, $message, array $context = array())
     {
@@ -110,7 +111,7 @@ 
      *
      * @param string $message or an object with a __toString() method
      * @param array $context replacement values for placeholders
-     * @return bool
+     * @return string
      */
     function interpolate($message, array $context = array())
     {
@@ -134,7 +135,7 @@ 
      *
      * @param mixed $key
      * @param string $logFileName
-     * @return bool
+     * @return string
      */
     public function addLogFile($key, $logFileName)
     {
@@ -190,7 +191,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function emergency($message, array $context = array())
     {
@@ -207,7 +208,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function alert($message, array $context = array())
     {
@@ -223,7 +224,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function critical($message, array $context = array())
     {
@@ -238,7 +239,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function error($message, array $context = array())
     {
@@ -255,7 +256,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function warning($message, array $context = array())
     {
@@ -269,7 +270,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function notice($message, array $context = array())
     {
@@ -285,7 +286,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function info($message, array $context = array())
     {
@@ -299,7 +300,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function debug($message, array $context = array())
     {

src/Theme.php

Indentation +6 added lines, -6 removed lines

@@ -210,7 +210,7 @@ 
      */
     public function addCss($name, $cssFile, $order = 10, $active = 1)
     {
-       $this->_data['css'][$name] = array(
+        $this->_data['css'][$name] = array(
             'file' => $cssFile,
             'order' => $order,
             'active' => $active
@@ -247,11 +247,11 @@ 
             );
     }
 
-     /**
-     * Get Theme Root Folder
-     *
-     * @param string $folder
-     */
+        /**
+         * Get Theme Root Folder
+         *
+         * @param string $folder
+         */
     public function getThemeRootFolder()
     {
         return $this->_themeRootFolder;

Spacing +4 added lines, -4 removed lines

@@ -76,7 +76,7 @@ 
     public function getThemeConfig()
     {
         if (empty($this->_themeConfig)) {
-            $file = $this->getThemeFolder() . 'theme.json';
+            $file = $this->getThemeFolder().'theme.json';
             $this->_themeConfig = Helper::getConfigFile($file);
         }
         return $this->_themeConfig;
@@ -90,7 +90,7 @@ 
     public function getMeta()
     {
         if (isset($this->_contextConfig['site']['meta'])) {
-            return array_merge($this->_contextConfig['site']['meta'],$this->_data['meta']);
+            return array_merge($this->_contextConfig['site']['meta'], $this->_data['meta']);
         } else {
             return $this->_data['meta'];
         }
@@ -127,8 +127,8 @@ 
 
         foreach ($this->getMeta() as $name => $content)
         {
-            if(is_array($content)) {
-                foreach($content as $cont)
+            if (is_array($content)) {
+                foreach ($content as $cont)
                     $html .= "<meta name=\"{$name}\" content=\"{$cont}\">\n";
             } else {
                 $html .= "<meta name=\"{$name}\" content=\"{$content}\">\n";

Braces +6 added lines, -4 removed lines

@@ -62,8 +62,9 @@ 
      */
     public function getContextConfig()
     {
-        if (empty($this->_contextConfig))
-            $this->_contextConfig = Helper::getConfig('application', $this->_context);
+        if (empty($this->_contextConfig)) {
+                    $this->_contextConfig = Helper::getConfig('application', $this->_context);
+        }
         
         return $this->_contextConfig;
     }
@@ -128,8 +129,9 @@ 
         foreach ($this->getMeta() as $name => $content)
         {
             if(is_array($content)) {
-                foreach($content as $cont)
-                    $html .= "<meta name=\"{$name}\" content=\"{$cont}\">\n";
+                foreach($content as $cont) {
+                                    $html .= "<meta name=\"{$name}\" content=\"{$cont}\">\n";
+                }
             } else {
                 $html .= "<meta name=\"{$name}\" content=\"{$content}\">\n";
             }

Doc Comments +3 added lines, -4 removed lines

@@ -206,7 +206,7 @@ 
      * @param string $name
      * @param string $cssFile URL of injected css file
      * @param int $order 
-     * @param boolean $active defaults to 1
+     * @param integer $active defaults to 1
      * @todo need to resolve order of merging and/or eliminate/refactor this function
      */
     public function addCss($name, $cssFile, $order = 10, $active = 1)
@@ -239,7 +239,7 @@ 
      * @param string $name
      * @param string $jsFile URL of js file
      * @param int $order 
-     * @param boolean $active defaults to 1
+     * @param integer $active defaults to 1
      * @todo same issue as addCss
      */
     public function addJs($name, $jsFile, $order = 10, $active = 1)
@@ -254,7 +254,6 @@ 
      /**
      * Get Theme Root Folder
      *
-     * @param string $folder
      */
     public function getThemeRootFolder()
     {
@@ -295,7 +294,7 @@ 
     /**
      * Set content
      *
-     * @param string|Container $content any string or object that implements __toString()
+     * @param string $content any string or object that implements __toString()
      */
     public function setContent($content)
     {

src/Helper.php

Doc Comments +3 added lines, -1 removed lines

@@ -52,7 +52,7 @@ 
     /**
      * Read JSON config file and return array
      *
-     * @param string $file
+     * @param string $filename
      * @return array $config
      */
     public static function getConfigFile($filename)
@@ -75,6 +75,7 @@ 
     
     /**
      * Get configuration
+     * @param string $context
      */
     public static function getConfig($name = 'application', $context = null)
     {
@@ -89,6 +90,7 @@ 
      * Get the compiled application routes from the config files
      *
      * @todo cache the loaded/compiled routes
+     * @param string $context
      */
     public static function getRoutes($context = null)
     {

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
     /**
      * Log Object
      */
-    protected static $_logObject=null; // @todo get rid of this
+    protected static $_logObject = null; // @todo get rid of this
 
     /**
      * Serve your site
@@ -26,7 +26,7 @@ 
      */
     public static function serve($context = null)
     {
-        if(empty($context))
+        if (empty($context))
             $context = getenv('ERDIKO_CONTEXT');
         
         $routes = static::getRoutes($context);
@@ -78,7 +78,7 @@ 
      */
     public static function getConfig($name = 'application', $context = null)
     {
-        if($context == null)
+        if ($context == null)
             $context = getenv('ERDIKO_CONTEXT');
 
         $filename = ERDIKO_APP."/config/{$context}/{$name}.json";
@@ -92,7 +92,7 @@ 
      */
     public static function getRoutes($context = null)
     {
-        if($context == null)
+        if ($context == null)
             $context = getenv('ERDIKO_CONTEXT');
         $file = ERDIKO_APP."/config/{$context}/routes.json";
         $applicationConfig = static::getConfigFile($file);
@@ -106,9 +106,9 @@ 
      */
     public static function sendEmail($toEmail, $subject, $body, $fromEmail)
     {
-        $headers = "From: $fromEmail\r\n" .
-            "Reply-To: $fromEmail\r\n" .
-            "X-Mailer: PHP/" . phpversion();
+        $headers = "From: $fromEmail\r\n".
+            "Reply-To: $fromEmail\r\n".
+            "X-Mailer: PHP/".phpversion();
         
         return mail($toEmail, $subject, $body, $headers);
     }
@@ -127,7 +127,7 @@ 
      */
     public static function log($level, $message, array $context = array())
     {
-        if(static::$_logObject==null)
+        if (static::$_logObject == null)
         {
             $erdikoContext = getenv('ERDIKO_CONTEXT');
             $config = static::getConfig("application", $erdikoContext);
@@ -137,7 +137,7 @@ 
             static::$_logObject = new \erdiko\core\Logger($logFiles, $logDir);
         }
 
-        if(empty($level))
+        if (empty($level))
             $level = \Psr\Log\LogLevel::DEBUG; // Default to debug for convenience
 
         return static::$_logObject->log($level, $message, $context);

Braces +13 added lines, -8 removed lines

@@ -26,8 +26,9 @@ 
      */
     public static function serve($context = null)
     {
-        if(empty($context))
-            $context = getenv('ERDIKO_CONTEXT');
+        if(empty($context)) {
+                    $context = getenv('ERDIKO_CONTEXT');
+        }
         
         $routes = static::getRoutes($context);
         Toro::serve($routes);
@@ -78,8 +79,9 @@ 
      */
     public static function getConfig($name = 'application', $context = null)
     {
-        if($context == null)
-            $context = getenv('ERDIKO_CONTEXT');
+        if($context == null) {
+                    $context = getenv('ERDIKO_CONTEXT');
+        }
 
         $filename = ERDIKO_APP."/config/{$context}/{$name}.json";
         return static::getConfigFile($filename);
@@ -92,8 +94,9 @@ 
      */
     public static function getRoutes($context = null)
     {
-        if($context == null)
-            $context = getenv('ERDIKO_CONTEXT');
+        if($context == null) {
+                    $context = getenv('ERDIKO_CONTEXT');
+        }
         $file = ERDIKO_APP."/config/{$context}/routes.json";
         $applicationConfig = static::getConfigFile($file);
         
@@ -137,8 +140,10 @@ 
             static::$_logObject = new \erdiko\core\Logger($logFiles, $logDir);
         }
 
-        if(empty($level))
-            $level = \Psr\Log\LogLevel::DEBUG; // Default to debug for convenience
+        if(empty($level)) {
+                    $level = \Psr\Log\LogLevel::DEBUG;
+        }
+        // Default to debug for convenience
 
         return static::$_logObject->log($level, $message, $context);
     }

src/ToroHook.php

Doc Comments +3 added lines

@@ -26,6 +26,9 @@
         $instance->hooks[$hook_name][] = $fn;
     }
 
+    /**
+     * @param string $hook_name
+     */
     public static function fire($hook_name, $params = null)
     {
         $instance = static::get_instance();

src/Toro.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
             // Search through routes and find first match
             foreach ($routes as $pattern => $handler_name) {
                 $patternRep = strtr($pattern, $tokens);
-                if (preg_match('#^/?' . $patternRep . '/?$#', $path_info, $matches)) {
+                if (preg_match('#^/?'.$patternRep.'/?$#', $path_info, $matches)) {
                     $discovered_handler = $handler_name;
                     $regex_matches = $matches;
                     $params = isset($regex_matches[1]) ? explode("/", $regex_matches[1]) : array();
@@ -88,10 +88,10 @@ 
         }
 
         if ($handler_instance) {
-            if (static::is_xhr_request() && method_exists($handler_instance, $action . '_xhr')) {
+            if (static::is_xhr_request() && method_exists($handler_instance, $action.'_xhr')) {
                 header('Content-type: application/json'); // @todo support xml
                 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-                header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+                header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
                 header('Cache-Control: no-store, no-cache, must-revalidate');
                 header('Cache-Control: post-check=0, pre-check=0', false);
                 header("Access-Control-Allow-Origin: *"); // @todo make this a parameter?

src/autoload.php

Spacing +3 added lines, -3 removed lines

@@ -6,10 +6,10 @@
  * @copyright   2012-2017 Arroyo Labs, Inc. http://www.arroyolabs.com
  * @author      John Arroyo <john@arroyolabs.com>
  */
-ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR . ERDIKO_ROOT .
-    PATH_SEPARATOR . ERDIKO_VENDOR . PATH_SEPARATOR . ERDIKO_APP . PATH_SEPARATOR . ERDIKO_SRC);
+ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.ERDIKO_ROOT.
+    PATH_SEPARATOR.ERDIKO_VENDOR.PATH_SEPARATOR.ERDIKO_APP.PATH_SEPARATOR.ERDIKO_SRC);
 
-spl_autoload_register(function ($name) {
+spl_autoload_register(function($name) {
 
     // error_log("autoload: $name");
 

src/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 require_once ERDIKO_ROOT.'/Erdiko.php';
 
 // Set a default context if none specified
-if(empty(getenv('ERDIKO_CONTEXT')))
+if (empty(getenv('ERDIKO_CONTEXT')))
         putenv("ERDIKO_CONTEXT=default");
 
 $config = \Erdiko::getConfig();

Braces +2 added lines, -1 removed lines

@@ -15,8 +15,9 @@
 require_once ERDIKO_ROOT.'/Erdiko.php';
 
 // Set a default context if none specified
-if(empty(getenv('ERDIKO_CONTEXT')))
+if(empty(getenv('ERDIKO_CONTEXT'))) {
         putenv("ERDIKO_CONTEXT=default");
+}
 
 $config = \Erdiko::getConfig();
 $debug = $config['site']['debug'];