Merge pull request #97 from marc-mabe/hotfix/95

Description message for ambiguous assertion check

Author: marc-mabe

src/Enum.php

@@ -369,7 +369,10 @@ private static function detectConstants($class)
                 $publicConstants = $scopeConstants + $publicConstants;
             } while (($reflection = $reflection->getParentClass()) && $reflection->name !== __CLASS__);
 
-            assert(self::noAmbiguousValues($publicConstants));
+            assert(
+                self::noAmbiguousValues($publicConstants),
+                "Ambiguous enumerator values detected for {$class}"
+            );
 
             self::$constants[$class] = $publicConstants;
             self::$names[$class] = \array_keys($publicConstants);
@@ -379,7 +382,7 @@ private static function detectConstants($class)
     }
 
     /**
-     * Assert that the given enumeration class doesn't define ambiguous enumerator values
+     * Test that the given constants does not contain ambiguous values
      * @param array $constants
      * @return bool
      */

tests/MabeEnumTest/EnumTest.php

@@ -313,6 +313,12 @@ 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);
+        }
+
         EnumAmbiguous::get('unknown');
     }
 
@@ -327,6 +333,12 @@ 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);
+        }
+
         EnumExtendedAmbiguous::get('unknown');
     }