fix: remove version check for outdated Magento versions which harm Ma…

src/N98/Magento/Command/Developer/Console/MakeBlockCommand.php

@@ -51,20 +51,11 @@ private function createClassFile(InputInterface $input, OutputInterface $output)
 
         /** @var $classGenerator ClassGenerator */
         $classGenerator->addUse('Magento\Framework\View\Element\Template');
-
-        if (version_compare($this->getMagentoVersion()->getVersion(), '2.2.0', '<')) {
-            $classGenerator->setExtendedClass('Template');
-        } else {
-            $classGenerator->setExtendedClass('Magento\Framework\View\Element\Template');
-        }
-
+        $classGenerator->setExtendedClass('Magento\Framework\View\Element\Template');
         $classGenerator->setName($classNameToGenerate);
 
-        $fileGenerator = FileGenerator::fromArray(
-            [
-                'classes' => [$classGenerator],
-            ]
-        );
+        $fileGenerator = new FileGenerator();
+        $fileGenerator->setClass($classGenerator);
 
         $directoryWriter = $this->getCurrentModuleDirectoryWriter();
         $directoryWriter->writeFile($filePathToGenerate, $fileGenerator->generate());

src/N98/Magento/Command/Developer/Console/MakeClassCommand.php

@@ -45,9 +45,8 @@ protected function catchedExecute(InputInterface $input, OutputInterface $output
         $classGenerator = $this->create(ClassGenerator::class);
         $classGenerator->setName($classNameToGenerate);
 
-        $fileGenerator = FileGenerator::fromArray([
-            'classes' => [$classGenerator],
-        ]);
+        $fileGenerator = new FileGenerator();
+        $fileGenerator->setClass($classGenerator);
 
         $directoryWriter = $this->getCurrentModuleDirectoryWriter();
         $directoryWriter->writeFile($filePathToGenerate, $fileGenerator->generate());

src/N98/Magento/Command/Developer/Console/MakeCommandCommand.php

@@ -59,12 +59,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $classGenerator->addUse('Symfony\Component\Console\Command\Command');
         $classGenerator->addUse('Symfony\Component\Console\Input\InputInterface');
         $classGenerator->addUse('Symfony\Component\Console\Output\OutputInterface');
-
-        if (version_compare($this->getMagentoVersion()->getVersion(), '2.2.0', '<')) {
-            $classGenerator->setExtendedClass('Command');
-        } else {
-            $classGenerator->setExtendedClass('Symfony\Component\Console\Command\Command');
-        }
+        $classGenerator->setExtendedClass('Symfony\Component\Console\Command\Command');
 
         $commandName = $this->prepareCommandName($input);
 

src/N98/Magento/Command/Developer/Console/MakeControllerCommand.php

@@ -39,14 +39,9 @@ protected function catchedExecute(InputInterface $input, OutputInterface $output
             . $this->getNormalizedClassnameByArgument($input->getArgument('classpath'));
         $filePathToGenerate = 'Controller/' . $actionFileName . '.php';
 
-        $classGenerator = $this->create(ClassGenerator::class);
-
         /** @var $classGenerator ClassGenerator */
-        if (version_compare($this->getMagentoVersion()->getVersion(), '2.2.0', '<')) {
-            $classGenerator->setExtendedClass('Action');
-        } else {
-            $classGenerator->setExtendedClass('Magento\Framework\App\Action\Action');
-        }
+        $classGenerator = $this->create(ClassGenerator::class);
+        $classGenerator->setExtendedClass('Magento\Framework\App\Action\Action');
 
         $body = $this->createClassBody($input);
         $executeMethodDefinition = $this->createClassMethodDefinitions($body);

src/N98/Magento/Command/Developer/Console/MakeHelperCommand.php

@@ -41,12 +41,7 @@ protected function catchedExecute(InputInterface $input, OutputInterface $output
 
         /** @var $classGenerator ClassGenerator */
         $classGenerator->addUse('Magento\Framework\App\Helper\AbstractHelper');
-
-        if (version_compare($this->getMagentoVersion()->getVersion(), '2.2.0', '<')) {
-            $classGenerator->setExtendedClass('AbstractHelper');
-        } else {
-            $classGenerator->setExtendedClass('Magento\Framework\App\Helper\AbstractHelper');
-        }
+        $classGenerator->setExtendedClass('Magento\Framework\App\Helper\AbstractHelper');
 
         $classGenerator->setName($classNameToGenerate);
 

src/N98/Magento/Command/Developer/Console/MakeModelCommand.php

@@ -40,21 +40,12 @@ protected function catchedExecute(InputInterface $input, OutputInterface $output
         $classGenerator = $this->create(ClassGenerator::class);
 
         /** @var $classGenerator ClassGenerator */
-        $classGenerator->addUse('Magento\Framework\Model\AbstractModel');
-
-        if (version_compare($this->getMagentoVersion()->getVersion(), '2.2.0', '<')) {
-            $classGenerator->setExtendedClass('AbstractModel');
-        } else {
-            $classGenerator->setExtendedClass('Magento\Framework\Model\AbstractModel');
-        }
-
+        $classGenerator->addUse('Magento\\Framework\\Model\\AbstractModel');
+        $classGenerator->setExtendedClass('Magento\\Framework\\Model\\AbstractModel');
         $classGenerator->setName($classNameToGenerate);
 
-        $modelFileGenerator = FileGenerator::fromArray(
-            [
-                'classes' => [$classGenerator],
-            ]
-        );
+        $modelFileGenerator = new FileGenerator();
+        $modelFileGenerator->setClass($classGenerator);
 
         $directoryWriter = $this->getCurrentModuleDirectoryWriter();
         $directoryWriter->writeFile($filePathToGenerate, $modelFileGenerator->generate());

src/N98/Magento/Command/ScriptCommand.php

@@ -2,6 +2,11 @@
 
 namespace N98\Magento\Command;
 
+use Exception;
+use function file_get_contents;
+use InvalidArgumentException;
+use Magento\Framework\App\DistributionMetadataInterface;
+use Magento\Framework\App\ProductMetadataInterface;
 use N98\Util\BinaryString;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\RuntimeException;
@@ -36,9 +41,26 @@ class ScriptCommand extends AbstractMagentoCommand
     protected $_stopOnError = false;
 
     /**
-     * @var null|\Magento\Framework\App\ProductMetadata
+     * @var ProductMetadataInterface
      */
-    protected $productMetadata = null;
+    private $productMetadata;
+
+    /**
+     * @var DistributionMetadataInterface|null
+     */
+    private $distributionMetadata;
+
+    /**
+     * Dependency injection for metadata interfaces
+     */
+    public function inject(
+        ProductMetadataInterface $productMetadata
+    ) {
+        $this->productMetadata = $productMetadata;
+        if ($productMetadata instanceof DistributionMetadataInterface) {
+            $this->distributionMetadata = $productMetadata;
+        }
+    }
 
     protected function configure()
     {
@@ -142,7 +164,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if (empty($commandString)) {
                 continue;
             }
-            $firstChar = substr($commandString, 0, 1);
+            $firstChar = $commandString[0];
 
             switch ($firstChar) {
                 case '#':
@@ -175,7 +197,7 @@ protected function _initDefines(InputInterface $input)
 
         foreach ($defines as $define) {
             if (!strstr($define, '=')) {
-                throw new \InvalidArgumentException('Invalid define');
+                throw new InvalidArgumentException('Invalid define');
             }
             $parts = BinaryString::trimExplodeEmpty('=', $define);
             list($variable, $value) = $parts + [1 => null];
@@ -194,7 +216,7 @@ protected function _getContent($filename)
         if ($filename === '-' || empty($filename)) {
             $filename = 'php://stdin';
         }
-        $script = @\file_get_contents($filename);
+        $script = @file_get_contents($filename);
 
         if (!$script) {
             throw new RuntimeException('Script file was not found');
@@ -250,7 +272,7 @@ protected function registerVariable(InputInterface $input, OutputInterface $outp
                     $question->setMaxAttempts(20);
                     $question->setValidator(function ($value) {
                         if (empty($value)) {
-                            throw new \Exception('Please enter a value');
+                            throw new Exception('Please enter a value');
                         }
 
                         return $value;
@@ -317,10 +339,17 @@ protected function _prepareShellCommand($commandString)
     protected function initScriptVars()
     {
         $rootFolder = $this->getApplication()->getMagentoRootFolder();
+        $this->getApplication()->initMagento();
         if ($rootFolder !== null) {
             $this->scriptVars['${magento.root}'] = $rootFolder;
-            $this->scriptVars['${magento.version}'] = $this->getMagentoVersion();
-            $this->scriptVars['${magento.edition}'] = $this->getMagentoEdition();
+            $this->scriptVars['${magento.version}'] = $this->productMetadata ? $this->productMetadata->getVersion() : 'UNKNOWN';
+            $this->scriptVars['${magento.edition}'] = $this->productMetadata ? $this->productMetadata->getEdition() : 'UNKNOWN';
+            $this->scriptVars['${magento.distribution}'] = 'UNKNOWN';
+            $this->scriptVars['${magento.distribution_version}'] = 'UNKNOWN';
+            if ($this->distributionMetadata) {
+                $this->scriptVars['${magento.distribution}'] = $this->distributionMetadata->getDistributionName();
+                $this->scriptVars['${magento.distribution_version}'] = $this->distributionMetadata->getDistributionVersion();
+            }
         }
 
         $this->scriptVars['${php.version}'] = substr(phpversion(), 0, strpos(phpversion(), '-'));
@@ -358,37 +387,4 @@ protected function _replaceScriptVars($commandString)
 
         return $commandString;
     }
-
-    /**
-     * @return string
-     * @throws \Exception
-     */
-    private function getMagentoVersion()
-    {
-        return $this->getProductMetadata()->getVersion();
-    }
-
-    /**
-     * @return string
-     * @throws \Exception
-     */
-    private function getMagentoEdition()
-    {
-        return $this->getProductMetadata()->getEdition();
-    }
-
-    /**
-     * @return \Magento\Framework\App\ProductMetadata
-     * @throws \Exception
-     */
-    private function getProductMetadata()
-    {
-        if ($this->productMetadata === null) {
-            $this->initMagento(); // obtaining the object-manager requires init Magento
-            $objectManager = $this->getApplication()->getObjectManager();
-            $this->productMetadata = $objectManager->get('\Magento\Framework\App\ProductMetadata');
-        }
-
-        return $this->productMetadata;
-    }
 }

tests/N98/Magento/Command/ScriptCommandTest.php

@@ -18,7 +18,8 @@ public function testExecute()
         // Check pre defined vars
         $this->assertDisplayRegExp($input, '~^\Qmagento.root: \E/.+\R$~m');
         $this->assertDisplayRegExp($input, '~^\Qmagento.edition: \E(Community|Enterprise)\R$~m');
-        $this->assertDisplayRegExp($input, '~^\Qmagento.version: \E\d\.\d+\.\d+.*\R$~m');
+        $this->assertDisplayRegExp($input, '~^magento.version: (\\d\\.\\d+\\.\\d+.*|UNKNOWN)\\R$~m');
+        $this->assertDisplayRegExp($input, '~^magento.distribution_version: (\\d\\.\\d+\\.\\d+.*|UNKNOWN)\\R$~m');
 
         // Test ENV vars
         $this->assertDisplayRegExp($input, '~^\QPath ENV Variable: \E.*\R$~m');

tests/N98/Magento/Command/_files/test.mr

@@ -11,6 +11,7 @@ ${bar}=${foo}.gz
 ! echo "magento.root: ${magento.root}"
 ! echo "magento.edition: ${magento.edition}"
 ! echo "magento.version: ${magento.version}"
+! echo "magento_distribution_version: ${magento.distribution_version}"
 ! echo "php.version: ${php.version}"
 ! echo "magerun.version: ${magerun.version}"
 ! echo "Path ENV Variable: ${env.PATH}"