Merge pull request #40 from Codeception/codecept5

Naktibalda · web-flow · commit 55d0d106685c · 2022-04-20T13:09:13.000+03:00
Codeception 5 support
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,8 +8,8 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.4, 8.0]
-        laravel: [6, 8]
+        php: [8.0, 8.1]
+        laravel: [8]
 
     steps:
       - name: Checkout code
@@ -23,14 +23,6 @@ jobs:
           extensions: ctype, iconv, intl, json, mbstring, pdo, pdo_sqlite
           coverage: none
 
-      - name: Checkout Laravel 6 Sample
-        if: matrix.laravel == 6
-        uses: actions/checkout@v2
-        with:
-          repository: codeception/laravel-module-tests
-          path: framework-tests
-          ref: 6.x
-
       - name: Checkout Laravel 8 Sample
         if: matrix.laravel == 8
         uses: actions/checkout@v2
@@ -51,9 +43,7 @@ jobs:
           restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer-
 
       - name: Install dependencies
-        run: |
-          composer require laravel/framework=${{ matrix.laravel }} --ignore-platform-req=php --no-update
-          composer install --prefer-dist --no-progress --ignore-platform-req=php
+        run: composer install --prefer-dist --no-progress
 
       - name: Validate composer.json and composer.lock
         run: composer validate
diff --git a/composer.json b/composer.json
@@ -19,16 +19,16 @@
     ],
     "minimum-stability": "RC",
     "require": {
-        "php": "^7.4 | ^8.0",
+        "php": "^8.0",
         "ext-json": "*",
-        "codeception/lib-innerbrowser": "^2.0",
-        "codeception/codeception": "^4.1"
+        "codeception/lib-innerbrowser": "^3.1",
+        "codeception/codeception": "^5.0.0-RC2"
     },
     "require-dev": {
-        "codeception/module-asserts": "^2.0",
-        "codeception/module-rest": "^2.0",
-        "laravel/framework": "^6.0 | ^7.0 | ^8.0",
-        "vlucas/phpdotenv": "^3.6 | ^4.1 | ^5.2"
+        "codeception/module-asserts": "^3.0",
+        "codeception/module-rest": "^3.1",
+        "laravel/framework": "^8.0",
+        "vlucas/phpdotenv": "^5.3"
     },
     "autoload": {
         "classmap": ["src/"]
diff --git a/src/Codeception/Module/Laravel.php b/src/Codeception/Module/Laravel.php
@@ -152,7 +152,7 @@ class Laravel extends Framework implements ActiveRecord, PartedModule
     /**
      * @var array
      */
-    public $config = [];
+    public array $config = [];
 
     public function __construct(ModuleContainer $moduleContainer, ?array $config = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ class Laravel extends Framework implements ActiveRecord, PartedModule`
`152`	`152`	`/**`
`153`	`153`	`* @var array`
`154`	`154`	`*/`
`155`		`- public $config = [];`
	`155`	`+ public array $config = [];`
`156`	`156`
`157`	`157`	`public function __construct(ModuleContainer $moduleContainer, ?array $config = null)`
`158`	`158`	`{`