Completed
Push — master ( 4f2147...27bd50 )
by Aimeos
02:03
created
src/Aimeos/Shop/Command/JobsCommand.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -46,30 +46,30 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	public function handle()
48 48
 	{
49
-		$aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get();
49
+		$aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get();
50 50
 		$context = $this->getContext();
51 51
 
52 52
 		$process = $context->getProcess();
53
-		$jobs = explode( ' ', $this->argument( 'jobs' ) );
54
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
53
+		$jobs = explode(' ', $this->argument('jobs'));
54
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
55 55
 
56
-		foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem )
56
+		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem)
57 57
 		{
58
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false );
59
-			$localeItem->setLanguageId( null );
60
-			$localeItem->setCurrencyId( null );
58
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
59
+			$localeItem->setLanguageId(null);
60
+			$localeItem->setCurrencyId(null);
61 61
 
62
-			$context->setLocale( $localeItem );
62
+			$context->setLocale($localeItem);
63 63
 
64
-			$this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) );
64
+			$this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode()));
65 65
 
66
-			foreach( $jobs as $jobname )
66
+			foreach ($jobs as $jobname)
67 67
 			{
68
-				$fcn = function( $context, $aimeos, $jobname ) {
69
-					\Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
68
+				$fcn = function($context, $aimeos, $jobname) {
69
+					\Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
70 70
 				};
71 71
 
72
-				$process->start( $fcn, [$context, $aimeos, $jobname], true );
72
+				$process->start($fcn, [$context, $aimeos, $jobname], true);
73 73
 			}
74 74
 		}
75 75
 
@@ -85,19 +85,19 @@  discard block
 block discarded – undo
85 85
 	protected function getContext()
86 86
 	{
87 87
 		$lv = $this->getLaravel();
88
-		$aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get();
89
-		$context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
88
+		$aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get();
89
+		$context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
90 90
 
91
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
92
-		$view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths );
91
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
92
+		$view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths);
93 93
 
94
-		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );
95
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
96
-		$i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids );
94
+		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language');
95
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
96
+		$i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids);
97 97
 
98
-		$context->setEditor( 'aimeos:jobs' );
99
-		$context->setView( $view );
100
-		$context->setI18n( $i18n );
98
+		$context->setEditor('aimeos:jobs');
99
+		$context->setView($view);
100
+		$context->setI18n($i18n);
101 101
 
102 102
 		return $context;
103 103
 	}
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/SetupCommand.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -49,39 +49,39 @@  discard block
 block discarded – undo
49 49
 	 */
50 50
 	public function handle()
51 51
 	{
52
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' );
53
-		$ctx->setEditor( 'aimeos:setup' );
52
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'command');
53
+		$ctx->setEditor('aimeos:setup');
54 54
 
55 55
 		$config = $ctx->getConfig();
56
-		$site = $this->argument( 'site' );
57
-		$template = $this->argument( 'tplsite' );
56
+		$site = $this->argument('site');
57
+		$template = $this->argument('tplsite');
58 58
 
59
-		$config->set( 'setup/site', $site );
60
-		$dbconfig = $this->getDbConfig( $config );
61
-		$this->setOptions( $config );
59
+		$config->set('setup/site', $site);
60
+		$dbconfig = $this->getDbConfig($config);
61
+		$this->setOptions($config);
62 62
 
63
-		$taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );
64
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
63
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
64
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
65 65
 
66
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
66
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
67 67
 
68
-		if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) {
69
-			$task = reset( $task );
68
+		if (($task = $this->option('task')) && is_array($task)) {
69
+			$task = reset($task);
70 70
 		}
71 71
 
72
-		switch( $this->option( 'action' ) )
72
+		switch ($this->option('action'))
73 73
 		{
74 74
 			case 'migrate':
75
-				$manager->migrate( $task );
75
+				$manager->migrate($task);
76 76
 				break;
77 77
 			case 'rollback':
78
-				$manager->rollback( $task );
78
+				$manager->rollback($task);
79 79
 				break;
80 80
 			case 'clean':
81
-				$manager->clean( $task );
81
+				$manager->clean($task);
82 82
 				break;
83 83
 			default:
84
-				throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) );
84
+				throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action')));
85 85
 		}
86 86
 	}
87 87
 
@@ -92,14 +92,14 @@  discard block
 block discarded – undo
92 92
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
93 93
 	 * @return array Multi-dimensional associative list of database configuration parameters
94 94
 	 */
