doplnení striktních typů

Author: krejzyOne

Makefile

@@ -3,7 +3,7 @@ composer:
 	composer update --no-interaction --prefer-dist
 
 phpstan:
-	vendor/bin/phpstan analyse -l 5 -c phpstan.neon src/
+	vendor/bin/phpstan analyse -l 9 -c phpstan.neon src/
 
 run-tests:
 	vendor/bin/tester tests -d extension=tokenizer.so

phpstan.neon

@@ -1,5 +1,7 @@
 parameters:
 	ignoreErrors:
+		- '#Cannot call method getParameter\(\) on Nette\\Application\\UI\\Presenter\|null\.#'
+		- '#Cannot cast mixed to string#'
 	fileExtensions:
 		- phpt
 

src/UI/AsyncControlLink.php

@@ -5,42 +5,53 @@
 final class AsyncControlLink
 {
 
-	private static $defaultMessage = 'Load content';
-	private static $defaultAttributes = [];
+	private static string $defaultMessage = 'Load content';
+
 	/**
-	 * @var string
+	 * @var array<string, string>
 	 */
-	private $message;
+	private static array $defaultAttributes = [];
+
+	private string $message;
+
 	/**
-	 * @var array
+	 * @var array<string, string>
 	 */
-	private $attributes;
-
+	private array $attributes;
 
+	/**
+	 * @param string|null $message
+	 * @param array<string, string> $attributes
+	 */
 	public function __construct(
-		string $message = NULL,
-		array $attributes = NULL
-	) {
-		$this->message = $message === NULL ? self::$defaultMessage : $message;
-		$this->attributes = $attributes === NULL ? self::$defaultAttributes : $attributes;
+		?string $message = null,
+		?array $attributes = null
+	)
+	{
+		$this->message = $message === null ? self::$defaultMessage : $message;
+		$this->attributes = $attributes === null ? self::$defaultAttributes : $attributes;
 	}
 
-
-	public static function setDefault(string $message, array $attributes = [])
+	/**
+	 * @param array<string, string>  $attributes
+	 */
+	public static function setDefault(string $message, array $attributes = []): void
 	{
 		self::$defaultMessage = $message;
 		self::$defaultAttributes = $attributes;
 	}
 
-
 	public function getMessage(): string
 	{
 		return $this->message;
 	}
 
-
+	/**
+	 * @return array<string, string>
+	 */
 	public function getAttributes(): array
 	{
 		return $this->attributes;
 	}
+
 }

src/UI/AsyncControlTrait.php

@@ -19,7 +19,7 @@ trait AsyncControlTrait
 	protected $asyncRenderer;
 
 
-	public function handleAsyncLoad()
+	public function handleAsyncLoad(): void
 	{
 		if ( ! $this instanceof Control || ! ($presenter = $this->getPresenter(FALSE)) || ! $presenter->isAjax()) {
 			return;
@@ -37,8 +37,11 @@ public function handleAsyncLoad()
 		$presenter->sendPayload();
 	}
 
-
-	public function renderAsync(string $linkMessage = NULL, array $linkAttributes = NULL)
+	/**
+	 * @param array<string, string> $linkAttributes
+	 * @return void
+	 */
+	public function renderAsync(string $linkMessage = NULL, array $linkAttributes = NULL): void
 	{
 		if (
 			$this instanceof Control
@@ -59,7 +62,7 @@ public function renderAsync(string $linkMessage = NULL, array $linkAttributes =
 	}
 
 
-	public function setAsyncRenderer(callable $renderer)
+	public function setAsyncRenderer(callable $renderer): void
 	{
 		$this->asyncRenderer = $renderer;
 	}

tests/UI/AsyncControlLinkTest.phpt

@@ -12,7 +12,7 @@ require_once __DIR__ . '/../../vendor/autoload.php';
 final class AsyncControlLinkTest extends TestCase
 {
 
-	public function testLink()
+	public function testLink(): void
 	{
 		$link = new AsyncControlLink;
 		Assert::equal('Load content', $link->getMessage());

tests/UI/AsyncControlTest.phpt

@@ -12,15 +12,17 @@ use Tester\TestCase;
 
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-
+/**
+ * @testCase
+ */
 final class AsyncControlTest extends TestCase
 {
 
 	const VALID_SIGNAL = 'control-form-submit';
 	const FRAGMENT_PARAMETER = '_escaped_fragment_';
 
 
-	public function testHandleAjax()
+	public function testHandleAjax(): void
 	{
 		$presenter = Mockery::mock(Presenter::class);
 		$presenter->shouldReceive('isAjax')->once()->andReturn(TRUE);
@@ -43,7 +45,7 @@ final class AsyncControlTest extends TestCase
 	}
 
 
-	public function testHandleNoAjax()
+	public function testHandleNoAjax(): void
 	{
 		$presenter = Mockery::mock(Presenter::class);
 		$presenter->shouldReceive('isAjax')->once()->andReturn(FALSE);
@@ -60,7 +62,7 @@ final class AsyncControlTest extends TestCase
 	}
 
 
-	public function testRenderAsyncLoadLink()
+	public function testRenderAsyncLoadLink(): void
 	{
 		/**
 		 * @var AsyncControl|Mockery\Mock $control
@@ -85,7 +87,7 @@ final class AsyncControlTest extends TestCase
 	}
 
 
-	public function testRenderWithSignal()
+	public function testRenderWithSignal(): void
 	{
 		$presenter = Mockery::mock(Presenter::class);
 		$presenter->shouldReceive('getParameter')->once()->with(self::FRAGMENT_PARAMETER)->andReturn(NULL);
@@ -101,7 +103,7 @@ final class AsyncControlTest extends TestCase
 	}
 
 
-	public function testRenderWithFragment()
+	public function testRenderWithFragment(): void
 	{
 		$presenter = Mockery::mock(Presenter::class);
 		$presenter->shouldReceive('getParameter')->once()->with(self::FRAGMENT_PARAMETER)->andReturn('');
@@ -115,7 +117,7 @@ final class AsyncControlTest extends TestCase
 	}
 
 
-	public function testRenderAsyncRenderer()
+	public function testRenderAsyncRenderer(): void
 	{
 		$presenter = Mockery::mock(Presenter::class);
 		$presenter->shouldReceive('getParameter')->once()->with(self::FRAGMENT_PARAMETER)->andReturn(NULL);
@@ -135,7 +137,7 @@ final class AsyncControlTest extends TestCase
 	}
 
 
-	protected function tearDown()
+	protected function tearDown(): void
 	{
 		parent::tearDown();
 		Mockery::close();