Merge pull request #22438 from eileenmcnaughton/format

[civicrm-core.git] / tests / phpunit / CRM / Upgrade / FormTest.php

diff --git a/tests/phpunit/CRM/Upgrade/FormTest.php b/tests/phpunit/CRM/Upgrade/FormTest.php
index a9af358959df4167ffff2d34bbc7b2d2718dc9c6..d028bd82e2375e84b1fb8e442e87660cc1f6f665 100644 (file)
--- a/tests/phpunit/CRM/Upgrade/FormTest.php
+++ b/tests/phpunit/CRM/Upgrade/FormTest.php
@@ -7,7 +7,8 @@
 class CRM_Upgrade_FormTest extends CiviUnitTestCase {
 
   /**
-   * "php" requirement (composer.json) should match MINIMUM_PHP_VERSION (CRM/Upgrade/Form.php).
+   * "php" requirement (composer.json) should match
+   * CRM_Upgrade_Incremental_General::MIN_INSTALL_PHP_VER.
    */
   public function testComposerRequirementMatch() {
     global $civicrm_root;
@@ -16,8 +17,8 @@ class CRM_Upgrade_FormTest extends CiviUnitTestCase {
     $composerJson = json_decode(file_get_contents($composerJsonPath), 1);
     $composerJsonRequirePhp = preg_replace(';[~^];', '', $composerJson['require']['php']);
     $actualMajorMinor = preg_replace(';^[\^]*(\d+\.\d+)\..*$;', '\1', $composerJsonRequirePhp);
-    $expectMajorMinor = preg_replace(';^[\^]*(\d+\.\d+)\..*$;', '\1', \CRM_Upgrade_Form::MINIMUM_PHP_VERSION);
-    $this->assertEquals($expectMajorMinor, $actualMajorMinor, "The PHP version requirements in CRM_Upgrade_Form ($expectMajorMinor) and composer.json ($actualMajorMinor) should specify same major+minor versions.");
+    $expectMajorMinor = preg_replace(';^(\d+\.\d+)\..*$;', '\1', \CRM_Upgrade_Incremental_General::MIN_INSTALL_PHP_VER);
+    $this->assertStringContainsString($expectMajorMinor, $actualMajorMinor, "The PHP version requirements in CRM_Upgrade_Form ($expectMajorMinor) and composer.json ($actualMajorMinor) should specify same major+minor versions.");
   }
 
 }