95
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
95
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
96 96
 	{
97
-		$dbconfig = $conf->get( 'resource', array() );
97
+		$dbconfig = $conf->get('resource', array());
98 98
 
99
-		foreach( $dbconfig as $rname => $dbconf )
99
+		foreach ($dbconfig as $rname => $dbconf)
100 100
 		{
101
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
102
-				unset( $dbconfig[$rname] );
101
+			if (strncmp($rname, 'db', 2) !== 0) {
102
+				unset($dbconfig[$rname]);
103 103
 			}
104 104
 		}
105 105
 
@@ -114,12 +114,12 @@  discard block
 block discarded – undo
114 114
 	 * @param array Associative list of database configurations
115 115
 	 * @throws \RuntimeException If the format of the options is invalid
116 116
 	 */
117
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
117
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
118 118
 	{
119
-		foreach( (array) $this->option( 'option' ) as $option )
119
+		foreach ((array) $this->option('option') as $option)
120 120
 		{
121
-			list( $name, $value ) = explode( ':', $option );
122
-			$conf->set( str_replace( '\\', '/', $name ), $value );
121
+			list($name, $value) = explode(':', $option);
122
+			$conf->set(str_replace('\\', '/', $name), $value);
123 123
 		}
124 124
 	}
125 125
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/CacheCommand.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -44,24 +44,24 @@
 block discarded – undo
44 44
 	 */
45 45
 	public function handle()
46 46
 	{
47
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' );
48
-		$context->setEditor( 'aimeos:cache' );
47
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command');
48
+		$context->setEditor('aimeos:cache');
49 49
 
50
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
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(), '', '', false );
54
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
55 55
 
56 56
 			$lcontext = clone $context;
57
-			$lcontext->setLocale( $localeItem );
57
+			$lcontext->setLocale($localeItem);
58 58
 
59
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext );
60
-			$lcontext->setCache( $cache );
59
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext);
60
+			$lcontext->setCache($cache);
61 61
 
62
-			$this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) );
62
+			$this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode()));
63 63
 
64
-			\Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear();
64
+			\Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear();
65 65
 		}
66 66
 	}
67 67
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Page.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
54 54
 	 * @param \Aimeos\Shop\Base\View $view View object
55 55
 	 */
56
-	public function __construct( \Illuminate\Contracts\Config\Repository $config,
56
+	public function __construct(\Illuminate\Contracts\Config\Repository $config,
57 57
 		\Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context,
58
-		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view )
58
+		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view)
59 59
 	{
60 60
 		$this->config = $config;
61 61
 		$this->aimeos = $aimeos;
@@ -71,21 +71,21 @@  discard block
 block discarded – undo
71 71
 	 * @param string $pageName Name of the configured page
72 72
 	 * @return array Associative list with body and header output separated by client name
73 73
 	 */
74
-	public function getSections( $pageName )
74
+	public function getSections($pageName)
75 75
 	{
76 76
 		$context = $this->context->get();
77 77
 		$langid = $context->getLocale()->getLanguageId();
78
-		$tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' );
79
-		$view = $this->view->create( $context, $tmplPaths, $langid );
80
-		$context->setView( $view );
78
+		$tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates');
79
+		$view = $this->view->create($context, $tmplPaths, $langid);
80
+		$context->setView($view);
81 81
 
82
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
83
-		$page = $context->getConfig()->get( 'page/' . $pageName, array() );
82
+		$result = array('aibody' => array(), 'aiheader' => array());
83
+		$page = $context->getConfig()->get('page/'.$pageName, array());
84 84
 
85
-		foreach( (array) $page as $clientName )
85
+		foreach ((array) $page as $clientName)
86 86
 		{
87
-			$client = \Aimeos\Client\Html\Factory::createClient( $context, $clientName );
88
-			$client->setView( clone $view );
87
+			$client = \Aimeos\Client\Html\Factory::createClient($context, $clientName);
88
+			$client->setView(clone $view);
89 89
 			$client->process();
90 90
 
91 91
 			$result['aibody'][$clientName] = $client->getBody();
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AccountController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public function indexAction()
31 31
 	{
32
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' );
32
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('account-index');
33 33
 		return Response::view('shop::account.index', $params);
34 34
 	}
35 35
 
@@ -41,17 +41,17 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	public function downloadAction()
43 43
 	{
44
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
44
+		$context = app('\Aimeos\Shop\Base\Context')->get();
45 45
 		$langid = $context->getLocale()->getLanguageId();
46 46
 
47
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid );
48
-		$context->setView( $view );
47
+		$view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid);
48
+		$context->setView($view);
49 49
 
50
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, 'account/download' );
51
-		$client->setView( $view );
50
+		$client = \Aimeos\Client\Html\Factory::createClient($context, 'account/download');
51
+		$client->setView($view);
52 52
 		$client->process();
53 53
 
54 54
 		$response = $view->response();
55
-		return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
55
+		return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
56 56
 	}
57 57
 }
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/JsonapiController.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
32 32
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
33 33
 	 */
34
-	public function deleteAction( ServerRequestInterface $request )
34
+	public function deleteAction(ServerRequestInterface $request)
35 35
 	{
36
-		return $this->createClient()->delete( $request, new Response() );
36
+		return $this->createClient()->delete($request, new Response());
37 37
 	}
38 38
 
39 39
 
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
44 44
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
45 45
 	 */
46
-	public function getAction( ServerRequestInterface $request )
46
+	public function getAction(ServerRequestInterface $request)
47 47
 	{
48
-		return $this->createClient()->get( $request, new Response() );
48
+		return $this->createClient()->get($request, new Response());
49 49
 	}
50 50
 
