Fixed Game and bin files after mentor comments

Author: Eksi-tech

Makefile

@@ -1,29 +1,29 @@
 install:
-	composer install
+	@composer install
 
 brain-games:
-	bin/brain-games
+	@bin/brain-games
 
 brain-even:
-	bin/brain-even
+	@bin/brain-even
 
 brain-calc:
-	bin/brain-calc
+	@bin/brain-calc
 
 brain-gcd:
-	bin/brain-gcd
+	@bin/brain-gcd
 
 brain-progression:
-	bin/brain-progression
+	@bin/brain-progression
 
 brain-prime:
-	bin/brain-prime
+	@bin/brain-prime
 
 validate:
-	composer validate
+	@composer validate
 
  lint:
-	composer exec --verbose phpcs -- --standard=PSR12 src bin
+	@composer exec --verbose phpcs -- --standard=PSR12 src bin
 
 correct:
-	composer exec -- phpcbf --standard=PSR12 src bin
+	@composer exec -- phpcbf --standard=PSR12 src bin

README.md

@@ -18,33 +18,34 @@
 **Доступные игры**
 1. Brain Even - Проверка на чётность
    Определите, является ли случайное число чётным. 
-make brain-even
+
+Команда: make brain-even
 Демонстрация - https://asciinema.org/a/PZIB0AMPHDWAigwTO2UAGq9PI
 
 2. Brain Calc - Калькулятор
    Решите простое арифметическое выражение. 
 
-make brain-calc
+Команда: make brain-calc
 Демонстрация - https://asciinema.org/a/5gDhJ6Taqf9GAgZvAtUY4W16l
 
 3. Brain GCD - Наибольший общий делитель 
    Найдите Наибольший общий делитель двух случайных чисел. 
 
-make brain-gcd
+Команда: make brain-gcd
 Демонстрация - https://asciinema.org/a/bBiNGAePf6ZXq4p0odlB5zFD6
 
 
 
 4. Brain Progression - Арифметическая прогрессия
    Найдите пропущенный элемент в прогрессии.
 
-make brain-progression
+Команда: make brain-progression
 Демонстрация - https://asciinema.org/a/HawCHRR9MDuvTWbaOEE4d76Zh
 
 5. Brain Prime - Простое число
    Определите, является ли число простым.
 
-make brain-prime
+Команда: make brain-prime
 Демонстрация - https://asciinema.org/a/JuOx3oZ2UACiALbcsQ5da10V2
 
 **Требования**

bin/brain-calc

@@ -1,9 +1,13 @@
 #!/usr/bin/env php
-
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../src/Engine.php';
-require_once __DIR__ . '/../src/Games/Calc.php';
+$autoloadPath1 = __DIR__ . '/../../../autoload.php';
+$autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
+
+if (file_exists($autoloadPath1)) {
+    require_once $autoloadPath1;
+} else {
+    require_once $autoloadPath2;
+}
 
-runGame('Calc');
+BrainGames\Games\Calc\runGame();

bin/brain-even

@@ -1,12 +1,16 @@
 #!/usr/bin/env php
-
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../src/Engine.php';
-require_once __DIR__ . '/../src/Games/Even.php';
+$autoloadPath1 = __DIR__ . '/../../../autoload.php';
+$autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
+
+if (file_exists($autoloadPath1)) {
+    require_once $autoloadPath1;
+} else {
+    require_once $autoloadPath2;
+}
 
-runGame('Even');
+BrainGames\Games\Even\runGame();
 
 
 

bin/brain-games

@@ -1,6 +1,13 @@
 #!/usr/bin/env php
-
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../src/Cli.php';
+$autoloadPath1 = __DIR__ . '/../../../autoload.php';
+$autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
+
+if (file_exists($autoloadPath1)) {
+    require_once $autoloadPath1;
+} else {
+    require_once $autoloadPath2;
+}
+
+BrainGames\Cli\welcome();

bin/brain-gcd

@@ -1,9 +1,13 @@
 #!/usr/bin/env php
-
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../src/Engine.php';
-require_once __DIR__ . '/../src/Games/Gcd.php';
+$autoloadPath1 = __DIR__ . '/../../../autoload.php';
+$autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
+
+if (file_exists($autoloadPath1)) {
+    require_once $autoloadPath1;
+} else {
+    require_once $autoloadPath2;
+}
 
-runGame('Gcd');
+BrainGames\Games\Gcd\runGame();

bin/brain-prime

@@ -1,9 +1,13 @@
 #!/usr/bin/env php
-
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../src/Engine.php';
-require_once __DIR__ . '/../src/Games/Prime.php';
+$autoloadPath1 = __DIR__ . '/../../../autoload.php';
+$autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
+
+if (file_exists($autoloadPath1)) {
+    require_once $autoloadPath1;
+} else {
+    require_once $autoloadPath2;
+}
 
-runGame('Prime');
+BrainGames\Games\Prime\runGame();

bin/brain-progression

@@ -1,9 +1,13 @@
 #!/usr/bin/env php
-
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../src/Engine.php';
-require_once __DIR__ . '/../src/Games/Progression.php';
+$autoloadPath1 = __DIR__ . '/../../../autoload.php';
+$autoloadPath2 = __DIR__ . '/../vendor/autoload.php';
+
+if (file_exists($autoloadPath1)) {
+    require_once $autoloadPath1;
+} else {
+    require_once $autoloadPath2;
+}
 
-runGame('Progression');
+BrainGames\Games\Progression\runGame();

composer.json

@@ -27,5 +27,16 @@
   "scripts": {
     "phpcs": "phpcs --standard=PSR12 src bin",
     "phpcbf": "phpcbf --standard=PSR12 src bin"
+  },
+  "autoload": {
+    "files": [
+      "src/Engine.php",
+      "src/Cli.php",
+      "src/Games/Even.php",
+      "src/Games/Calc.php",
+      "src/Games/Gcd.php",
+      "src/Games/Prime.php",
+      "src/Games/Progression.php"
+    ]
   }
 }

src/Cli.php

@@ -1,10 +1,13 @@
 <?php
 
-namespace Src\Cli;
+namespace BrainGames\Cli;
 
 use function cli\line;
 use function cli\prompt;
 
-line('Welcome to the Brain Games!');
-$name = prompt('May I have your name?');
-line("Hello, %s!", $name);
+function welcome(): void
+{
+    line('Welcome to the Brain Games!');
+    $name = prompt('May I have your name?');
+    line("Hello, %s!", $name);
+}