8step + lint PSR

Author: webDevWay

Makefile

@@ -13,6 +13,9 @@ brain-calc:
 brain-gcd:
 	php ./bin/brain-gcd
 
+brain-progression:
+	php ./bin/brain-progression
+
 validate:
 	composer validate
 

README.md

@@ -4,6 +4,8 @@ Brain-Calc - https://asciinema.org/a/cKn78eDiU1h5MTCMr1183kawd
 
 Brain-Gcd - https://asciinema.org/a/wWwYQWsxsikakJawzl5Wwxe4Y
 
+Result Url: https://asciinema.org/a/sNPCT391AYUgrvR8Oy4ASUkYk
+
 ### Hexlet tests and linter status:
 
 [![SonarQube Cloud](https://sonarcloud.io/images/project_badges/sonarcloud-light.svg)](https://sonarcloud.io/summary/new_code?id=webDevWay_php-project-lvl1)

bin/brain-calc

@@ -14,5 +14,5 @@ if (file_exists($autoloadPath1)) {
 }
 //получим имя пользователя
 $userName = getUserName();
-//
+//запуск игры
 checkAnswer($count = 3, $userName, $path="calc");

bin/brain-even

@@ -1,7 +1,9 @@
 #!/usr/bin/env php
 <?php
 
-use function BrainGames\BrainEven\getUserName;
+//use function BrainGames\BrainEven\getUserName;
+use function BrainGames\Engine\getUserName;
+use function BrainGames\Engine\checkAnswer;
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -12,4 +14,6 @@ if (file_exists($autoloadPath1)) {
     require_once $autoloadPath2;
 }
 //получим имя пользователя
-getUserName();
+$userName = getUserName();
+//запуск игры
+checkAnswer($count = 3, $userName, $path="even");

bin/brain-gcd

@@ -3,7 +3,7 @@
 
 use function BrainGames\Engine\getUserName;
 use function BrainGames\Engine\checkAnswer;
-use function BrainGames\BrainGcd\getGcd;
+
 
 $autoloadPath1 = __DIR__ . '/../../../autoload.php';
 $autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
@@ -15,6 +15,6 @@ if (file_exists($autoloadPath1)) {
 }
 //получим имя пользователя
 $userName = getUserName();
-//
+//запуск игры
 checkAnswer($count = 3, $userName, $path="gcd");
 

bin/brain-progression

@@ -0,0 +1,20 @@
+#!/usr/bin/env php
+<?php
+
+use function BrainGames\Engine\getUserName;
+use function BrainGames\Engine\checkAnswer;
+
+
+$autoloadPath1 = __DIR__ . '/../../../autoload.php';
+$autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
+
+if (file_exists($autoloadPath1)) {
+    require_once $autoloadPath1;
+} else {
+    require_once $autoloadPath2;
+}
+//получим имя пользователя
+$userName = getUserName();
+//Запустим игру
+checkAnswer($count = 3, $userName, $path="progression");
+

composer.json

@@ -11,15 +11,16 @@
             "src/Games/BrainEven.php",
             "src/Games/BrainCalc.php",
             "src/Engine.php",
-            "src/Games/BrainGcd.php"
+            "src/Games/BrainGcd.php",
+            "src/Games/BrainProgression.php"
         ]
     },
     "bin": [
         "bin/brain-games",
         "bin/brain-even",
         "bin/brain-calc",
-        "bin/brain-gcd"
-        
+        "bin/brain-gcd",
+        "bin/brain-progression"        
     ],
     "authors": [
         {

src/Engine.php

@@ -5,6 +5,8 @@
 use function cli\line;
 use function cli\prompt;
 use function BrainGames\BrainGcd\getGcd;
+use function BrainGames\BrainProgression\generateProgression;
+use function BrainGames\BrainProgression\hideElement;
 
 //---Приветствуем пользователя, получаем имя
 function getUserName()
@@ -24,22 +26,22 @@ function checkAnswer($count, $name, $path)
     $num = random_int(1, 100);
     $num2 = random_int(1, 10);
 
-    //---Логика игр
-    //Подлючим логику в зависимости от игры
+    //--- Логика игр
+    //-- Подлючим логику в зависимости от выбора игры
     switch ($filepath) {
-        //Игра - Чётные числа
+        //-- Игра - "Проверка на чётность"
         case "even":
             line('Answer "yes" if the number is even, otherwise answer "no".');
             $answer = prompt("Question:", $num);
             $isEven = $num % 2 === 0 ? true : false;
             $expectedAnswer = $isEven ? 'yes' : 'no';
             break;
-        //Игра - Калькулятор
+        //-- Игра - "Калькулятор"
         case "calc":
             line('What is the result of the expression?');
             $operation = ["+", "-", "*"];
             $thisOperation = $operation[random_int(0, 2)];
-            //Перебрать рандомные операторы
+            //-- Перебрать рандомные операторы --
             switch ($thisOperation) {
                 case "*":
                     $expectedAnswer = $num * $num2;
@@ -56,13 +58,20 @@ function checkAnswer($count, $name, $path)
             $answer = prompt("Question:", "{$num} {$thisOperation} {$num2}");
             $answer = is_string($answer) ? $answer : (int)$answer;
             break;
-        //Игра - Общий делитель
+        //-- Игра - Общий делитель -- "НОД"
         case "gcd":
             $expectedAnswer = getGcd($num, $num2);
-            print_r($expectedAnswer);
             line('Find the greatest common divisor of given numbers.');
             $answer = prompt("Question:", "{$num} {$num2}");
             break;
+        //-- Игра - "Арифметическая прогрессия"
+        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;
         default:
             return line("This Game is still in production :)");
     }

src/Games/BrainGcd.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace BrainGames\BrainGcd;
+
+//вычислим общий делитель
+function getGcd($num1, $num2)
+{
+    $a = $num1;
+    $b = $num2;
+    while ($b != 0) {
+        $temp = $b;
+        $b = $a % $b;
+        $a = $temp;
+    }
+    return abs($a);
+}

src/Games/BrainProgression.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace BrainGames\BrainProgression;
+
+//-- Генерируем прогрессию
+function generateProgression($length = 10, $minStep = 2, $maxStep = 5, $minStart = 1, $maxStart = 20)
+{
+    $start = rand($minStart, $maxStart);
+    $step = rand($minStep, $maxStep);
+
+    $progression = [];
+    for ($i = 0; $i < $length; $i++) {
+        $progression[] = $start + $i * $step;
+    }
+
+    return $progression;
+}
+//-- Скрыть элемент
+function hideElement($progression)
+{
+    $hiddenIndex = rand(0, count($progression) - 1);
+    $hiddenValue = $progression[$hiddenIndex];
+    $progression[$hiddenIndex] = '..';
+
+    return [
+        'progression' => $progression,
+        'hidden_index' => $hiddenIndex,
+        'hidden_value' => $hiddenValue
+    ];
+}