Passed
Push — master ( 305978...d3671c )
by Aimeos
16:54
created
Classes/Controller/JqadmController.php 1 patch
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
      */
26 26
     protected function initializeAction()
27 27
     {
28
-        $this->uriBuilder->setArgumentPrefix('tx_aimeos_web_aimeos');
28
+        $this->uriBuilder->setArgumentPrefix( 'tx_aimeos_web_aimeos' );
29 29
     }
30 30
 
31 31
 
@@ -38,31 +38,31 @@  discard block
 block discarded – undo
38 38
     {
39 39
         $contents = '';
40 40
         $files = [];
41
-        $type = $this->request->getArgument('type');
41
+        $type = $this->request->getArgument( 'type' );
42 42
 
43
-        foreach (Base::aimeos()->getCustomPaths('admin/jqadm') as $base => $paths) {
44
-            foreach($paths as $path) {
43
+        foreach( Base::aimeos()->getCustomPaths( 'admin/jqadm' ) as $base => $paths ) {
44
+            foreach( $paths as $path ) {
45 45
                 $jsbAbsPath = $base . '/' . $path;
46
-                $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
47
-                $files = array_merge($files, $jsb2->getFiles($type));
46
+                $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
47
+                $files = array_merge( $files, $jsb2->getFiles( $type ) );
48 48
             }
49 49
         }
50 50
 
51
-        foreach ($files as $file) {
52
-            if (($content = file_get_contents($file)) === false) {
53
-                throw new \RuntimeException(sprintf('File "%1$s" not found', $jsbAbsPath));
51
+        foreach( $files as $file ) {
52
+            if( ( $content = file_get_contents( $file ) ) === false ) {
53
+                throw new \RuntimeException( sprintf( 'File "%1$s" not found', $jsbAbsPath ) );
54 54
             }
55 55
 
56 56
             $contents .= $content;
57 57
         }
58 58
 
59 59
         $response = $this->responseFactory->createResponse()
60
-            ->withBody($this->streamFactory->createStream($contents));
60
+            ->withBody( $this->streamFactory->createStream( $contents ) );
61 61
 
62
-        if ($type === 'js') {
63
-            $response = $response->withAddedHeader('Content-Type', 'application/javascript');
64
-        } elseif ($type === 'css') {
65
-            $response = $response->withAddedHeader('Content-Type', 'text/css');
62
+        if( $type === 'js' ) {
63
+            $response = $response->withAddedHeader( 'Content-Type', 'application/javascript' );
64
+        } elseif( $type === 'css' ) {
65
+            $response = $response->withAddedHeader( 'Content-Type', 'text/css' );
66 66
         }
67 67
 
68 68
         return $response;
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
     {
79 79
         $cntl = $this->createAdmin();
80 80
 
81
-        if (($html = $cntl->batch()) == '') {
81
+        if( ( $html = $cntl->batch() ) == '' ) {
82 82
             return $cntl->response();
83 83
         }
84 84
 
85
-        $this->view->assign('content', $html);
85
+        $this->view->assign( 'content', $html );
86 86
         return $this->render();
87 87
     }
88 88
 
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
     {
97 97
         $cntl = $this->createAdmin();
98 98
 
99
-        if (($html = $cntl->copy()) == '') {
99
+        if( ( $html = $cntl->copy() ) == '' ) {
100 100
             return $cntl->response();
101 101
         }
102 102
 
103
-        $this->view->assign('content', $html);
103
+        $this->view->assign( 'content', $html );
104 104
         return $this->render();
105 105
     }
106 106
 
@@ -114,11 +114,11 @@  discard block
 block discarded – undo
114 114
     {
115 115
         $cntl = $this->createAdmin();
116 116
 
117
-        if (($html = $cntl->create()) == '') {
117
+        if( ( $html = $cntl->create() ) == '' ) {
118 118
             return $cntl->response();
119 119
         }
120 120
 
121
-        $this->view->assign('content', $html);
121
+        $this->view->assign( 'content', $html );
122 122
         return $this->render();
123 123
     }
124 124
 
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
     {
133 133
         $cntl = $this->createAdmin();
134 134
 
135
-        if (($html = $cntl->delete()) == '') {
135
+        if( ( $html = $cntl->delete() ) == '' ) {
136 136
             return $cntl->response();
137 137
         }
138 138
 
139
-        $this->view->assign('content', $html);
139
+        $this->view->assign( 'content', $html );
140 140
         return $this->render();
141 141
     }
142 142
 
@@ -150,11 +150,11 @@  discard block
 block discarded – undo
150 150
     {
151 151
         $cntl = $this->createAdmin();
152 152
 
153
-        if (($html = $cntl->export()) == '') {
153
+        if( ( $html = $cntl->export() ) == '' ) {
154 154
             return $cntl->response();
155 155
         }
156 156
 
157
-        $this->view->assign('content', $html);
157
+        $this->view->assign( 'content', $html );
158 158
         return $this->render();
159 159
     }
160 160
 
@@ -168,11 +168,11 @@  discard block
 block discarded – undo
168 168
     {
169 169
         $cntl = $this->createAdmin();
170 170
 
171
-        if (($html = $cntl->get()) == '') {
171
+        if( ( $html = $cntl->get() ) == '' ) {
172 172
             return $cntl->response();
173 173
         }
174 174
 
175
-        $this->view->assign('content', $html);
175
+        $this->view->assign( 'content', $html );
176 176
         return $this->render();
177 177
     }
178 178
 
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
     {
187 187
         $cntl = $this->createAdmin();
188 188
 
189
-        if (($html = $cntl->import()) == '') {
189
+        if( ( $html = $cntl->import() ) == '' ) {
190 190
             return $cntl->response();
191 191
         }
192 192
 
193
-        $this->view->assign('content', $html);
193
+        $this->view->assign( 'content', $html );
194 194
         return $this->render();
195 195
     }
196 196
 
@@ -204,11 +204,11 @@  discard block
 block discarded – undo
204 204
     {
205 205
         $cntl = $this->createAdmin();
206 206
 
207
-        if (($html = $cntl->save()) == '') {
207
+        if( ( $html = $cntl->save() ) == '' ) {
208 208
             return $cntl->response();
209 209
         }
210 210
 
211
-        $this->view->assign('content', $html);
211
+        $this->view->assign( 'content', $html );
212 212
         return $this->render();
213 213
     }
214 214
 
@@ -222,11 +222,11 @@  discard block
 block discarded – undo
222 222
     {
223 223
         $cntl = $this->createAdmin();
224 224
 
225
-        if (($html = $cntl->search()) == '') {
225
+        if( ( $html = $cntl->search() ) == '' ) {
226 226
             return $cntl->response();
227 227
         }
228 228
 
229
-        $this->view->assign('content', $html);
229
+        $this->view->assign( 'content', $html );
230 230
         return $this->render();
231 231
     }
232 232
 
@@ -238,20 +238,20 @@  discard block
 block discarded – undo
238 238
      */
239 239
     protected function createAdmin() : \Aimeos\Admin\JQAdm\Iface
240 240
     {
241
-        $resource = $this->request->hasArgument('resource') ? $this->request->getArgument('resource') : 'dashboard';
241
+        $resource = $this->request->hasArgument( 'resource' ) ? $this->request->getArgument( 'resource' ) : 'dashboard';
242 242
 
243 243
         $aimeos = Base::aimeos();
244
-        $context = $this->contextBackend('admin/jqadm/templates');
244
+        $context = $this->contextBackend( 'admin/jqadm/templates' );
245 245
 
246 246
         $view = $context->view();
247 247
 
248 248
         $view->aimeosType = 'TYPO3';
249 249
         $view->aimeosVersion = Base::getVersion();
250
-        $view->aimeosExtensions = implode(',', $aimeos->getExtensions());
250
+        $view->aimeosExtensions = implode( ',', $aimeos->getExtensions() );
251 251
 
252
-        $context->setView($view);
252
+        $context->setView( $view );
253 253
 
254
-        return \Aimeos\Admin\JQAdm::create($context, $aimeos, $resource);
254
+        return \Aimeos\Admin\JQAdm::create( $context, $aimeos, $resource );
255 255
     }
256 256
 
257 257
 
@@ -260,10 +260,10 @@  discard block
 block discarded – undo
260 260
      */
261 261
     protected function render()
262 262
     {
263
-        if (isset($this->responseFactory)) { // TYPO3 11
263
+        if( isset( $this->responseFactory ) ) { // TYPO3 11
264 264
             return $this->responseFactory->createResponse()
265
-                ->withAddedHeader('Content-Type', 'text/html; charset=utf-8')
266
-                ->withBody($this->streamFactory->createStream($this->view->render()));
265
+                ->withAddedHeader( 'Content-Type', 'text/html; charset=utf-8' )
266
+                ->withBody( $this->streamFactory->createStream( $this->view->render() ) );
267 267
         }
268 268
     }
269 269
 
@@ -275,9 +275,9 @@  discard block
 block discarded – undo
275 275
      */
276 276
     protected function resolveView() : \TYPO3Fluid\Fluid\View\ViewInterface
277 277
     {
278
-        if ($this->request->hasArgument('locale') && ($value = $this->request->getArgument('locale')) != '') {
278
+        if( $this->request->hasArgument( 'locale' ) && ( $value = $this->request->getArgument( 'locale' ) ) != '' ) {
279 279
             $lang = $value;
280
-        } elseif (isset($GLOBALS['BE_USER']->uc['lang']) && $GLOBALS['BE_USER']->uc['lang'] != '') {
280
+        } elseif( isset( $GLOBALS['BE_USER']->uc['lang'] ) && $GLOBALS['BE_USER']->uc['lang'] != '' ) {
281 281
             $lang = $GLOBALS['BE_USER']->uc['lang'];
282 282
         } else {
283 283
             $lang = 'en';
@@ -285,9 +285,9 @@  discard block
 block discarded – undo
285 285
 
286 286
         $view = \TYPO3\CMS\Extbase\Mvc\Controller\ActionController::resolveView();
287 287
 
288
-        $view->assign('theme', ($_COOKIE['aimeos_backend_theme'] ?? null) == 'dark' ? 'dark' : 'light');
289
-        $view->assign('localeDir', in_array($lang, ['ar', 'az', 'dv', 'fa', 'he', 'ku', 'ur']) ? 'rtl' : 'ltr');
290
-        $view->assign('locale', $lang);
288
+        $view->assign( 'theme', ( $_COOKIE['aimeos_backend_theme'] ?? null ) == 'dark' ? 'dark' : 'light' );
289
+        $view->assign( 'localeDir', in_array( $lang, ['ar', 'az', 'dv', 'fa', 'he', 'ku', 'ur'] ) ? 'rtl' : 'ltr' );
290
+        $view->assign( 'locale', $lang );
291 291
 
292 292
         return $view;
293 293
     }
Please login to merge, or discard this patch.
Classes/Controller/AbstractController.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -35,15 +35,15 @@  discard block
 block discarded – undo
35 35
      * @return bool True if the user is allowed to access the site
36 36
      * @throws \TYPO3\CMS\Core\Resource\Exception\InsufficientUserPermissionsException If user doesn't have access
37 37
      */
38
-    protected function checkSite(array $sitePath, $userSiteId) : bool
38
+    protected function checkSite( array $sitePath, $userSiteId ) : bool
39 39
     {
40
-        foreach (array_reverse($sitePath) as $siteid) {
41
-            if ((string) $userSiteId === (string) $siteid) {
40
+        foreach( array_reverse( $sitePath ) as $siteid ) {
41
+            if( (string) $userSiteId === (string) $siteid ) {
42 42
                 return true;
43 43
             }
44 44
         }
45 45
 
46
-        throw new \TYPO3\CMS\Core\Resource\Exception\InsufficientUserPermissionsException('Access not allowed');
46
+        throw new \TYPO3\CMS\Core\Resource\Exception\InsufficientUserPermissionsException( 'Access not allowed' );
47 47
     }
48 48
 
49 49
 
@@ -54,33 +54,33 @@  discard block
 block discarded – undo
54 54
      * @param bool $withView True to add view to context object, false for no view
55 55
      * @return \Aimeos\MShop\ContextIface Context item
56 56
      */
57
-    protected function context(string $templatePath = 'client/html/templates',
58
-        bool $withView = true) : \Aimeos\MShop\ContextIface
57
+    protected function context( string $templatePath = 'client/html/templates',
58
+        bool $withView = true ) : \Aimeos\MShop\ContextIface
59 59
     {
60
-        $config = Base::config((array) $this->settings);
60
+        $config = Base::config( (array) $this->settings );
61 61
 
62
-        if (!isset(self::$context)) {
63
-            $context = Base::context($config);
64
-            $locale = Base::locale($context, $this->request);
65
-            $context->setI18n(Base::i18n([$locale->getLanguageId()], $config->get('i18n', [])));
66
-            $context->setLocale($locale);
62
+        if( !isset( self::$context ) ) {
63
+            $context = Base::context( $config );
64
+            $locale = Base::locale( $context, $this->request );
65
+            $context->setI18n( Base::i18n( [$locale->getLanguageId()], $config->get( 'i18n', [] ) ) );
66
+            $context->setLocale( $locale );
67 67
 
68 68
             self::$context = $context;
69 69
         }
70 70
 
71 71
         // Use plugin specific configuration
72
-        self::$context->setConfig($config);
72
+        self::$context->setConfig( $config );
73 73
 
74
-        foreach (self::$context->locale()->getSiteItem()->getConfig() as $key => $value) {
75
-            $config->set($key, $value);
74
+        foreach( self::$context->locale()->getSiteItem()->getConfig() as $key => $value ) {
75
+            $config->set( $key, $value );
76 76
         }
77 77
 
78
-        if ($withView === true) {
78
+        if( $withView === true ) {
79 79
             $langid = self::$context->locale()->getLanguageId();
80
-            $paths = Base::aimeos()->getTemplatePaths($templatePath);
81
-            $view = Base::view(self::$context, $this->uriBuilder, $paths, $this->request, $langid);
80
+            $paths = Base::aimeos()->getTemplatePaths( $templatePath );
81
+            $view = Base::view( self::$context, $this->uriBuilder, $paths, $this->request, $langid );
82 82
 
83
-            self::$context->setView($view);
83
+            self::$context->setView( $view );
84 84
         }
85 85
 
86 86
         return self::$context;
@@ -94,48 +94,48 @@  discard block
 block discarded – undo
94 94
      * @param bool $withView True to add view to context object, false for no view
95 95
      * @return \Aimeos\MShop\ContextIface Context item
96 96
      */
97
-    protected function contextBackend(string $templatePath = 'admin/jqadm/templates',
98
-        bool $withView = true) : \Aimeos\MShop\ContextIface
97
+    protected function contextBackend( string $templatePath = 'admin/jqadm/templates',
98
+        bool $withView = true ) : \Aimeos\MShop\ContextIface
99 99
     {
100
-        if (!isset($this->contextBE)) {
100
+        if( !isset( $this->contextBE ) ) {
101 101
             $lang = 'en';
102 102
             $site = 'default';
103 103
 
104
-            $config = Base::config((array) $this->settings);
105
-            $context = Base::context($config);
104
+            $config = Base::config( (array) $this->settings );
105
+            $context = Base::context( $config );
106 106
 
107
-            if ($this->request->hasArgument('locale') && ($value = $this->request->getArgument('locale')) != '') {
107
+            if( $this->request->hasArgument( 'locale' ) && ( $value = $this->request->getArgument( 'locale' ) ) != '' ) {
108 108
                 $lang = $value;
109
-            } elseif (!in_array($GLOBALS['BE_USER']->uc['lang'] ?? '', ['', 'default'])) {
109
+            } elseif( !in_array( $GLOBALS['BE_USER']->uc['lang'] ?? '', ['', 'default'] ) ) {
110 110
                 $lang = $GLOBALS['BE_USER']->uc['lang'];
111 111
             }
112 112
 
113
-            if ($this->request->hasArgument('site') && ($value = $this->request->getArgument('site')) != '') {
113
+            if( $this->request->hasArgument( 'site' ) && ( $value = $this->request->getArgument( 'site' ) ) != '' ) {
114 114
                 $site = $value;
115
-            } elseif (isset($GLOBALS['BE_USER']->user['siteid']) && $GLOBALS['BE_USER']->user['siteid'] != '') {
116
-                $siteManager = \Aimeos\MShop::create($context, 'locale/site');
117
-                $siteId = current(array_reverse(explode('.', trim($GLOBALS['BE_USER']->user['siteid'], '.'))));
118
-                $site = ($siteId ? $siteManager->get($siteId)->getCode() : 'default');
115
+            } elseif( isset( $GLOBALS['BE_USER']->user['siteid'] ) && $GLOBALS['BE_USER']->user['siteid'] != '' ) {
116
+                $siteManager = \Aimeos\MShop::create( $context, 'locale/site' );
117
+                $siteId = current( array_reverse( explode( '.', trim( $GLOBALS['BE_USER']->user['siteid'], '.' ) ) ) );
118
+                $site = ( $siteId ? $siteManager->get( $siteId )->getCode() : 'default' );
119 119
             }
120 120
 
121
-            $locale = Base::getLocaleBackend($context, $site);
122
-            $context->setLocale($locale);
121
+            $locale = Base::getLocaleBackend( $context, $site );
122
+            $context->setLocale( $locale );
123 123
 
124
-            if (isset($GLOBALS['BE_USER']->user['siteid']) && $GLOBALS['BE_USER']->user['siteid'] != '') {
125
-                $this->checkSite($locale->getSitePath(), $GLOBALS['BE_USER']->user['siteid']);
124
+            if( isset( $GLOBALS['BE_USER']->user['siteid'] ) && $GLOBALS['BE_USER']->user['siteid'] != '' ) {
125
+                $this->checkSite( $locale->getSitePath(), $GLOBALS['BE_USER']->user['siteid'] );
126 126
             }
127 127
 
128
-            $i18n = Base::i18n([$lang, 'en'], $config->get('i18n', []));
129
-            $context->setI18n($i18n);
128
+            $i18n = Base::i18n( [$lang, 'en'], $config->get( 'i18n', [] ) );
129
+            $context->setI18n( $i18n );
130 130
 
131
-            foreach ($locale->getSiteItem()->getConfig() as $key => $value) {
132
-                $config->set($key, $value);
131
+            foreach( $locale->getSiteItem()->getConfig() as $key => $value ) {
132
+                $config->set( $key, $value );
133 133
             }
134 134
 
135
-            if ($withView) {
136
-                $paths = Base::aimeos()->getTemplatePaths($templatePath);
137
-                $view = Base::view($context, $this->uriBuilder, $paths, $this->request, $lang);
138
-                $context->setView($view);
135
+            if( $withView ) {
136
+                $paths = Base::aimeos()->getTemplatePaths( $templatePath );
137
+                $view = Base::view( $context, $this->uriBuilder, $paths, $this->request, $lang );
138
+                $context->setView( $view );
139 139
             }
140 140
 
141 141
             $this->contextBE = $context;
@@ -151,31 +151,31 @@  discard block
 block discarded – undo
151 151
      * @param \Aimeos\Client\Html\Iface $client Html client object (no type hint to prevent reflection)
152 152
      * @return string HTML code for inserting into the HTML body
153 153
      */
154
-    protected function getClientOutput(\Aimeos\Client\Html\Iface $client)
154
+    protected function getClientOutput( \Aimeos\Client\Html\Iface $client )
155 155
     {
156 156
         $uid = $this->ceUid;
157
-        if ($GLOBALS['TYPO3_REQUEST'] instanceof \Psr\Http\Message\ServerRequestInterface
158
-            && empty($GLOBALS['TYPO3_REQUEST']->getAttribute('routing')) === false
157
+        if( $GLOBALS['TYPO3_REQUEST'] instanceof \Psr\Http\Message\ServerRequestInterface
158
+            && empty( $GLOBALS['TYPO3_REQUEST']->getAttribute( 'routing' ) ) === false
159 159
         ) {
160
-            $uid .= '-' . $GLOBALS['TYPO3_REQUEST']->getAttribute('routing')->getPageType();
160
+            $uid .= '-' . $GLOBALS['TYPO3_REQUEST']->getAttribute( 'routing' )->getPageType();
161 161
         }
162 162
 
163
-        $client->setView($this->context()->view())->init();
164
-        $header = (string) $client->header($uid);
165
-        $html = (string) $client->body($uid);
163
+        $client->setView( $this->context()->view() )->init();
164
+        $header = (string) $client->header( $uid );
165
+        $html = (string) $client->body( $uid );
166 166
 
167
-        if (!isset($this->responseFactory)) // TYPO3 10
167
+        if( !isset( $this->responseFactory ) ) // TYPO3 10
168 168
         {
169
-            $this->response->addAdditionalHeaderData($header);
169
+            $this->response->addAdditionalHeaderData( $header );
170 170
             return $html;
171 171
         }
172 172
 
173
-        $renderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
174
-        $renderer->addHeaderData($header);
173
+        $renderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( \TYPO3\CMS\Core\Page\PageRenderer::class );
174
+        $renderer->addHeaderData( $header );
175 175
 
176 176
         return $this->responseFactory->createResponse()
177
-            ->withAddedHeader('Content-Type', 'text/html; charset=utf-8')
178
-            ->withBody($this->streamFactory->createStream($html));
177
+            ->withAddedHeader( 'Content-Type', 'text/html; charset=utf-8' )
178
+            ->withBody( $this->streamFactory->createStream( $html ) );
179 179
     }
180 180
 
181 181
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
      */
185 185
     protected function initializeAction()
186 186
     {
187
-        $this->uriBuilder->setArgumentPrefix('ai');
187
+        $this->uriBuilder->setArgumentPrefix( 'ai' );
188 188
 
189 189
         $ce = $this->configurationManager->getContentObject();
190 190
         $this->ceUid = $ce->data['uid'] ?? null;
Please login to merge, or discard this patch.
Classes/Controller/JsonadmController.php 2 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
      */
27 27
     protected function initializeAction()
28 28
     {
29
-        $this->uriBuilder->setArgumentPrefix('tx_aimeos_web_aimeos');
29
+        $this->uriBuilder->setArgumentPrefix( 'tx_aimeos_web_aimeos' );
30 30
     }
31 31
 
32 32
 
@@ -37,15 +37,15 @@  discard block
 block discarded – undo
37 37
      */
38 38
     public function indexAction()
39 39
     {
40
-        $resource = $this->request->hasArgument('resource') ? $this->request->getArgument('resource') : '';
41
-
42
-        switch ($this->request->getMethod()) {
43
-            case 'DELETE': return $this->deleteAction($resource);
44
-            case 'PATCH': return $this->patchAction($resource);
45
-            case 'POST': return $this->postAction($resource);
46
-            case 'PUT': return $this->putAction($resource);
47
-            case 'GET': return $this->getAction($resource);
48
-            default: return $this->optionsAction($resource);
40
+        $resource = $this->request->hasArgument( 'resource' ) ? $this->request->getArgument( 'resource' ) : '';
41
+
42
+        switch( $this->request->getMethod() ) {
43
+            case 'DELETE': return $this->deleteAction( $resource );
44
+            case 'PATCH': return $this->patchAction( $resource );
45
+            case 'POST': return $this->postAction( $resource );
46
+            case 'PUT': return $this->putAction( $resource );
47
+            case 'GET': return $this->getAction( $resource );
48
+            default: return $this->optionsAction( $resource );
49 49
         }
50 50
     }
51 51
 
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
      * @param string Resource location, e.g. "product/property/type"
57 57
      * @return string Generated output
58 58
      */
59
-    public function deleteAction(string $resource)
59
+    public function deleteAction( string $resource )
60 60
     {
61
-        return $this->createAdmin($resource)->delete($this->getPsrRequest(), (new Psr17Factory)->createResponse());
61
+        return $this->createAdmin( $resource )->delete( $this->getPsrRequest(), ( new Psr17Factory )->createResponse() );
62 62
     }
63 63
 
64 64
 
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
      * @param string Resource location, e.g. "product/property/type"
69 69
      * @return string Generated output
70 70
      */
71
-    public function getAction(string $resource)
71
+    public function getAction( string $resource )
72 72
     {
73
-        return $this->createAdmin($resource)->get($this->getPsrRequest(), (new Psr17Factory)->createResponse());
73
+        return $this->createAdmin( $resource )->get( $this->getPsrRequest(), ( new Psr17Factory )->createResponse() );
74 74
     }
75 75
 
76 76
 
@@ -80,9 +80,9 @@  discard block
 block discarded – undo
80 80
      * @param string Resource location, e.g. "product/property/type"
81 81
      * @return string Generated output
82 82
      */
83
-    public function patchAction(string $resource)
83
+    public function patchAction( string $resource )
84 84
     {
85
-        return $this->createAdmin($resource)->patch($this->getPsrRequest(), (new Psr17Factory)->createResponse());
85
+        return $this->createAdmin( $resource )->patch( $this->getPsrRequest(), ( new Psr17Factory )->createResponse() );
86 86
     }
87 87
 
88 88
 
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
      * @param string Resource location, e.g. "product/property/type"
93 93
      * @return string Generated output
94 94
      */
95
-    public function postAction(string $resource)
95
+    public function postAction( string $resource )
96 96
     {
97
-        return $this->createAdmin($resource)->post($this->getPsrRequest(), (new Psr17Factory)->createResponse());
97
+        return $this->createAdmin( $resource )->post( $this->getPsrRequest(), ( new Psr17Factory )->createResponse() );
98 98
     }
99 99
 
100 100
 
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
      * @param string Resource location, e.g. "product/property/type"
105 105
      * @return string Generated output
106 106
      */
107
-    public function putAction(string $resource)
107
+    public function putAction( string $resource )
108 108
     {
109
-        return $this->createAdmin($resource)->put($this->getPsrRequest(), (new Psr17Factory)->createResponse());
109
+        return $this->createAdmin( $resource )->put( $this->getPsrRequest(), ( new Psr17Factory )->createResponse() );
110 110
     }
111 111
 
112 112
 
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
      * @param string Resource location, e.g. "product/property/type"
117 117
      * @return string Generated output
118 118
      */
119
-    public function optionsAction(string $resource)
119
+    public function optionsAction( string $resource )
120 120
     {
121
-        return $this->createAdmin($resource)->options($this->getPsrRequest(), (new Psr17Factory)->createResponse());
121
+        return $this->createAdmin( $resource )->options( $this->getPsrRequest(), ( new Psr17Factory )->createResponse() );
122 122
     }
123 123
 
124 124
 
@@ -128,10 +128,10 @@  discard block
 block discarded – undo
128 128
      * @param string Resource location, e.g. "product/property/type"
129 129
      * @return \Aimeos\Admin\JsonAdm\Iface Jsonadm client
130 130
      */
131
-    protected function createAdmin(string $resource) : \Aimeos\Admin\JsonAdm\Iface
131
+    protected function createAdmin( string $resource ) : \Aimeos\Admin\JsonAdm\Iface
132 132
     {
133
-        $context = $this->contextBackend('admin/jsonadm/templates');
134
-        return \Aimeos\Admin\JsonAdm::create($context, Base::aimeos(), $resource);
133
+        $context = $this->contextBackend( 'admin/jsonadm/templates' );
134
+        return \Aimeos\Admin\JsonAdm::create( $context, Base::aimeos(), $resource );
135 135
     }
136 136
 
137 137
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,8 @@
 block discarded – undo
39 39
     {
40 40
         $resource = $this->request->hasArgument('resource') ? $this->request->getArgument('resource') : '';
41 41
 
42
-        switch ($this->request->getMethod()) {
42
+        switch ($this->request->getMethod())
43
+        {
43 44
             case 'DELETE': return $this->deleteAction($resource);
44 45
             case 'PATCH': return $this->patchAction($resource);
45 46
             case 'POST': return $this->postAction($resource);
Please login to merge, or discard this patch.
ext_localconf.php 1 patch
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-defined('TYPO3') or die();
3
+defined( 'TYPO3' ) or die();
4 4
 
5 5
 
6
-$aimeosExtPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('aimeos' );
6
+$aimeosExtPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath( 'aimeos' );
7 7
 
8
-if (file_exists($aimeosExtPath . '/Resources/Libraries/autoload.php' ) === true ) {
8
+if( file_exists( $aimeosExtPath . '/Resources/Libraries/autoload.php' ) === true ) {
9 9
     require_once $aimeosExtPath . '/Resources/Libraries/autoload.php';
10 10
 }
11 11
 
@@ -260,41 +260,41 @@  discard block
 block discarded – undo
260 260
  * Register icons for Aimeos content elements
261 261
  */
262 262
 $provider = 'TYPO3\CMS\Core\Imaging\IconProvider\FontawesomeIconProvider';
263
-$icons = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class );
264
-$icons->registerIcon('aimeos_catalog-home', $provider, ['name' => 'globe'] );
265
-$icons->registerIcon('aimeos_catalog-list', $provider, ['name' => 'list'] );
266
-$icons->registerIcon('aimeos_catalog-detail', $provider, ['name' => 'cube'] );
267
-$icons->registerIcon('aimeos_catalog-filter', $provider, ['name' => 'filter'] );
268
-$icons->registerIcon('aimeos_catalog-attribute', $provider, ['name' => 'filter'] );
269
-$icons->registerIcon('aimeos_catalog-price', $provider, ['name' => 'filter'] );
270
-$icons->registerIcon('aimeos_catalog-search', $provider, ['name' => 'filter'] );
271
-$icons->registerIcon('aimeos_catalog-supplier', $provider, ['name' => 'filter'] );
272
-$icons->registerIcon('aimeos_catalog-tree', $provider, ['name' => 'filter'] );
273
-$icons->registerIcon('aimeos_catalog-suggest', $provider, ['name' => 'ellipsis-h'] );
274
-$icons->registerIcon('aimeos_catalog-count', $provider, ['name' => 'bars'] );
275
-$icons->registerIcon('aimeos_catalog-stage', $provider, ['name' => 'image'] );
276
-$icons->registerIcon('aimeos_catalog-session', $provider, ['name' => 'thumb-tack'] );
277
-$icons->registerIcon('aimeos_catalog-stock', $provider, ['name' => 'cubes'] );
278
-$icons->registerIcon('aimeos_supplier-detail', $provider, ['name' => 'industry'] );
279
-$icons->registerIcon('aimeos_locale-select', $provider, ['name' => 'globe'] );
280
-$icons->registerIcon('aimeos_account-download', $provider, ['name' => 'download'] );
281
-$icons->registerIcon('aimeos_account-basket', $provider, ['name' => 'cart-arrow-down'] );
282
-$icons->registerIcon('aimeos_account-history', $provider, ['name' => 'history'] );
283
-$icons->registerIcon('aimeos_account-favorite', $provider, ['name' => 'heart'] );
284
-$icons->registerIcon('aimeos_account-profile', $provider, ['name' => 'user'] );
285
-$icons->registerIcon('aimeos_account-review', $provider, ['name' => 'comments'] );
286
-$icons->registerIcon('aimeos_account-subscription', $provider, ['name' => 'repeat'] );
287
-$icons->registerIcon('aimeos_account-watch', $provider, ['name' => 'eye'] );
288
-$icons->registerIcon('aimeos_basket-standard', $provider, ['name' => 'shopping-cart'] );
289
-$icons->registerIcon('aimeos_basket-small', $provider, ['name' => 'shopping-basket'] );
290
-$icons->registerIcon('aimeos_basket-related', $provider, ['name' => 'link'] );
291
-$icons->registerIcon('aimeos_basket-bulk', $provider, ['name' => 'truck'] );
292
-$icons->registerIcon('aimeos_checkout-standard', $provider, ['name' => 'credit-card'] );
293
-$icons->registerIcon('aimeos_checkout-confirm', $provider, ['name' => 'check'] );
294
-$icons->registerIcon('aimeos_checkout-update', $provider, ['name' => 'euro'] );
295
-$icons->registerIcon('aimeos_jsonapi', $provider, ['name' => 'code'] );
296
-
297
-$icons->registerIcon('aimeos-widget-latestorders', $provider, ['name' => 'shopping-cart'] );
263
+$icons = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( \TYPO3\CMS\Core\Imaging\IconRegistry::class );
264
+$icons->registerIcon( 'aimeos_catalog-home', $provider, ['name' => 'globe'] );
265
+$icons->registerIcon( 'aimeos_catalog-list', $provider, ['name' => 'list'] );
266
+$icons->registerIcon( 'aimeos_catalog-detail', $provider, ['name' => 'cube'] );
267
+$icons->registerIcon( 'aimeos_catalog-filter', $provider, ['name' => 'filter'] );
268
+$icons->registerIcon( 'aimeos_catalog-attribute', $provider, ['name' => 'filter'] );
269
+$icons->registerIcon( 'aimeos_catalog-price', $provider, ['name' => 'filter'] );
270
+$icons->registerIcon( 'aimeos_catalog-search', $provider, ['name' => 'filter'] );
271
+$icons->registerIcon( 'aimeos_catalog-supplier', $provider, ['name' => 'filter'] );
272
+$icons->registerIcon( 'aimeos_catalog-tree', $provider, ['name' => 'filter'] );
273
+$icons->registerIcon( 'aimeos_catalog-suggest', $provider, ['name' => 'ellipsis-h'] );
274
+$icons->registerIcon( 'aimeos_catalog-count', $provider, ['name' => 'bars'] );
275
+$icons->registerIcon( 'aimeos_catalog-stage', $provider, ['name' => 'image'] );
276
+$icons->registerIcon( 'aimeos_catalog-session', $provider, ['name' => 'thumb-tack'] );
277
+$icons->registerIcon( 'aimeos_catalog-stock', $provider, ['name' => 'cubes'] );
278
+$icons->registerIcon( 'aimeos_supplier-detail', $provider, ['name' => 'industry'] );
279
+$icons->registerIcon( 'aimeos_locale-select', $provider, ['name' => 'globe'] );
280
+$icons->registerIcon( 'aimeos_account-download', $provider, ['name' => 'download'] );
281
+$icons->registerIcon( 'aimeos_account-basket', $provider, ['name' => 'cart-arrow-down'] );
282
+$icons->registerIcon( 'aimeos_account-history', $provider, ['name' => 'history'] );
283
+$icons->registerIcon( 'aimeos_account-favorite', $provider, ['name' => 'heart'] );
284
+$icons->registerIcon( 'aimeos_account-profile', $provider, ['name' => 'user'] );
285
+$icons->registerIcon( 'aimeos_account-review', $provider, ['name' => 'comments'] );
286
+$icons->registerIcon( 'aimeos_account-subscription', $provider, ['name' => 'repeat'] );
287
+$icons->registerIcon( 'aimeos_account-watch', $provider, ['name' => 'eye'] );
288
+$icons->registerIcon( 'aimeos_basket-standard', $provider, ['name' => 'shopping-cart'] );
289
+$icons->registerIcon( 'aimeos_basket-small', $provider, ['name' => 'shopping-basket'] );
290
+$icons->registerIcon( 'aimeos_basket-related', $provider, ['name' => 'link'] );
291
+$icons->registerIcon( 'aimeos_basket-bulk', $provider, ['name' => 'truck'] );
292
+$icons->registerIcon( 'aimeos_checkout-standard', $provider, ['name' => 'credit-card'] );
293
+$icons->registerIcon( 'aimeos_checkout-confirm', $provider, ['name' => 'check'] );
294
+$icons->registerIcon( 'aimeos_checkout-update', $provider, ['name' => 'euro'] );
295
+$icons->registerIcon( 'aimeos_jsonapi', $provider, ['name' => 'code'] );
296
+
297
+$icons->registerIcon( 'aimeos-widget-latestorders', $provider, ['name' => 'shopping-cart'] );
298 298
 
299 299
 
300 300
 /**
@@ -344,19 +344,19 @@  discard block
 block discarded – undo
344 344
  * Add cache configuration
345 345
  */
346 346
 
347
-if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos'] ) ) {
347
+if( !isset( $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos'] ) ) {
348 348
     $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos'] = [];
349 349
 }
350 350
 
351
-if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['frontend'] ) ) {
351
+if( !isset( $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['frontend'] ) ) {
352 352
     $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['frontend'] = 'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend';
353 353
 }
354 354
 
355
-if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['options'] ) ) {
355
+if( !isset( $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['options'] ) ) {
356 356
     $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['options'] = ['defaultLifetime' => 0];
357 357
 }
358 358
 
359
-if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['groups'] ) ) {
359
+if( !isset( $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['groups'] ) ) {
360 360
     $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['groups'] = ['pages'];
361 361
 }
362 362
 
@@ -366,13 +366,13 @@  discard block
 block discarded – undo
366 366
  */
367 367
 
368 368
 // TYPO3 10, unnecessary in 11
369
-if (!isset($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['felogin']['logout_confirmed']['aimeos'] ) ) {
369
+if( !isset( $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['felogin']['logout_confirmed']['aimeos'] ) ) {
370 370
     $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['felogin']['logout_confirmed']['aimeos'] = \Aimeos\Aimeos\Base::class . '->logout';
371 371
 }
372 372
 
373
-if (!isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['clearCachePostProc']['aimeos'] ) ) {
374
-    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['clearCachePostProc']['aimeos'] = function(array $cacheType, $dataHandler ) {
375
-        \Aimeos\Aimeos\Base::clearCache($cacheType );
373
+if( !isset( $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['clearCachePostProc']['aimeos'] ) ) {
374
+    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['clearCachePostProc']['aimeos'] = function( array $cacheType, $dataHandler ) {
375
+        \Aimeos\Aimeos\Base::clearCache( $cacheType );
376 376
     };
377 377
 }
378 378
 
@@ -388,8 +388,8 @@  discard block
 block discarded – undo
388 388
  * Disable TYPO3 canonical tags so Aimeos ones are used
389 389
  */
390 390
 
391
-if (!\Aimeos\Aimeos\Base::getExtConfig('typo3Canonical', false ) ) {
392
-    unset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['TYPO3\CMS\Frontend\Page\PageGenerator']['generateMetaTags']['canonical'] );
391
+if( !\Aimeos\Aimeos\Base::getExtConfig( 'typo3Canonical', false ) ) {
392
+    unset( $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['TYPO3\CMS\Frontend\Page\PageGenerator']['generateMetaTags']['canonical'] );
393 393
 }
394 394
 
395 395
 
Please login to merge, or discard this patch.