las93 / venus3

bundles/lib/Cache/File.php

Doc Comments +2 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
      *
      * @access public
      * @param  string $sName name of the session
-     * @return mixed
+     * @return boolean
      */
     public function delete(string $sName)
     {
@@ -107,7 +107,6 @@ 
      * flush the cache
      *
      * @access public
-     * @param  string $sName name of the session
      * @return mixed
      */
     public function flush()
@@ -120,7 +119,7 @@ 
      *
      * @access public
      * @param  string $sName name of the session
-     * @return mixed
+     * @return string
      */
     private function _getSubDirectory($sName)
     {

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
      * @param  int $iTimeout expiration of cache
      * @return mixed
      */
-    public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
+    public function get(string $sName, int&$iFlags = null, int $iTimeout = 0)
     {
         if ($iTimeout > 0 && file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')
             && time() - filemtime($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac') > $iTimeout) {
@@ -84,7 +84,7 @@ 
 
         if (file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')) {
 
-            return unserialize(file_get_contents($this->_sFolder . $this->_getSubDirectory($sName) . md5($sName) . '.fil.cac'));
+            return unserialize(file_get_contents($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac'));
         } else {
 
             return false;

Indentation +121 added lines, -121 removed lines

@@ -30,125 +30,125 @@
  */
 class File implements CacheInterface
 {
-    /**
-     * var containe this folder of cache
-     *
-     * @access private
-     * @var    string
-     */
-    private $_sFolder = '';
-
-    /**
-     * constructor
-     *
-     * @access public
-     */
-    public function __construct()
-    {
-        $this->_sFolder = str_replace('bundles'.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'Cache', CACHE_DIR, __DIR__).DIRECTORY_SEPARATOR;
-    }
-
-    /**
-     * set a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  mixed $mValue value of this sesion var
-     * @param  int $iFlag flags
-     * @param  int $iExpire expiration of cache
-     * @return \Venus\lib\Cache\File
-     */
-    public function set(string $sName, $mValue, int $iFlag, int $iExpire)
-    {
-        file_put_contents($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac', serialize($mValue));
-        return $this;
-    }
-
-    /**
-     * get a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  int $iFlags flags
-     * @param  int $iTimeout expiration of cache
-     * @return mixed
-     */
-    public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
-    {
-        if ($iTimeout > 0 && file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')
-            && time() - filemtime($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac') > $iTimeout) {
-
-            unlink($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac');
-        }
-
-        if (file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')) {
-
-            return unserialize(file_get_contents($this->_sFolder . $this->_getSubDirectory($sName) . md5($sName) . '.fil.cac'));
-        } else {
-
-            return false;
-        }
-    }
-
-    /**
-     * delete a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @return mixed
-     */
-    public function delete(string $sName)
-    {
-        return unlink($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac');
-    }
-
-    /**
-     * flush the cache
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @return mixed
-     */
-    public function flush()
-    {
-        $this->_removeDirectory($this->_sFolder);
-    }
-
-    /**
-     *
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @return mixed
-     */
-    private function _getSubDirectory($sName)
-    {
-        if (!file_exists($this->_sFolder.substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2))) {
-
-            mkdir($this->_sFolder.substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2), 0777, true);
-        }
-
-        return substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2).DIRECTORY_SEPARATOR;
-    }
-
-    /**
-     * remove a directory recursivly
-     *
-     * @access private
-     * @param  string $sName nom du répertoire
-     * @return void
-     */
-    private function _removeDirectory($sName)
-    {
-        if ($rDirectory = opendir($sName)) {
-
-            while (($sFile = readdir($rDirectory)) !== false) {
-
-                if ($sFile > '0' && filetype($sName.$sFile) == "file") { unlink($sName.$sFile); } elseif ($sFile > '0' && filetype($sName.$sFile) == "dir") { remove_dir($sName.$sFile."\\"); }
-            }
-
-            closedir($rDirectory);
-            rmdir($sName);
-        }
-    }
+	/**
+	 * var containe this folder of cache
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	private $_sFolder = '';
+
+	/**
+	 * constructor
+	 *
+	 * @access public
+	 */
+	public function __construct()
+	{
+		$this->_sFolder = str_replace('bundles'.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'Cache', CACHE_DIR, __DIR__).DIRECTORY_SEPARATOR;
+	}
+
+	/**
+	 * set a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  mixed $mValue value of this sesion var
+	 * @param  int $iFlag flags
+	 * @param  int $iExpire expiration of cache
+	 * @return \Venus\lib\Cache\File
+	 */
+	public function set(string $sName, $mValue, int $iFlag, int $iExpire)
+	{
+		file_put_contents($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac', serialize($mValue));
+		return $this;
+	}
+
+	/**
+	 * get a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  int $iFlags flags
+	 * @param  int $iTimeout expiration of cache
+	 * @return mixed
+	 */
+	public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
+	{
+		if ($iTimeout > 0 && file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')
+			&& time() - filemtime($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac') > $iTimeout) {
+
+			unlink($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac');
+		}
+
+		if (file_exists($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac')) {
+
+			return unserialize(file_get_contents($this->_sFolder . $this->_getSubDirectory($sName) . md5($sName) . '.fil.cac'));
+		} else {
+
+			return false;
+		}
+	}
+
+	/**
+	 * delete a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @return mixed
+	 */
+	public function delete(string $sName)
+	{
+		return unlink($this->_sFolder.$this->_getSubDirectory($sName).md5($sName).'.fil.cac');
+	}
+
+	/**
+	 * flush the cache
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @return mixed
+	 */
+	public function flush()
+	{
+		$this->_removeDirectory($this->_sFolder);
+	}
+
+	/**
+	 *
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @return mixed
+	 */
+	private function _getSubDirectory($sName)
+	{
+		if (!file_exists($this->_sFolder.substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2))) {
+
+			mkdir($this->_sFolder.substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2), 0777, true);
+		}
+
+		return substr(md5($sName), 0, 2).DIRECTORY_SEPARATOR.substr(md5($sName), 2, 2).DIRECTORY_SEPARATOR;
+	}
+
+	/**
+	 * remove a directory recursivly
+	 *
+	 * @access private
+	 * @param  string $sName nom du répertoire
+	 * @return void
+	 */
+	private function _removeDirectory($sName)
+	{
+		if ($rDirectory = opendir($sName)) {
+
+			while (($sFile = readdir($rDirectory)) !== false) {
+
+				if ($sFile > '0' && filetype($sName.$sFile) == "file") { unlink($sName.$sFile); } elseif ($sFile > '0' && filetype($sName.$sFile) == "dir") { remove_dir($sName.$sFile."\\"); }
+			}
+
+			closedir($rDirectory);
+			rmdir($sName);
+		}
+	}
 }

bundles/lib/Cache/Redis.php

Doc Comments +2 added lines, -3 removed lines

@@ -93,7 +93,7 @@ 
      * flush the cache
      *
      * @access public
-     * @return mixed
+     * @return boolean
      */
     public function flush()
     {
@@ -129,9 +129,8 @@ 
      * @access public
      * @param  string $sName name of the session
      * @param  mixed $mValue value of this sesion var
-     * @param  int $iFlag unused
      * @param  int $iExpire expiration of cache
-     * @return mixed
+     * @return Apc
      */
     public function add(string $sName, $mValue, int $iExpire = false)
     {

Indentation +95 added lines, -95 removed lines

@@ -32,109 +32,109 @@
  */
 class Redis extends RealRedis implements CacheInterface
 {
-    /**
-     * constructor with the connection to Redis
-     *
-     * @access public
-     * @param $oConf
-     * @throws \Exception
-     * @internal param string $sName name of the session
-     * @internal param int $iFlags flags
-     * @internal param int $iTimeout expiration of cache
-     */
-    public function __construct($oConf)
-    {
-        if (!$this->connect($oConf->host, $oConf->port)) {
+	/**
+	 * constructor with the connection to Redis
+	 *
+	 * @access public
+	 * @param $oConf
+	 * @throws \Exception
+	 * @internal param string $sName name of the session
+	 * @internal param int $iFlags flags
+	 * @internal param int $iTimeout expiration of cache
+	 */
+	public function __construct($oConf)
+	{
+		if (!$this->connect($oConf->host, $oConf->port)) {
 
-            throw new \Exception('Redis server unavailable');
-        }
+			throw new \Exception('Redis server unavailable');
+		}
     
-        // Select the REDIS db index
-        $this->select($oConf->index);
-    }
+		// Select the REDIS db index
+		$this->select($oConf->index);
+	}
 
-    /**
-     * get a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  int $iFlags flags
-     * @param  int $iTimeout expiration of cache
-     * @return mixed
-     */
-    public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
-    {
-        return parent::get($sName);
-    }
+	/**
+	 * get a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  int $iFlags flags
+	 * @param  int $iTimeout expiration of cache
+	 * @return mixed
+	 */
+	public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
+	{
+		return parent::get($sName);
+	}
 
-    /**
-     * set a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  mixed $mValue value of this sesion var
-     * @param  int $iFlag unused
-     * @param  int $iExpire expiration of cache
-     * @return \Venus\lib\Cache\Apc
-     */
-    public function set(string $sName, $mValue, int $iFlag = 0, int $iExpire = false)
-    {
-        if ($iExpire === false) {
+	/**
+	 * set a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  mixed $mValue value of this sesion var
+	 * @param  int $iFlag unused
+	 * @param  int $iExpire expiration of cache
+	 * @return \Venus\lib\Cache\Apc
+	 */
+	public function set(string $sName, $mValue, int $iFlag = 0, int $iExpire = false)
+	{
+		if ($iExpire === false) {
 
-            return parent::set($sName, $mValue);
-        }
-        else {
+			return parent::set($sName, $mValue);
+		}
+		else {
 
-            return parent::setex($sName, $iExpire, $mValue);
-        }
-    }
+			return parent::setex($sName, $iExpire, $mValue);
+		}
+	}
 
-    /**
-     * flush the cache
-     *
-     * @access public
-     * @return mixed
-     */
-    public function flush()
-    {
-        return false;
-    }
+	/**
+	 * flush the cache
+	 *
+	 * @access public
+	 * @return mixed
+	 */
+	public function flush()
+	{
+		return false;
+	}
 
-    /**
-     * delete a value
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @return mixed
-     */
-    public function delete(string $sName)
-    {
-        return $this->del($sName);
-    }
+	/**
+	 * delete a value
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @return mixed
+	 */
+	public function delete(string $sName)
+	{
+		return $this->del($sName);
+	}
 
-    /**
-     * close the redis connecction
-     *
-     * @access public
-     * @return mixed
-     */
-    public function __sleep()
-    {
-        $this->close();
-    }
+	/**
+	 * close the redis connecction
+	 *
+	 * @access public
+	 * @return mixed
+	 */
+	public function __sleep()
+	{
+		$this->close();
+	}
 
-    /**
-     * add
-     *
-     * @access public
-     * @param  string $sName name of the session
-     * @param  mixed $mValue value of this sesion var
-     * @param  int $iFlag unused
-     * @param  int $iExpire expiration of cache
-     * @return mixed
-     */
-    public function add(string $sName, $mValue, int $iExpire = false)
-    {
-        return $this->set($sName, $mValue, 0, $iExpire);
-    }
+	/**
+	 * add
+	 *
+	 * @access public
+	 * @param  string $sName name of the session
+	 * @param  mixed $mValue value of this sesion var
+	 * @param  int $iFlag unused
+	 * @param  int $iExpire expiration of cache
+	 * @return mixed
+	 */
+	public function add(string $sName, $mValue, int $iExpire = false)
+	{
+		return $this->set($sName, $mValue, 0, $iExpire);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
      * @param  int $iTimeout expiration of cache
      * @return mixed
      */
-    public function get(string $sName, int &$iFlags = null, int $iTimeout = 0)
+    public function get(string $sName, int&$iFlags = null, int $iTimeout = 0)
     {
         return parent::get($sName);
     }

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
             echo "\n\n";
             echo "        > Check realized on ".$options['a'];
             echo "\n\n";
-        }
-        else {
+        } else {
             echo "\n\n";
             echo Bash::setBackground("                                                                            ", 'red');
             echo Bash::setBackground("          [WARNING] A web server is not used                                ", 'red');

bundles/core/Controller.php

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
      */
     public function redirect(string $sUrl, int $iHttpCode = 301)
     {
-        if ($iHttpCode === 301) { header('Status: 301 Moved Permanently', false, 301); }
-        else if ($iHttpCode === 302) { header('Status: Moved Temporarily', false, 301); }
+        if ($iHttpCode === 301) { header('Status: 301 Moved Permanently', false, 301); } else if ($iHttpCode === 302) { header('Status: Moved Temporarily', false, 301); }
 
         header('Location: '.$sUrl);
         exit;

Indentation +133 added lines, -133 removed lines

@@ -43,138 +43,138 @@
 abstract class Controller extends Mother 
 {
 
-    /**
-     * Cache to know if a model was initialize or not because we must initialize it just one time by script
-     * 
-     * @access private
-     * @var    array
-     */
-    private static $_aInitialize = array();
+	/**
+	 * Cache to know if a model was initialize or not because we must initialize it just one time by script
+	 * 
+	 * @access private
+	 * @var    array
+	 */
+	private static $_aInitialize = array();
     
-    /**
-     * Constructor
-     *
-     * @access public
-     */
-    public function __construct()
-    {
-        $aClass = explode('\\', get_called_class());
-        $sClassName = $aClass[count($aClass) - 1];
-        $sNamespaceName = preg_replace('/\\\\'.$sClassName.'$/', '', get_called_class());
-
-        if (isset($sClassName)) {
-
-            $sNamespaceBaseName = str_replace('\Controller', '', $sNamespaceName);
-            $sDefaultModel = $sNamespaceBaseName.'\Model\\'.$sClassName;
-            $sDefaultView = str_replace('\\', DIRECTORY_SEPARATOR, str_replace('Venus\\', '\\', $sNamespaceBaseName)).DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.$sClassName.'.tpl';
-            $sDefaultLayout = str_replace('\\', DIRECTORY_SEPARATOR, str_replace('Venus\\', '\\', $sNamespaceBaseName)).DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.'Layout.tpl';
-
-            $this->model = function() use ($sDefaultModel) { return new $sDefaultModel; };
-
-            $this->view = function() use ($sDefaultView) { return Vendor::getVendor('Apollina\Template', $sDefaultView); };
-
-            $this->layout = function() use ($sDefaultLayout) { return Vendor::getVendor('Apollina\Template', $sDefaultLayout, true); };
-
-            $this->layout->assign('model', $sDefaultView);
-        }
-
-        $this->form = function() { return new Form(); };
-        $this->security = function() { return new Security(); };
-        $this->router = function() { return new Router; };
-        $this->mail = function() { return new Mail; };
-        $this->session = function() { return new Session; };
-        $this->translator = function() { return new I18n; };
-        $this->url = function() { return new UrlManager; };
-        $this->cookie = function() { return new Cookie; };
-        $this->di = function() { return new Di; };
-        $this->request = function() { return new Request; };
-
-        /**
-         * Trigger on a model to initialize it. You could fill entity with it.
-         */
-        if (method_exists(get_called_class(), 'initialize')) {
-
-            if (!isset(self::$_aInitialize[get_called_class()])) {
-
-                static::initialize();
-                self::$_aInitialize[get_called_class()] = true;
-            }
-        }
-
-        /**
-         * Trigger on a model to initialize it every time you construct it
-         */
-        if (method_exists(get_called_class(), 'onConstruct')) { static::onConstruct(); }
-    }
-
-    /**
-     * redirection HTTP
-     *
-     * @access public
-     * @param  string $sUrl url for the redirection
-     * @param int $iHttpCode code of the http request
-     * @return void
-     */
-    public function redirect(string $sUrl, int $iHttpCode = 301)
-    {
-        if ($iHttpCode === 301) { header('Status: 301 Moved Permanently', false, 301); }
-        else if ($iHttpCode === 302) { header('Status: Moved Temporarily', false, 301); }
-
-        header('Location: '.$sUrl);
-        exit;
-    }
-
-    /**
-     * call an other action as you call action with URL/Cli
-     *
-     * @access public
-     * @param  string $sUri uri for the redirection
-     * @param  array $aParams parameters
-     * @return void
-     */
-    public function forward(string $sUri, array $aParams = array())
-    {
-        $this->router->runByFoward($sUri, $aParams);
-    }
-
-    /**
-     * call the 404 Not Found page
-     *
-     * @access public
-     * @return void
-     */
-    public function notFound()
-    {
-        $$this->router->runHttpErrorPage(404);
-    }
-
-    /**
-     * call the 403 Forbidden page
-     *
-     * @access public
-     * @return void
-     */
-    public function forbidden()
-    {
-        $$this->router->runHttpErrorPage(403);
-    }
-
-    /**
-     * get a property
-     *
-     * @access public
-     * @param  unknown_type $mKey
-     * @return void
-     */
-    public function __get($mKey)
-    {
-        if (isset($this->di) && property_exists($this, 'di')) {
-
-            $mDi = $this->di->get($mKey);
-
-            if (isset($mDi) && $mDi !== false) { return $mDi; }
-        }
-
-        return parent::__get($mKey);
-    }
+	/**
+	 * Constructor
+	 *
+	 * @access public
+	 */
+	public function __construct()
+	{
+		$aClass = explode('\\', get_called_class());
+		$sClassName = $aClass[count($aClass) - 1];
+		$sNamespaceName = preg_replace('/\\\\'.$sClassName.'$/', '', get_called_class());
+
+		if (isset($sClassName)) {
+
+			$sNamespaceBaseName = str_replace('\Controller', '', $sNamespaceName);
+			$sDefaultModel = $sNamespaceBaseName.'\Model\\'.$sClassName;
+			$sDefaultView = str_replace('\\', DIRECTORY_SEPARATOR, str_replace('Venus\\', '\\', $sNamespaceBaseName)).DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.$sClassName.'.tpl';
+			$sDefaultLayout = str_replace('\\', DIRECTORY_SEPARATOR, str_replace('Venus\\', '\\', $sNamespaceBaseName)).DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'View'.DIRECTORY_SEPARATOR.'Layout.tpl';
+
+			$this->model = function() use ($sDefaultModel) { return new $sDefaultModel; };
+
+			$this->view = function() use ($sDefaultView) { return Vendor::getVendor('Apollina\Template', $sDefaultView); };
+
+			$this->layout = function() use ($sDefaultLayout) { return Vendor::getVendor('Apollina\Template', $sDefaultLayout, true); };
+
+			$this->layout->assign('model', $sDefaultView);
+		}
+
+		$this->form = function() { return new Form(); };
+		$this->security = function() { return new Security(); };
+		$this->router = function() { return new Router; };
+		$this->mail = function() { return new Mail; };
+		$this->session = function() { return new Session; };
+		$this->translator = function() { return new I18n; };
+		$this->url = function() { return new UrlManager; };
+		$this->cookie = function() { return new Cookie; };
+		$this->di = function() { return new Di; };
+		$this->request = function() { return new Request; };
+
+		/**
+		 * Trigger on a model to initialize it. You could fill entity with it.
+		 */
+		if (method_exists(get_called_class(), 'initialize')) {
+
+			if (!isset(self::$_aInitialize[get_called_class()])) {
+
+				static::initialize();
+				self::$_aInitialize[get_called_class()] = true;
+			}
+		}
+
+		/**
+		 * Trigger on a model to initialize it every time you construct it
+		 */
+		if (method_exists(get_called_class(), 'onConstruct')) { static::onConstruct(); }
+	}
+
+	/**
+	 * redirection HTTP
+	 *
+	 * @access public
+	 * @param  string $sUrl url for the redirection
+	 * @param int $iHttpCode code of the http request
+	 * @return void
+	 */
+	public function redirect(string $sUrl, int $iHttpCode = 301)
+	{
+		if ($iHttpCode === 301) { header('Status: 301 Moved Permanently', false, 301); }
+		else if ($iHttpCode === 302) { header('Status: Moved Temporarily', false, 301); }
+
+		header('Location: '.$sUrl);
+		exit;
+	}
+
+	/**
+	 * call an other action as you call action with URL/Cli
+	 *
+	 * @access public
+	 * @param  string $sUri uri for the redirection
+	 * @param  array $aParams parameters
+	 * @return void
+	 */
+	public function forward(string $sUri, array $aParams = array())
+	{
+		$this->router->runByFoward($sUri, $aParams);
+	}
+
+	/**
+	 * call the 404 Not Found page
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function notFound()
+	{
+		$$this->router->runHttpErrorPage(404);
+	}
+
+	/**
+	 * call the 403 Forbidden page
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function forbidden()
+	{
+		$$this->router->runHttpErrorPage(403);
+	}
+
+	/**
+	 * get a property
+	 *
+	 * @access public
+	 * @param  unknown_type $mKey
+	 * @return void
+	 */
+	public function __get($mKey)
+	{
+		if (isset($this->di) && property_exists($this, 'di')) {
+
+			$mDi = $this->di->get($mKey);
+
+			if (isset($mDi) && $mDi !== false) { return $mDi; }
+		}
+
+		return parent::__get($mKey);
+	}
 }

bundles/core/Security.php

Braces +2 added lines, -5 removed lines

@@ -103,8 +103,7 @@ 
 					if (!$this->_checkAccess()) { return false; }
 					if (!$this->_checkBlackListIps()) { return false; }
 				}
-			}
-			else if (isset($oSecurity->authentification) && $oSecurity->authentification === 'http_basic_validate_by_controller') {
+			} else if (isset($oSecurity->authentification) && $oSecurity->authentification === 'http_basic_validate_by_controller') {
 
 				if (!isset($_SERVER['PHP_AUTH_USER'])) {
 
@@ -217,9 +216,7 @@ 
 		$sLogin = self::$_sLogin;
 		$sPassword = Config::get('Security')->users->$sLogin->password;
 
-		if ($sPassword == self::$_sPassword) { return true; }
-		else if ($sPassword == md5(self::$_sPassword)) { return true; }
-		else { return false; }
+		if ($sPassword == self::$_sPassword) { return true; } else if ($sPassword == md5(self::$_sPassword)) { return true; } else { return false; }
 	}
 
 	/**

bundles/lib/Response/Yaml.php

Indentation +12 added lines, -12 removed lines

@@ -32,17 +32,17 @@
  */
 class Yaml implements ResponseInterface
 {
-    /**
-     * translate the content
-     * @see \Venus\lib\Response\ResponseInterface::translate()
-     *
-     * @access public
-     * @param  mixed $mContent content to translate
-     * @return mixed
-     */
-    public static function translate($mContent)
-    {
-        return yaml_emit($mContent);
-    }
+	/**
+	 * translate the content
+	 * @see \Venus\lib\Response\ResponseInterface::translate()
+	 *
+	 * @access public
+	 * @param  mixed $mContent content to translate
+	 * @return mixed
+	 */
+	public static function translate($mContent)
+	{
+		return yaml_emit($mContent);
+	}
 
 }

bundles/lib/Response/Json.php

Indentation +12 added lines, -12 removed lines

@@ -33,17 +33,17 @@
  */
 class Json implements ResponseInterface
 {
-    /**
-     * translate the content
-     * @see \Venus\lib\Response\ResponseInterface::translate()
-     *
-     * @access public
-     * @param  mixed $mContent content to translate
-     * @return mixed
-     */
-    public static function translate($mContent)
-    {
-        return json_encode(ObjectOperation::objectToArray($mContent));
-    }
+	/**
+	 * translate the content
+	 * @see \Venus\lib\Response\ResponseInterface::translate()
+	 *
+	 * @access public
+	 * @param  mixed $mContent content to translate
+	 * @return mixed
+	 */
+	public static function translate($mContent)
+	{
+		return json_encode(ObjectOperation::objectToArray($mContent));
+	}
 
 }

bundles/lib/Response/Mock.php

Indentation +12 added lines, -12 removed lines

@@ -32,17 +32,17 @@
  */
 class Mock implements ResponseInterface
 {
-    /**
-     * translate the content
-     * @see \Venus\lib\Response\ResponseInterface::translate()
-     *
-     * @access public
-     * @param  mixed $mContent content to translate
-     * @return mixed
-     */
-    public static function translate($mContent)
-    {
-        return $mContent;
-    }
+	/**
+	 * translate the content
+	 * @see \Venus\lib\Response\ResponseInterface::translate()
+	 *
+	 * @access public
+	 * @param  mixed $mContent content to translate
+	 * @return mixed
+	 */
+	public static function translate($mContent)
+	{
+		return $mContent;
+	}
 
 }

bundles/lib/Request/Request.php

Indentation +14 added lines, -14 removed lines

@@ -9,18 +9,18 @@
 
 class Request implements RequestInterface
 {
-    /**
-     * get parameter
-     * @param string $name
-     * @param string $default
-     * @return string
-     */
-    public function get(string $name, string $default = null) : string
-    {
-        if (isset($_POST[$name]) && $_POST[$name] != '') {
-            return $_POST[$name];
-        } else if ($default !== null) {
-            return $default;
-        }
-    }
+	/**
+	 * get parameter
+	 * @param string $name
+	 * @param string $default
+	 * @return string
+	 */
+	public function get(string $name, string $default = null) : string
+	{
+		if (isset($_POST[$name]) && $_POST[$name] != '') {
+			return $_POST[$name];
+		} else if ($default !== null) {
+			return $default;
+		}
+	}
 }

bundles/lib/Request/Query.php

Indentation +14 added lines, -14 removed lines

@@ -9,18 +9,18 @@
 
 class Query implements RequestInterface
 {
-    /**
-     * get parameter
-     * @param string $name
-     * @param string $default
-     * @return string
-     */
-    public function get(string $name, string $default = null) : string
-    {
-        if (isset($_GET[$name]) && $_GET[$name] != '') {
-            return $_GET[$name];
-        } else if ($default !== null) {
-            return $default;
-        }
-    }
+	/**
+	 * get parameter
+	 * @param string $name
+	 * @param string $default
+	 * @return string
+	 */
+	public function get(string $name, string $default = null) : string
+	{
+		if (isset($_GET[$name]) && $_GET[$name] != '') {
+			return $_GET[$name];
+		} else if ($default !== null) {
+			return $default;
+		}
+	}
 }