Skip to content

Commit

Permalink
Merge pull request #1 from 68publishers/feature/allow-symfony-7
Browse files Browse the repository at this point in the history
Allowed `symfony/yaml` v7 and added PHP 8.3 between tested versions
  • Loading branch information
tg666 authored Oct 14, 2024
2 parents bcb06a8 + d21d5e7 commit b1df833
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.4', '8.0', '8.1', '8.2']
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
16 changes: 15 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN apk add --no-cache ${PHPIZE_DEPS} \

CMD tail -f /dev/null

FROM php:8.2.7RC1-cli-alpine3.18 AS php82
FROM php:8.2.24-cli-alpine3.20 AS php82

CMD ["/bin/sh"]
WORKDIR /var/www/html
Expand All @@ -49,3 +49,17 @@ RUN apk add --no-cache ${PHPIZE_DEPS} \
&& docker-php-ext-enable pcov

CMD tail -f /dev/null

FROM php:8.3.12-cli-alpine3.20 AS php83

CMD ["/bin/sh"]
WORKDIR /var/www/html

RUN apk add --no-cache --update git
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
RUN apk add --no-cache ${PHPIZE_DEPS} \
&& pecl install pcov \
&& pecl install uopz-7.1.1 \
&& docker-php-ext-enable pcov uopz

CMD tail -f /dev/null
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ tests.all:
PHP=80 make tests.run
PHP=81 make tests.run
PHP=82 make tests.run
PHP=83 make tests.run

cs.fix:
PHP=74 make composer.update
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"ext-json": "*",
"guzzlehttp/guzzle": "^7.7",
"jms/serializer": "^3.24",
"symfony/yaml": "^5.4"
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.17",
Expand Down
11 changes: 9 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
php74:
build:
Expand Down Expand Up @@ -36,3 +34,12 @@ services:
container_name: 68publishers.crawler-client-php.82
volumes:
- .:/var/www/html:cached

php83:
build:
context: .
dockerfile: Dockerfile
target: php83
container_name: 68publishers.crawler-client-php.83
volumes:
- .:/var/www/html:cached
2 changes: 1 addition & 1 deletion src/Serializer/Handler/ObjectOrArrayHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static function getSubscribingMethods(): array
* @param mixed $data
* @param array<mixed> $type
*
* @return array<string, mixed>|ArrayObject<string, mixed>
* @return array<string, mixed>|ArrayObject<string, mixed>|null
*/
public function serialize(SerializationVisitorInterface $visitor, $data, array $type, SerializationContext $context)
{
Expand Down

0 comments on commit b1df833

Please sign in to comment.