Completed
Push — master ( aa9489...67c4a6 )
by Aimeos
02:16
created
src/Aimeos/Shop/Controller/JsonadmController.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -36,13 +36,13 @@  discard block
 block discarded – undo
36 36
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
37 37
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
38 38
 	 */
39
-	public function deleteAction( ServerRequestInterface $request )
39
+	public function deleteAction(ServerRequestInterface $request)
40 40
 	{
41
-		if( config( 'shop.authorize', true ) ) {
42
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
41
+		if (config('shop.authorize', true)) {
42
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
43 43
 		}
44 44
 
45
-		return $this->createAdmin()->delete( $request, new Response() );
45
+		return $this->createAdmin()->delete($request, new Response());
46 46
 	}
47 47
 
48 48
 
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
53 53
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
54 54
 	 */
55
-	public function getAction( ServerRequestInterface $request )
55
+	public function getAction(ServerRequestInterface $request)
56 56
 	{
57
-		if( config( 'shop.authorize', true ) ) {
58
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] );
57
+		if (config('shop.authorize', true)) {
58
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
59 59
 		}
60 60
 
61
-		return $this->createAdmin()->get( $request, new Response() );
61
+		return $this->createAdmin()->get($request, new Response());
62 62
 	}
63 63
 
64 64
 
@@ -68,13 +68,13 @@  discard block
 block discarded – undo
68 68
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
69 69
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
70 70
 	 */
71
-	public function patchAction( ServerRequestInterface $request )
71
+	public function patchAction(ServerRequestInterface $request)
72 72
 	{
73
-		if( config( 'shop.authorize', true ) ) {
74
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
73
+		if (config('shop.authorize', true)) {
74
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
75 75
 		}
76 76
 
77
-		return $this->createAdmin()->patch( $request, new Response() );
77
+		return $this->createAdmin()->patch($request, new Response());
78 78
 	}
79 79
 
80 80
 
@@ -84,13 +84,13 @@  discard block
 block discarded – undo
84 84
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
85 85
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
86 86
 	 */
87
-	public function postAction( ServerRequestInterface $request )
87
+	public function postAction(ServerRequestInterface $request)
88 88
 	{
89
-		if( config( 'shop.authorize', true ) ) {
90
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
89
+		if (config('shop.authorize', true)) {
90
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
91 91
 		}
92 92
 
93
-		return $this->createAdmin()->post( $request, new Response() );
93
+		return $this->createAdmin()->post($request, new Response());
94 94
 	}
95 95
 
96 96
 
@@ -100,13 +100,13 @@  discard block
 block discarded – undo
100 100
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
101 101
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
102 102
 	 */
103
-	public function putAction( ServerRequestInterface $request )
103
+	public function putAction(ServerRequestInterface $request)
104 104
 	{
105
-		if( config( 'shop.authorize', true ) ) {
106
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] );
105
+		if (config('shop.authorize', true)) {
106
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api']]);
107 107
 		}
108 108
 
109
-		return $this->createAdmin()->put( $request, new Response() );
109
+		return $this->createAdmin()->put($request, new Response());
110 110
 	}
111 111
 
112 112
 
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 	 * @param \Psr\Http\Message\ServerRequestInterface $request Request object
117 117
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
118 118
 	 */
119
-	public function optionsAction( ServerRequestInterface $request )
119
+	public function optionsAction(ServerRequestInterface $request)
120 120
 	{
121
-		if( config( 'shop.authorize', true ) ) {
122
-			$this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] );
121
+		if (config('shop.authorize', true)) {
122
+			$this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]);
123 123
 		}
124 124
 
125
-		return $this->createAdmin()->options( $request, new Response() );
125
+		return $this->createAdmin()->options($request, new Response());
126 126
 	}
127 127
 
128 128
 
@@ -133,18 +133,18 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	protected function createAdmin()
135 135
 	{
136
-		$site = Route::input( 'site', Input::get( 'site', 'default' ) );
137
-		$lang = Input::get( 'locale', config( 'app.locale', 'en' ) );
138
-		$resource = Route::input( 'resource' );
136
+		$site = Route::input('site', Input::get('site', 'default'));
137
+		$lang = Input::get('locale', config('app.locale', 'en'));
138
+		$resource = Route::input('resource');
139 139
 
140
-		$aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get();
141
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
140
+		$aimeos = app('\Aimeos\Shop\Base\Aimeos')->get();
141
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
142 142
 
143
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' );
144
-		$context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) );
145
-		$context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) );
146
-		$context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) );
143
+		$context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend');
144
+		$context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en')));
145
+		$context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site));
146
+		$context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang));
147 147
 
