[CI] Update all versions and dependencies (#73)

flix-tech · Aug 10, 2022 · b49d7c6 · b49d7c6
1 parent b6b6baa
commit b49d7c6
Show file tree

Hide file tree

Showing 16 changed files with 57 additions and 27 deletions.
diff --git a/.env.dist b/.env.dist
@@ -1 +1 @@
-SCHEMA_REGISTRY_HOST="http://192.168.104.103:8081"
+SCHEMA_REGISTRY_HOST="http://172.68.0.103:8081"
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -29,10 +29,13 @@ jobs:
         php:
           -
             version: 7.4
-            xdebug: 3.1.1
+            xdebug: 3.1.5
           -
             version: 8.0
-            xdebug: 3.1.1
+            xdebug: 3.1.5
+          -
+            version: 8.1
+            xdebug: 3.1.5
     runs-on: ubuntu-20.04
     steps:
       -
@@ -81,12 +84,18 @@ jobs:
           -
             version: 8.0
             composer: --prefer-lowest
+          -
+            version: 8.1
+            composer: --prefer-lowest
           -
             version: 7.4
             composer: --prefer-stable
           -
             version: 8.0
             composer: --prefer-stable
+          -
+            version: 8.1
+            composer: --prefer-stable
     steps:
       -
         name: Download sources
@@ -137,10 +146,10 @@ jobs:
           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 }} \
-            vendor/bin/phpunit --exclude-group integration --coverage-clover=build/coverage.clover --coverage-text
+            -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@v2.7.4
+        uses: paambaati/codeclimate-action@v3.0.0
         env:
           CC_TEST_REPORTER_ID: ${{secrets.CODE_CLIMATE_REPORTER_ID}}
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
-ARG PHP_VERSION=7.4
+ARG PHP_VERSION=8.1
 
 FROM php:${PHP_VERSION}-cli-alpine
 
-ARG XDEBUG_VERSION=3.1.1
+ARG XDEBUG_VERSION=3.1.5
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 RUN composer --version

diff --git a/Makefile b/Makefile
@@ -4,20 +4,21 @@ MAKEFLAGS =+ -rR --warn-undefined-variables
 .PHONY: composer-install composer-update phpstan cs-fixer examples docker run
 
 CONFLUENT_VERSION ?= latest
-CONFLUENT_NETWORK_SUBNET ?= 192.168.104.0/24
-SCHEMA_REGISTRY_IPV4 ?= 192.168.104.103
-KAFKA_BROKER_IPV4 ?= 192.168.104.102
-ZOOKEEPER_IPV4 ?= 192.168.104.101
+CONFLUENT_NETWORK_SUBNET ?= 172.68.0.0/24
+CONFLUENT_NETWORK_GATEWAY ?= 172.68.0.1
+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.1.9
+COMPOSER_VERSION ?= 2.3.10
 PHP_STAN ?= bin/phpstan.phar
-PHP_STAN_VERSION ?= 0.12.99
+PHP_STAN_VERSION ?= 1.8.2
 PHP_CS_FIXER ?= bin/php-cs-fixer.phar
-PHP_CS_FIXER_VERSION ?= 3.2.1
+PHP_CS_FIXER_VERSION ?= 3.9.5
 PHPUNIT ?= vendor/bin/phpunit
 PHP ?= bin/php
-PHP_VERSION ?= 7.4
-XDEBUG_VERSION ?= 3.1.1
+PHP_VERSION ?= 8.1
+XDEBUG_VERSION ?= 3.1.5
 XDEBUG_OPTIONS ?= -d xdebug.mode=off
 export
 

