Runroom · jordisala1991 · Jun 29, 2020 · Jun 29, 2020
diff --git a/packages/basic-page-bundle/src/Entity/BasicPage.php b/packages/basic-page-bundle/src/Entity/BasicPage.php
@@ -37,7 +37,7 @@ class BasicPage implements TranslatableInterface
     public const LOCATION_FOOTER = 'footer';
 
     /**
-     * @var int
+     * @var int|null
      *
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -46,7 +46,7 @@ class BasicPage implements TranslatableInterface
     private $id;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @Assert\Choice(choices = {
      *     BasicPage::LOCATION_NONE,
@@ -57,7 +57,7 @@ class BasicPage implements TranslatableInterface
     private $location = self::LOCATION_NONE;
 
     /**
-     * @var bool
+     * @var bool|null
      *
      * @ORM\Column(type="boolean")
      */

diff --git a/packages/basic-page-bundle/src/Entity/BasicPageTranslation.php b/packages/basic-page-bundle/src/Entity/BasicPageTranslation.php
@@ -32,7 +32,7 @@ class BasicPageTranslation implements TranslationInterface
     use ORMBehaviors\Translatable\TranslationTrait;
 
     /**
-     * @var int
+     * @var string|null
      *
      * @ORM\Column(type="string", length=5)
      */
@@ -48,7 +48,7 @@ class BasicPageTranslation implements TranslationInterface
     private $id;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @Assert\NotNull
      * @Assert\Length(max=255)
@@ -57,15 +57,15 @@ class BasicPageTranslation implements TranslationInterface
     private $title;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @Gedmo\Slug(fields={"title"}, unique_base="locale")
      * @ORM\Column(type="string", nullable=true)
      */
     private $slug;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @Assert\NotNull
      * @ORM\Column(type="text")

diff --git a/packages/basic-page-bundle/src/Repository/BasicPageRepository.php b/packages/basic-page-bundle/src/Repository/BasicPageRepository.php
@@ -17,6 +17,7 @@
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\Persistence\ManagerRegistry;
 use Runroom\BasicPageBundle\Entity\BasicPage;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
