aimeos / aimeos-typo3

Tests/Unit/Controller/JsonapiControllerTest.php

Spacing +40 added lines, -40 removed lines

@@ -17,38 +17,38 @@ 
     {
         \Aimeos\Aimeos\Base::aimeos(); // initialize autoloader
 
-        $this->object = $this->getAccessibleMock('Aimeos\\Aimeos\\Controller\\JsonapiController', array('dummy'));
+        $this->object = $this->getAccessibleMock( 'Aimeos\\Aimeos\\Controller\\JsonapiController', array( 'dummy' ) );
 
-        $this->request = $this->getMockBuilder('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Request')
-            ->setMethods(array('hasArgument', 'getArgument', 'getMethod'))
+        $this->request = $this->getMockBuilder( 'TYPO3\\CMS\\Extbase\\Mvc\\Web\\Request' )
+            ->setMethods( array( 'hasArgument', 'getArgument', 'getMethod' ) )
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->response = $this->getMockBuilder('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response')
-            ->setMethods(array('setStatus'))
+        $this->response = $this->getMockBuilder( 'TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response' )
+            ->setMethods( array( 'setStatus' ) )
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->uriBuilder = $this->getMockBuilder('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Routing\\UriBuilder')
-            ->setMethods(array('buildFrontendUri'))
+        $this->uriBuilder = $this->getMockBuilder( 'TYPO3\\CMS\\Extbase\\Mvc\\Web\\Routing\\UriBuilder' )
+            ->setMethods( array( 'buildFrontendUri' ) )
             ->disableOriginalConstructor()
             ->getMock();
 
-        if (method_exists($response, 'setRequest')) {
-            $response->setRequest($this->request);
+        if( method_exists( $response, 'setRequest' ) ) {
+            $response->setRequest( $this->request );
         }
 
-        $this->object->_set('uriBuilder', $this->uriBuilder);
-        $this->object->_set('response', $this->response);
-        $this->object->_set('request', $this->request);
+        $this->object->_set( 'uriBuilder', $this->uriBuilder );
+        $this->object->_set( 'response', $this->response );
+        $this->object->_set( 'request', $this->request );
 
-        $this->object->_call('initializeAction');
+        $this->object->_call( 'initializeAction' );
     }
 
 
     public function tearDown()
     {
-        unset($this->object, $this->request, $this->response);
+        unset( $this->object, $this->request, $this->response );
     }
 
 
@@ -57,26 +57,26 @@ 
      */
     public function optionsAction()
     {
-        $this->request->expects($this->exactly(1))->method('getMethod')
-        ->will($this->returnValue('OPTIONS'));
+        $this->request->expects( $this->exactly( 1 ) )->method( 'getMethod' )
+        ->will( $this->returnValue( 'OPTIONS' ) );
 
-        $this->request->expects($this->atLeastOnce())->method('hasArgument')
-        ->will($this->returnValue(true));
+        $this->request->expects( $this->atLeastOnce() )->method( 'hasArgument' )
+        ->will( $this->returnValue( true ) );
 
-        $this->request->expects($this->any())->method('getArgument')
-        ->will($this->onConsecutiveCalls('', 'unittest', null, null, 'unittest', null, null));
+        $this->request->expects( $this->any() )->method( 'getArgument' )
+        ->will( $this->onConsecutiveCalls( '', 'unittest', null, null, 'unittest', null, null ) );
 
-        $this->response->expects($this->exactly(1))->method('setStatus')
-        ->with($this->equalTo(200));
+        $this->response->expects( $this->exactly( 1 ) )->method( 'setStatus' )
+        ->with( $this->equalTo( 200 ) );
 
         $result = $this->object->indexAction();
-        $json = json_decode($result, true);
+        $json = json_decode( $result, true );
 
-        $this->assertNotEquals(null, $json);
-        $this->assertArrayHasKey('meta', $json);
-        $this->assertArrayHasKey('resources', $json['meta']);
-        $this->assertGreaterThan(1, count($json['meta']['resources']));
-        $this->assertArrayHasKey('product', $json['meta']['resources']);
+        $this->assertNotEquals( null, $json );
+        $this->assertArrayHasKey( 'meta', $json );
+        $this->assertArrayHasKey( 'resources', $json['meta'] );
+        $this->assertGreaterThan( 1, count( $json['meta']['resources'] ) );
+        $this->assertArrayHasKey( 'product', $json['meta']['resources'] );
     }
 
 
@@ -85,25 +85,25 @@ 
      */
     public function getAction()
     {
-        $this->request->expects($this->exactly(1))->method('getMethod')
-            ->will($this->returnValue('GET'));
+        $this->request->expects( $this->exactly( 1 ) )->method( 'getMethod' )
+            ->will( $this->returnValue( 'GET' ) );
 
-        $this->request->expects($this->atLeastOnce())->method('hasArgument')
-            ->will($this->returnValue(true));
+        $this->request->expects( $this->atLeastOnce() )->method( 'hasArgument' )
+            ->will( $this->returnValue( true ) );
 
-        $this->request->expects($this->any())->method('getArgument')
-            ->will($this->onConsecutiveCalls('product', 'unittest', null, null, 'unittest', null, null));
+        $this->request->expects( $this->any() )->method( 'getArgument' )
+            ->will( $this->onConsecutiveCalls( 'product', 'unittest', null, null, 'unittest', null, null ) );
 
-        $this->response->expects($this->exactly(1))->method('setStatus')
-            ->with($this->equalTo(200));
+        $this->response->expects( $this->exactly( 1 ) )->method( 'setStatus' )
+            ->with( $this->equalTo( 200 ) );
 
-        $this->uriBuilder->expects($this->any())->method('buildFrontendUri')
-            ->will($this->returnValue('http://localhost/'));
+        $this->uriBuilder->expects( $this->any() )->method( 'buildFrontendUri' )
+            ->will( $this->returnValue( 'http://localhost/' ) );
 
         $result = $this->object->indexAction();
-        $json = json_decode($result, true);
+        $json = json_decode( $result, true );
 
-        $this->assertNotEquals(null, $json);
+        $this->assertNotEquals( null, $json );
     }
 
 }