diff --git a/composer.json b/composer.json
@@ -23,15 +23,16 @@
     }
   ],
   "require": {
-    "php": "^7.3|^8.0",
+    "php": "^7.3|^8.0|^8.1",
     "beberlei/assert": "^2.9.9|~3.0",
-    "flix-tech/confluent-schema-registry-api": "^7.3.1",
+    "flix-tech/confluent-schema-registry-api": "^7.6.0",
     "guzzlehttp/promises": "^1.4.0",
-    "flix-tech/avro-php": "^4.1.0",
+    "flix-tech/avro-php": "^4.3.0",
     "widmogrod/php-functional": "^6.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^8.2.3|^9.4.2",
+    "roave/security-advisories": "dev-latest",
+    "phpunit/phpunit": "^9.4.2",
     "phpbench/phpbench": "1.0.0-alpha2",
     "vlucas/phpdotenv": "~2.4",
     "symfony/serializer": "^3.4|^4.3",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       ZOOKEEPER_CLIENT_PORT: 2181
       ZOOKEEPER_TICK_TIME: 2000
     networks:
-      avro-serializer-net:
+      schema-registry-net:
         ipv4_address: ${ZOOKEEPER_IPV4}
 
   broker:
@@ -23,9 +23,10 @@ services:
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
-      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://${KAFKA_BROKER_IPV4}:9092'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://172.68.0.102:9092'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
     networks:
-      avro-serializer-net:
+      schema-registry-net:
         ipv4_address: ${KAFKA_BROKER_IPV4}
 
   schema_registry:
@@ -39,13 +40,17 @@ services:
     environment:
       SCHEMA_REGISTRY_HOST_NAME: ${SCHEMA_REGISTRY_IPV4}
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
+      SCHEMA_REGISTRY_LISTENERS: "http://${SCHEMA_REGISTRY_IPV4}:8081"
+      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: 'PLAINTEXT://172.68.0.102:9092'
     networks:
-      avro-serializer-net:
+      schema-registry-net:
         ipv4_address: ${SCHEMA_REGISTRY_IPV4}
 
 networks:
-  avro-serializer-net:
+  schema-registry-net:
     driver: bridge
     ipam:
+      driver: default
       config:
-      - subnet: ${CONFLUENT_NETWORK_SUBNET}
+        - subnet: "${CONFLUENT_NETWORK_SUBNET}"
+          gateway: "${CONFLUENT_NETWORK_GATEWAY}"
diff --git a/src/Common.php b/src/Common.php
@@ -3,6 +3,7 @@
 namespace FlixTech\AvroSerializer\Common;
 
 use Widmogrod\Monad\Maybe\Maybe;
+
 use function Widmogrod\Functional\curryN;
 use function Widmogrod\Monad\Maybe\just;
 use function Widmogrod\Monad\Maybe\nothing;

diff --git a/src/Objects/RecordSerializer.php b/src/Objects/RecordSerializer.php
@@ -10,12 +10,14 @@
 use FlixTech\SchemaRegistryApi\Exception\SubjectNotFoundException;
 use FlixTech\SchemaRegistryApi\Registry;
 use GuzzleHttp\Promise\PromiseInterface;
+
 use const FlixTech\AvroSerializer\Common\get;
 use const FlixTech\AvroSerializer\Protocol\PROTOCOL_ACCESSOR_AVRO;
 use const FlixTech\AvroSerializer\Protocol\PROTOCOL_ACCESSOR_SCHEMA_ID;
 use const FlixTech\AvroSerializer\Protocol\WIRE_FORMAT_PROTOCOL_VERSION;
 use const Widmogrod\Functional\identity;
 use const Widmogrod\Functional\reThrow;
+
 use function FlixTech\AvroSerializer\Common\memoize;
 use function FlixTech\AvroSerializer\Protocol\decode;
 use function FlixTech\AvroSerializer\Protocol\encoder;
@@ -207,7 +209,7 @@ private function handleSubjectOrSchemaNotFound(SchemaRegistryException $e): void
             default:
                 // @codeCoverageIgnoreStart
                 throw $e;
-                // @codeCoverageIgnoreEnd
+            // @codeCoverageIgnoreEnd
         }
     }
 }
diff --git a/src/Protocol.php b/src/Protocol.php
@@ -9,6 +9,7 @@
 use Widmogrod\Monad\Either\Left;
 use Widmogrod\Monad\Either\Right;
 use Widmogrod\Monad\Maybe\Maybe;
+
 use function Widmogrod\Functional\curryN;
 use function Widmogrod\Monad\Maybe\just;
 use function Widmogrod\Monad\Maybe\nothing;

diff --git a/src/Serialize.php b/src/Serialize.php
@@ -12,6 +12,7 @@
 use Widmogrod\Monad\Either\Either;
 use Widmogrod\Monad\Either\Left;
 use Widmogrod\Monad\Either\Right;
