aimeos / aimeos-slim

cache.php

Spacing +55 added lines, -55 removed lines

@@ -6,12 +6,12 @@ 
  */
 
 
-if( php_sapi_name() != 'cli' ) {
-	exit( 'Setup can only be started via command line for security reasons' );
+if (php_sapi_name() != 'cli') {
+	exit('Setup can only be started via command line for security reasons');
 }
 
-ini_set( 'display_errors', 1 );
-date_default_timezone_set( 'UTC' );
+ini_set('display_errors', 1);
+date_default_timezone_set('UTC');
 
 
 
@@ -21,35 +21,35 @@ 
  * @param array &$params List of parameters
  * @return array Associative list of option name and value(s)
  */
-function getOptions( array &$params )
+function getOptions(array &$params)
 {
 	$options = array();
 
-	foreach( $params as $key => $option )
+	foreach ($params as $key => $option)
 	{
-		if( $option === '--help' ) {
+		if ($option === '--help') {
 			usage();
 		}
 
-		if( strncmp( $option, '--', 2 ) === 0 && ( $pos = strpos( $option, '=', 2 ) ) !== false )
+		if (strncmp($option, '--', 2) === 0 && ($pos = strpos($option, '=', 2)) !== false)
 		{
-			if( ( $name = substr( $option, 2, $pos - 2 ) ) !== false )
+			if (($name = substr($option, 2, $pos - 2)) !== false)
 			{
-				if( isset( $options[$name] ) )
+				if (isset($options[$name]))
 				{
 					$options[$name] = (array) $options[$name];
-					$options[$name][] = substr( $option, $pos + 1 );
+					$options[$name][] = substr($option, $pos + 1);
 				}
 				else
 				{
-					$options[$name] = substr( $option, $pos + 1 );
+					$options[$name] = substr($option, $pos + 1);
 				}
 
-				unset( $params[$key] );
+				unset($params[$key]);
 			}
 			else
 			{
-				printf( "Invalid option \"%1\$s\"\n", $option );
+				printf("Invalid option \"%1\$s\"\n", $option);
 				usage();
 			}
 		}
@@ -66,32 +66,32 @@ 
  * @param array $options Associative list of configuration options as key/value pairs
  * @return \Aimeos\MShop\Context\Item\Iface Context object
  */
-function getContext( array $confPaths, array $options )
+function getContext(array $confPaths, array $options)
 {
 	$config = array();
 	$ctx = new \Aimeos\MShop\Context\Item\Standard();
 
-	if( isset( $options['config'] ) )
+	if (isset($options['config']))
 	{
-		foreach( (array) $options['config'] as $path )
+		foreach ((array) $options['config'] as $path)
 		{
-			if( is_file( $path ) ) {
-				$config = array_replace_recursive( $config, require $path );
+			if (is_file($path)) {
+				$config = array_replace_recursive($config, require $path);
 			} else {
 				$confPaths[] = $path;
 			}
 		}
 	}
 
-	$conf = new \Aimeos\MW\Config\PHPArray( $config, $confPaths );
-	$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
-	$ctx->setConfig( $conf );
+	$conf = new \Aimeos\MW\Config\PHPArray($config, $confPaths);
+	$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
+	$ctx->setConfig($conf);
 
-	$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-	$ctx->setDatabaseManager( $dbm );
+	$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
+	$ctx->setDatabaseManager($dbm);
 
-	$logger = new \Aimeos\MW\Logger\Errorlog( \Aimeos\MW\Logger\Base::INFO );
-	$ctx->setLogger( $logger );
+	$logger = new \Aimeos\MW\Logger\Errorlog(\Aimeos\MW\Logger\Base::INFO);
+	$ctx->setLogger($logger);
 
 	return $ctx;
 }
@@ -103,20 +103,20 @@ 
  * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object
  * @param string|null $sites List of site codes separated by a space
  */
-function getSiteItems( \Aimeos\MShop\Context\Item\Iface $ctx, $sites )
+function getSiteItems(\Aimeos\MShop\Context\Item\Iface $ctx, $sites)
 {
-	$manager = \Aimeos\MShop\Factory::createManager( $ctx, 'locale/site' );
+	$manager = \Aimeos\MShop\Factory::createManager($ctx, 'locale/site');
 	$search = $manager->createSearch();
 
-	if( is_scalar( $sites ) && $sites != '' ) {
-		$sites = explode( ' ', $sites );
+	if (is_scalar($sites) && $sites != '') {
+		$sites = explode(' ', $sites);
 	}
 
-	if( !empty( $sites ) ) {
-		$search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) );
+	if (!empty($sites)) {
+		$search->setConditions($search->compare('==', 'locale.site.code', $sites));
 	}
 
-	return $manager->searchItems( $search );
+	return $manager->searchItems($search);
 }
 
 
@@ -126,23 +126,23 @@ 
  * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object
  * @param array $siteItems List of site items implementing \Aimeos\MShop\Locale\Site\Iface
  */
-function clear( \Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems )
+function clear(\Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems)
 {
-	$localeManager = \Aimeos\MShop\Factory::createManager( $ctx, 'locale' );
+	$localeManager = \Aimeos\MShop\Factory::createManager($ctx, 'locale');
 
-	foreach( $siteItems as $siteItem )
+	foreach ($siteItems as $siteItem)
 	{
-		$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
+		$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
 
 		$lcontext = clone $ctx;
-		$lcontext->setLocale( $localeItem );
+		$lcontext->setLocale($localeItem);
 
-		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
-		$lcontext->setCache( $cache );
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
+		$lcontext->setCache($cache);
 
-		printf( "Clearing the Aimeos cache for site \"%1\$s\"\n", $siteItem->getCode() );
+		printf("Clearing the Aimeos cache for site \"%1\$s\"\n", $siteItem->getCode());
 
-		\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush();
+		\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush();
 	}
 }
 
@@ -152,28 +152,28 @@ 
  */
 function usage()
 {
-	printf( "Usage: php cache.php [--extdir=<path>]* [--config=<path>|<file>]* [\"sitecode1 [sitecode2]*\"]\n" );
-	exit( 1 );
+	printf("Usage: php cache.php [--extdir=<path>]* [--config=<path>|<file>]* [\"sitecode1 [sitecode2]*\"]\n");
+	exit(1);
 }
 
 
 try
 {
 	$params = $_SERVER['argv'];
-	array_shift( $params );
+	array_shift($params);
 
-	$options = getOptions( $params );
-	$sites = array_shift( $params );
+	$options = getOptions($params);
+	$sites = array_shift($params);
 
 	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
-	$aimeos = new \Aimeos\Bootstrap( ( isset( $options['extdir'] ) ? (array) $options['extdir'] : array() ) );
-	$ctx = getContext( $aimeos->getConfigPaths(), $options );
-	$siteItems = getSiteItems( $ctx, $sites );
+	$aimeos = new \Aimeos\Bootstrap((isset($options['extdir']) ? (array) $options['extdir'] : array()));
+	$ctx = getContext($aimeos->getConfigPaths(), $options);
+	$siteItems = getSiteItems($ctx, $sites);
 
-	clear( $ctx, $siteItems );
+	clear($ctx, $siteItems);
 }
-catch( \Throwable $t )
+catch (\Throwable $t)
 {
 	echo "\n\nCaught PHP error while processing setup";
 	echo "\n\nMessage:\n";
@@ -181,9 +181,9 @@ 
 	echo "\n\nStack trace:\n";
 	echo $t->getTraceAsString();
 	echo "\n\n";
-	exit( 1 );
+	exit(1);
 }
-catch( \Exception $e )
+catch (\Exception $e)
 {
 	echo "\n\nCaught exception while processing setup";
 	echo "\n\nMessage:\n";
@@ -191,5 +191,5 @@ 
 	echo "\n\nStack trace:\n";
 	echo $e->getTraceAsString();
 	echo "\n\n";
-	exit( 1 );
+	exit(1);
 }

Braces +4 added lines, -8 removed lines

@@ -39,15 +39,13 @@ 
 				{
 					$options[$name] = (array) $options[$name];
 					$options[$name][] = substr( $option, $pos + 1 );
-				}
-				else
+				} else
 				{
 					$options[$name] = substr( $option, $pos + 1 );
 				}
 
 				unset( $params[$key] );
-			}
-			else
+			} else
 			{
 				printf( "Invalid option \"%1\$s\"\n", $option );
 				usage();
@@ -172,8 +170,7 @@ 
 	$siteItems = getSiteItems( $ctx, $sites );
 
 	clear( $ctx, $siteItems );
-}
-catch( \Throwable $t )
+} catch( \Throwable $t )
 {
 	echo "\n\nCaught PHP error while processing setup";
 	echo "\n\nMessage:\n";
@@ -182,8 +179,7 @@ 
 	echo $t->getTraceAsString();
 	echo "\n\n";
 	exit( 1 );
-}
-catch( \Exception $e )
+} catch( \Exception $e )
 {
 	echo "\n\nCaught exception while processing setup";
 	echo "\n\nMessage:\n";

job.php

Spacing +64 added lines, -64 removed lines

@@ -6,12 +6,12 @@ 
  */
 
 
-if( php_sapi_name() != 'cli' ) {
-	exit( 'Setup can only be started via command line for security reasons' );
+if (php_sapi_name() != 'cli') {
+	exit('Setup can only be started via command line for security reasons');
 }
 
-ini_set( 'display_errors', 1 );
-date_default_timezone_set( 'UTC' );
+ini_set('display_errors', 1);
+date_default_timezone_set('UTC');
 
 
 
@@ -21,35 +21,35 @@ 
  * @param array &$params List of parameters
  * @return array Associative list of option name and value(s)
  */
-function getOptions( array &$params )
+function getOptions(array &$params)
 {
 	$options = array();
 
-	foreach( $params as $key => $option )
+	foreach ($params as $key => $option)
 	{
-		if( $option === '--help' ) {
+		if ($option === '--help') {
 			usage();
 		}
 
-		if( strncmp( $option, '--', 2 ) === 0 && ( $pos = strpos( $option, '=', 2 ) ) !== false )
+		if (strncmp($option, '--', 2) === 0 && ($pos = strpos($option, '=', 2)) !== false)
 		{
-			if( ( $name = substr( $option, 2, $pos - 2 ) ) !== false )
+			if (($name = substr($option, 2, $pos - 2)) !== false)
 			{
-				if( isset( $options[$name] ) )
+				if (isset($options[$name]))
 				{
 					$options[$name] = (array) $options[$name];
-					$options[$name][] = substr( $option, $pos + 1 );
+					$options[$name][] = substr($option, $pos + 1);
 				}
 				else
 				{
-					$options[$name] = substr( $option, $pos + 1 );
+					$options[$name] = substr($option, $pos + 1);
 				}
 
-				unset( $params[$key] );
+				unset($params[$key]);
 			}
 			else
 			{
-				printf( "Invalid option \"%1\$s\"\n", $option );
+				printf("Invalid option \"%1\$s\"\n", $option);
 				usage();
 			}
 		}
@@ -65,16 +65,16 @@ 
  * @param array $options Associative list of given options
  * @return array Multi-dimensional array of configuration settings
  */
-function getConfig( array $options )
+function getConfig(array $options)
 {
 	$config = array();
 
-	if( isset( $options['config'] ) )
+	if (isset($options['config']))
 	{
-		foreach( (array) $options['config'] as $path )
+		foreach ((array) $options['config'] as $path)
 		{
-			if( is_file( $path ) ) {
-				$config = array_replace_recursive( $config, require $path );
+			if (is_file($path)) {
+				$config = array_replace_recursive($config, require $path);
 			} else {
 				$confPaths[] = $path;
 			}
@@ -91,25 +91,25 @@ 
  * @param \Interop\Container\ContainerInterface $container Dependency injection container
  * @return \Aimeos\MShop\Context\Item\Standard Context object
  */
-function getContext( \Interop\Container\ContainerInterface $container )
+function getContext(\Interop\Container\ContainerInterface $container)
 {
-	$aimeos = $container->get( 'aimeos' );
-	$context = $container->get( 'aimeos_context' )->get( false );
+	$aimeos = $container->get('aimeos');
+	$context = $container->get('aimeos_context')->get(false);
 
 	$env = \Slim\Http\Environment::mock();
-	$request = \Slim\Http\Request::createFromEnvironment( $env );
+	$request = \Slim\Http\Request::createFromEnvironment($env);
 	$response = new \Slim\Http\Response();
 
-	$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
-	$view = $container->get( 'aimeos_view' )->create( $request, $response, array(), $tmplPaths );
+	$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
+	$view = $container->get('aimeos_view')->create($request, $response, array(), $tmplPaths);
 
-	$langManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/language' );
-	$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
-	$i18n = $container->get( 'aimeos_i18n' )->get( $langids );
+	$langManager = \Aimeos\MShop\Factory::createManager($context, 'locale/language');
+	$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
+	$i18n = $container->get('aimeos_i18n')->get($langids);
 
-	$context->setEditor( 'aimeos:jobs' );
-	$context->setView( $view );
-	$context->setI18n( $i18n );
+	$context->setEditor('aimeos:jobs');
+	$context->setView($view);
+	$context->setI18n($i18n);
 
 	return $context;
 }
@@ -121,21 +121,21 @@ 
  * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object
  * @param string|null $sites List of site codes separated by a space
  */
-function getSiteItems( \Aimeos\MShop\Context\Item\Iface $ctx, $sites )
+function getSiteItems(\Aimeos\MShop\Context\Item\Iface $ctx, $sites)
 {
-	$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-	$manager = $localeManager->getSubManager( 'site' );
+	$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+	$manager = $localeManager->getSubManager('site');
 	$search = $manager->createSearch();
 
-	if( is_scalar( $sites ) && $sites != '' ) {
-		$sites = explode( ' ', $sites );
+	if (is_scalar($sites) && $sites != '') {
+		$sites = explode(' ', $sites);
 	}
 
-	if( !empty( $sites ) ) {
-		$search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) );
+	if (!empty($sites)) {
+		$search->setConditions($search->compare('==', 'locale.site.code', $sites));
 	}
 
-	return $manager->searchItems( $search );
+	return $manager->searchItems($search);
 }
 
 
@@ -146,19 +146,19 @@ 
  * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object
  * @param array $siteItems List of site items implementing \Aimeos\MShop\Locale\Site\Iface
  */
-function execute( \Aimeos\Bootstrap $aimeos, \Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems, $jobs )
+function execute(\Aimeos\Bootstrap $aimeos, \Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems, $jobs)
 {
-	$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
+	$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
 
-	foreach( $siteItems as $siteItem )
+	foreach ($siteItems as $siteItem)
 	{
-		$localeItem = $localeManager->bootstrap( $siteItem->getCode(), 'en', '', false );
-		$ctx->setLocale( $localeItem );
+		$localeItem = $localeManager->bootstrap($siteItem->getCode(), 'en', '', false);
+		$ctx->setLocale($localeItem);
 
-		printf( "Executing the Aimeos jobs for \"%s\"\n", $siteItem->getCode() );
+		printf("Executing the Aimeos jobs for \"%s\"\n", $siteItem->getCode());
 
-		foreach( (array) explode( ' ', $jobs ) as $jobname ) {
-			\Aimeos\Controller\Jobs\Factory::createController( $ctx, $aimeos, $jobname )->run();
+		foreach ((array) explode(' ', $jobs) as $jobname) {
+			\Aimeos\Controller\Jobs\Factory::createController($ctx, $aimeos, $jobname)->run();
 		}
 	}
 }
@@ -169,8 +169,8 @@ 
  */
 function usage()
 {
-	printf( "Usage: php job.php [--extdir=<path>]* [--config=<path>|<file>]* \"job1 [job2]*\" [\"sitecode1 [sitecode2]*\"]\n" );
-	exit( 1 );
+	printf("Usage: php job.php [--extdir=<path>]* [--config=<path>|<file>]* \"job1 [job2]*\" [\"sitecode1 [sitecode2]*\"]\n");
+	exit(1);
 }
 
 
@@ -178,30 +178,30 @@ 
 try
 {
 	$params = $_SERVER['argv'];
-	array_shift( $params );
+	array_shift($params);
 
-	$options = getOptions( $params );
+	$options = getOptions($params);
 
-	if( ( $jobs = array_shift( $params ) ) === null ) {
+	if (($jobs = array_shift($params)) === null) {
 		usage();
 	}
 
-	$sites = array_shift( $params );
-	$config = getConfig( $options );
+	$sites = array_shift($params);
+	$config = getConfig($options);
 
 	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
-	$app = new \Slim\App( $config );
-	$aimeos = new \Aimeos\Slim\Bootstrap( $app, $config );
-	$aimeos->setup( ( isset( $options['extdir'] ) ? $options['extdir'] : './ext' ) );
+	$app = new \Slim\App($config);
+	$aimeos = new \Aimeos\Slim\Bootstrap($app, $config);
+	$aimeos->setup((isset($options['extdir']) ? $options['extdir'] : './ext'));
 
 	$container = $app->getContainer();
-	$context = getContext( $container );
+	$context = getContext($container);
 
-	$siteItems = getSiteItems( $context, $sites );
-	execute( $container->get( 'aimeos' ), $context, $siteItems, $jobs );
+	$siteItems = getSiteItems($context, $sites);
+	execute($container->get('aimeos'), $context, $siteItems, $jobs);
 }
-catch( \Throwable $t )
+catch (\Throwable $t)
 {
 	echo "\n\nCaught PHP error while processing setup";
 	echo "\n\nMessage:\n";
@@ -209,9 +209,9 @@ 
 	echo "\n\nStack trace:\n";
 	echo $t->getTraceAsString();
 	echo "\n\n";
-	exit( 1 );
+	exit(1);
 }
-catch( \Exception $e )
+catch (\Exception $e)
 {
 	echo "\n\nCaught exception while processing setup";
 	echo "\n\nMessage:\n";
@@ -219,5 +219,5 @@ 
 	echo "\n\nStack trace:\n";
 	echo $e->getTraceAsString();
 	echo "\n\n";
-	exit( 1 );
+	exit(1);
 }

Braces +4 added lines, -8 removed lines

@@ -39,15 +39,13 @@ 
 				{
 					$options[$name] = (array) $options[$name];
 					$options[$name][] = substr( $option, $pos + 1 );
-				}
-				else
+				} else
 				{
 					$options[$name] = substr( $option, $pos + 1 );
 				}
 
 				unset( $params[$key] );
-			}
-			else
+			} else
 			{
 				printf( "Invalid option \"%1\$s\"\n", $option );
 				usage();
@@ -200,8 +198,7 @@ 
 
 	$siteItems = getSiteItems( $context, $sites );
 	execute( $container->get( 'aimeos' ), $context, $siteItems, $jobs );
-}
-catch( \Throwable $t )
+} catch( \Throwable $t )
 {
 	echo "\n\nCaught PHP error while processing setup";
 	echo "\n\nMessage:\n";
@@ -210,8 +207,7 @@ 
 	echo $t->getTraceAsString();
 	echo "\n\n";
 	exit( 1 );
-}
-catch( \Exception $e )
+} catch( \Exception $e )
 {
 	echo "\n\nCaught exception while processing setup";
 	echo "\n\nMessage:\n";