Erdiko / core

src/Helper.php

Doc Comments +2 added lines, -1 removed lines

@@ -37,7 +37,7 @@ 
     /**
      * Read JSON config file and return array
      *
-     * @param string $file
+     * @param string $filename
      * @return array $config
      */
     public static function getConfigFile($filename)
@@ -60,6 +60,7 @@ 
     
     /**
      * Get configuration
+     * @param string $context
      */
     public static function getConfig($name = 'application', $context = null)
     {

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|null
      */
     public function log($level, $message, array $context = array())
     {
@@ -100,7 +100,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())
     {
@@ -118,7 +119,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())
     {
@@ -142,7 +143,7 @@ 
      *
      * @param mixed $key
      * @param string $logFileName
-     * @return bool
+     * @return string
      */
     public function addLogFile($key, $logFileName)
     {
@@ -198,7 +199,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function emergency($message, array $context = array())
     {
@@ -215,7 +216,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function alert($message, array $context = array())
     {
@@ -231,7 +232,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function critical($message, array $context = array())
     {
@@ -246,7 +247,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function error($message, array $context = array())
     {
@@ -263,7 +264,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function warning($message, array $context = array())
     {
@@ -277,7 +278,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function notice($message, array $context = array())
     {
@@ -293,7 +294,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function info($message, array $context = array())
     {
@@ -307,7 +308,7 @@ 
      * @param string $message
      * @param array $context
      *
-     * @return null
+     * @return integer
      */
     public function debug($message, array $context = array())
     {

src/Theme.php

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

Indentation +56 added lines, -56 removed lines

@@ -13,70 +13,70 @@
 
 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;
+        }
 
-		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;
-		ToroHook::fire( "general_error", $vars );
+        $vars['code']               = $errno;
+        $vars['error']              = trim($errstr);
+        $vars['path_info']          = $errfile . " on line " . $errline;
+        $vars['debug']              = $debug;
+        ToroHook::fire( "general_error", $vars );
 
-		return false;
-	}
+        return false;
+    }
 
-	public static function fatalErrorShutdownHandler()
-	{
-		$last_error = error_get_last();
-		self::errorHandler(E_ERROR, 
-			$last_error['message'], $last_error['file'], $last_error['line']);
-	}
+    public static function fatalErrorShutdownHandler()
+    {
+        $last_error = error_get_last();
+        self::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');
+    }
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,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");
@@ -24,15 +24,15 @@ 
 	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;
 		}
 
-		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:
@@ -45,20 +45,20 @@ 
 
 			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['path_info']          = $errfile." on line ".$errline;
 		$vars['debug']              = $debug;
-		ToroHook::fire( "general_error", $vars );
+		ToroHook::fire("general_error", $vars);
 
 		return false;
 	}
@@ -77,6 +77,6 @@ 
 	 */
 	public static function isDebug()
 	{
-		return (getenv("ERDIKO_DEBUG")=='1');
+		return (getenv("ERDIKO_DEBUG") == '1');
 	}
 }
\ No newline at end of file