las93 / venus3

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

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');

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/src/Batch/app/Controller/Generator.php

Spacing +11 added lines, -11 removed lines

@@ -72,13 +72,13 @@ 
 
 			if (!file_exists($sPrivatePath.'Controller')) {
 
-				mkdir($sPublicPath . 'css', 0777, true);
-				mkdir($sPublicPath . 'js', 0777, true);
-				mkdir($sPublicPath . 'img', 0777, true);
+				mkdir($sPublicPath.'css', 0777, true);
+				mkdir($sPublicPath.'js', 0777, true);
+				mkdir($sPublicPath.'img', 0777, true);
 			}
 			else {
 
-				echo 'The Project (public part) ' . $sPrivatePath . " exists\n";
+				echo 'The Project (public part) '.$sPrivatePath." exists\n";
 			}
 		}
 
@@ -91,16 +91,16 @@ 
 
 			if (!file_exists($sPrivatePath.'Controller')) {
 
-				mkdir($sPrivatePath . 'Controller', 0777, true);
-				mkdir($sPrivatePath . 'Entity', 0777, true);
-				mkdir($sPrivatePath . 'Model', 0777, true);
-				mkdir($sPrivatePath . 'View', 0777, true);
-				mkdir($sPrivatePath . 'conf', 0777, true);
-				mkdir($sPrivatePath . 'common', 0777, true);
+				mkdir($sPrivatePath.'Controller', 0777, true);
+				mkdir($sPrivatePath.'Entity', 0777, true);
+				mkdir($sPrivatePath.'Model', 0777, true);
+				mkdir($sPrivatePath.'View', 0777, true);
+				mkdir($sPrivatePath.'conf', 0777, true);
+				mkdir($sPrivatePath.'common', 0777, true);
 			}
 			else {
 
-				echo 'The Project (private part) ' . $sPrivatePath . " exists\n";
+				echo 'The Project (private part) '.$sPrivatePath." exists\n";
 			}
 
 			$sContent = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'common'.DIRECTORY_SEPARATOR.'Controller.php');

Braces +5 added lines, -10 removed lines

@@ -50,8 +50,7 @@ 
 		/**
 		 * option -p [portail]
 		 */
