diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index b9c47e8..9747228 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0778da5..fd44f8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 10 matrix: - php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'] + php: ['8.2', '8.3', '8.4', '8.5'] steps: - name: Set up PHP @@ -23,7 +23,7 @@ jobs: coverage: none - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Initialize tests run: make initialize @@ -31,8 +31,7 @@ jobs: - name: Download dependencies run: | composer config minimum-stability dev - composer req symfony/phpunit-bridge --no-update composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable - name: Run tests - run: ./vendor/bin/simple-phpunit + run: ./vendor/bin/phpunit diff --git a/CHANGELOG.md b/CHANGELOG.md index 342f019..01df470 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ ## NOT RELEASED +### Dependency bumped + +- Drop support for PHP versions lower than 8.2 + +### Changed + +- Apply new CodingStandard from latest php-cs-fixer. + ## 1.1.4 ### Changed diff --git a/Makefile b/Makefile index 850dffc..771133a 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ start-docker: echo "Noop" test: initialize - ./vendor/bin/simple-phpunit + ./vendor/bin/phpunit clean: stop-docker stop-docker: diff --git a/README.md b/README.md index 972f310..50bad94 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # AsyncAws IotData Client -![](https://github.com/async-aws/iot-data/workflows/Tests/badge.svg?branch=master) -![](https://github.com/async-aws/iot-data/workflows/BC%20Check/badge.svg?branch=master) +![CI](https://github.com/async-aws/iot-data/actions/workflows/ci.yml/badge.svg?branch=master) +![BC Check](https://github.com/async-aws/iot-data/actions/workflows/checks.yml/badge.svg?branch=master) An API client for IotData. diff --git a/composer.json b/composer.json index cbc70f3..a9c4a07 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,14 @@ "iot-data" ], "require": { - "php": "^7.2.5 || ^8.0", + "php": "^8.2", "async-aws/core": "^1.9" }, + "require-dev": { + "phpunit/phpunit": "^11.5.42", + "symfony/error-handler": "^7.3.2 || ^8.0", + "symfony/phpunit-bridge": "^7.3.2 || ^8.0" + }, "autoload": { "psr-4": { "AsyncAws\\IotData\\": "src" @@ -26,7 +31,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } } } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 9894ce3..20f6abf 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,17 +1,22 @@ - + ./src - + + trigger_deprecation + + @@ -20,4 +25,7 @@ ./tests/ + + + diff --git a/src/Input/GetThingShadowRequest.php b/src/Input/GetThingShadowRequest.php index 21e5b69..1b2174d 100644 --- a/src/Input/GetThingShadowRequest.php +++ b/src/Input/GetThingShadowRequest.php @@ -31,7 +31,7 @@ final class GetThingShadowRequest extends Input /** * @param array{ * thingName?: string, - * shadowName?: null|string, + * shadowName?: string|null, * '@region'?: string|null, * } $input */ @@ -45,7 +45,7 @@ public function __construct(array $input = []) /** * @param array{ * thingName?: string, - * shadowName?: null|string, + * shadowName?: string|null, * '@region'?: string|null, * }|GetThingShadowRequest $input */ diff --git a/src/Input/UpdateThingShadowRequest.php b/src/Input/UpdateThingShadowRequest.php index a1d9399..165c416 100644 --- a/src/Input/UpdateThingShadowRequest.php +++ b/src/Input/UpdateThingShadowRequest.php @@ -40,7 +40,7 @@ final class UpdateThingShadowRequest extends Input /** * @param array{ * thingName?: string, - * shadowName?: null|string, + * shadowName?: string|null, * payload?: string, * '@region'?: string|null, * } $input @@ -56,7 +56,7 @@ public function __construct(array $input = []) /** * @param array{ * thingName?: string, - * shadowName?: null|string, + * shadowName?: string|null, * payload?: string, * '@region'?: string|null, * }|UpdateThingShadowRequest $input diff --git a/src/IotDataClient.php b/src/IotDataClient.php index 4469ad9..712b465 100644 --- a/src/IotDataClient.php +++ b/src/IotDataClient.php @@ -39,7 +39,7 @@ class IotDataClient extends AbstractApi * * @param array{ * thingName: string, - * shadowName?: null|string, + * shadowName?: string|null, * '@region'?: string|null, * }|GetThingShadowRequest $input * @@ -84,7 +84,7 @@ public function getThingShadow($input): GetThingShadowResponse * * @param array{ * thingName: string, - * shadowName?: null|string, + * shadowName?: string|null, * payload: string, * '@region'?: string|null, * }|UpdateThingShadowRequest $input