refactor: reorganize structure

bin/brain-even

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\BrainGame\runBrainGame;
+use function BrainGames\Engine\runBrainGame;
 
 require_once __DIR__ . '/../src/bootstrap.php';
 

composer.json

@@ -7,9 +7,9 @@
       "BrainGames\\": "src/"
     },
     "files": [
-      "src/BrainGame.php",
+      "src/Engine.php",
       "src/Cli.php",
-      "src/Modules/EvenGame/Module.php",
+      "src/Games/EvenGame/Module.php",
       "src/Utils/ConfigUtils.php",
       "src/Utils/ModuleUtils.php"
     ]

src/BrainGame.php → src/Engine.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BrainGames\BrainGame;
+namespace BrainGames\Engine;
 
 use RuntimeException;
 
@@ -10,11 +10,12 @@
 use function BrainGames\ModuleUtils\getRulesDescription;
 use function BrainGames\ModuleUtils\getText;
 use function BrainGames\ModuleUtils\getUserName;
-use function BrainGames\ModuleUtils\getWinConditionHandler;
 use function BrainGames\ModuleUtils\setUserName;
 use function cli\line;
 use function cli\prompt;
 
+const ATTEMPT_NUMBER = 3;
+
 function runBrainGame(string $moduleName): void
 {
     $module = loadGame($moduleName);
@@ -24,7 +25,7 @@ function runBrainGame(string $moduleName): void
 
 function loadGame($moduleName): array
 {
-    $moduleFile = __DIR__ . '/Modules/' . $moduleName . '/config.php';
+    $moduleFile = __DIR__ . '/Games/' . $moduleName . '/config.php';
     if (!file_exists($moduleFile)) {
         throw new RuntimeException("Module $moduleFile not found");
     }
@@ -50,10 +51,10 @@ function greetUser(array $module): array
     return $module;
 }
 
-function runGame(array $module, int $questionCounter = 0, int $correctAnswerCounter = 0): void
+function runGame(array $module, int $correctAnswerCounter = 0): void
 {
     $userName = getUserName($module);
-    $questionCounter++;
+
     [$question, $correctAnswer] = getQuestionAnswerPairHandler($module);
     line(getText($module, 'prompts.question', ['[question]' => $question]));
 
@@ -76,11 +77,11 @@ function runGame(array $module, int $questionCounter = 0, int $correctAnswerCoun
     line(getText($module, 'dialogs.correct_answer', ['[user_name]' => $userName]));
 
     /** User Won! End game */
-    $isWin = getWinConditionHandler($module, $correctAnswerCounter, $questionCounter);
+    $isWin = ATTEMPT_NUMBER <= $correctAnswerCounter;
     if ($isWin) {
         line(getText($module, 'dialogs.congratulations', ['[user_name]' => $userName]));
         return;
     }
 
-    runGame($module, $questionCounter, $correctAnswerCounter);
+    runGame($module, $correctAnswerCounter);
 }

src/Modules/EvenGame/Module.php → src/Games/EvenGame/Module.php

@@ -23,11 +23,4 @@ function questionHandler(): array
     $question = random_int(1, 100);
     $isEven = $question % 2 === 0;
     return [$question, $isEven ? 'yes' : 'no'];
-}
-
-function winConditionHandler(int $correctAnswers, int $totalQuestions): bool
-{
-    return
-        NUMBER_CORRECT_ANSWERS_FOR_WIN === $correctAnswers and
-        NUMBER_CORRECT_ANSWERS_FOR_WIN === $totalQuestions;
-}
+}

src/Modules/EvenGame/config.php → src/Games/EvenGame/config.php

@@ -3,17 +3,11 @@
 namespace BrainGames\Modules\EvenGame\config;
 
 use function BrainGames\Modules\EvenGame\Module\questionHandler;
-use function BrainGames\Modules\EvenGame\Module\winConditionHandler;
 use function BrainGames\ModuleUtils\setQuestionAnswerPairHandler;
 use function BrainGames\ModuleUtils\setRulesDescription;
-use function BrainGames\ModuleUtils\setWinConditionHandler;
 
 return static function ($module) {
     $module = setRulesDescription($module, 'Answer "yes" if the number is even, otherwise answer "no".');
     $module = setQuestionAnswerPairHandler($module, static fn() => questionHandler());
-    $module = setWinConditionHandler(
-        $module,
-        static fn($correctAnswers, $totalQuestions) => winConditionHandler($correctAnswers, $totalQuestions)
-    );
     return $module;
 };

src/Utils/ModuleUtils.php

@@ -4,7 +4,6 @@
 
 const DATA_USER_NAME = 3010;
 const HANDLER_QUESTION = 100;
-const HANDLER_WIN_CONDITION = 101;
 const LOCATION_DATA = 'data';
 const LOCATION_HANDLERS = 'handlers';
 const LOCATION_SETTINGS = 'settings';
@@ -33,17 +32,6 @@ function setQuestionAnswerPairHandler($module, callable $handler): array
     return $module;
 }
 
-function setWinConditionHandler($module, callable $handler): array
-{
-    $module[LOCATION_HANDLERS][HANDLER_WIN_CONDITION] = $handler;
-    return $module;
-}
-
-function getWinConditionHandler(array $module, int $correctAnswers, int $totalQuestions): bool
-{
-    return $module[LOCATION_HANDLERS][HANDLER_WIN_CONDITION]($correctAnswers, $totalQuestions);
-}
-
 function setRulesDescription($module, $rulesDescription): array
 {
     $module[LOCATION_SETTINGS][SETTING_RULES_DESCRIPTION] = $rulesDescription;

src/config.json

@@ -12,8 +12,5 @@
       "ask_name": "May I have your name?",
       "question": "Question: [question]"
     }
-  },
-  "settings": {
-    "attempts": 0
   }
 }