Fix errors in rebasing

Author: silverbackdan

features/bootstrap/DoctrineContext.php

@@ -1081,7 +1081,7 @@ public function thePasswordForUserShouldBeHashed(string $password, string $user)
     {
         $user = $this->doctrine->getRepository($this->isOrm() ? User::class : UserDocument::class)->find($user);
         if (!$this->passwordEncoder->isPasswordValid($user, $password)) {
-            throw new Exception('User password mismatch');
+            throw new \Exception('User password mismatch');
         }
     }
 

src/Serializer/AbstractItemNormalizer.php

@@ -92,7 +92,7 @@ public function __construct(PropertyNameCollectionFactoryInterface $propertyName
      */
     public function supportsNormalization($data, $format = null)
     {
-        if (!\is_object($data) || $data instanceof \Traversable) {
+        if (!\is_object($data)) {
             return false;
         }
 

tests/Fixtures/TestBundle/Document/DummyDtoOutputFallbackToSameClass.php

@@ -30,35 +30,21 @@ class DummyDtoOutputFallbackToSameClass
     /**
      * @var int The id
      *
-<<<<<<< HEAD
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-=======
      * @ODM\Id(strategy="INCREMENT", type="integer", nullable=true)
->>>>>>> Add ODM docs for tests
      */
     private $id;
 
     /**
      * @var string
      *
-<<<<<<< HEAD
-     * @ORM\Column
-=======
      * @ODM\Field
->>>>>>> Add ODM docs for tests
      */
     public $lorem;
 
     /**
      * @var string
      *
-<<<<<<< HEAD
-     * @ORM\Column
-=======
      * @ODM\Field
->>>>>>> Add ODM docs for tests
      */
     public $ipsum;
 

tests/Fixtures/TestBundle/Document/DummyDtoOutputSameClass.php

@@ -29,35 +29,21 @@ class DummyDtoOutputSameClass
     /**
      * @var int The id
      *
-<<<<<<< HEAD
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-=======
      * @ODM\Id(strategy="INCREMENT", type="integer", nullable=true)
->>>>>>> Add ODM docs for tests
      */
     private $id;
 
     /**
      * @var string
      *
-<<<<<<< HEAD
-     * @ORM\Column
-=======
      * @ODM\Field
->>>>>>> Add ODM docs for tests
      */
     public $lorem;
 
     /**
      * @var string
      *
-<<<<<<< HEAD
-     * @ORM\Column
-=======
      * @ODM\Field
->>>>>>> Add ODM docs for tests
      */
     public $ipsum;