Merge pull request #1595 from schmittjoh/fix-warnings-in-tests

Fix warnings in a test code

Author: scyzoryck

tests/Expression/ExpressionEvaluatorTest.php

@@ -4,7 +4,6 @@
 
 namespace JMS\Serializer\Tests\Expression;
 
-use JMS\Serializer\Expression\Expression;
 use JMS\Serializer\Expression\ExpressionEvaluator;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
@@ -29,8 +28,6 @@ public function testEvaluate()
     public function testParse()
     {
         $parsed = $this->evaluator->parse('a + b', ['a', 'b']);
-        self::assertInstanceOf(Expression::class, $parsed);
-
         $evaluated = $this->evaluator->evaluateParsed($parsed, ['a' => 1, 'b' => 2]);
         self::assertSame(3, $evaluated);
     }

tests/Fixtures/IndexedCommentsBlogPost.php

@@ -59,6 +59,6 @@ class IndexedCommentsList
     public function addComment(Comment $comment)
     {
         $this->comments[] = $comment;
-        $this->count += 1;
+        ++$this->count;
     }
 }

tests/Fixtures/ObjectWithEmptyArrayAndHash.php

@@ -28,7 +28,7 @@ class ObjectWithEmptyArrayAndHash
      * @Serializer\SkipWhenEmpty()
      */
     #[Serializer\SkipWhenEmpty]
-    private $object = [];
+    private $object;
 
     public function __construct()
     {

tests/Fixtures/TypedProperties/UnionTypedProperties.php

@@ -8,7 +8,7 @@ class UnionTypedProperties
 {
     public bool|float|string|array|int $data;
 
-    private int|bool|float|string|null $nullableData = null;
+    private int|bool|float|string|null $nullableData;
 
     private string|false $valueTypedUnion;
 

tests/Handler/FormErrorHandlerTest.php

@@ -282,12 +282,12 @@ protected function getMockForm($name = 'name'): MockObject
         $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
         $config = $this->getMockBuilder('Symfony\Component\Form\FormConfigInterface')->getMock();
 
-        $form->expects($this->any())
+        $form
             ->method('getName')
-            ->will($this->returnValue($name));
-        $form->expects($this->any())
+            ->willReturn($name);
+        $form
             ->method('getConfig')
-            ->will($this->returnValue($config));
+            ->willReturn($config);
 
         return $form;
     }

tests/Metadata/Driver/BaseDriverTestCase.php

@@ -162,7 +162,11 @@ public function testVirtualProperty()
         self::assertArrayHasKey('virtualSerializedValue', $m->propertyMetadata);
         self::assertArrayHasKey('typedVirtualProperty', $m->propertyMetadata);
 
-        self::assertEquals($m->propertyMetadata['virtualSerializedValue']->serializedName, 'test', 'Serialized name is missing');
+        self::assertEquals(
+            'test',
+            $m->propertyMetadata['virtualSerializedValue']->serializedName,
+            'Serialized name is missing',
+        );
 
         $p = new VirtualPropertyMetadata($m->name, 'virtualValue');
         $p->getter = 'getVirtualValue';

tests/Metadata/Driver/DoctrinePHPCRDriverTest.php

@@ -122,9 +122,9 @@ public function getAnnotationDriver()
     {
         if (class_exists(DoctrinePHPCRDriver::class)) {
             return new AnnotationDriver(new AnnotationReader(), new IdenticalPropertyNamingStrategy());
-        } else {
-            return new AnnotationOrAttributeDriver(new IdenticalPropertyNamingStrategy());
         }
+
+        return new AnnotationOrAttributeDriver(new IdenticalPropertyNamingStrategy());
     }
 
     protected function getDoctrinePHPCRDriver()

tests/Serializer/BaseSerializationTestCase.php

@@ -975,7 +975,7 @@ public function testDeserializingNull()
         $builder->setObjectConstructor($objectConstructor);
         $this->serializer = $builder->build();
 
-        $post = new BlogPost('This is a nice title.', $author = new Author('Foo Bar'), new \DateTime('2011-07-30 00:00', new \DateTimeZone('UTC')), new Publisher('Bar Foo'));
+        $post = new BlogPost('This is a nice title.', new Author('Foo Bar'), new \DateTime('2011-07-30 00:00', new \DateTimeZone('UTC')), new Publisher('Bar Foo'));
 
         $this->setField($post, 'author', null);
         $this->setField($post, 'publisher', null);
@@ -1309,11 +1309,7 @@ public function testFormErrorsWithNonFormComponents($type)
         $context = SerializationContext::create();
         $context->setInitialType($type);
 
-        try {
-            $this->serialize($form, $context);
-        } catch (\Throwable $e) {
-            self::assertTrue(false, 'Serialization should not throw an exception');
-        }
+        $this->serialize($form, $context);
     }
 
     public static function initialFormTypeProvider()
