Removed code for PHP < 7.2 and HHVM

Author: marc-mabe

bench/bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 
 $zendassertions = ini_get('zend.assertions');
-if (\PHP_VERSION_ID >= 70000 && $zendassertions != -1) {
+if ($zendassertions != -1) {
     echo 'Please disable zend.assertions in php.ini (zend.assertions = -1)' . PHP_EOL
         . "Current ini setting: zend.assertions = {$zendassertions}]" . PHP_EOL;
     exit(1);

src/Enum.php

@@ -365,35 +365,27 @@ private static function detectConstants(string $class): array
     {
         if (!isset(self::$constants[$class])) {
             $reflection = new ReflectionClass($class);
-            $publicConstants  = [];
+            $allConstants  = [];
 
             do {
                 $scopeConstants = [];
-                if (\PHP_VERSION_ID >= 70100 && method_exists(ReflectionClass::class, 'getReflectionConstants')) {
-                    // Since PHP-7.1 visibility modifiers are allowed for class constants
-                    // for enumerations we are only interested in public once.
-                    // NOTE: HHVM > 3.26.2 still does not support private/protected constants.
-                    //       It allows the visibility keyword but ignores it.
-                    foreach ($reflection->getReflectionConstants() as $reflConstant) {
-                        if ($reflConstant->isPublic()) {
-                            $scopeConstants[ $reflConstant->getName() ] = $reflConstant->getValue();
-                        }
+                // Enumerators must be defined as public class constants
+                foreach ($reflection->getReflectionConstants() as $reflConstant) {
+                    if ($reflConstant->isPublic()) {
+                        $scopeConstants[ $reflConstant->getName() ] = $reflConstant->getValue();
                     }
-                } else {
-                    // In PHP < 7.1 all class constants were public by definition
-                    $scopeConstants = $reflection->getConstants();
                 }
 
-                $publicConstants = $scopeConstants + $publicConstants;
+                $allConstants = $scopeConstants + $allConstants;
             } while (($reflection = $reflection->getParentClass()) && $reflection->name !== __CLASS__);
 
             assert(
-                self::noAmbiguousValues($publicConstants),
+                self::noAmbiguousValues($allConstants),
                 "Ambiguous enumerator values detected for {$class}"
             );
 
-            self::$constants[$class] = $publicConstants;
-            self::$names[$class] = \array_keys($publicConstants);
+            self::$constants[$class] = $allConstants;
+            self::$names[$class] = \array_keys($allConstants);
         }
 
         return self::$constants[$class];

tests/MabeEnumTest/EnumTest.php

@@ -314,11 +314,7 @@ public function testInstantiateUsingMagicMethod()
     public function testEnabledAssertAmbiguousEnumeratorValues()
     {
         $this->expectException(AssertionError::class);
-
-        if (\PHP_VERSION_ID >= 70000 && strpos(\PHP_VERSION, 'hhvm') === false) {
-            // The assertion error contains the assertion description as exception message since PHP-7
-            $this->expectExceptionMessage('Ambiguous enumerator values detected for ' . EnumAmbiguous::class);
-        }
+        $this->expectExceptionMessage('Ambiguous enumerator values detected for ' . EnumAmbiguous::class);
 
         EnumAmbiguous::get('unknown');
     }
@@ -334,11 +330,7 @@ public function testDisabledAssertAmbiguousEnumeratorValues()
     public function testExtendedEnabledAssertAmbiguousEnumeratorValues()
     {
         $this->expectException(AssertionError::class);
-
-        if (\PHP_VERSION_ID >= 70000 && strpos(\PHP_VERSION, 'hhvm') === false) {
-            // The assertion error contains the assertion description as exception message since PHP-7
-            $this->expectExceptionMessage('Ambiguous enumerator values detected for ' . EnumExtendedAmbiguous::class);
-        }
+        $this->expectExceptionMessage('Ambiguous enumerator values detected for ' . EnumExtendedAmbiguous::class);
 
         EnumExtendedAmbiguous::get('unknown');
     }
@@ -414,13 +406,6 @@ public function testHasValue()
 
     public function testConstVisibility()
     {
-        if (PHP_VERSION_ID < 70100) {
-            $this->markTestSkipped('This test is for PHP-7.1 and upper only');
-        }
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('HHVM does not support constant visibility');
-        }
-
         $constants = ConstVisibilityEnum::getConstants();
         $this->assertSame(array(
             'IPUB' => ConstVisibilityEnum::IPUB,
@@ -430,13 +415,6 @@ public function testConstVisibility()
 
     public function testConstVisibilityExtended()
     {
-        if (PHP_VERSION_ID < 70100) {
-            $this->markTestSkipped('This test is for PHP-7.1 and upper only');
-        }
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('HHVM does not support constant visibility');
-        }
-
         $constants = ConstVisibilityEnumExtended::getConstants();
         $this->assertSame(array(
             'IPUB'  => ConstVisibilityEnumExtended::IPUB,

tests/bootstrap.php

@@ -5,7 +5,7 @@
 
 // make sure zend.assertions are available (not disabled on compile time)
 $zendassertions = ini_get('zend.assertions');
-if (\PHP_VERSION_ID >= 70000 && $zendassertions == -1) {
+if ($zendassertions == -1) {
     echo 'Please enable zend.assertions in php.ini (zend.assertions = 1)' . PHP_EOL
         . "Current ini setting: zend.assertions = {$zendassertions}]" . PHP_EOL;
     exit(1);