netz98 / n98-magerun

src/N98/Magento/Command/Config/SearchCommand.php

Spacing +15 added lines, -15 removed lines

@@ -40,24 +40,24 @@ 
 
             if (count($matches) > 0) {
                 foreach ($matches as $match) {
-                    $output->writeln('Found a <comment>' . $match->type . '</comment> with a match');
-                    $output->writeln('  ' . $this->_getPhpMageStoreConfigPathFromMatch($match));
-                    $output->writeln('  ' . $this->_getPathFromMatch($match));
+                    $output->writeln('Found a <comment>'.$match->type.'</comment> with a match');
+                    $output->writeln('  '.$this->_getPhpMageStoreConfigPathFromMatch($match));
+                    $output->writeln('  '.$this->_getPathFromMatch($match));
 
                     if ($match->match_type == 'comment') {
                         $output->writeln(
-                            '  ' .
+                            '  '.
                             str_ireplace(
                                 $searchString,
-                                '<info>' . $searchString . '</info>',
-                                (string) $match->node->comment
+                                '<info>'.$searchString.'</info>',
+                                (string)$match->node->comment
                             )
                         );
                     }
                     $output->writeln('');
                 }
             } else {
-                $output->writeln('<info>No matches for <comment>' . $searchString . '</comment></info>');
+                $output->writeln('<info>No matches for <comment>'.$searchString.'</comment></info>');
             }
         }
     }
