From b5ee41544be4a30028c0f7f28e515ca9eb0e20aa Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Sat, 26 Aug 2017 13:24:04 +0200
Subject: [PATCH 1/3] - Expanded to ReadInterface to include the readAll
 function, since a class implementing the ReadInterface should have this
 function in order to substitute the Read class. - Removed comment variable
 declarations from other file where the type is declared. This was necessary
 due to the missing function in the interface. Autocompleting this function
 now works properly, so these comments can be removed.

---
 .../Magento/Email/Model/Template/Config/FileIterator.php | 1 -
 app/code/Magento/Translation/Model/Js/DataProvider.php   | 1 -
 lib/internal/Magento/Framework/Config/FileIterator.php   | 1 -
 .../Magento/Framework/Filesystem/File/ReadInterface.php  | 9 +++++++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Email/Model/Template/Config/FileIterator.php b/app/code/Magento/Email/Model/Template/Config/FileIterator.php
index d71542e147bc8..66846bbea4ca9 100644
--- a/app/code/Magento/Email/Model/Template/Config/FileIterator.php
+++ b/app/code/Magento/Email/Model/Template/Config/FileIterator.php
@@ -47,7 +47,6 @@ public function current()
             );
         }
 
-        /** @var \Magento\Framework\Filesystem\File\Read $fileRead */
         $fileRead = $this->fileReadFactory->create($this->key(), DriverPool::FILE);
         $contents = $fileRead->readAll();
         return str_replace('<template ', '<template module="' . $moduleName . '" ', $contents);
diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
index 67d594b65b0f5..b45067cb57e01 100644
--- a/app/code/Magento/Translation/Model/Js/DataProvider.php
+++ b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -103,7 +103,6 @@ public function getData($themePath)
 
         $dictionary = [];
         foreach ($files as $filePath) {
-            /** @var \Magento\Framework\Filesystem\File\Read $read */
             $read = $this->fileReadFactory->create($filePath[0], \Magento\Framework\Filesystem\DriverPool::FILE);
             $content = $read->readAll();
             foreach ($this->getPhrases($content) as $phrase) {
diff --git a/lib/internal/Magento/Framework/Config/FileIterator.php b/lib/internal/Magento/Framework/Config/FileIterator.php
index f8cbe5d46dd8d..0de1d8ae528f9 100644
--- a/lib/internal/Magento/Framework/Config/FileIterator.php
+++ b/lib/internal/Magento/Framework/Config/FileIterator.php
@@ -66,7 +66,6 @@ public function rewind()
      */
     public function current()
     {
-        /** @var \Magento\Framework\Filesystem\File\Read $fileRead */
         $fileRead = $this->fileReadFactory->create($this->key(), DriverPool::FILE);
         return $fileRead->readAll();
     }
diff --git a/lib/internal/Magento/Framework/Filesystem/File/ReadInterface.php b/lib/internal/Magento/Framework/Filesystem/File/ReadInterface.php
index d4f547cc5c88a..e27086709d8b1 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/ReadInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/ReadInterface.php
@@ -19,6 +19,15 @@ interface ReadInterface
      */
     public function read($length);
 
+    /**
+     * Returns the complete content of the file.
+     *
+     * @param string|null $flag
+     * @param resource|null $context
+     * @return string
+     */
+    public function readAll($flag = null, $context = null);
+
     /**
      * Reads the line with specified number of bytes from the current position.
      *

From 1f0898335b383b5b6502d9ec3a4b211dc61efa39 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Wed, 30 Aug 2017 15:03:37 +0300
Subject: [PATCH 2/3] MAGETWO-72126: Disabling of randomly failing and timing
 out Functional Tests

---
 .../Mtf/TestSuite/InjectableTests/travis_acceptance_1.xml       | 2 --
 .../Mtf/TestSuite/InjectableTests/travis_acceptance_2.xml       | 1 -
 2 files changed, 3 deletions(-)

diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_1.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_1.xml
index 716a6dd89a61f..e0c1231b3f1d7 100644
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_1.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_1.xml
@@ -35,13 +35,11 @@
             <module value="Magento_Customer" strict="1" />
             <module value="Magento_CustomerImportExport" strict="1" />
             <module value="Magento_Dhl" strict="1" />
-            <module value="Magento_Directory" strict="1" />
             <module value="Magento_Downloadable" strict="1" />
             <module value="Magento_Email" strict="1" />
             <module value="Magento_Fedex" strict="1" />
             <module value="Magento_GiftMessage" strict="1" />
             <module value="Magento_GroupedImportExport" strict="1" />
-            <module value="Magento_GroupedProduct" strict="1" />
             <module value="Magento_ImportExport" strict="1" />
             <module value="Magento_Indexer" strict="1" />
             <module value="Magento_Install" strict="1" />
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_2.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_2.xml
index ce3f79f2923d9..87f45525f4ba1 100644
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_2.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_2.xml
@@ -12,7 +12,6 @@
             <module value="Magento_ConfigurableProduct" strict="1" />
             <module value="Magento_Checkout" strict="1" />
             <module value="Magento_LayeredNavigation" strict="1" />
-            <module value="Magento_Msrp" strict="1" />
             <module value="Magento_Multishipping" strict="1" />
             <module value="Magento_Newsletter" strict="1" />
             <module value="Magento_OfflinePayments" strict="1" />

From 827f052feb9e80153584d20f71ec08973e3d0968 Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Wed, 30 Aug 2017 22:27:17 +0200
Subject: [PATCH 3/3] - Fixed spelling mistake, changed function
 isClassLoadableFromDisc to isClassLoadabkelFromDisk - Fowarded old function
 to the new function so that it's fully backward compatible. - Deprecated old
 function with spelling mistake

---
 .../Magento/Framework/Code/Generator.php         |  2 +-
 .../Framework/Code/Generator/DefinedClasses.php  | 16 ++++++++++++++--
 .../Test/Unit/Generator/EntityAbstractTest.php   |  2 +-
 .../Framework/Code/Test/Unit/GeneratorTest.php   |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index 0b807775e032a..a845712b46598 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -199,7 +199,7 @@ protected function shouldSkipGeneration($resultEntityType, $sourceClassName, $re
     {
         if (!$resultEntityType || !$sourceClassName) {
             return self::GENERATION_ERROR;
-        } elseif ($this->definedClasses->isClassLoadableFromDisc($resultClass)) {
+        } elseif ($this->definedClasses->isClassLoadableFromDisk($resultClass)) {
             $generatedFileName = $this->_ioObject->generateResultFileName($resultClass);
             /**
              * Must handle two edge cases: a competing process has generated the class and written it to disc already,
diff --git a/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php b/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php
index 91d6e001a4edd..363c6f59b17ea 100644
--- a/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php
+++ b/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php
@@ -21,7 +21,7 @@ class DefinedClasses
      */
     public function isClassLoadable($className)
     {
-        return $this->isClassLoadableFromMemory($className) || $this->isClassLoadableFromDisc($className);
+        return $this->isClassLoadableFromMemory($className) || $this->isClassLoadableFromDisk($className);
     }
 
     /**
@@ -36,12 +36,24 @@ public function isClassLoadableFromMemory($className)
     }
 
     /**
-     * Determine if a class exists on disc
+     * Determine if a class exists on disk
      *
      * @param string $className
      * @return bool
+     * @deprecated
      */
     public function isClassLoadableFromDisc($className)
+    {
+        return $this->isClassLoadableFromDisk($className);
+    }
+
+    /**
+     * Determine if a class exists on disk
+     *
+     * @param string $className
+     * @return bool
+     */
+    public function isClassLoadableFromDisk($className)
     {
         try {
             return (bool)AutoloaderRegistry::getAutoloader()->findFile($className);
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
index f4691b90e80d1..afd784b061a22 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
@@ -233,7 +233,7 @@ protected function _prepareMocksForValidateData(
             ->willReturn($sourceClassExists);
         if ($resultClassExists) {
             $definedClassesMock->expects($this->once())
-                ->method('isClassLoadableFromDisc')
+                ->method('isClassLoadableFromDisk')
                 ->with($this->resultClass)
                 ->willReturn($resultClassExists);
         }
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index 3052f682d82cb..dfb547ae3d53f 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -114,7 +114,7 @@ public function testGenerateClassWithError()
     public function testGenerateClassWithExistName($fileExists)
     {
         $this->definedClassesMock->expects($this->any())
-            ->method('isClassLoadableFromDisc')
+            ->method('isClassLoadableFromDisk')
             ->willReturn(true);
 
         $resultClassFileName = '/Magento/Path/To/Class.php';