Passed
Branch master (e94900)
by judicael
03:54
created
bundles/src/plugins/Demo/Controller/Demo.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -32,37 +32,37 @@
 block discarded – undo
32 32
  */
33 33
 class Demo extends Controller
34 34
 {
35
-    /**
36
-     * Constructor
37
-     *
38
-     * @access public
39
-     * @return object
40
-     */
41
-    public function __construct()
42
-    {
43
-        parent::__construct();
44
-    }
35
+	/**
36
+	 * Constructor
37
+	 *
38
+	 * @access public
39
+	 * @return object
40
+	 */
41
+	public function __construct()
42
+	{
43
+		parent::__construct();
44
+	}
45 45
 
46
-    /**
47
-     * bootstrap
48
-     *
49
-     * @access public
50
-     * @return void
51
-     */
52
-    public function bootstrap()
53
-    {
54
-        ;
55
-    }
46
+	/**
47
+	 * bootstrap
48
+	 *
49
+	 * @access public
50
+	 * @return void
51
+	 */
52
+	public function bootstrap()
53
+	{
54
+		;
55
+	}
56 56
 
57
-    /**
58
-     * install method
59
-     *
60
-     * @access public
61
-     * @param  string $sPortal
62
-     * @return void
63
-     */
64
-    public function install($sPortal)
65
-    {
66
-        $this->installDb;
67
-    }
57
+	/**
58
+	 * install method
59
+	 *
60
+	 * @access public
61
+	 * @param  string $sPortal
62
+	 * @return void
63
+	 */
64
+	public function install($sPortal)
65
+	{
66
+		$this->installDb;
67
+	}
68 68
 }
69 69
\ No newline at end of file
Please login to merge, or discard this patch.
bundles/src/Demo/app/Controller/Home.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,6 +63,6 @@
 block discarded – undo
63 63
 
64 64
 		$response->send();
65 65
 
66
-	    exit;
66
+		exit;
67 67
 	}
68 68
 }
69 69
\ No newline at end of file
Please login to merge, or discard this patch.
bundles/src/Batch/app/Controller/Server.php 1 patch
Indentation   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -7,68 +7,68 @@
 block discarded – undo
7 7
 
8 8
 class Server extends Controller
