Use php 8 native property types

foxycode · foxycode · commit 6fff37ac45ce · 2022-10-09T21:23:28.000+02:00
diff --git a/src/AbstractMenuItemsContainer.php b/src/AbstractMenuItemsContainer.php
@@ -9,23 +9,18 @@
 abstract class AbstractMenuItemsContainer implements IMenuItemsContainer
 {
 
-	/** @var IMenu */
-	protected $menu;
+	protected IMenu $menu;
 
-	/** @var ILinkGenerator */
-	protected $linkGenerator;
+	protected ILinkGenerator $linkGenerator;
 
-	/** @var Translator */
-	protected $translator;
+	protected Translator $translator;
 
-	/** @var IAuthorizator */
-	protected $authorizator;
+	protected IAuthorizator $authorizator;
 
-	/** @var IMenuItemFactory */
-	protected $menuItemFactory;
+	protected IMenuItemFactory $menuItemFactory;
 
 	/** @var IMenuItem[] */
-	private $items = [];
+	private array $items = [];
 
 	public function __construct(
 		IMenu $menu,
diff --git a/src/Config/MenuItemAction.php b/src/Config/MenuItemAction.php
@@ -5,11 +5,10 @@
 final class MenuItemAction
 {
 
-	/** @var string */
-	public $target;
+	public string $target;
 
 	/** @var array<string, string> */
-	public $parameters = [];
+	public array $parameters = [];
 
 	/**
 	 * @param array<string, mixed> $array
diff --git a/src/Config/MenuVisibility.php b/src/Config/MenuVisibility.php
@@ -5,13 +5,10 @@
 final class MenuVisibility
 {
 
-	/** @var bool */
-	public $menu = true;
+	public bool $menu = true;
 
-	/** @var bool */
-	public $breadcrumbs = true;
+	public bool $breadcrumbs = true;
 
-	/** @var bool */
-	public $sitemap = true;
+	public bool $sitemap = true;
 
 }
diff --git a/src/Config/TemplatePaths.php b/src/Config/TemplatePaths.php
@@ -7,19 +7,10 @@
 final class TemplatePaths
 {
 
-	/**
-	 * @var string
-	 */
-	public $menu = __DIR__ . '/../UI/templates/menu.latte';
+	public string $menu = __DIR__ . '/../UI/templates/menu.latte';
 
-	/**
-	 * @var string
-	 */
-	public $breadcrumbs = __DIR__ . '/../UI/templates/breadcrumbs.latte';
+	public string $breadcrumbs = __DIR__ . '/../UI/templates/breadcrumbs.latte';
 
-	/**
-	 * @var string
-	 */
-	public $sitemap = __DIR__ . '/../UI/templates/sitemap.latte';
+	public string $sitemap = __DIR__ . '/../UI/templates/sitemap.latte';
 
 }
diff --git a/src/LinkGenerator/NetteLinkGenerator.php b/src/LinkGenerator/NetteLinkGenerator.php
@@ -9,11 +9,9 @@
 final class NetteLinkGenerator implements ILinkGenerator
 {
 
-	/** @var IRequest */
-	private $httpRequest;
+	private IRequest $httpRequest;
 
-	/** @var LinkGenerator */
-	private $linkGenerator;
+	private LinkGenerator $linkGenerator;
 
 	public function __construct(IRequest $httpRequest, LinkGenerator $linkGenerator)
 	{
diff --git a/src/Loaders/DefaultMenuLoader.php b/src/Loaders/DefaultMenuLoader.php
@@ -13,7 +13,7 @@ final class DefaultMenuLoader implements IMenuLoader
 {
 
 	/** @var array<string, stdClass> */
-	private $items;
+	private array $items;
 
 	/**
 	 * @param array<string, stdClass> $items
diff --git a/src/Menu.php b/src/Menu.php
@@ -12,17 +12,13 @@
 final class Menu extends AbstractMenuItemsContainer implements IMenu
 {
 
-	/** @var IMenuLoader */
-	private $loader;
+	private IMenuLoader $loader;
 
-	/** @var string */
-	private $name;
+	private string $name;
 
-	/** @var TemplatePaths */
-	private $templateConfig;
+	private TemplatePaths $templateConfig;
 
-	/** @var Presenter */
-	private $activePresenter;
+	private Presenter $activePresenter;
 
 	public function __construct(
 		ILinkGenerator $linkGenerator,
diff --git a/src/MenuContainer.php b/src/MenuContainer.php
@@ -6,7 +6,7 @@ final class MenuContainer
 {
 
 	/** @var IMenu[] */
-	private $menus = [];
+	private array $menus = [];
 
 	public function getMenu(string $name): IMenu
 	{
diff --git a/src/MenuItem.php b/src/MenuItem.php
@@ -17,20 +17,16 @@ final class MenuItem extends AbstractMenuItemsContainer implements IMenuItem
 	use MenuItemData;
 	use MenuItemVisibility;
 
-	/** @var string */
-	private $title;
+	private string $title;
 
-	/** @var MenuItemAction|null */
-	private $action;
+	private ?MenuItemAction $action = null;
 
-	/** @var string|null */
-	private $link;
+	private ?string $link = null;
 
-	/** @var bool */
-	private $active;
+	private ?bool $active = null;
 
 	/** @var string[] */
-	private $include = [];
+	private array $include = [];
 
 	public function __construct(
 		IMenu $menu,
diff --git a/src/Traits/MenuItemData.php b/src/Traits/MenuItemData.php
@@ -6,7 +6,7 @@ trait MenuItemData
 {
 
 	/** @var array<string, string> */
-	private $data = [];
+	private array $data = [];
 
 	/**
 	 * @return array<string, string>
diff --git a/src/Traits/MenuItemVisibility.php b/src/Traits/MenuItemVisibility.php
@@ -7,8 +7,7 @@
 trait MenuItemVisibility
 {
 
-	/** @var MenuVisibility */
-	private $visibility;
+	private MenuVisibility $visibility;
 
 	public function isVisibleOnMenu(): bool
 	{
diff --git a/src/UI/MenuComponent.php b/src/UI/MenuComponent.php
@@ -9,8 +9,7 @@
 final class MenuComponent extends Control
 {
 
-	/** @var IMenu */
-	private $menu;
+	private IMenu $menu;
 
 	public function __construct(IMenu $menu)
 	{
diff --git a/src/UI/MenuComponentFactory.php b/src/UI/MenuComponentFactory.php
@@ -7,8 +7,7 @@
 final class MenuComponentFactory
 {
 
-	/** @var MenuContainer */
-	private $menuContainer;
+	private MenuContainer $menuContainer;
 
 	public function __construct(MenuContainer $menuContainer)
 	{
diff --git a/tests/fixtures/Presenters/CategoryPresenter.php b/tests/fixtures/Presenters/CategoryPresenter.php
@@ -9,8 +9,7 @@
 final class CategoryPresenter extends Presenter
 {
 
-	/** @var MenuComponentFactory */
-	private $menuFactory;
+	private MenuComponentFactory $menuFactory;
 
 	public function injectMenuComponentFactory(MenuComponentFactory $menuFactory): void
 	{
diff --git a/tests/fixtures/Presenters/HomepagePresenter.php b/tests/fixtures/Presenters/HomepagePresenter.php
@@ -9,8 +9,7 @@
 final class HomepagePresenter extends Presenter
 {
 
-	/** @var MenuComponentFactory */
-	private $menuFactory;
+	private MenuComponentFactory $menuFactory;
 
 	public function injectMenuComponentFactory(MenuComponentFactory $menuFactory): void
 	{

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,10 @@`
`5`	`5`	`final class MenuVisibility`
`6`	`6`	`{`
`7`	`7`
`8`		`- /** @var bool */`
`9`		`- public $menu = true;`
	`8`	`+ public bool $menu = true;`
`10`	`9`
`11`		`- /** @var bool */`
`12`		`- public $breadcrumbs = true;`
	`10`	`+ public bool $breadcrumbs = true;`
`13`	`11`
`14`		`- /** @var bool */`
`15`		`- public $sitemap = true;`
	`12`	`+ public bool $sitemap = true;`
`16`	`13`
`17`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,9 @@`
`9`	`9`	`final class NetteLinkGenerator implements ILinkGenerator`
`10`	`10`	`{`
`11`	`11`
`12`		`- /** @var IRequest */`
`13`		`- private $httpRequest;`
	`12`	`+ private IRequest $httpRequest;`
`14`	`13`
`15`		`- /** @var LinkGenerator */`
`16`		`- private $linkGenerator;`
	`14`	`+ private LinkGenerator $linkGenerator;`
`17`	`15`
`18`	`16`	`public function __construct(IRequest $httpRequest, LinkGenerator $linkGenerator)`
`19`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class DefaultMenuLoader implements IMenuLoader`
`13`	`13`	`{`
`14`	`14`
`15`	`15`	`/** @var array<string, stdClass> */`
`16`		`- private $items;`
	`16`	`+ private array $items;`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* @param array<string, stdClass> $items`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ final class MenuContainer`
`6`	`6`	`{`
`7`	`7`
`8`	`8`	`/** @var IMenu[] */`
`9`		`- private $menus = [];`
	`9`	`+ private array $menus = [];`
`10`	`10`
`11`	`11`	`public function getMenu(string $name): IMenu`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ trait MenuItemData`
`6`	`6`	`{`
`7`	`7`
`8`	`8`	`/** @var array<string, string> */`
`9`		`- private $data = [];`
	`9`	`+ private array $data = [];`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* @return array<string, string>`