Completed
Push — master ( f34479...a6f6c0 )
by Aimeos
02:37
created
src/Aimeos/Shop/Controller/JsonadmController.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -35,19 +35,19 @@  discard block
 block discarded – undo
35 35
 	 * @param \Illuminate\Http\Request $request Request object
36 36
 	 * @return \Illuminate\Http\Response Response object containing the generated output
37 37
 	 */
38
-	public function deleteAction( Request $request )
38
+	public function deleteAction(Request $request)
39 39
 	{
40
-		if( config( 'shop.authorize', true ) ) {
41
-			$this->authorize( 'admin', [['admin']] );
40
+		if (config('shop.authorize', true)) {
41
+			$this->authorize('admin', [['admin']]);
42 42
 		}
43 43
 
44 44
 		$status = 500;
45 45
 		$header = $request->headers->all();
46 46
 
47 47
 		$client = $this->createClient();
48
-		$result = $client->delete( (string) $request->getContent(), $header, $status );
48
+		$result = $client->delete((string) $request->getContent(), $header, $status);
49 49
 
50
-		return $this->createResponse( $result, $status, $header );
50
+		return $this->createResponse($result, $status, $header);
51 51
 	}
52 52
 
53 53
 
@@ -57,19 +57,19 @@  discard block
 block discarded – undo
57 57
 	 * @param \Illuminate\Http\Request $request Request object
58 58
 	 * @return \Illuminate\Http\Response Response object containing the generated output
59 59
 	 */
60
-	public function getAction( Request $request )
60
+	public function getAction(Request $request)
61 61
 	{
62
-		if( config( 'shop.authorize', true ) ) {
63
-			$this->authorize( 'admin', [['admin', 'editor']] );
62
+		if (config('shop.authorize', true)) {
63
+			$this->authorize('admin', [['admin', 'editor']]);
64 64
 		}
65 65
 
66 66
 		$status = 500;
67 67
 		$header = $request->headers->all();
68 68
 
69 69
 		$client = $this->createClient();
70
-		$result = $client->get( (string) $request->getContent(), $header, $status );
70
+		$result = $client->get((string) $request->getContent(), $header, $status);
71 71
 
72
-		return $this->createResponse( $result, $status, $header );
72
+		return $this->createResponse($result, $status, $header);
73 73
 	}
74 74
 
75 75
 
@@ -79,19 +79,19 @@  discard block
 block discarded – undo
79 79
 	 * @param \Illuminate\Http\Request $request Request object
80 80
 	 * @return \Illuminate\Http\Response Response object containing the generated output
81 81
 	 */
82
-	public function patchAction( Request $request )
82
+	public function patchAction(Request $request)
83 83
 	{
84
-		if( config( 'shop.authorize', true ) ) {
85
-			$this->authorize( 'admin', [['admin']] );
84
+		if (config('shop.authorize', true)) {
85
+			$this->authorize('admin', [['admin']]);
86 86
 		}
87 87
 
88 88
 		$status = 500;
89 89
 		$header = $request->headers->all();
90 90
 
91 91
 		$client = $this->createClient();
92
-		$result = $client->patch( (string) $request->getContent(), $header, $status );
92
+		$result = $client->patch((string) $request->getContent(), $header, $status);
93 93
 
94
-		return $this->createResponse( $result, $status, $header );
94
+		return $this->createResponse($result, $status, $header);
95 95
 	}
96 96
 
97 97
 
@@ -101,19 +101,19 @@  discard block
 block discarded – undo
101 101
 	 * @param \Illuminate\Http\Request $request Request object
102 102
 	 * @return \Illuminate\Http\Response Response object containing the generated output
103 103
 	 */
104
-	public function postAction( Request $request )
104
+	public function postAction(Request $request)
105 105
 	{
106
-		if( config( 'shop.authorize', true ) ) {
107
-			$this->authorize( 'admin', [['admin']] );
106
+		if (config('shop.authorize', true)) {
107
+			$this->authorize('admin', [['admin']]);
108 108
 		}
109 109
 
110 110
 		$status = 500;
111 111
 		$header = $request->headers->all();
112 112
 
113 113
 		$client = $this->createClient();
114
-		$result = $client->post( (string) $request->getContent(), $header, $status );
114
+		$result = $client->post((string) $request->getContent(), $header, $status);
115 115
 
116
-		return $this->createResponse( $result, $status, $header );
116
+		return $this->createResponse($result, $status, $header);
117 117
 	}
118 118
 
119 119
 
@@ -123,19 +123,19 @@  discard block
 block discarded – undo
123 123
 	 * @param \Illuminate\Http\Request $request Request object
124 124
 	 * @return \Illuminate\Http\Response Response object containing the generated output
125 125
 	 */
126
-	public function putAction( Request $request )
126
+	public function putAction(Request $request)
127 127
 	{
128
-		if( config( 'shop.authorize', true ) ) {
129
-			$this->authorize( 'admin', [['admin']] );
128
+		if (config('shop.authorize', true)) {
129
+			$this->authorize('admin', [['admin']]);
130 130
 		}
131 131
 
132 132
 		$status = 500;
133 133
 		$header = $request->headers->all();
134 134
 
135 135
 		$client = $this->createClient();
136
-		$result = $client->put( (string) $request->getContent(), $header, $status );
136
+		$result = $client->put((string) $request->getContent(), $header, $status);
137 137
 
138
-		return $this->createResponse( $result, $status, $header );
138
+		return $this->createResponse($result, $status, $header);
139 139
 	}
140 140
 
141 141
 
@@ -145,19 +145,19 @@  discard block
 block discarded – undo
145 145
 	 * @param \Illuminate\Http\Request $request Request object
146 146
 	 * @return \Illuminate\Http\Response Response object containing the generated output
147 147
 	 */
148
-	public function optionsAction( Request $request )
148
+	public function optionsAction(Request $request)
149 149
 	{
150
-		if( config( 'shop.authorize', true ) ) {
151
-			$this->authorize( 'admin', [['admin', 'editor']] );
150
+		if (config('shop.authorize', true)) {
151
+			$this->authorize('admin', [['admin', 'editor']]);
152 152
 		}
153 153
 
154 154
 		$status = 500;
155 155
 		$header = $request->headers->all();
156 156
 
157 157
 		$client = $this->createClient();
158
-		$result = $client->options( (string) $request->getContent(), $header, $status );
158
+		$result = $client->options((string) $request->getContent(), $header, $status);
159 159
 
160
-		return $this->createResponse( $result, $status, $header );
160
+		return $this->createResponse($result, $status, $header);
161 161
 	}
162 162
 
163 163
 
@@ -168,20 +168,20 @@  discard block
 block discarded – undo
168 168
 	 */
169 169
 	protected function createClient()
170 170
 	{
171
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
172
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
173
-		$resource = Route::input( 'resource' );
171
+		$site = Route::input('site', Input::get('site', 'default'));
172
+		$lang = Input::get('lang', config('app.locale', 'en'));
173
+		$resource = Route::input('resource');
174 174
 
175
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
176
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
175
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
176
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
177 177
 
178
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
179
-		$context = $this->setLocale( $context, $site, $lang );
178
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
179
+		$context = $this->setLocale($context, $site, $lang);
180 180
 
181
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang );
182
-		$context->setView( $view );
181
+		$view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang);
182
+		$context->setView($view);
183 183
 
184
-		return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource );
184
+		return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource);
185 185
 	}
186 186
 
187 187
 
@@ -193,12 +193,12 @@  discard block
 block discarded – undo
193 193
 	 * @param array $header List of HTTP headers
194 194
 	 * @return \Illuminate\Http\Response HTTP response object
195 195
 	 */
196
-	protected function createResponse( $content, $status, array $header )
196
+	protected function createResponse($content, $status, array $header)
197 197
 	{
198
-		$response = Response::make( $content, $status );
198
+		$response = Response::make($content, $status);
199 199
 
200
-		foreach( $header as $key => $value ) {
201
-			$response->header( $key, $value );
200
+		foreach ($header as $key => $value) {
201
+			$response->header($key, $value);
202 202
 		}
203 203
 
204 204
 		return $response;
@@ -213,23 +213,23 @@  discard block
 block discarded – undo
213 213
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
214 214
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
215 215
 	 */
216
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang )
216
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang)
217 217
 	{
218
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
218
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
219 219
 
220 220
 		try
221 221
 		{
222
-			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
223
-			$localeItem->setLanguageId( null );
224
-			$localeItem->setCurrencyId( null );
222
+			$localeItem = $localeManager->bootstrap($sitecode, '', '', false);
223
+			$localeItem->setLanguageId(null);
224
+			$localeItem->setCurrencyId(null);
225 225
 		}
226
-		catch( \Aimeos\MShop\Locale\Exception $e )
226
+		catch (\Aimeos\MShop\Locale\Exception $e)
227 227
 		{
228 228
 			$localeItem = $localeManager->createItem();
229 229
 		}
230 230
 
231
-		$context->setLocale( $localeItem );
232
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang ) ) );
231
+		$context->setLocale($localeItem);
232
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang)));
233 233
 