51 51
 
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
56 56
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
57 57
 	 */
58
-	public function patchAction( ServerRequestInterface $request )
58
+	public function patchAction(ServerRequestInterface $request)
59 59
 	{
60
-		return $this->createClient()->patch( $request, new Response() );
60
+		return $this->createClient()->patch($request, new Response());
61 61
 	}
62 62
 
63 63
 
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
68 68
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
69 69
 	 */
70
-	public function postAction( ServerRequestInterface $request )
70
+	public function postAction(ServerRequestInterface $request)
71 71
 	{
72
-		return $this->createClient()->post( $request, new Response() );
72
+		return $this->createClient()->post($request, new Response());
73 73
 	}
74 74
 
75 75
 
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
80 80
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
81 81
 	 */
82
-	public function putAction( ServerRequestInterface $request )
82
+	public function putAction(ServerRequestInterface $request)
83 83
 	{
84
-		return $this->createClient()->put( $request, new Response() );
84
+		return $this->createClient()->put($request, new Response());
85 85
 	}
86 86
 
87 87
 
@@ -91,9 +91,9 @@  discard block
 block discarded – undo
91 91
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
92 92
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
93 93
 	 */
94
-	public function optionsAction( ServerRequestInterface $request )
94
+	public function optionsAction(ServerRequestInterface $request)
95 95
 	{
96
-		return $this->createClient()->options( $request, new Response() );
96
+		return $this->createClient()->options($request, new Response());
97 97
 	}
98 98
 
99 99
 
@@ -104,17 +104,17 @@  discard block
 block discarded – undo
104 104
 	 */
105 105
 	protected function createClient()
106 106
 	{
107
-		$resource = Route::input( 'resource' );
108
-		$related = Route::input( 'related', Input::get( 'related' ) );
107
+		$resource = Route::input('resource');
108
+		$related = Route::input('related', Input::get('related'));
109 109
 
110
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
111
-		$tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' );
110
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
111
+		$tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates');
112 112
 
113
-		$context = app( '\Aimeos\Shop\Base\Context' )->get();
113
+		$context = app('\Aimeos\Shop\Base\Context')->get();
114 114
 		$langid = $context->getLocale()->getLanguageId();
115 115
 
116
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths, $langid ) );
116
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $tmplPaths, $langid));
117 117
 
118
-		return \Aimeos\Client\JsonApi\Factory::createClient( $context, $resource . '/' . $related );
118
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $resource.'/'.$related);
119 119
 	}
120 120
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/View.php 1 patch
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 	 * @param \Aimeos\Shop\Base\I18n $i18n I18n object
48 48
 	 * @param \Aimeos\Shop\Base\Support $support Support object
49 49
 	 */
50
-	public function __construct( \Illuminate\Contracts\Config\Repository $config,
51
-		\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support )
50
+	public function __construct(\Illuminate\Contracts\Config\Repository $config,
51
+		\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support)
52 52
 	{
53 53
 		$this->i18n = $i18n;
54 54
 		$this->config = $config;
@@ -64,24 +64,24 @@  discard block
 block discarded – undo
64 64
 	 * @param string|null $locale Code of the current language or null for no translation
65 65
 	 * @return \Aimeos\MW\View\Iface View object
66 66
 	 */
67
-	public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null )
67
+	public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null)
68 68
 	{
69
-		$engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) );
70
-		$view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) );
69
+		$engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory'));
70
+		$view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine));
71 71
 
72 72
 		$config = $context->getConfig();
73 73
 		$session = $context->getSession();
74 74
 
75
-		$this->addCsrf( $view );
76
-		$this->addAccess( $view, $context );
77
-		$this->addConfig( $view, $config );
78
-		$this->addNumber( $view, $config );
79
-		$this->addParam( $view );
80
-		$this->addRequest( $view );
81
-		$this->addResponse( $view );
82
-		$this->addSession( $view, $session );
83
-		$this->addTranslate( $view, $locale );
84
-		$this->addUrl( $view );
75
+		$this->addCsrf($view);
76
+		$this->addAccess($view, $context);
77
+		$this->addConfig($view, $config);
78
+		$this->addNumber($view, $config);
79
+		$this->addParam($view);
80
+		$this->addRequest($view);
81
+		$this->addResponse($view);
82
+		$this->addSession($view, $session);
83
+		$this->addTranslate($view, $locale);
84
+		$this->addUrl($view);
85 85
 
86 86
 		return $view;
87 87
 	}
@@ -94,25 +94,25 @@  discard block
 block discarded – undo
94 94
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
95 95
 	 * @return \Aimeos\MW\View\Iface Modified view object
96 96
 	 */
