PSR-12

composer.json

@@ -52,8 +52,8 @@
     },
     "scripts" : {
         "cs" : [
-            "phpcs src --standard=PSR2 --encoding=UTF-8",
-            "phpcs test --standard=PSR2 --encoding=UTF-8"
+            "phpcs src --standard=PSR12 --encoding=UTF-8",
+            "phpcs test --standard=PSR12 --encoding=UTF-8"
         ]
     }
 }

src/Application.php

@@ -220,7 +220,7 @@ public function run()
      */
     private function getContainer()
     {
-        $containerBuilder = new ContainerBuilder;
+        $containerBuilder = new ContainerBuilder();
         $containerBuilder->addDefinitions(
             array_merge_recursive(
                 require $this->frameworkConfigLocation,

src/Check/CheckInterface.php

@@ -10,11 +10,11 @@ interface CheckInterface
     /**
      * Return the check's name
      */
-    public function getName() : string;
+    public function getName(): string;
 
     /**
      * This returns the interface the exercise should implement
      * when requiring this check. It should be the FQCN of the interface.
      */
-    public function getExerciseInterface() : string;
+    public function getExerciseInterface(): string;
 }

src/Check/CheckRepository.php

@@ -28,7 +28,7 @@ public function __construct(array $checks = [])
     /**
      * Add a new check to the repository.
      */
-    public function registerCheck(CheckInterface $check) : void
+    public function registerCheck(CheckInterface $check): void
     {
         $this->checks[get_class($check)] = $check;
     }
@@ -38,7 +38,7 @@ public function registerCheck(CheckInterface $check) : void
      *
      * @return array
      */
-    public function getAll() : array
+    public function getAll(): array
     {
         return array_values($this->checks);
     }
@@ -50,7 +50,7 @@ public function getAll() : array
      * @return CheckInterface The instance.
      * @throws InvalidArgumentException If an instance of the check does not exist.
      */
-    public function getByClass(string $class) : CheckInterface
+    public function getByClass(string $class): CheckInterface
     {
         if (!isset($this->checks[$class])) {
             throw new InvalidArgumentException(sprintf('Check: "%s" does not exist', $class));
@@ -62,7 +62,7 @@ public function getByClass(string $class) : CheckInterface
     /**
      * Query whether a check instance exists in this repository via its class name.
      */
-    public function has(string $class) : bool
+    public function has(string $class): bool
     {
         try {
             $this->getByClass($class);

src/Check/CodeParseCheck.php

@@ -35,7 +35,7 @@ public function __construct(Parser $parser)
     /**
      * Return the check's name
      */
-    public function getName() : string
+    public function getName(): string
     {
         return 'Code Parse Check';
     }
@@ -49,7 +49,7 @@ public function getName() : string
      * @param Input $input The command line arguments passed to the command.
      * @return ResultInterface The result of the check.
      */
-    public function check(ExerciseInterface $exercise, Input $input) : ResultInterface
+    public function check(ExerciseInterface $exercise, Input $input): ResultInterface
     {
 
         $code = file_get_contents($input->getArgument('program'));
@@ -66,15 +66,15 @@ public function check(ExerciseInterface $exercise, Input $input) : ResultInterfa
     /**
      * This check can run on any exercise type.
      */
-    public function canRun(ExerciseType $exerciseType) : bool
+    public function canRun(ExerciseType $exerciseType): bool
     {
         return in_array($exerciseType->getValue(), [ExerciseType::CGI, ExerciseType::CLI], true);
     }
 
     /**
      * @return string
      */
-    public function getExerciseInterface() : string
+    public function getExerciseInterface(): string
     {
         return ExerciseInterface::class;
     }
@@ -83,7 +83,7 @@ public function getExerciseInterface() : string
      * This check should be run before executing the student's solution, as, if it cannot be parsed
      * it probably cannot be executed.
      */
-    public function getPosition() : string
+    public function getPosition(): string
     {
         return SimpleCheckInterface::CHECK_BEFORE;
     }

src/Check/ComposerCheck.php

@@ -21,7 +21,7 @@ class ComposerCheck implements SimpleCheckInterface
     /**
      * Return the check's name
      */
-    public function getName() : string
+    public function getName(): string
     {
         return 'Composer Dependency Check';
     }
@@ -35,10 +35,10 @@ public function getName() : string
      * @param Input $input The command line arguments passed to the command.
      * @return ResultInterface The result of the check.
      */
-    public function check(ExerciseInterface $exercise, Input $input) : ResultInterface
+    public function check(ExerciseInterface $exercise, Input $input): ResultInterface
     {
         if (!$exercise instanceof ComposerExerciseCheck) {
-            throw new \InvalidArgumentException;
+            throw new \InvalidArgumentException();
         }
 
         if (!file_exists(sprintf('%s/composer.json', dirname($input->getArgument('program'))))) {
@@ -74,20 +74,20 @@ public function check(ExerciseInterface $exercise, Input $input) : ResultInterfa
     /**
      * This check can run on any exercise type.
      */
-    public function canRun(ExerciseType $exerciseType) : bool
+    public function canRun(ExerciseType $exerciseType): bool
     {
         return in_array($exerciseType->getValue(), [ExerciseType::CGI, ExerciseType::CLI], true);
     }
 
-    public function getExerciseInterface() : string
+    public function getExerciseInterface(): string
     {
         return ComposerExerciseCheck::class;
     }
 
     /**
      * This check can run before because if it fails, there is no point executing the solution.
      */
-    public function getPosition() : string
+    public function getPosition(): string
     {
         return SimpleCheckInterface::CHECK_BEFORE;
     }

src/Check/DatabaseCheck.php

@@ -61,12 +61,12 @@ public function __construct()
     /**
      * Return the check's name
      */
-    public function getName() : string
+    public function getName(): string
     {
         return 'Database Verification Check';
     }
 
-    public function getExerciseInterface() : string
+    public function getExerciseInterface(): string
     {
         return DatabaseExerciseCheck::class;
     }
@@ -75,7 +75,7 @@ public function getExerciseInterface() : string
      * Here we attach to various events to seed, verify and inject the DSN's
      * to the student & reference solution programs's CLI arguments.
      */
-    public function attach(EventDispatcher $eventDispatcher) : void
+    public function attach(EventDispatcher $eventDispatcher): void
     {
         if (file_exists($this->databaseDirectory)) {
             throw new \RuntimeException(

src/Check/FileExistsCheck.php

@@ -17,7 +17,7 @@ class FileExistsCheck implements SimpleCheckInterface
     /**
      * Return the check's name.
      */
-    public function getName() : string
+    public function getName(): string
     {
         return 'File Exists Check';
     }
@@ -29,7 +29,7 @@ public function getName() : string
      * @param Input $input The command line arguments passed to the command.
      * @return ResultInterface The result of the check.
      */
-    public function check(ExerciseInterface $exercise, Input $input) : ResultInterface
+    public function check(ExerciseInterface $exercise, Input $input): ResultInterface
     {
         if (file_exists($input->getArgument('program'))) {
             return Success::fromCheck($this);
@@ -41,20 +41,20 @@ public function check(ExerciseInterface $exercise, Input $input) : ResultInterfa
     /**
      * This check can run on any exercise type.
      */
-    public function canRun(ExerciseType $exerciseType) : bool
+    public function canRun(ExerciseType $exerciseType): bool
     {
         return in_array($exerciseType->getValue(), [ExerciseType::CGI, ExerciseType::CLI], true);
     }
 
-    public function getExerciseInterface() : string
+    public function getExerciseInterface(): string
     {
         return ExerciseInterface::class;
     }
 
     /**
      * This check must run before executing the solution becuase it may not exist.
      */
-    public function getPosition() : string
+    public function getPosition(): string
     {
         return SimpleCheckInterface::CHECK_BEFORE;
     }

src/Check/FunctionRequirementsCheck.php

@@ -39,7 +39,7 @@ public function __construct(Parser $parser)
     /**
      * Return the check's name.
      */
-    public function getName() : string
+    public function getName(): string
     {
         return 'Function Requirements Check';
     }
@@ -53,10 +53,10 @@ public function getName() : string
      * @param Input $input The command line arguments passed to the command.
      * @return ResultInterface The result of the check.
      */
-    public function check(ExerciseInterface $exercise, Input $input) : ResultInterface
+    public function check(ExerciseInterface $exercise, Input $input): ResultInterface
     {
         if (!$exercise instanceof FunctionRequirementsExerciseCheck) {
-            throw new \InvalidArgumentException;
+            throw new \InvalidArgumentException();
         }
 
         $requiredFunctions  = $exercise->getRequiredFunctions();
@@ -71,7 +71,7 @@ public function check(ExerciseInterface $exercise, Input $input) : ResultInterfa
         }
 
         $visitor    = new FunctionVisitor($requiredFunctions, $bannedFunctions);
-        $traverser  = new NodeTraverser;
+        $traverser  = new NodeTraverser();
         $traverser->addVisitor($visitor);
 
         $traverser->traverse($ast);
@@ -98,12 +98,12 @@ public function check(ExerciseInterface $exercise, Input $input) : ResultInterfa
     /**
      * This check can run on any exercise type.
      */
-    public function canRun(ExerciseType $exerciseType) : bool
+    public function canRun(ExerciseType $exerciseType): bool
     {
         return in_array($exerciseType->getValue(), [ExerciseType::CGI, ExerciseType::CLI], true);
     }
 
-    public function getExerciseInterface() : string
+    public function getExerciseInterface(): string
     {
         return FunctionRequirementsExerciseCheck::class;
     }
@@ -113,7 +113,7 @@ public function getExerciseInterface() : string
      * output, but do it in a way that was not correct for the task. This way the student can see the program works
      * but missed some requirements.
      */
-    public function getPosition() : string
+    public function getPosition(): string
     {
         return SimpleCheckInterface::CHECK_AFTER;
     }

src/Check/ListenableCheckInterface.php

@@ -13,5 +13,5 @@ interface ListenableCheckInterface extends CheckInterface
      * Attach to events throughout the running/verifying process. Inject verifiers
      * and listeners.
      */
-    public function attach(EventDispatcher $eventDispatcher) : void;
+    public function attach(EventDispatcher $eventDispatcher): void;
 }

src/Check/PhpLintCheck.php

@@ -20,7 +20,7 @@ class PhpLintCheck implements SimpleCheckInterface
     /**
      * Return the check's name
      */
-    public function getName() : string
+    public function getName(): string
     {
         return 'PHP Code Check';
     }
@@ -32,7 +32,7 @@ public function getName() : string
      * @param Input $input The command line arguments passed to the command.
      * @return ResultInterface The result of the check.
      */
-    public function check(ExerciseInterface $exercise, Input $input) : ResultInterface
+    public function check(ExerciseInterface $exercise, Input $input): ResultInterface
     {
         $process = new Process([PHP_BINARY, '-l', $input->getArgument('program')]);
         $process->run();
@@ -47,12 +47,12 @@ public function check(ExerciseInterface $exercise, Input $input) : ResultInterfa
     /**
      * This check can run on any exercise type.
      */
-    public function canRun(ExerciseType $exerciseType) : bool
+    public function canRun(ExerciseType $exerciseType): bool
     {
         return in_array($exerciseType->getValue(), [ExerciseType::CGI, ExerciseType::CLI], true);
     }
 
-    public function getExerciseInterface() : string
+    public function getExerciseInterface(): string
     {
         return ExerciseInterface::class;
     }
@@ -61,7 +61,7 @@ public function getExerciseInterface() : string
      * This check should be run before executing the student's solution, as, if it cannot be linted
      * it probably cannot be executed.
      */
-    public function getPosition() : string
+    public function getPosition(): string
     {
         return SimpleCheckInterface::CHECK_BEFORE;
     }

src/Check/SimpleCheckInterface.php

@@ -30,7 +30,7 @@ interface SimpleCheckInterface extends CheckInterface
     /**
      * Can this check run this exercise?
      */
-    public function canRun(ExerciseType $exerciseType) : bool;
+    public function canRun(ExerciseType $exerciseType): bool;
 
     /**
      * The check is ran against an exercise and a filename which
@@ -45,12 +45,12 @@ public function canRun(ExerciseType $exerciseType) : bool;
      * @param Input $input The command line arguments passed to the command.
      * @return ResultInterface The result of the check.
      */
-    public function check(ExerciseInterface $exercise, Input $input) : ResultInterface;
+    public function check(ExerciseInterface $exercise, Input $input): ResultInterface;
 
     /**
      * Either `static::CHECK_BEFORE` | `static::CHECK_AFTER`.
      *
      * @return string
      */
-    public function getPosition() : string;
+    public function getPosition(): string;
 }

src/CodeInsertion.php

@@ -14,13 +14,13 @@ class CodeInsertion
      * Denotes that the block of code this insertion
      * represents, should be inserted at the top of the solution.
      */
-    const TYPE_BEFORE   = 'before';
+    public const TYPE_BEFORE   = 'before';
 
     /**
      * Denotes that the block of code this insertion
      * represents, should be inserted at the bottom of the solution.
      */
-    const TYPE_AFTER    = 'after';
+    public const TYPE_AFTER    = 'after';
 
     /**
      * @var array