234 234
 		return $context;
235 235
 	}
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AdminController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -36,20 +36,20 @@
 block discarded – undo
36 36
 	 * @param \Illuminate\Http\Request $request Laravel request object
37 37
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
38 38
 	 */
39
-	public function indexAction( Request $request )
39
+	public function indexAction(Request $request)
40 40
 	{
41
-		if( config( 'shop.authorize', true ) && ( Auth::check() === false
42
-			|| $request->user()->cannot( 'admin' ) || $request->user()->cannot( 'editor' ) )
41
+		if (config('shop.authorize', true) && (Auth::check() === false
42
+			|| $request->user()->cannot('admin') || $request->user()->cannot('editor'))
43 43
 		) {
44
-			return View::make( 'shop::admin.index' );
44
+			return View::make('shop::admin.index');
45 45
 		}
46 46
 
47 47
 		$param = array(
48 48
 			'resource' => 'product',
49
-			'site' => Route::input( 'site', 'default' ),
50
-			'lang' => Input::get( 'lang', config( 'app.locale', 'en' ) ),
49
+			'site' => Route::input('site', 'default'),
50
+			'lang' => Input::get('lang', config('app.locale', 'en')),
51 51
 		);
52 52
 
53
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
53
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
54 54
 	}
55 55
 }
