Merge pull request #14 from php-school/match-made-in-heaven

Match made in heaven

Author: AydinHassan

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.3, 7.4, 8.0]
+        php: [8.0]
 
     name: PHP ${{ matrix.php }}
     steps:
@@ -32,7 +32,7 @@ jobs:
       - name: Run phpunit tests
         run: |
           mkdir -p build/logs
-          vendor/bin/simple-phpunit --coverage-clover ./build/logs/clover.xml
+          vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
       - name: Run phpcs
         run: composer cs
 

.phpstorm.meta.php

@@ -5,8 +5,8 @@
         \DI\Container::get('') => [
             "" == "@",
         ],
-        \Interop\Container\ContainerInterface::get('') => [
+        \Psr\Container\ContainerInterface::get('') => [
             "" == "@",
         ],
     ];
-}
+}

app/bootstrap.php

@@ -19,12 +19,12 @@
         throw new RuntimeException('Unable to locate Composer autoloader; please run "composer install".');
 }
 
+use PhpSchool\PHP8Appreciate\Exercise\AMatchMadeInHeaven;
 use PhpSchool\PhpWorkshop\Application;
 
 $app = new Application('PHP8 Appreciate', __DIR__ . '/config.php');
 
-//$app->addExercise(...);
-//$app->addExercise(...);
+$app->addExercise(AMatchMadeInHeaven::class);
 
 $art = <<<ART
         _ __ _
@@ -37,7 +37,7 @@
 ART;
 
 $app->setLogo($art);
-$app->setFgColour('green');
-$app->setBgColour('black');
+$app->setFgColour('white');
+$app->setBgColour('61');
 
 return $app;

app/config.php

@@ -1,8 +1,17 @@
 <?php
 
+use PhpSchool\PHP8Appreciate\AstService;
+use PhpSchool\PHP8Appreciate\Exercise\AMatchMadeInHeaven;
+use Psr\Container\ContainerInterface;
+use function DI\create;
 use function DI\factory;
 use function DI\object;
 
 return [
+    'basePath' => __DIR__ . '/../',
+
     //Define your exercise factories here
+    AMatchMadeInHeaven::class => function (ContainerInterface $c) {
+        return new AMatchMadeInHeaven($c->get(PhpParser\Parser::class));
+    },
 ];

composer.json

@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "php-school/php-workshop": "^3.0"
+        "php-school/php-workshop": "dev-master"
     },
     "require-dev": {
         "phpunit/phpunit": "^9",
@@ -47,11 +47,11 @@
         "unit-tests": "phpunit",
         "cs": [
             "phpcs src --standard=PSR12",
-            "phpcs test --standard=PSR12"
+            "phpcs test --standard=PSR12 --ignore='test/solutions'"
         ],
         "cs-fix": [
             "phpcbf src --standard=PSR12 --encoding=UTF-8",
-            "phpcbf test --standard=PSR12 --encoding=UTF-8"
+            "phpcbf test --standard=PSR12 --encoding=UTF-8 --ignore='test/solutions'"
         ],
         "static": "phpstan --ansi analyse --level max src"
     },