Merge remote-tracking branch 'ogresCE/MAGETWO-39647-autoload-error-after-running-setupdicompile' into PR_Branch

Author: mazhalai

dev/tests/integration/testsuite/Magento/Framework/Composer/ComposerInformationTest.php

@@ -26,6 +26,11 @@ class ComposerInformationTest extends \PHPUnit_Framework_TestCase
      */
     private $ioMock;
 
+    /**
+     * @var BufferIoFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bufferIoFactoryMock;
+
     public function setUp()
     {
         $this->directoryReadMock = $this->getMock('Magento\Framework\Filesystem\Directory\Read', [], [], '', false);
@@ -35,6 +40,8 @@ public function setUp()
             ->method('getDirectoryRead')
             ->will($this->returnValue($this->directoryReadMock));
         $this->ioMock = $this->getMock('Composer\IO\BufferIO', [], [], '', false);
+        $this->bufferIoFactoryMock = $this->getMock('Magento\Framework\Composer\BufferIoFactory', [], [], '', false);
+        $this->bufferIoFactoryMock->expects($this->any())->method('create')->willReturn($this->ioMock);
     }
 
     /**
@@ -63,7 +70,7 @@ private function setupDirectoryMock($composerDir)
     public function testGetRequiredPhpVersion($composerDir)
     {
         $this->setupDirectoryMock($composerDir);
-        $composerInfo = new ComposerInformation($this->filesystemMock, $this->ioMock);
+        $composerInfo = new ComposerInformation($this->filesystemMock, $this->bufferIoFactoryMock);
         $this->assertEquals("~5.5.0|~5.6.0", $composerInfo->getRequiredPhpVersion());
     }
 
@@ -75,7 +82,7 @@ public function testGetRequiredPhpVersion($composerDir)
     public function testGetRequiredExtensions($composerDir)
     {
         $this->setupDirectoryMock($composerDir);
-        $composerInfo = new ComposerInformation($this->filesystemMock, $this->ioMock);
+        $composerInfo = new ComposerInformation($this->filesystemMock, $this->bufferIoFactoryMock);
         $expectedExtensions = ['ctype', 'gd', 'spl', 'dom', 'simplexml', 'mcrypt', 'hash', 'curl', 'iconv', 'intl'];
 
         $actualRequiredExtensions = $composerInfo->getRequiredExtensions();
@@ -92,7 +99,7 @@ public function testGetRequiredExtensions($composerDir)
     public function testGetRootRequiredPackagesAndTypes($composerDir)
     {
         $this->setupDirectoryMock($composerDir);
-        $composerInfo = new ComposerInformation($this->filesystemMock, $this->ioMock);
+        $composerInfo = new ComposerInformation($this->filesystemMock, $this->bufferIoFactoryMock);
 
         $requiredPackagesAndTypes = $composerInfo->getRootRequiredPackageTypesByName();
 
@@ -121,6 +128,6 @@ public function getRequiredPhpVersionDataProvider()
     public function testNoLock()
     {
         $this->setupDirectoryMock('notARealDirectory');
-        new ComposerInformation($this->filesystemMock, $this->ioMock);
+        new ComposerInformation($this->filesystemMock, $this->bufferIoFactoryMock);
     }
 }

lib/internal/Magento/Framework/Composer/BufferIoFactory.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Composer;
+
+use Composer\IO\BufferIO;
+
+/**
+ * Class creates BufferIO instance
+ */
+class BufferIoFactory
+{
+    /**
+     * Creates BufferIO instance
+     * 
+     * @return BufferIO
+     */
+    public function create()
+    {
+        return new BufferIO();
+    }
+}

lib/internal/Magento/Framework/Composer/ComposerInformation.php

@@ -7,7 +7,6 @@
 namespace Magento\Framework\Composer;
 
 use Composer\Factory as ComposerFactory;
-use Composer\IO\BufferIO;
 use Composer\Package\Link;
 use Composer\Package\PackageInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -32,12 +31,12 @@ class ComposerInformation
      * Constructor
      *
      * @param Filesystem $filesystem
-     * @param BufferIO $io
+     * @param BufferIoFactory $bufferIoFactory
      * @throws \Exception
      */
     public function __construct(
         Filesystem $filesystem,
-        BufferIO $io
+        BufferIoFactory $bufferIoFactory
     ) {
         // composer.json is in same directory as vendor
         $vendorPath = $filesystem->getDirectoryRead(DirectoryList::CONFIG)->getAbsolutePath('vendor_path.php');
@@ -53,7 +52,7 @@ public function __construct(
         putenv('COMPOSER_HOME=' . $filesystem->getDirectoryRead(DirectoryList::COMPOSER_HOME)->getAbsolutePath());
 
         // Create Composer
-        $this->composer = ComposerFactory::create($io, $composerJson);
+        $this->composer = ComposerFactory::create($bufferIoFactory->create(), $composerJson);
         $this->locker = $this->composer->getLocker();
     }