Erdiko / core

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

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/ErrorHandler.php

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/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?