ByTIC / framework

src/acl/resource/Resources.php

Doc Comments -1 removed lines

@@ -31,7 +31,6 @@
 	/**
 	 * Recursively builds parents path to passed resource
 	 *
-	 * @param ACL_Resource|bool $page
 	 * @param array $return
 	 * @return array
 	 */

Indentation +56 added lines, -56 removed lines

@@ -3,61 +3,61 @@
 class ACL_Resources extends Records
 {
 
-	protected $_sortOn = "name";
-
-	public function findAll()
-	{
-		if (!$this->getRegistry()->exists("all")) {
-			$resources = parent::findAll();
-			$this->buildTree($resources);
-		}
-
-		return $this->getRegistry()->get('all');
-	}
-
-	public function buildTree($resources = array())
-	{
-		if ($resources) {
-			/* @var $resource ACL_Resource */
-			foreach ($resources as $resource) {
-				if ($resource->hasParent()) {
-					$parent = $resources[$resource->id_parent];
-					$parent->addChild($resource);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Recursively builds parents path to passed resource
-	 *
-	 * @param ACL_Resource|bool $page
-	 * @param array $return
-	 * @return array
-	 */
-	public function buildPath($resource, &$return = array())
-	{
-		if (!($resource instanceof ACL_Resource)) {
-			return array_reverse($return);
-		}
-
-		$return[] = $resource;
-
-		return $this->buildPath($resource->getParent(), $return);
-	}
-
-	/**
-	 * Singleton
-	 *
-	 * @return ACL_Resources
-	 */
-	public static function instance()
-	{
-		static $instance;
-		if (!($instance instanceof self)) {
-			$instance = new self();
-		}
-		return $instance;
-	}
+    protected $_sortOn = "name";
+
+    public function findAll()
+    {
+        if (!$this->getRegistry()->exists("all")) {
+            $resources = parent::findAll();
+            $this->buildTree($resources);
+        }
+
+        return $this->getRegistry()->get('all');
+    }
+
+    public function buildTree($resources = array())
+    {
+        if ($resources) {
+            /* @var $resource ACL_Resource */
+            foreach ($resources as $resource) {
+                if ($resource->hasParent()) {
+                    $parent = $resources[$resource->id_parent];
+                    $parent->addChild($resource);
+                }
+            }
+        }
+    }
+
+    /**
+     * Recursively builds parents path to passed resource
+     *
+     * @param ACL_Resource|bool $page
+     * @param array $return
+     * @return array
+     */
+    public function buildPath($resource, &$return = array())
+    {
+        if (!($resource instanceof ACL_Resource)) {
+            return array_reverse($return);
+        }
+
+        $return[] = $resource;
+
+        return $this->buildPath($resource->getParent(), $return);
+    }
+
+    /**
+     * Singleton
+     *
+     * @return ACL_Resources
+     */
+    public static function instance()
+    {
+        static $instance;
+        if (!($instance instanceof self)) {
+            $instance = new self();
+        }
+        return $instance;
+    }
 
 }
\ No newline at end of file

src/auth/Auth.php

Doc Comments +3 added lines

@@ -37,6 +37,9 @@
 		return $this;
 	}
 
+	/**
+	 * @param boolean $value
+	 */
 	public function authenticated($value = null)
 	{
 		if (!is_null($value)) {

Indentation +77 added lines, -77 removed lines

@@ -3,86 +3,86 @@
 class Nip_Auth extends Record
 {
 
-	protected $_authenticated = false;
+    protected $_authenticated = false;
 
-	public function authenticate($request = array())
-	{
-		if ($request) {
-			$this->email = clean($request['email']);
-			$this->password = clean($request['password']);
-		}
+    public function authenticate($request = array())
+    {
+        if ($request) {
+            $this->email = clean($request['email']);
+            $this->password = clean($request['password']);
+        }
 
-		$query = $this->_getAuthenticateQuery();
-		$user = $this->getManager()->findOneByQuery($query);
+        $query = $this->_getAuthenticateQuery();
+        $user = $this->getManager()->findOneByQuery($query);
 
-		if ($user) {
-			$this->writeData($user->toArray());
+        if ($user) {
+            $this->writeData($user->toArray());
 			
-			$this->id_session = session_id();
-			$this->last_login = date(DATE_DB);
-			$this->save();
-
-			$this->authenticated(true);
-
-			$_SESSION[$this->_getSessionVar()]['id'] = $this->id;
-		}
-
-		return $this->authenticated();
-	}
-
-	public function deauthenticate()
-	{
-		unset($_SESSION[$this->_getSessionVar()]);
-		$this->authenticated(false);
-		return $this;
-	}
-
-	public function authenticated($value = null)
-	{
-		if (!is_null($value)) {
-			$this->_authenticated = $value;
-		}
-		return $this->_authenticated;
-	}
-
-	public function updatePassword()
-	{
-		$this->password = Nip_Helper_Passwords::instance()->hash($this->new_password);
-		$this->save();
-		return $this;
-	}
-
-	public function recoverPassword()
-	{
-		$user = $this->getManager()->findOneByEmail($this->email);
-		$this->writeData($user->toArray());
-
-		$this->generatePassword()->updatePassword();
-		$this->sendRecoverPasswordMail();
-	}
-
-	public function generatePassword()
-	{
-		$this->new_password = Nip_Helper_Passwords::instance()->generate(8, false, true, true, false);
-		return $this;
-	}
-
-	/**
-	 * @return Nip_DB_Query_Select
-	 */
-	protected function _getAuthenticateQuery()
-	{
-		$query = $this->getManager()->newQuery();
-
-		$query->where("email = ?", $this->email);
-		$query->where("password = ?", Nip_Helper_Passwords::instance()->hash($this->password));
-
-		return $query;
-	}
-
-	protected function _getSessionVar()
-	{
-		return $this->getManager()->getModel();
-	}
+            $this->id_session = session_id();
+            $this->last_login = date(DATE_DB);
+            $this->save();
+
+            $this->authenticated(true);
+
+            $_SESSION[$this->_getSessionVar()]['id'] = $this->id;
+        }
+
+        return $this->authenticated();
+    }
+
+    public function deauthenticate()
+    {
+        unset($_SESSION[$this->_getSessionVar()]);
+        $this->authenticated(false);
+        return $this;
+    }
+
+    public function authenticated($value = null)
+    {
+        if (!is_null($value)) {
+            $this->_authenticated = $value;
+        }
+        return $this->_authenticated;
+    }
+
+    public function updatePassword()
+    {
+        $this->password = Nip_Helper_Passwords::instance()->hash($this->new_password);
+        $this->save();
+        return $this;
+    }
+
+    public function recoverPassword()
+    {
+        $user = $this->getManager()->findOneByEmail($this->email);
+        $this->writeData($user->toArray());
+
+        $this->generatePassword()->updatePassword();
+        $this->sendRecoverPasswordMail();
+    }
+
+    public function generatePassword()
+    {
+        $this->new_password = Nip_Helper_Passwords::instance()->generate(8, false, true, true, false);
+        return $this;
+    }
+
+    /**
+     * @return Nip_DB_Query_Select
+     */
+    protected function _getAuthenticateQuery()
+    {
+        $query = $this->getManager()->newQuery();
+
+        $query->where("email = ?", $this->email);
+        $query->where("password = ?", Nip_Helper_Passwords::instance()->hash($this->password));
+
+        return $query;
+    }
+
+    protected function _getSessionVar()
+    {
+        return $this->getManager()->getModel();
+    }
 
 }
\ No newline at end of file

src/AutoLoader.php

Doc Comments +13 added lines, -1 removed lines

@@ -81,6 +81,9 @@ 
         return false;
     }
 
+    /**
+     * @return string
+     */
     protected function getClassLocation($class, $retry = false)
     {
         if (in_array($class, array_keys($this->getMap()))) {
@@ -133,6 +136,9 @@ 
         return $this->_map;
     }
 
+    /**
+     * @param string $filePath
+     */
     protected function readCacheFile($filePath)
     {
         if (file_exists($filePath)) {
@@ -153,11 +159,17 @@ 
         return str_replace(DS, '-', $dir).'.php';
     }
 
+    /**
+     * @param boolean $retry
+     */
     public function setRetry($retry)
     {
         $this->_retry = $retry;
     }
 
+    /**
+     * @param boolean $value
+     */
     public function isFatal($value = null)
     {
         if (is_bool($value)) {
@@ -170,7 +182,7 @@ 
     /**
      * Singleton
      *
-     * @return Nip_AutoLoader
+     * @return AutoLoader
      */
     static public function instance()
     {

Spacing +3 added lines, -3 removed lines

@@ -111,7 +111,7 @@ 
     public function generateMapDir($dir)
     {
         $fileName = $this->getCacheName($dir);
-        $filePath = $this->_cachePath.$fileName;
+        $filePath = $this->_cachePath . $fileName;
         $this->_mapGenerator->dump($dir, $filePath);
     }
 
@@ -120,7 +120,7 @@ 
         if (!$this->_map) {
             foreach ($this->_directories as $dir) {
                 $fileName = $this->getCacheName($dir);
-                $filePath = $this->_cachePath.$fileName;
+                $filePath = $this->_cachePath . $fileName;
 
                 if (!$this->readCacheFile($filePath)) {
                     \Nip_Profiler::instance()->start('autoloader [readCache]');
@@ -150,7 +150,7 @@ 
         if (defined('ROOT_PATH')) {
             $dir = str_replace(ROOT_PATH, '', $dir);
         }
-        return str_replace(DS, '-', $dir).'.php';
+        return str_replace(DS, '-', $dir) . '.php';
     }
 
     public function setRetry($retry)

src/Bootstrap.php

Doc Comments +3 added lines

@@ -194,6 +194,9 @@
         return $i18n;
     }
 
+    /**
+     * @param \Nip_I18n $translation
+     */
     public function initLanguages($translation)
     {
         return $translation;

src/console/Console.php

Doc Comments +7 added lines, -1 removed lines

@@ -28,6 +28,9 @@ 
         return $this->_plugins;
     }
 
+    /**
+     * @param string $key
+     */
     public function getPlugin($key)
     {
         return $this->_plugins[$key];
@@ -68,6 +71,9 @@ 
         $_this->setEnabled(false);
     }
 
+    /**
+     * @param boolean $enabled
+     */
     public function setEnabled($enabled)
     {
         $this->_enabled = $enabled;
@@ -88,7 +94,7 @@ 
     /**
      * Singleton
      *
-     * @return Console
+     * @return Nip_Console
      */
     public static function instance()
     {

src/console/plugin/logger/Logger.php

Doc Comments +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     }
 
     /**
-     * @return Logger_Adapter
+     * @return Nip\Logger\Adapter\AdapterAbstract
      */
     public function getLogger()
     {

src/Controller.php

Doc Comments +3 added lines

@@ -159,6 +159,9 @@
         return true;
     }
 
+    /**
+     * @param string[] $action
+     */
     protected function validAction($action)
     {
         return in_array($action, get_class_methods(get_class($this)));

src/database/metadata/Cache.php

Doc Comments +3 added lines

@@ -32,6 +32,9 @@
         return parent::cachePath() . '/db-metadata/';
     }
 
+    /**
+     * @param Nip_Db_Metadata $metadata
+     */
     public function setMetadata($metadata) {
         $this->_metadata = $metadata;
         return $this;

src/database/profiler/Query.php

Doc Comments +4 added lines

@@ -16,6 +16,10 @@
 class Nip_DB_Profiler_Query extends Nip_Profile {
 	public $columns = array('time',	'type',	'memory', 'query', 'affectedRows', 'info');
 
+	/**
+	 * @param boolean $query
+	 * @param string $queryType
+	 */
 	public function __construct($query, $queryType) {
 		$this->query = $query;
 

Indentation +5 added lines, -5 removed lines

@@ -14,11 +14,11 @@
  */
 
 class Nip_DB_Profiler_Query extends Nip_Profile {
-	public $columns = array('time',	'type',	'memory', 'query', 'affectedRows', 'info');
+    public $columns = array('time',	'type',	'memory', 'query', 'affectedRows', 'info');
 
-	public function __construct($query, $queryType) {
-		$this->query = $query;
+    public function __construct($query, $queryType) {
+        $this->query = $query;
 
-		parent::__construct($queryType);
-	}
+        parent::__construct($queryType);
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
  */
 
 class Nip_DB_Profiler_Query extends Nip_Profile {
-	public $columns = array('time',	'type',	'memory', 'query', 'affectedRows', 'info');
+	public $columns = array('time', 'type', 'memory', 'query', 'affectedRows', 'info');
 
 	public function __construct($query, $queryType) {
 		$this->query = $query;