Fixed if we try to load AbstractProvider as provider

azuyalabs · Apr 14, 2016 · 9678bc4 · 9678bc4
1 parent 5879133
commit 9678bc4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Yasumi/Yasumi.php b/src/Yasumi/Yasumi.php
@@ -72,7 +72,7 @@ public static function create($class, $year = null, $locale = self::DEFAULT_LOCA
     {
         // Find and return holiday provider instance
         $providerClass = sprintf('Yasumi\Provider\%s', str_replace('/', '\\', $class));
-        if (!class_exists($providerClass)) {
+        if (!class_exists($providerClass) || $class === 'AbstractProvider') {
             throw new InvalidArgumentException(sprintf('Unable to find holiday provider "%s".', $class));
         }
 

diff --git a/tests/Base/YasumiTest.php b/tests/Base/YasumiTest.php
@@ -43,6 +43,26 @@ public function testCreateWithInvalidProvider()
         Yasumi::create('Mars');
     }
 
+    /**
+     * Tests that an InvalidArgumentException is thrown in case we try to load a Trait as provider.
+     *
+     * @expectedException InvalidArgumentException
+     */
+    public function testCreateWithInvalidProviderBecauseItsATrait()
+    {
+        Yasumi::create('CommonHolidays');
+    }
+
+    /**
+     * Tests that an InvalidArgumentException is thrown in case we try to load the AbstractProvider as provider.
+     *
+     * @expectedException InvalidArgumentException
+     */
+    public function testCreateWithAbstractClassProvider()
+    {
+        Yasumi::create('AbstractProvider');
+    }
+
     /**
      * Tests that an Yasumi\Exception\UnknownLocaleException is thrown in case an invalid locale is given.
      *