with verbs

Egorskov · Oct 20, 2024 · b01c08a · b01c08a
1 parent 48af88e
commit b01c08a
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/bin/brain-calc b/bin/brain-calc
@@ -10,6 +10,6 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-use function BrainGames\Games\Calc\calc;
+use function BrainGames\Games\Calc\runCalc;
 
-calc();
+runCalc();
diff --git a/bin/brain-even b/bin/brain-even
@@ -10,6 +10,6 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-use function BrainGames\Games\Even\even;
+use function BrainGames\Games\Even\runEven;
 
-even();
+runEven();
diff --git a/bin/brain-gcd b/bin/brain-gcd
@@ -10,6 +10,6 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-use function BrainGames\Games\Gcd\gcd;
+use function BrainGames\Games\Gcd\runGcd;
 
-gcd();
+runGcd();
diff --git a/bin/brain-prime b/bin/brain-prime
@@ -10,6 +10,6 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-use function BrainGames\Games\Prime\prime;
+use function BrainGames\Games\Prime\runPrime;
 
-prime();
+runPrime();
diff --git a/bin/brain-progression b/bin/brain-progression
@@ -10,6 +10,6 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-use function BrainGames\Games\Progression\progression;
+use function BrainGames\Games\Progression\runProgression;
 
-progression();
+runProgression();
diff --git a/src/Engine.php b/src/Engine.php
@@ -29,7 +29,7 @@ function communication(array $answers, string $game): void
 function arrayNumbers(): array
 {
     $numbers = [];
-    for ($i = 0; $i < ROUND; $i++) {
+    for ($i = 1; $i <= ROUND; $i++) {
         $numbers[$i] = mt_rand(MIN_NUM, MAX_NUM);
     }
     return $numbers;

diff --git a/src/Games/Calc.php b/src/Games/Calc.php
@@ -10,7 +10,7 @@
 use const BrainGames\Engine\MIN_NUM;
 use const BrainGames\Engine\MAX_NUM;
 
-function calc(): void
+function runCalc(): void
 {
     $game = 'What is the result of the expression?';
     $answers = [];

diff --git a/src/Games/Even.php b/src/Games/Even.php
@@ -5,7 +5,7 @@
 use function BrainGames\Engine\communication;
 use function BrainGames\Engine\arrayNumbers;
 
-function even(): void
+function runEven(): void
 {
     $game = 'Answer "yes" if the number is even, otherwise answer "no".';
     $answers = [];

diff --git a/src/Games/GCD.php b/src/Games/GCD.php
@@ -8,11 +8,11 @@
 use const BrainGames\Engine\MIN_NUM;
 use const BrainGames\Engine\MAX_NUM;
 
-function gcd(): void
+function runGcd(): void
 {
     $game = 'Find the greatest common divisor of given numbers.';
     $answers = [];
-    for ($i = 0; $i < ROUND; $i++) {
+    for ($i = 1; $i <= ROUND; $i++) {
         $first = mt_rand(MIN_NUM, MAX_NUM);
         $second = mt_rand(MIN_NUM, MAX_NUM);
         $answers["$first $second"] = nod($first, $second);

diff --git a/src/Games/Prime.php b/src/Games/Prime.php
@@ -5,7 +5,7 @@
 use function BrainGames\Engine\arrayNumbers;
 use function BrainGames\Engine\communication;
 
-function prime(): void
+function runPrime(): void
 {
     $game = 'Answer "yes" if given number is prime. Otherwise answer "no".';
     $answers = [];

diff --git a/src/Games/Progression.php b/src/Games/Progression.php
@@ -8,11 +8,11 @@
 use const BrainGames\Engine\MIN_NUM;
 use const BrainGames\Engine\MAX_NUM;
 
-function progression(): void
+function runProgression(): void
 {
     $game = 'What number is missing in the progression?';
     $answers = [];
-    for ($i = 0; $i < ROUND; $i++) {
+    for ($i = 1; $i <= ROUND; $i++) {
         $numbers = slicer();
         $randomSym = mt_rand(0, (count($numbers) - 1));
         $correctAnswer = $numbers[$randomSym];