9 9
 {
10
-    /**
11
-     * new method to launch a web server
12
-     * @param array $options
13
-     * @tutorial php bin/console server:run
14
-     *           php bin/console server:run -a 192.168.0.1:8000
15
-     */
16
-    public function run(array $options = array())
17
-    {
18
-        ob_get_clean();
10
+	/**
11
+	 * new method to launch a web server
12
+	 * @param array $options
13
+	 * @tutorial php bin/console server:run
14
+	 *           php bin/console server:run -a 192.168.0.1:8000
15
+	 */
16
+	public function run(array $options = array())
17
+	{
18
+		ob_get_clean();
19 19
 
20
-        if (!isset($options['a'])) {
21
-            $options['a'] = 'localhost:8000';
22
-        }
20
+		if (!isset($options['a'])) {
21
+			$options['a'] = 'localhost:8000';
22
+		}
23 23
 
24
-        echo "\n\n";
25
-        echo Bash::setBackground("                                                                            ", 'green');
26
-        echo Bash::setBackground("          [OK] Start web server                                             ", 'green');
27
-        echo Bash::setBackground("                                                                            ", 'green');
28
-        echo "\n\n";
29
-        echo "        > Use ".$options['a']." in browser";
30
-        echo "\n\n";
31
-        echo "        > Clic Ctrl+C to stop the web server";
32
-        echo "\n\n";
24
+		echo "\n\n";
25
+		echo Bash::setBackground("                                                                            ", 'green');
26
+		echo Bash::setBackground("          [OK] Start web server                                             ", 'green');
27
+		echo Bash::setBackground("                                                                            ", 'green');
28
+		echo "\n\n";
29
+		echo "        > Use ".$options['a']." in browser";
30
+		echo "\n\n";
31
+		echo "        > Clic Ctrl+C to stop the web server";
32
+		echo "\n\n";
33 33
 
34
-        exec('php -S '.$options['a'].' /public/index.php');
35
-    }
34
+		exec('php -S '.$options['a'].' /public/index.php');
35
+	}
36 36
 
37
-    /**
38
-     * check if a server web is launched
39
-     * @param array $options
40
-     * @tutorial php bin/console server:status
41
-     *           php bin/console server:status -a 192.168.0.1:8000
42
-     */
43
-    public function status(array $options = array())
44
-    {
45
-        ob_get_clean();
37
+	/**
38
+	 * check if a server web is launched
39
+	 * @param array $options
40
+	 * @tutorial php bin/console server:status
41
+	 *           php bin/console server:status -a 192.168.0.1:8000
42
+	 */
43
+	public function status(array $options = array())
44
+	{
45
+		ob_get_clean();
46 46
 
47
-        if (!isset($options['a'])) {
48
-            $options['a'] = 'localhost:8000';
49
-        }
47
+		if (!isset($options['a'])) {
48
+			$options['a'] = 'localhost:8000';
49
+		}
50 50
 
51
-        list($hostname, $port) = explode(':', $options['a']);
51
+		list($hostname, $port) = explode(':', $options['a']);
52 52
 
53
-        if (false !== $fp = @fsockopen($hostname, $port, $errno, $errstr, 1)) {
54
-            fclose($fp);
53
+		if (false !== $fp = @fsockopen($hostname, $port, $errno, $errstr, 1)) {
54
+			fclose($fp);
55 55
 
56
-            echo "\n\n";
57
-            echo Bash::setBackground("                                                                            ", 'green');
58
-            echo Bash::setBackground("          [OK] A web server is launched                                     ", 'green');
59
-            echo Bash::setBackground("                                                                            ", 'green');
60
-            echo "\n\n";
61
-            echo "        > Check realized on ".$options['a'];
62
-            echo "\n\n";
63
-        }
64
-        else {
65
-            echo "\n\n";
66
-            echo Bash::setBackground("                                                                            ", 'red');
67
-            echo Bash::setBackground("          [WARNING] A web server is not used                                ", 'red');
68
-            echo Bash::setBackground("                                                                            ", 'red');
69
-            echo "\n\n";
70
-            echo "        > Check realized on ".$options['a'];
71
-            echo "\n\n";
72
-        }
73
-    }
56
+			echo "\n\n";
57
+			echo Bash::setBackground("                                                                            ", 'green');
58
+			echo Bash::setBackground("          [OK] A web server is launched                                     ", 'green');
59
+			echo Bash::setBackground("                                                                            ", 'green');
60
+			echo "\n\n";
61
+			echo "        > Check realized on ".$options['a'];
62
+			echo "\n\n";
63
+		}
64
+		else {
65
+			echo "\n\n";
66
+			echo Bash::setBackground("                                                                            ", 'red');
67
+			echo Bash::setBackground("          [WARNING] A web server is not used                                ", 'red');
68
+			echo Bash::setBackground("                                                                            ", 'red');
69
+			echo "\n\n";
70
+			echo "        > Check realized on ".$options['a'];
71
+			echo "\n\n";
72
+		}
73
+	}
74 74
 }
75 75
\ No newline at end of file
Please login to merge, or discard this patch.
bundles/src/Batch/app/Controller/Entity.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -50,20 +50,20 @@
 block discarded – undo
50 50
 	 */
51 51
 	public function runScaffolding(array $aOptions = array())