\ No newline at end of file

Tests/Unit/Controller/AccountControllerTest.php

Spacing +22 added lines, -22 removed lines

@@ -14,31 +14,31 @@ 
     {
         \Aimeos\Aimeos\Base::aimeos(); // initialize autoloader
 
-        $this->object = $this->getAccessibleMock('Aimeos\\Aimeos\\Controller\\AccountController', array('dummy'));
+        $this->object = $this->getAccessibleMock( 'Aimeos\\Aimeos\\Controller\\AccountController', array( 'dummy' ) );
 
         $objManager = new \TYPO3\CMS\Extbase\Object\ObjectManager();
 
-        $uriBuilder = $objManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Routing\\UriBuilder');
-        $response = $objManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response');
-        $request = $objManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Request');
+        $uriBuilder = $objManager->get( 'TYPO3\\CMS\\Extbase\\Mvc\\Web\\Routing\\UriBuilder' );
+        $response = $objManager->get( 'TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response' );
+        $request = $objManager->get( 'TYPO3\\CMS\\Extbase\\Mvc\\Web\\Request' );
 
-        $uriBuilder->setRequest($request);
+        $uriBuilder->setRequest( $request );
 
-        if (method_exists($response, 'setRequest')) {
-            $response->setRequest($request);
+        if( method_exists( $response, 'setRequest' ) ) {
+            $response->setRequest( $request );
         }
 
-        $this->object->_set('uriBuilder', $uriBuilder);
-        $this->object->_set('response', $response);
-        $this->object->_set('request', $request);
+        $this->object->_set( 'uriBuilder', $uriBuilder );
+        $this->object->_set( 'response', $response );
+        $this->object->_set( 'request', $request );
 
-        $this->object->_call('initializeAction');
+        $this->object->_call( 'initializeAction' );
     }
 
 
     public function tearDown()
     {
-        unset($this->object);
+        unset( $this->object );
     }
 
 
@@ -48,13 +48,13 @@ 
     public function downloadAction()
     {
         $name = '\\Aimeos\\Client\\Html\\Account\\Download\\Standard';
-        $client = $this->getMock($name, array('process'), [], '', false);
+        $client = $this->getMock( $name, array( 'process' ), [], '', false );
 
-        \Aimeos\Client\Html\Account\Download\Factory::injectClient($name, $client);
+        \Aimeos\Client\Html\Account\Download\Factory::injectClient( $name, $client );
         $output = $this->object->downloadAction();
-        \Aimeos\Client\Html\Account\Download\Factory::injectClient($name, null);
+        \Aimeos\Client\Html\Account\Download\Factory::injectClient( $name, null );
 
-        $this->assertEquals('', $output);
+        $this->assertEquals( '', $output );
     }
 
 
@@ -64,15 +64,15 @@ 
     public function historyAction()
     {
         $name = '\\Aimeos\\Client\\Html\\Account\\History\\Standard';
-        $client = $this->getMock($name, array('getBody', 'getHeader', 'process'), [], '', false);
+        $client = $this->getMock( $name, array( 'getBody', 'getHeader', 'process' ), [], '', false );
 
-        $client->expects($this->once())->method('getBody')->will($this->returnValue('body'));
-        $client->expects($this->once())->method('getHeader')->will($this->returnValue('header'));
+        $client->expects( $this->once() )->method( 'getBody' )->will( $this->returnValue( 'body' ) );
+        $client->expects( $this->once() )->method( 'getHeader' )->will( $this->returnValue( 'header' ) );
 
-        \Aimeos\Client\Html\Account\History\Factory::injectClient($name, $client);
+        \Aimeos\Client\Html\Account\History\Factory::injectClient( $name, $client );
         $output = $this->object->historyAction();
-        \Aimeos\Client\Html\Account\History\Factory::injectClient($name, null);
+        \Aimeos\Client\Html\Account\History\Factory::injectClient( $name, null );
 
-        $this->assertEquals('body', $output);
+        $this->assertEquals( 'body', $output );
     }
 }
\ No newline at end of file

Tests/Unit/UpdateTest.php

Spacing +4 added lines, -4 removed lines

@@ -4,7 +4,7 @@ 
 namespace Aimeos\Aimeos\Tests\Unit;
 
 
-require_once dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'class.ext_update.php';
+require_once dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'class.ext_update.php';
 
 
 class UpdateTest
@@ -21,7 +21,7 @@ 
 
     public function tearDown()
     {
-        unset($this->object);
+        unset( $this->object );
     }
 
 