56 56
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/ExtadmController.php 1 patch
Spacing   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -34,64 +34,64 @@  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', [['admin']] );
39
+		if (config('shop.authorize', true)) {
40
+			$this->authorize('admin', [['admin']]);
41 41
 		}
42 42
 
43
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
44
-		$lang = Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) );
45
-		$tab = Route::input( 'tab', Input::get( 'tab', 0 ) );
43
+		$site = Route::input('site', Input::get('site', 'default'));
44
+		$lang = Route::input('lang', Input::get('lang', config('app.locale', 'en')));
45
+		$tab = Route::input('tab', Input::get('tab', 0));
46 46
 
47
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' );
47
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos');
48 48
 
49 49
 		$bootstrap = $aimeos->get();
50
-		$cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
50
+		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
51 51
 
52
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
53
-		$context = $this->setLocale( $context, $site, $lang );
52
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
53
+		$context = $this->setLocale($context, $site, $lang);
54 54
 
55
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
55
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
56 56
 		$cssFiles = array();
57 57
 
58
-		foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
58
+		foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths)
59 59
 		{
60
-			foreach( $paths as $path )
60
+			foreach ($paths as $path)
61 61
 			{
62
-				$jsbAbsPath = $base . '/' . $path;
62
+				$jsbAbsPath = $base.'/'.$path;
63 63
 
64
-				if( !is_file( $jsbAbsPath ) ) {
65
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
64
+				if (!is_file($jsbAbsPath)) {
65
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
66 66
 				}
67 67
 
68
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
69
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
68
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
69
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
70 70
 			}
71 71
 		}
72 72
 
73
-		$jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
74
-		$jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) );
75
-		$adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) );
73
+		$jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
74
+		$jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token()));
75
+		$adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>'));
76 76
 
