Passed
Pull Request — master (#156)
by Stephan
03:02
created
Classes/Base/Context.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -280,12 +280,10 @@  discard block
 block discarded – undo
280 280
 		{
281 281
 			$context->setUserId( $GLOBALS['TSFE']->fe_user->user[$GLOBALS['TSFE']->fe_user->userid_column] );
282 282
 			$context->setEditor( (string) $GLOBALS['TSFE']->fe_user->user['username'] );
283
-		}
284
-		elseif( TYPO3_MODE === 'BE' && isset( $GLOBALS['BE_USER']->user['username'] ) )
283
+		} elseif( TYPO3_MODE === 'BE' && isset( $GLOBALS['BE_USER']->user['username'] ) )
285 284
 		{
286 285
 			$context->setEditor( (string) $GLOBALS['BE_USER']->user['username'] );
287
-		}
288
-		else
286
+		} else
289 287
 		{
290 288
 			$context->setEditor( (string) GeneralUtility::getIndpEnv( 'REMOTE_ADDR' ) );
291 289
 		}
@@ -312,8 +310,7 @@  discard block
 block discarded – undo
312 310
 		{
313 311
 			$ids = GeneralUtility::trimExplode( ',', $GLOBALS['TSFE']->fe_user->user['usergroup'] );
314 312
 			$context->setGroupIds( $ids );
315
-		}
316
-		elseif( TYPO3_MODE === 'BE' && $GLOBALS['BE_USER']->userGroups )
313
+		} elseif( TYPO3_MODE === 'BE' && $GLOBALS['BE_USER']->userGroups )
317 314
 		{
318 315
 			$ids = array_keys( $GLOBALS['BE_USER']->userGroups );
319 316
 			$context->setGroupIds( $ids );
Please login to merge, or discard this patch.
Classes/Scheduler/Provider/Typo6.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -37,9 +37,12 @@  discard block
 block discarded – undo
37 37
 	 */
38 38
 	public function getAdditionalFields( array &$taskInfo, $task, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject )
39 39
 	{
40
-		try {
40
+		try
41
+		{
41 42
 			return $this->getFields( $taskInfo, $task, $parentObject );
42
-		} catch( \Exception $e ) {
43
+		}
44
+		catch( \Exception $e )
45
+		{
43 46
 			$this->addMessage( $e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR );
44 47
 		}
45 48
 
@@ -72,9 +75,12 @@  discard block
 block discarded – undo
72 75
 	 */
73 76
 	public function validateAdditionalFields( array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject )
74 77
 	{
75
-		try {
78
+		try
79
+		{
76 80
 			return $this->validateFields( $submittedData, $parentObject );
77
-		} catch( \Exception $e ) {
81
+		}
82
+		catch( \Exception $e )
83
+		{
78 84
 			$this->addMessage( $e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR );
79 85
 		}
80 86
 
Please login to merge, or discard this patch.
Classes/Scheduler/Provider/Email6.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -37,9 +37,12 @@  discard block
 block discarded – undo
37 37
 	 */
38 38
 	public function getAdditionalFields( array &$taskInfo, $task, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject )
39 39
 	{
40
-		try {
40
+		try
41
+		{
41 42
 			return $this->getFields( $taskInfo, $task, $parentObject );
42
-		} catch( \Exception $e ) {
43
+		}
44
+		catch( \Exception $e )
45
+		{
43 46
 			$this->addMessage( $e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR );
44 47
 		}
45 48
 
@@ -72,9 +75,12 @@  discard block
 block discarded – undo
72 75
 	 */
73 76
 	public function validateAdditionalFields( array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject )
74 77
 	{
75
-		try {
78
+		try
79
+		{
76 80
 			return $this->validateFields( $submittedData, $parentObject );
77
-		} catch( \Exception $e ) {
81
+		}
82
+		catch( \Exception $e )
83
+		{
78 84
 			$this->addMessage( $e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR );
79 85
 		}
80 86
 
Please login to merge, or discard this patch.
Classes/Base/View.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -83,13 +83,11 @@  discard block
 block discarded – undo
83 83
 					$groups[] = $entry['title'];
84 84
 				}
85 85
 				$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $groups );
86
-			}
87
-			else
86
+			} else
88 87
 			{
89 88
 				$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
90 89
 			}
91
-		}
92
-		else
90
+		} else
93 91
 		{
94 92
 			$t3context = GeneralUtility::makeInstance( 'TYPO3\CMS\Core\Context\Context' );
95 93
 
@@ -311,8 +309,7 @@  discard block
 block discarded – undo
311 309
 		{
312 310
 			$i18n = \Aimeos\Aimeos\Base::getI18n( [$langid], $local );
313 311
 			$translation = $i18n[$langid];
314
-		}
315
-		else
312
+		} else
316 313
 		{
317 314
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
318 315
 		}
Please login to merge, or discard this patch.
Classes/Custom/Composer.php 1 patch
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -79,8 +79,7 @@  discard block
 block discarded – undo
79 79
 				if( copy( $item, $target ) === false ) {
80 80
 					throw new \RuntimeException( sprintf( 'Unable to copy file "%1$s"', $item ) );
81 81
 				}
82
-			}
83
-			else
82
+			} else
84 83
 			{
85 84
 				self::createDirectory( $target );
86 85
 			}
@@ -158,13 +157,14 @@  discard block
 block discarded – undo
158 157
 			{
159 158
 				\Composer\Factory::createHttpDownloader( $event->getIO(), $config )
160 159
 					->get( 'https://api.github.com/graphql', $options );
161
-			}
162
-			else
160
+			} else
163 161
 			{
164 162
 				\Composer\Factory::createRemoteFilesystem( $event->getIO(), $config )
165 163
 					->getContents( 'github.com', 'https://api.github.com/graphql', false, $options );
166 164
 			}