97
-	protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context )
97
+	protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context)
98 98
 	{
99
-		if( $this->config->get( 'shop.accessControl', true ) === false
100
-			|| ( ( $user = \Illuminate\Support\Facades\Auth::user() ) !== null && $user->superuser )
99
+		if ($this->config->get('shop.accessControl', true) === false
100
+			|| (($user = \Illuminate\Support\Facades\Auth::user()) !== null && $user->superuser)
101 101
 		) {
102
-			$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
102
+			$helper = new \Aimeos\MW\View\Helper\Access\All($view);
103 103
 		}
104 104
 		else
105 105
 		{
106 106
 			$support = $this->support;
107 107
 
108
-			$fcn = function() use ( $support, $context ) {
109
-				return $support->getGroups( $context );
108
+			$fcn = function() use ($support, $context) {
109
+				return $support->getGroups($context);
110 110
 			};
111 111
 
112
-			$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
112
+			$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn);
113 113
 		}
114 114
 
115
-		$view->addHelper( 'access', $helper );
115
+		$view->addHelper('access', $helper);
116 116
 
117 117
 		return $view;
118 118
 	}
@@ -125,11 +125,11 @@  discard block
 block discarded – undo
125 125
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
126 126
 	 * @return \Aimeos\MW\View\Iface Modified view object
127 127
 	 */
128
-	protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
128
+	protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
129 129
 	{
130
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) );
131
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
132
-		$view->addHelper( 'config', $helper );
130
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client'));
131
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
132
+		$view->addHelper('config', $helper);
133 133
 
134 134
 		return $view;
135 135
 	}
@@ -141,10 +141,10 @@  discard block
 block discarded – undo
141 141
 	 * @param \Aimeos\MW\View\Iface $view View object
142 142
 	 * @return \Aimeos\MW\View\Iface Modified view object
143 143
 	 */
144
-	protected function addCsrf( \Aimeos\MW\View\Iface $view )
144
+	protected function addCsrf(\Aimeos\MW\View\Iface $view)
145 145
 	{
146
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() );
147
-		$view->addHelper( 'csrf', $helper );
146
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token());
147
+		$view->addHelper('csrf', $helper);
148 148
 
149 149
 		return $view;
150 150
 	}
@@ -157,14 +157,14 @@  discard block
 block discarded – undo
157 157
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
158 158
 	 * @return \Aimeos\MW\View\Iface Modified view object
159 159
 	 */
160
-	protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
160
+	protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
161 161
 	{
162
-		$sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' );
163
-		$sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' );
164
-		$decimals = $config->get( 'client/html/common/format/decimals', 2 );
162
+		$sepDec = $config->get('client/html/common/format/separatorDecimal', '.');
163
+		$sep1000 = $config->get('client/html/common/format/separator1000', ' ');
164
+		$decimals = $config->get('client/html/common/format/decimals', 2);
165 165
 
166
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals );
167
-		$view->addHelper( 'number', $helper );
166
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
167
+		$view->addHelper('number', $helper);
168 168
 
169 169
 		return $view;
170 170
 	}
@@ -176,11 +176,11 @@  discard block
 block discarded – undo
176 176
 	 * @param \Aimeos\MW\View\Iface $view View object
177 177
 	 * @return \Aimeos\MW\View\Iface Modified view object
178 178
 	 */
179
-	protected function addParam( \Aimeos\MW\View\Iface $view )
179
+	protected function addParam(\Aimeos\MW\View\Iface $view)
180 180
 	{
181
-		$params = ( Route::current() ? Route::current()->parameters() : array() ) + Input::all();
182
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
183
-		$view->addHelper( 'param', $helper );
181
+		$params = (Route::current() ? Route::current()->parameters() : array()) + Input::all();
182
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
183
+		$view->addHelper('param', $helper);
184 184
 
185 185
 		return $view;
186 186
 	}
@@ -192,10 +192,10 @@  discard block
 block discarded – undo
192 192
 	 * @param \Aimeos\MW\View\Iface $view View object
193 193
 	 * @return \Aimeos\MW\View\Iface Modified view object
194 194
 	 */
195
-	protected function addRequest( \Aimeos\MW\View\Iface $view )
195
+	protected function addRequest(\Aimeos\MW\View\Iface $view)
196 196
 	{
197
-		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() );
198
-		$view->addHelper( 'request', $helper );
197
+		$helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance());
198
+		$view->addHelper('request', $helper);
199 199
 
200 200
 		return $view;
201 201
 	}
@@ -207,10 +207,10 @@  discard block
 block discarded – undo
207 207
 	 * @param \Aimeos\MW\View\Iface $view View object
208 208
 	 * @return \Aimeos\MW\View\Iface Modified view object
209 209
 	 */
210
-	protected function addResponse( \Aimeos\MW\View\Iface $view )
210
+	protected function addResponse(\Aimeos\MW\View\Iface $view)
211 211
 	{
212
-		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view );
213
-		$view->addHelper( 'response', $helper );
212
+		$helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view);
213
+		$view->addHelper('response', $helper);
214 214
 
215 215
 		return $view;
216 216
 	}
@@ -223,10 +223,10 @@  discard block
 block discarded – undo
223 223
 	 * @param \Aimeos\MW\Session\Iface $session Session object
224 224
 	 * @return \Aimeos\MW\View\Iface Modified view object
225 225
 	 */
