aimeos / aimeos-typo3

Classes/Setup.php

Spacing +68 added lines, -68 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,30 +128,30 @@ 
      */
     public static function execute()
     {
-        ini_set('max_execution_time', 0);
+        ini_set( 'max_execution_time', 0 );
 
-        $objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-        $extconf = $objectManager->get('TYPO3\CMS\Core\Configuration\ExtensionConfiguration');
-        $demo = $extconf->get('aimeos', 'useDemoData');
+        $objectManager = GeneralUtility::makeInstance( \TYPO3\CMS\Extbase\Object\ObjectManager::class );
+        $extconf = $objectManager->get( 'TYPO3\CMS\Core\Configuration\ExtensionConfiguration' );
+        $demo = $extconf->get( 'aimeos', 'useDemoData' );
 
-        \Aimeos\MShop::cache(false);
-        \Aimeos\MAdmin::cache(false);
+        \Aimeos\MShop::cache( false );
+        \Aimeos\MAdmin::cache( false );
 
-        $site = $extconf->get('siteCode', 'default');
-        $template = $extconf->get('siteTpl', 'default');
-        $codelen = $extconf->get('codeLength', 64);
+        $site = $extconf->get( 'siteCode', 'default' );
+        $template = $extconf->get( 'siteTpl', 'default' );
+        $codelen = $extconf->get( '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 );
 
-        if (defined('TYPO3_version') && version_compare(constant('TYPO3_version'), '11.0.0', '<')) {
-            $extconf->set('aimeos', 'useDemoData', '');
+        if( defined( 'TYPO3_version' ) && version_compare( constant( 'TYPO3_version' ), '11.0.0', '<' ) ) {
+            $extconf->set( 'aimeos', 'useDemoData', '' );
         } else {
-            $extconf->set('aimeos', ['useDemoData' => '']);
+            $extconf->set( 'aimeos', ['useDemoData' => ''] );
         }
     }
 
@@ -162,45 +162,45 @@ 
      * @param array $sql List of SQL statements
      * @return array SQL statements required for the install tool
      */
-    public static function schema(array $sql) : array
+    public static function schema( array $sql ) : array
     {
         $ctx = self::getContext();
-        $connectionNames = array_keys($ctx->getConfig()->get( 'resource'));
-        $connectionNames = array_filter($connectionNames, fn (string $key): bool => str_starts_with($key, 'db'));
+        $connectionNames = array_keys( $ctx->getConfig()->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 );
 
                     $sql[] = $str . ";\n";
                 }
@@ -216,9 +216,9 @@ 
      *
      * @param string|null $extname Installed extension name
      */
-    public static function executeOnSignal(string $extname = null)
+    public static function executeOnSignal( string $extname = null )
     {
-        self::signal($extname);
+        self::signal( $extname );
     }
 
 
@@ -227,9 +227,9 @@ 
      *
      * @param string|null $extname Installed extension name
      */
-    public static function signal(string $extname = null)
+    public static function signal( string $extname = null )
     {
-        if ($extname === 'aimeos' && \Aimeos\Aimeos\Base::getExtConfig('autoSetup', true)) {
+        if( $extname === 'aimeos' && \Aimeos\Aimeos\Base::getExtConfig( 'autoSetup', true ) ) {
             self::execute();
         }
     }
@@ -240,12 +240,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 );
         }
     }
 
@@ -255,9 +255,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();
         }
     }
@@ -269,34 +269,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' ) ) );
     }
 }

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 . '`';
                 }

Resources/Private/Config/resource.php

