Merge remote-tracking branch 'origin/MAGETWO-50848-compile-folders-as-files' into develop

Author: dsikkema-magento

Diff for: setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php

@@ -55,7 +55,7 @@ public function getList($path)
         $classes = [];
         foreach ($recursiveIterator as $fileItem) {
             /** @var $fileItem \SplFileInfo */
-            if ($fileItem->getExtension() !== 'php') {
+            if ($fileItem->isDir() || $fileItem->getExtension() !== 'php') {
                 continue;
             }
             foreach ($this->excludePatterns as $excludePatterns) {

Diff for: setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Reader/ClassesScannerTest.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Test\Unit\Module\Di\Code\Reader;
+
+class ClassesScannerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Setup\Module\Di\Code\Reader\ClassesScanner
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new \Magento\Setup\Module\Di\Code\Reader\ClassesScanner();
+    }
+
+    public function testGetList()
+    {
+        $pathToScan = str_replace('\\', '/', realpath(__DIR__ . '/../../') . '/_files/app/code/Magento/SomeModule');
+        $actual = $this->model->getList($pathToScan);
+        $this->assertTrue(is_array($actual));
+        $this->assertCount(5, $actual);
+    }
+}

Diff for: setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/etc/source/PhpExt.php/content

@@ -0,0 +1,21 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * This file exists for the sake of \Magento\Setup\Test\Unit\Module\Di\Code\Reader\ClassesScannerTest, in order
+ * to verify that PHP files are correctly scanned and things that are not PHP files (like this file and its parent
+ * directory) are not scanned.
+ */
+
+/**
+ * True Function
+ *
+ * @return bool
+ */
+public function someTrueFunction()
+{
+    return true;
+}
+