Merge pull request #1011 from xabbuh/phpunit-bridge

use non-deprecated code when possible

Author: lsmith77

Tests/Request/RequestBodyParamConverterTest.php

@@ -207,14 +207,33 @@ public function testApplyWithSerializerContextOptionsForSymfonySerializer()
 
     public function testApplyWithValidationErrors()
     {
-        $validator = $this->getMockBuilder('Symfony\Component\Validator\Validator')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $expectedPost = new Post('Post 1', 'This is a blog post');
         $validationErrors = $this->getMock('Symfony\Component\Validator\ConstraintViolationList');
 
+        if (class_exists('Symfony\Component\Validator\Validator\RecursiveValidator')) {
+            $validator = $this
+                ->getMockBuilder('Symfony\Component\Validator\Validator\RecursiveValidator')
+                ->disableOriginalConstructor()
+                ->getMock();
+            $validator
+                ->expects($this->once())
+                ->method('validate')
+                ->with($expectedPost, null, array('group1'))
+                ->will($this->returnValue($validationErrors));
+        } else {
+            $validator = $this
+                ->getMockBuilder('Symfony\Component\Validator\Validator')
+                ->disableOriginalConstructor()
+                ->getMock();
+            $validator
+                ->expects($this->once())
+                ->method('validate')
+                ->with($expectedPost, array('group1'), true, true)
+                ->will($this->returnValue($validationErrors));
+        }
+
         $this->converter = new RequestBodyParamConverter($this->serializer, null, null, $validator, 'validationErrors');
 
-        $expectedPost = new Post('Post 1', 'This is a blog post');
         $this->serializer->expects($this->once())
             ->method('deserialize')
             ->with('', 'FOS\RestBundle\Tests\Request\Post', 'json')
@@ -229,11 +248,6 @@ public function testApplyWithValidationErrors()
             ),
         );
 
-        $validator->expects($this->once())
-            ->method('validate')
-            ->with($expectedPost, array('group1'), true, true)
-            ->will($this->returnValue($validationErrors));
-
         $config = $this->createConfiguration('FOS\RestBundle\Tests\Request\Post', 'post', $options);
         $this->converter->apply($request, $config);
 
@@ -306,9 +320,17 @@ public function testValidatorOptionsStructureAfterMergeWithUserOptions()
         );
         $config = $this->createConfiguration(null, null, $userOptions);
 
-        $validator = $this->getMockBuilder('Symfony\Component\Validator\Validator')
-            ->disableOriginalConstructor()
-            ->getMock();
+        if (class_exists('Symfony\Component\Validator\Validator\RecursiveValidator')) {
+            $validator = $this
+                ->getMockBuilder('Symfony\Component\Validator\Validator\RecursiveValidator')
+                ->disableOriginalConstructor()
+                ->getMock();
+        } else {
+            $validator = $this->getMockBuilder('Symfony\Component\Validator\Validator')
+                ->disableOriginalConstructor()
+                ->getMock();
+        }
+
         $this->converter = new RequestBodyParamConverter($this->serializer, null, null, $validator, 'validationErrors');
         $request = $this->createRequest();
 

Tests/View/ViewHandlerTest.php

@@ -76,16 +76,16 @@ public function testRegisterHandleExpectsException()
     /**
      * @dataProvider getStatusCodeDataProvider
      */
-    public function testGetStatusCode($expected, $data, $isBound, $isValid, $isBoundCalled, $isValidCalled, $noContentCode)
+    public function testGetStatusCode($expected, $data, $isSubmitted, $isValid, $isSubmittedCalled, $isValidCalled, $noContentCode)
     {
         $reflectionMethod = new \ReflectionMethod('FOS\RestBundle\View\ViewHandler', 'getStatusCode');
         $reflectionMethod->setAccessible(true);
 
-        $form = $this->getMock('Symfony\Component\Form\Form', array('isBound', 'isValid'), array(), '', false);
+        $form = $this->getMock('Symfony\Component\Form\Form', array('isSubmitted', 'isValid'), array(), '', false);
         $form
-            ->expects($this->exactly($isBoundCalled))
-            ->method('isBound')
-            ->will($this->returnValue($isBound));
+            ->expects($this->exactly($isSubmittedCalled))
+            ->method('isSubmitted')
+            ->will($this->returnValue($isSubmitted));
         $form
             ->expects($this->exactly($isValidCalled))
             ->method('isValid')
@@ -215,14 +215,14 @@ public function testShouldReturnErrorResponseWhenDataContainsFormAndFormIsNotVal
         $viewHandler = new ViewHandler(null, $expectedFailedValidationCode = Codes::HTTP_I_AM_A_TEAPOT);
         $viewHandler->setContainer($container);
 
-        $form = $this->getMock('Symfony\\Component\\Form\\Form', array('createView', 'getData', 'isValid', 'isBound'), array(), '', false);
+        $form = $this->getMock('Symfony\\Component\\Form\\Form', array('createView', 'getData', 'isValid', 'isSubmitted'), array(), '', false);
         $form
             ->expects($this->any())
             ->method('isValid')
             ->will($this->returnValue(false));
         $form
             ->expects($this->any())
-            ->method('isBound')
+            ->method('isSubmitted')
             ->will($this->returnValue(true));
 
         $view = new View($form);
@@ -266,7 +266,7 @@ public function testCreateResponseWithoutLocation($format, $expected, $createVie
         $viewHandler->setContainer($container);
 
         if ($form) {
-            $data = $this->getMock('Symfony\Component\Form\Form', array('createView', 'getData', 'isValid', 'isBound'), array(), '', false);
+            $data = $this->getMock('Symfony\Component\Form\Form', array('createView', 'getData', 'isValid', 'isSubmitted'), array(), '', false);
             $data
                 ->expects($this->exactly($createViewCalls))
                 ->method('createView')
@@ -281,7 +281,7 @@ public function testCreateResponseWithoutLocation($format, $expected, $createVie
                 ->will($this->returnValue($formIsValid));
             $data
                 ->expects($this->any())
-                ->method('isBound')
+                ->method('isSubmitted')
                 ->will($this->returnValue(true));
         } else {
             $data = array('foo' => 'bar');

View/ViewHandler.php

@@ -197,7 +197,7 @@ protected function getStatusCode(View $view, $content = null)
     {
         $form = $this->getFormFromView($view);
 
-        if ($form && $form->isBound() && !$form->isValid()) {
+        if ($form && $form->isSubmitted() && !$form->isValid()) {
             return $this->failedValidationCode;
         }
 
@@ -500,7 +500,7 @@ private function getDataFromView(View $view)
             return $view->getData();
         }
 
-        if ($form->isValid() || !$form->isBound()) {
+        if ($form->isValid() || !$form->isSubmitted()) {
             return $form;
         }
 

phpunit.xml.dist

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit bootstrap="./Tests/bootstrap.php" colors="true">
-    <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
-    </php>
-
     <testsuites>
         <testsuite name="FOSRestBundle test suite">
             <directory suffix="Test.php">./Tests</directory>