corrections after auto-tests

Author: Eksi-tech

bin/brain-games

@@ -4,5 +4,3 @@
 
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../src/Cli.php';
-
-Src\Cli\runGreeting();

src/Cli.php

@@ -5,9 +5,6 @@
 use function cli\line;
 use function cli\prompt;
 
-function runGreeting()
-{
-    line('Welcome to the Brain Games!');
-    $name = prompt('May I have your name?');
-    line("Hello, %s!", $name);
-}
+line('Welcome to the Brain Games!');
+$name = prompt('May I have your name?');
+line("Hello, %s!", $name);

src/Engine.php

@@ -3,7 +3,7 @@
 use function cli\line;
 use function cli\prompt;
 
-function runGame($gameName)
+function runGame(string $gameName): void
 {
     line('Welcome to the Brain Games!');
     $name = prompt('May I have your name?');
@@ -21,7 +21,7 @@ function runGame($gameName)
         $userAnswer = prompt('Your answer');
         $correctAnswer = getCorrectAnswer($question);
 
-        if ($userAnswer == $correctAnswer) {
+        if ($userAnswer === (string)$correctAnswer) {
             line('Correct!');
             $winCount++;
         } else {

src/Games/Calc.php

@@ -14,7 +14,7 @@ function generateQuestion(): string
     return "$firstOperand $operation $secondOperand";
 }
 
-function getCorrectAnswer($question): int
+function getCorrectAnswer(string $question): int
 {
     list($firstOperand, $operation, $secondOperand) = explode(" ", $question);
     $firstOperand = (int)$firstOperand;

src/Games/Even.php

@@ -10,7 +10,12 @@ function generateQuestion(): int
     return random_int(1, 20);
 }
 
-function getCorrectAnswer($question): string
+function getCorrectAnswer(string $question): string
 {
-    return $question % 2 ? 'no' : 'yes';
+    //return (int)$question % 2 ? 'no' : 'yes';
+    if ((int) $question % 2 === 0) {
+        return "yes";
+    } else {
+        return "no";
+    }
 }

src/Games/Gcd.php

@@ -18,18 +18,18 @@ function generateQuestion(): string
     return "$firstNumber $secondNumber";
 }
 
-function getCorrectAnswer($question): int
+function getCorrectAnswer(string $question): int
 {
     list($secondNumber, $firstNumber ) = explode(" ", $question);
 
     $firstNumber = (int)$firstNumber;
     $secondNumber = (int)$secondNumber;
 
-    if ($secondNumber == 0) {
+    if ($secondNumber === 0) {
         return $firstNumber;
     }
 
-    while ($secondNumber != 0) {
+    while ($secondNumber !== 0) {
         $temp = $secondNumber;
         $secondNumber = $firstNumber % $secondNumber;
         $firstNumber = $temp;

src/Games/Prime.php

@@ -10,15 +10,15 @@ function generateQuestion(): int
     return random_int(1, 101);
 }
 
-function getCorrectAnswer($question): string
+function getCorrectAnswer(string $question): string
 {
     $number = (int)$question;
     if ($number < 2) {
         return 'no';
     }
 
     for ($i = 2; $i * $i <= $number; $i++) {
-        if ($number % $i == 0) {
+        if ($number % $i === 0) {
             return 'no';
         }
     }

src/Games/Progression.php

@@ -27,18 +27,18 @@ function generateQuestion(): string
     return generateProgression();
 }
 
-function getCorrectAnswer($question): string
+function getCorrectAnswer(string $question): string
 {
     $elements = explode(" ", $question);
-    $hiddenIndex = array_search("..", $elements);
-    $intArray = array_map('intval', $elements);
+    $hiddenIndex = (int)array_search("..", $elements);
+    $intArray = array_map('intval', $elements, true);
     $len = count($elements);
 
-    if ($hiddenIndex != 0 && $hiddenIndex != $len  - 1) {
+    if ($hiddenIndex !== 0 && $hiddenIndex !== $len  - 1) {
         $step = ($intArray[$hiddenIndex + 1] -  $intArray[$hiddenIndex - 1]) / 2;
         $missedValue =  $intArray[$hiddenIndex - 1] + $step;
-    } elseif ($hiddenIndex == 0) {
-        $step = $elements[2] -  $intArray[1];
+    } elseif ($hiddenIndex === 0) {
+        $step = $intArray[2] -  $intArray[1];
         $missedValue =  $intArray[1] - $step;
     } else {
         $step =  $intArray[2] -  $intArray[1];