@@ -23,7 +23,7 @@ |
||
| 23 | 23 | * |
| 24 | 24 | * @param array $argv Associative array from $_SERVER['argv'] |
| 25 | 25 | */ |
| 26 | - public static function run( array $argv ); |
|
| 26 | + public static function run(array $argv); |
|
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * Returns the command usage and options |
@@ -6,28 +6,28 @@ discard block |
||
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | 8 | |
| 9 | -if( php_sapi_name() != 'cli' ) { |
|
| 10 | - exit( 'Setup can only be started via command line for security reasons' ); |
|
| 9 | +if (php_sapi_name() != 'cli') { |
|
| 10 | + exit('Setup can only be started via command line for security reasons'); |
|
| 11 | 11 | } |
| 12 | 12 | |
| 13 | -ini_set( 'display_errors', 1 ); |
|
| 14 | -date_default_timezone_set( 'UTC' ); |
|
| 13 | +ini_set('display_errors', 1); |
|
| 14 | +date_default_timezone_set('UTC'); |
|
| 15 | 15 | |
| 16 | 16 | |
| 17 | 17 | |
| 18 | 18 | try |
| 19 | 19 | { |
| 20 | - require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'; |
|
| 20 | + require 'vendor'.DIRECTORY_SEPARATOR.'autoload.php'; |
|
| 21 | 21 | |
| 22 | - \Aimeos\Slim\Command\Jobs::run( $_SERVER['argv'] ); |
|
| 22 | + \Aimeos\Slim\Command\Jobs::run($_SERVER['argv']); |
|
| 23 | 23 | } |
| 24 | -catch( \Aimeos\Slim\Command\Exception $e ) |
|
| 24 | +catch (\Aimeos\Slim\Command\Exception $e) |
|
| 25 | 25 | { |
| 26 | - echo $e->getMessage() . "\n"; |
|
| 26 | + echo $e->getMessage()."\n"; |
|
| 27 | 27 | echo \Aimeos\Slim\Command\Jobs::usage(); |
| 28 | - exit( 1 ); |
|
| 28 | + exit(1); |
|
| 29 | 29 | } |
| 30 | -catch( \Throwable $t ) |
|
| 30 | +catch (\Throwable $t) |
|
| 31 | 31 | { |
| 32 | 32 | echo "\n\nCaught PHP error while processing setup"; |
| 33 | 33 | echo "\n\nMessage:\n"; |
@@ -35,9 +35,9 @@ discard block |
||
| 35 | 35 | echo "\n\nStack trace:\n"; |
| 36 | 36 | echo $t->getTraceAsString(); |
| 37 | 37 | echo "\n\n"; |
| 38 | - exit( 1 ); |
|
| 38 | + exit(1); |
|
| 39 | 39 | } |
| 40 | -catch( \Exception $e ) |
|
| 40 | +catch (\Exception $e) |
|
| 41 | 41 | { |
| 42 | 42 | echo "\n\nCaught exception while processing setup"; |
| 43 | 43 | echo "\n\nMessage:\n"; |
@@ -45,5 +45,5 @@ discard block |
||
| 45 | 45 | echo "\n\nStack trace:\n"; |
| 46 | 46 | echo $e->getTraceAsString(); |
| 47 | 47 | echo "\n\n"; |
| 48 | - exit( 1 ); |
|
| 48 | + exit(1); |
|
| 49 | 49 | } |
@@ -6,27 +6,27 @@ discard block |
||
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | 8 | |
| 9 | -if( php_sapi_name() != 'cli' ) { |
|
| 10 | - exit( 'Setup can only be started via command line for security reasons' ); |
|
| 9 | +if (php_sapi_name() != 'cli') { |
|
| 10 | + exit('Setup can only be started via command line for security reasons'); |
|
| 11 | 11 | } |
| 12 | 12 | |
| 13 | -ini_set( 'display_errors', 1 ); |
|
| 14 | -date_default_timezone_set( 'UTC' ); |
|
| 13 | +ini_set('display_errors', 1); |
|
| 14 | +date_default_timezone_set('UTC'); |
|
| 15 | 15 | |
| 16 | 16 | |
| 17 | 17 | try |
| 18 | 18 | { |
| 19 | - require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'; |
|
| 19 | + require 'vendor'.DIRECTORY_SEPARATOR.'autoload.php'; |
|
| 20 | 20 | |
| 21 | - \Aimeos\Slim\Command\Cache::run( $_SERVER['argv'] ); |
|
| 21 | + \Aimeos\Slim\Command\Cache::run($_SERVER['argv']); |
|
| 22 | 22 | } |
| 23 | -catch( \Aimeos\Slim\Command\Exception $e ) |
|
| 23 | +catch (\Aimeos\Slim\Command\Exception $e) |
|
| 24 | 24 | { |
| 25 | - echo $e->getMessage() . "\n"; |
|
| 25 | + echo $e->getMessage()."\n"; |
|
| 26 | 26 | echo \Aimeos\Slim\Command\Cache::usage(); |
| 27 | - exit( 1 ); |
|
| 27 | + exit(1); |
|
| 28 | 28 | } |
| 29 | -catch( \Throwable $t ) |
|
| 29 | +catch (\Throwable $t) |
|
| 30 | 30 | { |
| 31 | 31 | echo "\n\nCaught PHP error"; |
| 32 | 32 | echo "\n\nMessage:\n"; |
@@ -34,9 +34,9 @@ discard block |
||
| 34 | 34 | echo "\n\nStack trace:\n"; |
| 35 | 35 | echo $t->getTraceAsString(); |
| 36 | 36 | echo "\n\n"; |
| 37 | - exit( 1 ); |
|
| 37 | + exit(1); |
|
| 38 | 38 | } |
| 39 | -catch( \Exception $e ) |
|
| 39 | +catch (\Exception $e) |
|
| 40 | 40 | { |
| 41 | 41 | echo "\n\nCaught exception"; |
| 42 | 42 | echo "\n\nMessage:\n"; |
@@ -44,5 +44,5 @@ discard block |
||
| 44 | 44 | echo "\n\nStack trace:\n"; |
| 45 | 45 | echo $e->getTraceAsString(); |
| 46 | 46 | echo "\n\n"; |
| 47 | - exit( 1 ); |
|
| 47 | + exit(1); |
|
| 48 | 48 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * |
| 30 | 30 | * @param ContainerInterface $container Dependency container |
| 31 | 31 | */ |
| 32 | - public function __construct( ContainerInterface $container, $settings ) |
|
| 32 | + public function __construct(ContainerInterface $container, $settings) |
|
| 33 | 33 | { |
| 34 | 34 | $this->container = $container; |
| 35 | 35 | $this->settings = $settings; |
@@ -42,19 +42,19 @@ discard block |
||
| 42 | 42 | * @param string $type Configuration type ("frontend" or "backend") |
| 43 | 43 | * @return \Aimeos\MW\Config\Iface Config object |
| 44 | 44 | */ |
| 45 | - public function get( $type = 'frontend' ) |
|
| 45 | + public function get($type = 'frontend') |
|
| 46 | 46 | { |
| 47 | - $paths = $this->container->get( 'aimeos' )->getConfigPaths(); |
|
| 48 | - $config = new \Aimeos\MW\Config\PHPArray( array(), $paths ); |
|
| 47 | + $paths = $this->container->get('aimeos')->getConfigPaths(); |
|
| 48 | + $config = new \Aimeos\MW\Config\PHPArray(array(), $paths); |
|
| 49 | 49 | |
| 50 | - if( function_exists( 'apcu_store' ) === true && $config->get( 'apc_enabled', false ) == true ) { |
|
| 51 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $config->get( 'apc_prefix', 'slim:' ) ); |
|
| 50 | + if (function_exists('apcu_store') === true && $config->get('apc_enabled', false) == true) { |
|
| 51 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $config->get('apc_prefix', 'slim:')); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->settings ); |
|
| 54 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->settings); |
|
| 55 | 55 | |
| 56 | - if( isset( $this->settings[$type] ) ) { |
|
| 57 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->settings[$type] ); |
|
| 56 | + if (isset($this->settings[$type])) { |
|
| 57 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->settings[$type]); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | return $config; |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * @param \Slim\App $app Slim application |
| 28 | 28 | * @param array $settings Multi-dimensional array of configuration settings |
| 29 | 29 | */ |
| 30 | - public function __construct( \Slim\App $app, array $settings ) |
|
| 30 | + public function __construct(\Slim\App $app, array $settings) |
|
| 31 | 31 | { |
| 32 | 32 | $this->app = $app; |
| 33 | 33 | $this->settings = $settings; |
@@ -40,16 +40,16 @@ discard block |
||
| 40 | 40 | * @param string $path Absolute or relative path to the Aimeos route file |
| 41 | 41 | * @return \Aimeos\Slim\Bootstrap Self instance |
| 42 | 42 | */ |
| 43 | - public function routes( $path ) |
|
| 43 | + public function routes($path) |
|
| 44 | 44 | { |
| 45 | 45 | $app = $this->app; |
| 46 | 46 | $settings = $this->settings; |
| 47 | 47 | |
| 48 | - $config = function( $key, $default ) use ( $settings ) |
|
| 48 | + $config = function($key, $default) use ($settings) |
|
| 49 | 49 | { |
| 50 | - foreach( explode( '/', trim( $key, '/' ) ) as $part ) |
|
| 50 | + foreach (explode('/', trim($key, '/')) as $part) |
|
| 51 | 51 | { |
| 52 | - if( isset( $settings[$part] ) ) { |
|
| 52 | + if (isset($settings[$part])) { |
|
| 53 | 53 | $settings = $settings[$part]; |
| 54 | 54 | } else { |
| 55 | 55 | return $default; |
@@ -71,52 +71,52 @@ discard block |
||
| 71 | 71 | * @param string $extdir Absolute or relative path to the Aimeos extension directory |
| 72 | 72 | * @return \Aimeos\Slim\Bootstrap Self instance |
| 73 | 73 | */ |
| 74 | - public function setup( $extdir = '../ext' ) |
|
| 74 | + public function setup($extdir = '../ext') |
|
| 75 | 75 | { |
| 76 | 76 | $container = $this->app->getContainer(); |
| 77 | 77 | |
| 78 | - $container['router'] = function( $c ) { |
|
| 78 | + $container['router'] = function($c) { |
|
| 79 | 79 | return new \Aimeos\Slim\Router(); |
| 80 | 80 | }; |
| 81 | 81 | |
| 82 | - $container['mailer'] = function( $c ) { |
|
| 83 | - return new \Swift_Mailer( new \Swift_SendmailTransport() ); |
|
| 82 | + $container['mailer'] = function($c) { |
|
| 83 | + return new \Swift_Mailer(new \Swift_SendmailTransport()); |
|
| 84 | 84 | }; |
| 85 | 85 | |
| 86 | 86 | |
| 87 | - $default = require __DIR__ . DIRECTORY_SEPARATOR . 'aimeos-default.php'; |
|
| 88 | - $settings = array_replace_recursive( $default, $this->settings ); |
|
| 87 | + $default = require __DIR__.DIRECTORY_SEPARATOR.'aimeos-default.php'; |
|
| 88 | + $settings = array_replace_recursive($default, $this->settings); |
|
| 89 | 89 | |
| 90 | - $container['aimeos'] = function( $c ) use ( $extdir ) { |
|
| 91 | - return new \Aimeos\Bootstrap( (array) $extdir, false ); |
|
| 90 | + $container['aimeos'] = function($c) use ($extdir) { |
|
| 91 | + return new \Aimeos\Bootstrap((array) $extdir, false); |
|
| 92 | 92 | }; |
| 93 | 93 | |
| 94 | - $container['aimeos.config'] = function( $c ) use ( $settings ) { |
|
| 95 | - return new \Aimeos\Slim\Base\Config( $c, $settings ); |
|
| 94 | + $container['aimeos.config'] = function($c) use ($settings) { |
|
| 95 | + return new \Aimeos\Slim\Base\Config($c, $settings); |
|
| 96 | 96 | }; |
| 97 | 97 | |
| 98 | - $container['aimeos.context'] = function( $c ) { |
|
| 99 | - return new \Aimeos\Slim\Base\Context( $c ); |
|
| 98 | + $container['aimeos.context'] = function($c) { |
|
| 99 | + return new \Aimeos\Slim\Base\Context($c); |
|
| 100 | 100 | }; |
| 101 | 101 | |
| 102 | - $container['aimeos.i18n'] = function( $c ) { |
|
| 103 | - return new \Aimeos\Slim\Base\I18n( $c ); |
|
| 102 | + $container['aimeos.i18n'] = function($c) { |
|
| 103 | + return new \Aimeos\Slim\Base\I18n($c); |
|
| 104 | 104 | }; |
| 105 | 105 | |
| 106 | - $container['aimeos.locale'] = function( $c ) { |
|
| 107 | - return new \Aimeos\Slim\Base\Locale( $c ); |
|
| 106 | + $container['aimeos.locale'] = function($c) { |
|
| 107 | + return new \Aimeos\Slim\Base\Locale($c); |
|
| 108 | 108 | }; |
| 109 | 109 | |
| 110 | - $container['aimeos.view'] = function( $c ) { |
|
| 111 | - return new \Aimeos\Slim\Base\View( $c ); |
|
| 110 | + $container['aimeos.view'] = function($c) { |
|
| 111 | + return new \Aimeos\Slim\Base\View($c); |
|
| 112 | 112 | }; |
| 113 | 113 | |
| 114 | - $container['shop'] = function( $c ) { |
|
| 115 | - return new \Aimeos\Slim\Base\Shop( $c ); |
|
| 114 | + $container['shop'] = function($c) { |
|
| 115 | + return new \Aimeos\Slim\Base\Shop($c); |
|
| 116 | 116 | }; |
| 117 | 117 | |
| 118 | 118 | // add client IP address to requests |
| 119 | - $this->app->add( new \RKA\Middleware\IpAddress( true, [] ) ); |
|
| 119 | + $this->app->add(new \RKA\Middleware\IpAddress(true, [])); |
|
| 120 | 120 | |
| 121 | 121 | return $this; |
| 122 | 122 | } |
@@ -129,14 +129,14 @@ discard block |
||
| 129 | 129 | */ |
| 130 | 130 | public static function getVersion() |
| 131 | 131 | { |
| 132 | - $basedir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR; |
|
| 132 | + $basedir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR; |
|
| 133 | 133 | |
| 134 | - if( ( $content = @file_get_contents( $basedir . 'composer.lock' ) ) !== false |
|
| 135 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) |
|
| 134 | + if (($content = @file_get_contents($basedir.'composer.lock')) !== false |
|
| 135 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) |
|
| 136 | 136 | ) { |
| 137 | - foreach( (array) $content['packages'] as $item ) |
|
| 137 | + foreach ((array) $content['packages'] as $item) |
|
| 138 | 138 | { |
| 139 | - if( $item['name'] === 'aimeos/aimeos-slim' ) { |
|
| 139 | + if ($item['name'] === 'aimeos/aimeos-slim') { |
|
| 140 | 140 | return $item['version']; |
| 141 | 141 | } |
| 142 | 142 | } |
@@ -24,31 +24,31 @@ discard block |
||
| 24 | 24 | * @param array &$params List of parameters |
| 25 | 25 | * @return array Associative list of option name and value(s) |
| 26 | 26 | */ |
| 27 | - protected static function getOptions( array &$params ) |
|
| 27 | + protected static function getOptions(array &$params) |
|
| 28 | 28 | { |
| 29 | 29 | $options = array(); |
| 30 | 30 | |
| 31 | - foreach( $params as $key => $option ) |
|
| 31 | + foreach ($params as $key => $option) |
|
| 32 | 32 | { |
| 33 | - if( $option === '--help' ) { |
|
| 33 | + if ($option === '--help') { |
|
| 34 | 34 | throw new Exception(); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - if( strncmp( $option, '--', 2 ) === 0 && ( $pos = strpos( $option, '=', 2 ) ) !== false ) |
|
| 37 | + if (strncmp($option, '--', 2) === 0 && ($pos = strpos($option, '=', 2)) !== false) |
|
| 38 | 38 | { |
| 39 | - $name = substr( $option, 2, $pos - 2 ); |
|
| 39 | + $name = substr($option, 2, $pos - 2); |
|
| 40 | 40 | |
| 41 | - if( isset( $options[$name] ) ) |
|
| 41 | + if (isset($options[$name])) |
|
| 42 | 42 | { |
| 43 | 43 | $options[$name] = (array) $options[$name]; |
| 44 | - $options[$name][] = substr( $option, $pos + 1 ); |
|
| 44 | + $options[$name][] = substr($option, $pos + 1); |
|
| 45 | 45 | } |
| 46 | 46 | else |
| 47 | 47 | { |
| 48 | - $options[$name] = substr( $option, $pos + 1 ); |
|
| 48 | + $options[$name] = substr($option, $pos + 1); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - unset( $params[$key] ); |
|
| 51 | + unset($params[$key]); |
|
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | |
@@ -62,19 +62,19 @@ discard block |
||
| 62 | 62 | * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object |
| 63 | 63 | * @param string|null $sites List of site codes separated by a space |
| 64 | 64 | */ |
| 65 | - protected static function getSiteItems( \Aimeos\MShop\Context\Item\Iface $ctx, $sites ) |
|
| 65 | + protected static function getSiteItems(\Aimeos\MShop\Context\Item\Iface $ctx, $sites) |
|
| 66 | 66 | { |
| 67 | - $manager = \Aimeos\MShop::create( $ctx, 'locale/site' ); |
|
| 67 | + $manager = \Aimeos\MShop::create($ctx, 'locale/site'); |
|
| 68 | 68 | $search = $manager->createSearch(); |
| 69 | 69 | |
| 70 | - if( is_scalar( $sites ) && $sites != '' ) { |
|
| 71 | - $sites = explode( ' ', $sites ); |
|
| 70 | + if (is_scalar($sites) && $sites != '') { |
|
| 71 | + $sites = explode(' ', $sites); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - if( !empty( $sites ) ) { |
|
| 75 | - $search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) ); |
|
| 74 | + if (!empty($sites)) { |
|
| 75 | + $search->setConditions($search->compare('==', 'locale.site.code', $sites)); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - return $manager->searchItems( $search ); |
|
| 78 | + return $manager->searchItems($search); |
|
| 79 | 79 | } |
| 80 | 80 | } |
| 81 | 81 | \ No newline at end of file |
@@ -34,28 +34,28 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @param array $argv Associative array from $_SERVER['argv'] |
| 36 | 36 | */ |
| 37 | - public static function run( array $argv ) |
|
| 37 | + public static function run(array $argv) |
|
| 38 | 38 | { |
| 39 | - array_shift( $argv ); |
|
| 40 | - $options = self::getOptions( $argv ); |
|
| 39 | + array_shift($argv); |
|
| 40 | + $options = self::getOptions($argv); |
|
| 41 | 41 | |
| 42 | - if( ( $jobs = array_shift( $argv ) ) === null ) { |
|
| 42 | + if (($jobs = array_shift($argv)) === null) { |
|
| 43 | 43 | throw new \Aimeos\Slim\Command\Exception(); |
| 44 | 44 | } |
| 45 | - $sites = array_shift( $argv ); |
|
| 45 | + $sites = array_shift($argv); |
|
| 46 | 46 | |
| 47 | - $config = self::getConfig( $options ); |
|
| 47 | + $config = self::getConfig($options); |
|
| 48 | 48 | |
| 49 | - $app = new \Slim\App( $config ); |
|
| 50 | - $aimeos = new \Aimeos\Slim\Bootstrap( $app, $config ); |
|
| 51 | - $aimeos->setup( ( isset( $options['extdir'] ) ? $options['extdir'] : './ext' ) ) |
|
| 52 | - ->routes( ( isset( $options['routes'] ) ? $options['routes'] : './src/aimeos-routes.php' ) ); |
|
| 49 | + $app = new \Slim\App($config); |
|
| 50 | + $aimeos = new \Aimeos\Slim\Bootstrap($app, $config); |
|
| 51 | + $aimeos->setup((isset($options['extdir']) ? $options['extdir'] : './ext')) |
|
| 52 | + ->routes((isset($options['routes']) ? $options['routes'] : './src/aimeos-routes.php')); |
|
| 53 | 53 | |
| 54 | 54 | $container = $app->getContainer(); |
| 55 | - $context = self::getContext( $container ); |
|
| 55 | + $context = self::getContext($container); |
|
| 56 | 56 | |
| 57 | - $siteItems = self::getSiteItems( $context, $sites ); |
|
| 58 | - self::execute( $container->get( 'aimeos' ), $context, $siteItems, $jobs ); |
|
| 57 | + $siteItems = self::getSiteItems($context, $sites); |
|
| 58 | + self::execute($container->get('aimeos'), $context, $siteItems, $jobs); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | |
@@ -65,16 +65,16 @@ discard block |
||
| 65 | 65 | * @param array $options Associative list of given options |
| 66 | 66 | * @return array Multi-dimensional array of configuration settings |
| 67 | 67 | */ |
| 68 | - protected static function getConfig( array $options ) |
|
| 68 | + protected static function getConfig(array $options) |
|
| 69 | 69 | { |
| 70 | 70 | $config = array(); |
| 71 | 71 | |
| 72 | - if( isset( $options['config'] ) ) |
|
| 72 | + if (isset($options['config'])) |
|
| 73 | 73 | { |
| 74 | - foreach( (array) $options['config'] as $path ) |
|
| 74 | + foreach ((array) $options['config'] as $path) |
|
| 75 | 75 | { |
| 76 | - if( is_file( $path ) ) { |
|
| 77 | - $config = array_replace_recursive( $config, require $path ); |
|
| 76 | + if (is_file($path)) { |
|
| 77 | + $config = array_replace_recursive($config, require $path); |
|
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -89,25 +89,25 @@ discard block |
||
| 89 | 89 | * @param \Interop\Container\ContainerInterface $container Dependency injection container |
| 90 | 90 | * @return \Aimeos\MShop\Context\Item\Standard Context object |
| 91 | 91 | */ |
| 92 | - protected static function getContext( \Interop\Container\ContainerInterface $container ) |
|
| 92 | + protected static function getContext(\Interop\Container\ContainerInterface $container) |
|
| 93 | 93 | { |
| 94 | - $aimeos = $container->get( 'aimeos' ); |
|
| 95 | - $context = $container->get( 'aimeos.context' )->get( false, array(), 'command' ); |
|
| 94 | + $aimeos = $container->get('aimeos'); |
|
| 95 | + $context = $container->get('aimeos.context')->get(false, array(), 'command'); |
|
| 96 | 96 | |
| 97 | 97 | $env = \Slim\Http\Environment::mock(); |
| 98 | - $request = \Slim\Http\Request::createFromEnvironment( $env ); |
|
| 98 | + $request = \Slim\Http\Request::createFromEnvironment($env); |
|
| 99 | 99 | $response = new \Slim\Http\Response(); |
| 100 | 100 | |
| 101 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
|
| 102 | - $view = $container->get( 'aimeos.view' )->create( $context, $request, $response, array(), $tmplPaths ); |
|
| 101 | + $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); |
|
| 102 | + $view = $container->get('aimeos.view')->create($context, $request, $response, array(), $tmplPaths); |
|
| 103 | 103 | |
| 104 | - $langManager = \Aimeos\MShop::create( $context, 'locale/language' ); |
|
| 105 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
|
| 106 | - $i18n = $container->get( 'aimeos.i18n' )->get( $langids ); |
|
| 104 | + $langManager = \Aimeos\MShop::create($context, 'locale/language'); |
|
| 105 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); |
|
| 106 | + $i18n = $container->get('aimeos.i18n')->get($langids); |
|
| 107 | 107 | |
| 108 | - $context->setEditor( 'aimeos:jobs' ); |
|
| 109 | - $context->setView( $view ); |
|
| 110 | - $context->setI18n( $i18n ); |
|
| 108 | + $context->setEditor('aimeos:jobs'); |
|
| 109 | + $context->setView($view); |
|
| 110 | + $context->setI18n($i18n); |
|
| 111 | 111 | |
| 112 | 112 | return $context; |
| 113 | 113 | } |
@@ -120,28 +120,28 @@ discard block |
||
| 120 | 120 | * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object |
| 121 | 121 | * @param array $siteItems List of site items implementing \Aimeos\MShop\Locale\Site\Iface |
| 122 | 122 | */ |
| 123 | - protected static function execute( \Aimeos\Bootstrap $aimeos, \Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems, $jobs ) |
|
| 123 | + protected static function execute(\Aimeos\Bootstrap $aimeos, \Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems, $jobs) |
|
| 124 | 124 | { |
| 125 | 125 | $process = $ctx->getProcess(); |
| 126 | - $localeManager = \Aimeos\MShop::create( $ctx, 'locale' ); |
|
| 126 | + $localeManager = \Aimeos\MShop::create($ctx, 'locale'); |
|
| 127 | 127 | |
| 128 | - foreach( $siteItems as $siteItem ) |
|
| 128 | + foreach ($siteItems as $siteItem) |
|
| 129 | 129 | { |
| 130 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), 'en', '', false ); |
|
| 131 | - $localeItem->setLanguageId( null ); |
|
| 132 | - $localeItem->setCurrencyId( null ); |
|
| 130 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), 'en', '', false); |
|
| 131 | + $localeItem->setLanguageId(null); |
|
| 132 | + $localeItem->setCurrencyId(null); |
|
| 133 | 133 | |
| 134 | - $ctx->setLocale( $localeItem ); |
|
| 134 | + $ctx->setLocale($localeItem); |
|
| 135 | 135 | |
| 136 | - printf( "Executing the Aimeos jobs for \"%s\"\n", $siteItem->getCode() ); |
|
| 136 | + printf("Executing the Aimeos jobs for \"%s\"\n", $siteItem->getCode()); |
|
| 137 | 137 | |
| 138 | - foreach( (array) explode( ' ', $jobs ) as $jobname ) |
|
| 138 | + foreach ((array) explode(' ', $jobs) as $jobname) |
|
| 139 | 139 | { |
| 140 | - $fcn = function( $ctx, $aimeos, $jobname ) { |
|
| 141 | - \Aimeos\Controller\Jobs::create( $ctx, $aimeos, $jobname )->run(); |
|
| 140 | + $fcn = function($ctx, $aimeos, $jobname) { |
|
| 141 | + \Aimeos\Controller\Jobs::create($ctx, $aimeos, $jobname)->run(); |
|
| 142 | 142 | }; |
| 143 | 143 | |
| 144 | - $process->start( $fcn, [$ctx, $aimeos, $jobname], true ); |
|
| 144 | + $process->start($fcn, [$ctx, $aimeos, $jobname], true); |
|
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | 147 | |
@@ -34,19 +34,19 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @param array $argv Associative array from $_SERVER['argv'] |
| 36 | 36 | */ |
| 37 | - public static function run( array $argv ) |
|
| 37 | + public static function run(array $argv) |
|
| 38 | 38 | { |
| 39 | - array_shift( $argv ); |
|
| 40 | - $options = self::getOptions( $argv ); |
|
| 41 | - $sites = array_shift( $argv ); |
|
| 39 | + array_shift($argv); |
|
| 40 | + $options = self::getOptions($argv); |
|
| 41 | + $sites = array_shift($argv); |
|
| 42 | 42 | |
| 43 | - $extdirs = ( isset( $options['extdir'] ) ? (array) $options['extdir'] : array() ); |
|
| 44 | - $aimeos = new \Aimeos\Bootstrap( $extdirs ); |
|
| 43 | + $extdirs = (isset($options['extdir']) ? (array) $options['extdir'] : array()); |
|
| 44 | + $aimeos = new \Aimeos\Bootstrap($extdirs); |
|
| 45 | 45 | |
| 46 | - $ctx = self::getContext( $aimeos->getConfigPaths(), $options ); |
|
| 47 | - $siteItems = self::getSiteItems( $ctx, $sites ); |
|
| 46 | + $ctx = self::getContext($aimeos->getConfigPaths(), $options); |
|
| 47 | + $siteItems = self::getSiteItems($ctx, $sites); |
|
| 48 | 48 | |
| 49 | - self::clear( $ctx, $siteItems ); |
|
| 49 | + self::clear($ctx, $siteItems); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | |
@@ -57,38 +57,38 @@ discard block |
||
| 57 | 57 | * @param array $options Associative list of configuration options as key/value pairs |
| 58 | 58 | * @return \Aimeos\MShop\Context\Item\Iface Context object |
| 59 | 59 | */ |
| 60 | - protected static function getContext( array $confPaths, array $options ) |
|
| 60 | + protected static function getContext(array $confPaths, array $options) |
|
| 61 | 61 | { |
| 62 | 62 | $config = array(); |
| 63 | 63 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
| 64 | 64 | |
| 65 | - if( isset( $options['config'] ) ) |
|
| 65 | + if (isset($options['config'])) |
|
| 66 | 66 | { |
| 67 | - foreach( (array) $options['config'] as $path ) |
|
| 67 | + foreach ((array) $options['config'] as $path) |
|
| 68 | 68 | { |
| 69 | - if( is_file( $path ) ) { |
|
| 70 | - $config = array_replace_recursive( $config, require $path ); |
|
| 69 | + if (is_file($path)) { |
|
| 70 | + $config = array_replace_recursive($config, require $path); |
|
| 71 | 71 | } else { |
| 72 | 72 | $confPaths[] = $path; |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - $conf = new \Aimeos\MW\Config\PHPArray( $config, $confPaths ); |
|
| 78 | - $conf = new \Aimeos\MW\Config\Decorator\Memory( $conf ); |
|
| 77 | + $conf = new \Aimeos\MW\Config\PHPArray($config, $confPaths); |
|
| 78 | + $conf = new \Aimeos\MW\Config\Decorator\Memory($conf); |
|
| 79 | 79 | |
| 80 | - if( ( $cfg = $conf->get( 'command' ) ) !== null ) { |
|
| 81 | - $conf = new \Aimeos\MW\Config\Decorator\Memory( $conf, $cfg ); |
|
| 80 | + if (($cfg = $conf->get('command')) !== null) { |
|
| 81 | + $conf = new \Aimeos\MW\Config\Decorator\Memory($conf, $cfg); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - $ctx->setConfig( $conf ); |
|
| 84 | + $ctx->setConfig($conf); |
|
| 85 | 85 | |
| 86 | 86 | |
| 87 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); |
|
| 88 | - $ctx->setDatabaseManager( $dbm ); |
|
| 87 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); |
|
| 88 | + $ctx->setDatabaseManager($dbm); |
|
| 89 | 89 | |
| 90 | - $logger = new \Aimeos\MW\Logger\Errorlog( \Aimeos\MW\Logger\Base::INFO ); |
|
| 91 | - $ctx->setLogger( $logger ); |
|
| 90 | + $logger = new \Aimeos\MW\Logger\Errorlog(\Aimeos\MW\Logger\Base::INFO); |
|
| 91 | + $ctx->setLogger($logger); |
|
| 92 | 92 | |
| 93 | 93 | return $ctx; |
| 94 | 94 | } |
@@ -100,23 +100,23 @@ discard block |
||
| 100 | 100 | * @param \Aimeos\MShop\Context\Item\Iface $ctx Context object |
| 101 | 101 | * @param array $siteItems List of site items implementing \Aimeos\MShop\Locale\Site\Iface |
| 102 | 102 | */ |
| 103 | - protected static function clear( \Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems ) |
|
| 103 | + protected static function clear(\Aimeos\MShop\Context\Item\Iface $ctx, array $siteItems) |
|
| 104 | 104 | { |
| 105 | - $localeManager = \Aimeos\MShop::create( $ctx, 'locale' ); |
|
| 105 | + $localeManager = \Aimeos\MShop::create($ctx, 'locale'); |
|
| 106 | 106 | |
| 107 | - foreach( $siteItems as $siteItem ) |
|
| 107 | + foreach ($siteItems as $siteItem) |
|
| 108 | 108 | { |
| 109 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
| 109 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
| 110 | 110 | |
| 111 | 111 | $lcontext = clone $ctx; |
| 112 | - $lcontext->setLocale( $localeItem ); |
|
| 112 | + $lcontext->setLocale($localeItem); |
|
| 113 | 113 | |
| 114 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
| 115 | - $lcontext->setCache( $cache ); |
|
| 114 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
| 115 | + $lcontext->setCache($cache); |
|
| 116 | 116 | |
| 117 | - printf( "Clearing the Aimeos cache for site \"%1\$s\"\n", $siteItem->getCode() ); |
|
| 117 | + printf("Clearing the Aimeos cache for site \"%1\$s\"\n", $siteItem->getCode()); |
|
| 118 | 118 | |
| 119 | - \Aimeos\MAdmin::create( $lcontext, 'cache' )->getCache()->clear(); |
|
| 119 | + \Aimeos\MAdmin::create($lcontext, 'cache')->getCache()->clear(); |
|
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | \ No newline at end of file |
@@ -7,17 +7,17 @@ |
||
| 7 | 7 | 'uploaddir' => '/', |
| 8 | 8 | |
| 9 | 9 | 'page' => array( |
| 10 | - 'account-index' => array( 'account/profile','account/subscription','account/history','account/favorite','account/watch','basket/mini','catalog/session' ), |
|
| 11 | - 'basket-index' => array( 'basket/standard','basket/related' ), |
|
| 12 | - 'catalog-count' => array( 'catalog/count' ), |
|
| 13 | - 'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ), |
|
| 14 | - 'catalog-list' => array( 'basket/mini','catalog/filter','catalog/lists' ), |
|
| 15 | - 'catalog-stock' => array( 'catalog/stock' ), |
|
| 16 | - 'catalog-suggest' => array( 'catalog/suggest' ), |
|
| 17 | - 'catalog-tree' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ), |
|
| 18 | - 'checkout-confirm' => array( 'checkout/confirm' ), |
|
| 19 | - 'checkout-index' => array( 'checkout/standard' ), |
|
| 20 | - 'checkout-update' => array( 'checkout/update'), |
|
| 10 | + 'account-index' => array('account/profile', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'), |
|
| 11 | + 'basket-index' => array('basket/standard', 'basket/related'), |
|
| 12 | + 'catalog-count' => array('catalog/count'), |
|
| 13 | + 'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'), |
|
| 14 | + 'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/lists'), |
|
| 15 | + 'catalog-stock' => array('catalog/stock'), |
|
| 16 | + 'catalog-suggest' => array('catalog/suggest'), |
|
| 17 | + 'catalog-tree' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'), |
|
| 18 | + 'checkout-confirm' => array('checkout/confirm'), |
|
| 19 | + 'checkout-index' => array('checkout/standard'), |
|
| 20 | + 'checkout-update' => array('checkout/update'), |
|
| 21 | 21 | ), |
| 22 | 22 | |
| 23 | 23 | 'resource' => array( |