Merge branch 'backport/98' into 2.x

Author: marc-mabe

.travis.yml

@@ -16,8 +16,6 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.3.3
-    - php: 5.3
     - php: 5.4
       env:
         - CODE_COVERAGE="1"
@@ -29,12 +27,13 @@ matrix:
     - php: 7.1
       env:
         - CODE_COVERAGE="1"
-    - php: nightly
-    - php: hhvm
-      # HHVM is no longer supported on Ubuntu Precise. Please consider using Trusty with `dist: trusty`.
+    - php: 7.2
+    - php: 7.3
+    # HHVM is no longer supported on Ubuntu Precise. Please consider using Trusty with `dist: trusty`.
+    - php: hhvm-3.27 # LTS
+      dist: trusty
+    - php: hhvm-3.30 # last with PHP support
       dist: trusty
-  allow_failures:
-    - php: nightly
 
 install:
   - if [ "${CODE_COVERAGE}" == "0" ]; then

src/Enum.php

@@ -378,9 +378,11 @@ private static function detectConstants($class)
 
             do {
                 $scopeConstants = array();
-                if (PHP_VERSION_ID >= 70100) {
+                if (\PHP_VERSION_ID >= 70100 && method_exists('ReflectionClass', '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();

tests/MabeEnumTest/EnumTest.php

@@ -297,6 +297,9 @@ 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(
@@ -310,6 +313,9 @@ 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(