Fix tests on php-school/php-workshop 3

Author: AydinHassan

src/Exercise/ConcernedAboutSeparation.php

@@ -3,6 +3,7 @@
 namespace PhpSchool\LearnYouPhp\Exercise;
 
 use Faker\Generator;
+use PhpParser\Node\Stmt\Expression;
 use PhpParser\Parser;
 use PhpSchool\PhpWorkshop\Exercise\AbstractExercise;
 use PhpSchool\PhpWorkshop\Exercise\CliExercise;
@@ -142,7 +143,7 @@ public function check(Input $input): ResultInterface
 
         $include = null;
         foreach ($statements as $statement) {
-            if ($statement instanceof Include_) {
+            if ($statement instanceof Expression && $statement->expr instanceof Include_) {
                 $include = $statement;
                 break;
             }

src/Exercise/DependencyHeaven.php

@@ -3,6 +3,7 @@
 namespace PhpSchool\LearnYouPhp\Exercise;
 
 use Faker\Generator;
+use GuzzleHttp\Psr7\Request;
 use PhpSchool\PhpWorkshop\Check\ComposerCheck;
 use PhpSchool\PhpWorkshop\Exercise\AbstractExercise;
 use PhpSchool\PhpWorkshop\Exercise\CgiExercise;
@@ -13,7 +14,7 @@
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use PhpSchool\PhpWorkshop\Solution\DirectorySolution;
 use PhpSchool\PhpWorkshop\Solution\SolutionInterface;
-use Zend\Diactoros\Request;
+use Psr\Http\Message\RequestInterface;
 
 /**
  * Class DependencyHeaven
@@ -84,8 +85,7 @@ public function getRequests(): array
      */
     private function newApiRequest(string $endpoint): RequestInterface
     {
-        $request = (new Request($endpoint))
-            ->withMethod('POST')
+        $request = (new Request('POST', $endpoint))
             ->withHeader('Content-Type', 'application/x-www-form-urlencoded');
 
         $request->getBody()->write(

src/Exercise/HttpJsonApi.php

@@ -2,13 +2,13 @@
 
 namespace PhpSchool\LearnYouPhp\Exercise;
 
+use GuzzleHttp\Psr7\Request;
 use PhpSchool\PhpWorkshop\Exercise\AbstractExercise;
 use PhpSchool\PhpWorkshop\Exercise\CgiExercise;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\ExerciseCheck\CgiOutputExerciseCheck;
 use Psr\Http\Message\RequestInterface;
-use Zend\Diactoros\Request;
 
 /**
  * Class HttpJsonApi
@@ -40,10 +40,8 @@ public function getRequests(): array
     {
         $url = 'http://www.time.com/api/%s?iso=%s';
         return [
-            (new Request(sprintf($url, 'parsetime', urlencode((new \DateTime())->format(DATE_ISO8601)))))
-                ->withMethod('GET'),
-            (new Request(sprintf($url, 'unixtime', urlencode((new \DateTime())->format(DATE_ISO8601)))))
-                ->withMethod('GET'),
+            (new Request('GET', sprintf($url, 'parsetime', urlencode((new \DateTime())->format(DATE_ISO8601))))),
+            (new Request('GET', sprintf($url, 'unixtime', urlencode((new \DateTime())->format(DATE_ISO8601)))))
         ];
     }
 

test/Exercise/TimeServerTest.php

@@ -3,7 +3,6 @@
 namespace PhpSchool\LearnYouPhpTest\Exercise;
 
 use Colors\Color;
-use PhpSchool\CliMenu\Terminal\TerminalInterface;
 use PhpSchool\LearnYouPhp\Exercise\TimeServer;
 use PhpSchool\LearnYouPhp\TcpSocketFactory;
 use PhpSchool\PhpWorkshop\Check\CheckRepository;
@@ -22,6 +21,7 @@
 use PhpSchool\PhpWorkshop\Result\Success;
 use PhpSchool\PhpWorkshop\ResultAggregator;
 use PhpSchool\PhpWorkshop\Solution\SolutionInterface;
+use PhpSchool\Terminal\Terminal;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -121,7 +121,7 @@ public function testRun(): void
     {
         $color = new Color();
         $color->setForceStyle(true);
-        $output = new StdOutput($color, $terminal = $this->createMock(TerminalInterface::class));
+        $output = new StdOutput($color, $terminal = $this->createMock(Terminal::class));
 
         $outputRegEx  = "/\n";
         $outputRegEx .= '\[1m\[4mArguments\[0m\[0m';