Renamed src/games/* files. Some refactoring.

alex-rysaev · May 21, 2020 · 4da223c · 4da223c
1 parent 33c6fac
commit 4da223c
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 68 deletions.
diff --git a/bin/brain-calc b/bin/brain-calc
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+use function BrainGames\Calc\brainCalc;
+
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
 if (file_exists($autoloadPath1)) {
@@ -9,6 +11,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-use function BrainGames\BrainCalc\brainCalc;
-
 brainCalc();
diff --git a/bin/brain-even b/bin/brain-even
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+use function BrainGames\Even\brainEven;
+
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
 if (file_exists($autoloadPath1)) {
@@ -9,6 +11,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-use function BrainGames\BrainEven\brainEven;
-
 brainEven();
diff --git a/bin/brain-gcd b/bin/brain-gcd
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+use function BrainGames\GCD\brainGCD;
+
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
 if (file_exists($autoloadPath1)) {
@@ -9,6 +11,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-use function BrainGames\BrainGCD\brainGCD;
-
 brainGCD();
diff --git a/bin/brain-prime b/bin/brain-prime
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+use function BrainGames\Prime\brainPrime;
+
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
 if (file_exists($autoloadPath1)) {
@@ -9,6 +11,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-use function BrainGames\BrainPrime\brainPrime;
-
 brainPrime();
diff --git a/bin/brain-progression b/bin/brain-progression
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+use function BrainGames\Progression\brainProgression;
+
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
 if (file_exists($autoloadPath1)) {
@@ -9,6 +11,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-use function BrainGames\BrainProgression\brainProgression;
-
 brainProgression();
diff --git a/composer.json b/composer.json
@@ -21,12 +21,12 @@
     },
     "autoload": {
         "files": [
-            "src/BrainGames.php",
-            "src/games/BrainCalc.php",
-            "src/games/BrainEven.php",
-            "src/games/BrainGCD.php",
-            "src/games/BrainProgression.php",
-            "src/games/BrainPrime.php"
+            "src/Engine.php",
+            "src/games/Calc.php",
+            "src/games/Even.php",
+            "src/games/GCD.php",
+            "src/games/Progression.php",
+            "src/games/Prime.php"
         ]
     },
     "require-dev": {

diff --git a/src/BrainGames.php → src/Engine.php b/src/BrainGames.php → src/Engine.php
@@ -1,15 +1,16 @@
 <?php
 
-namespace BrainGames\BrainGames;
+namespace BrainGames\Engine;
 
 use function cli\line;
 use function cli\prompt;
 
-function brainGames($gameParameters)
+const ROUNDS = 3;
+
+function brainEngine($mission, $questionsAndAnswers)
 {
-    $mission = $gameParameters[0];
-    $questionsAndAnswers = $gameParameters[1];
-    $guess = '';
+
+    $guess = null;
     line('Welcome to the Brain Games!');
     line("%s", $mission);
     line();
@@ -22,10 +23,9 @@ function brainGames($gameParameters)
         if ($guess !== $answer) {
             line('"%s" is wrong answer ;(. Correct answer was "%s".', $guess, $answer);
             line('Let\'s try again, %s!', $name);
-            break;
+            return false;
         }
     }
-    if ($guess == $answer) {
-        line("Congratulations, %s!", $name);
-    }
+
+    line("Congratulations, %s!", $name);
 }
diff --git a/src/games/BrainCalc.php → src/games/Calc.php b/src/games/BrainCalc.php → src/games/Calc.php
@@ -1,21 +1,19 @@
 <?php
 
-namespace BrainGames\BrainCalc;
+namespace BrainGames\Calc;
 
-use function cli\line;
-use function cli\prompt;
-use function BrainGames\BrainGames\brainGames;
+use function BrainGames\Engine\brainEngine;
+
+use const BrainGames\Engine\ROUNDS;
 
 function brainCalc()
 {
     $mission = 'What is the result of the expression?';
-    $gameParameters = [$mission];
     $operations = ['+', '-', '*'];
-    for ($i = 0; $i < 3; $i++) {
+    for ($i = 0; $i < ROUNDS; $i++) {
         $operation = $operations[array_rand($operations)];
         $firstNumber = rand(1, 10);
         $secondNumber = rand(1, 20);
-        $answer = 0;
         switch ($operation) {
             case '+':
                 $answer = $firstNumber + $secondNumber;
@@ -28,8 +26,8 @@ function brainCalc()
                 break;
         }
         $question = "{$firstNumber} {$operation} {$secondNumber}";
-        $gameParameters[1][] = [$question, (string) $answer];
+        $questionsAndAnswers[] = [$question, (string) $answer];
     }
 
-    brainGames($gameParameters);
+    brainEngine($mission, $questionsAndAnswers);
 }
diff --git a/src/games/BrainEven.php → src/games/Even.php b/src/games/BrainEven.php → src/games/Even.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BrainGames\BrainEven;
+namespace BrainGames\Even;
 
-use function cli\line;
-use function cli\prompt;
-use function BrainGames\BrainGames\brainGames;
+use function BrainGames\Engine\brainEngine;
+
+use const BrainGames\Engine\ROUNDS;
 
 function isEven($number)
 {
@@ -14,13 +14,13 @@ function isEven($number)
 function brainEven()
 {
     $mission = 'Answer "yes" if the number is even, otherwise answer "no".';
-    $gameParameters = [$mission];
-    for ($i = 0; $i < 3; $i++) {
+    $questionsAndAnswers = [];
+    for ($i = 0; $i < ROUNDS; $i++) {
         $number = rand(1, 100);
         $question = (string) $number;
         $answer = isEven($number) ? 'yes' : 'no';
-        $gameParameters[1][] = [$question, $answer];
+        $questionsAndAnswers[] = [$question, $answer];
     }
 
-    brainGames($gameParameters);
+    brainEngine($mission, $questionsAndAnswers);
 }
diff --git a/src/games/BrainGCD.php → src/games/GCD.php b/src/games/BrainGCD.php → src/games/GCD.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BrainGames\BrainGCD;
+namespace BrainGames\GCD;
 
-use function cli\line;
-use function cli\prompt;
-use function BrainGames\BrainGames\brainGames;
+use function BrainGames\Engine\brainEngine;
+
+use const BrainGames\Engine\ROUNDS;
 
 function getGCD($a, $b)
 {
@@ -22,14 +22,13 @@ function getGCD($a, $b)
 function brainGCD()
 {
     $mission = 'Find the greatest common divisor of given numbers.';
-    $gameParameters[] = $mission;
-    for ($i = 0; $i < 3; $i++) {
+    for ($i = 0; $i < ROUNDS; $i++) {
         $firstNumber = rand(1, 100);
         $secondNumber = rand(1, 100);
         $question = "{$firstNumber} {$secondNumber}";
         $answer = (string) getGCD($firstNumber, $secondNumber);
-        $gameParameters[1][] = [$question, $answer];
+        $questionsAndAnswers[] = [$question, $answer];
     }
 
-    brainGames($gameParameters);
+    brainEngine($mission, $questionsAndAnswers);
 }
diff --git a/src/games/BrainPrime.php → src/games/Prime.php b/src/games/BrainPrime.php → src/games/Prime.php
@@ -1,13 +1,17 @@
 <?php
 
-namespace BrainGames\BrainPrime;
+namespace BrainGames\Prime;
 
-use function cli\line;
-use function cli\prompt;
-use function BrainGames\BrainGames\brainGames;
+use function BrainGames\Engine\brainEngine;
+
+use const BrainGames\Engine\ROUNDS;
 
 function isPrime($number)
 {
+    if ($number < 2) {
+        return false;
+    }
+
     for ($i = 2; $i <= sqrt($number); $i++) {
         if ($number % $i === 0) {
             return false;
@@ -19,13 +23,12 @@ function isPrime($number)
 function brainPrime()
 {
     $mission = 'Answer "yes" if given number is prime. Otherwise answer "no".';
-    $gameParameters = [$mission];
-    for ($i = 0; $i < 3; $i++) {
+    for ($i = 0; $i < ROUNDS; $i++) {
         $number = rand(1, 100);
         $question = (string) $number;
         $answer = isPrime($number) ? 'yes' : 'no';
-        $gameParameters[1][] = [$question, $answer];
+        $questionsAndAnswers[] = [$question, $answer];
     }
 
-    brainGames($gameParameters);
+    brainEngine($mission, $questionsAndAnswers);
 }
diff --git a/src/games/BrainProgression.php → src/games/Progression.php b/src/games/BrainProgression.php → src/games/Progression.php
@@ -1,16 +1,15 @@
 <?php
 
-namespace BrainGames\BrainProgression;
+namespace BrainGames\Progression;
 
-use function cli\line;
-use function cli\prompt;
-use function BrainGames\BrainGames\brainGames;
+use function BrainGames\Engine\brainEngine;
+
+use const BrainGames\Engine\ROUNDS;
 
 function brainProgression()
 {
     $mission = 'What number is missing in the progression?';
-    $gameParameters = [$mission];
-    for ($i = 0; $i < 3; $i++) {
+    for ($i = 0; $i < ROUNDS; $i++) {
         $step = rand(1, 10);
         $maskedPosition = rand(0, 9);
         $startNumber = rand(1, 10);
@@ -22,13 +21,12 @@ function brainProgression()
         $progression[$maskedPosition] = '..';
         $question = '';
         foreach ($progression as $progressionMember) {
-            $question .= $progressionMember . ' ';
+            $question .= "{$progressionMember} ";
         }
         $question = trim($question);
-        $gameParameters[1][] = [$question, $answer];
-        print_r($gameParameters);
+        $questionsAndAnswers[] = [$question, $answer];
         $progression = [];
     }
 
-    brainGames($gameParameters);
+    brainEngine($mission, $questionsAndAnswers);
 }