Code: add types

src/DI/FormBinder.php

@@ -13,9 +13,7 @@ public static function bind(Factory $factory): void
 	{
 		Container::extensionMethod(
 			'addWordcha',
-			function (Container $container, string $name = 'captcha', string $label = 'Captcha') use ($factory): WordchaContainer {
-				return $container[$name] = new WordchaContainer($factory);
-			}
+			fn (Container $container, string $name = 'captcha', string $label = 'Captcha'): WordchaContainer => $container[$name] = new WordchaContainer($factory) // @phpcs:ignore
 		);
 	}
 

src/DI/WordchaExtension.php

@@ -10,7 +10,7 @@
 use Contributte\Wordcha\WordchaUniqueFactory;
 use Nette\DI\CompilerExtension;
 use Nette\PhpGenerator\ClassType;
-use Nette\PhpGenerator\PhpLiteral;
+use Nette\PhpGenerator\Literal;
 use Nette\Schema\Expect;
 use Nette\Schema\Schema;
 use Nette\Utils\AssertionException;
@@ -30,8 +30,7 @@ final class WordchaExtension extends CompilerExtension
 		self::DATASOURCE_QUESTIONS,
 	];
 
-	/** @var bool */
-	private $debugMode;
+	private bool $debugMode;
 
 	public function __construct(bool $debugMode = false)
 	{
@@ -85,7 +84,7 @@ public function afterCompile(ClassType $class): void
 			$method->addBody(
 				'?::bind($this->getService(?));',
 				[
-					new PhpLiteral(FormBinder::class),
+					new Literal(FormBinder::class),
 					$this->prefix('factory'),
 				]
 			);

src/DataSource/Pair.php

@@ -5,11 +5,9 @@
 class Pair
 {
 
-	/** @var string */
-	private $question;
+	private string $question;
 
-	/** @var string */
-	private $answer;
+	private string $answer;
 
 	public function __construct(string $question, string $answer)
 	{

src/DataSource/QuestionDataSource.php

@@ -8,11 +8,11 @@
 class QuestionDataSource implements DataSource
 {
 
-	/** @var string[] Pairs of question:answer */
-	private $questions;
+	/** @var array<string, string> Pairs of question:answer */
+	private array $questions;
 
 	/**
-	 * @param string[] $questions
+	 * @param array<string, string> $questions
 	 */
 	public function __construct(array $questions)
 	{
@@ -30,6 +30,7 @@ public function get(): Pair
 
 		$question = array_rand($this->questions);
 		$answer = $this->questions[$question];
+
 		return new Pair($question, $answer);
 	}
 

src/Form/WordchaContainer.php

@@ -8,16 +8,15 @@
 use Nette\Forms\Container;
 use Nette\Forms\Controls\HiddenField;
 use Nette\Forms\Controls\TextInput;
+use Nette\Forms\Form;
 use Nette\Utils\Strings;
 
 class WordchaContainer extends Container
 {
 
-	/** @var Validator */
-	private $validator;
+	private Validator $validator;
 
-	/** @var Generator */
-	private $generator;
+	private Generator $generator;
 
 	public function __construct(Factory $factory)
 	{
@@ -37,19 +36,31 @@ public function __construct(Factory $factory)
 
 	public function getQuestion(): TextInput
 	{
-		return $this['question'];
+		$control = $this->getComponent('question');
+		assert($control instanceof TextInput);
+
+		return $control;
 	}
 
 	public function getHash(): HiddenField
 	{
-		return $this['hash'];
+		$control = $this->getComponent('hash');
+		assert($control instanceof HiddenField);
+
+		return $control;
 	}
 
 	public function verify(): bool
 	{
-		$form = $this->getForm(true);
-		$hash = $form->getHttpData($form::DATA_LINE, $this->getHash()->getHtmlName());
-		$answer = $form->getHttpData($form::DATA_LINE, $this->getQuestion()->getHtmlName());
+		/** @var Form $form */
+		$form = $this->getForm();
+
+		/** @var string $hash */
+		$hash = $form->getHttpData(Form::DataLine, $this->getHash()->getHtmlName());
+
+		/** @var string $answer */
+		$answer = $form->getHttpData(Form::DataLine, $this->getQuestion()->getHtmlName());
+
 		$answer = Strings::lower($answer);
 
 		return $this->validator->validate($answer, $hash);

src/Generator/Security.php

@@ -5,11 +5,9 @@
 class Security
 {
 
-	/** @var string */
-	private $question;
+	private string $question;
 
-	/** @var string */
-	private $hash;
+	private string $hash;
 
 	public function __construct(string $question, string $hash)
 	{

src/Generator/WordchaGenerator.php

@@ -7,11 +7,9 @@
 class WordchaGenerator implements Generator
 {
 
-	/** @var DataSource */
-	private $dataSource;
+	private DataSource $dataSource;
 
-	/** @var string|null */
-	private $uniqueKey;
+	private ?string $uniqueKey = null;
 
 	public function __construct(DataSource $dataSource)
 	{

src/Validator/WordchaValidator.php

@@ -7,8 +7,7 @@
 class WordchaValidator implements Validator
 {
 
-	/** @var Generator */
-	private $generator;
+	private Generator $generator;
 
 	public function __construct(Generator $generator)
 	{

src/WordchaFactory.php

@@ -11,8 +11,7 @@
 class WordchaFactory implements Factory
 {
 
-	/** @var DataSource */
-	private $dataSource;
+	private DataSource $dataSource;
 
 	public function __construct(DataSource $dataSource)
 	{

src/WordchaUniqueFactory.php

@@ -9,8 +9,7 @@
 class WordchaUniqueFactory extends WordchaFactory
 {
 
-	/** @var string */
-	private $uniqueKey;
+	private string $uniqueKey;
 
 	public function __construct(DataSource $dataSource, string $uniqueKey)
 	{