netz98 / n98-magerun

src/N98/Util/Console/Helper/MagentoHelper.php

Spacing +12 added lines, -12 removed lines

@@ -194,7 +194,7 @@ 
             if (!is_readable($searchFolder)) {
                 if (OutputInterface::VERBOSITY_DEBUG <= $this->output->getVerbosity()) {
                     $this->output->writeln(
-                        '<debug>Folder <info>' . $searchFolder . '</info> is not readable. Skip.</debug>'
+                        '<debug>Folder <info>'.$searchFolder.'</info> is not readable. Skip.</debug>'
                     );
                 }
                 continue;
@@ -212,16 +212,16 @@ 
 
             $count = $finder->count();
             if ($count > 0) {
-                $baseFolderContent = trim(file_get_contents($searchFolder . DIRECTORY_SEPARATOR . '.basedir'));
+                $baseFolderContent = trim(file_get_contents($searchFolder.DIRECTORY_SEPARATOR.'.basedir'));
                 if (OutputInterface::VERBOSITY_DEBUG <= $this->output->getVerbosity()) {
                     $this->output->writeln(
-                        '<debug>Found modman .basedir file with content <info>' . $baseFolderContent . '</info></debug>'
+                        '<debug>Found modman .basedir file with content <info>'.$baseFolderContent.'</info></debug>'
                     );
                 }
 
                 if (!empty($baseFolderContent)) {
                     array_push(
-                        $folders, $searchFolder . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $baseFolderContent
+                        $folders, $searchFolder.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$baseFolderContent
                     );
                 }
             }
@@ -248,7 +248,7 @@ 
                 }
                 continue;
             }
-            $stopFile = '.' . pathinfo($this->_customConfigFilename, PATHINFO_FILENAME);
+            $stopFile = '.'.pathinfo($this->_customConfigFilename, PATHINFO_FILENAME);
             $finder = Finder::create();
             $finder
                 ->files()
@@ -263,7 +263,7 @@ 
             if ($count > 0) {
                 $this->_magerunStopFileFound  = true;
                 $this->_magerunStopFileFolder = $searchFolder;
-                $magerunFilePath              = $searchFolder . DIRECTORY_SEPARATOR . $stopFile;
+                $magerunFilePath              = $searchFolder.DIRECTORY_SEPARATOR.$stopFile;
                 $magerunFileContent           = trim(file_get_contents($magerunFilePath));
                 if (OutputInterface::VERBOSITY_DEBUG <= $this->output->getVerbosity()) {
                     $message = sprintf(
@@ -273,7 +273,7 @@ 
                     $this->output->writeln($message);
                 }
 
-                array_push($folders, $searchFolder . DIRECTORY_SEPARATOR . $magerunFileContent);
+                array_push($folders, $searchFolder.DIRECTORY_SEPARATOR.$magerunFileContent);
             }
         }
 