77 77
 		$vars = array(
78 78
 			'lang' => $lang,
79 79
 			'cssFiles' => $cssFiles,
80
-			'languages' => $this->getJsonLanguages( $context),
81
-			'config' => $this->getJsonClientConfig( $context ),
82
-			'site' => $this->getJsonSiteItem( $context, $site ),
83
-			'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
80
+			'languages' => $this->getJsonLanguages($context),
81
+			'config' => $this->getJsonClientConfig($context),
82
+			'site' => $this->getJsonSiteItem($context, $site),
83
+			'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),
84 84
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
85 85
 			'itemSchemas' => $controller->getJsonItemSchemas(),
86
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
87
-			'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ),
88
-			'uploaddir' => config( 'shop::uploaddir' ),
86
+			'smd' => $controller->getJsonSmd($jsonUrl),
87
+			'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)),
88
+			'uploaddir' => config('shop::uploaddir'),
89 89
 			'version' => $aimeos->getVersion(),
90 90
 			'jqadmurl' => $jqadmUrl,
91 91
 			'activeTab' => $tab,
92 92
 		);
93 93
 
94
-		return View::make( 'shop::extadm.index', $vars );
94
+		return View::make('shop::extadm.index', $vars);
95 95
 	}
96 96
 
97 97
 
@@ -101,23 +101,23 @@  discard block
 block discarded – undo
101 101
 	 * @param \Illuminate\Http\Request $request Laravel request object
102 102
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
103 103
 	 */
104
-	public function doAction( Request $request )
104
+	public function doAction(Request $request)
105 105
 	{
106
-		if( config( 'shop.authorize', true ) ) {
107
-			$this->authorize( 'admin', [['admin']] );
106
+		if (config('shop.authorize', true)) {
107
+			$this->authorize('admin', [['admin']]);
108 108
 		}
109 109
 
110
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
111
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' );
110
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
111
+		$cntlPaths = $aimeos->getCustomPaths('controller/extjs');
112 112
 
113
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
114
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), array() ) );
115
-		$context = $this->setLocale( $context );
113
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
114
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context->getConfig(), array()));
115
+		$context = $this->setLocale($context);
116 116
 
117
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
117
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
118 118
 
119
-		$response = $controller->process( Input::instance()->request->all(), $request->getContent() );
120
-		return View::make( 'shop::extadm.do', array( 'output' => $response ) );
119
+		$response = $controller->process(Input::instance()->request->all(), $request->getContent());
120
+		return View::make('shop::extadm.do', array('output' => $response));
121 121
 	}
122 122
 
123 123
 
@@ -128,32 +128,32 @@  discard block
 block discarded – undo
128 128
 	 */
129 129
 	public function fileAction()
130 130
 	{
131
-		if( config( 'shop.authorize', true ) ) {
132
-			$this->authorize( 'admin', [['admin']] );
131
+		if (config('shop.authorize', true)) {
132
+			$this->authorize('admin', [['admin']]);
133 133
 		}
134 134
 
135 135
 		$contents = '';
136 136
 		$jsFiles = array();
137
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
137
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
138 138
 
139
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
139
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
140 140
 		{
141
-			foreach( $paths as $path )
141
+			foreach ($paths as $path)
142 142
 			{
143
-				$jsbAbsPath = $base . '/' . $path;
144
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
145
-				$jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );
143
+				$jsbAbsPath = $base.'/'.$path;
144
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
145
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js'));
146 146
 			}
147 147
 		}
148 148
 
149
-		foreach( $jsFiles as $file )
149
+		foreach ($jsFiles as $file)
150 150
 		{
151
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
151
+			if (($content = file_get_contents($file)) !== false) {
152 152
 				$contents .= $content;
153 153
 			}
154 154
 		}
155 155
 
156
-		return response( $contents )->header( 'Content-Type', 'application/javascript' );
156
+		return response($contents)->header('Content-Type', 'application/javascript');
157 157
 	}
