las93 / venus3

bundles/lib/ObjectOperation.php

Indentation +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	{
 		if ( is_object($mObject)) {
 			
-		    $mObject = (array) $mObject;
+			$mObject = (array) $mObject;
 		}
 
 

bundles/lib/Log/LogLevel.php

Indentation +8 added lines, -8 removed lines

@@ -7,12 +7,12 @@
  */
 class LogLevel
 {
-    const EMERGENCY = 'emergency';
-    const ALERT     = 'alert';
-    const CRITICAL  = 'critical';
-    const ERROR     = 'error';
-    const WARNING   = 'warning';
-    const NOTICE    = 'notice';
-    const INFO      = 'info';
-    const DEBUG     = 'debug';
+	const EMERGENCY = 'emergency';
+	const ALERT     = 'alert';
+	const CRITICAL  = 'critical';
+	const ERROR     = 'error';
+	const WARNING   = 'warning';
+	const NOTICE    = 'notice';
+	const INFO      = 'info';
+	const DEBUG     = 'debug';
 }

bundles/lib/Log/LoggerInterface.php

Indentation +84 added lines, -84 removed lines

@@ -19,96 +19,96 @@
  */
 interface LoggerInterface
 {
-    /**
-     * System is unusable.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function emergency($message, array $context = array());
+	/**
+	 * System is unusable.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	public function emergency($message, array $context = array());
 
-    /**
-     * Action must be taken immediately.
-     *
-     * Example: Entire website down, database unavailable, etc. This should
-     * trigger the SMS alerts and wake you up.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function alert($message, array $context = array());
+	/**
+	 * Action must be taken immediately.
+	 *
+	 * Example: Entire website down, database unavailable, etc. This should
+	 * trigger the SMS alerts and wake you up.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	public function alert($message, array $context = array());
 
-    /**
-     * Critical conditions.
-     *
-     * Example: Application component unavailable, unexpected exception.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function critical($message, array $context = array());
+	/**
+	 * Critical conditions.
+	 *
+	 * Example: Application component unavailable, unexpected exception.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	public function critical($message, array $context = array());
 
-    /**
-     * Runtime errors that do not require immediate action but should typically
-     * be logged and monitored.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function error($message, array $context = array());
+	/**
+	 * Runtime errors that do not require immediate action but should typically
+	 * be logged and monitored.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	public function error($message, array $context = array());
 
-    /**
-     * Exceptional occurrences that are not errors.
-     *
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
-     * that are not necessarily wrong.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function warning($message, array $context = array());
+	/**
+	 * Exceptional occurrences that are not errors.
+	 *
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
+	 * that are not necessarily wrong.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	public function warning($message, array $context = array());
 
-    /**
-     * Normal but significant events.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function notice($message, array $context = array());
+	/**
+	 * Normal but significant events.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	public function notice($message, array $context = array());
 
-    /**
-     * Interesting events.
-     *
-     * Example: User logs in, SQL logs.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function info($message, array $context = array());
+	/**
+	 * Interesting events.
+	 *
+	 * Example: User logs in, SQL logs.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	public function info($message, array $context = array());
 
-    /**
-     * Detailed debug information.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function debug($message, array $context = array());
+	/**
+	 * Detailed debug information.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	public function debug($message, array $context = array());
 
-    /**
-     * Logs with an arbitrary level.
-     *
-     * @param mixed $level
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function log($level, $message, array $context = array());
+	/**
+	 * Logs with an arbitrary level.
+	 *
+	 * @param mixed $level
+	 * @param string $message
+	 * @param array $context
+	 * @return null
+	 */
+	public function log($level, $message, array $context = array());
 }

bundles/src/plugins/Demo/Controller/Demo.php

Indentation +31 added lines, -31 removed lines

@@ -32,37 +32,37 @@
  */
 class Demo extends Controller
 {
-    /**
-     * Constructor
-     *
-     * @access public
-     * @return Demo
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
+	/**
+	 * Constructor
+	 *
+	 * @access public
+	 * @return Demo
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
 
-    /**
-     * bootstrap
-     *
-     * @access public
-     * @return void
-     */
-    public function bootstrap()
-    {
-        ;
-    }
+	/**
+	 * bootstrap
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function bootstrap()
+	{
+		;
+	}
 
-    /**
-     * install method
-     *
-     * @access public
-     * @param  string $sPortal
-     * @return void
-     */
-    public function install($sPortal)
-    {
-        $this->installDb;
-    }
+	/**
+	 * install method
+	 *
+	 * @access public
+	 * @param  string $sPortal
+	 * @return void
+	 */
+	public function install($sPortal)
+	{
+		$this->installDb;
+	}
 }

bundles/src/Batch/app/Controller/Phpunit.php

Indentation +38 added lines, -38 removed lines

@@ -6,42 +6,42 @@
 
 class Phpunit extends Controller
 {
-    /**
-     * Constructs a test case with the given name.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * new method to launch a web server
-     * @param array $options
-     * @tutorial php bin/console server:run
-     *           php bin/console server:run -a 192.168.0.1:8000
-     */
-    public function phpunit(array $options = array())
-    {
-        ob_get_clean();
-
-        $files = scandir(__DIR__.'/../../../../tests');
-
-        foreach ($files as $one) {
-
-            if (is_dir(__DIR__.'/../../../../tests/'.$one) && $one != '..' && $one != '.') {
-
-                $controllerFiles = scandir(__DIR__.'/../../../../tests'.'/'.$one.'/app/Controller');
-
-                foreach ($controllerFiles as $oneController) {
-
-                    if (is_file(__DIR__.'/../../../../tests/'.$one.'/app/Controller/' . $oneController) && $oneController != '..' && $oneController != '.') {
-
-                        $unitTest = new \PHPUnit_TextUI_Command;
-                        $unitTest->run([__DIR__.'/../../../../tests/'.$one.'/app/Controller/' . $oneController]);
-                    }
-                }
-            }
-        }
-    }
+	/**
+	 * Constructs a test case with the given name.
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * new method to launch a web server
+	 * @param array $options
+	 * @tutorial php bin/console server:run
+	 *           php bin/console server:run -a 192.168.0.1:8000
+	 */
+	public function phpunit(array $options = array())
+	{
+		ob_get_clean();
+
+		$files = scandir(__DIR__.'/../../../../tests');
+
+		foreach ($files as $one) {
+
+			if (is_dir(__DIR__.'/../../../../tests/'.$one) && $one != '..' && $one != '.') {
+
+				$controllerFiles = scandir(__DIR__.'/../../../../tests'.'/'.$one.'/app/Controller');
+
+				foreach ($controllerFiles as $oneController) {
+
+					if (is_file(__DIR__.'/../../../../tests/'.$one.'/app/Controller/' . $oneController) && $oneController != '..' && $oneController != '.') {
+
+						$unitTest = new \PHPUnit_TextUI_Command;
+						$unitTest->run([__DIR__.'/../../../../tests/'.$one.'/app/Controller/' . $oneController]);
+					}
+				}
+			}
+		}
+	}
 }

bundles/src/Batch/app/Controller/Server.php

Indentation +56 added lines, -56 removed lines

@@ -7,68 +7,68 @@
 
 class Server extends Controller
 {
-    /**
-     * new method to launch a web server
-     * @param array $options
-     * @tutorial php bin/console server:run
-     *           php bin/console server:run -a 192.168.0.1:8000
-     */
-    public function run(array $options = array())
-    {
-        ob_get_clean();
+	/**
+	 * new method to launch a web server
+	 * @param array $options
+	 * @tutorial php bin/console server:run
+	 *           php bin/console server:run -a 192.168.0.1:8000
+	 */
+	public function run(array $options = array())
+	{
+		ob_get_clean();
 
-        if (!isset($options['a'])) {
-            $options['a'] = 'localhost:8000';
-        }
+		if (!isset($options['a'])) {
+			$options['a'] = 'localhost:8000';
+		}
 
-        echo "\n\n";
-        echo Bash::setBackground("                                                                            ", 'green');
-        echo Bash::setBackground("          [OK] Start web server                                             ", 'green');
-        echo Bash::setBackground("                                                                            ", 'green');
-        echo "\n\n";
-        echo "        > Use ".$options['a']." in browser";
-        echo "\n\n";
-        echo "        > Clic Ctrl+C to stop the web server";
-        echo "\n\n";
+		echo "\n\n";
+		echo Bash::setBackground("                                                                            ", 'green');
+		echo Bash::setBackground("          [OK] Start web server                                             ", 'green');
+		echo Bash::setBackground("                                                                            ", 'green');
+		echo "\n\n";
+		echo "        > Use ".$options['a']." in browser";
+		echo "\n\n";
+		echo "        > Clic Ctrl+C to stop the web server";
+		echo "\n\n";
 
-        exec('php -S '.$options['a'].' /public/index.php');
-    }
+		exec('php -S '.$options['a'].' /public/index.php');
+	}
 
-    /**
-     * check if a server web is launched
-     * @param array $options
-     * @tutorial php bin/console server:status
-     *           php bin/console server:status -a 192.168.0.1:8000
-     */
-    public function status(array $options = array())
-    {
-        ob_get_clean();
+	/**
+	 * check if a server web is launched
+	 * @param array $options
+	 * @tutorial php bin/console server:status
+	 *           php bin/console server:status -a 192.168.0.1:8000
+	 */
+	public function status(array $options = array())
+	{
+		ob_get_clean();
 
-        if (!isset($options['a'])) {
-            $options['a'] = 'localhost:8000';
-        }
+		if (!isset($options['a'])) {
+			$options['a'] = 'localhost:8000';
+		}
 
-        list($hostname, $port) = explode(':', $options['a']);
+		list($hostname, $port) = explode(':', $options['a']);
 
-        if (false !== $fp = @fsockopen($hostname, $port, $errno, $errstr, 1)) {
-            fclose($fp);
+		if (false !== $fp = @fsockopen($hostname, $port, $errno, $errstr, 1)) {
+			fclose($fp);
 
-            echo "\n\n";
-            echo Bash::setBackground("                                                                            ", 'green');
-            echo Bash::setBackground("          [OK] A web server is launched                                     ", 'green');
-            echo Bash::setBackground("                                                                            ", 'green');
-            echo "\n\n";
-            echo "        > Check realized on ".$options['a'];
-            echo "\n\n";
-        }
-        else {
-            echo "\n\n";
-            echo Bash::setBackground("                                                                            ", 'red');
-            echo Bash::setBackground("          [WARNING] A web server is not used                                ", 'red');
-            echo Bash::setBackground("                                                                            ", 'red');
-            echo "\n\n";
-            echo "        > Check realized on ".$options['a'];
-            echo "\n\n";
-        }
-    }
+			echo "\n\n";
+			echo Bash::setBackground("                                                                            ", 'green');
+			echo Bash::setBackground("          [OK] A web server is launched                                     ", 'green');
+			echo Bash::setBackground("                                                                            ", 'green');
+			echo "\n\n";
+			echo "        > Check realized on ".$options['a'];
+			echo "\n\n";
+		}
+		else {
+			echo "\n\n";
+			echo Bash::setBackground("                                                                            ", 'red');
+			echo Bash::setBackground("          [WARNING] A web server is not used                                ", 'red');
+			echo Bash::setBackground("                                                                            ", 'red');
+			echo "\n\n";
+			echo "        > Check realized on ".$options['a'];
+			echo "\n\n";
+		}
+	}
 }

bundles/core/Config.php

Indentation +61 added lines, -61 removed lines

@@ -49,11 +49,11 @@ 
 	 */
 	public static function get(string $sName, string $sPortal = null, bool $bNoDoRedirect = false)
 	{
-	    if ($bNoDoRedirect === true) { $sNameCache = $sName.'_true'; } else { $sNameCache = $sName; }
+		if ($bNoDoRedirect === true) { $sNameCache = $sName.'_true'; } else { $sNameCache = $sName; }
 	    
 		if ($sPortal === null || !is_string($sPortal)) {
 		    
-		    if (defined('PORTAL')) {
+			if (defined('PORTAL')) {
 
 				$sPortal = PORTAL;
 				$aDirectories = array($sPortal);
@@ -70,93 +70,93 @@ 
 
 			foreach ($aDirectories as $sPortal) {
 			
-			    if ($sPortal != '..' && $sPortal != '.') {
+				if ($sPortal != '..' && $sPortal != '.') {
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
         				
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('DEV') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-prod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('PREPROD') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-pprod';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
+					if (file_exists(str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-dev') && getenv('RECETTE') == 1) {
         
-        				$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-rec';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local')) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf-local';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
 
-        			if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf')) {
+					if (file_exists(str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf')) {
         
-        				$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
-        				$base = self::_mergeAndGetConf($sJsonFile, $base);
-        			}
+						$sJsonFile = str_replace('core', 'src'.DIRECTORY_SEPARATOR.$sPortal.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
+						$base = self::_mergeAndGetConf($sJsonFile, $base);
+					}
         
-        			$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
-        			$base = self::_mergeAndGetConf($sJsonFile, $base);
-			    }
-		    }
+					$sJsonFile = str_replace('core', 'conf', __DIR__).DIRECTORY_SEPARATOR.$sName.'.conf';
+					$base = self::_mergeAndGetConf($sJsonFile, $base);
+				}
+			}
 
-            if ($base === '') {
+			if ($base === '') {
 				
 				trigger_error("Error in your Json format in this file : ".$sJsonFile, E_USER_NOTICE);
 			}
 
 			if (isset($base->redirect) && $bNoDoRedirect === false) {
 			
-                $base = self::get($sName, $base->redirect);
+				$base = self::get($sName, $base->redirect);
 			}
 			
 			self::$_aConfCache[$sNameCache] = $base;
@@ -180,9 +180,9 @@ 
 	 */
 	public static function getBundleLocationName(string $sName): string
 	{
-	    $oConfig = self::get($sName, null, true);
+		$oConfig = self::get($sName, null, true);
 
-	    if (isset($oConfig->redirect)) { return $oConfig->redirect; } else { return PORTAL; }
+		if (isset($oConfig->redirect)) { return $oConfig->redirect; } else { return PORTAL; }
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 			echo "The Json ".$sFileToMerge." has an error! Please verify!\n";
 			$oDebug = Debug::getInstance();
 			$oDebug->error("The Json ".$sFileToMerge." has an error! Please verify!\n");
-            new \Exception("The Json ".$sFileToMerge." has an error! Please verify!\n");
+			new \Exception("The Json ".$sFileToMerge." has an error! Please verify!\n");
 		}
 	}
 
@@ -228,7 +228,7 @@ 
 			} else if (is_array($oConfFiles) && is_array($base) && !isset($base[$sKey])) {
 
 				$base[$sKey] = $oConfFiles[$sKey];
-            } else if (!isset($base->$sKey) && is_array($mOne)) {
+			} else if (!isset($base->$sKey) && is_array($mOne)) {
 
 				$base->$sKey = new \StdClass;
 				list($oConfFiles, $base) = self::_recursiveGet($mOne, $base->$sKey);

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));
+	}
 
 }