project check. ALL edition(2)

Author: webDevWay

.gitignore

@@ -23,6 +23,7 @@ Thumbs.db
 composer
 composer.bat
 composer.phar
+composer.lock
 phpcbf.phar
 phpcs.phar
 video.cast

src/Engine.php

@@ -15,7 +15,7 @@ function getUserName(): string
     return $name;
 }
     //---Функция логики игры и проверки ответов
-function startGame(array $gameParams)
+function startGame(array $gameParams): void
 {
     $name = getUserName();
     ["rules" => $rules,
@@ -25,7 +25,7 @@ function startGame(array $gameParams)
     for ($i = 0; $i < count($questions); $i++) {
         $answer = prompt("Question: {$questions[$i]}");
         line("Your answer: {$answer}");
-        if ($answer != $expectedAnswer[$i]) {
+        if ($answer !== $expectedAnswer[$i]) {
             wrongAnswer($name, $answer, $expectedAnswer[$i]);
             return;
         } else {
@@ -35,14 +35,14 @@ function startGame(array $gameParams)
     trueAnswers($name);
 }
     //---Функция для неверного ответа
-function wrongAnswer(string $name, mixed $answer, mixed $expectedAnswer)
+function wrongAnswer(string $name, mixed $answer, mixed $expectedAnswer): void
 {
     line("{$answer} is wrong answer ;(. Correct answer was '{$expectedAnswer}'.");
     line("Let's try again, %s!", $name);
     return;
 }
     //---Функция для верного ответа (конец игры)
-function trueAnswers(string $name)
+function trueAnswers(string $name): void
 {
     line("Congratulations, %s!", $name);
     return;

src/Games/Calc.php

@@ -5,7 +5,7 @@
 use function BrainGames\Engine\startGame;
 
 //-- Игра - "Калькулятор"
-function initGameData($count = 3): void
+function initGameData(int $count = 3): void
 {
     $gameParams = [];
     $gameParams["rules"] = 'What is the result of the expression?';
@@ -21,7 +21,7 @@ function initGameData($count = 3): void
     startGame($gameParams);
 }
 
-function calculate($x, $y, $operator)
+function calculate(int $x, int $y, string $operator): int
 {
         $operations = [
             '+' => fn($x, $y) => $x + $y,

src/Games/Even.php

@@ -5,11 +5,10 @@
 use function BrainGames\Engine\startGame;
 
 //-- Игра - "Проверка на чётность"
-function initGameData(): void
+function initGameData(int $count = 3): void
 {
     $gameParams = [];
     $gameParams["rules"] = 'Answer "yes" if the number is even, otherwise answer "no".';
-    $count = 3;
     for ($counterAnswers = 0; $counterAnswers < $count; $counterAnswers++) {
         $num = random_int(1, 100);
         $gameParams["expectedAnswer"][] = isEven($num) ? "yes" : "no";

src/Games/Gcd.php

@@ -5,11 +5,10 @@
 use function BrainGames\Engine\startGame;
 
 //-- Игра - Общий делитель -- "НОД"
-function initGameData(): void
+function initGameData(int $count = 3): void
 {
     $gameParams = [];
     $gameParams["rules"] = 'Find the greatest common divisor of given numbers.';
-    $count = 3;
     for ($counterAnswers = 0; $counterAnswers < $count; $counterAnswers++) {
         $num = random_int(1, 100);
         $num2 = random_int(1, 100);
@@ -25,7 +24,7 @@ function getGcd(int $num1, int $num2): int
 {
     $a = $num1;
     $b = $num2;
-    while ($b != 0) {
+    while ($b !== 0) {
         $temp = $b;
         $b = $a % $b;
         $a = $temp;

src/Games/Prime.php

@@ -5,11 +5,10 @@
 use function BrainGames\Engine\startGame;
 
 //-- Игра - "Простое ли число?"
-function initGameData(): void
+function initGameData(int $count = 3): void
 {
     $gameParams = [];
     $gameParams["rules"] = 'Answer "yes" if given number is prime. Otherwise answer "no".';
-    $count = 3;
     for ($counterAnswers = 0; $counterAnswers < $count; $counterAnswers++) {
         $num = random_int(1, 100);
         $gameParams["expectedAnswer"][] = isPrime($num) ? 'yes' : 'no';
@@ -26,16 +25,16 @@ function isPrime(int $number): bool
         return false;
     }
 
-    if ($number == 2) {
+    if ($number === 2) {
         return true;
     }
 
-    if ($number % 2 == 0) {
+    if ($number % 2 === 0) {
         return false;
     }
 
     for ($i = 3; $i <= sqrt($number); $i += 2) {
-        if ($number % $i == 0) {
+        if ($number % $i === 0) {
             return false;
         }
     }

src/Games/Progression.php

@@ -5,11 +5,10 @@
 use function BrainGames\Engine\startGame;
 
  //-- Игра - "Арифметическая прогрессия"
-function initGameData(): void
+function initGameData(int $count = 3): void
 {
     $gameParams = [];
     $gameParams["rules"] = 'What number is missing in the progression?';
-    $count = 3;
     for ($counterAnswers = 0; $counterAnswers < $count; $counterAnswers++) {
         $progression = generateProgression();
         $hiddenElement = hideElement($progression);