Fix Twig extensions and AdminManager::registerAdmin missing default argument value

Author: Jérôme Poskin

AdminManager.php

@@ -23,8 +23,9 @@ class AdminManager
     /**
      * @param string $alias
      * @param \Snowcap\AdminBundle\Admin\AdminInterface $admin
+     * @param array
      */
-    public function registerAdmin($alias, AdminInterface $admin, array $options)
+    public function registerAdmin($alias, AdminInterface $admin, array $options = array())
     {
         $admin->setAlias($alias);
 

Twig/Extension/AdminExtension.php

@@ -48,11 +48,11 @@ public function __construct(
     public function getFunctions()
     {
         return array(
-            'get_admin_for_entity_name' => new \Twig_Function_Method($this, 'getAdminForEntityName'),
-            'admin' => new \Twig_Function_Method($this, 'getAdminByCode'),
-            'admin_label' => new \Twig_Function_Method($this, 'getAdminLabel'),
-            'admin_content_path' => new \Twig_Function_Method($this, 'getAdminContentPath'),
-            'admin_translation_domain' => new \Twig_Function_Method($this, 'getDefaultTranslationDomain'),
+            new \Twig_SimpleFunction('get_admin_for_entity_name', array($this, 'getAdminForEntityName')),
+            new \Twig_SimpleFunction('admin', array($this, 'getAdminByCode')),
+            new \Twig_SimpleFunction('admin_label', array($this, 'getAdminLabel')),
+            new \Twig_SimpleFunction('admin_content_path', array($this, 'getAdminContentPath')),
+            new \Twig_SimpleFunction('admin_translation_domain', array($this, 'getDefaultTranslationDomain')),
         );
     }
 

Twig/Extension/DatalistExtension.php

@@ -74,12 +74,12 @@ public function setContainer(ContainerInterface $container = null)
     public function getFunctions()
     {
         return array(
-            'datalist_widget' => new \Twig_Function_Method($this, 'renderDatalistWidget', array('is_safe' => array('html'))),
-            'datalist_field' => new \Twig_Function_Method($this, 'renderDatalistField', array('is_safe' => array('html'))),
-            'datalist_search' => new \Twig_Function_Method($this, 'renderDatalistSearch', array('is_safe' => array('html'))),
-            'datalist_filters' => new \Twig_Function_Method($this, 'renderDatalistFilters', array('is_safe' => array('html'))),
-            'datalist_filter' => new \Twig_Function_Method($this, 'renderDatalistFilter', array('is_safe' => array('html'))),
-            'datalist_action' => new \Twig_Function_Method($this, 'renderDatalistAction', array('is_safe' => array('html')))
+            new \Twig_SimpleFunction('datalist_widget', array($this, 'renderDatalistWidget'), array('is_safe' => array('html'))),
+            new \Twig_SimpleFunction('datalist_field', array($this, 'renderDatalistField'), array('is_safe' => array('html'))),
+            new \Twig_SimpleFunction('datalist_search', array($this, 'renderDatalistSearch'), array('is_safe' => array('html'))),
+            new \Twig_SimpleFunction('datalist_filters', array($this, 'renderDatalistFilters'), array('is_safe' => array('html'))),
+            new \Twig_SimpleFunction('datalist_filter', array($this, 'renderDatalistFilter'), array('is_safe' => array('html'))),
+            new \Twig_SimpleFunction('datalist_action', array($this, 'renderDatalistAction'), array('is_safe' => array('html')))
         );
     }
 

composer.json

@@ -23,23 +23,26 @@
             "homepage": "http://www.snowcap.be"
         }
     ],
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.3.2",
         "symfony/framework-bundle": ">=2.7",
         "snowcap/core-bundle": "~3.0",
         "snowcap/bootstrap-bundle": "~1.0",
         "snowcap/im-bundle": "~2.0",
         "leafo/lessphp": "v0.4.0"
-
     },
     "autoload": {
         "psr-0": { "Snowcap\\AdminBundle": "" }
     },
     "target-dir": "Snowcap/AdminBundle",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7.x-dev"
+            "dev-master": "3.0.x-dev"
         }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8",
+        "symfony/phpunit-bridge": "^2.7"
     }
 }