pickFiles - Extract methods getPath() and getAll()

civicrm · Jul 21, 2022 · 93dd7a1 · 93dd7a1
1 parent b5dcea5
commit 93dd7a1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/util/pickFiles.lib.php b/util/pickFiles.lib.php
@@ -3,6 +3,26 @@
 
 class UpgradeSnapshots {
 
+  /**
+   * Get the base-path of the snapshot data.
+   *
+   * @return string
+   */
+  public static function getPath(): string {
+    return dirname(__DIR__) . DIRECTORY_SEPARATOR . 'databases';
+  }
+
+  public static function getAll(): array {
+    $dbDir = static::getPath() . DIRECTORY_SEPARATOR;
+    $allFiles = array_merge(
+      (array) glob("{$dbDir}*.sql.bz2"),
+      (array) glob("{$dbDir}*.sql.gz"),
+      (array) glob("{$dbDir}*.mysql.bz2"),
+      (array) glob("{$dbDir}*.mysql.gz")
+    );
+    return $allFiles;
+  }
+
   /**
    * @param string $a
    *   Filter expression that selects range of test examples.

diff --git a/util/pickFiles.php b/util/pickFiles.php
@@ -27,13 +27,7 @@ function main($args) {
     return 1;
   }
 
-  $dbDir = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'databases' . DIRECTORY_SEPARATOR;
-  $allFiles = array_merge(
-    (array) glob("{$dbDir}*.sql.bz2"),
-    (array) glob("{$dbDir}*.sql.gz"),
-    (array) glob("{$dbDir}*.mysql.bz2"),
-    (array) glob("{$dbDir}*.mysql.gz")
-  );
+  $allFiles = UpgradeSnapshots::getAll();
 
   $files = array();
   $maxCount = 0;
@@ -73,7 +67,7 @@ function main($args) {
     elseif (strpos($arg, '*')) {
       $files = array_merge(
         $files,
-        (array) glob($dbDir . $arg)
+        (array) glob(UpgradeSnapshots::getPath() . DIRECTORY_SEPARATOR . $arg)
       );
     }
     else {