Switch Indentation +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
 }
 
 switch($adapter) {
-	case 'mysql': $stmt = ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8'; SET SESSION sql_mode='ANSI'; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"]; break;
-	default: $stmt = [];
+	    case 'mysql': $stmt = ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8'; SET SESSION sql_mode='ANSI'; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"]; break;
+	    default: $stmt = [];
 }
 
 return [

Indentation +72 added lines, -72 removed lines

@@ -5,82 +5,82 @@
 $driver = $defaultConnection['driver'];
 
 switch($driver) {
-	case 'mysqli':
-	case 'pdo_mysql': $adapter = 'mysql'; break;
-	case 'pdo_oci': $adapter = 'oracle'; break;
-	case 'pdo_pgsql': $adapter = 'pgsql'; break;
-	case 'pdo_sqlite': $adapter = 'sqlite'; break;
-	case 'pdo_sqlsrv': $adapter = 'sqlsrv'; break;
-	default: $adapter = $driver;
+    case 'mysqli':
+    case 'pdo_mysql': $adapter = 'mysql'; break;
+    case 'pdo_oci': $adapter = 'oracle'; break;
+    case 'pdo_pgsql': $adapter = 'pgsql'; break;
+    case 'pdo_sqlite': $adapter = 'sqlite'; break;
+    case 'pdo_sqlsrv': $adapter = 'sqlsrv'; break;
+    default: $adapter = $driver;
 }
 
 switch($adapter) {
-	case 'mysql': $stmt = ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8'; SET SESSION sql_mode='ANSI'; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"]; break;
-	default: $stmt = [];
+    case 'mysql': $stmt = ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8'; SET SESSION sql_mode='ANSI'; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"]; break;
+    default: $stmt = [];
 }
 
 return [
-	'db' => [
-		'adapter' => $adapter,
-		'host' => $defaultConnection['host'] ?? null,
-		'port' => $defaultConnection['port'] ?? null,
-		'socket' => $defaultConnection['socket'] ?? null,
-		'database' => $defaultConnection['dbname'] ?? null,
-		'username' => $defaultConnection['user'] ?? null,
-		'password' => $defaultConnection['password'] ?? null,
-		'stmt' => $stmt,
-		'defaultTableOptions' => [
-			'charset' => $defaultConnection['tableoptions']['charset'] ?? 'utf8',
-			'collate' => $defaultConnection['tableoptions']['collate'] ?? 'utf8_unicode_ci',
-		],
-		'limit' => 3,
-	],
-	'fs' => [
-		'adapter' => 'Standard',
-		'baseurl' => '/uploads/tx_aimeos',
-		'basedir' => $publicPath . '/uploads/tx_aimeos',
-		'tempdir' => $publicPath . '/typo3temp',
-	],
-	'fs-media' => [
-		'adapter' => 'Standard',
-		'baseurl' => '/uploads/tx_aimeos',
-		'basedir' => $publicPath . '/uploads/tx_aimeos',
-		'tempdir' => $publicPath . '/typo3temp',
-	],
-	'fs-mimeicon' => [
-		'adapter' => 'Standard',
-		'baseurl' => '/typo3conf/ext/aimeos/Resources/Public/Images/Mimeicons',
-		'basedir' => $publicPath . '/typo3conf/ext/aimeos/Resources/Public/Images/Mimeicons',
-		'tempdir' => $publicPath . '/typo3temp',
-	],
-	'fs-theme' => [
-		'adapter' => 'Standard',
-		'baseurl' => '/typo3conf/ext/aimeos/Resources/Public/Themes',
-		'basedir' => $publicPath . '/typo3conf/ext/aimeos/Resources/Public/Themes',
-		'tempdir' => $publicPath . '/typo3temp',
-	],
-	'fs-admin' => [
-		'adapter' => 'Standard',
-		'basedir' => $publicPath . '/uploads/tx_aimeos/.secure/admin',
-		'tempdir' => $publicPath . '/typo3temp',
-	],
-	'fs-export' => [
-		'adapter' => 'Standard',
-		'basedir' => $publicPath . '/uploads/tx_aimeos/.secure/export',
-		'tempdir' => $publicPath . '/typo3temp',
-	],
-	'fs-import' => [
-		'adapter' => 'Standard',
-		'basedir' => $publicPath . '/uploads/tx_aimeos/.secure/import',
-		'tempdir' => $publicPath . '/typo3temp',
-	],
-	'fs-secure' => [
-		'adapter' => 'Standard',
-		'basedir' => $publicPath . '/uploads/tx_aimeos/.secure',
-		'tempdir' => $publicPath . '/typo3temp',
-	],
-	'mq' => [
-		'adapter' => 'Standard',
-		'db' => 'db',
-	],
+    'db' => [
+        'adapter' => $adapter,
+        'host' => $defaultConnection['host'] ?? null,
+        'port' => $defaultConnection['port'] ?? null,
+        'socket' => $defaultConnection['socket'] ?? null,
+        'database' => $defaultConnection['dbname'] ?? null,
+        'username' => $defaultConnection['user'] ?? null,
+        'password' => $defaultConnection['password'] ?? null,
+        'stmt' => $stmt,
+        'defaultTableOptions' => [
+            'charset' => $defaultConnection['tableoptions']['charset'] ?? 'utf8',
+            'collate' => $defaultConnection['tableoptions']['collate'] ?? 'utf8_unicode_ci',
+        ],
+        'limit' => 3,
+    ],
+    'fs' => [
+        'adapter' => 'Standard',
+        'baseurl' => '/uploads/tx_aimeos',
+        'basedir' => $publicPath . '/uploads/tx_aimeos',
+        'tempdir' => $publicPath . '/typo3temp',
+    ],
+    'fs-media' => [
+        'adapter' => 'Standard',
+        'baseurl' => '/uploads/tx_aimeos',
+        'basedir' => $publicPath . '/uploads/tx_aimeos',
+        'tempdir' => $publicPath . '/typo3temp',
+    ],
+    'fs-mimeicon' => [
+        'adapter' => 'Standard',
+        'baseurl' => '/typo3conf/ext/aimeos/Resources/Public/Images/Mimeicons',
+        'basedir' => $publicPath . '/typo3conf/ext/aimeos/Resources/Public/Images/Mimeicons',
+        'tempdir' => $publicPath . '/typo3temp',
+    ],
+    'fs-theme' => [
+        'adapter' => 'Standard',
+        'baseurl' => '/typo3conf/ext/aimeos/Resources/Public/Themes',
+        'basedir' => $publicPath . '/typo3conf/ext/aimeos/Resources/Public/Themes',
+        'tempdir' => $publicPath . '/typo3temp',
+    ],
+    'fs-admin' => [
+        'adapter' => 'Standard',
+        'basedir' => $publicPath . '/uploads/tx_aimeos/.secure/admin',
+        'tempdir' => $publicPath . '/typo3temp',
+    ],
+    'fs-export' => [
+        'adapter' => 'Standard',
+        'basedir' => $publicPath . '/uploads/tx_aimeos/.secure/export',
+        'tempdir' => $publicPath . '/typo3temp',
+    ],
+    'fs-import' => [
+        'adapter' => 'Standard',
+        'basedir' => $publicPath . '/uploads/tx_aimeos/.secure/import',
+        'tempdir' => $publicPath . '/typo3temp',
+    ],
+    'fs-secure' => [
+        'adapter' => 'Standard',
+        'basedir' => $publicPath . '/uploads/tx_aimeos/.secure',
+        'tempdir' => $publicPath . '/typo3temp',
+    ],
+    'mq' => [
+        'adapter' => 'Standard',
+        'db' => 'db',
+    ],
 ];

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 $defaultConnection = $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default'];
 $driver = $defaultConnection['driver'];
 
-switch($driver) {
+switch( $driver ) {
 	case 'mysqli':
 	case 'pdo_mysql': $adapter = 'mysql'; break;
 	case 'pdo_oci': $adapter = 'oracle'; break;
@@ -14,7 +14,7 @@ 
 	default: $adapter = $driver;
 }
 
-switch($adapter) {
+switch( $adapter ) {
 	case 'mysql': $stmt = ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8'; SET SESSION sql_mode='ANSI'; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"]; break;
 	default: $stmt = [];
 }

Braces +4 added lines, -2 removed lines

@@ -4,7 +4,8 @@ 
 $defaultConnection = $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default'];
 $driver = $defaultConnection['driver'];
 
-switch($driver) {
+switch($driver)
+{
 	case 'mysqli':
 	case 'pdo_mysql': $adapter = 'mysql'; break;
 	case 'pdo_oci': $adapter = 'oracle'; break;
@@ -14,7 +15,8 @@ 
 	default: $adapter = $driver;
 }
 
-switch($adapter) {
+switch($adapter)
+{
 	case 'mysql': $stmt = ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8'; SET SESSION sql_mode='ANSI'; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"]; break;
 	default: $stmt = [];
 }