Completed
Push — master ( 3df36a...73a491 )
by Aimeos
03:04
created
src/Aimeos/Shop/Command/AbstractCommand.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -22,19 +22,19 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/CacheCommand.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -35,24 +35,24 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Aimeos/Shop/Command/SetupCommand.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -35,18 +35,18 @@  discard block
 block discarded – undo
35 35
 	 * @param string $classname Name of the setup task class
36 36
 	 * @return boolean True if class is found, false if not
37 37
 	 */
38
-	public static function autoload( $classname )
38
+	public static function autoload($classname)
39 39
 	{
40
-		if( strncmp( $classname, 'Aimeos\\MW\\Setup\\Task\\', 21 ) === 0 )
40
+		if (strncmp($classname, 'Aimeos\\MW\\Setup\\Task\\', 21) === 0)
41 41
 		{
42
-			$fileName = substr( $classname, 21 ) . '.php';
43
-			$paths = explode( PATH_SEPARATOR, get_include_path() );
42
+			$fileName = substr($classname, 21) . '.php';
43
+			$paths = explode(PATH_SEPARATOR, get_include_path());
44 44
 
45
-			foreach( $paths as $path )
45
+			foreach ($paths as $path)
46 46
 			{
47 47
 				$file = $path . DIRECTORY_SEPARATOR . $fileName;
48 48
 
49
-				if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
49
+				if (file_exists($file) === true && (include_once $file) !== false) {
50 50
 					return true;
51 51
 				}
52 52
 			}
@@ -63,33 +63,33 @@  discard block
 block discarded – undo
63 63
 	 */
64 64
 	public function fire()
65 65
 	{
66
-		$ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false );
67
-		$ctx->setEditor( 'aimeos:setup' );
66
+		$ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false);
67
+		$ctx->setEditor('aimeos:setup');
68 68
 
69 69
 		$config = $ctx->getConfig();
70
-		$site = $this->argument( 'site' );
71
-		$template = $this->argument( 'tplsite' );
70
+		$site = $this->argument('site');
71
+		$template = $this->argument('tplsite');
72 72
 
73
-		$config->set( 'setup/site', $site );
74
-		$dbconfig = $this->getDbConfig( $config );
75
-		$this->setOptions( $config );
73
+		$config->set('setup/site', $site);
74
+		$dbconfig = $this->getDbConfig($config);
75
+		$this->setOptions($config);
76 76
 
77
-		$taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template );
77
+		$taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template);
78 78
 
79 79
 		$includePaths = $taskPaths;
80 80
 		$includePaths[] = get_include_path();
81 81
 
82
-		if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) {
83
-			throw new Exception( 'Unable to extend include path' );
82
+		if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) {
83
+			throw new Exception('Unable to extend include path');
84 84
 		}
85 85
 
86
-		spl_autoload_register( '\Aimeos\Shop\Command\SetupCommand::autoload', true );
86
+		spl_autoload_register('\Aimeos\Shop\Command\SetupCommand::autoload', true);
87 87
 
88
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
88
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
89 89
 
90
-		$this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) );
90
+		$this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site));
91 91
 
92
-		$manager->run( 'mysql' );
92
+		$manager->run('mysql');
93 93
 	}
94 94
 
95 95
 
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	protected function getArguments()
102 102
 	{
103 103
 		return array(
104
-			array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ),
105
-			array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ),
104
+			array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'),
105
+			array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'),
106 106
 		);
107 107
 	}
