Merge pull request #15 from Codeception/codecept5

Support Codeception 5

Author: Naktibalda

.github/workflows/main.yml

@@ -8,8 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.4, 8.0, 8.1]
-        diactoros: ['diactoros:^1.8.7', 'diactoros:^2.0']
+        php: [8.0]
 
     steps:
     - name: Checkout code
@@ -24,30 +23,21 @@ jobs:
     - name: Checkout Mezzio Sample
       uses: actions/checkout@v2
       with:
-        repository: Slamdunk/codeception-mezzio-tests
+        repository: Naktibalda/codeception-mezzio-tests
         path: framework-tests
+        ref: '5.0'
         submodules: recursive
 
-    - name: Install Mezzio Sample on PHP 7
-      if: matrix.php < 8
+    - name: Install Mezzio Sample
       run: composer update --no-dev --prefer-dist --no-interaction
       working-directory: framework-tests
 
-    - name: Install Mezzio Sample on PHP 8
-      if: matrix.php >= 8.0
-      run: composer update --no-dev --prefer-dist --no-interaction --ignore-platform-req=php
-      working-directory: framework-tests
 
     - name: Validate composer.json and composer.lock
       run: composer validate
 
-    - name: Install dependencies on PHP 7
-      if: matrix.php < 8
-      run: composer update --prefer-dist --no-progress --no-interaction --no-suggest --with='laminas/laminas-${{ matrix.diactoros }}'
-
-    - name: Install dependencies on PHP 8
-      if: matrix.php >= 8
-      run: composer update --prefer-dist --no-progress --no-interaction --ignore-platform-req=php  --with='laminas/laminas-${{ matrix.diactoros }}'
+    - name: Install dependencies
+      run: composer update --prefer-dist --no-progress --no-interaction --no-suggest
 
     - name: Run test suite
       run: php vendor/bin/codecept run functional -c framework-tests

composer.json

@@ -10,17 +10,17 @@
 			"name": "Gintautas Miselis"
 		}
 	],
-	"minimum-stability": "RC",
+	"minimum-stability": "dev",
 	"require": {
-		"php": "^7.4 | ^8.0",
-		"codeception/lib-innerbrowser": "^2.0",
-		"codeception/codeception": "^4.1",
+		"php": "^8.0",
+		"codeception/lib-innerbrowser": "^3.0",
+		"codeception/codeception": "^5.0.0-alpha2",
 		"container-interop/container-interop": "^1.2",
-		"laminas/laminas-diactoros": "^1.8.7 || ^2.0",
+		"laminas/laminas-diactoros": "^2.0",
 		"mezzio/mezzio": "^3.0"
 	},
 	"require-dev": {
-		"codeception/module-rest": "^2.0"
+		"codeception/module-rest": "^3.0"
 	},
 	"autoload": {
 		"classmap": [

src/Codeception/Lib/Connector/Mezzio.php

@@ -26,7 +26,7 @@ class Mezzio extends Client
      * @param BrowserKitRequest $request
      * @throws Exception
      */
-    public function doRequest($request)
+    public function doRequest($request): Response
     {
         $inputStream = fopen('php://memory', 'r+');
         $content = $request->getContent();
@@ -114,6 +114,9 @@ private function convertFiles(array $files): array
         return $fileObjects;
     }
 
+    /**
+     * @return array<string, string>
+     */
     private function extractHeaders(BrowserKitRequest $request): array
     {
         $headers = [];
@@ -123,7 +126,7 @@ private function extractHeaders(BrowserKitRequest $request): array
         foreach ($server as $header => $val) {
             $header = html_entity_decode(implode('-', array_map('ucfirst', explode('-', strtolower(str_replace('_', '-', $header))))), ENT_NOQUOTES);
 
-            if (strpos($header, 'Http-') === 0) {
+            if (str_starts_with($header, 'Http-')) {
                 $headers[substr($header, 5)] = $val;
             } elseif (isset($contentHeaders[$header])) {
                 $headers[$header] = $val;

src/Codeception/Module/Mezzio.php

@@ -8,6 +8,7 @@
 use Codeception\Lib\Framework;
 use Codeception\Lib\Interfaces\DoctrineProvider;
 use Codeception\TestInterface;
+use Doctrine\ORM\EntityManagerInterface;
 use Interop\Container\ContainerInterface;
 use Mezzio\Application;
 use PHPUnit\Framework\AssertionFailedError;
@@ -39,9 +40,9 @@
 class Mezzio extends Framework implements DoctrineProvider
 {
     /**
-     * @var array
+     * @var array<string, mixed>
      */
-    protected $config = [
+    protected array $config = [
         'container'                          => 'config/container.php',
         'recreateApplicationBetweenTests'    => true,
         'recreateApplicationBetweenRequests' => false,
@@ -62,7 +63,7 @@ class Mezzio extends Framework implements DoctrineProvider
      */
     public Application $application;
 
-    public function _initialize()
+    public function _initialize(): void
     {
         $this->client = new MezzioConnector();
         $this->client->setConfig($this->config);
@@ -73,7 +74,7 @@ public function _initialize()
         }
     }
 
-    public function _before(TestInterface $test)
+    public function _before(TestInterface $test): void
     {
         $this->client = new MezzioConnector();
         $this->client->setConfig($this->config);
@@ -86,7 +87,7 @@ public function _before(TestInterface $test)
         }
     }
 
-    public function _after(TestInterface $test)
+    public function _after(TestInterface $test): void
     {
         //Close the session, if any are open
         if (session_status() == PHP_SESSION_ACTIVE) {
@@ -99,7 +100,7 @@ public function _after(TestInterface $test)
         parent::_after($test);
     }
 
-    public function _getEntityManager()
+    public function _getEntityManager(): EntityManagerInterface
     {
         $service = 'Doctrine\ORM\EntityManager';
         if (!$this->container->has($service)) {