52 52
 	{
53
-	    if (!isset($aOptions['p'])) { $aOptions['p'] = 'Batch'; }
53
+		if (!isset($aOptions['p'])) { $aOptions['p'] = 'Batch'; }
54 54
 	    
55
-	    if (!isset($aOptions['b'])) { $aOptions['b'] = json_encode(Config::get('Db', $aOptions['p'])); }
55
+		if (!isset($aOptions['b'])) { $aOptions['b'] = json_encode(Config::get('Db', $aOptions['p'])); }
56 56
 	    
57
-	    $aOptions['g'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Entity'.DIRECTORY_SEPARATOR;
57
+		$aOptions['g'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Entity'.DIRECTORY_SEPARATOR;
58 58
 	    
59
-	    $aOptions['h'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Model'.DIRECTORY_SEPARATOR;
59
+		$aOptions['h'] = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$aOptions['p'].DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Model'.DIRECTORY_SEPARATOR;
60 60
 	    
61 61
 	    
62
-	    if (!defined('ENTITY_NAMESPACE')) { define('ENTITY_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Entity'); }
62
+		if (!defined('ENTITY_NAMESPACE')) { define('ENTITY_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Entity'); }
63 63
 	    
64
-	    if (!defined('MODEL_NAMESPACE')) { define('MODEL_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Model'); }
64
+		if (!defined('MODEL_NAMESPACE')) { define('MODEL_NAMESPACE', '\Venus\src\\'.$aOptions['p'].'\Model'); }
65 65
 	    
66
-	    $oBatch = new BatchEntity;
67
-	    $oBatch->runScaffolding($aOptions);
66
+		$oBatch = new BatchEntity;
67
+		$oBatch->runScaffolding($aOptions);
68 68
 	}
69 69
 }
Please login to merge, or discard this patch.
bundles/src/Batch/app/Controller/Phpunit.php 1 patch
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -8,42 +8,42 @@
 block discarded – undo
8 8
 
9 9
 class Phpunit extends Controller
10 10
 {
11
-    /**
12
-     * Constructs a test case with the given name.
13
-     *
14
-     */
15
-    public function __construct()
16
-    {
17
-        parent::__construct();
18
-    }
19
-
20
-    /**
21
-     * new method to launch a web server
22
-     * @param array $options
23
-     * @tutorial php bin/console server:run
24
-     *           php bin/console server:run -a 192.168.0.1:8000
25
-     */
26
-    public function phpunit(array $options = array())
27
-    {
28
-        ob_get_clean();
29
-
30
-        $files = scandir(__DIR__.'/../../../../tests');
31
-
32
-        foreach ($files as $one) {
33
-
34
-            if (is_dir(__DIR__.'/../../../../tests/'.$one) && $one != '..' && $one != '.') {
35
-
36
-                $controllerFiles = scandir(__DIR__.'/../../../../tests'.'/'.$one.'/app/Controller');
37
-
38
-                foreach ($controllerFiles as $oneController) {
39
-
40
-                    if (is_file(__DIR__.'/../../../../tests/'.$one.'/app/Controller/' . $oneController) && $oneController != '..' && $oneController != '.') {
41
-
42
-                        $unitTest = new \PHPUnit_TextUI_Command;
43
-                        $unitTest->run([__DIR__.'/../../../../tests/'.$one.'/app/Controller/' . $oneController]);
44
-                    }
45
-                }
46
-            }
47
-        }
48
-    }
11
+	/**
12
+	 * Constructs a test case with the given name.
13
+	 *
14
+	 */
15
+	public function __construct()
16
+	{
17
+		parent::__construct();
18
+	}
19
+
20
+	/**
21
+	 * new method to launch a web server
22
+	 * @param array $options
23
+	 * @tutorial php bin/console server:run
24
+	 *           php bin/console server:run -a 192.168.0.1:8000
25
+	 */
26
+	public function phpunit(array $options = array())
27
+	{
28
+		ob_get_clean();
29
+
30
+		$files = scandir(__DIR__.'/../../../../tests');
31
+
32
+		foreach ($files as $one) {
33
+
34
+			if (is_dir(__DIR__.'/../../../../tests/'.$one) && $one != '..' && $one != '.') {
35
+
36
+				$controllerFiles = scandir(__DIR__.'/../../../../tests'.'/'.$one.'/app/Controller');
37
+
38
+				foreach ($controllerFiles as $oneController) {
39
+
40
+					if (is_file(__DIR__.'/../../../../tests/'.$one.'/app/Controller/' . $oneController) && $oneController != '..' && $oneController != '.') {
41
+
42
+						$unitTest = new \PHPUnit_TextUI_Command;
43
+						$unitTest->run([__DIR__.'/../../../../tests/'.$one.'/app/Controller/' . $oneController]);
44
+					}
45
+				}
46
+			}
47
+		}
48
+	}
49 49
 }
50 50
\ No newline at end of file
Please login to merge, or discard this patch.
bundles/src/Batch/app/Controller/Plugin.php 1 patch
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -47,20 +47,20 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function install(array $aOptions = array())
49 49
 	{
50
-	    $sFile = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugins.conf');
51
-	    $aPlugins = json_decode($sFile);
50
+		$sFile = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugins.conf');
51
+		$aPlugins = json_decode($sFile);
52 52
 	    
53
-	    if (isset($aOptions['p'])) {
53
+		if (isset($aOptions['p'])) {
54 54
 	        
55
-	        define('CREATE_PORTAL', $aOptions['p']);
56
-	    }
55
+			define('CREATE_PORTAL', $aOptions['p']);
56
+		}
57 57
 	    
58
-	    foreach ($aPlugins->list as $sPluginName) {
58
+		foreach ($aPlugins->list as $sPluginName) {
59 59
 	        
60
-	        $sClassName = 'Venus\src\plugins\\'.$sPluginName.'\Controller\\'.$sPluginName;
61
-	        $oPlugin = new $sClassName;
62
-	        $oPlugin->install($aOptions['p']);
63
-	    }
60
+			$sClassName = 'Venus\src\plugins\\'.$sPluginName.'\Controller\\'.$sPluginName;
61
+			$oPlugin = new $sClassName;
62
+			$oPlugin->install($aOptions['p']);
63
+		}
64 64
 	}
65 65
 
66 66
 	/**
@@ -73,23 +73,23 @@  discard block
 block discarded – undo
73 73
 	 */
74 74
 	public function create(array $aOptions = array())
75 75
 	{
76
-	    $sDefaultFolder = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$aOptions['n'];
77
-	    mkdir($sDefaultFolder, 0777, true);
78
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'conf', 0777, true);
79
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller', 0777, true);
80
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'data', 0777, true);
81
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n', 0777, true);
82
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'meta', 0777, true);
83
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public', 0777, true);
84
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'css', 0777, true);
85
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'img', 0777, true);
86
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'js', 0777, true);
87
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'View', 0777, true);
76
+		$sDefaultFolder = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$aOptions['n'];
77
+		mkdir($sDefaultFolder, 0777, true);
78
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'conf', 0777, true);
79
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller', 0777, true);
80
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'data', 0777, true);
81
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n', 0777, true);
82
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'meta', 0777, true);
83
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public', 0777, true);
84
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'css', 0777, true);
85
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'img', 0777, true);
86
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.'js', 0777, true);
87
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'View', 0777, true);
88 88
 	    