108 108
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	protected function getOptions()
116 116
 	{
117 117
 		return array(
118
-			array( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ),
118
+			array('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()),
119 119
 		);
120 120
 	}
121 121
 
@@ -126,14 +126,14 @@  discard block
 block discarded – undo
126 126
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
127 127
 	 * @return array Multi-dimensional associative list of database configuration parameters
128 128
 	 */
129
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
129
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
130 130
 	{
131
-		$dbconfig = $conf->get( 'resource', array() );
131
+		$dbconfig = $conf->get('resource', array());
132 132
 
133
-		foreach( $dbconfig as $rname => $dbconf )
133
+		foreach ($dbconfig as $rname => $dbconf)
134 134
 		{
135
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
136
-				unset( $dbconfig[$rname] );
135
+			if (strncmp($rname, 'db', 2) !== 0) {
136
+				unset($dbconfig[$rname]);
137 137
 			}
138 138
 		}
139 139
 
@@ -148,12 +148,12 @@  discard block
 block discarded – undo
148 148
 	 * @param array Associative list of database configurations
149 149
 	 * @throws \RuntimeException If the format of the options is invalid
150 150
 	 */
151
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf )
151
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf)
152 152
 	{
153
-		foreach( (array) $this->option( 'option' ) as $option )
153
+		foreach ((array) $this->option('option') as $option)
154 154
 		{
155
-			list( $name, $value ) = explode( ':', $option );
156
-			$conf->set( $name, $value );
155
+			list($name, $value) = explode(':', $option);
156
+			$conf->set($name, $value);
157 157
 		}
158 158
 	}
159 159
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/BasketController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CatalogController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CheckoutController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Page.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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();
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Support.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 *
30 30
 	 * @param \Aimeos\Shop\Base\Context $context Context object
31 31
 	 */
32
-	public function __construct( \Aimeos\Shop\Base\Context $context )
32
+	public function __construct(\Aimeos\Shop\Base\Context $context)
33 33
 	{
34 34
 		$this->context = $context;
35 35
 	}
@@ -42,21 +42,21 @@  discard block
 block discarded – undo
42 42
 	 * @param string $groupcode Unique user/customer group code
43 43
 	 * @return boolean True if user is part of the group, false if not
44 44
 	 */
45
-	public function checkGroup( $userid, $groupcode )
45
+	public function checkGroup($userid, $groupcode)
46 46
 	{
47 47
 		$context = $this->context->get();
48
-		$group = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' )->findItem( $groupcode );
49
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
48
+		$group = \Aimeos\MShop\Factory::createManager($context, 'customer/group')->findItem($groupcode);
49
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
50 50
 
51 51
 		$search = $manager->createSearch();
52 52
 		$expr = array(
53
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
54
-			$search->compare( '==', 'customer.lists.refid', $group->getId() ),
55
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
53
+			$search->compare('==', 'customer.lists.parentid', $userid),
54
+			$search->compare('==', 'customer.lists.refid', $group->getId()),
55
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
56 56
 		);
57
-		$search->setConditions( $search->combine( '&&', $expr ) );
58
-		$search->setSlice( 0, 1 );
57
+		$search->setConditions($search->combine('&&', $expr));
58
+		$search->setSlice(0, 1);
59 59
 
60
-		return (bool) count( $manager->searchItems( $search ) );
60
+		return (bool) count($manager->searchItems($search));
61 61
 	}
62 62
 }
63 63
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/ExtadmController.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
 	 * Creates a list of all available translations.
136 136
 	 *
137 137
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
138
-	 * @return array List of language IDs with labels
138
+	 * @return string List of language IDs with labels
139 139
 	 */
140 140
 	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
141 141
 	{
Please login to merge, or discard this patch.
Spacing   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -34,63 +34,63 @@  discard block
 block discarded – undo
34 34
 	 * @param \Illuminate\Http\Request $request Laravel request object
35 35
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
36 36
 	 */
37
-	public function indexAction( Request $request )
37
+	public function indexAction(Request $request)
38 38
 	{
39
-		if( config( 'shop.authorize', true ) ) {
40
-			$this->authorize( 'admin' );
39
+		if (config('shop.authorize', true)) {
40
+			$this->authorize('admin');
41 41
 		}
42 42
 
43
-		$site = Route::input( 'site', 'default' );
44
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
43
+		$site = Route::input('site', 'default');
44
+		$lang = Input::get('lang', config('app.locale', 'en'));
45 45
 
46
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' );
46
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos');
47 47
 
48 48
 		$bootstrap = $aimeos->get();
49
-		$cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
49
+		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
50 50
 
51
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
52
-		$context = $this->setLocale( $context, $site, $lang );
51
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
52
+		$context = $this->setLocale($context, $site, $lang);
53 53
 
54
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
54
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
55 55
 		$cssFiles = array();
56 56
 
57
-		foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
57
+		foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths)
58 58
 		{
59
-			foreach( $paths as $path )
59
+			foreach ($paths as $path)
60 60
 			{
61 61
 				$jsbAbsPath = $base . '/' . $path;
62 62
 
63
-				if( !is_file( $jsbAbsPath ) ) {
64
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
63
+				if (!is_file($jsbAbsPath)) {
64
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
65 65
 				}
66 66
 
67
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
68
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
67
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
68
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
69 69
 			}
70 70
 		}
71 71
 
72
-		$jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
73
-		$jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) );
74
-		$adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
72
+		$jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
73
+		$jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token()));
74
+		$adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>'));
75 75
 