226
-	protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session )
226
+	protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session)
227 227
 	{
228
-		$helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session );
229
-		$view->addHelper( 'session', $helper );
228
+		$helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session);
229
+		$view->addHelper('session', $helper);
230 230
 
231 231
 		return $view;
232 232
 	}
@@ -239,20 +239,20 @@  discard block
 block discarded – undo
239 239
 	 * @param string|null $locale ISO language code, e.g. "de" or "de_CH"
240 240
 	 * @return \Aimeos\MW\View\Iface Modified view object
241 241
 	 */
242
-	protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale )
242
+	protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale)
243 243
 	{
244
-		if( $locale !== null )
244
+		if ($locale !== null)
245 245
 		{
246
-			$i18n = $this->i18n->get( array( $locale ) );
246
+			$i18n = $this->i18n->get(array($locale));
247 247
 			$translation = $i18n[$locale];
248 248
 		}
249 249
 		else
250 250
 		{
251
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
251
+			$translation = new \Aimeos\MW\Translation\None('en');
252 252
 		}
253 253
 
254
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
255
-		$view->addHelper( 'translate', $helper );
254
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
255
+		$view->addHelper('translate', $helper);
256 256
 
257 257
 		return $view;
258 258
 	}
@@ -264,27 +264,27 @@  discard block
 block discarded – undo
264 264
 	 * @param \Aimeos\MW\View\Iface $view View object
265 265
 	 * @return \Aimeos\MW\View\Iface Modified view object
266 266
 	 */