@@ -30,7 +30,7 @@ 
      */
     public function access()
     {
-        $this->assertTrue($this->object->access());
+        $this->assertTrue( $this->object->access() );
     }
 
 
@@ -41,6 +41,6 @@ 
     {
         $result = $this->object->main();
 
-        $this->assertContains('Setup process lasted', $result);
+        $this->assertContains( 'Setup process lasted', $result );
     }
 }
\ No newline at end of file

Classes/Scheduler/Provider/Email6.php

Spacing +10 added lines, -10 removed lines

@@ -34,12 +34,12 @@ 
      *            ['cshKey']        => The CSH key for the field
      *            ['cshLabel']    => The code of the CSH label
      */
-    public function getAdditionalFields(array &$taskInfo, $task, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject)
+    public function getAdditionalFields( array &$taskInfo, $task, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject )
     {
         try {
-            return $this->getFields($taskInfo, $task, $parentObject);
-        } catch(\Exception $e) {
-            $this->addMessage($e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR);
+            return $this->getFields( $taskInfo, $task, $parentObject );
+        } catch( \Exception $e ) {
+            $this->addMessage( $e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR );
         }
 
         return [];
@@ -54,9 +54,9 @@ 
      * @param array $submittedData Array containing the data submitted by the user
      * @param tx_scheduler_Task    $task Reference to the current task object
      */
-    public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task)
+    public function saveAdditionalFields( array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task )
     {
-        $this->saveFields($submittedData, $task);
+        $this->saveFields( $submittedData, $task );
     }
 
 
