netz98 / n98-magerun

src/N98/Magento/Command/System/Cron/AbstractCronCommand.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
     /**
      * Get job configuration from XML and database. Expression priority is given to the database.
      *
-     * @return Traversable|Mage_Core_Model_Config_Element[]
+     * @return AppendIterator
      */
     private function getJobConfigElements()
     {

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         $expr = null;
 
         if (isset($job->schedule->config_path)) {
-            $expr = Mage::getStoreConfig((string) $job->schedule->config_path);
+            $expr = Mage::getStoreConfig((string)$job->schedule->config_path);
         } elseif (isset($job->schedule->cron_expr)) {
             $expr = $job->schedule->cron_expr;
         }

src/N98/Magento/Command/System/Setup/AbstractSetupCommand.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         $resources      = \Mage::getConfig()->getNode('global/resources')->children();
 
         foreach ($resources as $resName => $resource) {
-            $modName = (string) $resource->setup->module;
+            $modName = (string)$resource->setup->module;
 
             if ($modName == $moduleName) {
                 $moduleSetups[$resName] = $resource;

src/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 if (!class_exists('N98\MagerunBootstrap')) {
-    require_once __DIR__ . '/N98/MagerunBootstrap.php';
+    require_once __DIR__.'/N98/MagerunBootstrap.php';
 }
 
 try {

src/N98/Magento/Application.php

Spacing +11 added lines, -11 removed lines

@@ -257,7 +257,7 @@ 
 
         // Twig
         $twigBaseDirs = array(
-            __DIR__ . '/../../../res/twig'
+            __DIR__.'/../../../res/twig'
         );
         if (isset($this->config['twig']['baseDirs']) && is_array($this->config['twig']['baseDirs'])) {
             $twigBaseDirs = array_merge(array_reverse($this->config['twig']['baseDirs']), $twigBaseDirs);
@@ -409,7 +409,7 @@ 
      */
     public function checkVarDir(OutputInterface $output)
     {
-        $tempVarDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'magento' . DIRECTORY_SEPARATOR . 'var';
+        $tempVarDir = sys_get_temp_dir().DIRECTORY_SEPARATOR.'magento'.DIRECTORY_SEPARATOR.'var';
         if (!OutputInterface::VERBOSITY_NORMAL <= $output->getVerbosity() && !is_dir($tempVarDir)) {
             return;
         }
@@ -417,7 +417,7 @@ 
         $this->detectMagento(null, $output);
         /* If magento is not installed yet, don't check */
         if ($this->_magentoRootFolder === null
-            || !file_exists($this->_magentoRootFolder . '/app/etc/local.xml')
+            || !file_exists($this->_magentoRootFolder.'/app/etc/local.xml')
         ) {
             return;
         }
@@ -444,9 +444,9 @@ 
             $output->writeln(array(
                 sprintf('<warning>Fallback folder %s is used in n98-magerun</warning>', $tempVarDir),
                 '',
-                'n98-magerun is using the fallback folder. If there is another folder configured for Magento, this ' .
+                'n98-magerun is using the fallback folder. If there is another folder configured for Magento, this '.
                 'can cause serious problems.',
-                'Please refer to https://github.com/netz98/n98-magerun/wiki/File-system-permissions ' .
+                'Please refer to https://github.com/netz98/n98-magerun/wiki/File-system-permissions '.
                 'for more information.',
                 '',
             ));
@@ -454,9 +454,9 @@ 
             $output->writeln(array(
                 sprintf('<warning>Folder %s found, but not used in n98-magerun</warning>', $tempVarDir),
                 '',
-                "This might cause serious problems. n98-magerun is using the configured var-folder " .
+                "This might cause serious problems. n98-magerun is using the configured var-folder ".
                 "<comment>$currentVarDir</comment>",
-                'Please refer to https://github.com/netz98/n98-magerun/wiki/File-system-permissions ' .
+                'Please refer to https://github.com/netz98/n98-magerun/wiki/File-system-permissions '.
                 'for more information.',
                 '',
             ));
@@ -491,12 +491,12 @@ 
      */
     public function getHelp()
     {
-        return self::$logo . parent::getHelp();
+        return self::$logo.parent::getHelp();
     }
 
     public function getLongVersion()
     {
-        return parent::getLongVersion() . ' by <info>netz98 new media GmbH</info>';
+        return parent::getLongVersion().' by <info>netz98 new media GmbH</info>';
     }
 
     /**
@@ -760,7 +760,7 @@ 
 
         if (!empty($definedRootDir)) {
             if ($definedRootDir[0] == '~') {
-                $definedRootDir = OperatingSystem::getHomeDir() . substr($definedRootDir, 1);
+                $definedRootDir = OperatingSystem::getHomeDir().substr($definedRootDir, 1);
             }
 
             $folder = realpath($definedRootDir);
@@ -783,7 +783,7 @@ 
             // Create a new AutoloadRestorer to capture currenjt auto-öpaders
             $restorer = new AutoloadRestorer();
             // require app/Mage.php from Magento in a function of it's own to have it's own variable scope
-            $this->requireOnce($this->_magentoRootFolder . '/app/Mage.php');
+            $this->requireOnce($this->_magentoRootFolder.'/app/Mage.php');
             // Restore auto-loaders that might be removed by extensions that overwrite Varien/Autoload
             $restorer->restore();
         }

src/N98/Magento/Application/ConfigurationLoader.php

Spacing +15 added lines, -15 removed lines

@@ -158,7 +158,7 @@ 
     protected function loadDistConfig($initConfig)
     {
         if ($this->_distConfig == null) {
-            $this->_distConfig = Yaml::parse(__DIR__ . '/../../../../config.yaml');
+            $this->_distConfig = Yaml::parse(__DIR__.'/../../../../config.yaml');
         }
         if (OutputInterface::VERBOSITY_DEBUG <= $this->_output->getVerbosity()) {
             $this->_output->writeln('<debug>Load dist config</debug>');
@@ -179,15 +179,15 @@ 
     {
         if ($this->_systemConfig == null) {
             if (OperatingSystem::isWindows()) {
-                $systemWideConfigFile = getenv('WINDIR') . DIRECTORY_SEPARATOR . $this->_customConfigFilename;
+                $systemWideConfigFile = getenv('WINDIR').DIRECTORY_SEPARATOR.$this->_customConfigFilename;
             } else {
-                $systemWideConfigFile = '/etc/' . $this->_customConfigFilename;
+                $systemWideConfigFile = '/etc/'.$this->_customConfigFilename;
             }
 
             if ($systemWideConfigFile && file_exists($systemWideConfigFile)) {
                 if (OutputInterface::VERBOSITY_DEBUG <= $this->_output->getVerbosity()) {
                     $this->_output->writeln(
-                        '<debug>Load system config <comment>' . $systemWideConfigFile . '</comment></debug>'
+                        '<debug>Load system config <comment>'.$systemWideConfigFile.'</comment></debug>'
                     );
                 }
                 $this->_systemConfig = Yaml::parse($systemWideConfigFile);
@@ -217,12 +217,12 @@ 
             $customFilename = $this->_customConfigFilename;
             $customName = pathinfo($customFilename, PATHINFO_FILENAME);
             if (OperatingSystem::isWindows()) {
-                $config['plugin']['folders'][] = getenv('WINDIR') . '/' . $customName . '/modules';
-                $config['plugin']['folders'][] = OperatingSystem::getHomeDir() . '/' . $customName . '/modules';
+                $config['plugin']['folders'][] = getenv('WINDIR').'/'.$customName.'/modules';
+                $config['plugin']['folders'][] = OperatingSystem::getHomeDir().'/'.$customName.'/modules';
             } else {
-                $config['plugin']['folders'][] = OperatingSystem::getHomeDir() . '/.' . $customName . '/modules';
+                $config['plugin']['folders'][] = OperatingSystem::getHomeDir().'/.'.$customName.'/modules';
             }
-            $config['plugin']['folders'][] = $magentoRootFolder . '/lib/' . $customName . '/modules';
+            $config['plugin']['folders'][] = $magentoRootFolder.'/lib/'.$customName.'/modules';
             foreach ($config['plugin']['folders'] as $folder) {
                 if (is_dir($folder)) {
                     $moduleBaseFolders[] = $folder;
@@ -305,9 +305,9 @@ 
             $this->_userConfig = array();
             $homeDirectory = OperatingSystem::getHomeDir();
             if (OperatingSystem::isWindows()) {
-                $personalConfigFile = $homeDirectory . DIRECTORY_SEPARATOR . $this->_customConfigFilename;
+                $personalConfigFile = $homeDirectory.DIRECTORY_SEPARATOR.$this->_customConfigFilename;
             } else {
-                $personalConfigFile = $homeDirectory . DIRECTORY_SEPARATOR . '.' . $this->_customConfigFilename;
+                $personalConfigFile = $homeDirectory.DIRECTORY_SEPARATOR.'.'.$this->_customConfigFilename;
             }
 
             if ($homeDirectory && file_exists($personalConfigFile)) {
@@ -337,7 +337,7 @@ 
         if ($this->_projectConfig == null) {
             $this->_projectConfig = array();
 
-            $projectConfigFile = $magentoRootFolder . DIRECTORY_SEPARATOR . 'app/etc/' . $this->_customConfigFilename;
+            $projectConfigFile = $magentoRootFolder.DIRECTORY_SEPARATOR.'app/etc/'.$this->_customConfigFilename;
             if ($projectConfigFile && file_exists($projectConfigFile)) {
                 $projectConfig = $this->applyVariables(
                     \file_get_contents($projectConfigFile),
@@ -347,7 +347,7 @@ 
                 $this->_projectConfig = Yaml::parse($projectConfig);
             }
 
-            $stopFileConfigFile = $magerunStopFileFolder . DIRECTORY_SEPARATOR . '.' . $this->_customConfigFilename;
+            $stopFileConfigFile = $magerunStopFileFolder.DIRECTORY_SEPARATOR.'.'.$this->_customConfigFilename;
             if (!empty($magerunStopFileFolder) && file_exists($stopFileConfigFile)) {
                 $projectConfig = $this->applyVariables(
                     \file_get_contents($stopFileConfigFile),
@@ -388,7 +388,7 @@ 
         }
 
         if (OutputInterface::VERBOSITY_DEBUG <= $this->_output->getVerbosity()) {
-            $this->_output->writeln('<debug>Load plugin config <comment>' . $path . '</comment></debug>');
+            $this->_output->writeln('<debug>Load plugin config <comment>'.$path.'</comment></debug>');
         }
 
         $localPluginConfig = \file_get_contents($path);
@@ -403,13 +403,13 @@ 
     public function getVendorDir()
     {
         /* old vendor folder to give backward compatibility */
-        $vendorFolder = $this->getConfigurationLoaderDir() . '/../../../../vendor';
+        $vendorFolder = $this->getConfigurationLoaderDir().'/../../../../vendor';
         if (is_dir($vendorFolder)) {
             return $vendorFolder;
         }
 
         /* correct vendor folder for composer installations */
-        $vendorFolder = $this->getConfigurationLoaderDir() . '/../../../../../../../vendor';
+        $vendorFolder = $this->getConfigurationLoaderDir().'/../../../../../../../vendor';
         if (is_dir($vendorFolder)) {
             return $vendorFolder;
         }

src/N98/Magento/Command/Installer/InstallCommand.php

Spacing +72 added lines, -72 removed lines

@@ -86,7 +86,7 @@ 
                 'noDownload',
                 null,
                 InputOption::VALUE_NONE,
-                'If set skips download step. Used when installationFolder is already a Magento installation that has ' .
+                'If set skips download step. Used when installationFolder is already a Magento installation that has '.
                 'to be installed on the given database.'
             )
             ->addOption(
@@ -200,7 +200,7 @@ 
 
         if (count($missingExtensions) > 0) {
             throw new RuntimeException(
-                'The following PHP extensions are required to start installation: ' . implode(',', $missingExtensions)
+                'The following PHP extensions are required to start installation: '.implode(',', $missingExtensions)
             );
         }
     }
@@ -216,8 +216,8 @@ 
         if ($input->getOption('magentoVersion') == null && $input->getOption('magentoVersionByName') == null) {
             $question = array();
             foreach ($this->commandConfig['magento-packages'] as $key => $package) {
-                $question[] = '<comment>' . str_pad('[' . ($key + 1) . ']', 4, ' ') . '</comment> ' .
-                    $package['name'] . "\n";
+                $question[] = '<comment>'.str_pad('['.($key + 1).']', 4, ' ').'</comment> '.
+                    $package['name']."\n";
             }
             $question[] = "<question>Choose a magento version:</question> ";
 
@@ -303,7 +303,7 @@ 
             $package = $this->createComposerPackageByConfig($this->config['magentoVersionData']);
             $this->config['magentoPackage'] = $package;
 
-            if (file_exists($this->config['installationFolder'] . '/app/Mage.php')) {
+            if (file_exists($this->config['installationFolder'].'/app/Mage.php')) {
                 $output->writeln('<error>A magento installation already exists in this folder </error>');
 
                 return false;
@@ -325,7 +325,7 @@ 
             } else {
                 $filesystem = new \Composer\Util\Filesystem();
                 $filesystem->copyThenRemove(
-                    $this->config['installationFolder'] . '/_n98_magerun_download',
+                    $this->config['installationFolder'].'/_n98_magerun_download',
                     $this->config['installationFolder']
                 );
             }
@@ -335,7 +335,7 @@ 
                 $this->patchMagentoInstallerForPHP54($this->config['installationFolder']);
             }
         } catch (Exception $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            $output->writeln('<error>'.$e->getMessage().'</error>');
 
             return false;
         }
@@ -431,7 +431,7 @@ 
                 $dbHostDefault = $input->getOption('dbHost') ? $input->getOption('dbHost') : 'localhost';
                 $this->config['db_host'] = $dialog->askAndValidate(
                     $output,
-                    '<question>Please enter the database host</question> <comment>[' . $dbHostDefault . ']</comment>: ',
+                    '<question>Please enter the database host</question> <comment>['.$dbHostDefault.']</comment>: ',
                     $this->notEmptyCallback,
                     false,
                     $dbHostDefault
@@ -440,7 +440,7 @@ 
                 $dbUserDefault = $input->getOption('dbUser') ? $input->getOption('dbUser') : 'root';
                 $this->config['db_user'] = $dialog->askAndValidate(
                     $output,
-                    '<question>Please enter the database username</question> <comment>[' . $dbUserDefault .
+                    '<question>Please enter the database username</question> <comment>['.$dbUserDefault.
                     ']</comment>: ',
                     $this->notEmptyCallback,
                     false,
@@ -450,7 +450,7 @@ 
                 $dbPassDefault = $input->getOption('dbPass') ? $input->getOption('dbPass') : '';
                 $this->config['db_pass'] = $dialog->ask(
                     $output,
-                    '<question>Please enter the database password</question> <comment>[' . $dbPassDefault .
+                    '<question>Please enter the database password</question> <comment>['.$dbPassDefault.
                     ']</comment>: ',
                     $dbPassDefault
                 );
@@ -458,7 +458,7 @@ 
                 $dbNameDefault = $input->getOption('dbName') ? $input->getOption('dbName') : 'magento';
                 $this->config['db_name'] = $dialog->askAndValidate(
                     $output,
-                    '<question>Please enter the database name</question> <comment>[' . $dbNameDefault . ']</comment>: ',
+                    '<question>Please enter the database name</question> <comment>['.$dbNameDefault.']</comment>: ',
                     $this->notEmptyCallback,
                     false,
                     $dbNameDefault
@@ -467,7 +467,7 @@ 
                 $dbPortDefault = $input->getOption('dbPort') ? $input->getOption('dbPort') : 3306;
                 $this->config['db_port'] = $dialog->askAndValidate(
                     $output,
-                    '<question>Please enter the database port </question> <comment>[' . $dbPortDefault .
+                    '<question>Please enter the database port </question> <comment>['.$dbPortDefault.
                     ']</comment>: ',
                     $this->notEmptyCallback,
                     false,
@@ -477,7 +477,7 @@ 
                 $dbPrefixDefault = $input->getOption('dbPrefix') ? $input->getOption('dbPrefix') : '';
                 $this->config['db_prefix'] = $dialog->ask(
                     $output,
-                    '<question>Please enter the table prefix</question> <comment>[' . $dbPrefixDefault . ']</comment>:',
+                    '<question>Please enter the table prefix</question> <comment>['.$dbPrefixDefault.']</comment>:',
                     $dbPrefixDefault
                 );
                 $db = $this->validateDatabaseSettings($output, $input);
@@ -498,10 +498,10 @@ 
         try {
             $dsn = sprintf("mysql:host=%s;port=%s", $this->config['db_host'], $this->config['db_port']);
             $db = new PDO($dsn, $this->config['db_user'], $this->config['db_pass']);
-            if (!$db->query('USE ' . $this->config['db_name'])) {
-                $db->query("CREATE DATABASE `" . $this->config['db_name'] . "`");
-                $output->writeln('<info>Created database ' . $this->config['db_name'] . '</info>');
-                $db->query('USE ' . $this->config['db_name']);
+            if (!$db->query('USE '.$this->config['db_name'])) {
+                $db->query("CREATE DATABASE `".$this->config['db_name']."`");
+                $output->writeln('<info>Created database '.$this->config['db_name'].'</info>');
+                $db->query('USE '.$this->config['db_name']);
 
                 return $db;
             }
@@ -514,7 +514,7 @@ 
 
             return $db;
         } catch (PDOException $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            $output->writeln('<error>'.$e->getMessage().'</error>');
         }
 
         return false;
@@ -551,7 +551,7 @@ 
                         $input,
                         $output,
                         $demoPackageData,
-                        $this->config['installationFolder'] . '/_temp_demo_data',
+                        $this->config['installationFolder'].'/_temp_demo_data',
                         false
                     );
 
@@ -569,39 +569,39 @@ 
                     }
 
                     // Remove empty folder
-                    if (is_dir($this->config['installationFolder'] . '/vendor/composer')) {
-                        $filesystem->recursiveRemoveDirectory($this->config['installationFolder'] . '/vendor/composer');
+                    if (is_dir($this->config['installationFolder'].'/vendor/composer')) {
+                        $filesystem->recursiveRemoveDirectory($this->config['installationFolder'].'/vendor/composer');
                     }
 
                     // Install sample data
                     $sampleDataSqlFile = glob(
-                        $this->config['installationFolder'] . '/_temp_demo_data/magento_*sample_data*sql'
+                        $this->config['installationFolder'].'/_temp_demo_data/magento_*sample_data*sql'
                     );
                     $db = $this->config['db'];
                     /* @var $db PDO */
                     if (isset($sampleDataSqlFile[0])) {
                         if (OperatingSystem::isProgramInstalled('mysql')) {
                             $exec = 'mysql '
-                                . '-h' . escapeshellarg(strval($this->config['db_host']))
+                                . '-h'.escapeshellarg(strval($this->config['db_host']))
                                 . ' '
-                                . '-u' . escapeshellarg(strval($this->config['db_user']))
+                                . '-u'.escapeshellarg(strval($this->config['db_user']))
                                 . ' '
                                 . ($this->config['db_port'] != '3306'
-                                    ? '-P' . escapeshellarg($this->config['db_port']) . ' ' : '')
+                                    ? '-P'.escapeshellarg($this->config['db_port']).' ' : '')
                                 . (!strval($this->config['db_pass'] == '')
-                                    ? '-p' . escapeshellarg($this->config['db_pass']) . ' ' : '')
+                                    ? '-p'.escapeshellarg($this->config['db_pass']).' ' : '')
                                 . strval($this->config['db_name'])
                                 . ' < '
                                 . escapeshellarg($sampleDataSqlFile[0]);
                             $output->writeln(
-                                '<info>Importing <comment>' . $sampleDataSqlFile[0] .
+                                '<info>Importing <comment>'.$sampleDataSqlFile[0].
                                 '</comment> with mysql cli client</info>'
                             );
                             Exec::run($exec);
                             @unlink($sampleDataSqlFile[0]);
                         } else {
                             $output->writeln(
-                                '<info>Importing <comment>' . $sampleDataSqlFile[0] .
+                                '<info>Importing <comment>'.$sampleDataSqlFile[0].
                                 '</comment> with PDO driver</info>'
                             );
                             // Fallback -> Try to install dump file by PDO driver
@@ -612,8 +612,8 @@ 
                 }
             }
 
-            if (is_dir($this->config['installationFolder'] . '/_temp_demo_data')) {
-                $filesystem->recursiveRemoveDirectory($this->config['installationFolder'] . '/_temp_demo_data');
+            if (is_dir($this->config['installationFolder'].'/_temp_demo_data')) {
+                $filesystem->recursiveRemoveDirectory($this->config['installationFolder'].'/_temp_demo_data');
             }
         }
     }
@@ -622,8 +622,8 @@ 
     {
         $filesystem = new Filesystem();
         foreach (array('/_temp_demo_data/media' => '/media', '/_temp_demo_data/skin' => '/skin') as $wrong => $right) {
-            $wrongFolder = $this->config['installationFolder'] . $wrong;
-            $rightFolder = $this->config['installationFolder'] . $right;
+            $wrongFolder = $this->config['installationFolder'].$wrong;
+            $rightFolder = $this->config['installationFolder'].$right;
             if (is_dir($wrongFolder)) {
                 $filesystem->recursiveCopy(
                     $wrongFolder,
@@ -639,12 +639,12 @@ 
      */
     protected function removeEmptyFolders()
     {
-        if (is_dir(getcwd() . '/vendor')) {
+        if (is_dir(getcwd().'/vendor')) {
             $finder = new Finder();
-            $finder->files()->depth(3)->in(getcwd() . '/vendor');
+            $finder->files()->depth(3)->in(getcwd().'/vendor');
             if ($finder->count() == 0) {
                 $filesystem = new Filesystem();
-                $filesystem->recursiveRemoveDirectory(getcwd() . '/vendor');
+                $filesystem->recursiveRemoveDirectory(getcwd().'/vendor');
             }
         }
     }
@@ -668,15 +668,15 @@ 
 
         $sessionSave = $useDefaultConfigParams ? $defaults['session_save'] : $dialog->ask(
             $output,
-            '<question>Please enter the session save:</question> <comment>[' .
-            $defaults['session_save'] . ']</comment>: ',
+            '<question>Please enter the session save:</question> <comment>['.
+            $defaults['session_save'].']</comment>: ',
             $defaults['session_save']
         );
 
         $adminFrontname = $useDefaultConfigParams ? $defaults['admin_frontname'] : $dialog->askAndValidate(
             $output,
-            '<question>Please enter the admin frontname:</question> <comment>[' .
-            $defaults['admin_frontname'] . ']</comment> ',
+            '<question>Please enter the admin frontname:</question> <comment>['.
+            $defaults['admin_frontname'].']</comment> ',
             $this->notEmptyCallback,
             false,
             $defaults['admin_frontname']
@@ -684,8 +684,8 @@ 
 
         $currency = $useDefaultConfigParams ? $defaults['currency'] : $dialog->askAndValidate(
             $output,
-            '<question>Please enter the default currency code:</question> <comment>[' .
-            $defaults['currency'] . ']</comment>: ',
+            '<question>Please enter the default currency code:</question> <comment>['.
+            $defaults['currency'].']</comment>: ',
             $this->notEmptyCallback,
             false,
             $defaults['currency']
@@ -693,7 +693,7 @@ 
 
         $locale = $useDefaultConfigParams ? $defaults['locale'] : $dialog->askAndValidate(
             $output,
-            '<question>Please enter the locale code:</question> <comment>[' . $defaults['locale'] . ']</comment>: ',
+            '<question>Please enter the locale code:</question> <comment>['.$defaults['locale'].']</comment>: ',
             $this->notEmptyCallback,
             false,
             $defaults['locale']
@@ -701,7 +701,7 @@ 
 
         $timezone = $useDefaultConfigParams ? $defaults['timezone'] : $dialog->askAndValidate(
             $output,
-            '<question>Please enter the timezone:</question> <comment>[' . $defaults['timezone'] . ']</comment>: ',
+            '<question>Please enter the timezone:</question> <comment>['.$defaults['timezone'].']</comment>: ',
             $this->notEmptyCallback,
             false,
             $defaults['timezone']
@@ -709,8 +709,8 @@ 
 
         $adminUsername = $useDefaultConfigParams ? $defaults['admin_username'] : $dialog->askAndValidate(
             $output,
-            '<question>Please enter the admin username:</question> <comment>[' .
-            $defaults['admin_username'] . ']</comment>: ',
+            '<question>Please enter the admin username:</question> <comment>['.
+            $defaults['admin_username'].']</comment>: ',
             $this->notEmptyCallback,
             false,
             $defaults['admin_username']
@@ -718,8 +718,8 @@ 
 
         $adminPassword = $useDefaultConfigParams ? $defaults['admin_password'] : $dialog->askAndValidate(
             $output,
-            '<question>Please enter the admin password:</question> <comment>[' .
-            $defaults['admin_password'] . ']</comment>: ',
+            '<question>Please enter the admin password:</question> <comment>['.
+            $defaults['admin_password'].']</comment>: ',
             $this->notEmptyCallback,
             false,
             $defaults['admin_password']
@@ -727,8 +727,8 @@ 
 
         $adminFirstname = $useDefaultConfigParams ? $defaults['admin_firstname'] : $dialog->askAndValidate(
             $output,
-            '<question>Please enter the admin\'s firstname:</question> <comment>[' .
-            $defaults['admin_firstname'] . ']</comment>: ',
+            '<question>Please enter the admin\'s firstname:</question> <comment>['.
+            $defaults['admin_firstname'].']</comment>: ',
             $this->notEmptyCallback,
             false,
             $defaults['admin_firstname']
@@ -736,8 +736,8 @@ 
 
         $adminLastname = $useDefaultConfigParams ? $defaults['admin_lastname'] : $dialog->askAndValidate(
             $output,
-            '<question>Please enter the admin\'s lastname:</question> <comment>[' .
-            $defaults['admin_lastname'] . ']</comment>: ',
+            '<question>Please enter the admin\'s lastname:</question> <comment>['.
+            $defaults['admin_lastname'].']</comment>: ',
             $this->notEmptyCallback,
             false,
             $defaults['admin_lastname']
@@ -745,8 +745,8 @@ 
 
         $adminEmail = $useDefaultConfigParams ? $defaults['admin_email'] : $dialog->askAndValidate(
             $output,
-            '<question>Please enter the admin\'s email:</question> <comment>[' .
-            $defaults['admin_email'] . ']</comment>: ',
+            '<question>Please enter the admin\'s email:</question> <comment>['.
+            $defaults['admin_email'].']</comment>: ',
             $this->notEmptyCallback,
             false,
             $defaults['admin_email']
@@ -771,7 +771,7 @@ 
             $validateBaseUrl,
             false
         );
-        $baseUrl = rtrim($baseUrl, '/') . '/'; // normalize baseUrl
+        $baseUrl = rtrim($baseUrl, '/').'/'; // normalize baseUrl
 
         /**
          * Correct session save (common mistake)
@@ -783,14 +783,14 @@ 
         /**
          * Try to create session folder
          */
-        $defaultSessionFolder = $this->config['installationFolder'] . DIRECTORY_SEPARATOR . 'var/session';
+        $defaultSessionFolder = $this->config['installationFolder'].DIRECTORY_SEPARATOR.'var/session';
         if ($sessionSave == 'files' && !is_dir($defaultSessionFolder)) {
             @mkdir($defaultSessionFolder);
         }
 
         $dbHost = $this->config['db_host'];
         if ($this->config['db_port'] != 3306) {
-            $dbHost .= ':' . $this->config['db_port'];
+            $dbHost .= ':'.$this->config['db_port'];
         }
 
         $argv = array(
@@ -832,24 +832,24 @@ 
         }
         $installArgs = '';
         foreach ($argv as $argName => $argValue) {
-            $installArgs .= '--' . $argName . ' ' . escapeshellarg($argValue) . ' ';
+            $installArgs .= '--'.$argName.' '.escapeshellarg($argValue).' ';
         }
 
         $output->writeln('<info>Start installation process.</info>');
 
         $phpExec = OperatingSystem::getPhpBinary();
-        $installCommand = $phpExec . ' -f ' . escapeshellarg($this->getInstallScriptPath()) . ' -- ' . $installArgs;
+        $installCommand = $phpExec.' -f '.escapeshellarg($this->getInstallScriptPath()).' -- '.$installArgs;
 
 
-        $output->writeln('<comment>' . $installCommand . '</comment>');
+        $output->writeln('<comment>'.$installCommand.'</comment>');
         Exec::run($installCommand, $installationOutput, $returnStatus);
         if ($returnStatus !== self::EXEC_STATUS_OK) {
             $this->getApplication()->setAutoExit(true);
-            throw new RuntimeException('Installation failed.' . $installationOutput, 1);
+            throw new RuntimeException('Installation failed.'.$installationOutput, 1);
         } else {
             $output->writeln('<info>Successfully installed Magento</info>');
             $encryptionKey = trim(substr($installationOutput, strpos($installationOutput, ':') + 1));
-            $output->writeln('<comment>Encryption Key:</comment> <info>' . $encryptionKey . '</info>');
+            $output->writeln('<comment>Encryption Key:</comment> <info>'.$encryptionKey.'</info>');
         }
 
         $dialog = $this->getHelperSet()->get('dialog');
@@ -891,8 +891,8 @@ 
      */
     protected function getInstallScriptPath()
     {
-        $magento1InstallScriptPath = $this->config['installationFolder'] . '/install.php';
-        $magento2InstallScriptPath = $this->config['installationFolder'] . '/dev/shell/install.php';
+        $magento1InstallScriptPath = $this->config['installationFolder'].'/install.php';
+        $magento2InstallScriptPath = $this->config['installationFolder'].'/dev/shell/install.php';
         if (file_exists($magento2InstallScriptPath)) {
             return $magento2InstallScriptPath;
         }
@@ -905,13 +905,13 @@ 
      */
     protected function replaceHtaccessFile($baseUrl)
     {
-        $content = file_get_contents($this->config['installationFolder'] . DIRECTORY_SEPARATOR . '.htaccess');
+        $content = file_get_contents($this->config['installationFolder'].DIRECTORY_SEPARATOR.'.htaccess');
         copy(
-            $this->config['installationFolder'] . DIRECTORY_SEPARATOR . '.htaccess',
-            $this->config['installationFolder'] . DIRECTORY_SEPARATOR . '.htaccess.dist'
+            $this->config['installationFolder'].DIRECTORY_SEPARATOR.'.htaccess',
+            $this->config['installationFolder'].DIRECTORY_SEPARATOR.'.htaccess.dist'
         );
-        $content = str_replace('#RewriteBase /magento/', 'RewriteBase ' . parse_url($baseUrl, PHP_URL_PATH), $content);
-        file_put_contents($this->config['installationFolder'] . DIRECTORY_SEPARATOR . '.htaccess', $content);
+        $content = str_replace('#RewriteBase /magento/', 'RewriteBase '.parse_url($baseUrl, PHP_URL_PATH), $content);
+        file_put_contents($this->config['installationFolder'].DIRECTORY_SEPARATOR.'.htaccess', $content);
     }
 
     /**
@@ -920,19 +920,19 @@ 
     protected function setDirectoryPermissions($output)
     {
         try {
-            $varFolder = $this->config['installationFolder'] . DIRECTORY_SEPARATOR . 'var';
+            $varFolder = $this->config['installationFolder'].DIRECTORY_SEPARATOR.'var';
             if (!is_dir($varFolder)) {
                 @mkdir($varFolder);
             }
             @chmod($varFolder, 0777);
 
-            $varCacheFolder = $this->config['installationFolder'] . DIRECTORY_SEPARATOR . 'var/cache';
+            $varCacheFolder = $this->config['installationFolder'].DIRECTORY_SEPARATOR.'var/cache';
             if (!is_dir($varCacheFolder)) {
                 @mkdir($varCacheFolder);
             }
             @chmod($varCacheFolder, 0777);
 
-            $mediaFolder = $this->config['installationFolder'] . DIRECTORY_SEPARATOR . 'media';
+            $mediaFolder = $this->config['installationFolder'].DIRECTORY_SEPARATOR.'media';
             if (!is_dir($mediaFolder)) {
                 @mkdir($mediaFolder);
             }
@@ -946,7 +946,7 @@ 
                 @chmod($dir->getRealpath(), 0777);
             }
         } catch (Exception $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            $output->writeln('<error>'.$e->getMessage().'</error>');
         }
     }
 

src/N98/Magento/Command/Installer/UninstallCommand.php

Spacing +2 added lines, -2 removed lines

@@ -67,11 +67,11 @@
             $input = new StringInput('db:drop --force');
             $this->getApplication()->run($input, $output);
             $fileSystem = new Filesystem();
-            $output->writeln('<info>Remove directory </info><comment>' . $this->_magentoRootFolder . '</comment>');
+            $output->writeln('<info>Remove directory </info><comment>'.$this->_magentoRootFolder.'</comment>');
             try {
                 $fileSystem->recursiveRemoveDirectory($this->_magentoRootFolder);
             } catch (Exception $e) {
-                $output->writeln('<error>' . $e->getMessage() . '</error>');
+                $output->writeln('<error>'.$e->getMessage().'</error>');
             }
             $output->writeln('<info>Done</info>');
         }

src/N98/Magento/Command/Cms/Banner/ToggleCommand.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 
             $disabled = !$banner->getIsEnabled();
             $comment = '<comment>Banner</comment> '
-            . '<info>' . (!$disabled ? 'disabled' : 'enabled') . '</info>';
+            . '<info>'.(!$disabled ? 'disabled' : 'enabled').'</info>';
 
             $banner->setIsEnabled($disabled);
             $banner->save();

src/N98/Magento/Command/AbstractMagentoCommand.php

Spacing +6 added lines, -6 removed lines

@@ -179,7 +179,7 @@ 
         if (!$silent) {
             $editionString = ($this->_magentoEnterprise ? ' (Enterprise Edition) ' : '');
             $output->writeln(
-                '<info>Found Magento ' . $editionString . 'in folder "' . $this->_magentoRootFolder . '"</info>'
+                '<info>Found Magento '.$editionString.'in folder "'.$this->_magentoRootFolder.'"</info>'
             );
         }
 
@@ -353,7 +353,7 @@ 
     {
         if (isset($this->_deprecatedAlias[$input->getArgument('command')])) {
             $output->writeln(
-                '<error>Deprecated:</error> <comment>' . $this->_deprecatedAlias[$input->getArgument('command')] .
+                '<error>Deprecated:</error> <comment>'.$this->_deprecatedAlias[$input->getArgument('command')].
                 '</comment>'
             );
         }
@@ -459,7 +459,7 @@ 
             // resolve folder-name to current working directory if relative
             if (substr($folderName, 0, 1) == '.') {
                 $cwd = OperatingSystem::getCwd();
-                $folderName = $cwd . substr($folderName, 1);
+                $folderName = $cwd.substr($folderName, 1);
             }
 
             if (empty($folderName)) {
@@ -487,7 +487,7 @@ 
                     );
                 }
 
-                $localXml = $folderName . '/app/etc/local.xml';
+                $localXml = $folderName.'/app/etc/local.xml';
                 if (file_exists($localXml)) {
                     throw new InvalidArgumentException(
                         sprintf(
@@ -504,7 +504,7 @@ 
 
         if (($installationFolder = $input->getOption('installationFolder')) == null) {
             $defaultFolder = './magento';
-            $question[] = "<question>Enter installation folder:</question> [<comment>" . $defaultFolder . "</comment>]";
+            $question[] = "<question>Enter installation folder:</question> [<comment>".$defaultFolder."</comment>]";
 
             $installationFolder = $this->getHelper('dialog')->askAndValidate(
                 $output,
@@ -562,7 +562,7 @@ 
     {
         $dialog = '';
         foreach ($entries as $key => $entry) {
-            $dialog .= '<comment>[' . ($key + 1) . ']</comment> ' . $entry . "\n";
+            $dialog .= '<comment>['.($key + 1).']</comment> '.$entry."\n";
         }
         $dialog .= "<question>{$question}</question> ";