Tests: add types

f3l1x · f3l1x · commit 33b0e9d1044b · 2024-02-05T16:43:31.000+01:00
diff --git a/src/DI/EventBridgesExtension.php b/src/DI/EventBridgesExtension.php
@@ -13,6 +13,16 @@
 class EventBridgesExtension extends CompilerExtension
 {
 
+	/** @var array<string, class-string<CompilerExtension>> */
+	private array $map = [
+		'application' => EventApplicationBridgeExtension::class,
+		'latte' => EventLatteBridgeExtension::class,
+		'security' => EventSecurityBridgeExtension::class,
+	];
+
+	/** @var array<string, CompilerExtension> */
+	private array $passes = [];
+
 	public function getConfigSchema(): Schema
 	{
 		return Expect::structure([
@@ -22,16 +32,6 @@ public function getConfigSchema(): Schema
 		])->castTo('array');
 	}
 
-	/** @var array<string, class-string<CompilerExtension>> */
-	private $map = [
-		'application' => EventApplicationBridgeExtension::class,
-		'latte' => EventLatteBridgeExtension::class,
-		'security' => EventSecurityBridgeExtension::class,
-	];
-
-	/** @var array<string, CompilerExtension> */
-	private $passes = [];
-
 	/**
 	 * Register services
 	 */
@@ -74,7 +74,7 @@ public function beforeCompile(): void
 	/**
 	 * Decorate initialize method
 	 */
-	public function afterCompile(ClassType $class)
+	public function afterCompile(ClassType $class): void
 	{
 		foreach ($this->passes as $pass) {
 			$pass->afterCompile($class);
diff --git a/src/DI/EventLatteBridgeExtension.php b/src/DI/EventLatteBridgeExtension.php
@@ -5,8 +5,8 @@
 use Contributte\Events\Extra\Event\Latte\LatteCompileEvent;
 use Contributte\Events\Extra\Event\Latte\TemplateCreateEvent;
 use LogicException;
-use Nette\Application\UI\TemplateFactory;
 use Nette\Bridges\ApplicationLatte\LatteFactory;
+use Nette\Bridges\ApplicationLatte\TemplateFactory;
 use Nette\DI\CompilerExtension;
 use Nette\DI\Definitions\FactoryDefinition;
 use Nette\DI\Definitions\ServiceDefinition;
@@ -44,9 +44,6 @@ public function beforeCompile(): void
 		$templateFactories = $builder->findByType(TemplateFactory::class);
 		foreach ($templateFactories as $templateFactory) {
 			assert($templateFactory instanceof ServiceDefinition);
-			if ($templateFactory->factory === null || $templateFactory->factory->entity !== TemplateFactory::class) {
-				continue;
-			}
 
 			$templateFactory->addSetup('?->onCreate[] = function() {?->dispatch(new ?(...func_get_args()));}', [
 				'@self',
diff --git a/src/Event/Application/ErrorEvent.php b/src/Event/Application/ErrorEvent.php
@@ -9,11 +9,9 @@
 class ErrorEvent extends Event
 {
 
-	/** @var Application */
-	private $application;
+	private Application $application;
 
-	/** @var Throwable */
-	private $throwable;
+	private Throwable $throwable;
 
 	public function __construct(Application $application, Throwable $throwable)
 	{
diff --git a/src/Event/Application/PresenterEvent.php b/src/Event/Application/PresenterEvent.php
@@ -9,11 +9,9 @@
 class PresenterEvent extends Event
 {
 
-	/** @var Application */
-	private $application;
+	private Application $application;
 
-	/** @var IPresenter */
-	private $presenter;
+	private IPresenter $presenter;
 
 	public function __construct(Application $application, IPresenter $presenter)
 	{
diff --git a/src/Event/Application/PresenterShutdownEvent.php b/src/Event/Application/PresenterShutdownEvent.php
@@ -9,11 +9,9 @@
 class PresenterShutdownEvent extends Event
 {
 
-	/** @var Presenter */
-	private $presenter;
+	private Presenter $presenter;
 
-	/** @var Response */
-	private $response;
+	private Response $response;
 
 	public function __construct(Presenter $presenter, Response $response)
 	{
diff --git a/src/Event/Application/PresenterStartupEvent.php b/src/Event/Application/PresenterStartupEvent.php
@@ -8,8 +8,7 @@
 class PresenterStartupEvent extends Event
 {
 
-	/** @var Presenter */
-	private $presenter;
+	private Presenter $presenter;
 
 	public function __construct(Presenter $presenter)
 	{
diff --git a/src/Event/Application/RequestEvent.php b/src/Event/Application/RequestEvent.php
@@ -9,11 +9,9 @@
 class RequestEvent extends Event
 {
 
-	/** @var Application */
-	private $application;
+	private Application $application;
 
-	/** @var Request */
-	private $request;
+	private Request $request;
 
 	public function __construct(Application $application, Request $request)
 	{
diff --git a/src/Event/Application/ResponseEvent.php b/src/Event/Application/ResponseEvent.php
@@ -9,11 +9,9 @@
 class ResponseEvent extends Event
 {
 
-	/** @var Application */
-	private $application;
+	private Application $application;
 
-	/** @var Response */
-	private $response;
+	private Response $response;
 
 	public function __construct(Application $application, Response $response)
 	{
diff --git a/src/Event/Application/ShutdownEvent.php b/src/Event/Application/ShutdownEvent.php
@@ -9,11 +9,9 @@
 class ShutdownEvent extends Event
 {
 
-	/** @var Application */
-	private $application;
+	private Application $application;
 
-	/** @var Throwable|null */
-	private $throwable;
+	private ?Throwable $throwable = null;
 
 	public function __construct(Application $application, ?Throwable $throwable = null)
 	{
diff --git a/src/Event/Application/StartupEvent.php b/src/Event/Application/StartupEvent.php
@@ -8,8 +8,7 @@
 class StartupEvent extends Event
 {
 
-	/** @var Application */
-	private $application;
+	private Application $application;
 
 	public function __construct(Application $application)
 	{
diff --git a/src/Event/Latte/LatteCompileEvent.php b/src/Event/Latte/LatteCompileEvent.php
@@ -8,8 +8,7 @@
 class LatteCompileEvent extends Event
 {
 
-	/** @var Engine */
-	private $engine;
+	private Engine $engine;
 
 	public function __construct(Engine $engine)
 	{
diff --git a/src/Event/Latte/TemplateCreateEvent.php b/src/Event/Latte/TemplateCreateEvent.php
@@ -8,8 +8,7 @@
 class TemplateCreateEvent extends Event
 {
 
-	/** @var Template */
-	private $template;
+	private Template $template;
 
 	public function __construct(Template $template)
 	{
diff --git a/src/Event/Security/LoggedInEvent.php b/src/Event/Security/LoggedInEvent.php
@@ -8,8 +8,7 @@
 class LoggedInEvent extends Event
 {
 
-	/** @var User */
-	private $user;
+	private User $user;
 
 	public function __construct(User $user)
 	{
diff --git a/src/Event/Security/LoggedOutEvent.php b/src/Event/Security/LoggedOutEvent.php
@@ -8,8 +8,7 @@
 class LoggedOutEvent extends Event
 {
 
-	/** @var User */
-	private $user;
+	private User $user;
 
 	public function __construct(User $user)
 	{
diff --git a/src/Event/UI/Changeset.php b/src/Event/UI/Changeset.php
@@ -3,7 +3,7 @@
 namespace Contributte\Events\Extra\Event\UI;
 
 use ArrayIterator;
-use Contributte\EventDispatcher\Exceptions\Logical\InvalidStateException;
+use Contributte\Events\Extra\Exceptions\LogicalException;
 use IteratorAggregate;
 
 /**
@@ -13,33 +13,22 @@ class Changeset implements IteratorAggregate
 {
 
 	/** @var mixed[] */
-	private $changeset = [];
+	private array $changeset = [];
 
-	/**
-	 * @param string|int $key
-	 * @param mixed      $value
-	 */
-	public function add($key, $value): void
+	public function add(string|int $key, mixed $value): void
 	{
 		$this->changeset[$key] = $value;
 	}
 
-	/**
-	 * @param string|int $key
-	 */
-	public function has($key): bool
+	public function has(string|int $key): bool
 	{
 		return array_key_exists($key, $this->changeset);
 	}
 
-	/**
-	 * @param string|int $key
-	 * @return mixed
-	 */
-	public function get($key)
+	public function get(string|int $key): mixed
 	{
 		if (!$this->has($key)) {
-			throw new InvalidStateException(sprintf('Key %s does not exist in this changeset', (string) $key));
+			throw new LogicalException(sprintf('Key %s does not exist in this changeset', (string) $key));
 		}
 
 		return $this->changeset[$key];
diff --git a/src/Event/UI/UI.php b/src/Event/UI/UI.php
@@ -9,13 +9,12 @@ class UI
 {
 
 	/** @var array<int, stdClass> */
-	private $messages = [];
+	private array $messages = [];
 
 	/** @var string[] */
-	private $snippets = [];
+	private array $snippets = [];
 
-	/** @var stdClass */
-	private $redirect;
+	private ?stdClass $redirect = null;
 
 	/**
 	 * @return array<int, stdClass>
@@ -74,10 +73,7 @@ public function redrawSnippet(string $snippet): void
 		$this->snippets[] = $snippet;
 	}
 
-	/**
-	 * @return mixed
-	 */
-	public function getRedirect()
+	public function getRedirect(): ?stdClass
 	{
 		return $this->redirect;
 	}
diff --git a/src/Event/UI/UIEvent.php b/src/Event/UI/UIEvent.php
@@ -7,11 +7,10 @@
 abstract class UIEvent extends Event
 {
 
-	/** @var UI */
-	private $ui;
+	private ?UI $ui = null;
 
 	/** @var Changeset<mixed> */
-	private $changeset;
+	private ?Changeset $changeset = null;
 
 	public function getUi(): UI
 	{
diff --git a/src/Exceptions/LogicalException.php b/src/Exceptions/LogicalException.php
@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace Contributte\Events\Extra\Exceptions;
+
+use LogicException;
+
+final class LogicalException extends LogicException
+{
+
+}

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,9 @@`
`9`	`9`	`class ErrorEvent extends Event`
`10`	`10`	`{`
`11`	`11`
`12`		`- /** @var Application */`
`13`		`- private $application;`
	`12`	`+ private Application $application;`
`14`	`13`
`15`		`- /** @var Throwable */`
`16`		`- private $throwable;`
	`14`	`+ private Throwable $throwable;`
`17`	`15`
`18`	`16`	`public function __construct(Application $application, Throwable $throwable)`
`19`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,9 @@`
`9`	`9`	`class PresenterEvent extends Event`
`10`	`10`	`{`
`11`	`11`
`12`		`- /** @var Application */`
`13`		`- private $application;`
	`12`	`+ private Application $application;`
`14`	`13`
`15`		`- /** @var IPresenter */`
`16`		`- private $presenter;`
	`14`	`+ private IPresenter $presenter;`
`17`	`15`
`18`	`16`	`public function __construct(Application $application, IPresenter $presenter)`
`19`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,9 @@`
`9`	`9`	`class PresenterShutdownEvent extends Event`
`10`	`10`	`{`
`11`	`11`
`12`		`- /** @var Presenter */`
`13`		`- private $presenter;`
	`12`	`+ private Presenter $presenter;`
`14`	`13`
`15`		`- /** @var Response */`
`16`		`- private $response;`
	`14`	`+ private Response $response;`
`17`	`15`
`18`	`16`	`public function __construct(Presenter $presenter, Response $response)`
`19`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@`
`8`	`8`	`class PresenterStartupEvent extends Event`
`9`	`9`	`{`
`10`	`10`
`11`		`- /** @var Presenter */`
`12`		`- private $presenter;`
	`11`	`+ private Presenter $presenter;`
`13`	`12`
`14`	`13`	`public function __construct(Presenter $presenter)`
`15`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,9 @@`
`9`	`9`	`class RequestEvent extends Event`
`10`	`10`	`{`
`11`	`11`
`12`		`- /** @var Application */`
`13`		`- private $application;`
	`12`	`+ private Application $application;`
`14`	`13`
`15`		`- /** @var Request */`
`16`		`- private $request;`
	`14`	`+ private Request $request;`
`17`	`15`
`18`	`16`	`public function __construct(Application $application, Request $request)`
`19`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,9 @@`
`9`	`9`	`class ResponseEvent extends Event`
`10`	`10`	`{`
`11`	`11`
`12`		`- /** @var Application */`
`13`		`- private $application;`
	`12`	`+ private Application $application;`
`14`	`13`
`15`		`- /** @var Response */`
`16`		`- private $response;`
	`14`	`+ private Response $response;`
`17`	`15`
`18`	`16`	`public function __construct(Application $application, Response $response)`
`19`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,9 @@`
`9`	`9`	`class ShutdownEvent extends Event`
`10`	`10`	`{`
`11`	`11`
`12`		`- /** @var Application */`
`13`		`- private $application;`
	`12`	`+ private Application $application;`
`14`	`13`
`15`		`- /** @var Throwable\|null */`
`16`		`- private $throwable;`
	`14`	`+ private ?Throwable $throwable = null;`
`17`	`15`
`18`	`16`	`public function __construct(Application $application, ?Throwable $throwable = null)`
`19`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@`
`8`	`8`	`class StartupEvent extends Event`
`9`	`9`	`{`
`10`	`10`
`11`		`- /** @var Application */`
`12`		`- private $application;`
	`11`	`+ private Application $application;`
`13`	`12`
`14`	`13`	`public function __construct(Application $application)`
`15`	`14`	`{`