+
 use function Widmogrod\Functional\curryN;
 use function Widmogrod\Functional\tryCatch;
 

diff --git a/test/CommonTest.php b/test/CommonTest.php
@@ -6,10 +6,12 @@
 
 use Widmogrod\Monad\Maybe\Just;
 use Widmogrod\Monad\Maybe\Nothing;
+
 use const FlixTech\AvroSerializer\Common\get;
 use const FlixTech\AvroSerializer\Protocol\PROTOCOL_ACCESSOR_AVRO;
 use const FlixTech\AvroSerializer\Protocol\PROTOCOL_ACCESSOR_SCHEMA_ID;
 use const FlixTech\AvroSerializer\Protocol\PROTOCOL_ACCESSOR_VERSION;
+
 use function FlixTech\AvroSerializer\Common\get;
 use function FlixTech\AvroSerializer\Common\getter;
 use function Widmogrod\Functional\curryN;

diff --git a/test/Objects/RecordSerializerTest.php b/test/Objects/RecordSerializerTest.php
@@ -14,6 +14,7 @@
 use GuzzleHttp\Promise\FulfilledPromise;
 use LogicException;
 use PHPUnit\Framework\MockObject\MockObject;
+
 use function FlixTech\AvroSerializer\Common\memoize;
 
 class RecordSerializerTest extends AbstractFunctionalTestCase

diff --git a/test/Objects/SchemaResolvers/CallableResolverTest.php b/test/Objects/SchemaResolvers/CallableResolverTest.php
@@ -6,6 +6,7 @@
 
 use FlixTech\AvroSerializer\Objects\SchemaResolvers\CallableResolver;
 use FlixTech\AvroSerializer\Test\AbstractFunctionalTestCase;
+
 use function Widmogrod\Functional\constt;
 
 class CallableResolverTest extends AbstractFunctionalTestCase

diff --git a/test/Objects/SchemaResolvers/FileResolverTest.php b/test/Objects/SchemaResolvers/FileResolverTest.php
@@ -6,6 +6,7 @@
 
 use FlixTech\AvroSerializer\Objects\SchemaResolvers\FileResolver;
 use PHPUnit\Framework\TestCase;
+
 use function FlixTech\AvroSerializer\Common\inflectRecord;
 
 class FileResolverTest extends TestCase

diff --git a/test/ProtocolTest.php b/test/ProtocolTest.php
@@ -7,12 +7,14 @@
 use Widmogrod\Monad\Either\Right;
 use Widmogrod\Monad\Maybe\Just;
 use Widmogrod\Monad\Maybe\Nothing;
+
 use const FlixTech\AvroSerializer\Protocol\encode;
 use const FlixTech\AvroSerializer\Protocol\PROTOCOL_ACCESSOR_AVRO;
 use const FlixTech\AvroSerializer\Protocol\PROTOCOL_ACCESSOR_SCHEMA_ID;
 use const FlixTech\AvroSerializer\Protocol\PROTOCOL_ACCESSOR_VERSION;
 use const FlixTech\AvroSerializer\Protocol\validate;
 use const FlixTech\AvroSerializer\Protocol\WIRE_FORMAT_PROTOCOL_VERSION;
+
 use function FlixTech\AvroSerializer\Protocol\decode;
 use function FlixTech\AvroSerializer\Protocol\encode;
 use function FlixTech\AvroSerializer\Protocol\encoder;

diff --git a/test/SerializeTest.php b/test/SerializeTest.php
@@ -7,7 +7,9 @@
 use FlixTech\AvroSerializer\Objects\Exceptions\AvroEncodingException;
 use Widmogrod\Monad\Either\Left;
 use Widmogrod\Monad\Either\Right;
+
 use const FlixTech\AvroSerializer\Serialize\writeDatum;
+
 use function FlixTech\AvroSerializer\Serialize\avroBinaryDecoder;
 use function FlixTech\AvroSerializer\Serialize\avroBinaryEncoder;
 use function FlixTech\AvroSerializer\Serialize\avroDatumReader;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SCHEMA_REGISTRY_HOST="http://192.168.104.103:8081"
		SCHEMA_REGISTRY_HOST="http://172.68.0.103:8081"