@@ -288,10 +288,10 @@ 
     protected function _search($searchFolder)
     {
         if (OutputInterface::VERBOSITY_DEBUG <= $this->output->getVerbosity()) {
-            $this->output->writeln('<debug>Search for Magento in folder <info>' . $searchFolder . '</info></debug>');
+            $this->output->writeln('<debug>Search for Magento in folder <info>'.$searchFolder.'</info></debug>');
         }
 
-        if (!is_dir($searchFolder . '/app')) {
+        if (!is_dir($searchFolder.'/app')) {
             return false;
         }
 
@@ -303,7 +303,7 @@ 
             ->name('Mage.php')
             ->name('bootstrap.php')
             ->name('autoload.php')
-            ->in($searchFolder . '/app');
+            ->in($searchFolder.'/app');
 
         if ($finder->count() > 0) {
             $files = iterator_to_array($finder, false);
@@ -327,12 +327,12 @@ 
             if (is_callable(array('\Mage', 'getEdition'))) {
                 $this->_magentoEnterprise = (\Mage::getEdition() == 'Enterprise');
             } else {
-                $this->_magentoEnterprise = is_dir($this->_magentoRootFolder . '/app/code/core/Enterprise');
+                $this->_magentoEnterprise = is_dir($this->_magentoRootFolder.'/app/code/core/Enterprise');
             }
 
             if (OutputInterface::VERBOSITY_DEBUG <= $this->output->getVerbosity()) {
                 $this->output->writeln(
-                    '<debug>Found Magento in folder <info>' . $this->_magentoRootFolder . '</info></debug>'
+                    '<debug>Found Magento in folder <info>'.$this->_magentoRootFolder.'</info></debug>'
                 );
             }
 

src/N98/Util/Console/Helper/ParameterHelper.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
             foreach ($storeManager->getStores($withDefaultStore) as $store) {
                 $stores[$i] = $store->getId();
                 $question[] = sprintf(
-                    '<comment>[%d]</comment> %s - %s' . PHP_EOL,
+                    '<comment>[%d]</comment> %s - %s'.PHP_EOL,
                     ++$i,
                     $store->getCode(),
                     $store->getName()
@@ -166,7 +166,7 @@ 
             $position = $i + 1;
 
             $websites[$i] = $value;
-            $question[$i] = sprintf('<comment>[%d]</comment> %s' . PHP_EOL, $position, $label);
+            $question[$i] = sprintf('<comment>[%d]</comment> %s'.PHP_EOL, $position, $label);
         }
 
         return array($websites, $question);
@@ -256,13 +256,13 @@ 
         if (strlen($value)) {
             $errors = $this->validateValue($name, $value, $constraints);
             if ($errors->count() > 0) {
-                $output->writeln('<error>' . $errors[0]->getMessage() . '</error>');
+                $output->writeln('<error>'.$errors[0]->getMessage().'</error>');
             } else {
                 return $value;
             }
         }
 
-        $question = '<question>' . ucfirst($name) . ': </question>';
+        $question = '<question>'.ucfirst($name).': </question>';
 
         $value = $this->askAndValidate(
             $output,

src/N98/Util/Console/Helper/DatabaseHelper.php

Spacing +22 added lines, -22 removed lines

@@ -55,7 +55,7 @@ 
         $application = $this->getApplication();
         $application->detectMagento();
 
-        $configFile = $application->getMagentoRootFolder() . '/app/etc/local.xml';
+        $configFile = $application->getMagentoRootFolder().'/app/etc/local.xml';
 
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
             $output->writeln(
@@ -66,7 +66,7 @@ 
         try {
             $this->dbSettings = new DbSettings($configFile);
         } catch (InvalidArgumentException $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            $output->writeln('<error>'.$e->getMessage().'</error>');
             throw new RuntimeException('Failed to load database settings from config file', 0, $e);
         }
     }
@@ -111,7 +111,7 @@ 
 
         $result = $statement->fetchAll(PDO::FETCH_COLUMN);
         foreach ($result as $row) {
-            if (preg_match('/^GRANT(.*)' . strtoupper($privilege) . '/', $row)
+            if (preg_match('/^GRANT(.*)'.strtoupper($privilege).'/', $row)
                 || preg_match('/^GRANT(.*)ALL/', $row)
             ) {
                 return true;
@@ -179,7 +179,7 @@ 
             );
         }
 
-        $quoted = '`' . strtr($name, array('`' => '``')) . '`';
+        $quoted = '`'.strtr($name, array('`' => '``')).'`';
         $query = "SELECT {$type}{$quoted};";
 
         $connection = $this->getConnection();
@@ -212,7 +212,7 @@ 
             foreach ($tableGroups as $index => $definition) {
                 $description = isset($definition['description']) ? $definition['description'] : '';
                 if (!isset($definition['id'])) {
-                    throw new RuntimeException('Invalid definition of table-groups (id missing) Index: ' . $index);
+                    throw new RuntimeException('Invalid definition of table-groups (id missing) Index: '.$index);
                 }
                 if (!isset($definition['tables'])) {
                     throw new RuntimeException('Invalid definition of table-groups (tables missing) Id: '
@@ -249,7 +249,7 @@ 
             if (substr($entry, 0, 1) == '@') {
                 $code = substr($entry, 1);
                 if (!isset($definitions[$code])) {
-                    throw new RuntimeException('Table-groups could not be resolved: ' . $entry);
+                    throw new RuntimeException('Table-groups could not be resolved: '.$entry);
                 }
                 if (!isset($resolved[$code])) {
                     $resolved[$code] = true;
@@ -271,7 +271,7 @@ 
                     array(PDO::ATTR_CURSOR => PDO::CURSOR_FWDONLY)
                 );
                 $sth->execute(
-                    array(':like' => str_replace('*', '%', $this->dbSettings['prefix'] . $entry))
+                    array(':like' => str_replace('*', '%', $this->dbSettings['prefix'].$entry))
                 );
                 $rows = $sth->fetchAll();
                 foreach ($rows as $row) {
@@ -281,7 +281,7 @@ 
             }
 
             if (in_array($entry, $this->_tables)) {
-                $resolvedList[] = $this->dbSettings['prefix'] . $entry;
+                $resolvedList[] = $this->dbSettings['prefix'].$entry;
             }
         }
 
@@ -323,7 +323,7 @@ 
         if ($length) {
             $escape = '=';
             $condition .= sprintf(" AND %s LIKE :like ESCAPE '%s'", $columnName, $escape);
-            $input[':like'] = $this->quoteLike($prefix, $escape) . '%';
+            $input[':like'] = $this->quoteLike($prefix, $escape).'%';
         }
 
         $query = sprintf('SELECT %s FROM information_schema.tables WHERE %s;', $column, $condition);
@@ -363,7 +363,7 @@ 
             $message = '';
         }
 
-        throw new RuntimeException($message . $reason);
+        throw new RuntimeException($message.$reason);
     }
 
     /**
@@ -377,9 +377,9 @@ 
     private function quoteLike($string, $escape = '=')
     {
         $translation = array(
-            $escape => $escape . $escape,
-            '%'     => $escape . '%',
-            '_'     => $escape . '_',
+            $escape => $escape.$escape,
+            '%'     => $escape.'%',
+            '_'     => $escape.'_',
         );
 
         return strtr($string, $translation);
@@ -399,7 +399,7 @@ 
         if (strlen($prefix) > 0) {
             $statement = $db->prepare('SHOW TABLE STATUS LIKE :like', array(PDO::ATTR_CURSOR => PDO::CURSOR_FWDONLY));
             $statement->execute(
-                array(':like' => $prefix . '%')
+                array(':like' => $prefix.'%')
             );
         } else {
             $statement = $db->query('SHOW TABLE STATUS');
@@ -470,8 +470,8 @@ 
     {
         $this->detectDbSettings($output);
         $db = $this->getConnection();
-        $db->query('DROP DATABASE `' . $this->dbSettings['dbname'] . '`');
-        $output->writeln('<info>Dropped database</info> <comment>' . $this->dbSettings['dbname'] . '</comment>');
+        $db->query('DROP DATABASE `'.$this->dbSettings['dbname'].'`');
+        $output->writeln('<info>Dropped database</info> <comment>'.$this->dbSettings['dbname'].'</comment>');
     }
 
     /**
@@ -483,12 +483,12 @@ 
         $query = 'SET FOREIGN_KEY_CHECKS = 0; ';
         $count = 0;
         foreach ($result as $tableName) {
-            $query .= 'DROP TABLE IF EXISTS `' . $tableName . '`; ';
+            $query .= 'DROP TABLE IF EXISTS `'.$tableName.'`; ';
             $count++;
         }
         $query .= 'SET FOREIGN_KEY_CHECKS = 1;';
         $this->getConnection()->query($query);
-        $output->writeln('<info>Dropped database tables</info> <comment>' . $count . ' tables dropped</comment>');
+        $output->writeln('<info>Dropped database tables</info> <comment>'.$count.' tables dropped</comment>');
     }
 
     /**
@@ -498,8 +498,8 @@ 
     {
         $this->detectDbSettings($output);
         $db = $this->getConnection();
-        $db->query('CREATE DATABASE IF NOT EXISTS `' . $this->dbSettings['dbname'] . '`');
-        $output->writeln('<info>Created database</info> <comment>' . $this->dbSettings['dbname'] . '</comment>');
+        $db->query('CREATE DATABASE IF NOT EXISTS `'.$this->dbSettings['dbname'].'`');
+        $output->writeln('<info>Created database</info> <comment>'.$this->dbSettings['dbname'].'</comment>');
     }
 
     /**
@@ -514,14 +514,14 @@ 
 
         if (null !== $variable) {
             $statement = $db->prepare(
-                'SHOW /*!50000 GLOBAL */ ' . $command . ' LIKE :like',
+                'SHOW /*!50000 GLOBAL */ '.$command.' LIKE :like',
                 array(PDO::ATTR_CURSOR => PDO::CURSOR_FWDONLY)
             );
             $statement->execute(
                 array(':like' => $variable)
             );
         } else {
-            $statement = $db->query('SHOW /*!50000 GLOBAL */ ' . $command);
+            $statement = $db->query('SHOW /*!50000 GLOBAL */ '.$command);
         }
 
         if ($statement) {

src/N98/Util/Exec.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
             throw new RuntimeException($message);
         }
 
-        $command = $command . self::REDIRECT_STDERR_TO_STDOUT;
+        $command = $command.self::REDIRECT_STDERR_TO_STDOUT;
 
         exec($command, $outputArray, $returnCode);
         $output = self::parseCommandOutput($outputArray);
@@ -60,6 +60,6 @@ 
      */
     private static function parseCommandOutput(array $commandOutput)
     {
-        return implode(PHP_EOL, $commandOutput) . PHP_EOL;
+        return implode(PHP_EOL, $commandOutput).PHP_EOL;
     }
 }

src/N98/Util/Database.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
                 while (feof($file) === false) {
                     $query[] = fgets($file);
 
-                    if (preg_match('~' . preg_quote($delimiter, '~') . '\s*$~iS', end($query)) === 1) {
+                    if (preg_match('~'.preg_quote($delimiter, '~').'\s*$~iS', end($query)) === 1) {
                         $query = trim(implode('', $query));
                         $pdo->query($query);
 

src/N98/Util/DateTime.php

Spacing +6 added lines, -6 removed lines

@@ -29,12 +29,12 @@
         $seconds  = $interval->format('%s');
 
         $differenceString
-            = ($years ? $years . 'Y ' : '')
-            . ($months ? $months . 'M ' : '')
-            . ($days ? $days . 'd ' : '')
-            . ($hours ? $hours . 'h ' : '')
-            . ($minutes ? $minutes . 'm ' : '')
-            . ($seconds ? $seconds . 's ' : '');
+            = ($years ? $years.'Y ' : '')
+            . ($months ? $months.'M ' : '')
+            . ($days ? $days.'d ' : '')
+            . ($hours ? $hours.'h ' : '')
+            . ($minutes ? $minutes.'m ' : '')
+            . ($seconds ? $seconds.'s ' : '');
 
         return trim($differenceString);
     }

src/N98/Util/Filesystem.php

Spacing +4 added lines, -4 removed lines

@@ -46,16 +46,16 @@ 
                 continue;
             }
 
-            if (is_dir($src . '/' . $file)) {
+            if (is_dir($src.'/'.$file)) {
                 $stack[] = $file;
             } else {
-                copy($src . '/' . $file, $dst . '/' . $file);
+                copy($src.'/'.$file, $dst.'/'.$file);
             }
         }
         closedir($handle);
 
         foreach ($stack as $file) {
-            $this->recursiveCopy($src . '/' . $file, $dst . '/' . $file, $blacklist);
+            $this->recursiveCopy($src.'/'.$file, $dst.'/'.$file, $blacklist);
         }
     }
 
@@ -98,7 +98,7 @@ 
             }
 
             // we build the new path to delete
-            $path = $directory . '/' . $file;
+            $path = $directory.'/'.$file;
 
             // if the new path is a directory
             // don't recursively delete symlinks - just remove the actual link

src/N98/MagerunBootstrap.php

Spacing +5 added lines, -5 removed lines

@@ -34,13 +34,13 @@
     public static function getLoader()
     {
         if (
-            !($loader = self::includeIfExists(__DIR__ . '/../../vendor/autoload.php'))
-            && !($loader = self::includeIfExists(__DIR__ . '/../../../../autoload.php'))
+            !($loader = self::includeIfExists(__DIR__.'/../../vendor/autoload.php'))
+            && !($loader = self::includeIfExists(__DIR__.'/../../../../autoload.php'))
         ) {
             throw new ErrorException(
-                'You must set up the project dependencies, run the following commands:' . PHP_EOL .
-                'curl -s http://getcomposer.org/installer | php' . PHP_EOL .
-                'php composer.phar install' . PHP_EOL
+                'You must set up the project dependencies, run the following commands:'.PHP_EOL.
+                'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
+                'php composer.phar install'.PHP_EOL
             );
         }
 

build/phar/tasks/PatchedPharPackageTask.php

Spacing +9 added lines, -9 removed lines

@@ -269,7 +269,7 @@ 
 
         try {
             $this->log(
-                'Building package: ' . $this->destinationFile->__toString(),
+                'Building package: '.$this->destinationFile->__toString(),
                 Project::MSG_INFO
             );
 
@@ -278,12 +278,12 @@ 
             try {
                 $this->compressAllFiles($this->initPhar(), $baseDirectory);
             } catch (\RuntimeException $e) {
-                $this->log('Most likely compression failed (known bug): ' . $e->getMessage());
+                $this->log('Most likely compression failed (known bug): '.$e->getMessage());
                 $this->compressEachFile($this->initPhar(), $baseDirectory);
             }
         } catch (Exception $e) {
             throw new BuildException(
-                'Problem creating package: ' . $e->getMessage(),
+                'Problem creating package: '.$e->getMessage(),
                 $e,
                 $this->getLocation()
             );
@@ -315,7 +315,7 @@ 
         if (!is_null($this->baseDirectory)) {
             if (!$this->baseDirectory->exists()) {
                 throw new BuildException(
-                    "basedir '" . (string) $this->baseDirectory . "' does not exist!", $this->getLocation()
+                    "basedir '".(string)$this->baseDirectory."' does not exist!", $this->getLocation()
                 );
             }
         }
@@ -332,11 +332,11 @@ 
             }
 
             if (!$this->key->exists()) {
-                throw new BuildException("key '" . (string) $this->key . "' does not exist!", $this->getLocation());
+                throw new BuildException("key '".(string)$this->key."' does not exist!", $this->getLocation());
             }
 
             if (!$this->key->canRead()) {
-                throw new BuildException("key '" . (string) $this->key . "' cannot be read!", $this->getLocation());
+                throw new BuildException("key '".(string)$this->key."' cannot be read!", $this->getLocation());
             }
         }
     }
@@ -363,7 +363,7 @@ 
             // Get the details so we can get the public key and write that out
             // alongside the phar.
             $details = openssl_pkey_get_details($private);
-            file_put_contents($this->destinationFile . '.pubkey', $details['key']);
+            file_put_contents($this->destinationFile.'.pubkey', $details['key']);
 
         } else {
             $phar->setSignatureAlgorithm($this->signatureAlgorithm);
@@ -428,14 +428,14 @@ 
 
         foreach ($this->filesets as $fileset) {
             $this->log(
-                'Adding specified files in ' . $fileset->getDir($this->project) . ' to package',
+                'Adding specified files in '.$fileset->getDir($this->project).' to package',
                 Project::MSG_VERBOSE
             );
 
             if (Phar::NONE != $this->compression) {
                 foreach ($fileset as $file) {
                     $localName = substr($file, strlen($baseDirectory) + 1);
-                    $this->log($localName . "... ", Project::MSG_VERBOSE);
+                    $this->log($localName."... ", Project::MSG_VERBOSE);
                     $phar->addFile($file, $localName);
                     $phar[$localName]->compress($this->compression);
                 }