76 76
 		$vars = array(
77 77
 			'lang' => $lang,
78 78
 			'cssFiles' => $cssFiles,
79
-			'languages' => $this->getJsonLanguages( $context),
80
-			'config' => $this->getJsonClientConfig( $context ),
81
-			'site' => $this->getJsonSiteItem( $context, $site ),
82
-			'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
79
+			'languages' => $this->getJsonLanguages($context),
80
+			'config' => $this->getJsonClientConfig($context),
81
+			'site' => $this->getJsonSiteItem($context, $site),
82
+			'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),
83 83
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
84 84
 			'itemSchemas' => $controller->getJsonItemSchemas(),
85
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
86
-			'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ),
87
-			'uploaddir' => config( 'shop::uploaddir' ),
88
-			'activeTab' => Input::get( 'tab', 0 ),
85
+			'smd' => $controller->getJsonSmd($jsonUrl),
86
+			'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)),
87
+			'uploaddir' => config('shop::uploaddir'),
88
+			'activeTab' => Input::get('tab', 0),
89 89
 			'version' => $aimeos->getVersion(),
90 90
 			'jqadmurl' => $jqadmUrl,
91 91
 		);
92 92
 
93
-		return View::make( 'shop::extadm.index', $vars );
93
+		return View::make('shop::extadm.index', $vars);
94 94
 	}
95 95
 
96 96
 
@@ -100,23 +100,23 @@  discard block
 block discarded – undo
100 100
 	 * @param \Illuminate\Http\Request $request Laravel request object
101 101
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
102 102
 	 */
103
-	public function doAction( Request $request )
103
+	public function doAction(Request $request)
104 104
 	{
105
-		if( config( 'shop.authorize', true ) ) {
106
-			$this->authorize( 'admin' );
105
+		if (config('shop.authorize', true)) {
106
+			$this->authorize('admin');
107 107
 		}
108 108
 
109
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
110
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
109
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
110
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
111 111
 
112
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
113
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), array() ) );
114
-		$context = $this->setLocale( $context );
112
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
113
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context->getConfig(), array()));
114
+		$context = $this->setLocale($context);
115 115
 
116
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
116
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
117 117
 
118
-		$response = $controller->process( Input::instance()->request->all(), $request->getContent() );
119
-		return View::make( 'shop::extadm.do', array( 'output' => $response ) );
118
+		$response = $controller->process(Input::instance()->request->all(), $request->getContent());
119
+		return View::make('shop::extadm.do', array('output' => $response));
120 120
 	}
121 121
 
122 122
 
@@ -127,32 +127,32 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	public function fileAction()
129 129
 	{
130
-		if( config( 'shop.authorize', true ) ) {
131
-			$this->authorize( 'admin' );
130
+		if (config('shop.authorize', true)) {
131
+			$this->authorize('admin');
132 132
 		}
133 133
 
134 134
 		$contents = '';
135 135
 		$jsFiles = array();
136
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
136
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
137 137
 
138
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
138
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
139 139
 		{
140
-			foreach( $paths as $path )
140
+			foreach ($paths as $path)
141 141
 			{
142 142
 				$jsbAbsPath = $base . '/' . $path;
143
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
144
-				$jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );
143
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
144
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js'));
145 145
 			}
146 146
 		}
147 147
 
148
-		foreach( $jsFiles as $file )
148
+		foreach ($jsFiles as $file)
149 149
 		{
150
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
150
+			if (($content = file_get_contents($file)) !== false) {
151 151
 				$contents .= $content;
152 152
 			}
153 153
 		}
154 154
 
155
-		return response( $contents )->header( 'Content-Type', 'application/javascript' );
155
+		return response($contents)->header('Content-Type', 'application/javascript');
156 156
 	}