@@ -117,14 +117,14 @@ 
     {
         $match = new \stdClass;
         $match->type = $this->_getNodeType($node);
-        if (stristr((string) $node->label, $searchString)) {
+        if (stristr((string)$node->label, $searchString)) {
             $match->match_type = 'label';
             $match->node = $node;
 
             return $match;
         }
 
-        if (stristr((string) $node->comment, $searchString)) {
+        if (stristr((string)$node->comment, $searchString)) {
             $match->match_type = 'comment';
             $match->node = $node;
 
@@ -179,13 +179,13 @@ 
                 $grand = current($parent->xpath('parent::*'));
                 $grand = current($grand->xpath('parent::*'));
 
-                $path = $grand->getName() . '/' . $parent->getName() . '/' . $match->node->getName();
+                $path = $grand->getName().'/'.$parent->getName().'/'.$match->node->getName();
                 break;
 
             case 'group':
                 $parent = current($match->node->xpath('parent::*'));
                 $parent = current($parent->xpath('parent::*'));
-                $path = $parent->getName() . '/' . $match->node->getName();
+                $path = $parent->getName().'/'.$match->node->getName();
                 break;
 
             default:
@@ -193,7 +193,7 @@ 
                 throw new RuntimeException(__METHOD__);
         }
 
-        return "Mage::getStoreConfig('" . $path . "')";
+        return "Mage::getStoreConfig('".$path."')";
     }
 
     /**
@@ -206,7 +206,7 @@ 
     {
         switch ($match->type) {
             case 'section':
-                return (string) $match->node->label . ' -> ... -> ...';
+                return (string)$match->node->label.' -> ... -> ...';
 
             case 'field':
                 $parent = current($match->node->xpath('parent::*'));
@@ -215,12 +215,12 @@ 
                 $grand = current($parent->xpath('parent::*'));
                 $grand = current($grand->xpath('parent::*'));
 
-                return $grand->label . ' -> ' . $parent->label . ' -> <info>' . $match->node->label . '</info>';
+                return $grand->label.' -> '.$parent->label.' -> <info>'.$match->node->label.'</info>';
 
             case 'group':
                 $parent = current($match->node->xpath('parent::*'));
                 $parent = current($parent->xpath('parent::*'));
-                return $parent->label . ' -> <info>' . $match->node->label . '</info> -> ...';
+                return $parent->label.' -> <info>'.$match->node->label.'</info> -> ...';
 
             default:
                 // @TODO Why?

src/N98/Magento/Command/Config/SetCommand.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         );
 
         $output->writeln(
-            '<comment>' . $input->getArgument('path') . "</comment> => <comment>" . $input->getArgument('value') .
+            '<comment>'.$input->getArgument('path')."</comment> => <comment>".$input->getArgument('value').
             '</comment>'
         );
     }

src/N98/Magento/Command/Developer/Report/CountCommand.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
         $this->detectMagento($output);
         $this->initMagento();
 
-        $dir = \Mage::getBaseDir('var') . DIRECTORY_SEPARATOR . 'report' . DIRECTORY_SEPARATOR;
+        $dir = \Mage::getBaseDir('var').DIRECTORY_SEPARATOR.'report'.DIRECTORY_SEPARATOR;
         $count = $this->getFileCount($dir);
 
         $output->writeln($count);

src/N98/Magento/Command/Developer/ConsoleCommand.php

Spacing +2 added lines, -2 removed lines

@@ -48,8 +48,8 @@
             $ok = Charset::convertInteger(Charset::UNICODE_CHECKMARK_CHAR);
             $edition = $this->getApplication()->isMagentoEnterprise() ? 'EE' : 'CE';
             $consoleOutput->writeln(
-                '<fg=black;bg=green>Magento ' . \Mage::getVersion() . ' ' . $edition .
-                ' initialized.</fg=black;bg=green> ' . $ok
+                '<fg=black;bg=green>Magento '.\Mage::getVersion().' '.$edition.
+                ' initialized.</fg=black;bg=green> '.$ok
             );
         } else {
             $consoleOutput->writeln('<fg=black;bg=yellow>Magento is not initialized.</fg=black;bg=yellow>');

src/N98/Magento/Command/Developer/Module/CreateCommand.php

Spacing +31 added lines, -31 removed lines

@@ -93,7 +93,7 @@ 
         if (!$this->modmanMode) {
             $this->detectMagento($output);
         }
-        $this->baseFolder = __DIR__ . '/../../../../../../res/module/create';
+        $this->baseFolder = __DIR__.'/../../../../../../res/module/create';
 
         $this->vendorNamespace = ucfirst($input->getArgument('vendorNamespace'));
         $this->moduleName = ucfirst($input->getArgument('moduleName'));
@@ -136,13 +136,13 @@ 
     protected function createModuleDirectories(InputInterface $input, OutputInterface $output)
     {
         if ($this->modmanMode) {
-            $modManDir = $this->vendorNamespace . '_' . $this->moduleName . '/src';
+            $modManDir = $this->vendorNamespace.'_'.$this->moduleName.'/src';
             if (file_exists($modManDir)) {
                 throw new RuntimeException('Module already exists. Stop.');
             }
             mkdir($modManDir, 0777, true);
-            $this->_magentoRootFolder = './' . $modManDir;
-            mkdir($this->_magentoRootFolder . '/app/etc/modules', 0777, true);
+            $this->_magentoRootFolder = './'.$modManDir;
+            mkdir($this->_magentoRootFolder.'/app/etc/modules', 0777, true);
         }
         $moduleDir = sprintf(
             '%s/app/code/%s/%s/%s',
@@ -157,47 +157,47 @@ 
         }
         $this->moduleDirectory = $moduleDir;
         mkdir($this->moduleDirectory, 0777, true);
-        $output->writeln('<info>Created directory: <comment>' . $this->moduleDirectory . '<comment></info>');
+        $output->writeln('<info>Created directory: <comment>'.$this->moduleDirectory.'<comment></info>');
 
         // Add etc folder
-        mkdir($this->moduleDirectory . '/etc');
-        $output->writeln('<info>Created directory: <comment>' . $this->moduleDirectory . '/etc<comment></info>');
+        mkdir($this->moduleDirectory.'/etc');
+        $output->writeln('<info>Created directory: <comment>'.$this->moduleDirectory.'/etc<comment></info>');
 
         // Add blocks folder
         if ($input->getOption('add-blocks')) {
-            mkdir($this->moduleDirectory . '/Block');
+            mkdir($this->moduleDirectory.'/Block');
             $output->writeln(
-                '<info>Created directory: <comment>' . $this->moduleDirectory . '/Block' . '<comment></info>'
+                '<info>Created directory: <comment>'.$this->moduleDirectory.'/Block'.'<comment></info>'
             );
         }
 
         // Add helpers folder
         if ($input->getOption('add-helpers')) {
-            mkdir($this->moduleDirectory . '/Helper');
+            mkdir($this->moduleDirectory.'/Helper');
             $output->writeln(
-                '<info>Created directory: <comment>' . $this->moduleDirectory . '/Helper' . '<comment></info>'
+                '<info>Created directory: <comment>'.$this->moduleDirectory.'/Helper'.'<comment></info>'
             );
         }
 
         // Add models folder
         if ($input->getOption('add-models')) {
-            mkdir($this->moduleDirectory . '/Model');
+            mkdir($this->moduleDirectory.'/Model');
             $output->writeln(
-                '<info>Created directory: <comment>' . $this->moduleDirectory . '/Model' . '<comment></info>'
+                '<info>Created directory: <comment>'.$this->moduleDirectory.'/Model'.'<comment></info>'
             );
         }
 
         // Create SQL and Data folder
         if ($input->getOption('add-setup')) {
-            $sqlSetupFolder = $this->moduleDirectory . '/sql/' . strtolower($this->vendorNamespace) . '_' .
-                strtolower($this->moduleName) . '_setup';
+            $sqlSetupFolder = $this->moduleDirectory.'/sql/'.strtolower($this->vendorNamespace).'_'.
+                strtolower($this->moduleName).'_setup';
             mkdir($sqlSetupFolder, 0777, true);
-            $output->writeln('<info>Created directory: <comment>' . $sqlSetupFolder . '<comment></info>');
+            $output->writeln('<info>Created directory: <comment>'.$sqlSetupFolder.'<comment></info>');
 
-            $dataSetupFolder = $this->moduleDirectory . '/data/' . strtolower($this->vendorNamespace) . '_' .
-                strtolower($this->moduleName) . '_setup';
+            $dataSetupFolder = $this->moduleDirectory.'/data/'.strtolower($this->vendorNamespace).'_'.
+                strtolower($this->moduleName).'_setup';
             mkdir($dataSetupFolder, 0777, true);
-            $output->writeln('<info>Created directory: <comment>' . $dataSetupFolder . '<comment></info>');
+            $output->writeln('<info>Created directory: <comment>'.$dataSetupFolder.'<comment></info>');
         }
     }
 
@@ -215,28 +215,28 @@ 
         $buffer = $helper->render('dev/module/create/app/etc/modules/definition.twig', $this->twigVars);
         $size   = file_put_contents($outFile, $buffer);
 
-        $output->writeln('<info>Created file: <comment>' . $outFile . '<comment> (' . $size . ' bytes)</info>');
+        $output->writeln('<info>Created file: <comment>'.$outFile.'<comment> ('.$size.' bytes)</info>');
     }
 
     protected function writeModuleConfig(OutputInterface $output)
     {
-        $outFile = $this->moduleDirectory . '/etc/config.xml';
+        $outFile = $this->moduleDirectory.'/etc/config.xml';
         file_put_contents(
             $outFile,
             $this->getHelper('twig')->render('dev/module/create/app/etc/modules/config.twig', $this->twigVars)
         );
 
-        $output->writeln('<info>Created file: <comment>' . $outFile . '<comment></info>');
+        $output->writeln('<info>Created file: <comment>'.$outFile.'<comment></info>');
     }
 
     protected function writeModmanFile(OutputInterface $output)
     {
-        $outFile = $this->_magentoRootFolder . '/../modman';
+        $outFile = $this->_magentoRootFolder.'/../modman';
         file_put_contents(
             $outFile,
             $this->getHelper('twig')->render('dev/module/create/modman.twig', $this->twigVars)
         );
-        $output->writeln('<info>Created file: <comment>' . $outFile . '<comment></info>');
+        $output->writeln('<info>Created file: <comment>'.$outFile.'<comment></info>');
     }
 
     /**
@@ -255,15 +255,15 @@ 
             return;
         }
         if ($this->modmanMode) {
-            $outFile = $this->_magentoRootFolder . '/../readme.md';
+            $outFile = $this->_magentoRootFolder.'/../readme.md';
         } else {
-            $outFile = $this->moduleDirectory . '/etc/readme.md';
+            $outFile = $this->moduleDirectory.'/etc/readme.md';
         }
         file_put_contents(
             $outFile,
             $this->getHelper('twig')->render('dev/module/create/app/etc/modules/readme.twig', $this->twigVars)
         );
-        $output->writeln('<info>Created file: <comment>' . $outFile . '<comment></info>');
+        $output->writeln('<info>Created file: <comment>'.$outFile.'<comment></info>');
     }
 
     /**
@@ -278,15 +278,15 @@ 
             return;
         }
         if ($this->modmanMode) {
-            $outFile = $this->_magentoRootFolder . '/../composer.json';
+            $outFile = $this->_magentoRootFolder.'/../composer.json';
         } else {
-            $outFile = $this->moduleDirectory . '/etc/composer.json';
+            $outFile = $this->moduleDirectory.'/etc/composer.json';
         }
         file_put_contents(
             $outFile,
             $this->getHelper('twig')->render('dev/module/create/composer.twig', $this->twigVars)
         );
-        $output->writeln('<info>Created file: <comment>' . $outFile . '<comment></info>');
+        $output->writeln('<info>Created file: <comment>'.$outFile.'<comment></info>');
     }
 
     protected function addAdditionalFiles(OutputInterface $output)
@@ -302,7 +302,7 @@ 
                     $outFile,
                     $this->getHelper('twig')->render($template, $this->twigVars)
                 );
-                $output->writeln('<info>Created file: <comment>' . $outFile . '<comment></info>');
+                $output->writeln('<info>Created file: <comment>'.$outFile.'<comment></info>');
             }
         }
     }

src/N98/Magento/Command/Developer/Module/Rewrite/AbstractRewriteCommand.php

Spacing +11 added lines, -11 removed lines

@@ -32,7 +32,7 @@ 
             }
 
             // Load config of module
-            $configXmlFile = \Mage::getConfig()->getModuleDir('etc', $moduleName) . DIRECTORY_SEPARATOR . 'config.xml';
+            $configXmlFile = \Mage::getConfig()->getModuleDir('etc', $moduleName).DIRECTORY_SEPARATOR.'config.xml';
             if (!is_readable($configXmlFile)) {
                 continue;
             }
@@ -51,10 +51,10 @@ 
 
                 foreach ($element->children() as $child) {
                     $groupClassName = \simplexml_import_dom(dom_import_simplexml($element)->parentNode)->getName();
-                    if (!isset($return[$type][$groupClassName . '/' . $child->getName()])) {
-                        $return[$type][$groupClassName . '/' . $child->getName()] = array();
+                    if (!isset($return[$type][$groupClassName.'/'.$child->getName()])) {
+                        $return[$type][$groupClassName.'/'.$child->getName()] = array();
                     }
-                    $return[$type][$groupClassName . '/' . $child->getName()][] = (string) $child;
+                    $return[$type][$groupClassName.'/'.$child->getName()][] = (string)$child;
                 }
             }
         }
@@ -85,13 +85,13 @@ 
     protected function loadAutoloaderRewritesByCodepool($codePool)
     {
         $return = array();
-        $localCodeFolder = \Mage::getBaseDir('code') . '/' . $codePool;
+        $localCodeFolder = \Mage::getBaseDir('code').'/'.$codePool;
 
         $folders = array(
-            'Mage'       => $localCodeFolder . '/Mage',
-            'Enterprise' => $localCodeFolder . '/Enterprise',
-            'Varien'     => $localCodeFolder . '/Varien',
-            'Zend'       => $localCodeFolder . '/Zend',
+            'Mage'       => $localCodeFolder.'/Mage',
+            'Enterprise' => $localCodeFolder.'/Enterprise',
+            'Varien'     => $localCodeFolder.'/Varien',
+            'Zend'       => $localCodeFolder.'/Zend',
         );
 
         foreach ($folders as $vendorPrefix => $folder) {
@@ -104,9 +104,9 @@ 
                     ->in($folder);
                 foreach ($finder as $file) {
                     $classFile = trim(str_replace($folder, '', $file->getPathname()), '/');
-                    $className = $vendorPrefix . '_' . str_replace(DIRECTORY_SEPARATOR, '_', $classFile);
+                    $className = $vendorPrefix.'_'.str_replace(DIRECTORY_SEPARATOR, '_', $classFile);
                     $className = substr($className, 0, -4); // replace .php extension
-                    $return['autoload: ' . $vendorPrefix][$className][] = $className;
+                    $return['autoload: '.$vendorPrefix][$className][] = $className;
                 }
             }
         }

src/N98/Magento/Command/Developer/Module/Rewrite/ConflictsCommand.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
             $this->writeOutput($output, $conflicts);
         }
 
-        return (int) (bool) $conflicts;
+        return (int)(bool)$conflicts;
     }
 
     /**
@@ -114,7 +114,7 @@ 
     {
         $document = new JUnitXmlDocument();
         $suite = $document->addTestSuite();
-        $suite->setName('n98-magerun: ' . $this->getName());
+        $suite->setName('n98-magerun: '.$this->getName());
         $suite->setTimestamp(new DateTime());
         $suite->setTime($duration);
 
@@ -189,6 +189,6 @@ 
             $number === 1 ? 'conflict was' : 'conflicts were'
         );
 
-        $output->writeln('<error>' . $message . '</error>');
+        $output->writeln('<error>'.$message.'</error>');
     }
 }

src/N98/Magento/Command/Developer/Module/Observer/ListCommand.php

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
                 'format',
                 null,
                 InputOption::VALUE_OPTIONAL,
-                'Output Format. One of [' . implode(',', RendererFactory::getFormats()) . ']'
+                'Output Format. One of ['.implode(',', RendererFactory::getFormats()).']'
             )
             ->addOption(
                 'sort',
@@ -60,13 +60,13 @@ 
         }
 
         if (!in_array($type, $areas)) {
-            throw new InvalidArgumentException('Invalid type! Use one of: ' . implode(', ', $areas));
+            throw new InvalidArgumentException('Invalid type! Use one of: '.implode(', ', $areas));
         }
 
         if ($input->getOption('format') === null) {
-            $this->writeSection($output, 'Observers: ' . $type);
+            $this->writeSection($output, 'Observers: '.$type);
         }
-        $frontendEvents = \Mage::getConfig()->getNode($type . '/events')->asArray();
+        $frontendEvents = \Mage::getConfig()->getNode($type.'/events')->asArray();
         if (true === $input->getOption('sort')) {
             // sorting for Observers is a bad idea because the order in which observers will be called is important.
             ksort($frontendEvents);
@@ -108,9 +108,9 @@ 
             $class = $observer['model'];
         }
 
-        $method = isset($observer['method']) ? '::' . $observer['method'] : '';
+        $method = isset($observer['method']) ? '::'.$observer['method'] : '';
 
-        $observer = $type . $class . $method;
+        $observer = $type.$class.$method;
 
         return $observer;
     }

src/N98/Magento/Command/Developer/Module/UpdateCommand.php

Spacing +17 added lines, -17 removed lines

@@ -182,12 +182,12 @@ 
     {
         if ($this->testMode === true) {
             $this->codePool = 'local';
-            $this->_magentoRootFolder = './' . $this->getModuleNamespace() . '/src';
+            $this->_magentoRootFolder = './'.$this->getModuleNamespace().'/src';
             $this->moduleDirectory = $this->_magentoRootFolder
                 . '/app/code/'
                 . $this->codePool
-                . '/' . $this->vendorNamespace
-                . '/' . $this->moduleName;
+                . '/'.$this->vendorNamespace
+                . '/'.$this->moduleName;
         } else {
             $this->moduleDirectory = $this->getModuleDir();
         }
@@ -247,7 +247,7 @@ 
         $this->setDefaultNode($input, $configXml);
         $this->putConfigXml($configXml);
 
-        $output->writeln('<info>Edited file: <comment>' . $this->getOutFile() . '<comment></info>');
+        $output->writeln('<info>Edited file: <comment>'.$this->getOutFile().'<comment></info>');
     }
 
 
@@ -410,7 +410,7 @@ 
      */
     protected function getCurrentConfigContent()
     {
-        $configFile = $this->getModuleDir() . '/etc/config.xml';
+        $configFile = $this->getModuleDir().'/etc/config.xml';
 
         return file_get_contents($configFile);
     }
@@ -430,8 +430,8 @@ 
      */
     protected function initResourceModelConfigNodes()
     {
-        $this->configNodes['resource_node_name'] = $this->getLowercaseModuleNamespace() . '_resource';
-        $this->configNodes['resource_model_class'] = $this->getModuleNamespace() . '_Model_Resource';
+        $this->configNodes['resource_node_name'] = $this->getLowercaseModuleNamespace().'_resource';
+        $this->configNodes['resource_model_class'] = $this->getModuleNamespace().'_Model_Resource';
         $this->configNodes['resource_deprecated_mysql4_node'] = false;
         $this->configNodes['resource_entities'] = array();
     }
@@ -646,7 +646,7 @@ 
         $global = $configXml->global ? $configXml->global : $configXml->addChild('global');
         $globalNode = $global->addChild($type);
         $moduleNamespaceNode = $globalNode->addChild($this->getLowercaseModuleNamespace());
-        $moduleNamespaceNode->addChild('class', $this->getModuleNamespace() . $classSuffix);
+        $moduleNamespaceNode->addChild('class', $this->getModuleNamespace().$classSuffix);
     }
 
 
@@ -661,7 +661,7 @@ 
             );
         }
 
