| @@ -22,19 +22,19 @@ | ||
| 22 | 22 | * @param string|array $sites Unique site codes | 
| 23 | 23 | * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items | 
| 24 | 24 | */ | 
| 25 | - protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites ) | |
| 25 | + protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites) | |
| 26 | 26 |  	{ | 
| 27 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); | |
| 27 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); | |
| 28 | 28 | $search = $manager->createSearch(); | 
| 29 | 29 | |
| 30 | -		if( is_scalar( $sites ) && $sites != '' ) { | |
| 31 | - $sites = explode( ' ', $sites ); | |
| 30 | +		if (is_scalar($sites) && $sites != '') { | |
| 31 | +			$sites = explode(' ', $sites); | |
| 32 | 32 | } | 
| 33 | 33 | |
| 34 | -		if( !empty( $sites ) ) { | |
| 35 | - $search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) ); | |
| 34 | +		if (!empty($sites)) { | |
| 35 | +			$search->setConditions($search->compare('==', 'locale.site.code', $sites)); | |
| 36 | 36 | } | 
| 37 | 37 | |
| 38 | - return $manager->searchItems( $search ); | |
| 38 | + return $manager->searchItems($search); | |
| 39 | 39 | } | 
| 40 | 40 | } | 
| 41 | 41 | \ No newline at end of file | 
| @@ -35,24 +35,24 @@ discard block | ||
| 35 | 35 | */ | 
| 36 | 36 | public function fire() | 
| 37 | 37 |  	{ | 
| 38 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false ); | |
| 39 | - $context->setEditor( 'aimeos:cache' ); | |
| 38 | +		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false); | |
| 39 | +		$context->setEditor('aimeos:cache'); | |
| 40 | 40 | |
| 41 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); | |
| 41 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); | |
| 42 | 42 | |
| 43 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) | |
| 43 | +		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) | |
| 44 | 44 |  		{ | 
| 45 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); | |
| 45 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); | |
| 46 | 46 | |
| 47 | 47 | $lcontext = clone $context; | 
| 48 | - $lcontext->setLocale( $localeItem ); | |
| 48 | + $lcontext->setLocale($localeItem); | |
| 49 | 49 | |
| 50 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); | |
| 51 | - $lcontext->setCache( $cache ); | |
| 50 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); | |
| 51 | + $lcontext->setCache($cache); | |
| 52 | 52 | |
| 53 | - $this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) ); | |
| 53 | +			$this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode())); | |
| 54 | 54 | |
| 55 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush(); | |
| 55 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush(); | |
| 56 | 56 | } | 
| 57 | 57 | } | 
| 58 | 58 | |
| @@ -65,7 +65,7 @@ discard block | ||
| 65 | 65 | protected function getArguments() | 
| 66 | 66 |  	{ | 
| 67 | 67 | return array( | 
| 68 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ), | |
| 68 | +			array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'), | |
| 69 | 69 | ); | 
| 70 | 70 | } | 
| 71 | 71 | |
| @@ -28,7 +28,7 @@ | ||
| 28 | 28 | */ | 
| 29 | 29 | public function indexAction() | 
| 30 | 30 |  	{ | 
| 31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' ); | |
| 31 | +		$params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index'); | |
| 32 | 32 |  		return \View::make('shop::basket.index', $params); | 
| 33 | 33 | } | 
| 34 | 34 | } | 
| 35 | 35 | \ No newline at end of file | 
| @@ -28,7 +28,7 @@ discard block | ||
| 28 | 28 | */ | 
| 29 | 29 | public function countAction() | 
| 30 | 30 |  	{ | 
| 31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' ); | |
| 31 | +		$params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count'); | |
| 32 | 32 |  		$contents = \View::make('shop::catalog.count', $params); | 
| 33 | 33 | |
| 34 | 34 | $response = \Response::make($contents, 200); | 
| @@ -45,7 +45,7 @@ discard block | ||
| 45 | 45 | */ | 
| 46 | 46 | public function detailAction() | 
| 47 | 47 |  	{ | 
| 48 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' ); | |
| 48 | +		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail'); | |
| 49 | 49 |  		return \View::make('shop::catalog.detail', $params); | 
| 50 | 50 | } | 
| 51 | 51 | |
| @@ -57,7 +57,7 @@ discard block | ||
| 57 | 57 | */ | 
| 58 | 58 | public function listAction() | 
| 59 | 59 |  	{ | 
| 60 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' ); | |
| 60 | +		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list'); | |
| 61 | 61 |  		return \View::make('shop::catalog.list', $params); | 
| 62 | 62 | } | 
| 63 | 63 | |
| @@ -69,7 +69,7 @@ discard block | ||
| 69 | 69 | */ | 
| 70 | 70 | public function stockAction() | 
| 71 | 71 |  	{ | 
| 72 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' ); | |
| 72 | +		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock'); | |
| 73 | 73 |  		$contents = \View::make('shop::catalog.stock', $params); | 
| 74 | 74 | |
| 75 | 75 | $response = \Response::make($contents, 200); | 
| @@ -86,7 +86,7 @@ discard block | ||
| 86 | 86 | */ | 
| 87 | 87 | public function suggestAction() | 
| 88 | 88 |  	{ | 
| 89 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' ); | |
| 89 | +		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest'); | |
| 90 | 90 |  		$contents = \View::make('shop::catalog.suggest', $params); | 
| 91 | 91 | |
| 92 | 92 | $response = \Response::make($contents, 200); | 
| @@ -28,7 +28,7 @@ discard block | ||
| 28 | 28 | */ | 
| 29 | 29 | public function confirmAction() | 
| 30 | 30 |  	{ | 
| 31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' ); | |
| 31 | +		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm'); | |
| 32 | 32 |  		return \View::make('shop::checkout.confirm', $params); | 
| 33 | 33 | } | 
| 34 | 34 | |
| @@ -40,7 +40,7 @@ discard block | ||
| 40 | 40 | */ | 
| 41 | 41 | public function indexAction() | 
| 42 | 42 |  	{ | 
| 43 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' ); | |
| 43 | +		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index'); | |
| 44 | 44 |  		return \View::make('shop::checkout.index', $params); | 
| 45 | 45 | } | 
| 46 | 46 | |
| @@ -52,7 +52,7 @@ discard block | ||
| 52 | 52 | */ | 
| 53 | 53 | public function updateAction() | 
| 54 | 54 |  	{ | 
| 55 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' ); | |
| 55 | +		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update'); | |
| 56 | 56 |  		return \View::make('shop::checkout.update', $params); | 
| 57 | 57 | } | 
| 58 | 58 | } | 
| 59 | 59 | \ No newline at end of file | 
| @@ -47,8 +47,8 @@ discard block | ||
| 47 | 47 | * @param \Aimeos\Shop\Base\Context $context Context object | 
| 48 | 48 | * @param \Aimeos\Shop\Base\View $view View object | 
| 49 | 49 | */ | 
| 50 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, | |
| 51 | - \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view ) | |
| 50 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, | |
| 51 | + \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view) | |
| 52 | 52 |  	{ | 
| 53 | 53 | $this->config = $config; | 
| 54 | 54 | $this->aimeos = $aimeos; | 
| @@ -63,23 +63,23 @@ discard block | ||
| 63 | 63 | * @param string $pageName Name of the configured page | 
| 64 | 64 | * @return array Associative list with body and header output separated by client name | 
| 65 | 65 | */ | 
| 66 | - public function getSections( $pageName ) | |
| 66 | + public function getSections($pageName) | |
| 67 | 67 |  	{ | 
| 68 | 68 | $context = $this->context->get(); | 
| 69 | 69 | $langid = $context->getLocale()->getLanguageId(); | 
| 70 | - $tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' ); | |
| 71 | - $view = $this->view->create( $context->getConfig(), $tmplPaths, $langid ); | |
| 72 | - $context->setView( $view ); | |
| 70 | +		$tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates'); | |
| 71 | + $view = $this->view->create($context->getConfig(), $tmplPaths, $langid); | |
| 72 | + $context->setView($view); | |
| 73 | 73 | |
| 74 | - $pagesConfig = $this->config->get( 'shop.page', array() ); | |
| 75 | - $result = array( 'aibody' => array(), 'aiheader' => array() ); | |
| 74 | +		$pagesConfig = $this->config->get('shop.page', array()); | |
| 75 | +		$result = array('aibody' => array(), 'aiheader' => array()); | |
| 76 | 76 | |
| 77 | - if( isset( $pagesConfig[$pageName] ) ) | |
| 77 | + if (isset($pagesConfig[$pageName])) | |
| 78 | 78 |  		{ | 
| 79 | - foreach( (array) $pagesConfig[$pageName] as $clientName ) | |
| 79 | + foreach ((array) $pagesConfig[$pageName] as $clientName) | |
| 80 | 80 |  			{ | 
| 81 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName ); | |
| 82 | - $client->setView( clone $view ); | |
| 81 | + $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName); | |
| 82 | + $client->setView(clone $view); | |
| 83 | 83 | $client->process(); | 
| 84 | 84 | |
| 85 | 85 | $result['aibody'][$clientName] = $client->getBody(); | 
| @@ -34,7 +34,7 @@ discard block | ||
| 34 | 34 | * | 
| 35 | 35 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object | 
| 36 | 36 | */ | 
| 37 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) | |
| 37 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) | |
| 38 | 38 |  	{ | 
| 39 | 39 | $this->config = $config; | 
| 40 | 40 | } | 
| @@ -47,10 +47,10 @@ discard block | ||
| 47 | 47 | */ | 
| 48 | 48 | public function get() | 
| 49 | 49 |  	{ | 
| 50 | - if( $this->object === null ) | |
| 50 | + if ($this->object === null) | |
| 51 | 51 |  		{ | 
| 52 | - $extDirs = (array) $this->config->get( 'shop.extdir', array() ); | |
| 53 | - $this->object = new \Aimeos\Bootstrap( $extDirs, false ); | |
| 52 | +			$extDirs = (array) $this->config->get('shop.extdir', array()); | |
| 53 | + $this->object = new \Aimeos\Bootstrap($extDirs, false); | |
| 54 | 54 | } | 
| 55 | 55 | |
| 56 | 56 | return $this->object; | 
| @@ -64,12 +64,12 @@ discard block | ||
| 64 | 64 | */ | 
| 65 | 65 | public function getVersion() | 
| 66 | 66 |  	{ | 
| 67 | - if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false | |
| 68 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) | |
| 67 | +		if (($content = @file_get_contents(base_path('composer.lock'))) !== false | |
| 68 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) | |
| 69 | 69 |  		) { | 
| 70 | - foreach( (array) $content['packages'] as $item ) | |
| 70 | + foreach ((array) $content['packages'] as $item) | |
| 71 | 71 |  			{ | 
| 72 | -				if( $item['name'] === 'aimeos/aimeos-laravel' ) { | |
| 72 | +				if ($item['name'] === 'aimeos/aimeos-laravel') { | |
| 73 | 73 | return $item['version']; | 
| 74 | 74 | } | 
| 75 | 75 | } | 
| @@ -30,7 +30,7 @@ discard block | ||
| 30 | 30 | */ | 
| 31 | 31 | public function indexAction() | 
| 32 | 32 |  	{ | 
| 33 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' ); | |
| 33 | +		$params = app('\Aimeos\Shop\Base\Page')->getSections('account-index'); | |
| 34 | 34 |  		return View::make('shop::account.index', $params); | 
| 35 | 35 | } | 
| 36 | 36 | |
| @@ -42,17 +42,17 @@ discard block | ||
| 42 | 42 | */ | 
| 43 | 43 | public function downloadAction() | 
| 44 | 44 |  	{ | 
| 45 | - $context = app( '\Aimeos\Shop\Base\Context' )->get(); | |
| 45 | +		$context = app('\Aimeos\Shop\Base\Context')->get(); | |
| 46 | 46 | $langid = $context->getLocale()->getLanguageId(); | 
| 47 | 47 | |
| 48 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), array(), $langid ); | |
| 49 | - $context->setView( $view ); | |
| 48 | +		$view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), array(), $langid); | |
| 49 | + $context->setView($view); | |
| 50 | 50 | |
| 51 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' ); | |
| 52 | - $client->setView( $view ); | |
| 51 | + $client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download'); | |
| 52 | + $client->setView($view); | |
| 53 | 53 | $client->process(); | 
| 54 | 54 | |
| 55 | 55 | $response = $view->response(); | 
| 56 | - return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() ); | |
| 56 | + return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders()); | |
| 57 | 57 | } | 
| 58 | 58 | } | 
| 59 | 59 | \ No newline at end of file | 
| @@ -43,21 +43,21 @@ discard block | ||
| 43 | 43 | */ | 
| 44 | 44 | public function fire() | 
| 45 | 45 |  	{ | 
| 46 | - $aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get(); | |
| 46 | +		$aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get(); | |
| 47 | 47 | $context = $this->getContext(); | 
| 48 | 48 | |
| 49 | - $jobs = explode( ' ', $this->argument( 'jobs' ) ); | |
| 50 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); | |
| 49 | +		$jobs = explode(' ', $this->argument('jobs')); | |
| 50 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); | |
| 51 | 51 | |
| 52 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) | |
| 52 | +		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) | |
| 53 | 53 |  		{ | 
| 54 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), 'en', '', false ); | |
| 55 | - $context->setLocale( $localeItem ); | |
| 54 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), 'en', '', false); | |
| 55 | + $context->setLocale($localeItem); | |
| 56 | 56 | |
| 57 | - $this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) ); | |
| 57 | +			$this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode())); | |
| 58 | 58 | |
| 59 | -			foreach( $jobs as $jobname ) { | |
| 60 | - \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run(); | |
| 59 | +			foreach ($jobs as $jobname) { | |
| 60 | + \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run(); | |
| 61 | 61 | } | 
| 62 | 62 | } | 
| 63 | 63 | } | 
| @@ -71,8 +71,8 @@ discard block | ||
| 71 | 71 | protected function getArguments() | 
| 72 | 72 |  	{ | 
| 73 | 73 | return array( | 
| 74 | - array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ), | |
| 75 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ), | |
| 74 | +			array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'), | |
| 75 | +			array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'), | |
| 76 | 76 | ); | 
| 77 | 77 | } | 
| 78 | 78 | |
| @@ -95,19 +95,19 @@ discard block | ||
| 95 | 95 | protected function getContext() | 
| 96 | 96 |  	{ | 
| 97 | 97 | $lv = $this->getLaravel(); | 
| 98 | - $aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get(); | |
| 99 | - $context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false ); | |
| 98 | +		$aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get(); | |
| 99 | +		$context = $lv->make('\Aimeos\Shop\Base\Context')->get(false); | |
| 100 | 100 | |
| 101 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); | |
| 102 | - $view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $tmplPaths ); | |
| 101 | +		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); | |
| 102 | +		$view = $lv->make('\Aimeos\Shop\Base\View')->create($context->getConfig(), $tmplPaths); | |
| 103 | 103 | |
| 104 | - $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' ); | |
| 105 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); | |
| 106 | - $i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids ); | |
| 104 | +		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language'); | |
| 105 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); | |
| 106 | +		$i18n = $lv->make('\Aimeos\Shop\Base\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 | } |