Skip to content

Commit 9b5cf9d

Browse files
authored
Merge pull request #29 from DoclerLabs/feature/codeception-5-support-on-v1
Codeception 5 support on v1
2 parents 44012f3 + af92a9d commit 9b5cf9d

File tree

7 files changed

+22
-20
lines changed

7 files changed

+22
-20
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
max-parallel: 10
1111
matrix:
12-
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
12+
php: [ '8.0', '8.1', '8.2', '8.3' ]
1313

1414
steps:
1515
- name: Set up PHP

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
uses: actions/checkout@v2
1313

1414
- name: PHPStan
15-
uses: docker://oskarstark/phpstan-ga:0.12.85
15+
uses: docker://oskarstark/phpstan-ga:0.12.94
1616
env:
1717
REQUIRE_DEV: true
1818
with:

CHANGELOG-1.0.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [1.2.0] - 2024-05-13
8+
### Added
9+
- Added Codeception 5 support.
10+
- Added testing for PHP 8.3.
11+
12+
### Removed
13+
- Removed PHP ^7.2 support.
14+
715
## [1.1.0] - 2023-10-17
816
### Added
917
- Added PHP 8 support.

Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ coverage:
2121
static: static-phpstan static-cs-check
2222

2323
static-phpstan:
24-
docker run --rm -it -e REQUIRE_DEV=true -v ${PWD}:/app -w /app oskarstark/phpstan-ga:0.12.85 analyze $(PHPSTAN_PARAMS)
24+
docker run --rm -it -e REQUIRE_DEV=true -v ${PWD}:/app -w /app oskarstark/phpstan-ga:0.12.94 analyze $(PHPSTAN_PARAMS)
2525

2626
static-cs-fix:
2727
docker run --rm -it -v ${PWD}:/app -w /app oskarstark/php-cs-fixer-ga:2.19.0 --diff-format udiff $(CS_PARAMS)
@@ -33,10 +33,8 @@ DOCKER_RUN=docker run --rm -u $(shell id -u):$(shell id -g) -v $(shell pwd):/app
3333

3434
local-ci:
3535
$(DOCKER_RUN) -v ~/.composer:/tmp -v ~/.ssh:/root/.ssh composer:2 install
36-
$(DOCKER_RUN) php:7.2-cli vendor/bin/codecept build
37-
$(DOCKER_RUN) php:7.2-cli vendor/bin/codecept run
38-
$(DOCKER_RUN) php:7.3-cli vendor/bin/codecept run
39-
$(DOCKER_RUN) php:7.4-cli vendor/bin/codecept run
36+
$(DOCKER_RUN) php:8.0-cli vendor/bin/codecept build
4037
$(DOCKER_RUN) php:8.0-cli vendor/bin/codecept run
4138
$(DOCKER_RUN) php:8.1-cli vendor/bin/codecept run
4239
$(DOCKER_RUN) php:8.2-cli vendor/bin/codecept run
40+
$(DOCKER_RUN) php:8.3-cli vendor/bin/codecept run

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"type": "library",
1010
"license": "MIT",
1111
"require": {
12-
"php": "^7.2 || ^8.0",
13-
"codeception/codeception": "^4.0",
14-
"codeception/lib-innerbrowser": "^1.0",
12+
"php": "^8.0",
13+
"codeception/codeception": "^5",
14+
"codeception/lib-innerbrowser": "^3",
1515
"slim/slim": "^3.1"
1616
},
1717
"require-dev": {
1818
"ext-json": "*",
19-
"codeception/module-asserts": "^1.2",
20-
"codeception/module-rest": "^1.2"
19+
"codeception/module-asserts": "^3",
20+
"codeception/module-rest": "^3"
2121
},
2222
"autoload": {
2323
"psr-4": {

src/Lib/Connector/Slim.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121

2222
class Slim extends AbstractBrowser
2323
{
24-
/** @var App */
25-
private $app;
24+
private App $app;
2625

2726
public function setApp(App $app): void
2827
{

src/Module/Slim.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,11 @@
4646
*/
4747
class Slim extends Framework
4848
{
49-
/** @var App */
50-
public $app;
49+
public App $app;
5150

52-
/** @var array */
53-
protected $requiredFields = ['application'];
51+
protected array $requiredFields = ['application'];
5452

55-
/** @var string */
56-
private $applicationPath;
53+
private string $applicationPath;
5754

5855
public function _initialize(): void
5956
{

0 commit comments

Comments
 (0)