@@ -69,12 +69,12 @@ 
      * @param tx_scheduler_Module $parentObject Reference to the calling object (Scheduler's BE module)
      * @return boolean True if validation was ok (or selected class is not relevant), false otherwise
      */
-    public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject)
+    public function validateAdditionalFields( array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject )
     {
         try {
-            return $this->validateFields($submittedData, $parentObject);
-        } catch(\Exception $e) {
-            $this->addMessage($e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR);
+            return $this->validateFields( $submittedData, $parentObject );
+        } catch( \Exception $e ) {
+            $this->addMessage( $e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR );
         }
 
         return false;

Braces +10 added lines, -4 removed lines

@@ -36,9 +36,12 @@ 
      */
     public function getAdditionalFields(array &$taskInfo, $task, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject)
     {
-        try {
+        try
+        {
             return $this->getFields($taskInfo, $task, $parentObject);
-        } catch(\Exception $e) {
+        }
+        catch(\Exception $e)
+        {
             $this->addMessage($e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR);
         }
 
@@ -71,9 +74,12 @@ 
      */
     public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject)
     {
-        try {
+        try
+        {
             return $this->validateFields($submittedData, $parentObject);
-        } catch(\Exception $e) {
+        }
+        catch(\Exception $e)
+        {
             $this->addMessage($e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR);
         }
 

Tests/Unit/Scheduler/Task/Typo6Test.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
     public function tearDown()
     {
-        unset($this->object);
+        unset( $this->object );
     }
 
 
@@ -29,6 +29,6 @@ 
     {
         $result = $this->object->execute();
 
-        $this->assertTrue($result);
+        $this->assertTrue( $result );
     }
 }

Classes/Controller/AbstractController.php

Braces +3 added lines, -1 removed lines

@@ -165,9 +165,11 @@
         $header = (string) $client->header($uid);
         $html = (string) $client->body($uid);
 
-        if (!isset($this->responseFactory)) // TYPO3 10
+        if (!isset($this->responseFactory)) {
+            // TYPO3 10
         {
             $this->response->addAdditionalHeaderData($header);
+        }
             return $html;
         }
 

Spacing +57 added lines, -57 removed lines

@@ -35,15 +35,15 @@ 
      * @return bool True if the user is allowed to access the site
      * @throws \TYPO3\CMS\Core\Resource\Exception\InsufficientUserPermissionsException If user doesn't have access
      */
-    protected function checkSite(array $sitePath, $userSiteId) : bool
+    protected function checkSite( array $sitePath, $userSiteId ) : bool
     {
-        foreach (array_reverse($sitePath) as $siteid) {
-            if ((string) $userSiteId === (string) $siteid) {
+        foreach( array_reverse( $sitePath ) as $siteid ) {
+            if( (string) $userSiteId === (string) $siteid ) {
                 return true;
             }
         }
 
-        throw new \TYPO3\CMS\Core\Resource\Exception\InsufficientUserPermissionsException('Access not allowed');
+        throw new \TYPO3\CMS\Core\Resource\Exception\InsufficientUserPermissionsException( 'Access not allowed' );
     }
 
 
@@ -54,33 +54,33 @@ 
      * @param bool $withView True to add view to context object, false for no view
      * @return \Aimeos\MShop\ContextIface Context item
      */
-    protected function context(string $templatePath = 'client/html/templates',
-        bool $withView = true) : \Aimeos\MShop\ContextIface
+    protected function context( string $templatePath = 'client/html/templates',
+        bool $withView = true ) : \Aimeos\MShop\ContextIface
     {
-        $config = Base::config((array) $this->settings);
+        $config = Base::config( (array) $this->settings );
 
-        if (!isset(self::$context)) {
-            $context = Base::context($config);
-            $locale = Base::locale($context, $this->request);
-            $context->setI18n(Base::i18n([$locale->getLanguageId()], $config->get('i18n', [])));
-            $context->setLocale($locale);
+        if( !isset( self::$context ) ) {
+            $context = Base::context( $config );
+            $locale = Base::locale( $context, $this->request );
+            $context->setI18n( Base::i18n( [$locale->getLanguageId()], $config->get( 'i18n', [] ) ) );
+            $context->setLocale( $locale );
 
             self::$context = $context;
         }
 
         // Use plugin specific configuration
-        self::$context->setConfig($config);
+        self::$context->setConfig( $config );
 
-        foreach (self::$context->locale()->getSiteItem()->getConfig() as $key => $value) {
-            $config->set($key, $value);
+        foreach( self::$context->locale()->getSiteItem()->getConfig() as $key => $value ) {
+            $config->set( $key, $value );
         }
 
-        if ($withView === true) {
+        if( $withView === true ) {
             $langid = self::$context->locale()->getLanguageId();
-            $paths = Base::aimeos()->getTemplatePaths($templatePath);
-            $view = Base::view(self::$context, $this->uriBuilder, $paths, $this->request, $langid);
+            $paths = Base::aimeos()->getTemplatePaths( $templatePath );
+            $view = Base::view( self::$context, $this->uriBuilder, $paths, $this->request, $langid );
 
-            self::$context->setView($view);
+            self::$context->setView( $view );
         }
 
         return self::$context;
@@ -94,48 +94,48 @@ 
      * @param bool $withView True to add view to context object, false for no view
      * @return \Aimeos\MShop\ContextIface Context item
      */
-    protected function contextBackend(string $templatePath = 'admin/jqadm/templates',
-        bool $withView = true) : \Aimeos\MShop\ContextIface
+    protected function contextBackend( string $templatePath = 'admin/jqadm/templates',
+        bool $withView = true ) : \Aimeos\MShop\ContextIface
     {
-        if (!isset($this->contextBE)) {
+        if( !isset( $this->contextBE ) ) {
             $lang = 'en';
             $site = 'default';
 
-            $config = Base::config((array) $this->settings);
-            $context = Base::context($config);
+            $config = Base::config( (array) $this->settings );
+            $context = Base::context( $config );
 
-            if ($this->request->hasArgument('locale') && ($value = $this->request->getArgument('locale')) != '') {
+            if( $this->request->hasArgument( 'locale' ) && ( $value = $this->request->getArgument( 'locale' ) ) != '' ) {
                 $lang = $value;
-            } elseif (!in_array($GLOBALS['BE_USER']->uc['lang'] ?? '', ['', 'default'])) {
+            } elseif( !in_array( $GLOBALS['BE_USER']->uc['lang'] ?? '', ['', 'default'] ) ) {
                 $lang = $GLOBALS['BE_USER']->uc['lang'];
             }
 
-            if ($this->request->hasArgument('site') && ($value = $this->request->getArgument('site')) != '') {
+            if( $this->request->hasArgument( 'site' ) && ( $value = $this->request->getArgument( 'site' ) ) != '' ) {
                 $site = $value;
-            } elseif (isset($GLOBALS['BE_USER']->user['siteid']) && $GLOBALS['BE_USER']->user['siteid'] != '') {
-                $siteManager = \Aimeos\MShop::create($context, 'locale/site');
-                $siteId = current(array_reverse(explode('.', trim($GLOBALS['BE_USER']->user['siteid'], '.'))));
-                $site = ($siteId ? $siteManager->get($siteId)->getCode() : 'default');
+            } elseif( isset( $GLOBALS['BE_USER']->user['siteid'] ) && $GLOBALS['BE_USER']->user['siteid'] != '' ) {
+                $siteManager = \Aimeos\MShop::create( $context, 'locale/site' );
+                $siteId = current( array_reverse( explode( '.', trim( $GLOBALS['BE_USER']->user['siteid'], '.' ) ) ) );
+                $site = ( $siteId ? $siteManager->get( $siteId )->getCode() : 'default' );
             }
 
-            $locale = Base::getLocaleBackend($context, $site);
-            $context->setLocale($locale);
+            $locale = Base::getLocaleBackend( $context, $site );
+            $context->setLocale( $locale );
 
-            if (isset($GLOBALS['BE_USER']->user['siteid']) && $GLOBALS['BE_USER']->user['siteid'] != '') {
-                $this->checkSite($locale->getSitePath(), $GLOBALS['BE_USER']->user['siteid']);
+            if( isset( $GLOBALS['BE_USER']->user['siteid'] ) && $GLOBALS['BE_USER']->user['siteid'] != '' ) {
+                $this->checkSite( $locale->getSitePath(), $GLOBALS['BE_USER']->user['siteid'] );
             }
 
-            $i18n = Base::i18n([$lang, 'en'], $config->get('i18n', []));
-            $context->setI18n($i18n);
+            $i18n = Base::i18n( [$lang, 'en'], $config->get( 'i18n', [] ) );
+            $context->setI18n( $i18n );
 
-            foreach ($locale->getSiteItem()->getConfig() as $key => $value) {
-                $config->set($key, $value);
+            foreach( $locale->getSiteItem()->getConfig() as $key => $value ) {
+                $config->set( $key, $value );
             }
 
-            if ($withView) {
-                $paths = Base::aimeos()->getTemplatePaths($templatePath);
-                $view = Base::view($context, $this->uriBuilder, $paths, $this->request, $lang);
-                $context->setView($view);
+            if( $withView ) {
+                $paths = Base::aimeos()->getTemplatePaths( $templatePath );
+                $view = Base::view( $context, $this->uriBuilder, $paths, $this->request, $lang );
+                $context->setView( $view );
             }
 
             $this->contextBE = $context;
@@ -151,31 +151,31 @@ 
      * @param \Aimeos\Client\Html\Iface $client Html client object (no type hint to prevent reflection)
      * @return string HTML code for inserting into the HTML body
      */
-    protected function getClientOutput(\Aimeos\Client\Html\Iface $client)
+    protected function getClientOutput( \Aimeos\Client\Html\Iface $client )
     {
         $uid = $this->ceUid;
-        if ($GLOBALS['TYPO3_REQUEST'] instanceof \Psr\Http\Message\ServerRequestInterface
-            && empty($GLOBALS['TYPO3_REQUEST']->getAttribute('routing')) === false
+        if( $GLOBALS['TYPO3_REQUEST'] instanceof \Psr\Http\Message\ServerRequestInterface
+            && empty( $GLOBALS['TYPO3_REQUEST']->getAttribute( 'routing' ) ) === false
         ) {
-            $uid .= '-' . $GLOBALS['TYPO3_REQUEST']->getAttribute('routing')->getPageType();
+            $uid .= '-' . $GLOBALS['TYPO3_REQUEST']->getAttribute( 'routing' )->getPageType();
         }
 
-        $client->setView($this->context()->view())->init();
-        $header = (string) $client->header($uid);
-        $html = (string) $client->body($uid);
+        $client->setView( $this->context()->view() )->init();
+        $header = (string) $client->header( $uid );
+        $html = (string) $client->body( $uid );
 
-        if (!isset($this->responseFactory)) // TYPO3 10
+        if( !isset( $this->responseFactory ) ) // TYPO3 10
         {
-            $this->response->addAdditionalHeaderData($header);
+            $this->response->addAdditionalHeaderData( $header );
             return $html;
         }
 
-        $renderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
-        $renderer->addHeaderData($header);
+        $renderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( \TYPO3\CMS\Core\Page\PageRenderer::class );
+        $renderer->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 ) );
     }
 
 
@@ -184,7 +184,7 @@ 
      */
     protected function initializeAction()
     {
-        $this->uriBuilder->setArgumentPrefix('ai');
+        $this->uriBuilder->setArgumentPrefix( 'ai' );
 
         $ce = $this->configurationManager->getContentObject();
         $this->ceUid = $ce->data['uid'] ?? null;

Classes/Setup.php

Indentation +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function getIdentifier() : string
     {
-      return 'aimeos';
+        return 'aimeos';
     }
 
 
@@ -48,7 +48,7 @@ 
      */
     public function getTitle() : string
     {
-      return 'Aimeos database migration';
+        return 'Aimeos database migration';
     }
 
 
@@ -59,7 +59,7 @@ 
      */
     public function getDescription() : string
     {
-      return 'Updates the Aimeos database tables and migrates data if necessary';
+        return 'Updates the Aimeos database tables and migrates data if necessary';
     }
 
 

Braces +9 added lines, -4 removed lines

@@ -70,7 +70,8 @@ 
      */
     public function executeUpdate() : bool
     {
-        try {
+        try
+        {
             ob_start();
             $exectimeStart = microtime(true);
 
@@ -78,7 +79,9 @@ 
 
             $this->output->writeln(ob_get_clean());
             $this->output->writeln(sprintf('Setup process lasted %1$f sec', (microtime(true) - $exectimeStart)));
-        } catch(\Throwable $t) {
+        }
+        catch(\Throwable $t)
+        {
             $this->output->writeln(ob_get_clean());
             $this->output->writeln($t->getMessage());
             $this->output->writeln($t->getTraceAsString());
@@ -174,7 +177,8 @@ 
 
             $tables = [];
             foreach(['fe_users_', 'madmin_', 'mshop_'] as $prefix) {
-                switch ($adapter) {
+                switch ($adapter)
+                {
                     case "pgsql": $sql = 'SELECT tablename FROM pg_catalog.pg_tables where tablename ~ \'^' . $prefix . '\''; break;
                     default: $sql = 'SHOW TABLES like \'' . $prefix . '%\'';
                 }
@@ -187,7 +191,8 @@ 
             }
 
             foreach($tables as $table) {
-                switch ($adapter) {
+                switch ($adapter)
+                {
                     case "pgsql":  $sql = 'CREATE TABLE IF NOT EXISTS ' . $table . '()'; break;
                     default: $sql = 'SHOW CREATE TABLE `' . $table . '`';
                 }

Spacing +61 added lines, -61 removed lines

@@ -72,16 +72,16 @@ 
     {
         try {
             ob_start();
-            $exectimeStart = microtime(true);
+            $exectimeStart = microtime( true );
 
             self::execute();
 
-            $this->output->writeln(ob_get_clean());
-            $this->output->writeln(sprintf('Setup process lasted %1$f sec', (microtime(true) - $exectimeStart)));
-        } catch(\Throwable $t) {
-            $this->output->writeln(ob_get_clean());
-            $this->output->writeln($t->getMessage());
-            $this->output->writeln($t->getTraceAsString());
+            $this->output->writeln( ob_get_clean() );
+            $this->output->writeln( sprintf( 'Setup process lasted %1$f sec', ( microtime( true ) - $exectimeStart ) ) );
+        } catch( \Throwable $t ) {
+            $this->output->writeln( ob_get_clean() );
+            $this->output->writeln( $t->getMessage() );
+            $this->output->writeln( $t->getTraceAsString() );
 
             return false;
         }
@@ -106,7 +106,7 @@ 
      *
      * @param OutputInterface $output
      */
-    public function setOutput(OutputInterface $output) : void
+    public function setOutput( OutputInterface $output ) : void
     {
         $this->output = $output;
     }
@@ -128,26 +128,26 @@ 
      */
     public static function execute()
     {
-        ini_set('max_execution_time', 0);
+        ini_set( 'max_execution_time', 0 );
 
-        $extconf = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class);
-        $demo = $extconf->get('aimeos', 'useDemoData') ?: false;
+        $extconf = GeneralUtility::makeInstance( \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class );
+        $demo = $extconf->get( 'aimeos', 'useDemoData' ) ?: false;
 
-        \Aimeos\MShop::cache(false);
-        \Aimeos\MAdmin::cache(false);
+        \Aimeos\MShop::cache( false );
+        \Aimeos\MAdmin::cache( false );
 
-        $site = $extconf->get('aimeos', 'siteCode') ?: 'default';
-        $template = $extconf->get('aimeos', 'siteTpl') ?: 'default';
-        $codelen = $extconf->get('aimeos', 'codeLength') ?: 64;
+        $site = $extconf->get( 'aimeos', 'siteCode' ) ?: 'default';
+        $template = $extconf->get( 'aimeos', 'siteTpl' ) ?: 'default';
+        $codelen = $extconf->get( 'aimeos', 'codeLength' ) ?: 64;
 
         $boostrap = \Aimeos\Aimeos\Base::aimeos();
-        $ctx = self::context(['setup' => ['default' => ['demo' => (string) $demo]]])->setEditor('setup');
+        $ctx = self::context( ['setup' => ['default' => ['demo' => (string) $demo]]] )->setEditor( 'setup' );
 
-        \Aimeos\Setup::use($boostrap, ['codelength' => $codelen])->verbose('vvv')
-            ->context($ctx->setEditor('aimeos:setup'))
-            ->up($site, $template);
+        \Aimeos\Setup::use( $boostrap, ['codelength' => $codelen] )->verbose( 'vvv' )
+            ->context( $ctx->setEditor( 'aimeos:setup' ) )
+            ->up( $site, $template );
 
-        $extconf->set('aimeos', ['useDemoData' => '']);
+        $extconf->set( 'aimeos', ['useDemoData' => ''] );
     }
 
 
@@ -157,45 +157,45 @@ 
      * @param array $list List of SQL statements
      * @return array SQL statements required for the install tool
      */
-    public static function schema(array $list) : array
+    public static function schema( array $list ) : array
     {
         $ctx = self::context();
-        $connectionNames = array_keys($ctx->config()->get( 'resource'));
-        $connectionNames = array_filter($connectionNames, fn (string $key): bool => str_starts_with($key, 'db'));
+        $connectionNames = array_keys( $ctx->config()->get( 'resource' ) );
+        $connectionNames = array_filter( $connectionNames, fn ( string $key ): bool => str_starts_with( $key, 'db' ) );
 
-        foreach ($connectionNames as $connectionName) {
-            $conn = $ctx->db($connectionName);
-            $adapter = $ctx->config('resource/' . $connectionName . '/adapter');
+        foreach( $connectionNames as $connectionName ) {
+            $conn = $ctx->db( $connectionName );
+            $adapter = $ctx->config( 'resource/' . $connectionName . '/adapter' );
 
             $tables = [];
-            foreach(['fe_users_', 'madmin_', 'mshop_'] as $prefix) {
-                switch ($adapter) {
+            foreach( ['fe_users_', 'madmin_', 'mshop_'] as $prefix ) {
+                switch( $adapter ) {
                     case "pgsql": $sql = 'SELECT tablename FROM pg_catalog.pg_tables where tablename ~ \'^' . $prefix . '\''; break;
                     default: $sql = 'SHOW TABLES like \'' . $prefix . '%\'';
                 }
 
-                $result = $conn->create($sql)->execute();
+                $result = $conn->create( $sql )->execute();
 
-                while(($row = $result->fetch(\Aimeos\Base\DB\Result\Base::FETCH_NUM)) !== null) {
+                while( ( $row = $result->fetch( \Aimeos\Base\DB\Result\Base::FETCH_NUM ) ) !== null ) {
                     $tables[] = $row[0];
                 }
             }
 
-            foreach($tables as $table) {
-                switch ($adapter) {
+            foreach( $tables as $table ) {
+                switch( $adapter ) {
                     case "pgsql":  $sql = 'CREATE TABLE IF NOT EXISTS ' . $table . '()'; break;
                     default: $sql = 'SHOW CREATE TABLE `' . $table . '`';
                 }
 
-                $result = $conn->create($sql)->execute();
+                $result = $conn->create( $sql )->execute();
 
-                while(($row = $result->fetch(\Aimeos\Base\DB\Result\Base::FETCH_NUM)) !== null) {
+                while( ( $row = $result->fetch( \Aimeos\Base\DB\Result\Base::FETCH_NUM ) ) !== null ) {
                     $str = $row[1];
 
-                    $str = str_replace('"', '`', $str);
-                    $str = preg_replace('/CONSTRAINT `[a-zA-Z0-9_-]+` /', '', $str);
-                    $str = preg_replace('/ DEFAULT CHARSET=[^ ;]+/', '', $str);
-                    $str = preg_replace('/ COLLATE=[^ ;]+/', '', $str);
+                    $str = str_replace( '"', '`', $str );
+                    $str = preg_replace( '/CONSTRAINT `[a-zA-Z0-9_-]+` /', '', $str );
+                    $str = preg_replace( '/ DEFAULT CHARSET=[^ ;]+/', '', $str );
+                    $str = preg_replace( '/ COLLATE=[^ ;]+/', '', $str );
 
                     $list[] = $str . ";\n";
                 }
@@ -211,12 +211,12 @@ 
      *
      * @param AlterTableDefinitionStatementsEvent $event Event object
      */
-    public function schemaEvent(AlterTableDefinitionStatementsEvent $event)
+    public function schemaEvent( AlterTableDefinitionStatementsEvent $event )
     {
-        $list = self::schema([]);
+        $list = self::schema( [] );
 
-        foreach ($list['sqlString'] ?? [] as $sql) {
-            $event->addSqlData($sql);
+        foreach( $list['sqlString'] ?? [] as $sql ) {
+            $event->addSqlData( $sql );
         }
     }
 
@@ -226,9 +226,9 @@ 
      *
      * @param AfterPackageActivationEvent $event Event object
      */
-    public function setupEvent(AfterPackageActivationEvent $event)
+    public function setupEvent( AfterPackageActivationEvent $event )
     {
-        if ($event->getPackageKey() === 'aimeos' && \Aimeos\Aimeos\Base::getExtConfig('autoSetup', true)) {
+        if( $event->getPackageKey() === 'aimeos' && \Aimeos\Aimeos\Base::getExtConfig( 'autoSetup', true ) ) {
             self::execute();
         }
     }
@@ -240,34 +240,34 @@ 
      * @param array $config Nested array of configuration settings
      * @return \Aimeos\MShop\ContextIface Context object
      */
-    protected static function context(array $config = []) : \Aimeos\MShop\ContextIface
+    protected static function context( array $config = [] ) : \Aimeos\MShop\ContextIface
     {
-        $aimeosExtPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('aimeos');
+        $aimeosExtPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath( 'aimeos' );
 
-        if (file_exists($aimeosExtPath . '/Resources/Libraries/autoload.php') === true) {
+        if( file_exists( $aimeosExtPath . '/Resources/Libraries/autoload.php' ) === true ) {
             require_once $aimeosExtPath . '/Resources/Libraries/autoload.php';
         }
 
         $ctx = new \Aimeos\MShop\Context();
-        $conf = \Aimeos\Aimeos\Base::config($config);
+        $conf = \Aimeos\Aimeos\Base::config( $config );
 
-        $ctx->setConfig($conf);
-        $ctx->setDatabaseManager(new \Aimeos\Base\DB\Manager\Standard($conf->get('resource', []), 'DBAL'));
-        $ctx->setFilesystemManager(new \Aimeos\Base\Filesystem\Manager\Standard($conf->get('resource', [])));
-        $ctx->setLogger(new \Aimeos\Base\Logger\Errorlog(\Aimeos\Base\Logger\Iface::INFO));
-        $ctx->setSession(new \Aimeos\Base\Session\None());
-        $ctx->setCache(new \Aimeos\Base\Cache\None());
+        $ctx->setConfig( $conf );
+        $ctx->setDatabaseManager( new \Aimeos\Base\DB\Manager\Standard( $conf->get( 'resource', [] ), 'DBAL' ) );
+        $ctx->setFilesystemManager( new \Aimeos\Base\Filesystem\Manager\Standard( $conf->get( 'resource', [] ) ) );
+        $ctx->setLogger( new \Aimeos\Base\Logger\Errorlog( \Aimeos\Base\Logger\Iface::INFO ) );
+        $ctx->setSession( new \Aimeos\Base\Session\None() );
+        $ctx->setCache( new \Aimeos\Base\Cache\None() );
 
         // Reset before child processes are spawned to avoid lost DB connections afterwards (TYPO3 9.4 and above)
-        if (php_sapi_name() === 'cli' && class_exists('\TYPO3\CMS\Core\Database\ConnectionPool')
-            && method_exists('\TYPO3\CMS\Core\Database\ConnectionPool', 'resetConnections')
+        if( php_sapi_name() === 'cli' && class_exists( '\TYPO3\CMS\Core\Database\ConnectionPool' )
+            && method_exists( '\TYPO3\CMS\Core\Database\ConnectionPool', 'resetConnections' )
         ) {
-            $ctx->setProcess(new \Aimeos\Base\Process\Pcntl(\Aimeos\Aimeos\Base::getExtConfig('pcntlMax', 4)));
+            $ctx->setProcess( new \Aimeos\Base\Process\Pcntl( \Aimeos\Aimeos\Base::getExtConfig( 'pcntlMax', 4 ) ) );
         } else {
-            $ctx->setProcess(new \Aimeos\Base\Process\None());
+            $ctx->setProcess( new \Aimeos\Base\Process\None() );
         }
 
-        $factory = GeneralUtility::makeInstance('TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory');
-        return $ctx->setPassword(new \Aimeos\Base\Password\Typo3($factory->getDefaultHashInstance('FE')));
+        $factory = GeneralUtility::makeInstance( 'TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory' );
+        return $ctx->setPassword( new \Aimeos\Base\Password\Typo3( $factory->getDefaultHashInstance( 'FE' ) ) );
     }
 }

Resources/Private/Config/admin.php

Indentation +85 added lines, -85 removed lines

@@ -1,89 +1,89 @@
 <?php
 
 return array(
-	'jqadm' => array(
-		'url' => array(
-			'batch' => array(
-				'controller' => 'Jqadm',
-				'action' => 'batch',
-				'config' => array(
-					'BE' => true,
-				),
-			),
-			'copy' => array(
-				'controller' => 'Jqadm',
-				'action' => 'copy',
-				'config' => array(
-					'BE' => true,
-				),
-			),
-			'create' => array(
-				'controller' => 'Jqadm',
-				'action' => 'create',
-				'config' => array(
-					'BE' => true,
-				),
-			),
-			'delete' => array(
-				'controller' => 'Jqadm',
-				'action' => 'delete',
-				'config' => array(
-					'BE' => true,
-				),
-			),
-			'export' => array(
-				'controller' => 'Jqadm',
-				'action' => 'export',
-				'config' => array(
-					'BE' => true,
-				),
-			),
-			'get' => array(
-				'controller' => 'Jqadm',
-				'action' => 'get',
-				'config' => array(
-					'BE' => true,
-				),
-			),
-			'import' => array(
-				'controller' => 'Jqadm',
-				'action' => 'import',
-				'config' => array(
-					'BE' => true,
-				),
-			),
-			'save' => array(
-				'controller' => 'Jqadm',
-				'action' => 'save',
-				'config' => array(
-					'BE' => true,
-				),
-			),
-			'search' => array(
-				'controller' => 'Jqadm',
-				'action' => 'search',
-				'config' => array(
-					'BE' => true,
-				),
-			),
-		),
-	),
-	'jsonadm' => array(
-		'url' => array(
-			'controller' => 'Jsonadm',
-			'action' => 'index',
-			'config' => array(
-				'absoluteUri' => true,
-				'BE' => true,
-			),
-			'options' => array(
-				'controller' => 'Jsonadm',
-				'action' => 'index',
-				'config' => array(
-					'absoluteUri' => true,
-					'BE' => true,
-				),
-			),
-		),
-	),
+    'jqadm' => array(
+        'url' => array(
+            'batch' => array(
+                'controller' => 'Jqadm',
+                'action' => 'batch',
+                'config' => array(
+                    'BE' => true,
+                ),
+            ),
+            'copy' => array(
+                'controller' => 'Jqadm',
+                'action' => 'copy',
+                'config' => array(
+                    'BE' => true,
+                ),
+            ),
+            'create' => array(
+                'controller' => 'Jqadm',
+                'action' => 'create',
+                'config' => array(
+                    'BE' => true,
+                ),
+            ),
+            'delete' => array(
+                'controller' => 'Jqadm',
+                'action' => 'delete',
+                'config' => array(
+                    'BE' => true,
+                ),
+            ),
+            'export' => array(
+                'controller' => 'Jqadm',
+                'action' => 'export',
+                'config' => array(
+                    'BE' => true,
+                ),
+            ),
+            'get' => array(
+                'controller' => 'Jqadm',
+                'action' => 'get',
+                'config' => array(
+                    'BE' => true,
+                ),
+            ),
+            'import' => array(
+                'controller' => 'Jqadm',
+                'action' => 'import',
+                'config' => array(
+                    'BE' => true,
+                ),
+            ),
+            'save' => array(
+                'controller' => 'Jqadm',
+                'action' => 'save',
+                'config' => array(
+                    'BE' => true,
+                ),
+            ),
+            'search' => array(
+                'controller' => 'Jqadm',
+                'action' => 'search',
+                'config' => array(
+                    'BE' => true,
+                ),
+            ),
+        ),
+    ),
+    'jsonadm' => array(
+        'url' => array(
+            'controller' => 'Jsonadm',
+            'action' => 'index',
+            'config' => array(
+                'absoluteUri' => true,
+                'BE' => true,
+            ),
+            'options' => array(
+                'controller' => 'Jsonadm',
+                'action' => 'index',
+                'config' => array(
+                    'absoluteUri' => true,
+                    'BE' => true,
+                ),
+            ),
+        ),
+    ),
 );

Resources/Private/Config/controller.php

Indentation +9 added lines, -9 removed lines

@@ -1,13 +1,13 @@
 <?php
 
 return array(
-	'common' => array(
-		'media' => array(
-			// Mime icon related settings
-			'mimeicon' => array(
-				// File extension of mime type icons
-				'extension' => '.png',
-			),
-		),
-	),
+    'common' => array(
+        'media' => array(
+            // Mime icon related settings
+            'mimeicon' => array(
+                // File extension of mime type icons
+                'extension' => '.png',
+            ),
+        ),
+    ),
 );