las93 / venus3

bundles/src/plugins/common/Controller.php

Indentation +11 added lines, -11 removed lines

@@ -46,20 +46,20 @@
 		
 		$this->installDb = function()
 		{
-		    $oDb = Config::get('Db');
-		    $oTables = json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.preg_replace('/^.*\\\\([a-zA-Z0-9]+)$/', '$1', get_called_class()).DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Db.conf'));
+			$oDb = Config::get('Db');
+			$oTables = json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.preg_replace('/^.*\\\\([a-zA-Z0-9]+)$/', '$1', get_called_class()).DIRECTORY_SEPARATOR.'conf'.DIRECTORY_SEPARATOR.'Db.conf'));
 		    
-		    $oDb->configuration->tables = $oTables;
+			$oDb->configuration->tables = $oTables;
 		    
-    	    $aOptions = [
-	           "p" => CREATE_PORTAL,
-	           "c" => true,
-	           "e" => true,
-	           "b" => json_encode($oDb)
-    	    ];
+			$aOptions = [
+			   "p" => CREATE_PORTAL,
+			   "c" => true,
+			   "e" => true,
+			   "b" => json_encode($oDb)
+			];
     	    
-    	    $oEntity = new Entity;
-    	    $oEntity->runScaffolding($aOptions);
+			$oEntity = new Entity;
+			$oEntity->runScaffolding($aOptions);
 		};
 	}
 }

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

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

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