Added test for PathFinderContrib::find()

src/Discovery/PathFinderContrib.php

@@ -57,7 +57,7 @@ public function find($seed) {
       // Check if the current directory corresponds to the contrib we are
       // looking for.
       if ($this->isWantedContrib($dir)) {
-        return $this->cleanDirPath($dir->getPathName()) . $this->path;
+        return $this->cleanDirPath($dir->getPathName());
       }
     }
     throw new ClassLoaderException(sprintf('Drupal module "%s" could not be found in the Drupal tree that contains: %s.', $this->moduleName, $seed));

src/Discovery/PathFinderCore.php

@@ -29,7 +29,7 @@ public function find($seed) {
     // up and up and up until we reach the Drupal root.
     do {
       if ($this->isDrupalRoot($directory)) {
-        return $this->cleanDirPath($directory->getPathName()) . $this->path;
+        return dirname(realpath($this->cleanDirPath($directory->getPathName())));
       }
     }
     while ($directory = $this->getParentDirectory($directory));
@@ -82,13 +82,13 @@ protected function getParentDirectory(\DirectoryIterator $directory) {
 
     // Get the parent directory and return a DirectoryIterator.
     $path_info = pathinfo($path_name);
-    if (!empty($path_info['dirname'])) {
+    if (!empty($path_info['dirname']) && $path_info['dirname'] !== '/') {
       try {
-        return new \DirectoryIterator($path_info['dirname']);
+        return new \DirectoryIterator(dirname($path_info['dirname']));
       }
       catch (\UnexpectedValueException $e) {}
     }
-    throw new ClassLoaderException(sprintf('Could not find the parent directory of "%s".', $path_name));
+    return NULL;
   }
 
 }

tests/data/docroot/COPYRIGHT.txt

@@ -0,0 +1,2 @@
+All Drupal code is Copyright 
+

tests/src/Discovery/PathFinderContribTest.php

@@ -37,5 +37,15 @@ public function testConstructor() {
     $this->assertEquals('mymodule', $value);
   }
 
+  /**
+   * Tests that find() works properly.
+   *
+   * @covers ::find()
+   */
+  public function testFind() {
+    $pathFinder = new PathFinderContrib(['.', 'testmodule']);
+    $path = $pathFinder->find('data/docroot/');
+    $this->assertEquals(realpath('data/docroot/sites/all/modules'), $path);
+  }
 }