Merge pull request #265 from magento-ogre/PR_Branch

[Ogres] Bug fixes and custom vendor part 1

Author: Kopylova,Olga(okopylova)

.travis.yml

@@ -1,3 +1,6 @@
+sudo: required
+dist: trusty
+
 language: php
 php:
   - 5.5
@@ -44,12 +47,10 @@ before_script:
   # Install MySQL 5.6, create DB for integration tests
   - >
       sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
-      sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
-      sudo apt-get autoremove;
-      sudo apt-get autoclean;
-      sudo apt-add-repository ppa:ondrej/mysql-5.6 -y;
-      sudo apt-get update;
-      sudo apt-get install mysql-server-5.6 mysql-client-5.6;
+      sudo apt-get remove -y -qq --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
+      sudo apt-get -y -qq autoremove;
+      sudo apt-get -y -qq autoclean;
+      sudo apt-get install -y -qq mysql-server-5.6 mysql-client-5.6;
       mysql -uroot -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;';
       mv dev/tests/integration/etc/install-config-mysql.travis.php.dist dev/tests/integration/etc/install-config-mysql.php;
       fi"

app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php

@@ -12,7 +12,6 @@
 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
@@ -42,9 +41,9 @@ class XmlCatalogGenerateCommand extends Command
     private $urnResolver;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\ReadInterface
+     * @var \Magento\Framework\Filesystem\Directory\ReadFactory
      */
-    private $rootDirRead;
+    private $readFactory;
 
     /**
      * Supported formats
@@ -56,19 +55,19 @@ class XmlCatalogGenerateCommand extends Command
     /**
      * @param \Magento\Framework\App\Utility\Files $filesUtility
      * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
-     * @param \Magento\Framework\Filesystem $filesystemFactory
+     * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
      * @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,
+        \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory,
         array $formats = []
     ) {
         $this->filesUtility = $filesUtility;
         $this->urnResolver = $urnResolver;
         $this->formats = $formats;
-        $this->rootDirRead = $filesystemFactory->getDirectoryRead(DirectoryList::ROOT);
+        $this->readFactory = $readFactory;
         parent::__construct();
     }
 
@@ -111,9 +110,10 @@ private function getUrnDictionary(OutputInterface $output)
 
         $urns = [];
         foreach ($files as $file) {
-            $content = $this->rootDirRead->readFile(
-                $this->rootDirRead->getRelativePath($file[0])
-            );
+            $fileDir = dirname($file[0]);
+            $fileName = basename($file[0]);
+            $read = $this->readFactory->create($fileDir);
+            $content = $read->readFile($fileName);
             $matches = [];
             preg_match_all('/schemaLocation="(urn\:magento\:[^"]*)"/i', $content, $matches);
             if (isset($matches[1])) {

app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php

@@ -42,27 +42,23 @@ public function testExecuteBadType()
             )->will($this->returnValue(null));
 
         $formats = ['phpstorm' => $phpstormFormatMock];
-        $filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
+        $readFactory = $this->getMock('Magento\Framework\Filesystem\Directory\ReadFactory', [], [], '', false);
         $readDirMock = $this->getMock('\Magento\Framework\Filesystem\Directory\ReadInterface', [], [], '', false);
 
         $content = file_get_contents($fixtureXmlFile);
 
-        $readDirMock->expects($this->once())
-            ->method('getRelativePath')
-            ->with($this->equalTo($fixtureXmlFile))
-            ->will($this->returnValue('test'));
         $readDirMock->expects($this->once())
             ->method('readFile')
-            ->with($this->equalTo('test'))
+            ->with($this->equalTo('test.xml'))
             ->will($this->returnValue($content));
-        $filesystem->expects($this->once())
-            ->method('getDirectoryRead')
+        $readFactory->expects($this->once())
+            ->method('create')
             ->will($this->returnValue($readDirMock));
 
         $this->command = new XmlCatalogGenerateCommand(
             $filesMock,
             $urnResolverMock,
-            $filesystem,
+            $readFactory,
             $formats
         );
 

app/code/Magento/Payment/Model/CcConfigProvider.php

@@ -58,7 +58,7 @@ protected function getIcons()
         foreach (array_keys($types) as $code) {
             if (!array_key_exists($code, $icons)) {
                 $asset = $this->ccConfig->createAsset('Magento_Payment::images/cc/' . strtolower($code) . '.png');
-                $placeholder = $this->assetSource->findRelativeSourceFilePath($asset);
+                $placeholder = $this->assetSource->findSource($asset);
                 if ($placeholder) {
                     list($width, $height) = getimagesize($asset->getSourceFile());
                     $icons[$code] = [

app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php

@@ -77,7 +77,7 @@ public function testGetConfig()
                 [$ccAvailableTypesMock['ae']['fileId']]
             )->willReturn($assetMock);
         $this->assetSourceMock->expects($this->atLeastOnce())
-            ->method('findRelativeSourceFilePath')
+            ->method('findSource')
             ->with($assetMock)
             ->willReturnOnConsecutiveCalls(
                 $ccAvailableTypesMock['vi']['path'],

dev/tests/integration/etc/install-config-mysql.travis.php.dist

@@ -6,7 +6,7 @@
 
 return [
     'db-host' => '127.0.0.1',
-    'db-user' => 'travis',
+    'db-user' => 'root',
     'db-password' => '',
     'db-name' => 'magento_integration_tests',
     'db-prefix' => 'trv_',

dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php

@@ -116,10 +116,7 @@ public function testXmlConvertedConfigurationAndCompereStructure()
      */
     protected function getActualContent()
     {
-        $files = $this->fileUtility->getFiles(
-            [$this->fileUtility->getPathToSource() . static::ACTUAL],
-            'config.xml'
-        );
+        $files = $this->fileUtility->getFiles([BP . static::ACTUAL], 'config.xml');
 
         return file_get_contents(reset($files));
     }
