Eliminate code duplication

sebastianbergmann · Jan 15, 2019 · d197ab3 · d197ab3
1 parent 7c89093
commit d197ab3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/Util/Filesystem.php b/src/Util/Filesystem.php
@@ -27,4 +27,9 @@ public static function classNameToFilename(string $className): string
             $className
         ) . '.php';
     }
+
+    public static function createDirectory(string $directory): bool
+    {
+        return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
+    }
 }
diff --git a/src/Util/Printer.php b/src/Util/Printer.php
@@ -53,7 +53,7 @@ public function __construct($out = null)
 
                     $this->out = \fsockopen($out[0], $out[1]);
                 } else {
-                    if (\strpos($out, 'php://') === false && !$this->createDirectory(\dirname($out))) {
+                    if (\strpos($out, 'php://') === false && !Filesystem::createDirectory(\dirname($out))) {
                         throw new Exception(\sprintf('Directory "%s" was not created', \dirname($out)));
                     }
 
@@ -132,9 +132,4 @@ public function setAutoFlush(bool $autoFlush): void
     {
         $this->autoFlush = $autoFlush;
     }
-
-    private function createDirectory(string $directory): bool
-    {
-        return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
-    }
 }
diff --git a/src/Util/TestResultCache.php b/src/Util/TestResultCache.php
@@ -10,6 +10,7 @@
 namespace PHPUnit\Runner;
 
 use PHPUnit\Framework\Test;
+use PHPUnit\Util\Filesystem;
 
 class TestResultCache implements \Serializable, TestResultCacheInterface
 {
@@ -79,7 +80,7 @@ public function saveToFile(): void
             return;
         }
 
-        if (!$this->createDirectory(\dirname($this->cacheFilename))) {
+        if (!Filesystem::createDirectory(\dirname($this->cacheFilename))) {
             throw new Exception(
                 \sprintf(
                     'Cannot create directory "%s" for result cache file',
@@ -187,9 +188,4 @@ public function unserialize($serialized): void
             }
         }
     }
-
-    private function createDirectory(string $directory): bool
-    {
-        return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
-    }
 }