Merge branch '3' into 4

silverstripe · Jun 19, 2024 · cfefa51 · cfefa51
2 parents 7bd60f8 + 913390e
commit cfefa51
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/Checks/FileAccessibilityAndValidationCheck.php b/src/Checks/FileAccessibilityAndValidationCheck.php
@@ -80,7 +80,7 @@ public function __construct($path, $fileTypeValidateFunc = 'noVidation', $checkT
     {
         $this->path = $path;
         $this->fileTypeValidateFunc = ($fileTypeValidateFunc)? $fileTypeValidateFunc : 'noVidation';
-        $this->checkType = ($checkType) ? $checkType : self::CHECK_SINGLE;
+        $this->checkType = ($checkType) ? $checkType : FileAccessibilityAndValidationCheck::CHECK_SINGLE;
     }
 
     /**
@@ -109,7 +109,9 @@ public function check()
                 }
 
                 // If at least one file was valid, count as passed
-                if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles ?? []) < count($files ?? [])) {
+                if ($this->checkType == FileAccessibilityAndValidationCheck::CHECK_SINGLE
+                    && count($invalidFiles ?? []) < count($files ?? [])
+                ) {
                     $validFileList = PHP_EOL;
                     foreach ($validFiles as $vf) {
                         $validFileList .= $vf . PHP_EOL;

diff --git a/src/Checks/FileAgeCheck.php b/src/Checks/FileAgeCheck.php
@@ -85,7 +85,7 @@ public function __construct($path, $relativeAge, $compareOperand = '>', $checkTy
         $this->path = $path;
         $this->relativeAge = $relativeAge;
         $this->checkFn = $checkFn;
-        $this->checkType = ($checkType) ? $checkType : self::CHECK_SINGLE;
+        $this->checkType = ($checkType) ? $checkType : FileAgeCheck::CHECK_SINGLE;
         $this->compareOperand = $compareOperand;
     }
 
@@ -110,7 +110,7 @@ public function check()
                     $validFiles[] = $file;
                 } else {
                     $invalidFiles[] = $file;
-                    if ($this->checkType == self::CHECK_ALL) {
+                    if ($this->checkType == FileAgeCheck::CHECK_ALL) {
                         return [
                             EnvironmentCheck::ERROR,
                             sprintf(
@@ -127,7 +127,7 @@ public function check()
         }
 
         // If at least one file was valid, count as passed
-        if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles ?? []) < count($files ?? [])) {
+        if ($this->checkType == FileAgeCheck::CHECK_SINGLE && count($invalidFiles ?? []) < count($files ?? [])) {
             return [EnvironmentCheck::OK, ''];
         }
         if (count($invalidFiles ?? []) == 0) {

diff --git a/src/EnvironmentCheckSuite.php b/src/EnvironmentCheckSuite.php
@@ -74,7 +74,8 @@ class EnvironmentCheckSuite
     public function __construct($suiteName)
     {
         if (empty($this->config()->registered_suites[$suiteName])) {
-            // Not registered via config system, but it still may be configured later via self::register.
+            // Not registered via config system, but it still may be configured later
+            // via EnvironmentCheckSuite::register.
             return;
         }
 
@@ -181,10 +182,10 @@ public function push($check, $title = null)
      */
     public static function inst($name)
     {
-        if (!isset(self::$instances[$name])) {
-            self::$instances[$name] = new EnvironmentCheckSuite($name);
+        if (!isset(EnvironmentCheckSuite::$instances[$name])) {
+            EnvironmentCheckSuite::$instances[$name] = new EnvironmentCheckSuite($name);
         }
-        return self::$instances[$name];
+        return EnvironmentCheckSuite::$instances[$name];
     }
 
     /**
@@ -201,7 +202,7 @@ public static function register($names, $check, $title = null)
         }
 
         foreach ($names as $name) {
-            self::inst($name)->push($check, $title);
+            EnvironmentCheckSuite::inst($name)->push($check, $title);
         }
     }
 
@@ -210,6 +211,6 @@ public static function register($names, $check, $title = null)
      */
     public static function reset()
     {
-        self::$instances = [];
+        EnvironmentCheckSuite::$instances = [];
     }
 }