Rename all $dir to $directory.

Author: donquixote

src/ClassFilesIA/ClassFilesIA.php

@@ -11,27 +11,27 @@
 class ClassFilesIA {
 
   /**
-   * @param string $dir
+   * @param string $directory
    * @param string $namespace
    *
    * @return \Ock\ClassFilesIterator\ClassFilesIA\ClassFilesIAInterface
    */
-  public static function psr4(string $dir, string $namespace): ClassFilesIAInterface {
+  public static function psr4(string $directory, string $namespace): ClassFilesIAInterface {
     return new ClassFilesIA_Psr4(
-      $dir,
+      $directory,
       NsDirUtil::terminateNamespace($namespace),
     );
   }
 
   /**
-   * @param string $dir
+   * @param string $directory
    * @param string $namespace
    * @param int $nLevelsUp
    *
    * @return \Ock\ClassFilesIterator\ClassFilesIA\ClassFilesIAInterface
    */
-  public static function psr4Up(string $dir, string $namespace, int $nLevelsUp = 0): ClassFilesIAInterface {
-    return NamespaceDirectory::create($dir, $namespace)
+  public static function psr4Up(string $directory, string $namespace, int $nLevelsUp = 0): ClassFilesIAInterface {
+    return NamespaceDirectory::create($directory, $namespace)
       ->requireParentN($nLevelsUp);
   }
 

src/ClassFilesIA/ClassFilesIA_Psr4.php

@@ -17,14 +17,14 @@ public function __construct(
   ) {}
 
   /**
-   * @param string $dir
+   * @param string $directory
    * @param string $namespace
    *
    * @return self
    */
-  public static function create(string $dir, string $namespace): self {
+  public static function create(string $directory, string $namespace): self {
     return new self(
-      $dir,
+      $directory,
       NsDirUtil::terminateNamespace($namespace),
     );
   }

src/DirectoryContents.php

@@ -30,14 +30,14 @@ public function __construct(
   /**
    * Static factory which loads a directory.
    *
-   * @param string $dir
+   * @param string $directory
    *   Directory path without trailing slash.
    *
    * @return static
    */
-  public static function load(string $dir): static {
-    assert(!str_ends_with($dir, '/'));
-    $iterator = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS|\FilesystemIterator::KEY_AS_FILENAME|\FilesystemIterator::CURRENT_AS_SELF);
+  public static function load(string $directory): static {
+    assert(!str_ends_with($directory, '/'));
+    $iterator = new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS|\FilesystemIterator::KEY_AS_FILENAME|\FilesystemIterator::CURRENT_AS_SELF);
     $subdir_names = [];
     $file_names = [];
     foreach ($iterator as $name => $iterator_self) {

src/NsDirUtil.php

@@ -27,60 +27,60 @@ public static function terminateNamespace(string $namespace): string {
   /**
    * Recursively iterates over class files.
    *
-   * @param string $dir
+   * @param string $directory
    *   Directory without trailing slash.
    * @param string $terminatedNamespace
    *   Namespace with trailing separator.
    *
    * @return \Iterator<string, class-string>
    *   Format: $[$file] = $class
    */
-  public static function iterate(string $dir, string $terminatedNamespace): \Iterator {
-    assert(!str_ends_with($dir, '/'));
+  public static function iterate(string $directory, string $terminatedNamespace): \Iterator {
+    assert(!str_ends_with($directory, '/'));
     assert(str_ends_with($terminatedNamespace, '\\') || $terminatedNamespace === '');
-    self::assertReadableDirectory($dir);
-    return self::doIterateRecursively($dir, $terminatedNamespace);
+    self::assertReadableDirectory($directory);
+    return self::doIterateRecursively($directory, $terminatedNamespace);
   }
 
   /**
    * Asserts that a path is a readable directory.
    *
-   * @param string $dir
+   * @param string $directory
    *   Directory path.
    */
-  public static function assertReadableDirectory(string $dir): void {
-    if (!is_dir($dir)) {
-      if (!file_exists($dir)) {
-        throw new \RuntimeException("Directory '$dir' does not exist.");
+  public static function assertReadableDirectory(string $directory): void {
+    if (!is_dir($directory)) {
+      if (!file_exists($directory)) {
+        throw new \RuntimeException("Directory '$directory' does not exist.");
       }
-      throw new \RuntimeException("Path '$dir' is not a directory.");
+      throw new \RuntimeException("Path '$directory' is not a directory.");
     }
-    if (!is_readable($dir)) {
-      throw new \RuntimeException("Directory '$dir' is not readable.");
+    if (!is_readable($directory)) {
+      throw new \RuntimeException("Directory '$directory' is not readable.");
     }
   }
 
   /**
    * Recursively iterates over class files.
    *
-   * @param string $dir
+   * @param string $directory
    *   Directory without trailing slash.
    * @param string $terminatedNamespace
    *   Namespace with trailing separator.
    *
    * @return \Iterator<string, class-string>
    *   Format: $[$file] = $class
    */
-  private static function doIterateRecursively(string $dir, string $terminatedNamespace): \Iterator {
-    $contents = DirectoryContents::load($dir);
+  private static function doIterateRecursively(string $directory, string $terminatedNamespace): \Iterator {
+    $contents = DirectoryContents::load($directory);
     foreach ($contents->iterateClassAndNamespaceMap() as $name => $is_namespace) {
       if (!$is_namespace) {
         // @phpstan-ignore generator.valueType
-        yield $dir . '/' . $name . '.php' => $terminatedNamespace . $name;
+        yield $directory . '/' . $name . '.php' => $terminatedNamespace . $name;
       }
       else {
         yield from self::doIterateRecursively(
-          $dir . '/' . $name,
+          $directory . '/' . $name,
           $terminatedNamespace . $name . '\\',
         );
       }