Needed updates for version 3.x supporting codecetion 5 (#54)

* Needed updates for version 3.x supporting codecetion 5

* Removed unneeded checks from scrutinizer

* Removed wrongly commited file

Author: mcustiel

.scrutinizer.yml

@@ -14,18 +14,6 @@ build:
       - php-scrutinizer-run
       - ./vendor/bin/codecept run
   nodes:
-    php72:
-      environment:
-        php:
-          version: 7.2
-    php73:
-      environment:
-        php:
-          version: 7.3
-    php74:
-      environment:
-        php:
-          version: 7.4
     php80:
       environment:
         php:

codeception.https.yml

@@ -1,7 +1,7 @@
 actor: Tester
 paths:
     tests: tests
-    log: tests/_output
+    output: tests/_output
     data: tests/_data
     support: tests/_support
     envs: tests/_envs

codeception.yml

@@ -1,7 +1,7 @@
 actor: Tester
 paths:
     tests: tests
-    log: tests/_output
+    output: tests/_output
     data: tests/_data
     support: tests/_support
     envs: tests/_envs

composer.json

@@ -33,14 +33,14 @@
     "description" : "Codeception extension for Phiremock. Allows to stub remote services for HTTP requests.",
     "license" : "GPL-3.0-or-later",
     "require" : {
-        "php" : "^7.2|^8.0",
-        "codeception/codeception" : ">=2.2 <6.0",
-        "symfony/process": ">=3.0.0 <7.0.0"
+        "php" : "^8.0",
+        "codeception/codeception" : "^5.0",
+        "symfony/process": ">=5.0.0 <7.0.0"
     },
     "require-dev": {
         "mcustiel/phiremock-server": "^1.0",
-    	"codeception/module-rest": "^1.0",
-        "codeception/module-phpbrowser": "^1.0",
+    	"codeception/module-rest": "^3.0",
+        "codeception/module-phpbrowser": "^3.0",
         "guzzlehttp/guzzle" : "^7.0"
     },
     "suggest": {

src/Extension/Phiremock.php

@@ -25,8 +25,6 @@
 use Mcustiel\Phiremock\Codeception\Extension\Config;
 use Mcustiel\Phiremock\Codeception\Extension\PhiremockProcessManager;
 use Mcustiel\Phiremock\Codeception\Extension\ReadinessCheckerFactory;
-use Mcustiel\Phiremock\Codeception\Extension\PhiremockPHP72;
-use Mcustiel\Phiremock\Codeception\Extension\PhiremockPHP74p;
 
 class Phiremock extends CodeceptionExtension
 {
@@ -36,29 +34,113 @@ class Phiremock extends CodeceptionExtension
         'suite.after'  => 'stopProcess',
     ];
 
-    /** Phiremock72|Phiremock74p */
-    private $instance;
+    /** @var array */
+    protected array $config = Config::DEFAULT_CONFIG;
+
+    /** @var PhiremockProcessManager */
+    private $process;
+
+    /** @var Config */
+    private $extensionConfig;
 
     /**  @throws ConfigurationException */
     public function __construct(
         array $config,
         array $options,
         PhiremockProcessManager $process = null
     ) {
-        if (version_compare(PHP_VERSION, '7.4.0') >= 0) {
-            $this->instance = new PhiremockPHP74p($config, $options, $process);
-        } else {
-            $this->instance = new PhiremockPHP72($config, $options, $process);
-        }
+        $this->setDefaultLogsPath();
+        parent::__construct($config, $options);
+        $this->extensionConfig = new Config($this->config, $this->getOutputCallable());
+        $this->initProcess($process);
     }
 
     public function startProcess(SuiteEvent $event): void
     {
-        $this->instance->startProcess($event);
+        $this->writeln('Starting default phiremock instance...');
+        $suite = $event->getSuite();
+        if ($this->mustRunForSuite($suite, $this->extensionConfig->getSuites())) {
+            $this->process->start($this->extensionConfig);
+        }
+        foreach ($this->extensionConfig->getExtraInstances() as $configInstance) {
+            if ($this->mustRunForSuite($suite, $configInstance->getSuites())) {
+                $this->writeln('Starting extra phiremock instance...');
+                $this->process->start($configInstance);
+            }
+        }
+        $this->executeDelay();
+        $this->waitUntilReady();
     }
 
     public function stopProcess(): void
     {
-        $this->instance->stopProcess();
+        $this->writeln('Stopping phiremock...');
+        $this->process->stop();
+    }
+
+    public function getOutputCallable(): callable
+    {
+        return function (string $message) {
+            $this->writeln($message);
+        };
+    }
+
+    private function mustRunForSuite(Suite $suite, array $allowedSuites): bool
+    {
+        return empty($allowedSuites) || in_array($suite->getBaseName(), $allowedSuites, true);
+    }
+
+    private function executeDelay(): void
+    {
+        $delay = $this->extensionConfig->getDelay();
+        if ($delay > 0) {
+            sleep($delay);
+        }
+    }
+
+    private function initProcess(?PhiremockProcessManager $process): void
+    {
+        $this->process = $process ?? new PhiremockProcessManager($this->getOutputCallable());
+    }
+
+    /** @throws ConfigurationException */
+    private function setDefaultLogsPath(): void
+    {
+        if (!isset($this->config['logs_path'])) {
+            $this->config['logs_path'] = Config::getDefaultLogsPath();
+        }
+    }
+
+    private function waitUntilReady(): void
+    {
+        if (!$this->extensionConfig->waitUntilReady()) {
+            return;
+        }
+
+        $this->writeln('Waiting until Phiremock is ready...');
+
+        $readinessChecker = ReadinessCheckerFactory::create(
+            $this->extensionConfig->getInterface(),
+            $this->extensionConfig->getPort(),
+            $this->extensionConfig->isSecure()
+            );
+
+        $start = \microtime(true);
+        $interval = $this->extensionConfig->getWaitUntilReadyIntervalMicros();
+        $timeout = $this->extensionConfig->getWaitUntilReadyTimeout();
+        while (true) {
+            if ($readinessChecker->isReady()) {
+                break;
+            }
+            \usleep($interval);
+            $elapsed = (int) (\microtime(true) - $start);
+
+            if ($elapsed > $timeout) {
+                throw new \RuntimeException(
+                    \sprintf('Phiremock failed to start within %d seconds', $this->extensionConfig->getWaitUntilReadyTimeout())
+                    );
+            }
+        }
+        $this->writeln('Phiremock is ready!');
     }
 }

src/PhiremockExtension/Config.php

@@ -207,7 +207,7 @@ public function getWaitUntilReadyIntervalMicros(): int
     /** @throws ConfigurationException */
     public static function getDefaultLogsPath(): string
     {
-        return Configuration::logDir();
+        return Configuration::outputDir();
     }
 
     private function initInterfaceAndPort(array $config): void