Skip to content

Commit b49d7c6

Browse files
authored
[CI] Update all versions and dependencies (#73)
1 parent b6b6baa commit b49d7c6

File tree

16 files changed

+57
-27
lines changed

16 files changed

+57
-27
lines changed

.env.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SCHEMA_REGISTRY_HOST="http://192.168.104.103:8081"
1+
SCHEMA_REGISTRY_HOST="http://172.68.0.103:8081"

.github/workflows/checks.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@ jobs:
2929
php:
3030
-
3131
version: 7.4
32-
xdebug: 3.1.1
32+
xdebug: 3.1.5
3333
-
3434
version: 8.0
35-
xdebug: 3.1.1
35+
xdebug: 3.1.5
36+
-
37+
version: 8.1
38+
xdebug: 3.1.5
3639
runs-on: ubuntu-20.04
3740
steps:
3841
-
@@ -81,12 +84,18 @@ jobs:
8184
-
8285
version: 8.0
8386
composer: --prefer-lowest
87+
-
88+
version: 8.1
89+
composer: --prefer-lowest
8490
-
8591
version: 7.4
8692
composer: --prefer-stable
8793
-
8894
version: 8.0
8995
composer: --prefer-stable
96+
-
97+
version: 8.1
98+
composer: --prefer-stable
9099
steps:
91100
-
92101
name: Download sources
@@ -137,10 +146,10 @@ jobs:
137146
mkdir -p build
138147
docker run -i --rm --net=host --sig-proxy=true --pid=host \
139148
-v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" -w "${GITHUB_WORKSPACE}" php-avro-serde:${{ matrix.php.version }} \
140-
vendor/bin/phpunit --exclude-group integration --coverage-clover=build/coverage.clover --coverage-text
149+
-d xdebug.mode=coverage vendor/bin/phpunit --exclude-group integration --coverage-clover=build/coverage.clover --coverage-text
141150
- name: Publish code coverage
142151
if: ${{ matrix.php.version == '7.4' && matrix.php.composer == '--prefer-stable' && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
143-
uses: paambaati/codeclimate-action@v2.7.4
152+
uses: paambaati/codeclimate-action@v3.0.0
144153
env:
145154
CC_TEST_REPORTER_ID: ${{secrets.CODE_CLIMATE_REPORTER_ID}}
146155
with:

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
ARG PHP_VERSION=7.4
1+
ARG PHP_VERSION=8.1
22

33
FROM php:${PHP_VERSION}-cli-alpine
44

5-
ARG XDEBUG_VERSION=3.1.1
5+
ARG XDEBUG_VERSION=3.1.5
66

77
COPY --from=composer /usr/bin/composer /usr/bin/composer
88
RUN composer --version

Makefile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@ MAKEFLAGS =+ -rR --warn-undefined-variables
44
.PHONY: composer-install composer-update phpstan cs-fixer examples docker run
55

66
CONFLUENT_VERSION ?= latest
7-
CONFLUENT_NETWORK_SUBNET ?= 192.168.104.0/24
8-
SCHEMA_REGISTRY_IPV4 ?= 192.168.104.103
9-
KAFKA_BROKER_IPV4 ?= 192.168.104.102
10-
ZOOKEEPER_IPV4 ?= 192.168.104.101
7+
CONFLUENT_NETWORK_SUBNET ?= 172.68.0.0/24
8+
CONFLUENT_NETWORK_GATEWAY ?= 172.68.0.1
9+
SCHEMA_REGISTRY_IPV4 ?= 172.68.0.103
10+
KAFKA_BROKER_IPV4 ?= 172.68.0.102
11+
ZOOKEEPER_IPV4 ?= 172.68.0.101
1112
COMPOSER ?= bin/composer.phar
12-
COMPOSER_VERSION ?= 2.1.9
13+
COMPOSER_VERSION ?= 2.3.10
1314
PHP_STAN ?= bin/phpstan.phar
14-
PHP_STAN_VERSION ?= 0.12.99
15+
PHP_STAN_VERSION ?= 1.8.2
1516
PHP_CS_FIXER ?= bin/php-cs-fixer.phar
16-
PHP_CS_FIXER_VERSION ?= 3.2.1
17+
PHP_CS_FIXER_VERSION ?= 3.9.5
1718
PHPUNIT ?= vendor/bin/phpunit
1819
PHP ?= bin/php
19-
PHP_VERSION ?= 7.4
20-
XDEBUG_VERSION ?= 3.1.1
20+
PHP_VERSION ?= 8.1
21+
XDEBUG_VERSION ?= 3.1.5
2122
XDEBUG_OPTIONS ?= -d xdebug.mode=off
2223
export
2324

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@
2323
}
2424
],
2525
"require": {
26-
"php": "^7.3|^8.0",
26+
"php": "^7.3|^8.0|^8.1",
2727
"beberlei/assert": "^2.9.9|~3.0",
28-
"flix-tech/confluent-schema-registry-api": "^7.3.1",
28+
"flix-tech/confluent-schema-registry-api": "^7.6.0",
2929
"guzzlehttp/promises": "^1.4.0",
30-
"flix-tech/avro-php": "^4.1.0",
30+
"flix-tech/avro-php": "^4.3.0",
3131
"widmogrod/php-functional": "^6.0"
3232
},
3333
"require-dev": {
34-
"phpunit/phpunit": "^8.2.3|^9.4.2",
34+
"roave/security-advisories": "dev-latest",
35+
"phpunit/phpunit": "^9.4.2",
3536
"phpbench/phpbench": "1.0.0-alpha2",
3637
"vlucas/phpdotenv": "~2.4",
3738
"symfony/serializer": "^3.4|^4.3",

docker-compose.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
ZOOKEEPER_CLIENT_PORT: 2181
1111
ZOOKEEPER_TICK_TIME: 2000
1212
networks:
13-
avro-serializer-net:
13+
schema-registry-net:
1414
ipv4_address: ${ZOOKEEPER_IPV4}
1515

1616
broker:
@@ -23,9 +23,10 @@ services:
2323
environment:
2424
KAFKA_BROKER_ID: 1
2525
KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
26-
KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://${KAFKA_BROKER_IPV4}:9092'
26+
KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://172.68.0.102:9092'
27+
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
2728
networks:
28-
avro-serializer-net:
29+
schema-registry-net:
2930
ipv4_address: ${KAFKA_BROKER_IPV4}
3031

3132
schema_registry:
@@ -39,13 +40,17 @@ services:
3940
environment:
4041
SCHEMA_REGISTRY_HOST_NAME: ${SCHEMA_REGISTRY_IPV4}
4142
SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
43+
SCHEMA_REGISTRY_LISTENERS: "http://${SCHEMA_REGISTRY_IPV4}:8081"
44+
SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: 'PLAINTEXT://172.68.0.102:9092'
4245
networks:
43-
avro-serializer-net:
46+
schema-registry-net:
4447
ipv4_address: ${SCHEMA_REGISTRY_IPV4}
4548

4649
networks:
47-
avro-serializer-net:
50+
schema-registry-net:
4851
driver: bridge
4952
ipam:
53+
driver: default
5054
config:
51-
- subnet: ${CONFLUENT_NETWORK_SUBNET}
55+
- subnet: "${CONFLUENT_NETWORK_SUBNET}"
56+
gateway: "${CONFLUENT_NETWORK_GATEWAY}"

src/Common.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace FlixTech\AvroSerializer\Common;
44

55
use Widmogrod\Monad\Maybe\Maybe;
6+
67
use function Widmogrod\Functional\curryN;
78
use function Widmogrod\Monad\Maybe\just;
89
use function Widmogrod\Monad\Maybe\nothing;

src/Objects/RecordSerializer.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
use FlixTech\SchemaRegistryApi\Exception\SubjectNotFoundException;
1111
use FlixTech\SchemaRegistryApi\Registry;
1212
use GuzzleHttp\Promise\PromiseInterface;
13+
1314
use const FlixTech\AvroSerializer\Common\get;
1415
use const FlixTech\AvroSerializer\Protocol\PROTOCOL_ACCESSOR_AVRO;
1516
use const FlixTech\AvroSerializer\Protocol\PROTOCOL_ACCESSOR_SCHEMA_ID;
1617
use const FlixTech\AvroSerializer\Protocol\WIRE_FORMAT_PROTOCOL_VERSION;
1718
use const Widmogrod\Functional\identity;
1819
use const Widmogrod\Functional\reThrow;
20+
1921
use function FlixTech\AvroSerializer\Common\memoize;
2022
use function FlixTech\AvroSerializer\Protocol\decode;
2123
use function FlixTech\AvroSerializer\Protocol\encoder;
@@ -207,7 +209,7 @@ private function handleSubjectOrSchemaNotFound(SchemaRegistryException $e): void
207209
default:
208210
// @codeCoverageIgnoreStart
209211
throw $e;
210-
// @codeCoverageIgnoreEnd
212+
// @codeCoverageIgnoreEnd
211213
}
212214
}
213215
}

src/Protocol.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Widmogrod\Monad\Either\Left;
1010
use Widmogrod\Monad\Either\Right;
1111
use Widmogrod\Monad\Maybe\Maybe;
12+
1213
use function Widmogrod\Functional\curryN;
1314
use function Widmogrod\Monad\Maybe\just;
1415
use function Widmogrod\Monad\Maybe\nothing;

src/Serialize.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Widmogrod\Monad\Either\Either;
1313
use Widmogrod\Monad\Either\Left;
1414
use Widmogrod\Monad\Either\Right;
15+
1516
use function Widmogrod\Functional\curryN;
1617
use function Widmogrod\Functional\tryCatch;
1718

0 commit comments

Comments
 (0)