Browse Source

Changed parameter name in Filesystem::findShortestPath

Martin Hasoň 13 years ago
parent
commit
36d9513d7b
2 changed files with 5 additions and 5 deletions
  1. 3 3
      src/Composer/Util/Filesystem.php
  2. 2 2
      tests/Composer/Test/Util/FilesystemTest.php

+ 3 - 3
src/Composer/Util/Filesystem.php

@@ -58,10 +58,10 @@ class Filesystem
      *
      * @param string $from
      * @param string $to
-     * @param Boolean $inDirectory if true, the source is considered to be in the directory
+     * @param Boolean $directories if true, the source/target are considered to be directories
      * @return string
      */
-    public function findShortestPath($from, $to, $inDirectory = false)
+    public function findShortestPath($from, $to, $directories = false)
     {
         if (!$this->isAbsolutePath($from) || !$this->isAbsolutePath($to)) {
             throw new \InvalidArgumentException('from and to must be absolute paths');
@@ -70,7 +70,7 @@ class Filesystem
         $from = lcfirst(rtrim(strtr($from, '\\', '/'), '/'));
         $to = lcfirst(rtrim(strtr($to, '\\', '/'), '/'));
 
-        if ($inDirectory) {
+        if ($directories) {
             $from .= '/dummy_file';
         }
 

+ 2 - 2
tests/Composer/Test/Util/FilesystemTest.php

@@ -58,10 +58,10 @@ class FilesystemTest extends TestCase
     /**
      * @dataProvider providePathCouples
      */
-    public function testFindShortestPath($a, $b, $expected, $inDirectory = false)
+    public function testFindShortestPath($a, $b, $expected, $directory = false)
     {
         $fs = new Filesystem;
-        $this->assertEquals($expected, $fs->findShortestPath($a, $b, $inDirectory));
+        $this->assertEquals($expected, $fs->findShortestPath($a, $b, $directory));
     }
 
     public function providePathCouples()