167 165
 		}
168
-		catch( \Exception $e ) {}
166
+		catch( \Exception $e )
167
+		{
168
+}
169 169
 	}
170 170
 }
Please login to merge, or discard this patch.
Classes/Base/Locale.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -88,9 +88,12 @@
 block discarded – undo
88 88
 	{
89 89
 		$localeManager = \Aimeos\MShop::create( $context, 'locale' );
90 90
 
91
-		try {
91
+		try
92
+		{
92 93
 			$localeItem = $localeManager->bootstrap( $site, '', '', false, null, true );
93
-		} catch( \Aimeos\MShop\Exception $e ) {
94
+		}
95
+		catch( \Aimeos\MShop\Exception $e )
96
+		{
94 97
 			$localeItem = $localeManager->create();
95 98
 		}
96 99
 
Please login to merge, or discard this patch.
Classes/Command/SetupCommand.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -71,9 +71,12 @@
 block discarded – undo
71 71
 			$task = reset( $task );
72 72
 		}
73 73
 
74
-		try {
74
+		try
75
+		{
75 76
 			$manager->migrate( $task );
76
-		} catch( \Throwable $t ) {
77
+		}
78
+		catch( \Throwable $t )
79
+		{
77 80
 			$output->writeln( sprintf( "Error <error>%s</error> while initializing or updating the Aimeos database\n<debug>%s</debug>", $t->getMessage(), $t->getTraceAsString() ) );
78 81
 
79 82
 			return 1;
Please login to merge, or discard this patch.
Configuration/_Services.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,7 @@
 block discarded – undo
7 7
 use Symfony\Component\DependencyInjection\Reference;
8 8
 
9 9
 
10
-return function( ContainerConfigurator $configurator, ContainerBuilder $containerBuilder )
11
-{
10
+return function( ContainerConfigurator $configurator, ContainerBuilder $containerBuilder ) {
12 11
 	$services = $configurator->services();
13 12
 
14 13
 	if( \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded( 'aimeos' ) )
Please login to merge, or discard this patch.
Configuration/TCA/Overrides/tt_content.php 2 patches
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -1,78 +1,78 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 if ( !defined( 'TYPO3_MODE' ) ) {
4
-    die( 'Access denied.' );
4
+	die( 'Access denied.' );
5 5
 }
6 6
 
7 7
 $registerPlugins = function (array $plugins, string $pluginGroup) {
8
-    foreach ( $plugins as $pluginName ) {
9
-        $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['aimeos_' . $pluginName] = 'pi_flexform';
10
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
11
-            'aimeos_' . $pluginName,
12
-            'FILE:EXT:aimeos/Configuration/FlexForms/' . str_replace( '-', '', ucwords( $pluginName, '-' ) ) . '.xml'
13
-        );
14
-        \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
15
-            'Aimeos.aimeos',
16
-            $pluginName,
17
-            'LLL:EXT:aimeos/Resources/Private/Language/admin.xlf:aimeos_' . $pluginName . '.title',
18
-            'aimeos_'  .$pluginName,
19
-            'Aimeos Shop: ' .$pluginGroup
20
-        );
21
-    }
8
+	foreach ( $plugins as $pluginName ) {
9
+		$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['aimeos_' . $pluginName] = 'pi_flexform';
10
+		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
11
+			'aimeos_' . $pluginName,
12
+			'FILE:EXT:aimeos/Configuration/FlexForms/' . str_replace( '-', '', ucwords( $pluginName, '-' ) ) . '.xml'
13
+		);
14
+		\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
15
+			'Aimeos.aimeos',
16
+			$pluginName,
17
+			'LLL:EXT:aimeos/Resources/Private/Language/admin.xlf:aimeos_' . $pluginName . '.title',
18
+			'aimeos_'  .$pluginName,
19
+			'Aimeos Shop: ' .$pluginGroup
20
+		);
21
+	}
22 22
 };
23 23
 
24 24
 $registerPlugins(
25
-    [
26
-    'jsonapi',
27
-    'locale-select'
28
-    ], 'Tools'
25
+	[
26
+	'jsonapi',
27
+	'locale-select'
28
+	], 'Tools'
29 29
 );
30 30
 $registerPlugins(
31
-    [
32
-    'catalog-attribute',
33
-    'catalog-count',
34
-    'catalog-detail',
35
-    'catalog-filter',
36
-    'catalog-home',
37
-    'catalog-list',
38
-    'catalog-price',
39
-    'catalog-search',
40
-    'catalog-session',
41
-    'catalog-stage',
42
-    'catalog-stock',
43
-    'catalog-suggest',
44
-    'catalog-supplier',
45
-    'catalog-tree',
46
-    ],
47
-    'Catalog'
31
+	[
32
+	'catalog-attribute',
33
+	'catalog-count',
34
+	'catalog-detail',
35
+	'catalog-filter',
36
+	'catalog-home',
37
+	'catalog-list',
38
+	'catalog-price',
39
+	'catalog-search',
40
+	'catalog-session',
41
+	'catalog-stage',
42
+	'catalog-stock',
43
+	'catalog-suggest',
44
+	'catalog-supplier',
45
+	'catalog-tree',
46
+	],
47
+	'Catalog'
48 48
 );
49 49
 $registerPlugins(
50
-    [
51
-    'basket-bulk',
52
-    'basket-related',
53
-    'basket-small',
54
-    'basket-standard',
55
-    ],
56
-    'Basket'
50
+	[
51
+	'basket-bulk',
52
+	'basket-related',
53
+	'basket-small',
54
+	'basket-standard',
55
+	],
56
+	'Basket'
57 57
 );
58 58
 $registerPlugins(
59
-    [
60
-    'checkout-confirm',
61
-    'checkout-standard',
62
-    'checkout-update',
63
-    ],
64
-    'Checkout'
59
+	[
60
+	'checkout-confirm',
61
+	'checkout-standard',
62
+	'checkout-update',
63
+	],
64
+	'Checkout'
65 65
 );
66 66
 $registerPlugins(
67
-    [
68
-    'account-download',
69
-    'account-history',
70
-    'account-favorite',
71
-    'account-profile',
72
-    'account-review',
73
-    'account-subscription',
74
-    'account-watch',
75
-    ],
76
-    'Account'
67
+	[
68
+	'account-download',
69
+	'account-history',
70
+	'account-favorite',
71
+	'account-profile',
72
+	'account-review',
73
+	'account-subscription',
74
+	'account-watch',
75
+	],
76
+	'Account'
77 77
 );
78 78
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if ( !defined( 'TYPO3_MODE' ) ) {
3
+if( !defined( 'TYPO3_MODE' ) ) {
4 4
     die( 'Access denied.' );
5 5
 }
6 6
 
7
-$registerPlugins = function (array $plugins, string $pluginGroup) {
8
-    foreach ( $plugins as $pluginName ) {
7
+$registerPlugins = function( array $plugins, string $pluginGroup ) {
8
+    foreach( $plugins as $pluginName ) {
9 9
         $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['aimeos_' . $pluginName] = 'pi_flexform';
10 10
         \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
11 11
             'aimeos_' . $pluginName,
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
             'Aimeos.aimeos',
16 16
             $pluginName,
17 17
             'LLL:EXT:aimeos/Resources/Private/Language/admin.xlf:aimeos_' . $pluginName . '.title',
18
-            'aimeos_'  .$pluginName,
19
-            'Aimeos Shop: ' .$pluginGroup
18
+            'aimeos_' . $pluginName,
19
+            'Aimeos Shop: ' . $pluginGroup
20 20
         );
21 21
     }
22 22
 };
Please login to merge, or discard this patch.