project check. ALL edition

Author: webDevWay

bin/brain-calc

@@ -1,8 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\Engine\getUserName;
-use function BrainGames\Engine\checkAnswer;
+use function BrainGames\Calc\initGameData;
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -13,5 +12,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-
-//checkAnswer($count = 3, $userName, $path="calc");
+initGameData();

bin/brain-even

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\BrainEven\brainEvenGame;
+use function BrainGames\Even\initGameData;
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -12,5 +12,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-//запуск игры со значением счётчиика по умолчанию
-brainEvenGame($count = 3);
+initGameData();

bin/brain-games

@@ -12,5 +12,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-//получим имя пользователя
 getName();

bin/brain-gcd

@@ -1,9 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\Engine\getUserName;
-use function BrainGames\Engine\checkAnswer;
-
+use function BrainGames\Gcd\initGameData;
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -13,15 +11,6 @@ if (file_exists($autoloadPath1)) {
 } else {
     require_once $autoloadPath2;
 }
-//получим имя пользователя
-/*$userName = getUserName();
-//запуск игры
-checkAnswer($count = 3, $userName, $path="gcd");
 
-  //-- Игра - Общий делитель -- "НОД"
-        case "gcd":
-            $expectedAnswer = getGcd($num, $num2);
-            line('Find the greatest common divisor of given numbers.');
-            $answer = prompt("Question: {$num} {$num2}");
-            break;
+initGameData();
 

bin/brain-prime

@@ -1,9 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\Engine\getUserName;
-use function BrainGames\Engine\checkAnswer;
-
+use function BrainGames\Prime\initGameData;
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -13,15 +11,6 @@ if (file_exists($autoloadPath1)) {
 } else {
     require_once $autoloadPath2;
 }
-//получим имя пользователя
-/*$userName = getUserName();
-//запуск игры
-checkAnswer($count = 3, $userName, $path="prime");
- case "prime":
-            line('Answer "yes" if given number is prime. Otherwise answer "no".');
-            $answer = prompt("Question: {$num}");
-            $expectedAnswer = isPrime($num) ? 'yes' : 'no';
-            break;
-        default:
-            return line("This Game is still in production :)");
-    }
+
+initGameData();        
+        

bin/brain-progression

@@ -1,9 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\Engine\getUserName;
-use function BrainGames\Engine\checkAnswer;
-
+use function BrainGames\Progression\initGameData;
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -13,17 +11,5 @@ if (file_exists($autoloadPath1)) {
 } else {
     require_once $autoloadPath2;
 }
-//получим имя пользователя
-/*$userName = getUserName();
-//Запустим игру
-checkAnswer($count = 3, $userName, $path="progression");
 
-        case "progression":
-            $progression = generateProgression();
-            $hiddenElement = hideElement($progression);
-            $expectedAnswer = $hiddenElement["hidden_value"];
-            line('What number is missing in the progression?');
-            $answer = prompt("Question: " . implode(" ", $hiddenElement["progression"]));
-            break;
-        //-- Игра - "Простое ли число?"
-       
+initGameData();

composer.json

@@ -8,12 +8,12 @@
         },
         "files": [
             "src/Cli.php",
-            "src/Games/BrainEven.php",
-            "src/Games/BrainCalc.php",
             "src/Engine.php",
-            "src/Games/BrainGcd.php",
-            "src/Games/BrainProgression.php",
-            "src/Games/BrainPrime.php"
+            "src/Games/Even.php",
+            "src/Games/Calc.php",
+            "src/Games/Gcd.php",
+            "src/Games/Progression.php",
+            "src/Games/Prime.php"
         ]
     },
     "bin": [

src/Engine.php

@@ -8,26 +8,25 @@
     //---Приветствуем пользователя, получаем имя
 function getUserName(): string
 {
-    //Приветствуем пользователя
     line('Welcome to the Brain Games!');
     $name = prompt('May I have your name?');
     line("Hello, %s!", $name);
-    //Вернуть полученное имя
+
     return $name;
 }
-    //---Функция проверки ответов
-function checkAnswer(array $gameParams)
+    //---Функция логики игры и проверки ответов
+function startGame(array $gameParams)
 {
     $name = getUserName();
-    ["rules" => $rules, 
+    ["rules" => $rules,
     "expectedAnswer" => $expectedAnswer,
     "questions" => $questions] = $gameParams;
     line($rules);
-    for($i = 0; $i < count($questions); $i++) {
+    for ($i = 0; $i < count($questions); $i++) {
         $answer = prompt("Question: {$questions[$i]}");
         line("Your answer: {$answer}");
         if ($answer != $expectedAnswer[$i]) {
-            wrongAnswer($name, $answer[$i], $expectedAnswer[$i]);
+            wrongAnswer($name, $answer, $expectedAnswer[$i]);
             return;
         } else {
             line("Correct!");
@@ -42,7 +41,7 @@ function wrongAnswer(string $name, mixed $answer, mixed $expectedAnswer)
     line("Let's try again, %s!", $name);
     return;
 }
-    //---Функция для верного ответа
+    //---Функция для верного ответа (конец игры)
 function trueAnswers(string $name)
 {
     line("Congratulations, %s!", $name);