Add type hints

sonata-project · Sep 16, 2021 · 727861a · 727861a
1 parent 376a399
commit 727861a
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 238 deletions.
diff --git a/src/Block/Breadcrumb/BaseBreadcrumbMenuBlockService.php b/src/Block/Breadcrumb/BaseBreadcrumbMenuBlockService.php
@@ -28,10 +28,7 @@
  */
 abstract class BaseBreadcrumbMenuBlockService extends AbstractBlockService implements BreadcrumbInterface
 {
-    /**
-     * @var FactoryInterface
-     */
-    private $factory;
+    private FactoryInterface $factory;
 
     public function __construct(Environment $twig, FactoryInterface $factory)
     {

diff --git a/src/Command/SitemapGeneratorCommand.php b/src/Command/SitemapGeneratorCommand.php
@@ -33,25 +33,16 @@
  */
 final class SitemapGeneratorCommand extends Command
 {
-    /**
-     * @var RouterInterface
-     */
-    private $router;
+    private RouterInterface $router;
 
-    /**
-     * @var SourceManager
-     */
-    private $sitemapManager;
+    private SourceManager $sitemapManager;
 
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
+    private Filesystem $filesystem;
 
     public function __construct(
-        ?RouterInterface $router,
-        ?SourceManager $sitemapManager,
-        ?Filesystem $filesystem
+        RouterInterface $router,
+        SourceManager $sitemapManager,
+        Filesystem $filesystem
     ) {
         $this->router = $router;
         $this->sitemapManager = $sitemapManager;

diff --git a/src/Event/BreadcrumbListener.php b/src/Event/BreadcrumbListener.php
@@ -24,10 +24,7 @@
  */
 final class BreadcrumbListener
 {
-    /**
-     * @var array
-     */
-    private $blockServices = [];
+    private array $blockServices = [];
 
     /**
      * Add a renderer to the status services list.

diff --git a/src/Seo/SeoAwareTrait.php b/src/Seo/SeoAwareTrait.php
@@ -16,11 +16,9 @@
 trait SeoAwareTrait
 {
     /**
-     * @var SeoPageInterface|null
-     *
      * @required
      */
-    protected $seoPage;
+    protected ?SeoPageInterface $seoPage;
 
     public function setSeoPage(?SeoPageInterface $seoPage = null): void
     {

diff --git a/src/Seo/SeoPage.php b/src/Seo/SeoPage.php
@@ -18,50 +18,38 @@
  */
 final class SeoPage implements SeoPageInterface
 {
-    /**
-     * @var string
-     */
-    private $title;
+    private string $title;
 
     /**
      * @var array<string, array<string, mixed>>
      */
-    private $metas;
+    private array $metas;
 
     /**
      * @var array<string, string>
      */
-    private $htmlAttributes;
+    private array $htmlAttributes;
 
-    /**
-     * @var string
-     */
-    private $linkCanonical;
+    private string $linkCanonical;
 
-    /**
-     * @var string
-     */
-    private $separator;
+    private string $separator;
 
     /**
      * @var array<string, string>
      */
-    private $headAttributes;
+    private array $headAttributes;
 
     /**
      * @var array<string, string>
      */
-    private $langAlternates;
+    private array $langAlternates;
 
     /**
      * @var array<string, string>
      */
-    private $oembedLinks;
+    private array $oembedLinks;
 
-    /**
-     * @param string $title
-     */
-    public function __construct($title = '')
+    public function __construct(string $title = '')
     {
         $this->title = $title;
         $this->metas = [
@@ -80,31 +68,31 @@ public function __construct($title = '')
         $this->oembedLinks = [];
     }
 
-    public function setTitle($title)
+    public function setTitle(string $title): self
     {
         $this->title = $title;
 
         return $this;
     }
 
-    public function addTitle($title)
+    public function addTitle(string $title): self
     {
         $this->title = $title.$this->separator.$this->title;
 
         return $this;
     }
 
-    public function getTitle()
+    public function getTitle(): string
     {
         return $this->title;
     }
 
-    public function getMetas()
+    public function getMetas(): array
     {
         return $this->metas;
     }
 
-    public function addMeta($type, $name, $value, array $extras = [])
+    public function addMeta(string $type, string $name, string $value, array $extras = []): self
     {
         if (!\is_string($value)) {
             @trigger_error(sprintf(
@@ -123,19 +111,19 @@ public function addMeta($type, $name, $value, array $extras = [])
         return $this;
     }
 
-    public function hasMeta($type, $name)
+    public function hasMeta(string $type, string $name): bool
     {
         return isset($this->metas[$type][$name]);
     }
 
-    public function removeMeta($type, $name)
+    public function removeMeta(string $type, string $name): self
     {
         unset($this->metas[$type][$name]);
 
         return $this;
     }
 
-    public function setMetas(array $metas)
+    public function setMetas(array $metas): self
     {
         $this->metas = [];
 
@@ -154,76 +142,76 @@ public function setMetas(array $metas)
         return $this;
     }
 
-    public function setHtmlAttributes(array $attributes)
+    public function setHtmlAttributes(array $attributes): self
     {
         $this->htmlAttributes = $attributes;
 
         return $this;
     }
 
-    public function addHtmlAttributes($name, $value)
+    public function addHtmlAttributes(string $name, string $value): self
     {
         $this->htmlAttributes[$name] = $value;
 
         return $this;
     }
 
-    public function removeHtmlAttributes($name)
+    public function removeHtmlAttributes(string $name): self
     {
         unset($this->htmlAttributes[$name]);
 
         return $this;
     }
 
-    public function getHtmlAttributes()
+    public function getHtmlAttributes(): array
     {
         return $this->htmlAttributes;
     }
 
-    public function hasHtmlAttribute($name)
+    public function hasHtmlAttribute(string $name): bool
     {
         return isset($this->htmlAttributes[$name]);
     }
 
-    public function setHeadAttributes(array $attributes)
+    public function setHeadAttributes(array $attributes): self
     {
         $this->headAttributes = $attributes;
 
         return $this;
     }
 
-    public function addHeadAttribute($name, $value)
+    public function addHeadAttribute(string $name, string $value): self
     {
         $this->headAttributes[$name] = $value;
 
         return $this;
     }
 
-    public function removeHeadAttribute($name)
+    public function removeHeadAttribute(string $name): self
     {
         unset($this->headAttributes[$name]);
 
         return $this;
     }
 
-    public function getHeadAttributes()
+    public function getHeadAttributes(): array
     {
         return $this->headAttributes;
     }
 
-    public function hasHeadAttribute($name)
+    public function hasHeadAttribute(string $name): bool
     {
         return isset($this->headAttributes[$name]);
     }
 
-    public function setLinkCanonical($link)
+    public function setLinkCanonical(string $link): self
     {
         $this->linkCanonical = $link;
 
         return $this;
     }
 
-    public function getLinkCanonical()
+    public function getLinkCanonical(): string
     {
         return $this->linkCanonical;
     }
@@ -233,58 +221,58 @@ public function removeLinkCanonical(): void
         $this->linkCanonical = '';
     }
 
-    public function setSeparator($separator)
+    public function setSeparator(string $separator): self
     {
         $this->separator = $separator;
 
         return $this;
     }
 
-    public function setLangAlternates(array $langAlternates)
+    public function setLangAlternates(array $langAlternates): self
     {
         $this->langAlternates = $langAlternates;
 
         return $this;
     }
 
-    public function addLangAlternate($href, $hrefLang)
+    public function addLangAlternate(string $href, string $hrefLang): self
     {
         $this->langAlternates[$href] = $hrefLang;
 
         return $this;
     }
 
-    public function removeLangAlternate($href)
+    public function removeLangAlternate(string $href): self
     {
         unset($this->langAlternates[$href]);
 
         return $this;
     }
 
-    public function hasLangAlternate($href)
+    public function hasLangAlternate(string $href): bool
     {
         return isset($this->langAlternates[$href]);
     }
 
-    public function getLangAlternates()
+    public function getLangAlternates(): array
     {
         return $this->langAlternates;
     }
 
-    public function addOEmbedLink($title, $link)
+    public function addOEmbedLink(string $title, string $link): self
     {
         $this->oembedLinks[$title] = $link;
 
         return $this;
     }
 
-    public function getOEmbedLinks()
+    public function getOEmbedLinks(): array
     {
         return $this->oembedLinks;
     }
 
     /**
-     * @param string|array $meta
+     * @param array|string $meta
      */
     private function normalize($meta): array
     {