Merge pull request #35 from Elao/php71/autodiscover_public_consts_only

AutoDiscoveredValuesTrait: do only autodiscover public constants

src/AutoDiscoveredValuesTrait.php

@@ -25,11 +25,18 @@ public static function values(): array
         $enumType = static::class;
 
         if (!isset(self::$guessedValues[$enumType])) {
-            $values = (new \ReflectionClass($enumType))->getConstants();
+            $r = new \ReflectionClass($enumType);
+            $values = $r->getConstants();
+
+            if (PHP_VERSION_ID >= 70100) {
+                $values = array_filter($values, function (string $k) use ($r) {
+                    return $r->getReflectionConstant($k)->isPublic();
+                }, ARRAY_FILTER_USE_KEY);
+            }
 
             if (is_a($enumType, FlaggedEnum::class, true)) {
                 $values = array_filter($values, function ($v) {
-                    return 0 === ($v & $v - 1) && $v > 0;
+                    return is_int($v) && 0 === ($v & $v - 1) && $v > 0;
                 });
             }
 

tests/Fixtures/Enum/Php71AutoDiscoveredEnum.php

@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the "elao/enum" package.
+ *
+ * Copyright (C) 2016 Elao
+ *
+ * @author Elao <contact@elao.com>
+ */
+
+namespace Elao\Enum\Tests\Fixtures\Enum;
+
+use Elao\Enum\AutoDiscoveredValuesTrait;
+use Elao\Enum\Enum;
+
+final class Php71AutoDiscoveredEnum extends Enum
+{
+    use AutoDiscoveredValuesTrait;
+
+    public const FOO = 'foo';
+    public const BAR = 'bar';
+    public const BAZ = 'baz';
+
+    private const PRIVATE = 'private';
+    protected const PROTECTED = 'protected';
+}

tests/Unit/AutoDiscoveredValuesTraitTest.php

@@ -13,6 +13,7 @@
 use Elao\Enum\AutoDiscoveredValuesTrait;
 use Elao\Enum\Enum;
 use Elao\Enum\FlaggedEnum;
+use Elao\Enum\Tests\Fixtures\Enum\Php71AutoDiscoveredEnum;
 
 class AutoDiscoveredValuesTraitTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,6 +22,14 @@ public function testItAutoDiscoveredValuesBasedOnAvailableConstants()
         $this->assertSame(['foo', 'bar', 'baz'], AutoDiscoveredEnum::values());
     }
 
+    /**
+     * @requires PHP 7.1
+     */
+    public function testPHP71ItAutoDiscoveredValuesBasedOnAvailableConstants()
+    {
+        $this->assertSame(['foo', 'bar', 'baz'], Php71AutoDiscoveredEnum::values());
+    }
+
     public function testItAutoDiscoveredValuesBasedOnAvailableBitFlagConstants()
     {
         $this->assertSame([1, 2, 4], AutoDiscoveredFlaggedEnum::values());
@@ -45,4 +54,5 @@ final class AutoDiscoveredFlaggedEnum extends FlaggedEnum
     const BAZ = 4;
 
     const NOT_A_BIT_FLAG = 3;
+    const NOT_EVEN_AN_INT = 'not_even_an_int';
 }