aimeos / aimeos-typo3

Classes/Controller/AdminController.php

Spacing +7 added lines, -7 removed lines

@@ -26,16 +26,16 @@
     {
         $site = 'default';
 
-        if (isset($GLOBALS['BE_USER']->user['siteid']) && $GLOBALS['BE_USER']->user['siteid'] != '') {
-            $siteManager = \Aimeos\MShop::create($this->contextBackend(), 'locale/site');
-            $siteId = current(array_reverse(explode('.', trim($GLOBALS['BE_USER']->user['siteid'], '.'))));
-            $site = ($siteId ? $siteManager->get($siteId)->getCode() : 'default');
+        if( isset( $GLOBALS['BE_USER']->user['siteid'] ) && $GLOBALS['BE_USER']->user['siteid'] != '' ) {
+            $siteManager = \Aimeos\MShop::create( $this->contextBackend(), 'locale/site' );
+            $siteId = current( array_reverse( explode( '.', trim( $GLOBALS['BE_USER']->user['siteid'], '.' ) ) ) );
+            $site = ( $siteId ? $siteManager->get( $siteId )->getCode() : 'default' );
         }
 
-        if (!class_exists('\TYPO3\CMS\Extbase\Http\ForwardResponse')) {
-            return $this->forward('search', 'Jqadm', null, ['site' => $site]);
+        if( !class_exists( '\TYPO3\CMS\Extbase\Http\ForwardResponse' ) ) {
+            return $this->forward( 'search', 'Jqadm', null, ['site' => $site] );
         }
 
-        return (new ForwardResponse('search'))->withControllerName('Jqadm')->withArguments(['site' => $site]);
+        return ( new ForwardResponse( 'search' ) )->withControllerName( 'Jqadm' )->withArguments( ['site' => $site] );
     }
 }

Classes/Controller/LocaleController.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@
      */
     public function selectAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'locale/select');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'locale/select' );
+        return $this->getClientOutput( $client );
     }
 }

Classes/Controller/GraphqlController.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
      */
     public function indexAction()
     {
-        return \Aimeos\Admin\Graphql::execute($this->contextBackend(''), $this->getPsrRequest());
+        return \Aimeos\Admin\Graphql::execute( $this->contextBackend( '' ), $this->getPsrRequest() );
     }
 
 
@@ -57,15 +57,15 @@ 
      * @param \Psr\Http\Message\ResponseInterface $response PSR-7 response object
      * @return string Generated output
      */
