Merge remote-tracking branch 'tango/MC-18697' into PR-08-233

Author: dhorytskyi

setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/InstancesNamesList/DirectoryTest.php

@@ -7,6 +7,10 @@
 
 use Magento\Setup\Module\Di\Compiler\Log\Log;
 
+/**
+ * Test for Directory Decorator
+ * @package Magento\Setup\Test\Unit\Module\Di\Code\Reader\InstancesNamesList
+ */
 class DirectoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -84,11 +88,15 @@ public function testGetList()
             ['NameSpace1\ClassName2', ['Parent_Class_Name', 'Interface_1', 'Interface_2']]
         ];
 
-        $this->classReaderMock->expects($this->exactly(count($classes)))
+        $this->classReaderMock->expects(
+            $this->exactly(
+                count($classes)
+            )
+        )
             ->method('getParents')
-            ->will($this->returnValueMap(
-                $parents
-            ));
+            ->will(
+                $this->returnValueMap($parents)
+            );
 
         $this->logMock->expects($this->never())
             ->method('add');
@@ -125,9 +133,9 @@ public function testGetListNoValidation()
 
         $this->classReaderMock->expects($this->exactly(count($classes)))
             ->method('getParents')
-            ->will($this->returnValueMap(
-                $parents
-            ));
+            ->will(
+                $this->returnValueMap($parents)
+            );
 
         $this->logMock->expects($this->never())
             ->method('add');
@@ -191,4 +199,12 @@ public function getListExceptionDataProvider()
             [new \ReflectionException('Not Valid!')]
         ];
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        restore_error_handler();
+    }
 }