Procházet zdrojové kódy

Fix regression with link_parameters

Thomas Rabaix před 11 roky
rodič
revize
217a3f3b7c

+ 4 - 0
Admin/BaseFieldDescription.php

@@ -202,6 +202,10 @@ abstract class BaseFieldDescription implements FieldDescriptionInterface
             $options['placeholder'] = 'short_object_description_placeholder';
         }
 
+        if (!isset($options['link_parameters'])) {
+            $options['link_parameters'] = array();
+        }
+
         $this->options = $options;
     }
 

+ 1 - 1
Tests/Admin/BaseFieldDescriptionTest.php

@@ -54,7 +54,7 @@ class BaseFieldDescriptionTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('foo.twig.html', $description->getTemplate());
         $this->assertEquals('fooHelp', $description->getHelp());
 
-        $this->assertCount(1, $description->getOptions());
+        $this->assertCount(2, $description->getOptions());
 
         $description->setHelp('Please enter an integer');
         $this->assertEquals('Please enter an integer', $description->getHelp());

+ 2 - 1
Tests/Controller/HelperControllerTest.php

@@ -92,7 +92,8 @@ class HelperControllerTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+     * @expectedException \RuntimeException
+     * @expectionMessage Invalid format
      */
     public function testgetShortObjectDescriptionActionObjectDoesNotExist()
     {

+ 2 - 0
Tests/Datagrid/DatagridMapperTest.php

@@ -121,6 +121,7 @@ class DatagridMapperTest extends \PHPUnit_Framework_TestCase
             'label' => 'fooLabel',
             'field_name' => 'fooFilterName',
             'placeholder' => 'short_object_description_placeholder',
+            'link_parameters' => array()
         ), $filter->getOptions());
     }
 
@@ -147,6 +148,7 @@ class DatagridMapperTest extends \PHPUnit_Framework_TestCase
             'field_type' => 'foo_field_type',
             'placeholder' => 'short_object_description_placeholder',
             'foo_filter_option' => 'foo_filter_option_value',
+            'link_parameters' => array()
         ), $filter->getOptions());
     }