pickFiles - Convert "UpgradeSnapshots" to PSR-4 autoloading

civicrm · Jul 21, 2022 · dbb8802 · dbb8802
1 parent 8ade0d3
commit dbb8802
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -6,6 +6,9 @@
     "bin": [
       "bin/civicrm-upgrade-test"
     ],
+    "autoload": {
+      "psr-4": {"Civi\\UpgradeTest\\": "src/"}
+    },
     "authors": [
         {
             "name": "Tim Otten",

diff --git a/util/pickFiles.lib.php → src/UpgradeSnapshots.php b/util/pickFiles.lib.php → src/UpgradeSnapshots.php
diff --git a/tests/ParseFilterTest.php b/tests/ParseFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Civi\UpgradeTest;
 
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'util' . DIRECTORY_SEPARATOR . 'pickFiles.lib.php';
+require_once dirname(__DIR__) . '/vendor/autoload.php';
 global $assertionCount;
 $assertionCount = ['ok' => 0, 'fail' => 0];
 

diff --git a/util/pickFiles.php b/util/pickFiles.php
@@ -2,6 +2,8 @@
 <?php
 namespace Civi\UpgradeTest;
 
+require_once dirname(__DIR__) . '/vendor/autoload.php';
+
 main($argv);
 
 function help($error = NULL) {
@@ -20,7 +22,6 @@ function help($error = NULL) {
 }
 
 function main($args) {
-  require_once __DIR__ . DIRECTORY_SEPARATOR . 'pickFiles.lib.php';
   $prog = array_shift($args);
   if (empty($args)) {
     help("Missing required argument <fileExpr>\n");