267
-	protected function addUrl( \Aimeos\MW\View\Iface $view )
267
+	protected function addUrl(\Aimeos\MW\View\Iface $view)
268 268
 	{
269 269
 		$fixed = array();
270 270
 
271
-		if( Route::current() )
271
+		if (Route::current())
272 272
 		{
273
-			if( ( $value = Route::input( 'site' ) ) !== null ) {
273
+			if (($value = Route::input('site')) !== null) {
274 274
 				$fixed['site'] = $value;
275 275
 			}
276 276
 
277
-			if( ( $value = Route::input( 'locale' ) ) !== null ) {
277
+			if (($value = Route::input('locale')) !== null) {
278 278
 				$fixed['locale'] = $value;
279 279
 			}
280 280
 
281
-			if( ( $value = Route::input( 'currency' ) ) !== null ) {
281
+			if (($value = Route::input('currency')) !== null) {
282 282
 				$fixed['currency'] = $value;
283 283
 			}
284 284
 		}
285 285
 
286
-		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed );
287
-		$view->addHelper( 'url', $helper );
286
+		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed);
287
+		$view->addHelper('url', $helper);
288 288
 
289 289
 		return $view;
290 290
 	}
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/AccountCommand.php 1 patch
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -51,22 +51,22 @@  discard block
 block discarded – undo
51 51
 	 */
52 52
 	public function handle()
53 53
 	{
54
-		if( ( $code = $this->argument( 'email' ) ) === null ) {
55
-			$code = $this->ask( 'E-Mail' );
54
+		if (($code = $this->argument('email')) === null) {
55
+			$code = $this->ask('E-Mail');
56 56
 		}
57 57
 
58
-		if( ( $password = $this->option( 'password' ) ) === null ) {
59
-			$password = $this->secret( 'Password' );
58
+		if (($password = $this->option('password')) === null) {
59
+			$password = $this->secret('Password');
60 60
 		}
61 61
 
62
-		$context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' );
63
-		$context->setEditor( 'aimeos:account' );
62
+		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command');
63
+		$context->setEditor('aimeos:account');
64 64
 
65
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
66
-		$localeItem = $localeManager->bootstrap( $this->argument( 'site' ), '', '', false );
67
-		$context->setLocale( $localeItem );
65
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
66
+		$localeItem = $localeManager->bootstrap($this->argument('site'), '', '', false);
67
+		$context->setLocale($localeItem);
68 68
 
69
-		$this->addGroups( $context, $this->createCustomerItem( $context, $code, $password ) );
69
+		$this->addGroups($context, $this->createCustomerItem($context, $code, $password));
70 70
 	}
71 71
 
72 72
 
@@ -77,33 +77,33 @@  discard block
 block discarded – undo
77 77
 	 * @param string $userid Unique user ID
78 78
 	 * @param string $groupid Unique group ID
79 79
 	 */
80
-	protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid )
80
+	protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid)
81 81
 	{
82
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
83
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
82
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
83
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
84 84
 
85
-		$typeid = $typeManager->findItem( 'default', array(), 'customer/group' )->getId();
85
+		$typeid = $typeManager->findItem('default', array(), 'customer/group')->getId();
86 86
 
87 87
 		$search = $manager->createSearch();
88 88
 		$expr = array(
89
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
90
-			$search->compare( '==', 'customer.lists.refid', $groupid ),
91
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
92
-			$search->compare( '==', 'customer.lists.typeid', $typeid ),
89
+			$search->compare('==', 'customer.lists.parentid', $userid),
90
+			$search->compare('==', 'customer.lists.refid', $groupid),
91
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
92
+			$search->compare('==', 'customer.lists.typeid', $typeid),
93 93
 		);
94
-		$search->setConditions( $search->combine( '&&', $expr ) );
95
-		$search->setSlice( 0, 1 );
94
+		$search->setConditions($search->combine('&&', $expr));
95
+		$search->setSlice(0, 1);
96 96
 
97
-		if( count( $manager->searchItems( $search ) ) === 0 )
97
+		if (count($manager->searchItems($search)) === 0)
98 98
 		{
99 99
 			$item = $manager->createItem();
100
-			$item->setDomain( 'customer/group' );
101
-			$item->setParentId( $userid );
102
-			$item->setTypeId( $typeid );
103
-			$item->setRefId( $groupid );
104
-			$item->setStatus( 1 );
100
+			$item->setDomain('customer/group');
101
+			$item->setParentId($userid);
102
+			$item->setTypeId($typeid);
103
+			$item->setRefId($groupid);
104
+			$item->setStatus(1);
105 105
 
106
-			$manager->saveItem( $item, false );
106
+			$manager->saveItem($item, false);
107 107
 		}
108 108
 	}
109 109
 
@@ -114,22 +114,22 @@  discard block
 block discarded – undo
114 114
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Aimeos context object
115 115
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
116 116
 	 */
117
-	protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user )
117
+	protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user)
118 118
 	{
119
-		\Illuminate\Foundation\Auth\User::findOrFail( $user->getId() )
120
-			->forceFill( ['superuser' => ( $this->option( 'super' ) ? 1 : 0 )] )
119
+		\Illuminate\Foundation\Auth\User::findOrFail($user->getId())
120
+			->forceFill(['superuser' => ($this->option('super') ? 1 : 0)])
121 121
 			->save();
122 122
 
123
-		if( $this->option( 'admin' ) ) {
124
-			$this->addGroup( $context, $user, 'admin' );
123
+		if ($this->option('admin')) {
124
+			$this->addGroup($context, $user, 'admin');
125 125
 		}
126 126
 
127
-		if( $this->option( 'editor' ) ) {
128
-			$this->addGroup( $context, $user, 'editor' );
127
+		if ($this->option('editor')) {
128
+			$this->addGroup($context, $user, 'editor');
129 129
 		}
130 130
 
131
-		if( $this->option( 'api' ) ) {
132
-			$this->addGroup( $context, $user, 'api' );
131
+		if ($this->option('api')) {
132
+			$this->addGroup($context, $user, 'api');
133 133
 		}
134 134
 	}
135 135
 
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
141 141
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
142 142
 	 * @param string $group Unique customer group code
143 143
 	 */
144
-	protected function addGroup( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group )
144
+	protected function addGroup(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group)
145 145
 	{
146 146
 		$msg = 'Add "%1$s" group to user "%2$s" for site "%3$s"';
147
-		$this->info( sprintf( $msg, $group, $user->getCode(), $this->argument( 'site' ) ) );
147
+		$this->info(sprintf($msg, $group, $user->getCode(), $this->argument('site')));
148 148
 
149
-		$groupItem = $this->getGroupItem( $context, $group );
150
-		$this->addListItem( $context, $user->getId(), $groupItem->getId() );
149
+		$groupItem = $this->getGroupItem($context, $group);
150
+		$this->addListItem($context, $user->getId(), $groupItem->getId());
151 151
 	}
152 152
 
153 153
 
@@ -161,23 +161,23 @@  discard block
 block discarded – undo
161 161
 	 * @param string $password New user password
162 162
 	 * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object
163 163
 	 */
164
-	protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password )
164
+	protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password)
165 165
 	{
166
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
166
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
167 167
 
168 168
 		try {
169
-			$item = $manager->findItem( $email );
170
-		} catch( \Aimeos\MShop\Exception $e ) {
169
+			$item = $manager->findItem($email);
170
+		} catch (\Aimeos\MShop\Exception $e) {
171 171
 			$item = $manager->createItem();
172 172
 		}
173 173
 
174
-		$item->setCode( $email );
175
-		$item->setLabel( $email );
176
-		$item->getPaymentAddress()->setEmail( $email );
177
-		$item->setPassword( $password );
178
-		$item->setStatus( 1 );
174
+		$item->setCode($email);
175
+		$item->setLabel($email);
176
+		$item->getPaymentAddress()->setEmail($email);
177
+		$item->setPassword($password);
178
+		$item->setStatus(1);
179 179
 
180
-		$manager->saveItem( $item );
180
+		$manager->saveItem($item);
181 181
 
182 182
 		return $item;
183 183
 	}
@@ -191,8 +191,8 @@  discard block
 block discarded – undo
191 191
 	protected function getArguments()
192 192
 	{
193 193
 		return array(
194
-			array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ),
195
-			array( 'site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default' ),
194
+			array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'),
195
+			array('site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default'),
196 196
 		);
197 197
 	}
198 198
 
@@ -204,21 +204,21 @@  discard block
 block discarded – undo
204 204
 	 * @param string $code Unique customer group code
