Handle both class names and instances with getExtensionsOptions

phug-php · Oct 6, 2017 · 237b25f · 237b25f
1 parent 5cc7bf9
commit 237b25f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Phug/Phug.php b/src/Phug/Phug.php
@@ -84,7 +84,9 @@ public static function getExtensionsOptions(array $extensions, array $options =
     {
         $methods = static::getExtensionsGetters();
         foreach ($extensions as $extensionClassName) {
-            $extension = new $extensionClassName();
+            $extension = is_string($extensionClassName)
+                ? new $extensionClassName()
+                : $extensionClassName;
             foreach (['getOptions', 'getEvents'] as $method) {
                 $value = $extension->$method();
                 if (!empty($value)) {

diff --git a/tests/Phug/PhugTest.php b/tests/Phug/PhugTest.php
@@ -284,6 +284,15 @@ public function testExtensions()
         self::assertFalse(Phug::hasExtension(VerbatimExtension::class));
     }
 
+    /**
+     * @covers ::getExtensionsOptions
+     */
+    public function testGetExtensionsOptions()
+    {
+        self::assertSame([], Phug::getExtensionsOptions([new VerbatimExtension()]));
+        self::assertSame([], Phug::getExtensionsOptions([VerbatimExtension::class]));
+    }
+
     /**
      * @covers                   ::addExtension
      * @expectedException        \Phug\PhugException