Skip to content
This repository was archived by the owner on Jul 6, 2024. It is now read-only.

Commit 36ac9a2

Browse files
author
Dominik Zogg
committed
php 8.3
1 parent 42efb11 commit 36ac9a2

12 files changed

+73
-106
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,36 @@ on:
66
- cron: '0 0 * * *'
77

88
jobs:
9-
php80:
10-
name: PHP 8.0
11-
runs-on: ubuntu-20.04
9+
php81:
10+
name: PHP 8.1
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: checkout
1414
uses: actions/checkout@v3
1515
- name: composer test
16-
uses: docker://chubbyphp/ci-php80:latest
16+
uses: docker://chubbyphp/ci-php81:latest
1717
env:
1818
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1919
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
20-
php81:
21-
name: PHP 8.1
22-
runs-on: ubuntu-20.04
20+
php82:
21+
name: PHP 8.2
22+
runs-on: ubuntu-22.04
2323
steps:
2424
- name: checkout
2525
uses: actions/checkout@v3
2626
- name: composer test
27-
uses: docker://chubbyphp/ci-php81:latest
27+
uses: docker://chubbyphp/ci-php82:latest
2828
env:
2929
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3030
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
31-
php82:
32-
name: PHP 8.2
33-
runs-on: ubuntu-20.04
31+
php83:
32+
name: PHP 8.3
33+
runs-on: ubuntu-22.04
3434
steps:
3535
- name: checkout
3636
uses: actions/checkout@v3
3737
- name: composer test
38-
uses: docker://chubbyphp/ci-php82:latest
38+
uses: docker://chubbyphp/ci-php83:latest
3939
env:
4040
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4141
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
.idea/
3+
.phpunit.cache
34
.vscode/
45
build/
56
composer.lock

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![CI](https://github.com/chubbyphp/chubbyphp-api-http/workflows/CI/badge.svg?branch=master)](https://github.com/chubbyphp/chubbyphp-api-http/actions?query=workflow%3ACI)
44
[![Coverage Status](https://coveralls.io/repos/github/chubbyphp/chubbyphp-api-http/badge.svg?branch=master)](https://coveralls.io/github/chubbyphp/chubbyphp-api-http?branch=master)
5-
[![Infection MSI](https://badge.stryker-mutator.io/github.com/chubbyphp/chubbyphp-api-http/master)](https://dashboard.stryker-mutator.io/reports/github.com/chubbyphp/chubbyphp-api-http/master)
5+
[![Mutation testing badge](https://img.shields.io/endpoint?style=flat&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2Fchubbyphp%2Fchubbyphp-api-http%2Fmaster)](https://dashboard.stryker-mutator.io/reports/github.com/chubbyphp/chubbyphp-api-http/master)[![Latest Stable Version](https://poser.pugx.org/chubbyphp/chubbyphp-api-http/v/stable.png)](https://packagist.org/packages/chubbyphp/chubbyphp-api-http)
66
[![Latest Stable Version](https://poser.pugx.org/chubbyphp/chubbyphp-api-http/v/stable.png)](https://packagist.org/packages/chubbyphp/chubbyphp-api-http)
77
[![Total Downloads](https://poser.pugx.org/chubbyphp/chubbyphp-api-http/downloads.png)](https://packagist.org/packages/chubbyphp/chubbyphp-api-http)
88
[![Monthly Downloads](https://poser.pugx.org/chubbyphp/chubbyphp-api-http/d/monthly)](https://packagist.org/packages/chubbyphp/chubbyphp-api-http)
@@ -25,22 +25,22 @@ A simple http handler implementation for API.
2525

2626
## Requirements
2727

28-
* php: ^8.0
29-
* chubbyphp/chubbyphp-deserialization: ^3.5.1
30-
* chubbyphp/chubbyphp-http-exception: ^1.0.1
31-
* chubbyphp/chubbyphp-negotiation: ^1.9
32-
* chubbyphp/chubbyphp-serialization: ^3.3.1
33-
* psr/http-factory: ^1.0.1
34-
* psr/http-message: ^1.0.1
35-
* psr/http-server-middleware: ^1.0.1
36-
* psr/log: ^1.1.4|^2.0|^3.0
28+
* php: ^8.1
29+
* chubbyphp/chubbyphp-deserialization: ^4.0
30+
* chubbyphp/chubbyphp-http-exception: ^1.1
31+
* chubbyphp/chubbyphp-negotiation: ^2.0
32+
* chubbyphp/chubbyphp-serialization: ^4.0
33+
* psr/http-factory: ^1.0.2
34+
* psr/http-message: ^1.1|^2.0
35+
* psr/http-server-middleware: ^1.0.2
36+
* psr/log: ^2.0|^3.0
3737

3838
## Installation
3939

4040
Through [Composer](http://getcomposer.org) as [chubbyphp/chubbyphp-api-http][1].
4141

4242
```sh
43-
composer require chubbyphp/chubbyphp-api-http "^5.0"
43+
composer require chubbyphp/chubbyphp-api-http "^6.0"
4444
```
4545

4646
## Usage

‎composer.json‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,26 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^8.0",
14-
"chubbyphp/chubbyphp-deserialization": "^3.5.1",
15-
"chubbyphp/chubbyphp-http-exception": "^1.0.1",
16-
"chubbyphp/chubbyphp-negotiation": "^1.9",
17-
"chubbyphp/chubbyphp-serialization": "^3.3.1",
18-
"psr/http-factory": "^1.0.1",
19-
"psr/http-message": "^1.0.1",
20-
"psr/http-server-middleware": "^1.0.1",
21-
"psr/log": "^1.1.4|^2.0|^3.0"
13+
"php": "^8.1",
14+
"chubbyphp/chubbyphp-deserialization": "^4.0",
15+
"chubbyphp/chubbyphp-http-exception": "^1.1",
16+
"chubbyphp/chubbyphp-negotiation": "^2.0",
17+
"chubbyphp/chubbyphp-serialization": "^4.0",
18+
"psr/http-factory": "^1.0.2",
19+
"psr/http-message": "^1.1|^2.0",
20+
"psr/http-server-middleware": "^1.0.2",
21+
"psr/log": "^2.0|^3.0"
2222
},
2323
"require-dev": {
24-
"chubbyphp/chubbyphp-container": "^2.1",
24+
"chubbyphp/chubbyphp-container": "^2.2",
2525
"chubbyphp/chubbyphp-dev-helper": "dev-master",
26-
"chubbyphp/chubbyphp-laminas-config-factory": "^1.2",
27-
"chubbyphp/chubbyphp-mock": "^1.6.1",
28-
"infection/infection": "^0.26.5",
29-
"php-coveralls/php-coveralls": "^2.5.2",
30-
"phploc/phploc": "^7.0.2",
31-
"phpstan/extension-installer": "^1.1",
32-
"phpstan/phpstan": "^1.4.8",
33-
"phpunit/phpunit": "^9.5.17",
26+
"chubbyphp/chubbyphp-laminas-config-factory": "^1.3",
27+
"chubbyphp/chubbyphp-mock": "^1.7",
28+
"infection/infection": "^0.27.9",
29+
"php-coveralls/php-coveralls": "^2.7",
30+
"phpstan/extension-installer": "^1.3.1",
31+
"phpstan/phpstan": "^1.10.50",
32+
"phpunit/phpunit": "^10.5.3",
3433
"pimple/pimple": "^3.5",
3534
"psr/container": "^2.0.2"
3635
},
@@ -49,7 +48,7 @@
4948
},
5049
"extra": {
5150
"branch-alias": {
52-
"dev-master": "5.0-dev"
51+
"dev-master": "6.0-dev"
5352
}
5453
},
5554
"scripts": {
@@ -60,14 +59,12 @@
6059
"@test:integration",
6160
"@test:infection",
6261
"@test:static-analysis",
63-
"@test:loc",
6462
"@test:cs"
6563
],
6664
"test:cs": "mkdir -p build && PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --cache-file=build/phpcs.cache",
6765
"test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=100 --verbose --coverage=build/phpunit",
6866
"test:integration": "vendor/bin/phpunit --testsuite=Integration --cache-result-file=build/phpunit/result.cache",
6967
"test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",
70-
"test:loc": "mkdir -p build && vendor/bin/phploc src | tee build/phploc.log",
7168
"test:static-analysis": "mkdir -p build && bash -c 'vendor/bin/phpstan analyse src --no-progress --level=8 --error-format=junit | tee build/phpstan.junit.xml; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",
7269
"test:unit": "vendor/bin/phpunit --testsuite=Unit --coverage-text --coverage-clover=build/phpunit/clover.xml --coverage-html=build/phpunit/coverage-html --coverage-xml=build/phpunit/coverage-xml --log-junit=build/phpunit/junit.xml --cache-result-file=build/phpunit/result.cache"
7370
}

‎phpunit.xml‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
backupGlobals="false"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
executionOrder="random"
10-
processIsolation="false"
11-
stopOnFailure="false"
12-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
13-
<coverage>
14-
<include>
15-
<directory>./src</directory>
16-
</include>
17-
</coverage>
18-
<testsuites>
19-
<testsuite name="Integration">
20-
<directory>./tests/Integration</directory>
21-
</testsuite>
22-
<testsuite name="Unit">
23-
<directory>./tests/Unit</directory>
24-
</testsuite>
25-
</testsuites>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" executionOrder="random" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
3+
<coverage/>
4+
<testsuites>
5+
<testsuite name="Integration">
6+
<directory>./tests/Integration</directory>
7+
</testsuite>
8+
<testsuite name="Unit">
9+
<directory>./tests/Unit</directory>
10+
</testsuite>
11+
</testsuites>
12+
<source>
13+
<include>
14+
<directory>./src</directory>
15+
</include>
16+
</source>
2617
</phpunit>

‎src/Manager/RequestManager.php‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,19 @@
1010

1111
final class RequestManager implements RequestManagerInterface
1212
{
13-
public function __construct(private DeserializerInterface $deserializer)
14-
{
15-
}
13+
public function __construct(private DeserializerInterface $deserializer) {}
1614

17-
/**
18-
* @param object|string $object
19-
*/
2015
public function getDataFromRequestQuery(
2116
ServerRequestInterface $request,
22-
$object,
17+
object|string $object,
2318
?DenormalizerContextInterface $context = null
2419
): object {
2520
return $this->deserializer->denormalize($object, $request->getQueryParams(), $context);
2621
}
2722

28-
/**
29-
* @param object|string $object
30-
*/
3123
public function getDataFromRequestBody(
3224
ServerRequestInterface $request,
33-
$object,
25+
object|string $object,
3426
string $contentType,
3527
?DenormalizerContextInterface $context = null
3628
): object {

‎src/Manager/RequestManagerInterface.php‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,15 @@
99

1010
interface RequestManagerInterface
1111
{
12-
/**
13-
* @param object|string $object
14-
*/
1512
public function getDataFromRequestQuery(
1613
ServerRequestInterface $request,
17-
$object,
14+
object|string $object,
1815
?DenormalizerContextInterface $context = null
1916
): object;
2017

21-
/**
22-
* @param object|string $object
23-
*/
2418
public function getDataFromRequestBody(
2519
ServerRequestInterface $request,
26-
$object,
20+
object|string $object,
2721
string $contentType,
2822
?DenormalizerContextInterface $context = null
2923
): object;

‎src/Manager/ResponseManager.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ final class ResponseManager implements ResponseManagerInterface
1515
public function __construct(
1616
private ResponseFactoryInterface $responseFactory,
1717
private SerializerInterface $serializer
18-
) {
19-
}
18+
) {}
2019

2120
public function create(
2221
object $object,

‎src/Middleware/AcceptAndContentTypeMiddleware.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ public function __construct(
1919
private AcceptNegotiatorInterface $acceptNegotiator,
2020
private ContentTypeNegotiatorInterface $contentTypeNegotiator,
2121
private ResponseManagerInterface $responseManager
22-
) {
23-
}
22+
) {}
2423

2524
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
2625
{

‎tests/Unit/Manager/ResponseManagerTest.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testCreateWithDefaults(): void
3333

3434
/** @var MockObject|StreamInterface $body */
3535
$body = $this->getMockByCalls(StreamInterface::class, [
36-
Call::create('write')->with($bodyString),
36+
Call::create('write')->with($bodyString)->willReturn(\strlen($bodyString)),
3737
]);
3838

3939
/** @var MockObject|Response $response */
@@ -65,7 +65,7 @@ public function testCreateWithoutDefaults(): void
6565

6666
/** @var MockObject|StreamInterface $body */
6767
$body = $this->getMockByCalls(StreamInterface::class, [
68-
Call::create('write')->with($bodyString),
68+
Call::create('write')->with($bodyString)->willReturn(\strlen($bodyString)),
6969
]);
7070

7171
/** @var MockObject|Response $response */
@@ -174,11 +174,13 @@ public function testCreateRedirectWithoutDefaults(): void
174174

175175
public function testCreateFromHttpException(): void
176176
{
177+
$bodyString = '{"title":"Method Not Allowed"}';
178+
177179
$httpException = HttpException::createMethodNotAllowed(['allowedMethods' => ['PATCH', 'PUT']]);
178180

179181
/** @var MockObject|StreamInterface $body */
180182
$body = $this->getMockByCalls(StreamInterface::class, [
181-
Call::create('write')->with('{"title":"Method Not Allowed"}'),
183+
Call::create('write')->with($bodyString)->willReturn(\strlen($bodyString)),
182184
]);
183185

184186
/** @var MockObject|Response $response */

0 commit comments

Comments
 (0)