205 205
 	 * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object
206 206
 	 */
207
-	protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code )
207
+	protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code)
208 208
 	{
209
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' );
209
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group');
210 210
 
211 211
 		try
212 212
 		{
213
-			$item = $manager->findItem( $code );
213
+			$item = $manager->findItem($code);
214 214
 		}
215
-		catch( \Aimeos\MShop\Exception $e )
215
+		catch (\Aimeos\MShop\Exception $e)
216 216
 		{
217 217
 			$item = $manager->createItem();
218
-			$item->setLabel( $code );
219
-			$item->setCode( $code );
218
+			$item->setLabel($code);
219
+			$item->setCode($code);
220 220
 
221
-			$manager->saveItem( $item );
221
+			$manager->saveItem($item);
222 222
 		}
223 223
 
224 224
 		return $item;
@@ -233,11 +233,11 @@  discard block
 block discarded – undo
233 233
 	protected function getOptions()
234 234
 	{
235 235
 		return array(
236
-			array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ),
237
-			array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ),
238
-			array( 'api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs' ),
239
-			array( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ),
240
-			array( 'viewer', null, InputOption::VALUE_NONE, 'If account should only have view privileges' ),
236
+			array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'),
237
+			array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'),
238
+			array('api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs'),
239
+			array('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'),
240
+			array('viewer', null, InputOption::VALUE_NONE, 'If account should only have view privileges'),
241 241
 		);
242 242
 	}
243 243
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/JqadmController.php 1 patch
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -34,38 +34,38 @@  discard block
 block discarded – undo
34 34
 	 */
35 35
 	public function fileAction()