148
-		return \Aimeos\Admin\JsonAdm::create( $context, $aimeos, $resource );
148
+		return \Aimeos\Admin\JsonAdm::create($context, $aimeos, $resource);
149 149
 	}
150 150
 }
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::create( $context, $resource . '/' . $related );
118
+		return \Aimeos\Client\JsonApi::create($context, $resource.'/'.$related);
119 119
 	}
120 120
 }
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::create( $context, 'account/download' );
51
-		$client->setView( $view );
50
+		$client = \Aimeos\Client\Html::create($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/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->createAdmin();
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->createAdmin();
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->createAdmin();
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->createAdmin();
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->createAdmin();
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->createAdmin();
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->createAdmin();
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 createAdmin()
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::create( $context, $aimeos, $resource );
248
+		return \Aimeos\Admin\JQAdm::create($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.
src/Aimeos/Shop/Controller/AdminController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -36,26 +36,26 @@
 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( Auth::check() === false
42
-			|| $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) === false
41
+		if (Auth::check() === false
42
+			|| $request->user()->can('admin', [AdminController::class, ['admin', 'editor']]) === false
43 43
 		) {
44
-			return redirect()->guest( 'login' );
44
+			return redirect()->guest('login');
45 45
 		}
46 46
 
47 47
 		$siteId = $request->user()->siteid;
48
-		$context = app( '\Aimeos\Shop\Base\Context' )->get( false );
49
-		$siteManager = \Aimeos\MShop::create( $context, 'locale/site' );
50
-		$siteCode = ( $siteId ? $siteManager->getItem( $siteId )->getCode() : 'default' );
51
-		$locale = $request->user()->langid ?: config( 'app.locale', 'en' );
48
+		$context = app('\Aimeos\Shop\Base\Context')->get(false);
49
+		$siteManager = \Aimeos\MShop::create($context, 'locale/site');
50
+		$siteCode = ($siteId ? $siteManager->getItem($siteId)->getCode() : 'default');
51
+		$locale = $request->user()->langid ?: config('app.locale', 'en');
52 52
 
53 53
 		$param = array(
54 54
 			'resource' => 'dashboard',
55
-			'site' => Route::input( 'site', Input::get( 'site', $siteCode ) ),
56
-			'lang' => Route::input( 'lang', Input::get( 'lang', $locale ) )
55
+			'site' => Route::input('site', Input::get('site', $siteCode)),
56
+			'lang' => Route::input('lang', Input::get('lang', $locale))
57 57
 		);
58 58
 
59
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
59
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
60 60
 	}
61 61
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Context.php 1 patch
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
56 56
 	 * @param \Aimeos\Shop\Base\I18n $i18n Internationalisation object
57 57
 	 */
58
-	public function __construct( \Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n )
58
+	public function __construct(\Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n)
59 59
 	{
60 60
 		$this->session = $session;
61 61
 		$this->config = $config;
@@ -71,36 +71,36 @@  discard block
 block discarded – undo
71 71
 	 * @param string $type Configuration type, i.e. "frontend" or "backend" (deprecated, use \Aimeos\Shop\Base\Config)
72 72
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
73 73
 	 */
74
-	public function get( $locale = true, $type = 'frontend' )
74
+	public function get($locale = true, $type = 'frontend')
75 75
 	{
76
-		$config = $this->config->get( $type );
76
+		$config = $this->config->get($type);
77 77
 
78
-		if( $this->context === null )
78
+		if ($this->context === null)
79 79
 		{
80 80
 			$context = new \Aimeos\MShop\Context\Item\Standard();
81
-			$context->setConfig( $config );
82
-
83
-			$this->addDataBaseManager( $context );
84
-			$this->addFilesystemManager( $context );
85
-			$this->addMessageQueueManager( $context );
86
-			$this->addLogger( $context );
87
-			$this->addCache( $context );
88
-			$this->addMailer( $context);
89
-			$this->addProcess( $context );
90
-			$this->addSession( $context );
91
-			$this->addUser( $context);
92
-			$this->addGroups( $context);
81
+			$context->setConfig($config);
82
+
83
+			$this->addDataBaseManager($context);
84
+			$this->addFilesystemManager($context);
85
+			$this->addMessageQueueManager($context);
86
+			$this->addLogger($context);
87
+			$this->addCache($context);
88
+			$this->addMailer($context);
89
+			$this->addProcess($context);
90
+			$this->addSession($context);
91
+			$this->addUser($context);
92
+			$this->addGroups($context);
93 93
 
94 94
 			$this->context = $context;
95 95
 		}
96 96
 
97
-		$this->context->setConfig( $config );
97
+		$this->context->setConfig($config);
98 98
 
99
-		if( $locale === true )
99
+		if ($locale === true)
100 100
 		{
101
-			$localeItem = $this->locale->get( $this->context );
102
-			$this->context->setLocale( $localeItem );
103
-			$this->context->setI18n( $this->i18n->get( array( $localeItem->getLanguageId() ) ) );
101
+			$localeItem = $this->locale->get($this->context);
102
+			$this->context->setLocale($localeItem);
103
+			$this->context->setI18n($this->i18n->get(array($localeItem->getLanguageId())));
104 104
 		}
105 105
 
106 106
 		return $this->context;
@@ -113,11 +113,11 @@  discard block
 block discarded – undo
113 113
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config
114 114
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
115 115
 	 */
116
-	protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )
116
+	protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)
117 117
 	{
118
-		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
118
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
119 119
 
120
-		return $context->setCache( $cache );
120
+		return $context->setCache($cache);
121 121
 	}
122 122
 
123 123
 
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
128 128
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
129 129
 	 */
130
-	protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )
130
+	protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)
131 131
 	{
132
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );
132
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
133 133
 