89
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Db.conf', '{}');
90
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugin.conf', '{}');
89
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Db.conf', '{}');
90
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Plugin.conf', '{}');
91 91
 	    
92
-	    $sContent = "<?php
92
+		$sContent = "<?php
93 93
 
94 94
 /**
95 95
  * Controller of the plugin ".$aOptions['n']."
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
     }
158 158
 }";
159 159
 	    
160
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller'.DIRECTORY_SEPARATOR.$aOptions['n'].'.php', $sContent);
161
-	    mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n'.DIRECTORY_SEPARATOR.'en_US'.DIRECTORY_SEPARATOR.'LC_MESSAGES', 0777, true);
162
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'LICENSE.md', '');
163
-	    file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'README.md', '');
160
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'Controller'.DIRECTORY_SEPARATOR.$aOptions['n'].'.php', $sContent);
161
+		mkdir($sDefaultFolder.DIRECTORY_SEPARATOR.'i18n'.DIRECTORY_SEPARATOR.'en_US'.DIRECTORY_SEPARATOR.'LC_MESSAGES', 0777, true);
162
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'LICENSE.md', '');
163
+		file_put_contents($sDefaultFolder.DIRECTORY_SEPARATOR.'meta'.DIRECTORY_SEPARATOR.'README.md', '');
164 164
 	}
165 165
 }
Please login to merge, or discard this patch.
bundles/conf/AutoLoad.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -17,45 +17,45 @@  discard block
 block discarded – undo
17 17
 spl_autoload_register(function (string $sClassName)
18 18
 {
19 19
 
20
-    $sClassName = ltrim($sClassName, '\\');
21
-    $sFileName  = '';
22
-    $sNamespace = '';
23
-    $iLastNsPos = strrpos($sClassName, '\\');
20
+	$sClassName = ltrim($sClassName, '\\');
21
+	$sFileName  = '';
22
+	$sNamespace = '';
23
+	$iLastNsPos = strrpos($sClassName, '\\');
24 24
 
25
-    if ($iLastNsPos) {
25
+	if ($iLastNsPos) {
26 26
 
27
-        $sNamespace = substr($sClassName, 0, $iLastNsPos);
28
-        $sClassName = substr($sClassName, $iLastNsPos + 1);
27
+		$sNamespace = substr($sClassName, 0, $iLastNsPos);
28
+		$sClassName = substr($sClassName, $iLastNsPos + 1);
29 29
 		$sFileName  = str_replace('\\', DIRECTORY_SEPARATOR, $sNamespace).DIRECTORY_SEPARATOR;
30
-    }
30
+	}
31 31
 
32
-    $sFileName = str_replace('/', '\\', $sFileName);
32
+	$sFileName = str_replace('/', '\\', $sFileName);
33 33
     
34
-    $sFileName .= $sClassName.'.php';
34
+	$sFileName .= $sClassName.'.php';
35 35
 
36
-    if (defined('PORTAL')) {
36
+	if (defined('PORTAL')) {
37 37
 
38
-        $sFileClassName = str_replace(PORTAL, PORTAL.DIRECTORY_SEPARATOR.'app', str_replace(['\\', '/'], DIRECTORY_SEPARATOR, str_replace('conf', DIRECTORY_SEPARATOR, __DIR__).str_replace('Venus\\', '', $sFileName)));
39
-        $sFileClassName = preg_replace('/(tests\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
40
-        $sFileClassName = preg_replace('/(src\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
41
-        $sFileClassName = str_replace('\\\\', '\\', $sFileClassName);
42
-        $sFileClassName = preg_replace('#bundles//tests/([^/]+)#', 'bundles/tests/$1/app', $sFileClassName);
43
-        $sFileClassName = preg_replace('#bundles//src/([^/]+)#', 'bundles/src/$1/app', $sFileClassName);
44
-        $sFileClassName = str_replace('app\\app', 'app', $sFileClassName);
45
-        $sFileClassName = str_replace('app/app', 'app', $sFileClassName);
38
+		$sFileClassName = str_replace(PORTAL, PORTAL.DIRECTORY_SEPARATOR.'app', str_replace(['\\', '/'], DIRECTORY_SEPARATOR, str_replace('conf', DIRECTORY_SEPARATOR, __DIR__).str_replace('Venus\\', '', $sFileName)));
39
+		$sFileClassName = preg_replace('/(tests\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
40
+		$sFileClassName = preg_replace('/(src\\\\[^\\\\]+\\\\)/', '$1app\\', $sFileClassName);
41
+		$sFileClassName = str_replace('\\\\', '\\', $sFileClassName);
42
+		$sFileClassName = preg_replace('#bundles//tests/([^/]+)#', 'bundles/tests/$1/app', $sFileClassName);
43
+		$sFileClassName = preg_replace('#bundles//src/([^/]+)#', 'bundles/src/$1/app', $sFileClassName);
44
+		$sFileClassName = str_replace('app\\app', 'app', $sFileClassName);
45
+		$sFileClassName = str_replace('app/app', 'app', $sFileClassName);
46 46
 
47
-        if (strstr($sFileName, 'Venus\\') && file_exists($sFileClassName)) {
47
+		if (strstr($sFileName, 'Venus\\') && file_exists($sFileClassName)) {
48 48
 
49
-        	require $sFileClassName;
50
-        }
51
-    }
52
-    else {
49
+			require $sFileClassName;
50
+		}
51
+	}
52
+	else {
53 53
 
54
-        if (strstr($sFileName, 'Venus\\') && file_exists(preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName))))) {
54
+		if (strstr($sFileName, 'Venus\\') && file_exists(preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName))))) {
55 55
 
56
-            require preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName)));
57
-        }
58
-    }
56
+			require preg_replace('#^(src/[a-zA-Z0-9_]+/)#', '$1app/', str_replace(['\\', '/'], '/', str_replace('conf', '', __DIR__).str_replace('Venus\\', '', $sFileName)));
57
+		}
58
+	}
59 59
 });
60 60
 
61 61
 /**
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
 if (file_exists(preg_replace('#bundles[/\\\\]conf#', '', __DIR__).'vendor/autoload.php')) {
66 66
 
67
-    include preg_replace('#bundles[/\\\\]conf#', '', __DIR__).'vendor/autoload.php';
67
+	include preg_replace('#bundles[/\\\\]conf#', '', __DIR__).'vendor/autoload.php';
68 68
 }
69 69
 
70 70
 /**
@@ -75,10 +75,10 @@  discard block
 block discarded – undo
75 75
 
76 76
 if (isset($oConfig) && isset($oConfig->autoload)) {
77 77
     
78
-    $oAutoloadConf = $oConfig->autoload;
78
+	$oAutoloadConf = $oConfig->autoload;
79 79
     
80
-    foreach ($oAutoloadConf as $sFile) {
80
+	foreach ($oAutoloadConf as $sFile) {
81 81
     
82
-        require __DIR__.'/../'.$sFile;
83
-    }
82
+		require __DIR__.'/../'.$sFile;
83
+	}
84 84
 }
Please login to merge, or discard this patch.