Align with flix tech v2 (#7)

* fixing php 8.4 deprecations (flix-tech#88) Co-authored-by: mihai.leu <[email protected]> * Bump actions/download-artifact from 2 to 4.1.7 in /.github/workflows (flix-tech#85) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@v2...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Ploch <[email protected]> * [PHP] Drop PHP 7.4 & 8.0 (flix-tech#90) - Upgrade all dependencies - Refurbish code to pass CI tests again * [DOC] Update README.md with correct versions * add logical types and attributes support * add test and fix error on AvroSymbols * restore AvroSerDeEncoderTest.php * fix tests imports --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: mihaileu <[email protected]> Co-authored-by: mihai.leu <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Ploch <[email protected]> Co-authored-by: Thomas Ploch <[email protected]>
mattiabasone · Feb 17, 2025 · 794b3a5 · 794b3a5
1 parent dd96c20
commit 794b3a5
Show file tree

Hide file tree

Showing 96 changed files with 757 additions and 964 deletions.
diff --git a/.env.dist → .env b/.env.dist → .env
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -6,20 +6,21 @@ on:
       - master
 jobs:
   build-source:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       -
         name: Install phars
         run: |
           make install-phars
       -
         name: Upload source directory
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: source
+          include-hidden-files: true
           path: .
   php-xdebug-docker:
     needs:
@@ -29,26 +30,29 @@ jobs:
         php:
           -
             version: '8.1'
-            xdebug: '3.1.5'
+            xdebug: '3.4.0'
           -
             version: '8.2'
-            xdebug: '3.2.1'
+            xdebug: '3.4.0'
           -
             version: '8.3'
-            xdebug: '3.3.1'
-    runs-on: ubuntu-20.04
+            xdebug: '3.4.0'
+          -
+            version: '8.4'
+            xdebug: '3.4.0'
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Download sources
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: source
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       -
         name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
@@ -67,12 +71,12 @@ jobs:
           docker save php-avro-serde:${{ matrix.php.version }} -o php-avro-serde-${{ matrix.php.version }}.tgz
       -
         name: Upload docker image
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: php-avro-serde-${{ matrix.php.version }}
           path: php-avro-serde-${{ matrix.php.version }}.tgz
   ci-checks:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - php-xdebug-docker
     strategy:
@@ -87,27 +91,33 @@ jobs:
           -
             version: '8.3'
             composer: --prefer-lowest
+          -
+            version: '8.4'
+            composer: --prefer-lowest
           -
             version: '8.1'
             composer: --prefer-stable
           -
             version: '8.2'
             composer: --prefer-stable
           -
-            version: '8.2'
+            version: '8.3'
+            composer: --prefer-stable
+          -
+            version: '8.4'
             composer: --prefer-stable
     steps:
       -
         name: Download sources
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: source
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       -
         name: Download docker image
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: php-avro-serde-${{ matrix.php.version }}
       -
@@ -122,75 +132,73 @@ jobs:
             composer update --no-interaction --no-scripts --no-ansi ${{ matrix.php.composer }}
       -
         name: Run Static analysis
-        if: ${{ matrix.php.version == '7.4' && matrix.php.composer == '--prefer-stable' }}
+        if: ${{ matrix.php.version == '8.3' && matrix.php.composer == '--prefer-stable' }}
         run: |
           chmod a+x bin/phpstan.phar bin/php-cs-fixer.phar
           docker run -i --rm --net=host --sig-proxy=true --pid=host \
             -v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" -w "${GITHUB_WORKSPACE}" php-avro-serde:${{ matrix.php.version }} \
-            bin/phpstan.phar analyse
+            bin/phpstan.phar analyse --memory-limit 4G
           docker run -i --rm --net=host --sig-proxy=true --pid=host \
             -v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" -w "${GITHUB_WORKSPACE}" php-avro-serde:${{ matrix.php.version }} \
             bin/php-cs-fixer.phar fix --config=.php-cs-fixer.dist.php --diff -v --dry-run --path-mode=intersection --allow-risky=yes \
             src test
       -
         name: Run PHPUnit
-        if: ${{ !(matrix.php.version == '7.4' && matrix.php.composer == '--prefer-stable') }}
+        if: ${{ !(matrix.php.version == '8.3' && matrix.php.composer == '--prefer-stable') }}
         run: |
           docker run -i --rm --net=host --sig-proxy=true --pid=host \
             -v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" -w "${GITHUB_WORKSPACE}" php-avro-serde:${{ matrix.php.version }} \
             vendor/bin/phpunit --exclude-group integration
       -
         name: Run PHPUnit with Coverage Report
-        if: ${{ matrix.php.version == '7.4' && matrix.php.composer == '--prefer-stable' }}
+        if: ${{ matrix.php.version == '8.3' && matrix.php.composer == '--prefer-stable' }}
         run: |
           mkdir -p build
           docker run -i --rm --net=host --sig-proxy=true --pid=host \
             -v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" -w "${GITHUB_WORKSPACE}" php-avro-serde:${{ matrix.php.version }} \
             -d xdebug.mode=coverage vendor/bin/phpunit --exclude-group integration --coverage-clover=build/coverage.clover --coverage-text
       - name: Publish code coverage
-        if: ${{ matrix.php.version == '7.4' && matrix.php.composer == '--prefer-stable' && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: paambaati/codeclimate-action@v3.0.0
+        if: ${{ matrix.php.version == '8.3' && matrix.php.composer == '--prefer-stable' && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: paambaati/codeclimate-action@v9
         env:
           CC_TEST_REPORTER_ID: ${{secrets.CODE_CLIMATE_REPORTER_ID}}
         with:
           coverageLocations: |
             ${{github.workspace}}/build/coverage.clover:clover
   confluent-integration:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - php-xdebug-docker
     strategy:
       matrix:
         confluent:
           -
             version: latest
-          -
-            version: 4.1.4
           -
             version: 5.5.2
     steps:
       -
         name: Download sources
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: source
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       -
         name: Download docker image
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
-          name: php-avro-serde-8.1
+          name: php-avro-serde-8.3
       -
         name: Load docker image
         run: |
-          docker load -i php-avro-serde-8.1.tgz
+          docker load -i php-avro-serde-8.3.tgz
       -
         name: Install vendors
         run: |
           docker run -i --rm --net=host --sig-proxy=true --pid=host \
-            -v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" -w "${GITHUB_WORKSPACE}" php-avro-serde:8.1 \
+            -v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" -w "${GITHUB_WORKSPACE}" php-avro-serde:8.3 \
             composer update --no-interaction --no-scripts --no-ansi --prefer-stable
       -
         name: Run PHPUnit Integration
@@ -200,5 +208,5 @@ jobs:
           chmod a+x bin/wait-for-all.sh bin/wait-for-it.sh
           make platform
           docker run -i --rm --net=host --sig-proxy=true --pid=host \
-            -v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" -w "${GITHUB_WORKSPACE}" php-avro-serde:8.1 \
+            -v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" -w "${GITHUB_WORKSPACE}" php-avro-serde:8.3 \
             vendor/bin/phpunit --group integration
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,6 @@ composer.lock
 
 # Custom entries
 .php_cs*.cache
-.env
 variables.mk
 build/
 ocular.phar

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -23,7 +23,8 @@
         'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'all', 'strict' => false],
         'ordered_class_elements' => true,
         'php_unit_method_casing' => false,
+        'fully_qualified_strict_types' => false,
     ])
     ->setFinder($finder)
-    ->setCacheFile('.php_cs.' . (string) getenv('PHP_VERSION') . '.cache')
+    ->setCacheFile('.php_cs.' . getenv('PHP_VERSION') . '.cache')
     ->setUsingCache(true);
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
-ARG PHP_VERSION=8.1
+ARG PHP_VERSION=8.3
 
 FROM php:${PHP_VERSION}-cli-alpine
 
-ARG XDEBUG_VERSION=3.1.5
+ARG XDEBUG_VERSION=3.4.0
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 RUN composer --version

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
-# no buildin rules and variables
+# no builtin rules and variables
 MAKEFLAGS =+ -rR --warn-undefined-variables
 
-.PHONY: composer-install composer-update phpstan cs-fixer examples docker run
+.PHONY: composer-install composer-update composer-update-lowest phpstan cs-fixer examples docker run
 
 CONFLUENT_VERSION ?= latest
 CONFLUENT_NETWORK_SUBNET ?= 172.68.0.0/24
@@ -10,15 +10,15 @@ SCHEMA_REGISTRY_IPV4 ?= 172.68.0.103
 KAFKA_BROKER_IPV4 ?= 172.68.0.102
 ZOOKEEPER_IPV4 ?= 172.68.0.101
 COMPOSER ?= bin/composer.phar
-COMPOSER_VERSION ?= 2.3.10
+COMPOSER_VERSION ?= 2.8.4
 PHP_STAN ?= bin/phpstan.phar
-PHP_STAN_VERSION ?= 1.8.2
+PHP_STAN_VERSION ?= 2.0.4
 PHP_CS_FIXER ?= bin/php-cs-fixer.phar
-PHP_CS_FIXER_VERSION ?= 3.9.5
+PHP_CS_FIXER_VERSION ?= 3.65.0
 PHPUNIT ?= vendor/bin/phpunit
 PHP ?= bin/php
-PHP_VERSION ?= 8.1
-XDEBUG_VERSION ?= 3.1.5
+PHP_VERSION ?= 8.3
+XDEBUG_VERSION ?= 3.4.0
 XDEBUG_OPTIONS ?= -d xdebug.mode=off
 export
 
@@ -36,8 +36,11 @@ composer-install:
 composer-update:
 	PHP_VERSION=$(PHP_VERSION) $(PHP) $(XDEBUG_OPTIONS) $(COMPOSER) update --prefer-stable --no-interaction --no-progress --no-scripts
 
+composer-update-lowest:
+	PHP_VERSION=$(PHP_VERSION) $(PHP) $(XDEBUG_OPTIONS) $(COMPOSER) update --prefer-lowest --no-interaction --no-progress --no-scripts
+
 phpstan:
-	PHP_VERSION=$(PHP_VERSION) $(PHP) $(XDEBUG_OPTIONS) $(PHP_STAN) analyse
+	PHP_VERSION=$(PHP_VERSION) $(PHP) $(XDEBUG_OPTIONS) $(PHP_STAN) analyse --memory-limit 4G
 
 cs-fixer:
 	PHP_VERSION=$(PHP_VERSION) $(PHP) $(XDEBUG_OPTIONS) $(PHP_CS_FIXER) fix --config=.php-cs-fixer.dist.php --diff -v --dry-run \

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ When serializing and deserializing messages using the [Avro](http://avro.apache.
 especially when integrating with the [Confluent Platform](https://docs.confluent.io/current/avro.html), you want to make
 sure that schemas are evolved in a way that downstream consumers are not affected.
 
-Hence [Confluent](https://www.confluent.io/) developed the
+Hence, [Confluent](https://www.confluent.io/) developed the
 [Schema Registry](https://docs.confluent.io/current/schema-registry/docs/index.html) which has the responsibility to
 validate a given schema evolution against a configurable compatibility policy.
 
@@ -27,7 +27,7 @@ integrates FlixTech's [Schema Registry Client](https://github.com/flix-tech/sche
 This library is using the [composer package manager](https://getcomposer.org/) for PHP.
 
 ```bash
-composer require 'flix-tech/avro-serde-php:^1.6'
+composer require 'flix-tech/avro-serde-php:^2.2'
 ```
 
 ## Quickstart
@@ -273,7 +273,7 @@ $resolver->keySchemaFor($record); // Will resolve $fileResolver, then $callableR
 
 ## Symfony Serializer Integration
 
-This library provides integrations with the [Symfony Serializer component](https://symfony.com/doc/master/components/serializer.html).
+This library provides integrations with the [Symfony Serializer component](https://symfony.com/doc/master/components/serializer.html) from version 6.4 and above.
 
 ```php
 <?php