Skip to content

Commit

Permalink
Merge pull request #29 from DoclerLabs/feature/codeception-5-support-…
Browse files Browse the repository at this point in the history
…on-v1

Codeception 5 support on v1
  • Loading branch information
tommey authored May 13, 2024
2 parents 44012f3 + af92a9d commit 9b5cf9d
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
max-parallel: 10
matrix:
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
php: [ '8.0', '8.1', '8.2', '8.3' ]

steps:
- name: Set up PHP
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: actions/checkout@v2

- name: PHPStan
uses: docker://oskarstark/phpstan-ga:0.12.85
uses: docker://oskarstark/phpstan-ga:0.12.94
env:
REQUIRE_DEV: true
with:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG-1.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.2.0] - 2024-05-13
### Added
- Added Codeception 5 support.
- Added testing for PHP 8.3.

### Removed
- Removed PHP ^7.2 support.

## [1.1.0] - 2023-10-17
### Added
- Added PHP 8 support.
Expand Down
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ coverage:
static: static-phpstan static-cs-check

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

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

local-ci:
$(DOCKER_RUN) -v ~/.composer:/tmp -v ~/.ssh:/root/.ssh composer:2 install
$(DOCKER_RUN) php:7.2-cli vendor/bin/codecept build
$(DOCKER_RUN) php:7.2-cli vendor/bin/codecept run
$(DOCKER_RUN) php:7.3-cli vendor/bin/codecept run
$(DOCKER_RUN) php:7.4-cli vendor/bin/codecept run
$(DOCKER_RUN) php:8.0-cli vendor/bin/codecept build
$(DOCKER_RUN) php:8.0-cli vendor/bin/codecept run
$(DOCKER_RUN) php:8.1-cli vendor/bin/codecept run
$(DOCKER_RUN) php:8.2-cli vendor/bin/codecept run
$(DOCKER_RUN) php:8.3-cli vendor/bin/codecept run
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"type": "library",
"license": "MIT",
"require": {
"php": "^7.2 || ^8.0",
"codeception/codeception": "^4.0",
"codeception/lib-innerbrowser": "^1.0",
"php": "^8.0",
"codeception/codeception": "^5",
"codeception/lib-innerbrowser": "^3",
"slim/slim": "^3.1"
},
"require-dev": {
"ext-json": "*",
"codeception/module-asserts": "^1.2",
"codeception/module-rest": "^1.2"
"codeception/module-asserts": "^3",
"codeception/module-rest": "^3"
},
"autoload": {
"psr-4": {
Expand Down
3 changes: 1 addition & 2 deletions src/Lib/Connector/Slim.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@

class Slim extends AbstractBrowser
{
/** @var App */
private $app;
private App $app;

public function setApp(App $app): void
{
Expand Down
9 changes: 3 additions & 6 deletions src/Module/Slim.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,11 @@
*/
class Slim extends Framework
{
/** @var App */
public $app;
public App $app;

/** @var array */
protected $requiredFields = ['application'];
protected array $requiredFields = ['application'];

/** @var string */
private $applicationPath;
private string $applicationPath;

public function _initialize(): void
{
Expand Down

0 comments on commit 9b5cf9d

Please sign in to comment.