Use new consolidated constant for minimum PHP version

See civicrm/civicrm-core#16753
agh1 · Mar 11, 2020 · 8f13fca · 8f13fca
1 parent 36a21ed
commit 8f13fca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/civicrm.module b/civicrm.module
@@ -35,12 +35,10 @@ define('CIVICRM_UF_HEAD', TRUE);
 /**
  * Minimum required PHP
  *
- * Note: This duplicates CRM_Upgrade_Form::MINIMUM_PHP_VERSION. The
- * duplication helps avoid a dependency-loop. (Reading `Form::MINIMUM_PHP_VERSION`
- * requires loading `civicrm.settings.php`, but that triggers a parse-error
- * on PHP 5.x.)
+ * Note: This duplicates CRM_Upgrade_Incremental_General::MIN_INSTALL_PHP_VER.
+ * The duplication helps avoid a dependency-loop.
  *
- * @see CRM_Upgrade_Form::MINIMUM_PHP_VERSION
+ * @see CRM_Upgrade_Incremental_General::MIN_INSTALL_PHP_VER
  * @see CiviDrupal\PhpVersionTest::testConstantMatch()
  */
 define('CIVICRM_DRUPAL_PHP_MINIMUM', '7.1.0');

diff --git a/tests/phpunit/CiviDrupal/PhpVersionTest.php b/tests/phpunit/CiviDrupal/PhpVersionTest.php
@@ -7,28 +7,30 @@
 class PhpVersionTest extends \PHPUnit\Framework\TestCase implements EndToEndInterface {
 
   /**
-   * CIVICRM_DRUPAL_PHP_MINIMUM (civicrm.module) should match MINIMUM_PHP_VERSION (CRM/Upgrade/Form.php).
+   * CIVICRM_DRUPAL_PHP_MINIMUM (civicrm.module) should match
+   * CRM_Upgrade_Incremental_General::MIN_INSTALL_PHP_VER.
    */
   public function testConstantMatch() {
     $constantFile = $this->getDrupalModulePath() . '/civicrm.module';
     $this->assertFileExists($constantFile);
     $content = file_get_contents($constantFile);
     if (preg_match(";define\\('CIVICRM_DRUPAL_PHP_MINIMUM', '(.*)'\\);", $content, $m)) {
-      $this->assertEquals(\CRM_Upgrade_Form::MINIMUM_PHP_VERSION, $m[1]);
+      $this->assertEquals(\CRM_Upgrade_Incremental_General::MIN_INSTALL_PHP_VER, $m[1]);
     }
     else {
       $this->fail('Failed to find CIVICRM_DRUPAL_PHP_MINIMUM in ' . $constantFile);
     }
   }
 
   /**
-   * "php" requirement (civicrm.info) should match MINIMUM_PHP_VERSION (CRM/Upgrade/Form.php).
+   * "php" requirement (civicrm.info) should match
+   * CRM_Upgrade_Incremental_General::MIN_INSTALL_PHP_VER.
    */
   public function testInfoMatch() {
     $infoFile = $this->getDrupalModulePath() . '/civicrm.info';
     $this->assertFileExists($infoFile);
     $info = drupal_parse_info_file($infoFile);
-    $expectMajorMinor = preg_replace(';^(\d+\.\d+)\..*$;', '\1', \CRM_Upgrade_Form::MINIMUM_PHP_VERSION);
+    $expectMajorMinor = preg_replace(';^(\d+\.\d+)\..*$;', '\1', \CRM_Upgrade_Incremental_General::MIN_INSTALL_PHP_VER);
     $this->assertEquals($expectMajorMinor, $info['php']);
   }