Grégoire Paris 9 năm trước cách đây
mục cha
commit
20d924b71e

+ 2 - 16
Controller/CRUDController.php

@@ -169,8 +169,6 @@ class CRUDController extends Controller
      *
      * @param Request $request
      *
-     * @param Request $request
-     *
      * @return string The template name
      */
     protected function getBaseTemplate(Request $request = null)
@@ -220,8 +218,6 @@ class CRUDController extends Controller
      *
      * @param Request $request
      *
-     * @param Request $request
-     *
      * @return Response
      *
      * @throws AccessDeniedException If access is not granted
@@ -498,8 +494,6 @@ class CRUDController extends Controller
      *
      * @param Request $request
      *
-     * @param Request $request
-     *
      * @return Response|RedirectResponse
      *
      * @throws NotFoundHttpException If the HTTP method is not POST
@@ -614,8 +608,6 @@ class CRUDController extends Controller
      *
      * @param Request $request
      *
-     * @param Request $request
-     *
      * @return Response
      *
      * @throws AccessDeniedException If access is not granted
@@ -654,8 +646,8 @@ class CRUDController extends Controller
 
                     if ($this->isXmlHttpRequest($request)) {
                         return $this->renderJson(array(
-                            'result' => 'ok',
-                            'objectId' => $this->admin->getNormalizedIdentifier($object)
+                            'result'   => 'ok',
+                            'objectId' => $this->admin->getNormalizedIdentifier($object),
                         ), 200, array(), $request);
                     }
 
@@ -713,8 +705,6 @@ class CRUDController extends Controller
      *
      * @param Request $request
      *
-     * @param Request $request
-     *
      * @return bool
      */
     protected function isPreviewRequested(Request $request = null)
@@ -729,8 +719,6 @@ class CRUDController extends Controller
      *
      * @param Request $request
      *
-     * @param Request $request
-     *
      * @return bool
      */
     protected function isPreviewApproved(Request $request = null)
@@ -765,8 +753,6 @@ class CRUDController extends Controller
      *
      * @param Request $request
      *
-     * @param Request $request
-     *
      * @return bool
      */
     protected function isPreviewDeclined(Request $request = null)

+ 2 - 2
Tests/Command/ExplainAdminCommandTest.php

@@ -171,11 +171,11 @@ class ExplainAdminCommandTest extends \PHPUnit_Framework_TestCase
         }
 
         $propertyMetadata = $this->getMockForAbstractClass('Symfony\Component\Validator\Mapping\\'.$class);
-        $propertyMetadata->constraints = array(new NotNull(), new Length(array('min' => 2, 'max' => 50, 'groups' => array('create', 'edit'),)));
+        $propertyMetadata->constraints = array(new NotNull(), new Length(array('min' => 2, 'max' => 50, 'groups' => array('create', 'edit'))));
         $metadata->properties = array('firstName' => $propertyMetadata);
 
         $getterMetadata = $this->getMockForAbstractClass('Symfony\Component\Validator\Mapping\\'.$class);
-        $getterMetadata->constraints = array(new NotNull(), new Email(array('groups' => array('registration', 'edit'),)));
+        $getterMetadata->constraints = array(new NotNull(), new Email(array('groups' => array('registration', 'edit'))));
         $metadata->getters = array('email' => $getterMetadata);
 
         $modelManager = $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface');

+ 7 - 7
Tests/Controller/CRUDControllerTest.php

@@ -554,7 +554,7 @@ class CRUDControllerTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf(
             'Symfony\Component\HttpFoundation\Response',
             $this->controller->render('FooAdminBundle::foo.html.twig',
-            array('foo'=>'bar'), null, $this->request)
+            array('foo' => 'bar'), null, $this->request)
         );
         $this->assertSame($this->admin, $this->parameters['admin']);
         $this->assertSame('SonataAdminBundle::standard_layout.html.twig', $this->parameters['base_template']);
@@ -567,12 +567,12 @@ class CRUDControllerTest extends \PHPUnit_Framework_TestCase
     {
         $this->parameters = array();
         $this->request->headers->set('X-Requested-With', 'XMLHttpRequest');
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $this->controller->render('FooAdminBundle::foo.html.twig', array('foo'=>'bar'), null, $this->request));
-        $this->assertEquals($this->admin, $this->parameters['admin']);
-        $this->assertEquals('SonataAdminBundle::ajax_layout.html.twig', $this->parameters['base_template']);
-        $this->assertEquals($this->pool, $this->parameters['admin_pool']);
-        $this->assertEquals('bar', $this->parameters['foo']);
-        $this->assertEquals('FooAdminBundle::foo.html.twig', $this->template);
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $this->controller->render('FooAdminBundle::foo.html.twig', array('foo' => 'bar'), null, $this->request));
+        $this->assertSame($this->admin, $this->parameters['admin']);
+        $this->assertSame('SonataAdminBundle::ajax_layout.html.twig', $this->parameters['base_template']);
+        $this->assertSame($this->pool, $this->parameters['admin_pool']);
+        $this->assertSame('bar', $this->parameters['foo']);
+        $this->assertSame('FooAdminBundle::foo.html.twig', $this->template);
     }
 
     public function testListActionAccessDenied()