Renaming of functions

alex-rysaev · May 29, 2020 · b730ebe · b730ebe
1 parent b89fedf
commit b730ebe
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/bin/brain-calc b/bin/brain-calc
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\Calc\calc;
+use function BrainGames\Calc\brainCalc;
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -11,4 +11,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-calc();
+brainCalc();
diff --git a/bin/brain-even b/bin/brain-even
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\Even\even;
+use function BrainGames\Even\brainEven;
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -11,4 +11,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-even();
+brainEven();
diff --git a/bin/brain-gcd b/bin/brain-gcd
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\GCD\gcd;
+use function BrainGames\GCD\brainGCD;
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -11,4 +11,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-gcd();
+brainGCD();
diff --git a/bin/brain-prime b/bin/brain-prime
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\Prime\prime;
+use function BrainGames\Prime\brainPrime;
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -11,4 +11,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-prime();
+brainPrime();
diff --git a/bin/brain-progression b/bin/brain-progression
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\Progression\progression;
+use function BrainGames\Progression\brainProgression;
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -11,4 +11,4 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 
-progression();
+brainProgression();
diff --git a/src/games/Calc.php b/src/games/Calc.php
@@ -6,7 +6,7 @@
 
 use const BrainGames\Engine\ROUNDS_COUNT;
 
-function calc()
+function brainCalc()
 {
     $mission = 'What is the result of the expression?';
 

diff --git a/src/games/Even.php b/src/games/Even.php
@@ -11,7 +11,7 @@ function isEven($number)
     return $number % 2 == 0;
 }
 
-function even()
+function brainEven()
 {
     $mission = 'Answer "yes" if the number is even, otherwise answer "no".';
 

diff --git a/src/games/GCD.php b/src/games/GCD.php
@@ -19,7 +19,7 @@ function getGCD($a, $b)
     return $a + $b;
 }
 
-function gcd()
+function brainGCD()
 {
     $mission = 'Find the greatest common divisor of given numbers.';
 

diff --git a/src/games/Prime.php b/src/games/Prime.php
@@ -20,7 +20,7 @@ function isPrime($number)
     return true;
 }
 
-function prime()
+function brainPrime()
 {
     $mission = 'Answer "yes" if given number is prime. Otherwise answer "no".';
 

diff --git a/src/games/Progression.php b/src/games/Progression.php
@@ -6,20 +6,20 @@
 
 use const BrainGames\Engine\ROUNDS_COUNT;
 
-function progression()
+function brainProgression()
 {
     $mission = 'What number is missing in the progression?';
 
     for ($i = 0; $i < ROUNDS_COUNT; $i++) {
         $progressionSize = 10;
         $step = rand(1, 10);
-        $maskedPosition = rand(0, $progressionSize - 1);
         $startNumber = rand(1, 10);
 
         for ($j = 0; $j < $progressionSize; $j++) {
             $progression[] = $startNumber + $step * $j;
         }
 
+        $maskedPosition = array_rand($progression);
         $answer = (string) $progression[$maskedPosition];
         $progression[$maskedPosition] = '..';
         $question = implode(' ', $progression);