@@ -1998,9 +1994,7 @@ public function testThrowingExceptionWhenDeserializingUnionDocBlockTypes()
         }
 
         $this->expectException(RuntimeException::class);
-
-        $object = new UnionTypedDocBlockProperty(10000);
-        $deserialized = $this->deserialize(static::getContent('data_integer'), UnionTypedDocBlockProperty::class);
+        $this->deserialize(static::getContent('data_integer'), UnionTypedDocBlockProperty::class);
     }
 
     public function testIterable(): void

tests/Serializer/ContextTest.php

@@ -35,7 +35,7 @@ public function testSerializationContextPathAndDepth()
         $self = $this;
 
         $exclusionStrategy = $this->getMockBuilder(ExclusionStrategyInterface::class)->getMock();
-        $exclusionStrategy->expects($this->any())
+        $exclusionStrategy
             ->method('shouldSkipClass')
             ->with($this->anything(), $this->callback(static function (SerializationContext $context) use ($self, $objects) {
                 $expectedDepth = $expectedPath = null;
@@ -61,7 +61,7 @@ public function testSerializationContextPathAndDepth()
             }))
             ->willReturn(false);
 
-        $exclusionStrategy->expects($this->any())
+        $exclusionStrategy
             ->method('shouldSkipProperty')
             ->with($this->anything(), $this->callback(static function (SerializationContext $context) use ($self, $objects) {
                 $expectedDepth = $expectedPath = null;

tests/Serializer/DateIntervalFormatTest.php

@@ -14,21 +14,21 @@ public function testFormat()
         $dtf = new DateHandler();
 
         $ATOMDateIntervalString = $dtf->format(new \DateInterval('P0D'));
-        self::assertEquals($ATOMDateIntervalString, 'P0DT0S');
+        self::assertEquals('P0DT0S', $ATOMDateIntervalString);
 
         $ATOMDateIntervalString = $dtf->format(new \DateInterval('P0DT0S'));
-        self::assertEquals($ATOMDateIntervalString, 'P0DT0S');
+        self::assertEquals('P0DT0S', $ATOMDateIntervalString);
 
         $ATOMDateIntervalString = $dtf->format(new \DateInterval('PT45M'));
 
-        self::assertEquals($ATOMDateIntervalString, 'PT45M');
+        self::assertEquals('PT45M', $ATOMDateIntervalString);
 
         $ATOMDateIntervalString = $dtf->format(new \DateInterval('P2YT45M'));
 
-        self::assertEquals($ATOMDateIntervalString, 'P2YT45M');
+        self::assertEquals('P2YT45M', $ATOMDateIntervalString);
 
         $ATOMDateIntervalString = $dtf->format(new \DateInterval('P2Y4DT6H8M16S'));
 
-        self::assertEquals($ATOMDateIntervalString, 'P2Y4DT6H8M16S');
+        self::assertEquals('P2Y4DT6H8M16S', $ATOMDateIntervalString);
     }
 }