Erdiko / core

src/ErrorHandler.php

Doc Comments +3 added lines

@@ -22,6 +22,9 @@
 		register_shutdown_function("\\erdiko\\core\\ErrorHandler::fatalErrorShutdownHandler");
 	}
 
+	/**
+	 * @param integer $errno
+	 */
 	public static function errorHandler($errno, $errstr, $errfile, $errline)
 	{
 		$debug = \erdiko\core\ErrorHandler::isDebug();

Indentation +56 added lines, -56 removed lines

@@ -14,73 +14,73 @@
 
 class ErrorHandler 
 {
-	public static function init()
-	{
-		ini_set('html_errors',0); // @todo review this line
-		// error_reporting((E_ALL | E_STRICT)); // @note we shouldn't override by default, but we could inject
-		set_error_handler("\\erdiko\\core\\ErrorHandler::errorHandler");
-		register_shutdown_function("\\erdiko\\core\\ErrorHandler::fatalErrorShutdownHandler");
-	}
+    public static function init()
+    {
+        ini_set('html_errors',0); // @todo review this line
+        // error_reporting((E_ALL | E_STRICT)); // @note we shouldn't override by default, but we could inject
+        set_error_handler("\\erdiko\\core\\ErrorHandler::errorHandler");
+        register_shutdown_function("\\erdiko\\core\\ErrorHandler::fatalErrorShutdownHandler");
+    }
 
-	public static function errorHandler($errno, $errstr, $errfile, $errline)
-	{
-		$debug = \erdiko\core\ErrorHandler::isDebug();
-		if ( ! ( error_reporting() & $errno ) || empty( $errstr ) ) {
-			return null;
-		}
+    public static function errorHandler($errno, $errstr, $errfile, $errline)
+    {
+        $debug = \erdiko\core\ErrorHandler::isDebug();
+        if ( ! ( error_reporting() & $errno ) || empty( $errstr ) ) {
+            return null;
+        }
 
         $errorHook = "500";
 
-		switch ( $errno ) {
-			case E_USER_ERROR:
-				$vars['msg_type']        = "USER ERROR";
-				$vars['msg_description'] = " Fatal error in line $errline of $errfile file";
-				$vars['msg_description'] .= ", PHP " . PHP_VERSION . " (" . PHP_OS . ")";
-				break;
+        switch ( $errno ) {
+            case E_USER_ERROR:
+                $vars['msg_type']        = "USER ERROR";
+                $vars['msg_description'] = " Fatal error in line $errline of $errfile file";
+                $vars['msg_description'] .= ", PHP " . PHP_VERSION . " (" . PHP_OS . ")";
+                break;
 
-			case E_USER_WARNING:
-				$vars['msg_type'] = "USER WARNING";
-				break;
+            case E_USER_WARNING:
+                $vars['msg_type'] = "USER WARNING";
+                break;
 
-			case E_USER_NOTICE:
-				$vars['msg_type'] = "USER NOTICE";
-				break;
+            case E_USER_NOTICE:
+                $vars['msg_type'] = "USER NOTICE";
+                break;
 
-			case E_ERROR:
-				$vars['msg_type'] = "ERROR";
-				$vars['msg_description'] = print_r(debug_backtrace(),1);
-				break;
+            case E_ERROR:
+                $vars['msg_type'] = "ERROR";
+                $vars['msg_description'] = print_r(debug_backtrace(),1);
+                break;
 
-			default:
-				$vars['msg_type'] = "Type of error: [$errno] $errstr";
-				$vars['msg_description'] = print_r(debug_backtrace(),1);
-				break;
-		}
+            default:
+                $vars['msg_type'] = "Type of error: [$errno] $errstr";
+                $vars['msg_description'] = print_r(debug_backtrace(),1);
+                break;
+        }
 
-		$vars['code']               = $errno;
-		$vars['error']              = trim($errstr);
-		$vars['path_info']          = $errfile . " on line " . $errline;
-        	$vars['debug']              = $debug;
+        $vars['code']               = $errno;
+        $vars['error']              = trim($errstr);
+        $vars['path_info']          = $errfile . " on line " . $errline;
+            $vars['debug']              = $debug;
 
-        	ToroHook::fire($errorHook, $vars );
+            ToroHook::fire($errorHook, $vars );
 
-		return false;
-	}
+        return false;
+    }
 
-	public static function fatalErrorShutdownHandler()
-	{
-		$last_error = error_get_last();
-		static::errorHandler(E_ERROR, 
-			$last_error['message'], $last_error['file'], $last_error['line']);
-	}
+    public static function fatalErrorShutdownHandler()
+    {
+        $last_error = error_get_last();
+        static::errorHandler(E_ERROR, 
+            $last_error['message'], $last_error['file'], $last_error['line']);
+    }
 
-	/**
-	 * isDebug
-	 *
-	 * @return bool
-	 */
-	public static function isDebug()
-	{
-		return (getenv("ERDIKO_DEBUG")=='1');
-	}
+    /**
+     * isDebug
+     *
+     * @return bool
+     */
+    public static function isDebug()
+    {
+        return (getenv("ERDIKO_DEBUG")=='1');
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -16,7 +16,7 @@ 
 {
 	public static function init()
 	{
-		ini_set('html_errors',0); // @todo review this line
+		ini_set('html_errors', 0); // @todo review this line
 		// error_reporting((E_ALL | E_STRICT)); // @note we shouldn't override by default, but we could inject
 		set_error_handler("\\erdiko\\core\\ErrorHandler::errorHandler");
 		register_shutdown_function("\\erdiko\\core\\ErrorHandler::fatalErrorShutdownHandler");
@@ -25,17 +25,17 @@ 
 	public static function errorHandler($errno, $errstr, $errfile, $errline)
 	{
 		$debug = \erdiko\core\ErrorHandler::isDebug();
-		if ( ! ( error_reporting() & $errno ) || empty( $errstr ) ) {
+		if (!(error_reporting() & $errno) || empty($errstr)) {
 			return null;
 		}
 
         $errorHook = "500";
 
-		switch ( $errno ) {
+		switch ($errno) {
 			case E_USER_ERROR:
 				$vars['msg_type']        = "USER ERROR";
 				$vars['msg_description'] = " Fatal error in line $errline of $errfile file";
-				$vars['msg_description'] .= ", PHP " . PHP_VERSION . " (" . PHP_OS . ")";
+				$vars['msg_description'] .= ", PHP ".PHP_VERSION." (".PHP_OS.")";
 				break;
 
 			case E_USER_WARNING:
@@ -48,21 +48,21 @@ 
 
 			case E_ERROR:
 				$vars['msg_type'] = "ERROR";
-				$vars['msg_description'] = print_r(debug_backtrace(),1);
+				$vars['msg_description'] = print_r(debug_backtrace(), 1);
 				break;
 
 			default:
 				$vars['msg_type'] = "Type of error: [$errno] $errstr";
-				$vars['msg_description'] = print_r(debug_backtrace(),1);
+				$vars['msg_description'] = print_r(debug_backtrace(), 1);
 				break;
 		}
 
 		$vars['code']               = $errno;
 		$vars['error']              = trim($errstr);
-		$vars['path_info']          = $errfile . " on line " . $errline;
-        	$vars['debug']              = $debug;
+		$vars['path_info']          = $errfile." on line ".$errline;
+        	$vars['debug'] = $debug;
 
-        	ToroHook::fire($errorHook, $vars );
+        	ToroHook::fire($errorHook, $vars);
 
 		return false;
 	}
@@ -81,6 +81,6 @@ 
 	 */
 	public static function isDebug()
 	{
-		return (getenv("ERDIKO_DEBUG")=='1');
+		return (getenv("ERDIKO_DEBUG") == '1');
 	}
 }

src/helpers/FlashMessages.php

Indentation +34 added lines, -34 removed lines

@@ -14,43 +14,43 @@
 
 class FlashMessages
 {
-	/**
-	 * Reset the messages
-	 */
-	public static function reset()
-	{
-		$_SESSION['erdiko_flash_message'] = array();
-	}
+    /**
+     * Reset the messages
+     */
+    public static function reset()
+    {
+        $_SESSION['erdiko_flash_message'] = array();
+    }
 
-	/**
-	 * Set flash message
-	 * Add a message to the array
-	 * @note: Should we restrict/limit types to only the 4 listed in the header?
-	 * @param string $message
-	 * @param string $type
-	 */
-	public static function set($message, $type = 'danger')
-	{
-		$_SESSION['erdiko_flash_message'][] = array(
-			'text' => $message,
-			'type' => $type
-			);
+    /**
+     * Set flash message
+     * Add a message to the array
+     * @note: Should we restrict/limit types to only the 4 listed in the header?
+     * @param string $message
+     * @param string $type
+     */
+    public static function set($message, $type = 'danger')
+    {
+        $_SESSION['erdiko_flash_message'][] = array(
+            'text' => $message,
+            'type' => $type
+            );
 
-		$_SESSION['erdiko_flash_message'];
-	}
+        $_SESSION['erdiko_flash_message'];
+    }
 
-	/**
-	 * Get flash messages
-	 * @return array $messages
-	 */
-	public static function get()
-	{
-		$messages = array();
-		if(isset($_SESSION['erdiko_flash_message']))
-			$messages = $_SESSION['erdiko_flash_message'];
-		self::reset();
+    /**
+     * Get flash messages
+     * @return array $messages
+     */
+    public static function get()
+    {
+        $messages = array();
+        if(isset($_SESSION['erdiko_flash_message']))
+            $messages = $_SESSION['erdiko_flash_message'];
+        self::reset();
 		
-		return $messages;
-	}
+        return $messages;
+    }
 	
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	public static function get()
 	{
 		$messages = array();
-		if(isset($_SESSION['erdiko_flash_message']))
+		if (isset($_SESSION['erdiko_flash_message']))
 			$messages = $_SESSION['erdiko_flash_message'];
 		self::reset();
 		

Braces +3 added lines, -2 removed lines

@@ -46,8 +46,9 @@
 	public static function get()
 	{
 		$messages = array();
-		if(isset($_SESSION['erdiko_flash_message']))
-			$messages = $_SESSION['erdiko_flash_message'];
+		if(isset($_SESSION['erdiko_flash_message'])) {
+					$messages = $_SESSION['erdiko_flash_message'];
+		}
 		self::reset();
 		
 		return $messages;

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/core/cache/Memcached.php

Doc Comments +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
     /**
      *  Get Cache Object
      *
-     *  @return Memcache $memcacheObj
+     *  @return \Memcached $memcacheObj
      *  @note   Please do not modify data if you use the put function in this class
      */
     public function getObject()
@@ -105,8 +105,8 @@ 
      *  Check if the key exists in cache
      *
      *  @parm mixed $key
-     *  @return true if the key exist in cache
-     *  @return false if the key does not exist in cache
+     *  @return boolean if the key exist in cache
+     *  @return boolean if the key does not exist in cache
      *
      */
     public function has($key)

Spacing +2 added lines, -2 removed lines

@@ -31,8 +31,8 @@
         $this->memcacheObj = new \Memcached;
 
         $config = \erdiko\core\Helper::getConfig("local/cache");
-        $host=$config["memcached"]["host"];
-        $port=$config["memcached"]["port"];
+        $host = $config["memcached"]["host"];
+        $port = $config["memcached"]["port"];
         $cacheAvailable = $this->memcacheObj->addServer($host, $port);
 
     }

src/core/datasource/File.php

Doc Comments +4 added lines, -4 removed lines

@@ -120,8 +120,8 @@ 
      *
      * @param string $filename
      * @param string $pathTo
-     * @param string $pathToFrom
-     * @return bool
+     * @param string $pathFrom
+     * @return boolean|null
      */
     public function move($filename, $pathTo, $pathFrom = null)
     {
@@ -140,8 +140,8 @@ 
      * Rename a file
      *
      * @param string $oldName
-     * @param string $pathTo
-     * @param string $pathToFrom
+     * @param string $pathToFile
+     * @param string $pathToFile
      * @return bool
      * @todo consider merging rename() and move() into one method
      */

Indentation +4 added lines, -4 removed lines

@@ -22,10 +22,10 @@
     protected $_filePath = null;
     
     /**
-    * Contructor
-    *
-    * @param string $defaultPath
-    */
+     * Contructor
+     *
+     * @param string $defaultPath
+     */
     public function __construct($defaultPath = null)
     {
         if (isset($defaultPath)) {

Spacing +17 added lines, -17 removed lines

@@ -29,10 +29,10 @@ 
     public function __construct($defaultPath = null)
     {
         if (isset($defaultPath)) {
-            $this->_filePath=$defaultPath;
+            $this->_filePath = $defaultPath;
         } else {
-            $rootFolder=dirname(dirname(dirname(__DIR__)));
-            $this->_filePath=$rootFolder."/var";
+            $rootFolder = dirname(dirname(dirname(__DIR__)));
+            $this->_filePath = $rootFolder."/var";
         }
         if (!is_dir($this->_filePath)) {
             mkdir($this->_filePath, 0775, true);
@@ -86,10 +86,10 @@ 
      */
     public function read($filename, $pathToFile = null)
     {
-        if(!$this->fileExists($filename, $pathToFile))
+        if (!$this->fileExists($filename, $pathToFile))
             throw new \Exception("File, '{$filename}', does not exist.");
 
-        if ($pathToFile==null) {
+        if ($pathToFile == null) {
             return file_get_contents($this->_filePath."/".$filename);
         } else {
             return file_get_contents($pathToFile."/".$filename);
@@ -105,8 +105,8 @@ 
      */
     public function delete($filename, $pathToFile = null)
     {
-        if ($pathToFile==null) {
-            $pathToFile=$this->_filePath;
+        if ($pathToFile == null) {
+            $pathToFile = $this->_filePath;
         }
         if (file_exists($pathToFile."/".$filename)) {
             return unlink($pathToFile."/".$filename);
@@ -125,8 +125,8 @@ 
      */
     public function move($filename, $pathTo, $pathFrom = null)
     {
-        if ($pathFrom==null) {
-            $pathFrom=$this->_filePath;
+        if ($pathFrom == null) {
+            $pathFrom = $this->_filePath;
         }
         if (file_exists($pathFrom."/".$filename)) {
             $this->createDir($pathTo);
@@ -147,8 +147,8 @@ 
      */
     public function rename($oldName, $newName, $pathToFile = null)
     {
-        if ($pathToFile==null) {
-            $pathToFile=$this->_filePath;
+        if ($pathToFile == null) {
+            $pathToFile = $this->_filePath;
         }
         if (file_exists($pathToFile."/".$oldName)) {
             $this->createDir($pathToFile);
@@ -169,11 +169,11 @@ 
      */
     public function copy($filename, $newFilePath, $newFileName = null, $pathToFile = null)
     {
-        if ($pathToFile==null) {
-            $pathToFile=$this->_filePath;
+        if ($pathToFile == null) {
+            $pathToFile = $this->_filePath;
         }
-        if ($newFileName==null) {
-            $newFileName=$filename;
+        if ($newFileName == null) {
+            $newFileName = $filename;
         }
         if (file_exists($pathToFile."/".$filename)) {
             return copy($pathToFile."/".$filename, $newFilePath."/".$newFileName);
@@ -191,8 +191,8 @@ 
      */
     public function fileExists($filename, $pathToFile = null)
     {
-        if ($pathToFile==null) {
-            $pathToFile=$this->_filePath;
+        if ($pathToFile == null) {
+            $pathToFile = $this->_filePath;
         }
         return file_exists($pathToFile."/".$filename);
     }

Braces +3 added lines, -2 removed lines

@@ -86,8 +86,9 @@
      */
     public function read($filename, $pathToFile = null)
     {
-        if(!$this->fileExists($filename, $pathToFile))
-            throw new \Exception("File, '{$filename}', does not exist.");
+        if(!$this->fileExists($filename, $pathToFile)) {
+                    throw new \Exception("File, '{$filename}', does not exist.");
+        }
 
         if ($pathToFile==null) {
             return file_get_contents($this->_filePath."/".$filename);

src/core/Layout.php

Doc Comments +1 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
      *
      * @param string $template , Theme Object (Contaier)
      * @param mixed $data
-     * @param string $theme
+     * @param string $themeName
      */
     public function __construct($template = null, $data = array(), $themeName = null)
     {
@@ -97,7 +97,6 @@ 
     /**
      * Get Theme Root Folder
      *
-     * @param string $folder
      */
     public function getThemeRootFolder()
     {

Spacing +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
      */
     public function getRegion($name)
     {
-        if(array_key_exists($name, $this->_regions)) {
+        if (array_key_exists($name, $this->_regions)) {
             $html = (is_subclass_of($this->_regions[$name], 'erdiko\core\Container')) ?
                 $this->_regions[$name]->toHtml() : $this->_regions[$name];
         } else {

src/core/Logger.php

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())
     {

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 {

src/core/Template.php

Doc Comments +2 added lines, -3 removed lines

@@ -52,7 +52,6 @@ 
     /**
      * Get template
      *
-     * @param string $template
      */
     public function getTemplate()
     {
@@ -62,7 +61,6 @@ 
     /**
      * Get default template name
      *
-     * @param string $template
      */
     public function getDefaultTemplate()
     {
@@ -82,7 +80,7 @@ 
     /**
      * Set template root folder
      *
-     * @param string $TemplateRootFolder
+     * @param string $templateRootFolder
      */
     public function setTemplateRootFolder($templateRootFolder)
     {
@@ -119,6 +117,7 @@ 
 
     /**
      * Set Template folder
+     * @param string $templateFolder
      */
     public function setTemplateFolder($templateFolder)
     {

Spacing +2 added lines, -2 removed lines

@@ -163,7 +163,7 @@ 
     {
         // Capitalize first letter of the key to preserve camel case convention naming
         $method = 'set'.ucfirst($key);
-        if(is_callable(array($this, $method))) {
+        if (is_callable(array($this, $method))) {
             $this->$method($value); // Execute the native setter function
         } else {
             $this->_data[$key] = $value;
@@ -174,7 +174,7 @@ 
     {
         $value = null;
 
-        if(array_key_exists($key, $this->_data))
+        if (array_key_exists($key, $this->_data))
             $value = $this->_data[$key];
 
         return $value;

Braces +3 added lines, -2 removed lines

@@ -174,8 +174,9 @@
     {
         $value = null;
 
-        if(array_key_exists($key, $this->_data))
-            $value = $this->_data[$key];
+        if(array_key_exists($key, $this->_data)) {
+                    $value = $this->_data[$key];
+        }
 
         return $value;
     }

src/core/Theme.php

Doc Comments +3 added lines, -3 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()
     {
@@ -316,6 +315,7 @@ 
      * Set the theme name, the name is also the id of the theme
      *
      * @param string Theme name
+     * @param string $name
      */
     public function setName($name)
     {

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";
             }