134
-		return $context->setDatabaseManager( $dbm );
134
+		return $context->setDatabaseManager($dbm);
135 135
 	}
136 136
 
137 137
 
@@ -141,14 +141,14 @@  discard block
 block discarded – undo
141 141
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
142 142
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
143 143
 	 */
144
-	protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )
144
+	protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)
145 145
 	{
146 146
 		$config = $context->getConfig();
147
-		$path = storage_path( 'aimeos' );
147
+		$path = storage_path('aimeos');
148 148
 
149
-		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, $path );
149
+		$fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path);
150 150
 
151
-		return $context->setFilesystemManager( $fs );
151
+		return $context->setFilesystemManager($fs);
152 152
 	}
153 153
 
154 154
 
@@ -158,11 +158,11 @@  discard block
 block discarded – undo
158 158
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
159 159
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
160 160
 	 */
161
-	protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )
161
+	protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)
162 162
 	{
163
-		$logger = \Aimeos\MAdmin::create( $context, 'log' );
163
+		$logger = \Aimeos\MAdmin::create($context, 'log');
164 164
 
165
-		return $context->setLogger( $logger );
165
+		return $context->setLogger($logger);
166 166
 	}
167 167
 
168 168
 
@@ -173,11 +173,11 @@  discard block
 block discarded – undo
173 173
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
174 174
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
175 175
 	 */
176
-	protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )
176
+	protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)
177 177
 	{
178
-		$mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } );
178
+		$mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } );
179 179
 
180
-		return $context->setMail( $mail );
180
+		return $context->setMail($mail);
181 181
 	}
182 182
 
183 183
 
@@ -187,11 +187,11 @@  discard block
 block discarded – undo
187 187
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
188 188
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
189 189
 	 */
190
-	protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )
190
+	protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)
191 191
 	{
192
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );
192
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
193 193
 
194
-		return $context->setMessageQueueManager( $mq );
194
+		return $context->setMessageQueueManager($mq);
195 195
 	}
196 196
 
197 197
 
@@ -201,16 +201,16 @@  discard block
 block discarded – undo
201 201
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
202 202
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
203 203
 	 */