@@ -129,10 +126,7 @@ protected function getActualContent()
      */
     protected function getExpectedContent()
     {
-        $files = $this->fileUtility->getFiles(
-            [$this->fileUtility->getPathToSource() . static::EXPECTED],
-            'config.xml'
-        );
+        $files = $this->fileUtility->getFiles([BP . static::EXPECTED], 'config.xml');
 
         return file_get_contents(reset($files));
     }

dev/tests/integration/testsuite/Magento/Setup/Console/Command/I18nCollectPhrasesCommandTest.php

@@ -75,4 +75,22 @@ public function testExecuteNonExistingPath()
             ]
         );
     }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Directory path is not needed when --magento flag is set.
+     */
+    public function testExecuteMagentoFlagDirectoryPath()
+    {
+        $this->tester->execute(['directory' => 'a', '--magento' => true]);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Directory path is needed when --magento flag is not set.
+     */
+    public function testExecuteNoMagentoFlagNoDirectoryPath()
+    {
+        $this->tester->execute([]);
+    }
 }

dev/tests/integration/testsuite/Magento/Setup/Console/Command/I18nPackCommandTest.php

@@ -30,9 +30,17 @@ public function setUp()
 
     public function tearDown()
     {
-        if (file_exists(__DIR__ . '/_files/output/pack')) {
+        $this->removeCsv('A');
+        $this->removeCsv('B');
+        $this->removeCsv('C');
+        $this->removeCsv('D');
+    }
+
+    private function removeCsv($module)
+    {
+        if (file_exists(__DIR__ . "/_files/root/app/code/Magento/{$module}/i18n")) {
             $helper = new \Magento\Framework\Backup\Filesystem\Helper();
-            $helper->rm(__DIR__ . '/_files/output/pack', [], true);
+            $helper->rm(__DIR__ . "/_files/root/app/code/Magento/{$module}/i18n", [], true);
         }
     }
 
@@ -41,15 +49,13 @@ public function testExecute()
         $this->tester->execute(
             [
                 'source' => BP . '/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/i18n.csv',
-                'pack' => BP . '/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/output/pack',
                 'locale' => 'de_DE',
                 '--allow-duplicates' => true,
             ]
         );
 
         $this->assertEquals('Successfully saved de_DE language package.' . PHP_EOL, $this->tester->getDisplay());
-        $basePath = BP . '/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/output/pack/'
-            . 'dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code';
+        $basePath = BP . '/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code';
         $this->assertFileExists($basePath . '/Magento/A/i18n/de_DE.csv');
         $this->assertFileExists($basePath . '/Magento/B/i18n/de_DE.csv');
         $this->assertFileExists($basePath . '/Magento/C/i18n/de_DE.csv');
@@ -67,7 +73,6 @@ public function testExecuteNonExistingPath()
         $this->tester->execute(
             [
                 'source' => $nonExistPath,
-                'pack' => BP . '/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/output/pack',
                 'locale' => 'de_DE',
                 '--allow-duplicates' => true,
             ]
@@ -83,7 +88,6 @@ public function testExecuteInvalidMode()
         $this->tester->execute(
             [
                 'source' => BP . '/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/i18n.csv',
-                'pack' => BP . '/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/output/pack',
                 'locale' => 'de_DE',
                 '--allow-duplicates' => true,
                 '--mode' => 'invalid'

dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/GeneratorTest.php

@@ -104,6 +104,12 @@ public function testGenerationWithContext()
     {
         $this->generator->generate($this->source, $this->outputFileName, true);
 
-        $this->assertFileEquals($this->expectedDir . '/with_context.csv', $this->outputFileName);
+        $expected = explode(PHP_EOL, file_get_contents($this->expectedDir . '/with_context.csv'));
+        $output = file_get_contents($this->outputFileName);
+        foreach ($expected as $line) {
+            if ($line) {
+                $this->assertContains($line, $output);
+            }
+        }
     }
 }