diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
index 34f56c035..0364f0eb5 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
@@ -75,7 +75,7 @@ final class DocGenObjectNormalizerTest extends KernelTestCase
         $user = new User();
         $user->setUsername('User Test');
 
-        $normalized = $this->normalizer->normalize($user, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read']]);
+        $normalized = $this->normalizer->normalize($user, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => User::class]);
         $expected = [
             'label' => 'User Test',
             'email' => '',
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index d3c18fe64..2ed451a92 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -386,10 +386,7 @@ class User implements AdvancedUserInterface
         return $this;
     }
 
-    /**
-     * @param bool $enabled
-     */
-    public function setEnabled($enabled)
+    public function setEnabled(bool $enabled)
     {
         $this->enabled = $enabled;
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
index 802f9fd6c..012d0fd68 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
@@ -186,7 +186,7 @@ class HouseholdMemberController extends ApiController
                     $_format,
                     ['groups' => ['read']]
                 );
-        } catch (Exception\InvalidArgumentException|Exception\UnexpectedValueException $e) {
+        } catch (Exception\InvalidArgumentException | Exception\UnexpectedValueException $e) {
             throw new BadRequestException("Deserialization error: {$e->getMessage()}", 45896, $e);
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index f232558a2..e8a4e5608 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -173,8 +173,6 @@ class AccompanyingPeriod implements
     private bool $emergency = false;
 
     /**
-     * @var int
-     *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
@@ -600,11 +598,6 @@ class AccompanyingPeriod implements
         throw new LogicException('no validation group permitted with this step');
     }
 
-    /**
-     * Get id.
-     *
-     * @return int
-     */
     public function getId(): ?int
     {
         return $this->id;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
index c43f07256..82464cd7b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
@@ -48,7 +48,7 @@ final class AccompanyingPeriodWorkDocGenNormalizerTest extends KernelTestCase
         ];
 
         $this->assertIsArray($actual);
-        $this->markTestSkipped("specification still not finalized");
+        $this->markTestSkipped('specification still not finalized');
         $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($actual));
 
         foreach ($expected as $key => $item) {
@@ -84,7 +84,7 @@ final class AccompanyingPeriodWorkDocGenNormalizerTest extends KernelTestCase
         ];
 
         $this->assertIsArray($actual);
-        $this->markTestSkipped("specification still not finalized");
+        $this->markTestSkipped('specification still not finalized');
         $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($actual));
 
         foreach ($expected as $key => $item) {