Add test for trailing slash

Author: dantleech

src/TextUI/Configuration/README.md

@@ -1,21 +1,29 @@
+(this file can be removed before merging)
+
 SourceMapper Implementation Notes
 =================================
 
-Currently the `<directory>` element in `<include>` and `<exclude>` has the 
-attributes `prefix` and `suffix` and we also have `<file>` which specifies a
-single file.
-
-Our primary goal is to ensure that the source mapper needn't iterate over all
+The primary goal is to ensure that the source mapper needn't iterate over all
 included files recursively whenever the source map is required (for example
 when a deprecation is encountered PHPUnit needs to know if the deprecation was
 issued from source code within the project's responsiblity - i.e. source that
 is mapped). We can determine if a file is within the included source by
 converting the glob-patterns in the `<directory>` element to regexes.
 
-This is more complicated than it could be as the current matching logic
-depends on PHP's `glob` function - the implementation of which is not
-consistent across platforms and which has a number of rarely-used operators
-which while not common, would present a B/C break if they were removed.
+Currently the `<directory>` element in `<include>` and `<exclude>` has the 
+attributes `prefix` and `suffix` and we also have `<file>` which specifies a
+single file.
+
+This is more complicated than it could be:
+
+- Current matching/traversal logic depends on PHP's `glob` function - the implementation
+  of which is not consistent across platforms and which has a number of
+  rarely-used operators which while not common, would present a B/C break if
+  they were removed.
+
+
+
+
 
 How it works currently
 ----------------------
@@ -44,6 +52,8 @@ The Factory:
 - create a new PHPUnit `Iterator` passing a recursive iterator iterator
   directory iterator... (the iterator that iterates over the directories) that
   **follows symlinks and skips dots**.
+- the iterator also Excludes the excluded `<directory>` elements **but does
+  not take into account the prefixes or suffixes**.
 
 The Iterator:
 

src/TextUI/Configuration/SourceFilter.php

@@ -63,7 +63,7 @@ public function __construct(Source $source)
     public function includes(string $path): bool
     {
         $included = false;
-        $dirPath = dirname($path) . '/';
+        $dirPath = rtrim(dirname($path), '/') . '/';
         $filename = basename($path);
         foreach ($this->source->includeFiles() as $file) {
             if ($file->path() === $path) {
@@ -100,12 +100,12 @@ public function includes(string $path): bool
      */
     public static function toGlob(FilterDirectory $directory): string
     {
-        $path = $directory->path();
+        $path = rtrim($directory->path(), '/');
 
         return sprintf(
             '{(%s)|(%s)}',
-            Glob::toRegEx(sprintf('%s/**/*', $directory->path()), 0, ''),
-            Glob::toRegEx(sprintf('%s/*', $directory->path()), 0, ''),
+            Glob::toRegEx(sprintf('%s/**/*', $path), 0, ''),
+            Glob::toRegEx(sprintf('%s/*', $path), 0, ''),
         );
     }
 

tests/unit/TextUI/SourceFilterTest.php

@@ -80,6 +80,18 @@ public static function provider(): array
                     ),
                 ),
             ],
+            'file included using directory with trailing slash' => [
+                [
+                    self::fixturePath('a/PrefixSuffix.php') => true,
+                ],
+                self::createSource(
+                    includeDirectories: FilterDirectoryCollection::fromArray(
+                        [
+                            new FilterDirectory(self::fixturePath() . '/', '', '.php'),
+                        ],
+                    ),
+                ),
+            ],
             'file included using directory, but excluded using file' => [
                 [
                     self::fixturePath('a/PrefixSuffix.php') => false,
@@ -167,18 +179,18 @@ public static function provider(): array
                     ),
                 ),
             ],
-            //'directory wildcard does not include files at same level' => [
-            //    [
-            //        self::fixturePath('a/PrefixSuffix.php') => false,
-            //    ],
-            //    self::createSource(
-            //        includeDirectories: FilterDirectoryCollection::fromArray(
-            //            [
-            //                new FilterDirectory(self::fixturePath(), 'a/*', '.php'),
-            //            ],
-            //        ),
-            //    ),
-            //],
+            'directory wildcard does not include files at same level' => [
+                [
+                    self::fixturePath('a/PrefixSuffix.php') => false,
+                ],
+                self::createSource(
+                    includeDirectories: FilterDirectoryCollection::fromArray(
+                        [
+                            new FilterDirectory(self::fixturePath(), 'a/*', '.php'),
+                        ],
+                    ),
+                ),
+            ],
             'directory wildcard with suffix does not match files' => [
                 [
                     self::fixturePath('a/PrefixSuffix.php') => false,