-
Notifications
You must be signed in to change notification settings - Fork 9.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #74 from magento-ogre/PR_Branch
[Ogres] Bugfixes
- Loading branch information
Showing
77 changed files
with
764 additions
and
153 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
178 changes: 178 additions & 0 deletions
178
app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2015 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Developer\Console\Command; | ||
|
|
||
| use Magento\Framework\Exception\InputException; | ||
| use Symfony\Component\Console\Command\Command; | ||
| use Symfony\Component\Console\Input\InputArgument; | ||
| use Symfony\Component\Console\Input\InputOption; | ||
| use Symfony\Component\Console\Input\InputInterface; | ||
| use Symfony\Component\Console\Output\OutputInterface; | ||
| use Magento\Framework\App\Filesystem\DirectoryList; | ||
|
|
||
| /** | ||
| * Class XmlCatalogGenerateCommand Generates dictionary of URNs for the IDE | ||
| * | ||
| * @SuppressWarnings(PMD.CouplingBetweenObjects) | ||
| */ | ||
| class XmlCatalogGenerateCommand extends Command | ||
| { | ||
| /** | ||
| * Option for the type of IDE | ||
| */ | ||
| const IDE_OPTION = 'ide'; | ||
|
|
||
| /** | ||
| * Argument for the path to IDE config file | ||
| */ | ||
| const IDE_FILE_PATH_ARGUMENT = 'path'; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\App\Utility\Files | ||
| */ | ||
| private $filesUtility; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\Config\Dom\UrnResolver | ||
| */ | ||
| private $urnResolver; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\Filesystem\Directory\ReadInterface | ||
| */ | ||
| private $rootDirRead; | ||
|
|
||
| /** | ||
| * Supported formats | ||
| * | ||
| * @var \Magento\Developer\Model\XmlCatalog\Format\FormatInterface[] | ||
| */ | ||
| private $formats; | ||
|
|
||
| /** | ||
| * @param \Magento\Framework\App\Utility\Files $filesUtility | ||
| * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver | ||
| * @param \Magento\Framework\Filesystem $filesystemFactory | ||
| * @param \Magento\Developer\Model\XmlCatalog\Format\FormatInterface[] $formats | ||
| */ | ||
| public function __construct( | ||
| \Magento\Framework\App\Utility\Files $filesUtility, | ||
| \Magento\Framework\Config\Dom\UrnResolver $urnResolver, | ||
| \Magento\Framework\Filesystem $filesystemFactory, | ||
| array $formats = [] | ||
| ) { | ||
| $this->filesUtility = $filesUtility; | ||
| $this->urnResolver = $urnResolver; | ||
| $this->formats = $formats; | ||
| $this->rootDirRead = $filesystemFactory->getDirectoryRead(DirectoryList::ROOT); | ||
| parent::__construct(); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| protected function configure() | ||
| { | ||
| $this->setName('dev:urn-catalog:generate') | ||
| ->setDescription('Generates the catalog of URNs to *.xsd mappings for the IDE to highlight xml.') | ||
| ->setDefinition([ | ||
| new InputOption( | ||
| self::IDE_OPTION, | ||
| null, | ||
| InputOption::VALUE_REQUIRED, | ||
| 'Format in which catalog will be generated. Supported: ['. | ||
| implode(', ', $this->getSupportedFormats()) . ']', | ||
| 'phpstorm' | ||
| ), | ||
| new InputArgument( | ||
| self::IDE_FILE_PATH_ARGUMENT, | ||
| InputArgument::REQUIRED, | ||
| 'Path to file to output the catalog. For PhpStorm use .idea/misc.xml' | ||
| ) | ||
| ]); | ||
|
|
||
| parent::configure(); | ||
| } | ||
|
|
||
| /** | ||
| * Get an array of URNs | ||
| * | ||
| * @param OutputInterface $output | ||
| * @return array | ||
| */ | ||
| private function getUrnDictionary(OutputInterface $output) | ||
| { | ||
| $files = $this->filesUtility->getXmlCatalogFiles('*.xml'); | ||
| $files = array_merge($files, $this->filesUtility->getXmlCatalogFiles('*.xsd')); | ||
|
|
||
| $urns = []; | ||
| foreach ($files as $file) { | ||
| $content = $this->rootDirRead->readFile( | ||
| $this->rootDirRead->getRelativePath($file[0]) | ||
| ); | ||
| $matches = []; | ||
| preg_match_all('/schemaLocation="(urn\:magento\:[^"]*)"/i', $content, $matches); | ||
| if (isset($matches[1])) { | ||
| $urns = array_merge($urns, $matches[1]); | ||
| } | ||
| } | ||
| $urns = array_unique($urns); | ||
| $paths = []; | ||
| foreach ($urns as $urn) { | ||
| try { | ||
| $paths[$urn] = $this->urnResolver->getRealPath($urn); | ||
| } catch (\Exception $e) { | ||
| // don't add unsupported element to array | ||
| if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) { | ||
| $output->writeln($e->getMessage()); | ||
| } | ||
| } | ||
| } | ||
| return $paths; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| * @throws \InvalidArgumentException | ||
| */ | ||
| protected function execute(InputInterface $input, OutputInterface $output) | ||
| { | ||
| $ideName = $input->getOption(self::IDE_OPTION); | ||
| $ideFilePath = $input->getArgument(self::IDE_FILE_PATH_ARGUMENT); | ||
|
|
||
| $urnDictionary = $this->getUrnDictionary($output); | ||
| if ($formatter = $this->getFormatters($ideName)) { | ||
| $formatter->generateCatalog($urnDictionary, $ideFilePath); | ||
| } else { | ||
| throw new InputException(__("Format for IDE '%1' is not supported", $ideName)); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Get formatter based on format | ||
| * | ||
| * @param string $format | ||
| * @return \Magento\Developer\Model\XmlCatalog\Format\FormatInterface|false | ||
| */ | ||
| private function getFormatters($format) | ||
| { | ||
| if (!isset($this->formats[$format])) { | ||
| return false; | ||
| } | ||
| return $this->formats[$format]; | ||
| } | ||
|
|
||
| /** | ||
| * Get registered formatter aliases | ||
| * | ||
| * @return string[] | ||
| */ | ||
| public function getSupportedFormats() | ||
| { | ||
| return array_keys($this->formats); | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
app/code/Magento/Developer/Model/XmlCatalog/Format/FormatInterface.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2015 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Developer\Model\XmlCatalog\Format; | ||
|
|
||
| /** | ||
| * Interface FormatInterface is implemented by custom URN catalog generators | ||
| */ | ||
| interface FormatInterface | ||
| { | ||
| /** | ||
| * Generate Catalog of URNs | ||
| * | ||
| * @param string[] $dictionary | ||
| * @param string $configFile absolute path to the file to write the catalog | ||
| * @return void | ||
| */ | ||
| public function generateCatalog(array $dictionary, $configFile); | ||
| } |
Oops, something went wrong.