158 158
 
159 159
 
@@ -163,15 +163,15 @@  discard block
 block discarded – undo
163 163
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
164 164
 	 * @return array List of language IDs with labels
165 165
 	 */
166
-	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
166
+	protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context)
167 167
 	{
168 168
 		$result = array();
169 169
 
170
-		foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
171
-			$result[] = array( 'id' => $id, 'label' => $id );
170
+		foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) {
171
+			$result[] = array('id' => $id, 'label' => $id);
172 172
 		}
173 173
 
174
-		return json_encode( $result );
174
+		return json_encode($result);
175 175
 	}
176 176
 
177 177
 
@@ -181,10 +181,10 @@  discard block
 block discarded – undo
181 181
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
182 182
 	 * @return string JSON encoded configuration object
183 183
 	 */
184
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
184
+	protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
185 185
 	{
186
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
187
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
186
+		$config = $context->getConfig()->get('admin/extjs', array());
187
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
188 188
 	}
189 189
 
190 190
 
@@ -195,16 +195,16 @@  discard block
 block discarded – undo
195 195
 	 * @param string $lang ISO language code like "en" or "en_GB"
196 196
 	 * @return string JSON encoded translation object
197 197
 	 */
198
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
198
+	protected function getJsonClientI18n(array $i18nPaths, $lang)
199 199
 	{
200
-		$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang );
200
+		$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang);
201 201
 
202 202
 		$content = array(
203
-			'admin' => $i18n->getAll( 'admin' ),
204
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
203
+			'admin' => $i18n->getAll('admin'),
204
+			'admin/ext' => $i18n->getAll('admin/ext'),
205 205
 		);
206 206
 
207
-		return json_encode( $content, JSON_FORCE_OBJECT );
207
+		return json_encode($content, JSON_FORCE_OBJECT);
208 208
 	}
209 209
 
210 210
 
@@ -216,19 +216,19 @@  discard block
 block discarded – undo
216 216
 	 * @return string JSON encoded site item object
217 217
 	 * @throws Exception If no site item was found for the code
218 218
 	 */
219
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
219
+	protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
220 220
 	{
221
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
221
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
222 222
 
223 223
 		$criteria = $manager->createSearch();
224
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
225
-		$items = $manager->searchItems( $criteria );
224
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
225
+		$items = $manager->searchItems($criteria);
226 226
 
227
-		if( ( $item = reset( $items ) ) === false ) {
228
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
227
+		if (($item = reset($items)) === false) {
228
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
229 229
 		}
230 230
 
231
-		return json_encode( $item->toArray() );
231
+		return json_encode($item->toArray());
232 232
 	}
233 233
 
234 234
 
@@ -240,17 +240,17 @@  discard block
 block discarded – undo
240 240
 	 * @param string $locale ISO language code, e.g. "en" or "en_GB"
241 241
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
242 242
 	 */
243
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null )
243
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null)
244 244
 	{
245
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
245
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
246 246
 
247 247
 		try {
248
-			$localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false );
249
-		} catch( \Aimeos\MShop\Locale\Exception $e ) {
248
+			$localeItem = $localeManager->bootstrap($sitecode, $locale, '', false);
249
+		} catch (\Aimeos\MShop\Locale\Exception $e) {
250 250
 			$localeItem = $localeManager->createItem();
251 251
 		}
252 252
 
253
-		$context->setLocale( $localeItem );
253
+		$context->setLocale($localeItem);
254 254
 
255 255
 		return $context;