-        $resourceNamespace = $this->getLowercaseModuleNamespace() . '_resource';
+        $resourceNamespace = $this->getLowercaseModuleNamespace().'_resource';
         $resourceModelNode = $simpleXml->global->models->$resourceNamespace ?
             $simpleXml->global->models->$resourceNamespace : $simpleXml->global->models->addChild($resourceNamespace);
 
@@ -671,7 +671,7 @@ 
         if ($this->configNodes['resource_deprecated_mysql4_node'] === true) {
             $simpleXml->global->models->$resourceNamespace->deprecatedNode ? null : $resourceModelNode->addChild(
                 'deprecatedNode',
-                $resourceNamespace . '_eav_mysql4'
+                $resourceNamespace.'_eav_mysql4'
             );
         } else {
             $this->removeChildNodeIfNotNull($resourceModelNode, 'deprecatedNode');
@@ -772,7 +772,7 @@ 
      */
     protected function getOutFile()
     {
-        return $this->moduleDirectory . '/etc/config.xml';
+        return $this->moduleDirectory.'/etc/config.xml';
     }
 
     /**
@@ -897,7 +897,7 @@ 
      */
     protected function getModuleNamespace()
     {
-        return $this->vendorNamespace . '_' . $this->moduleName;
+        return $this->vendorNamespace.'_'.$this->moduleName;
     }
 
     /**
@@ -905,7 +905,7 @@ 
      */
     protected function getLowercaseModuleNamespace()
     {
-        return strtolower($this->vendorNamespace . '_' . $this->moduleName);
+        return strtolower($this->vendorNamespace.'_'.$this->moduleName);
     }
 
     /**
@@ -943,16 +943,16 @@ 
         $xmlArray = explode("\n", $string);
         $currIndent = 0;
         $indent = "    ";
-        $string = array_shift($xmlArray) . "\n";
+        $string = array_shift($xmlArray)."\n";
         foreach ($xmlArray as $element) {
             if (preg_match('/^<([\w])+[^>\/]*>$/U', $element)) {
-                $string .= str_repeat($indent, $currIndent) . $element . "\n";
+                $string .= str_repeat($indent, $currIndent).$element."\n";
                 $currIndent += 1;
             } elseif (preg_match('/^<\/.+>$/', $element)) {
                 $currIndent -= 1;
-                $string .= str_repeat($indent, $currIndent) . $element . "\n";
+                $string .= str_repeat($indent, $currIndent).$element."\n";
             } else {
-                $string .= str_repeat($indent, $currIndent) . $element . "\n";
+                $string .= str_repeat($indent, $currIndent).$element."\n";
             }
         }