@@ -37,7 +38,7 @@ public function __construct(ManagerRegistry $registry, RequestStack $requestStac
 
     public function findBySlug(string $slug): BasicPage
     {
-        $request = $this->requestStack->getCurrentRequest();
+        $request = $this->requestStack->getCurrentRequest() ?? new Request();
 
         $query = $this->createQueryBuilder('basic_page')
             ->leftJoin('basic_page.translations', 'translations', Join::WITH, 'translations.locale = :locale')

diff --git a/packages/redirection-bundle/src/Entity/Redirect.php b/packages/redirection-bundle/src/Entity/Redirect.php
@@ -30,7 +30,7 @@ class Redirect
     public const TEMPORAL = 302;
 
     /**
-     * @var int
+     * @var int|null
      *
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -39,7 +39,7 @@ class Redirect
     private $id;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @Assert\NotNull
      * @Assert\Length(max=500)
@@ -49,7 +49,7 @@ class Redirect
     private $source;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @Assert\NotNull
      * @Assert\Length(max=500)
@@ -60,7 +60,7 @@ class Redirect
     private $destination;
 
     /**
-     * @var int
+     * @var int|null
      *
      * @Assert\Choice(choices = {
      *     Redirect::PERMANENT,
@@ -71,14 +71,14 @@ class Redirect
     private $httpCode = self::PERMANENT;
 
     /**
-     * @var bool
+     * @var bool|null
      *
      * @ORM\Column(type="boolean")
      */
     private $automatic = false;
 
     /**
-     * @var bool
+     * @var bool|null
      *
      * @ORM\Column(type="boolean")
      */

diff --git a/packages/redirection-bundle/tests/App/Entity/Entity.php b/packages/redirection-bundle/tests/App/Entity/Entity.php
@@ -19,7 +19,7 @@
 class Entity
 {
     /**
-     * @var int
+     * @var int|null
      *
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -28,14 +28,14 @@ class Entity
     private $id;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @ORM\Column(type="string")
      */
     private $title;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @ORM\Column(type="string")
      */

diff --git a/packages/redirection-bundle/tests/App/Entity/WrongEntity.php b/packages/redirection-bundle/tests/App/Entity/WrongEntity.php
@@ -19,7 +19,7 @@
 class WrongEntity
 {
     /**
-     * @var int
+     * @var int|null
      *
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -28,7 +28,7 @@ class WrongEntity
     private $id;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @ORM\Column(type="string")
      */

diff --git a/packages/redirection-bundle/tests/Integration/RedirectRepositoryTest.php b/packages/redirection-bundle/tests/Integration/RedirectRepositoryTest.php
@@ -32,12 +32,16 @@ public function itReturnsRedirect(): void
     {
         $redirect = $this->repository->findOneBy(['source' => '/redirect']);
 
-        self::assertNotNull($redirect->getId());
-        self::assertSame('/redirect', $redirect->__toString());
-        self::assertSame('/redirect', $redirect->getSource());
-        self::assertSame('/target', $redirect->getDestination());
-        self::assertSame(301, $redirect->getHttpCode());
-        self::assertTrue($redirect->getPublish());
+        if (null !== $redirect) {
+            self::assertNotNull($redirect->getId());
+            self::assertSame('/redirect', $redirect->__toString());
+            self::assertSame('/redirect', $redirect->getSource());
+            self::assertSame('/target', $redirect->getDestination());
+            self::assertSame(301, $redirect->getHttpCode());
+            self::assertTrue($redirect->getPublish());
+        } else {
+            self::fail('not found redirect');
+        }
     }
 
     /** @test */

diff --git a/packages/render-event-bundle/src/Controller/TemplateController.php b/packages/render-event-bundle/src/Controller/TemplateController.php
@@ -21,7 +21,7 @@ final class TemplateController
     /** @var PageRenderer */
     private $renderer;
 
-    public function __construct(PageRenderer $renderer = null)
+    public function __construct(PageRenderer $renderer)
     {
         $this->renderer = $renderer;
     }

diff --git a/packages/render-event-bundle/src/Renderer/PageRenderer.php b/packages/render-event-bundle/src/Renderer/PageRenderer.php
@@ -63,11 +63,11 @@ public function renderResponse(string $view, $model = null, Response $response =
 
         /** @var PageRenderEvent */
         $event = $this->eventDispatcher->dispatch(
-            new PageRenderEvent($view, $this->pageViewModel, $response ?? new Response()),
+            new PageRenderEvent($view, $this->pageViewModel, $response),
             PageRenderEvent::EVENT_NAME
         );
 
-        $response = $event->getResponse();
+        $response = $event->getResponse() ?? new Response();
         if ($response instanceof RedirectResponse || '' !== $response->getContent()) {
             return $response;
         }

diff --git a/packages/seo-bundle/src/AlternateLinks/AlternateLinksService.php b/packages/seo-bundle/src/AlternateLinks/AlternateLinksService.php
@@ -74,15 +74,15 @@ protected function getCurrentRoute(): string
     {
         $request = $this->requestStack->getCurrentRequest();
 
-        return $request->get('_route', '');
+        return null !== $request ? $request->get('_route', '') : '';
     }
 
     /** @return array<string, string> */
     protected function getCurrentRouteParameters(): array
     {
         $request = $this->requestStack->getCurrentRequest();
 
-        $routeParameters = $request->get('_route_params', []);
+        $routeParameters = null !== $request ? $request->get('_route_params', []) : [];
 
         return array_diff_key($routeParameters, array_flip(self::EXCLUDED_PARAMETERS));
     }

diff --git a/packages/seo-bundle/src/Behaviors/MetaInformationAware.php b/packages/seo-bundle/src/Behaviors/MetaInformationAware.php
@@ -19,7 +19,7 @@
 trait MetaInformationAware
 {
     /**
-     * @var EntityMetaInformation
+     * @var EntityMetaInformation|null
      *
      * @ORM\OneToOne(targetEntity="Runroom\SeoBundle\Entity\EntityMetaInformation", cascade={"all"})
      * @ORM\JoinColumn(referencedColumnName="id")

diff --git a/packages/seo-bundle/src/Entity/EntityMetaInformation.php b/packages/seo-bundle/src/Entity/EntityMetaInformation.php
@@ -27,7 +27,7 @@ class EntityMetaInformation implements TranslatableInterface
     use ORMBehaviors\Translatable\TranslatableTrait;
 
     /**
-     * @var int
+     * @var int|null
      *
      * @ORM\Id
      * @ORM\GeneratedValue

diff --git a/packages/seo-bundle/src/Entity/EntityMetaInformationTranslation.php b/packages/seo-bundle/src/Entity/EntityMetaInformationTranslation.php
@@ -28,7 +28,7 @@ class EntityMetaInformationTranslation implements TranslationInterface
     use ORMBehaviors\Translatable\TranslationTrait;
 
     /**
-     * @var int
+     * @var int|null
      *
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -37,15 +37,15 @@ class EntityMetaInformationTranslation implements TranslationInterface
     private $id;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @Assert\Length(max=255)
      * @ORM\Column(type="string", nullable=true)
      */
     private $title;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @ORM\Column(type="text", nullable=true)
      */

diff --git a/packages/seo-bundle/src/Entity/MetaInformation.php b/packages/seo-bundle/src/Entity/MetaInformation.php
@@ -30,7 +30,7 @@ class MetaInformation implements TranslatableInterface
     use ORMBehaviors\Translatable\TranslatableTrait;
 
     /**
-     * @var int
+     * @var int|null
      *
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -39,21 +39,21 @@ class MetaInformation implements TranslatableInterface
     private $id;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @ORM\Column(type="string", unique=true)
      */
     private $route;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @ORM\Column(type="string")
      */
     private $routeName;
 
     /**
-     * @var MediaInterface
+     * @var MediaInterface|null
      *
      * @Assert\Valid
      */

diff --git a/packages/seo-bundle/src/Entity/MetaInformationTranslation.php b/packages/seo-bundle/src/Entity/MetaInformationTranslation.php
@@ -28,7 +28,7 @@ class MetaInformationTranslation implements TranslationInterface
     use ORMBehaviors\Translatable\TranslationTrait;
 
     /**
-     * @var int
+     * @var int|null
      *
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -37,7 +37,7 @@ class MetaInformationTranslation implements TranslationInterface
     private $id;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @Assert\NotNull
      * @Assert\Length(max=255)
@@ -46,7 +46,7 @@ class MetaInformationTranslation implements TranslationInterface
     private $title;
 
     /**
-     * @var string
+     * @var string|null
      *
      * @Assert\NotNull
      * @ORM\Column(type="text")

diff --git a/packages/seo-bundle/src/MetaInformation/MetaInformationBuilder.php b/packages/seo-bundle/src/MetaInformation/MetaInformationBuilder.php
@@ -58,7 +58,7 @@ public function build(MetaInformationProviderInterface $provider, string $route,
     private function getMetasForRoute(MetaInformationProviderInterface $provider, string $route): MetaInformation
     {
         return $this->repository->findOneBy(['route' => $provider->getRouteAlias($route)]) ??
-            $this->repository->findOneBy(['route' => self::DEFAULT_ROUTE]);
+            $this->repository->findOneBy(['route' => self::DEFAULT_ROUTE]) ?? new MetaInformation();
     }
 
     private function getTitle(?EntityMetaInformation $modelMetas, MetaInformation $routeMetas): string

diff --git a/packages/seo-bundle/src/MetaInformation/MetaInformationService.php b/packages/seo-bundle/src/MetaInformation/MetaInformationService.php
@@ -72,7 +72,7 @@ protected function getCurrentRoute(): string
     {
         $request = $this->requestStack->getCurrentRequest();
 
-        return $request->get('_route', '');
+        return null !== $request ? $request->get('_route', '') : '';
     }
 
     protected function selectProvider(string $route): MetaInformationProviderInterface

diff --git a/packages/seo-bundle/src/ViewModel/MetaInformationViewModel.php b/packages/seo-bundle/src/ViewModel/MetaInformationViewModel.php
@@ -17,13 +17,13 @@
 
 final class MetaInformationViewModel
 {
-    /** @var string */
+    /** @var string|null */
     private $title;
 
-    /** @var string */
+    /** @var string|null */
     private $description;
 
-    /** @var MediaInterface */
+    /** @var MediaInterface|null */
     private $image;
 
     public function setTitle(string $title): void

diff --git a/packages/sortable-behavior-bundle/src/Behaviors/Sortable.php b/packages/sortable-behavior-bundle/src/Behaviors/Sortable.php
@@ -19,7 +19,7 @@
 trait Sortable
 {
     /**
-     * @var int
+     * @var int|null
      *
      * @Gedmo\SortablePosition
      * @ORM\Column(type="integer")