256 256
 	}
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/JqadmController.php 1 patch
Spacing   +56 added lines, -56 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', [['admin', 'editor']] );
37
+		if (config('shop.authorize', true)) {
38
+			$this->authorize('admin', [['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,12 +79,12 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function copyAction()
81 81
 	{
82
-		if( config( 'shop.authorize', true ) ) {
83
-			$this->authorize( 'admin', [['admin', 'editor']] );
82
+		if (config('shop.authorize', true)) {
83
+			$this->authorize('admin', [['admin', 'editor']]);
84 84
 		}
85 85
 
86 86
 		$cntl = $this->createClient();
87
-		return $this->getHtml( $cntl->copy() );
87
+		return $this->getHtml($cntl->copy());
88 88
 	}
89 89
 
90 90
 
@@ -95,12 +95,12 @@  discard block
 block discarded – undo
95 95
 	 */
96 96
 	public function createAction()
97 97
 	{
98
-		if( config( 'shop.authorize', true ) ) {
99
-			$this->authorize( 'admin', [['admin', 'editor']] );
98
+		if (config('shop.authorize', true)) {
99
+			$this->authorize('admin', [['admin', 'editor']]);
100 100
 		}
101 101
 
102 102
 		$cntl = $this->createClient();
103
-		return $this->getHtml( $cntl->create() );
103
+		return $this->getHtml($cntl->create());
104 104
 	}
105 105
 
106 106
 
@@ -111,12 +111,12 @@  discard block
 block discarded – undo
111 111
 	 */
112 112
 	public function deleteAction()
113 113
 	{
114
-		if( config( 'shop.authorize', true ) ) {
115
-			$this->authorize( 'admin', [['admin', 'editor']] );
114
+		if (config('shop.authorize', true)) {
115
+			$this->authorize('admin', [['admin', 'editor']]);
116 116
 		}
117 117
 
118 118
 		$cntl = $this->createClient();
119
-		return $this->getHtml( $cntl->delete() . $cntl->search() );
119
+		return $this->getHtml($cntl->delete().$cntl->search());
120 120
 	}
121 121
 
122 122
 
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	public function getAction()
129 129
 	{
130
-		if( config( 'shop.authorize', true ) ) {
131
-			$this->authorize( 'admin', [['admin', 'editor']] );
130
+		if (config('shop.authorize', true)) {
131
+			$this->authorize('admin', [['admin', 'editor']]);
132 132
 		}
133 133
 
134 134
 		$cntl = $this->createClient();
135
-		return $this->getHtml( $cntl->get() );
135
+		return $this->getHtml($cntl->get());
136 136
 	}
137 137
 
138 138
 
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
143 143
 	 */
144 144
 	public function saveAction()
145 145
 	{
146
-		if( config( 'shop.authorize', true ) ) {
147
-			$this->authorize( 'admin', [['admin', 'editor']] );
146
+		if (config('shop.authorize', true)) {
147
+			$this->authorize('admin', [['admin', 'editor']]);
148 148
 		}
149 149
 
150 150
 		$cntl = $this->createClient();
151
-		return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) );
151
+		return $this->getHtml(($cntl->save() ?: $cntl->search()));
152 152
 	}
153 153
 
154 154
 
@@ -159,12 +159,12 @@  discard block
 block discarded – undo
159 159
 	 */
160 160
 	public function searchAction()
161 161
 	{
162
-		if( config( 'shop.authorize', true ) ) {
163
-			$this->authorize( 'admin', [['admin', 'editor']] );
162
+		if (config('shop.authorize', true)) {
163
+			$this->authorize('admin', [['admin', 'editor']]);
164 164
 		}
165 165
 
166 166
 		$cntl = $this->createClient();
167
-		return $this->getHtml( $cntl->search() );
167
+		return $this->getHtml($cntl->search());
168 168
 	}
169 169
 
170 170
 
@@ -175,20 +175,20 @@  discard block
 block discarded – undo
175 175
 	 */
176 176
 	protected function createClient()
177 177
 	{
178
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
179
-		$lang = Input::get( 'lang', config( 'app.locale', 'en' ) );
180
-		$resource = Route::input( 'resource' );
178
+		$site = Route::input('site', Input::get('site', 'default'));
179
+		$lang = Input::get('lang', config('app.locale', 'en'));
180
+		$resource = Route::input('resource');
181 181
 
182
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
183
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
182
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
183
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
184 184
 
185
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
186
-		$context = $this->setLocale( $context, $site, $lang );
185
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
186
+		$context = $this->setLocale($context, $site, $lang);
187 187
 
188
-		$view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang );
189
-		$context->setView( $view );
188
+		$view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang);
189
+		$context->setView($view);
190 190
 
191
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
191
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
192 192
 	}
193 193
 
194 194
 
@@ -198,12 +198,12 @@  discard block
 block discarded – undo
198 198
 	 * @param string $content Content from admin client
199 199
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
200 200
 	 */
201
-	protected function getHtml( $content )
201
+	protected function getHtml($content)
202 202
 	{
203
-		$version = app( '\Aimeos\Shop\Base\Aimeos' )->getVersion();
204
-		$content = str_replace( ['{type}', '{version}'], ['Laravel', $version], $content );
203
+		$version = app('\Aimeos\Shop\Base\Aimeos')->getVersion();
204
+		$content = str_replace(['{type}', '{version}'], ['Laravel', $version], $content);
205 205
 
206
-		return View::make( 'shop::jqadm.index', array( 'content' => $content ) );
206
+		return View::make('shop::jqadm.index', array('content' => $content));
207 207
 	}
208 208
 
209 209
 
@@ -215,23 +215,23 @@  discard block
 block discarded – undo
215 215
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
216 216
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
217 217
 	 */
218
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $site, $lang )
218
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $site, $lang)
219 219
 	{
220
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
220
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
221 221
 
222 222
 		try
223 223
 		{
224
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
225
-			$localeItem->setLanguageId( null );
226
-			$localeItem->setCurrencyId( null );
224
+			$localeItem = $localeManager->bootstrap($site, '', '', false);
225
+			$localeItem->setLanguageId(null);
226
+			$localeItem->setCurrencyId(null);
227 227
 		}
228
-		catch( \Aimeos\MShop\Locale\Exception $e )
228
+		catch (\Aimeos\MShop\Locale\Exception $e)
229 229
 		{
230 230
 			$localeItem = $localeManager->createItem();
231 231
 		}
232 232
 
233
-		$context->setLocale( $localeItem );
234
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
233
+		$context->setLocale($localeItem);
234
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
235 235
 
236 236
 		return $context;
237 237
 	}
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Support.php 1 patch
Spacing   +12 added lines, -12 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,28 +42,28 @@  discard block
 block discarded – undo
42 42
 	 * @param string|array $groupcodes Unique user/customer group codes that are allowed
43 43
 	 * @return boolean True if user is part of the group, false if not
44 44
 	 */
45
-	public function checkGroup( $userid, $groupcodes )
45
+	public function checkGroup($userid, $groupcodes)
46 46
 	{
47 47
 		$context = $this->context->get();
48 48
 
49
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' );
49
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group');
50 50
 
51 51
 		$search = $manager->createSearch();
52
-		$search->setConditions( $search->compare( '==', 'customer.group.code', $groupcodes ) );
53
-		$groupIds = array_keys( $manager->searchItems( $search ) );
52
+		$search->setConditions($search->compare('==', 'customer.group.code', $groupcodes));
53
+		$groupIds = array_keys($manager->searchItems($search));
54 54
 
55 55
 
56
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
56
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
57 57
 
58 58
 		$search = $manager->createSearch();
59 59
 		$expr = array(
60
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
61
-			$search->compare( '==', 'customer.lists.refid', $groupIds ),
62
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
60
+			$search->compare('==', 'customer.lists.parentid', $userid),
61
+			$search->compare('==', 'customer.lists.refid', $groupIds),
62
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
63 63
 		);
64
-		$search->setConditions( $search->combine( '&&', $expr ) );
65
-		$search->setSlice( 0, 1 );
64
+		$search->setConditions($search->combine('&&', $expr));
65
+		$search->setSlice(0, 1);
66 66
 
67
-		return (bool) count( $manager->searchItems( $search ) );
67
+		return (bool) count($manager->searchItems($search));
68 68
 	}
69 69
 }
70 70
\ No newline at end of file
Please login to merge, or discard this patch.