-    protected function setPsrResponse(\Psr\Http\Message\ResponseInterface $response)
+    protected function setPsrResponse( \Psr\Http\Message\ResponseInterface $response )
     {
-        if (!isset($this->responseFactory)) // TYPO3 10
+        if( !isset( $this->responseFactory ) ) // TYPO3 10
         {
-            $this->response->setStatus($response->getStatusCode());
+            $this->response->setStatus( $response->getStatusCode() );
 
-            foreach ($response->getHeaders() as $key => $value) {
-                foreach ((array) $value as $val) {
-                    $this->response->setHeader($key, $val);
+            foreach( $response->getHeaders() as $key => $value ) {
+                foreach( (array) $value as $val ) {
+                    $this->response->setHeader( $key, $val );
                 }
             }
 

Braces +3 added lines, -1 removed lines

@@ -59,9 +59,11 @@
      */
     protected function setPsrResponse(\Psr\Http\Message\ResponseInterface $response)
     {
-        if (!isset($this->responseFactory)) // TYPO3 10
+        if (!isset($this->responseFactory)) {
+            // TYPO3 10
         {
             $this->response->setStatus($response->getStatusCode());
+        }
 
             foreach ($response->getHeaders() as $key => $value) {
                 foreach ((array) $value as $val) {

Classes/Controller/JqadmController.php

Spacing +66 added lines, -66 removed lines

@@ -29,7 +29,7 @@ 
     protected function initializeAction()
     {
         parent::initializeAction();
-        $this->uriBuilder->setArgumentPrefix('tx_aimeos_web_aimeostxaimeosadmin');
+        $this->uriBuilder->setArgumentPrefix( 'tx_aimeos_web_aimeostxaimeosadmin' );
     }
 
 
@@ -42,41 +42,41 @@ 
     {
         $contents = '';
         $files = [];
-        $type = $this->request->getArgument('type');
+        $type = $this->request->getArgument( 'type' );
 
-        foreach (Base::aimeos()->getCustomPaths('admin/jqadm') as $base => $paths) {
-            foreach($paths as $path) {
+        foreach( Base::aimeos()->getCustomPaths( 'admin/jqadm' ) as $base => $paths ) {
+            foreach( $paths as $path ) {
                 $jsbAbsPath = $base . '/' . $path;
-                $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
-                $files = array_merge($files, $jsb2->getFiles($type));
+                $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
+                $files = array_merge( $files, $jsb2->getFiles( $type ) );
             }
         }
 
-        foreach ($files as $file) {
-            if (($content = file_get_contents($file)) === false) {
-                throw new \RuntimeException(sprintf('File "%1$s" not found', $jsbAbsPath));
+        foreach( $files as $file ) {
+            if( ( $content = file_get_contents( $file ) ) === false ) {
+                throw new \RuntimeException( sprintf( 'File "%1$s" not found', $jsbAbsPath ) );
             }
 
             $contents .= $content;
         }
 
-        if (!isset($this->responseFactory)) { // TYPO3 10
-            if ($type === 'js') {
-                $this->response->setHeader('Content-Type', 'application/javascript');
-            } elseif ($type === 'css') {
-                $this->response->setHeader('Content-Type', 'text/css');
+        if( !isset( $this->responseFactory ) ) { // TYPO3 10
+            if( $type === 'js' ) {
+                $this->response->setHeader( 'Content-Type', 'application/javascript' );
+            } elseif( $type === 'css' ) {
+                $this->response->setHeader( 'Content-Type', 'text/css' );
             }
 
             return $contents;
         }
 
         $response = $this->responseFactory->createResponse()
-            ->withBody($this->streamFactory->createStream($contents));
+            ->withBody( $this->streamFactory->createStream( $contents ) );
 
-        if ($type === 'js') {
-            $response = $response->withAddedHeader('Content-Type', 'application/javascript');
-        } elseif ($type === 'css') {
-            $response = $response->withAddedHeader('Content-Type', 'text/css');
+        if( $type === 'js' ) {
+            $response = $response->withAddedHeader( 'Content-Type', 'application/javascript' );
+        } elseif( $type === 'css' ) {
+            $response = $response->withAddedHeader( 'Content-Type', 'text/css' );
         }
 
         return $response;
@@ -92,11 +92,11 @@ 
     {
         $cntl = $this->createAdmin();
 
-        if (($html = $cntl->batch()) == '') {
-            return $this->setPsrResponse($cntl->response());
+        if( ( $html = $cntl->batch() ) == '' ) {
+            return $this->setPsrResponse( $cntl->response() );
         }
 
-        $this->view->assign('content', $html);
+        $this->view->assign( 'content', $html );
         return $this->render();
     }
 
@@ -110,11 +110,11 @@ 
     {
         $cntl = $this->createAdmin();
 
-        if (($html = $cntl->copy()) == '') {
-            return $this->setPsrResponse($cntl->response());
+        if( ( $html = $cntl->copy() ) == '' ) {
+            return $this->setPsrResponse( $cntl->response() );
         }
 
-        $this->view->assign('content', $html);
+        $this->view->assign( 'content', $html );
         return $this->render();
     }
 
@@ -128,11 +128,11 @@ 
     {
         $cntl = $this->createAdmin();
 
-        if (($html = $cntl->create()) == '') {
-            return $this->setPsrResponse($cntl->response());
+        if( ( $html = $cntl->create() ) == '' ) {
+            return $this->setPsrResponse( $cntl->response() );
         }
 
-        $this->view->assign('content', $html);
+        $this->view->assign( 'content', $html );
         return $this->render();
     }
 
@@ -146,11 +146,11 @@ 
     {
         $cntl = $this->createAdmin();
 
-        if (($html = $cntl->delete()) == '') {
-            return $this->setPsrResponse($cntl->response());
+        if( ( $html = $cntl->delete() ) == '' ) {
+            return $this->setPsrResponse( $cntl->response() );
         }
 
-        $this->view->assign('content', $html);
+        $this->view->assign( 'content', $html );
         return $this->render();
     }
 
@@ -164,11 +164,11 @@ 
     {
         $cntl = $this->createAdmin();
 
-        if (($html = $cntl->export()) == '') {
-            return $this->setPsrResponse($cntl->response());
+        if( ( $html = $cntl->export() ) == '' ) {
+            return $this->setPsrResponse( $cntl->response() );
         }
 
-        $this->view->assign('content', $html);
+        $this->view->assign( 'content', $html );
         return $this->render();
     }
 
@@ -182,11 +182,11 @@ 
     {
         $cntl = $this->createAdmin();
 
-        if (($html = $cntl->get()) == '') {
-            return $this->setPsrResponse($cntl->response());
+        if( ( $html = $cntl->get() ) == '' ) {
+            return $this->setPsrResponse( $cntl->response() );
         }
 
-        $this->view->assign('content', $html);
+        $this->view->assign( 'content', $html );
         return $this->render();
     }
 
@@ -200,11 +200,11 @@ 
     {
         $cntl = $this->createAdmin();
 
-        if (($html = $cntl->import()) == '') {
-            return $this->setPsrResponse($cntl->response());
+        if( ( $html = $cntl->import() ) == '' ) {
+            return $this->setPsrResponse( $cntl->response() );
         }
 
-        $this->view->assign('content', $html);
+        $this->view->assign( 'content', $html );
         return $this->render();
     }
 
@@ -218,11 +218,11 @@ 
     {
         $cntl = $this->createAdmin();
 
-        if (($html = $cntl->save()) == '') {
-            return $this->setPsrResponse($cntl->response());
+        if( ( $html = $cntl->save() ) == '' ) {
+            return $this->setPsrResponse( $cntl->response() );
         }
 
-        $this->view->assign('content', $html);
+        $this->view->assign( 'content', $html );
         return $this->render();
     }
 
@@ -236,11 +236,11 @@ 
     {
         $cntl = $this->createAdmin();
 
-        if (($html = $cntl->search()) == '') {
-            return $this->setPsrResponse($cntl->response());
+        if( ( $html = $cntl->search() ) == '' ) {
+            return $this->setPsrResponse( $cntl->response() );
         }
 
-        $this->view->assign('content', $html);
+        $this->view->assign( 'content', $html );
         return $this->render();
     }
 
@@ -254,24 +254,24 @@ 
     {
         $resource = 'dashboard';
 
-        if ($this->request->hasArgument('resource')
-            && ($value = $this->request->getArgument('resource')) != ''
+        if( $this->request->hasArgument( 'resource' )
+            && ( $value = $this->request->getArgument( 'resource' ) ) != ''
         ) {
             $resource = $value;
         }
 
         $aimeos = Base::aimeos();
-        $context = $this->contextBackend('admin/jqadm/templates');
+        $context = $this->contextBackend( 'admin/jqadm/templates' );
 
         $view = $context->view();
 
         $view->aimeosType = 'TYPO3';
         $view->aimeosVersion = Base::getVersion();
-        $view->aimeosExtensions = implode(',', $aimeos->getExtensions());
+        $view->aimeosExtensions = implode( ',', $aimeos->getExtensions() );
 
-        $context->setView($view);
+        $context->setView( $view );
 
-        return \Aimeos\Admin\JQAdm::create($context, $aimeos, $resource);
+        return \Aimeos\Admin\JQAdm::create( $context, $aimeos, $resource );
     }
 
 
@@ -280,10 +280,10 @@ 
      */
     protected function render()
     {
-        if (isset($this->responseFactory)) { // TYPO3 11
+        if( isset( $this->responseFactory ) ) { // TYPO3 11
             return $this->responseFactory->createResponse()
-                ->withAddedHeader('Content-Type', 'text/html; charset=utf-8')
-                ->withBody($this->streamFactory->createStream($this->view->render()));
+                ->withAddedHeader( 'Content-Type', 'text/html; charset=utf-8' )
+                ->withBody( $this->streamFactory->createStream( $this->view->render() ) );
         }
     }
 
@@ -295,9 +295,9 @@ 
      */
     protected function resolveView()
     {
-        if ($this->request->hasArgument('locale') && ($value = $this->request->getArgument('locale')) != '') {
+        if( $this->request->hasArgument( 'locale' ) && ( $value = $this->request->getArgument( 'locale' ) ) != '' ) {
             $lang = $value;
-        } elseif (isset($GLOBALS['BE_USER']->uc['lang']) && $GLOBALS['BE_USER']->uc['lang'] != '') {
+        } elseif( isset( $GLOBALS['BE_USER']->uc['lang'] ) && $GLOBALS['BE_USER']->uc['lang'] != '' ) {
             $lang = $GLOBALS['BE_USER']->uc['lang'];
         } else {
             $lang = 'en';
@@ -305,9 +305,9 @@ 
 
         $view = \TYPO3\CMS\Extbase\Mvc\Controller\ActionController::resolveView();
 
-        $view->assign('theme', ($_COOKIE['aimeos_backend_theme'] ?? null) == 'dark' ? 'dark' : 'light');
-        $view->assign('localeDir', in_array($lang, ['ar', 'az', 'dv', 'fa', 'he', 'ku', 'ur']) ? 'rtl' : 'ltr');
-        $view->assign('locale', $lang);
+        $view->assign( 'theme', ( $_COOKIE['aimeos_backend_theme'] ?? null ) == 'dark' ? 'dark' : 'light' );
+        $view->assign( 'localeDir', in_array( $lang, ['ar', 'az', 'dv', 'fa', 'he', 'ku', 'ur'] ) ? 'rtl' : 'ltr' );
+        $view->assign( 'locale', $lang );
 
         return $view;
     }
@@ -319,14 +319,14 @@ 
      * @param \Psr\Http\Message\ResponseInterface $response PSR-7 response object
      * @return string Generated output
      */
-    protected function setPsrResponse(\Psr\Http\Message\ResponseInterface $response)
+    protected function setPsrResponse( \Psr\Http\Message\ResponseInterface $response )
     {
-        if (!isset($this->responseFactory)) { // TYPO3 10
-            $this->response->setStatus($response->getStatusCode());
+        if( !isset( $this->responseFactory ) ) { // TYPO3 10
+            $this->response->setStatus( $response->getStatusCode() );
 
-            foreach ($response->getHeaders() as $key => $value) {
-                foreach ((array) $value as $val) {
-                    $this->response->setHeader($key, $val);
+            foreach( $response->getHeaders() as $key => $value ) {
+                foreach( (array) $value as $val ) {
+                    $this->response->setHeader( $key, $val );
                 }
             }
 

Classes/Controller/CheckoutController.php

Spacing +26 added lines, -26 removed lines

@@ -27,8 +27,8 @@ 
      */
     public function indexAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'checkout/standard');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'checkout/standard' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -38,29 +38,29 @@ 
     public function confirmAction()
     {
         $context = $this->context();
-        $client = \Aimeos\Client\Html::create($context, 'checkout/confirm');
+        $client = \Aimeos\Client\Html::create( $context, 'checkout/confirm' );
 
         $view = $context->view();
-        $param = array_merge(GeneralUtility::_GET(), GeneralUtility::_POST());
-        $helper = new \Aimeos\Base\View\Helper\Param\Standard($view, $param);
-        $view->addHelper('param', $helper);
+        $param = array_merge( GeneralUtility::_GET(), GeneralUtility::_POST() );
+        $helper = new \Aimeos\Base\View\Helper\Param\Standard( $view, $param );
+        $view->addHelper( 'param', $helper );
 
-        $client->setView($view)->init();
+        $client->setView( $view )->init();
 
         $header = (string) $client->header();
         $html = (string) $client->body();
 
-        if (!isset($this->responseFactory)) // TYPO3 10
+        if( !isset( $this->responseFactory ) ) // TYPO3 10
         {
-            $this->response->addAdditionalHeaderData($header);
+            $this->response->addAdditionalHeaderData( $header );
             return $html;
         }
 
-        GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class)->addHeaderData($header);
+        GeneralUtility::makeInstance( \TYPO3\CMS\Core\Page\PageRenderer::class )->addHeaderData( $header );
 
         return $this->responseFactory->createResponse()
-            ->withAddedHeader('Content-Type', 'text/html; charset=utf-8')
-            ->withBody($this->streamFactory->createStream($html));
+            ->withAddedHeader( 'Content-Type', 'text/html; charset=utf-8' )
+            ->withBody( $this->streamFactory->createStream( $html ) );
     }
 
 
@@ -71,37 +71,37 @@ 
     {
         try {
             $context = $this->context();
-            $client = \Aimeos\Client\Html::create($context, 'checkout/update');
+            $client = \Aimeos\Client\Html::create( $context, 'checkout/update' );
 
             $view = $context->view();
-            $param = array_merge(GeneralUtility::_GET(), GeneralUtility::_POST());
-            $helper = new \Aimeos\Base\View\Helper\Param\Standard($view, $param);
-            $view->addHelper('param', $helper);
+            $param = array_merge( GeneralUtility::_GET(), GeneralUtility::_POST() );
+            $helper = new \Aimeos\Base\View\Helper\Param\Standard( $view, $param );
+            $view->addHelper( 'param', $helper );
 
-            $client->setView($view)->init();
+            $client->setView( $view )->init();
 
             $header = (string) $client->header();
             $html = (string) $client->body();
 
-            if (!isset($this->responseFactory)) // TYPO3 10
+            if( !isset( $this->responseFactory ) ) // TYPO3 10
             {
-                $this->response->addAdditionalHeaderData($header);
+                $this->response->addAdditionalHeaderData( $header );
                 return $html;
             }
 
-            GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class)->addHeaderData($header);
+            GeneralUtility::makeInstance( \TYPO3\CMS\Core\Page\PageRenderer::class )->addHeaderData( $header );
 
             return $this->responseFactory->createResponse()
-                ->withBody($this->streamFactory->createStream($html));
-        } catch(\Exception $e) {
-            if (!isset($this->responseFactory)) // TYPO3 10
+                ->withBody( $this->streamFactory->createStream( $html ) );
+        } catch( \Exception $e ) {
+            if( !isset( $this->responseFactory ) ) // TYPO3 10
             {
-                @header('HTTP/1.1 500 Internal server error', true, 500);
+                @header( 'HTTP/1.1 500 Internal server error', true, 500 );
                 return 'Error: ' . $e->getMessage();
             }
 
-            return $this->responseFactory->createResponse()->withStatus(500)
-                ->withBody($this->streamFactory->createStream('Error: ' . $e->getMessage()));
+            return $this->responseFactory->createResponse()->withStatus( 500 )
+                ->withBody( $this->streamFactory->createStream( 'Error: ' . $e->getMessage() ) );
         }
     }
 }

Braces +14 added lines, -5 removed lines

@@ -50,9 +50,11 @@ 
         $header = (string) $client->header();
         $html = (string) $client->body();
 
-        if (!isset($this->responseFactory)) // TYPO3 10
+        if (!isset($this->responseFactory)) {
+            // TYPO3 10
         {
             $this->response->addAdditionalHeaderData($header);
+        }
             return $html;
         }
 
@@ -69,7 +71,8 @@ 
      */
     public function updateAction()
     {
-        try {
+        try
+        {
             $context = $this->context();
             $client = \Aimeos\Client\Html::create($context, 'checkout/update');
 
@@ -83,9 +86,11 @@ 
             $header = (string) $client->header();
             $html = (string) $client->body();
 
-            if (!isset($this->responseFactory)) // TYPO3 10
+            if (!isset($this->responseFactory)) {
+                // TYPO3 10
             {
                 $this->response->addAdditionalHeaderData($header);
+            }
                 return $html;
             }
 
@@ -93,10 +98,14 @@ 
 
             return $this->responseFactory->createResponse()
                 ->withBody($this->streamFactory->createStream($html));
-        } catch(\Exception $e) {
-            if (!isset($this->responseFactory)) // TYPO3 10
+        }
+        catch(\Exception $e)
+        {
+            if (!isset($this->responseFactory)) {
+                // TYPO3 10
             {
                 @header('HTTP/1.1 500 Internal server error', true, 500);
+            }
                 return 'Error: ' . $e->getMessage();
             }
 

Classes/Controller/AccountController.php

Spacing +20 added lines, -20 removed lines

@@ -26,8 +26,8 @@ 
      */
     public function basketAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'account/basket');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'account/basket' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -39,17 +39,17 @@ 
         $context = $this->context();
         $view = $context->view();
 
-        $client = \Aimeos\Client\Html::create($context, 'account/download');
-        $client->setView($view)->init();
+        $client = \Aimeos\Client\Html::create( $context, 'account/download' );
+        $client->setView( $view )->init();
 
-        if (!isset($this->responseFactory)) // TYPO3 10
+        if( !isset( $this->responseFactory ) ) // TYPO3 10
         {
             $response = $view->response();
 
-            $this->response->setStatus($response->getStatusCode());
+            $this->response->setStatus( $response->getStatusCode() );
 
-            foreach ($response->getHeaders() as $key => $value) {
-                $this->response->setHeader($key, implode(', ', $value));
+            foreach( $response->getHeaders() as $key => $value ) {
+                $this->response->setHeader( $key, implode( ', ', $value ) );
             }
 
             return (string) $response->getBody();
@@ -64,8 +64,8 @@ 
      */
     public function historyAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'account/history');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'account/history' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -74,8 +74,8 @@ 
      */
     public function favoriteAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'account/favorite');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'account/favorite' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -84,8 +84,8 @@ 
      */
     public function profileAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'account/profile');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'account/profile' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -94,8 +94,8 @@ 
      */
     public function reviewAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'account/review');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'account/review' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -104,8 +104,8 @@ 
      */
     public function subscriptionAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'account/subscription');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'account/subscription' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -114,7 +114,7 @@ 
      */
     public function watchAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'account/watch');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'account/watch' );
+        return $this->getClientOutput( $client );
     }
 }

Braces +3 added lines, -1 removed lines

@@ -42,9 +42,11 @@
         $client = \Aimeos\Client\Html::create($context, 'account/download');
         $client->setView($view)->init();
 
-        if (!isset($this->responseFactory)) // TYPO3 10
+        if (!isset($this->responseFactory)) {
+            // TYPO3 10
         {
             $response = $view->response();
+        }
 
             $this->response->setStatus($response->getStatusCode());
 

Classes/Controller/CatalogController.php

Spacing +64 added lines, -64 removed lines

@@ -27,8 +27,8 @@ 
      */
     public function attributeAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/attribute');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/attribute' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -37,18 +37,18 @@ 
      */
     public function countAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/count');
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/count' );
 
-        if (!isset($this->responseFactory)) { // TYPO3 10
-            return $this->getClientOutput($client);
+        if( !isset( $this->responseFactory ) ) { // TYPO3 10
+            return $this->getClientOutput( $client );
         }
 
-        $client->setView($this->context()->view())->init();
+        $client->setView( $this->context()->view() )->init();
 
         return $this->responseFactory->createResponse()
-            ->withAddedHeader('Content-Type', 'application/javascript')
-            ->withAddedHeader('Cache-Control', 'public, max-age=300')
-            ->withBody($this->streamFactory->createStream((string) $client->body()));
+            ->withAddedHeader( 'Content-Type', 'application/javascript' )
+            ->withAddedHeader( 'Cache-Control', 'public, max-age=300' )
+            ->withBody( $this->streamFactory->createStream( (string) $client->body() ) );
     }
 
 
@@ -59,10 +59,10 @@ 
     {
         try {
             $this->removeMetatags();
-            $client = \Aimeos\Client\Html::create($this->context(), 'catalog/detail');
-            return $this->getClientOutput($client);
-        } catch(\Exception $e) {
-            $this->exception($e);
+            $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/detail' );
+            return $this->getClientOutput( $client );
+        } catch( \Exception $e ) {
+            $this->exception( $e );
         }
     }
 
@@ -72,8 +72,8 @@ 
      */
     public function filterAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/filter');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/filter' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -83,8 +83,8 @@ 
     public function homeAction()
     {
         $this->removeMetatags();
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/home');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/home' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -94,8 +94,8 @@ 
     public function listAction()
     {
         $this->removeMetatags();
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/lists');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/lists' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -104,8 +104,8 @@ 
      */
     public function priceAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/price');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/price' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -114,8 +114,8 @@ 
      */
     public function searchAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/search');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/search' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -124,8 +124,8 @@ 
      */
     public function sessionAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/session');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/session' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -134,8 +134,8 @@ 
      */
     public function stageAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/stage');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/stage' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -144,18 +144,18 @@ 
      */
     public function stockAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/stock');
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/stock' );
 
-        if (!isset($this->responseFactory)) { // TYPO3 10
-            return $this->getClientOutput($client);
+        if( !isset( $this->responseFactory ) ) { // TYPO3 10
+            return $this->getClientOutput( $client );
         }
 
-        $client->setView($this->context()->view())->init();
+        $client->setView( $this->context()->view() )->init();
 
         return $this->responseFactory->createResponse()
-            ->withAddedHeader('Content-Type', 'application/javascript')
-            ->withAddedHeader('Cache-Control', 'public, max-age=300')
-            ->withBody($this->streamFactory->createStream((string) $client->body()));
+            ->withAddedHeader( 'Content-Type', 'application/javascript' )
+            ->withAddedHeader( 'Cache-Control', 'public, max-age=300' )
+            ->withBody( $this->streamFactory->createStream( (string) $client->body() ) );
     }
 
 
@@ -164,18 +164,18 @@ 
      */
     public function suggestAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/suggest');
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/suggest' );
 
-        if (!isset($this->responseFactory)) { // TYPO3 10
-            return $this->getClientOutput($client);
+        if( !isset( $this->responseFactory ) ) { // TYPO3 10
+            return $this->getClientOutput( $client );
         }
 
-        $client->setView($this->context()->view())->init();
+        $client->setView( $this->context()->view() )->init();
 
         return $this->responseFactory->createResponse()
-            ->withAddedHeader('Content-Type', 'application/json')
-            ->withAddedHeader('Cache-Control', 'public, max-age=300')
-            ->withBody($this->streamFactory->createStream((string) $client->body()));
+            ->withAddedHeader( 'Content-Type', 'application/json' )
+            ->withAddedHeader( 'Cache-Control', 'public, max-age=300' )
+            ->withBody( $this->streamFactory->createStream( (string) $client->body() ) );
     }
 
 
@@ -184,8 +184,8 @@ 
      */
     public function supplierAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'catalog/supplier');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/supplier' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -195,10 +195,10 @@ 
     public function treeAction()
     {
         try {
-            $client = \Aimeos\Client\Html::create($this->context(), 'catalog/tree');
-            return $this->getClientOutput($client);
-        } catch(\Exception $e) {
-            $this->exception($e);
+            $client = \Aimeos\Client\Html::create( $this->context(), 'catalog/tree' );
+            return $this->getClientOutput( $client );
+        } catch( \Exception $e ) {
+            $this->exception( $e );
         }
     }
 
@@ -209,15 +209,15 @@ 
      * @param \Exception $e Caught exception
      * @throws \Exception Thrown exception
      */
-    protected function exception(\Exception $e)
+    protected function exception( \Exception $e )
     {
-        if ($e->getCode() > 400) {
+        if( $e->getCode() > 400 ) {
             $name = \TYPO3\CMS\Frontend\Controller\ErrorController::class;
 
-            $response = GeneralUtility::makeInstance($name)->pageNotFoundAction(
+            $response = GeneralUtility::makeInstance( $name )->pageNotFoundAction(
                 $this->request, $e->getMessage(), ['code' => $e->getCode()]
             );
-            throw new \TYPO3\CMS\Core\Http\ImmediateResponseException($response);
+            throw new \TYPO3\CMS\Core\Http\ImmediateResponseException( $response );
         }
 
         throw $e;
@@ -229,24 +229,24 @@ 
      */
     protected function removeMetatags()
     {
-        if (is_object($GLOBALS['TSFE']) && isset($GLOBALS['TSFE']->config['config'])) {
+        if( is_object( $GLOBALS['TSFE'] ) && isset( $GLOBALS['TSFE']->config['config'] ) ) {
             $GLOBALS['TSFE']->config['config']['disableCanonical'] = true;
             $GLOBALS['TSFE']->config['config']['noPageTitle'] = 2;
         }
 
-        if (class_exists('\TYPO3\CMS\Core\MetaTag\MetaTagManagerRegistry')
-            && !\Aimeos\Aimeos\Base::getExtConfig('typo3Metatags', true)
+        if( class_exists( '\TYPO3\CMS\Core\MetaTag\MetaTagManagerRegistry' )
+            && !\Aimeos\Aimeos\Base::getExtConfig( 'typo3Metatags', true )
         ) {
-            $registry = GeneralUtility::makeInstance('TYPO3\CMS\Core\MetaTag\MetaTagManagerRegistry');
-
-            $registry->getManagerForProperty('keywords')->removeProperty('keywords');
-            $registry->getManagerForProperty('description')->removeProperty('description');
-            $registry->getManagerForProperty('og:type')->removeProperty('og:type');
-            $registry->getManagerForProperty('og:title')->removeProperty('og:title');
-            $registry->getManagerForProperty('og:url')->removeProperty('og:url');
-            $registry->getManagerForProperty('og:description')->removeProperty('og:description');
-            $registry->getManagerForProperty('og:image')->removeProperty('og:image');
-            $registry->getManagerForProperty('twitter:card')->removeProperty('twitter:card');
+            $registry = GeneralUtility::makeInstance( 'TYPO3\CMS\Core\MetaTag\MetaTagManagerRegistry' );
+
+            $registry->getManagerForProperty( 'keywords' )->removeProperty( 'keywords' );
+            $registry->getManagerForProperty( 'description' )->removeProperty( 'description' );
+            $registry->getManagerForProperty( 'og:type' )->removeProperty( 'og:type' );
+            $registry->getManagerForProperty( 'og:title' )->removeProperty( 'og:title' );
+            $registry->getManagerForProperty( 'og:url' )->removeProperty( 'og:url' );
+            $registry->getManagerForProperty( 'og:description' )->removeProperty( 'og:description' );
+            $registry->getManagerForProperty( 'og:image' )->removeProperty( 'og:image' );
+            $registry->getManagerForProperty( 'twitter:card' )->removeProperty( 'twitter:card' );
         }
     }
 }

Braces +10 added lines, -4 removed lines

@@ -57,11 +57,14 @@ 
      */
     public function detailAction()
     {
-        try {
+        try
+        {
             $this->removeMetatags();
             $client = \Aimeos\Client\Html::create($this->context(), 'catalog/detail');
             return $this->getClientOutput($client);
-        } catch(\Exception $e) {
+        }
+        catch(\Exception $e)
+        {
             $this->exception($e);
         }
     }
@@ -194,10 +197,13 @@ 
      */
     public function treeAction()
     {
-        try {
+        try
+        {
             $client = \Aimeos\Client\Html::create($this->context(), 'catalog/tree');
             return $this->getClientOutput($client);
-        } catch(\Exception $e) {
+        }
+        catch(\Exception $e)
+        {
             $this->exception($e);
         }
     }

Classes/Controller/SupplierController.php

Spacing +14 added lines, -14 removed lines

@@ -28,8 +28,8 @@ 
     public function detailAction()
     {
         $this->removeMetatags();
-        $client = \Aimeos\Client\Html::create($this->context(), 'supplier/detail');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'supplier/detail' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -38,19 +38,19 @@ 
      */
     protected function removeMetatags()
     {
-        if (class_exists('\TYPO3\CMS\Core\MetaTag\MetaTagManagerRegistry')
-            && !\Aimeos\Aimeos\Base::getExtConfig('typo3Metatags', true)
+        if( class_exists( '\TYPO3\CMS\Core\MetaTag\MetaTagManagerRegistry' )
+            && !\Aimeos\Aimeos\Base::getExtConfig( 'typo3Metatags', true )
         ) {
-            $registry = GeneralUtility::makeInstance('TYPO3\CMS\Core\MetaTag\MetaTagManagerRegistry');
-
-            $registry->getManagerForProperty('keywords')->removeProperty('keywords');
-            $registry->getManagerForProperty('description')->removeProperty('description');
-            $registry->getManagerForProperty('og:type')->removeProperty('og:type');
-            $registry->getManagerForProperty('og:title')->removeProperty('og:title');
-            $registry->getManagerForProperty('og:url')->removeProperty('og:url');
-            $registry->getManagerForProperty('og:description')->removeProperty('og:description');
-            $registry->getManagerForProperty('og:image')->removeProperty('og:image');
-            $registry->getManagerForProperty('twitter:card')->removeProperty('twitter:card');
+            $registry = GeneralUtility::makeInstance( 'TYPO3\CMS\Core\MetaTag\MetaTagManagerRegistry' );
+
+            $registry->getManagerForProperty( 'keywords' )->removeProperty( 'keywords' );
+            $registry->getManagerForProperty( 'description' )->removeProperty( 'description' );
+            $registry->getManagerForProperty( 'og:type' )->removeProperty( 'og:type' );
+            $registry->getManagerForProperty( 'og:title' )->removeProperty( 'og:title' );
+            $registry->getManagerForProperty( 'og:url' )->removeProperty( 'og:url' );
+            $registry->getManagerForProperty( 'og:description' )->removeProperty( 'og:description' );
+            $registry->getManagerForProperty( 'og:image' )->removeProperty( 'og:image' );
+            $registry->getManagerForProperty( 'twitter:card' )->removeProperty( 'twitter:card' );
         }
     }
 }

Classes/Controller/BasketController.php

Spacing +8 added lines, -8 removed lines

@@ -26,8 +26,8 @@ 
      */
     public function indexAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'basket/standard');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'basket/standard' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -36,8 +36,8 @@ 
      */
     public function bulkAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'basket/bulk');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'basket/bulk' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -46,8 +46,8 @@ 
      */
     public function smallAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'basket/mini');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'basket/mini' );
+        return $this->getClientOutput( $client );
     }
 
 
@@ -56,7 +56,7 @@ 
      */
     public function relatedAction()
     {
-        $client = \Aimeos\Client\Html::create($this->context(), 'basket/related');
-        return $this->getClientOutput($client);
+        $client = \Aimeos\Client\Html::create( $this->context(), 'basket/related' );
+        return $this->getClientOutput( $client );
     }
 }