UpgradeSnapshots - Call methods using object/instance notation

civicrm · Jul 21, 2022 · fd7030b · fd7030b
1 parent 9a5357a
commit fd7030b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/src/UpgradeSnapshots.php b/src/UpgradeSnapshots.php
@@ -3,6 +3,17 @@
 
 class UpgradeSnapshots {
 
+  /**
+   * Get a default instance (based on the colocated list of snapshot files).
+   *
+   * @return \Civi\UpgradeTest\UpgradeSnapshots
+   */
+  public static function instance(): UpgradeSnapshots {
+    static $instance;
+    $instance = $instance ?: new UpgradeSnapshots(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'databases');
+    return $instance;
+  }
+
   /**
    * Get the base-path of the snapshot data.
    *

diff --git a/tests/FindFilterTest.php b/tests/FindFilterTest.php
@@ -20,7 +20,7 @@ public function getExamples(): array {
    * @dataProvider getExamples
    */
   public function testExamples($pattern, array $expectFileNames): void {
-    $actualFilePaths = UpgradeSnapshots::find($pattern);
+    $actualFilePaths = UpgradeSnapshots::instance()->find($pattern);
     foreach ($actualFilePaths as $actualFile) {
       $this->assertTrue(file_exists($actualFile), "Identified file [$actualFile] should exist");
     }
@@ -29,8 +29,8 @@ public function testExamples($pattern, array $expectFileNames): void {
   }
 
   public function testMaxCount() {
-    $big = UpgradeSnapshots::find('@4.0..4.5');
-    $little = UpgradeSnapshots::find('@4.0..4.5:3');
+    $big = UpgradeSnapshots::instance()->find('@4.0..4.5');
+    $little = UpgradeSnapshots::instance()->find('@4.0..4.5:3');
     $this->assertEquals(3, count($little));
     $this->assertTrue(count($big) > count($little));
     $this->assertEquals($little, array_intersect($little, $big), 'All items in $little are also in $big');

diff --git a/tests/ParseFilterTest.php b/tests/ParseFilterTest.php
@@ -19,7 +19,7 @@ public function testMisc() {
   }
 
   protected function assertFilterExpr($expected, $filterExpr) {
-    $parsed = UpgradeSnapshots::parseFilterExpr($filterExpr);
+    $parsed = UpgradeSnapshots::instance()->parseFilterExpr($filterExpr);
     $this->assertEquals($expected, $parsed, "Parsing \"$filterExpr\": ");
   }
 

diff --git a/util/pickFiles.php b/util/pickFiles.php
@@ -29,7 +29,7 @@ function main($args) {
   }
 
   $files = array();
-  $maxCount = 0;
+  $upgradeSnapshots = UpgradeSnapshots::instance();
   while (!empty($args)) {
     $arg = array_shift($args);
 
@@ -44,15 +44,15 @@ function main($args) {
       $files[] = $arg;
     }
     elseif ($arg[0] === '@' || strpos($arg, '*')) {
-      $files = array_merge($files, UpgradeSnapshots::find($arg));
+      $files = array_merge($files, $upgradeSnapshots->find($arg));
     }
     else {
       help("Unrecognized argument or missing file: $arg\n");
       exit(3);
     }
   }
 
-  $files = UpgradeSnapshots::sortFilesByVer(array_unique($files));
+  $files = $upgradeSnapshots->sortFilesByVer(array_unique($files));
   foreach ($files as $file) {
     echo "$file\n";
   }