204
-	protected function addProcess( \Aimeos\MShop\Context\Item\Iface $context )
204
+	protected function addProcess(\Aimeos\MShop\Context\Item\Iface $context)
205 205
 	{
206 206
 		$config = $context->getConfig();
207
-		$max = $config->get( 'pcntl_max', 4 );
208
-		$prio = $config->get( 'pcntl_priority', 19 );
207
+		$max = $config->get('pcntl_max', 4);
208
+		$prio = $config->get('pcntl_priority', 19);
209 209
 
210
-		$process = new \Aimeos\MW\Process\Pcntl( $max, $prio );
211
-		$process = new \Aimeos\MW\Process\Decorator\Check( $process );
210
+		$process = new \Aimeos\MW\Process\Pcntl($max, $prio);
211
+		$process = new \Aimeos\MW\Process\Decorator\Check($process);
212 212
 
213
-		return $context->setProcess( $process );
213
+		return $context->setProcess($process);
214 214
 	}
215 215
 
216 216
 
@@ -220,11 +220,11 @@  discard block
 block discarded – undo
220 220
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
221 221
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
222 222
 	 */
223
-	protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )
223
+	protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)
224 224
 	{
225
-		$session = new \Aimeos\MW\Session\Laravel5( $this->session );
225
+		$session = new \Aimeos\MW\Session\Laravel5($this->session);
226 226
 
227
-		return $context->setSession( $session );
227
+		return $context->setSession($session);
228 228
 	}
229 229
 
230 230
 
@@ -234,16 +234,16 @@  discard block
 block discarded – undo
234 234
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
235 235
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
236 236
 	 */
237
-	protected function addUser( \Aimeos\MShop\Context\Item\Iface $context )
237
+	protected function addUser(\Aimeos\MShop\Context\Item\Iface $context)
238 238
 	{
239
-		if( ( $userid = Auth::id() ) !== null ) {
240
-			$context->setUserId( $userid );
239
+		if (($userid = Auth::id()) !== null) {
240
+			$context->setUserId($userid);
241 241
 		}
242 242
 
243
-		if( ( $user = Auth::user() ) !== null ) {
244
-			$context->setEditor( $user->name );
243
+		if (($user = Auth::user()) !== null) {
244
+			$context->setEditor($user->name);
245 245
 		} else {
246
-			$context->setEditor( \Request::ip() );
246
+			$context->setEditor(\Request::ip());
247 247
 		}
248 248
 
249 249
 		return $context;
@@ -256,14 +256,14 @@  discard block
 block discarded – undo
256 256
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
257 257
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
258 258
 	 */
259
-	protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context )
259
+	protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context)
260 260
 	{
261
-		if( ( $userid = Auth::id() ) !== null )
261
+		if (($userid = Auth::id()) !== null)
262 262
 		{
263
-			$context->setGroupIds( function() use ( $context, $userid )
263
+			$context->setGroupIds(function() use ($context, $userid)
264 264
 			{
265
-				$manager = \Aimeos\MShop::create( $context, 'customer' );
266
-				return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
265
+				$manager = \Aimeos\MShop::create($context, 'customer');
266
+				return $manager->getItem($userid, array('customer/group'))->getGroups();
267 267
 			} );
268 268
 		}
269 269
 
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Support.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * @param \Aimeos\Shop\Base\Context $context Context provider
45 45
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale provider
46 46
 	 */
47
-	public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale )
47
+	public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale)
48 48
 	{
49 49
 		$this->context = $context;
50 50
 		$this->locale = $locale;
@@ -58,29 +58,29 @@  discard block
 block discarded – undo
58 58
 	 * @param string|array $groupcodes Unique user/customer group codes that are allowed
59 59
 	 * @return boolean True if user is part of the group, false if not
60 60
 	 */
61
-	public function checkUserGroup( \Illuminate\Foundation\Auth\User $user, $groupcodes )
61
+	public function checkUserGroup(\Illuminate\Foundation\Auth\User $user, $groupcodes)
62 62
 	{
63
-		$groups = ( is_array( $groupcodes ) ? implode( ',', $groupcodes ) : $groupcodes );
63
+		$groups = (is_array($groupcodes) ? implode(',', $groupcodes) : $groupcodes);
64 64
 
65
-		if( isset( $this->cache[$user->id][$groups] ) ) {
65
+		if (isset($this->cache[$user->id][$groups])) {
66 66