Skip AbstractProvider when generating provider list (#107)

azuyalabs · Jan 11, 2019 · f56f129 · f56f129
1 parent 7122ac5
commit f56f129
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Fixed spelling issues in the Danish translation. [\#96](https://github.com/azuyalabs/yasumi/pull/96)
 - Fixed German Easter Sunday and Pentecost Sunday holidays (not nationwide, only in Brandenburg). [\#100](https://github.com/azuyalabs/yasumi/pull/100)
 - Fixed BetweenFilter to ignore time part and timezone. [\#101](https://github.com/azuyalabs/yasumi/pull/101)
+- Fixed bug in provider list generation related to variable order of files returned by the filesystem [\#107](https://github.com/azuyalabs/yasumi/pull/107)
 
 ### Removed
 

diff --git a/src/Yasumi/Yasumi.php b/src/Yasumi/Yasumi.php
@@ -233,8 +233,8 @@ public static function getProviders()
             $class = new ReflectionClass(sprintf('Yasumi\Provider\%s', str_replace('/', '\\', $provider)));
 
             $key = 'ID';
-            if ($class->hasConstant($key)) {
-                $providers[strtoupper($class->getConstant($key))] = $provider;
+            if ($class->isSubclassOf('Yasumi\Provider\AbstractProvider') && $class->hasConstant($key)) {
+                $providers[\strtoupper($class->getConstant($key))] = $provider;
             }
         }
 

diff --git a/tests/Base/YasumiTest.php b/tests/Base/YasumiTest.php
@@ -303,6 +303,8 @@ public function testGetProviders()
         $this->assertNotEmpty($providers);
         $this->assertInternalType('array', $providers);
         $this->assertContains('Netherlands', $providers);
+        $this->assertEquals('USA', $providers['US']);
+        $this->assertNotContains('AbstractProvider', $providers);
     }
 
     /**