157 157
 
158 158
 
@@ -162,15 +162,15 @@  discard block
 block discarded – undo
162 162
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
163 163
 	 * @return array List of language IDs with labels
164 164
 	 */
165
-	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
165
+	protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context)
166 166
 	{
167 167
 		$result = array();
168 168
 
169
-		foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
170
-			$result[] = array( 'id' => $id, 'label' => $id );
169
+		foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) {
170
+			$result[] = array('id' => $id, 'label' => $id);
171 171
 		}
172 172
 
173
-		return json_encode( $result );
173
+		return json_encode($result);
174 174
 	}
175 175
 
176 176
 
@@ -180,10 +180,10 @@  discard block
 block discarded – undo
180 180
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
181 181
 	 * @return string JSON encoded configuration object
182 182
 	 */
183
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
183
+	protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
184 184
 	{
185
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
186
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
185
+		$config = $context->getConfig()->get('admin/extjs', array());
186
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
187 187
 	}
188 188
 
189 189
 
@@ -194,16 +194,16 @@  discard block
 block discarded – undo
194 194
 	 * @param string $lang ISO language code like "en" or "en_GB"
195 195
 	 * @return string JSON encoded translation object
196 196
 	 */
197
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
197
+	protected function getJsonClientI18n(array $i18nPaths, $lang)
198 198
 	{
199
-		$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang );
199
+		$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang);
200 200
 
201 201
 		$content = array(
202
-			'admin' => $i18n->getAll( 'admin' ),
203
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
202
+			'admin' => $i18n->getAll('admin'),
203
+			'admin/ext' => $i18n->getAll('admin/ext'),
204 204
 		);
205 205
 
206
-		return json_encode( $content, JSON_FORCE_OBJECT );
206
+		return json_encode($content, JSON_FORCE_OBJECT);
207 207
 	}
208 208
 
209 209
 
@@ -215,19 +215,19 @@  discard block
 block discarded – undo
215 215
 	 * @return string JSON encoded site item object
216 216
 	 * @throws Exception If no site item was found for the code
217 217
 	 */
218
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
218
+	protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
219 219
 	{
220
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
220
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
221 221
 
222 222
 		$criteria = $manager->createSearch();
223
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
224
-		$items = $manager->searchItems( $criteria );
223
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
224
+		$items = $manager->searchItems($criteria);
225 225
 
226
-		if( ( $item = reset( $items ) ) === false ) {
227
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
226
+		if (($item = reset($items)) === false) {
227
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
228 228
 		}
229 229
 
230
-		return json_encode( $item->toArray() );
230
+		return json_encode($item->toArray());
231 231
 	}
232 232
 
233 233
 
@@ -239,17 +239,17 @@  discard block
 block discarded – undo
239 239
 	 * @param string $locale ISO language code, e.g. "en" or "en_GB"
240 240
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
241 241
 	 */
242
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null )
242
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null)
243 243
 	{
244
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
244
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
245 245
 
246 246
 		try {
247
-			$localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false );
248
-		} catch( \Aimeos\MShop\Locale\Exception $e ) {
247
+			$localeItem = $localeManager->bootstrap($sitecode, $locale, '', false);
248
+		} catch (\Aimeos\MShop\Locale\Exception $e) {
249 249
 			$localeItem = $localeManager->createItem();
250 250
 		}
251 251
 
252
-		$context->setLocale( $localeItem );
252
+		$context->setLocale($localeItem);
253 253
 
254 254
 		return $context;
255 255
 	}
Please login to merge, or discard this patch.