-		if (isset($aOptions['p'])) { $sPortal = $aOptions['p']; }
-		else { $sPortal = 'Batch'; }
+		if (isset($aOptions['p'])) { $sPortal = $aOptions['p']; } else { $sPortal = 'Batch'; }
 
 		if (!preg_match('/^[a-zA-Z0-9]+$/', $sPortal)) {
 
@@ -67,16 +66,14 @@ 
 
 			echo 'The batch can`t create public folders for '.$sPortal.'! Please check the rights.';
 			throw new \Exception('The batch can`t create public folders for '.$sPortal.'! Please check the rights.');
-		}
-		else {
+		} else {
 
 			if (!file_exists($sPrivatePath.'Controller')) {
 
 				mkdir($sPublicPath . 'css', 0777, true);
 				mkdir($sPublicPath . 'js', 0777, true);
 				mkdir($sPublicPath . 'img', 0777, true);
-			}
-			else {
+			} else {
 
 				echo 'The Project (public part) ' . $sPrivatePath . " exists\n";
 			}
@@ -86,8 +83,7 @@ 
 
 			echo 'The batch can`t create private folders for '.$sPortal.'! Please check the rights.';
 			throw new \Exception('The batch can`t create private folders for '.$sPortal.'! Please check the rights.');
-		}
-		else {
+		} else {
 
 			if (!file_exists($sPrivatePath.'Controller')) {
 
@@ -97,8 +93,7 @@ 
 				mkdir($sPrivatePath . 'View', 0777, true);
 				mkdir($sPrivatePath . 'conf', 0777, true);
 				mkdir($sPrivatePath . 'common', 0777, true);
-			}
-			else {
+			} else {
 
 				echo 'The Project (private part) ' . $sPrivatePath . " exists\n";
 			}

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

Indentation +8 added lines, -8 removed lines

@@ -50,20 +50,20 @@
 	 */
 	public function runScaffolding(array $aOptions = array())
 	{
-	    if (!isset($aOptions['p'])) { $aOptions['p'] = 'Batch'; }
+		if (!isset($aOptions['p'])) { $aOptions['p'] = 'Batch'; }
 	    
-	    if (!isset($aOptions['b'])) { $aOptions['b'] = json_encode(Config::get('Db', $aOptions['p'])); }
+		if (!isset($aOptions['b'])) { $aOptions['b'] = json_encode(Config::get('Db', $aOptions['p'])); }
 	    
-	    $aOptions['g'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Entity'.DIRECTORY_SEPARATOR;
+		$aOptions['g'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Entity'.DIRECTORY_SEPARATOR;
 	    
-	    $aOptions['h'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Model'.DIRECTORY_SEPARATOR;
+		$aOptions['h'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Model'.DIRECTORY_SEPARATOR;
 	    
 	    
-	    if (!defined('ENTITY_NAMESPACE')) { define('ENTITY_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Entity'); }
+		if (!defined('ENTITY_NAMESPACE')) { define('ENTITY_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Entity'); }
 	    
-	    if (!defined('MODEL_NAMESPACE')) { define('MODEL_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Model'); }
+		if (!defined('MODEL_NAMESPACE')) { define('MODEL_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Model'); }
 	    
-	    $oBatch = new BatchEntity;
-	    $oBatch->runScaffolding($aOptions);
+		$oBatch = new BatchEntity;
+		$oBatch->runScaffolding($aOptions);
 	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -37,10 +37,10 @@
 
                 foreach ($controllerFiles as $oneController) {
 
-                    if (is_file(__DIR__.'/../../../../tests/'.$one.'/app/Controller/' . $oneController) && $oneController != '..' && $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]);
+                        $unitTest->run([__DIR__.'/../../../../tests/'.$one.'/app/Controller/'.$oneController]);
                     }
                 }
             }

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

Indentation +29 added lines, -29 removed lines

@@ -47,20 +47,20 @@ 
 	 */
 	public function install(array $aOptions = array())
 	{
-	    $sFile = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugins.conf');
-	    $aPlugins = json_decode($sFile);
+		$sFile = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugins.conf');
+		$aPlugins = json_decode($sFile);
 	    
-	    if (isset($aOptions['p'])) {
+		if (isset($aOptions['p'])) {
 	        
-	        define('CREATE_PORTAL', $aOptions['p']);
-	    }
+			define('CREATE_PORTAL', $aOptions['p']);
+		}
 	    
-	    foreach ($aPlugins->list as $sPluginName) {
+		foreach ($aPlugins->list as $sPluginName) {
 	        
-	        $sClassName = 'Venus\src\plugins\\'.$sPluginName.'\Controller\\'.$sPluginName;
-	        $oPlugin = new $sClassName;
-	        $oPlugin->install($aOptions['p']);
-	    }
+			$sClassName = 'Venus\src\plugins\\'.$sPluginName.'\Controller\\'.$sPluginName;
+			$oPlugin = new $sClassName;
+			$oPlugin->install($aOptions['p']);
+		}
 	}
 
 	/**
@@ -73,23 +73,23 @@ 
 	 */
 	public function create(array $aOptions = array())
 	{
-	    $sDefaultFolder = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$aOptions['n'];
-	    mkdir($sDefaultFolder, 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'conf', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'data', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'meta', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'css', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'img', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'js', 0777, true);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'View', 0777, true);
+		$sDefaultFolder = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$aOptions['n'];
+		mkdir($sDefaultFolder, 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'conf', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'data', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'meta', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'css', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'img', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'js', 0777, true);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'View', 0777, true);
 	    
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Db.conf', '{}');
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugin.conf', '{}');
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Db.conf', '{}');
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugin.conf', '{}');
 	    
-	    $sContent = "<?php
+		$sContent = "<?php
 
 /**
  * Controller of the plugin ".$aOptions['n']."
@@ -157,9 +157,9 @@ 
     }
 }";
 	    
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller'.DIRECTORY_SEPARATOR.$aOptions['n'].'.php', $sContent);
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n'.DIRECTORY_SEPARATOR.'en_US'.DIRECTORY_SEPARATOR.'LC_MESSAGES', 0777, true);
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'LICENSE.md', '');
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'README.md', '');
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller'.DIRECTORY_SEPARATOR.$aOptions['n'].'.php', $sContent);
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n'.DIRECTORY_SEPARATOR.'en_US'.DIRECTORY_SEPARATOR.'LC_MESSAGES', 0777, true);
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'LICENSE.md', '');
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'README.md', '');
 	}
 }

bundles/conf/AutoLoad.php

Indentation +33 added lines, -33 removed lines

@@ -17,45 +17,45 @@ 
 spl_autoload_register(function (string $sClassName)
 {
 
-    $sClassName = ltrim($sClassName, '\\');
-    $sFileName  = '';
-    $sNamespace = '';
-    $iLastNsPos = strrpos($sClassName, '\\');
+	$sClassName = ltrim($sClassName, '\\');
+	$sFileName  = '';
+	$sNamespace = '';
+	$iLastNsPos = strrpos($sClassName, '\\');
 
-    if ($iLastNsPos) {
+	if ($iLastNsPos) {
 
-        $sNamespace = substr($sClassName, 0, $iLastNsPos);
-        $sClassName = substr($sClassName, $iLastNsPos + 1);
+		$sNamespace = substr($sClassName, 0, $iLastNsPos);
+		$sClassName = substr($sClassName, $iLastNsPos + 1);
 		$sFileName  = str_replace('\\', DIRECTORY_SEPARATOR, $sNamespace).DIRECTORY_SEPARATOR;
-    }
+	}
 
-    $sFileName = str_replace('/', '\\', $sFileName);
+	$sFileName = str_replace('/', '\\', $sFileName);
     
-    $sFileName .= $sClassName.'.php';
+	$sFileName .= $sClassName.'.php';
 
-    if (defined('PORTAL')) {
+	if (defined('PORTAL')) {
 
-        $sFileClassName = str_replace(PORTAL, PORTAL.DIRECTORY_SEPARATOR.'app', str_replace(['\\', '/'], DIRECTORY_SEPARATOR, str_replace('conf', DIRECTORY_SEPARATOR, __DIR__).str_replace('Venus\\', '', $sFileName)));
-        $sFileClassName = preg_replace('/(tests\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
-        $sFileClassName = preg_replace('/(src\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
-        $sFileClassName = str_replace('\\\\', '\\', $sFileClassName);
-        $sFileClassName = preg_replace('#bundles//tests/([^/]+)#', 'bundles/tests/$1/app', $sFileClassName);
-        $sFileClassName = preg_replace('#bundles//src/([^/]+)#', 'bundles/src/$1/app', $sFileClassName);
-        $sFileClassName = str_replace('app\\app', 'app', $sFileClassName);
-        $sFileClassName = str_replace('app/app', 'app', $sFileClassName);
+		$sFileClassName = str_replace(PORTAL, PORTAL.DIRECTORY_SEPARATOR.'app', str_replace(['\\', '/'], DIRECTORY_SEPARATOR, str_replace('conf', DIRECTORY_SEPARATOR, __DIR__).str_replace('Venus\\', '', $sFileName)));
+		$sFileClassName = preg_replace('/(tests\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
+		$sFileClassName = preg_replace('/(src\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
+		$sFileClassName = str_replace('\\\\', '\\', $sFileClassName);
+		$sFileClassName = preg_replace('#bundles//tests/([^/]+)#', 'bundles/tests/$1/app', $sFileClassName);
+		$sFileClassName = preg_replace('#bundles//src/([^/]+)#', 'bundles/src/$1/app', $sFileClassName);
+		$sFileClassName = str_replace('app\\app', 'app', $sFileClassName);
+		$sFileClassName = str_replace('app/app', 'app', $sFileClassName);
 
-        if (strstr($sFileName, 'Venus\\') && file_exists($sFileClassName)) {
+		if (strstr($sFileName, 'Venus\\') && file_exists($sFileClassName)) {
 
-        	require $sFileClassName;
-        }
-    }
-    else {
+			require $sFileClassName;
+		}
+	}
+	else {
 
-        if (strstr($sFileName, 'Venus\\') && file_exists(preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName))))) {
+		if (strstr($sFileName, 'Venus\\') && file_exists(preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName))))) {
 
-            require preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName)));
-        }
-    }
+			require preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName)));
+		}
+	}
 });
 
 /**
@@ -64,7 +64,7 @@ 
 
 if (file_exists(preg_replace('#bundles[/\\\\]conf#', '', __DIR__).'vendor/autoload.php')) {
 
-    include preg_replace('#bundles[/\\\\]conf#', '', __DIR__).'vendor/autoload.php';
+	include preg_replace('#bundles[/\\\\]conf#', '', __DIR__).'vendor/autoload.php';
 }
 
 /**
@@ -75,10 +75,10 @@ 
 
 if (isset($oConfig) && isset($oConfig->autoload)) {
     
-    $oAutoloadConf = $oConfig->autoload;
+	$oAutoloadConf = $oConfig->autoload;
     
-    foreach ($oAutoloadConf as $sFile) {
+	foreach ($oAutoloadConf as $sFile) {
     
-        require __DIR__.'/../'.$sFile;
-    }
+		require __DIR__.'/../'.$sFile;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
  *
  * new version with SPL to have the capacity to add external autoload
  */
-spl_autoload_register(function (string $sClassName)
+spl_autoload_register(function(string $sClassName)
 {
 
     $sClassName = ltrim($sClassName, '\\');
@@ -26,7 +26,7 @@ 
 
         $sNamespace = substr($sClassName, 0, $iLastNsPos);
         $sClassName = substr($sClassName, $iLastNsPos + 1);
-		$sFileName  = str_replace('\\', DIRECTORY_SEPARATOR, $sNamespace).DIRECTORY_SEPARATOR;
+		$sFileName = str_replace('\\', DIRECTORY_SEPARATOR, $sNamespace).DIRECTORY_SEPARATOR;
     }
 
     $sFileName = str_replace('/', '\\', $sFileName);

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 
         	require $sFileClassName;
         }
-    }
-    else {
+    } else {
 
         if (strstr($sFileName, 'Venus\\') && file_exists(preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName))))) {
 

bundles/lib/Cache/Apc.php

Spacing +1 added lines, -1 removed lines

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

bundles/lib/Request/RequestInterface.php

Indentation +7 added lines, -7 removed lines

@@ -9,11 +9,11 @@
 
 interface RequestInterface
 {
-    /**
-     * get parameter
-     * @param string $name
-     * @param string $default
-     * @return string
-     */
-    public function get(string $name, string $default = null) : string;
+	/**
+	 * get parameter
+	 * @param string $name
+	 * @param string $default
+	 * @return string
+	 */
+	public function get(string $name, string $default = null) : string;
 }

bundles/lib/Request/Files.php

Indentation +15 added lines, -15 removed lines

@@ -9,19 +9,19 @@
 
 class Files implements RequestInterface
 {
-    /**
-     * get parameter
-     * @param string $name
-     * @param string $default
-     * @return string
-     */
-    public function get(string $name, string $default = null) : string
-    {
-        if (isset($_FILES[$name]) && $_FILES[$name] != '') {
-            return $_FILES[$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($_FILES[$name]) && $_FILES[$name] != '') {
+			return $_FILES[$name];
+		}
+		else if ($default !== null) {
+			return $default;
+		}
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
     {
         if (isset($_COOKIE[$name]) && $_COOKIE[$name] != '') {
             return $_COOKIE[$name];
-        }
-        else if ($default !== null) {
+        } else if ($default !== null) {
             return $default;
         }
     }