Updated based on recommendations

Author: kschroeder

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

@@ -20,13 +20,13 @@ class ClassesScanner implements ClassesScannerInterface
      * @var array
      */
 
-    protected $fileResults = [];
+    private $fileResults = [];
 
     /**
      * @var string
      */
 
-    protected $generationDirectory;
+    private $generationDirectory;
 
     /**
      * @param array $excludePatterns
@@ -54,18 +54,6 @@ public function addExcludePatterns(array $excludePatterns)
         $this->excludePatterns = array_merge($this->excludePatterns, $excludePatterns);
     }
 
-    /**
-     * Determines if the path provided is in the var/generation folder
-     *
-     * @param string $path
-     * @return bool
-     */
-
-    public function isGeneration($path)
-    {
-        return strpos($path, $this->generationDirectory) === 0;
-    }
-
     /**
      * Retrieves list of classes for given path
      *
@@ -77,7 +65,7 @@ public function getList($path)
     {
 
         $realPath = realpath($path);
-        $isGeneration = $this->isGeneration($realPath);
+        $isGeneration = strpos($realPath, $this->generationDirectory) === 0;
 
         // Generation folders should not have their results cached since they may actually change during compile
         if (!$isGeneration && isset($this->fileResults[$realPath])) {

setup/src/Magento/Setup/Module/Di/Code/Reader/FileClassScanner.php

@@ -15,21 +15,21 @@ class FileClassScanner
      * @var string
      */
 
-    protected $filename;
+    private $filename;
 
     /**
      * The list of classes found in the file.
      *
      * @var bool
      */
 
-    protected $classNames = false;
+    private $classNames = false;
 
     /**
      * @var array
      */
 
-    protected $tokens;
+    private $tokens;
 
     /**
      * Constructor for the file class scanner.  Requires the filename

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

@@ -39,14 +39,4 @@ public function testGetList()
         $this->assertTrue(is_array($actual));
         $this->assertCount(5, $actual);
     }
-
-    public function testIsGenerationIgnoresRegularPath()
-    {
-        self::assertFalse($this->model->isGeneration(__DIR__));
-    }
-
-    public function testIsGenerationNotesGenerationPath()
-    {
-        self::assertTrue($this->model->isGeneration($this->generation));
-    }
 }

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

@@ -35,7 +35,7 @@ public function testEmptyArrayForFileWithoutNamespaceOrClass()
 }
 PHP
         );
-        /* @var $scanner FileClassScanner */
+        /** @var $scanner FileClassScanner */
 
         $result = $scanner->getClassNames();
         self::assertCount(0, $result);
@@ -55,7 +55,7 @@ class ThisIsATest {
 }
 PHP
         );
-        /* @var $scanner FileClassScanner */
+        /** @var $scanner FileClassScanner */
 
         $result = $scanner->getClassNames();
 
@@ -79,7 +79,7 @@ class ThisIsMyTest {
 }
 PHP
         );
-        /* @var $scanner FileClassScanner */
+        /** @var $scanner FileClassScanner */
 
         $result = $scanner->getClassNames();
 
@@ -112,7 +112,7 @@ public function test()
 }
 PHP
         );
-        /* @var $scanner FileClassScanner */
+        /** @var $scanner FileClassScanner */
 
         $result = $scanner->getClassNames();
 
@@ -151,7 +151,7 @@ class ThisIsForBreaking {
 
 PHP
         );
-        /* @var $scanner FileClassScanner */
+        /** @var $scanner FileClassScanner */
 
         $result = $scanner->getClassNames();
 
@@ -196,7 +196,7 @@ class ThisIsNotMyTest
 
 PHP
         );
-        /* @var $scanner FileClassScanner */
+        /** @var $scanner FileClassScanner */
 
         $result = $scanner->getClassNames();
 
@@ -236,7 +236,7 @@ class ThisIsMyTest
 
 PHP
         );
-        /* @var $scanner FileClassScanner */
+        /** @var $scanner FileClassScanner */
 
         $scanner->getClassNames();
     }