36 36
 	{
37
-		if( config( 'shop.authorize', true ) ) {
38
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
37
+		if (config('shop.authorize', true)) {
38
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
39 39
 		}
40 40
 
41 41
 		$contents = '';
42 42
 		$files = array();
43
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
44
-		$type = Route::input( 'type', Input::get( 'type', 'js' ) );
43
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
44
+		$type = Route::input('type', Input::get('type', 'js'));
45 45
 
46
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
46
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
47 47
 		{
48
-			foreach( $paths as $path )
48
+			foreach ($paths as $path)
49 49
 			{
50
-				$jsbAbsPath = $base . '/' . $path;
51
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
52
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
50
+				$jsbAbsPath = $base.'/'.$path;
51
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
52
+				$files = array_merge($files, $jsb2->getFiles($type));
53 53
 			}
54 54
 		}
55 55
 
56
-		foreach( $files as $file )
56
+		foreach ($files as $file)
57 57
 		{
58
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
58
+			if (($content = file_get_contents($file)) !== false) {
59 59
 				$contents .= $content;
60 60
 			}
61 61
 		}
62 62
 
63
-		$response = response( $contents );
63
+		$response = response($contents);
64 64
 
65
-		if( $type === 'js' ) {
66
-			$response->header( 'Content-Type', 'application/javascript' );
67
-		} elseif( $type === 'css' ) {
68
-			$response->header( 'Content-Type', 'text/css' );
65
+		if ($type === 'js') {
66
+			$response->header('Content-Type', 'application/javascript');
67
+		} elseif ($type === 'css') {
68
+			$response->header('Content-Type', 'text/css');
69 69
 		}
70 70
 
71 71
 		return $response;
@@ -79,17 +79,17 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function copyAction()
81 81
 	{
82
-		if( config( 'shop.authorize', true ) ) {
83
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
82
+		if (config('shop.authorize', true)) {
83
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
84 84
 		}
85 85
 
86 86
 		$cntl = $this->createClient();
87 87
 
88
-		if( ( $html = $cntl->copy() ) == '' ) {
88
+		if (($html = $cntl->copy()) == '') {
89 89
 			return $cntl->getView()->response();
90 90
 		}
91 91
 
92
-		return $this->getHtml( $html );
92
+		return $this->getHtml($html);
93 93
 	}
94 94
 
95 95
 
@@ -100,17 +100,17 @@  discard block
 block discarded – undo
100 100
 	 */
101 101
 	public function createAction()
102 102
 	{
103
-		if( config( 'shop.authorize', true ) ) {
104
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
103
+		if (config('shop.authorize', true)) {
104
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
105 105
 		}
106 106
 
107 107
 		$cntl = $this->createClient();
108 108
 
109
-		if( ( $html = $cntl->create() ) == '' ) {
109
+		if (($html = $cntl->create()) == '') {
110 110
 			return $cntl->getView()->response();
111 111
 		}
112 112
 
113
-		return $this->getHtml( $html );
113
+		return $this->getHtml($html);
114 114
 	}
115 115
 
116 116
 
@@ -121,17 +121,17 @@  discard block
 block discarded – undo
121 121
 	 */
122 122
 	public function deleteAction()
123 123
 	{
124
-		if( config( 'shop.authorize', true ) ) {
125
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
124
+		if (config('shop.authorize', true)) {
125
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
126 126
 		}
127 127
 
128 128
 		$cntl = $this->createClient();
129 129
 
130
-		if( ( $html = $cntl->delete() ) == '' ) {
130
+		if (($html = $cntl->delete()) == '') {
131 131
 			return $cntl->getView()->response();
132 132
 		}
133 133
 
134
-		return $this->getHtml( $html );
134
+		return $this->getHtml($html);
135 135
 	}
136 136
 
137 137
 
@@ -142,17 +142,17 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	public function exportAction()
144 144
 	{
145
-		if( config( 'shop.authorize', true ) ) {
146
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
145
+		if (config('shop.authorize', true)) {
146
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
147 147
 		}
148 148
 
149 149
 		$cntl = $this->createClient();
150 150
 
151
-		if( ( $html = $cntl->export() ) == '' ) {
151
+		if (($html = $cntl->export()) == '') {
152 152
 			return $cntl->getView()->response();
153 153
 		}
154 154
 
155
-		return $this->getHtml( $html );
155
+		return $this->getHtml($html);
156 156
 	}
157 157
 
158 158
 
@@ -163,17 +163,17 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	public function getAction()
165 165
 	{
166
-		if( config( 'shop.authorize', true ) ) {
167
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
166
+		if (config('shop.authorize', true)) {
167
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
168 168
 		}
169 169
 
170 170
 		$cntl = $this->createClient();
171 171
 
172
-		if( ( $html = $cntl->get() ) == '' ) {
172
+		if (($html = $cntl->get()) == '') {
173 173
 			return $cntl->getView()->response();
174 174
 		}
175 175
 
176
-		return $this->getHtml( $html );
176
+		return $this->getHtml($html);
177 177
 	}
178 178
 
179 179
 
@@ -184,17 +184,17 @@  discard block
 block discarded – undo
184 184
 	 */
185 185
 	public function saveAction()
186 186
 	{
187
-		if( config( 'shop.authorize', true ) ) {
188
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
187
+		if (config('shop.authorize', true)) {
188
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
189 189
 		}
190 190
 
191 191
 		$cntl = $this->createClient();
192 192
 
193
-		if( ( $html = $cntl->save() ) == '' ) {
193
+		if (($html = $cntl->save()) == '') {
194 194
 			return $cntl->getView()->response();
195 195
 		}
196 196
 
197
-		return $this->getHtml( $html );
197
+		return $this->getHtml($html);
198 198
 	}
199 199
 
200 200
 
@@ -205,17 +205,17 @@  discard block
 block discarded – undo
205 205
 	 */
206 206
 	public function searchAction()
207 207
 	{
208
-		if( config( 'shop.authorize', true ) ) {
209
-			$this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] );
208
+		if (config('shop.authorize', true)) {
209
+			$this->authorize('admin', [JqadmController::class, ['admin', 'editor']]);
210 210
 		}
211 211
 
212 212
 		$cntl = $this->createClient();
213 213
 
214
-		if( ( $html = $cntl->search() ) == '' ) {
214
+		if (($html = $cntl->search()) == '') {
215 215
 			return $cntl->getView()->response();
216 216
 		}
217 217
 
218
-		return $this->getHtml( $html );
218
+		return $this->getHtml($html);
219 219
 	}
220 220
 
221 221
 
@@ -226,26 +226,26 @@  discard block
 block discarded – undo
226 226
 	 */
227 227
 	protected function createClient()
228 228
 	{
229
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
230
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
231
-		$resource = Route::input( 'resource' );
229
+		$site = Route::input('site', Input::get('site', 'default'));
230
+		$lang = Input::get('lang', config('app.locale', 'en'));
231
+		$resource = Route::input('resource');
232 232
 
233
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
234
-		$paths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
233
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
234
+		$paths = $aimeos->getCustomPaths('admin/jqadm/templates');
235 235
 
236
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
237
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
238
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
236
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
237
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
238
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
239 239
 
240
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context, $paths, $lang );
240
+		$view = app('\Aimeos\Shop\Base\View')->create($context, $paths, $lang);
241 241
 
242 242
 		$view->aimeosType = 'Laravel';
243
-		$view->aimeosVersion = app( '\Aimeos\Shop\Base\Aimeos' )->getVersion();
244
-		$view->aimeosExtensions = implode( ',', $aimeos->getExtensions() );
243
+		$view->aimeosVersion = app('\Aimeos\Shop\Base\Aimeos')->getVersion();
244
+		$view->aimeosExtensions = implode(',', $aimeos->getExtensions());
245 245
 
246
-		$context->setView( $view );
246
+		$context->setView($view);
247 247
 
248
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $aimeos, $resource );
248
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $aimeos, $resource);
249 249
 	}
250 250
 
251 251
 
@@ -255,9 +255,9 @@  discard block
 block discarded – undo
255 255
 	 * @param string $content Content from admin client
256 256
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
257 257
 	 */
258
-	protected function getHtml( $content )
258
+	protected function getHtml($content)
259 259
 	{
260
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
261
-		return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) );
260
+		$site = Route::input('site', Input::get('site', 'default'));
261
+		return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site));
262 262
 	}
263 263
 }
Please login to merge, or discard this patch.