Skip to content

Commit 32d642c

Browse files
haeberhaeber
committed
chore(PRO-3138): solve deprecations; cleanup code
1 parent 7cdccd4 commit 32d642c

File tree

84 files changed

+495
-1401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+495
-1401
lines changed

‎.circleci/config.yml‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,37 @@
11
version: 2.1
22

33
orbs:
4-
ci-caching: jobcloud/ci-caching@3.1
5-
ci-php: jobcloud/ci-php@2.7
4+
ci-caching: jobcloud/ci-caching@3.2.5
5+
ci-php: jobcloud/ci-php@2.12.1
66

77
workflows:
8+
version: 2
89
test-php-kafka-lib:
910
jobs:
1011
- ci-caching/build-docker-images:
1112
context: dockerhub-credentials
12-
dockerComposeFile: "./docker/docker-compose.yml"
1313
- ci-php/install-dependencies:
1414
context: dockerhub-credentials
15-
dockerComposeFile: "./docker/docker-compose.yml"
1615
dependencyCheckSumFile: "./composer.json"
1716
requires:
1817
- ci-caching/build-docker-images
19-
- coverage:
18+
- ci-php/coverage:
2019
context: dockerhub-credentials
20+
dependencyCheckSumFile: "./composer.json"
2121
requires:
2222
- ci-php/install-dependencies
2323
- ci-php/code-style:
2424
context: dockerhub-credentials
25-
dockerComposeFile: "./docker/docker-compose.yml"
2625
dependencyCheckSumFile: "./composer.json"
2726
requires:
2827
- ci-php/install-dependencies
2928
- ci-php/static-analysis:
3029
context: dockerhub-credentials
31-
dockerComposeFile: "./docker/docker-compose.yml"
3230
dependencyCheckSumFile: "./composer.json"
3331
requires:
3432
- ci-php/install-dependencies
3533
- ci-php/infection-testing:
3634
context: dockerhub-credentials
37-
dockerComposeFile: "./docker/docker-compose.yml"
3835
dependencyCheckSumFile: "./composer.json"
3936
requires:
4037
- ci-php/install-dependencies
@@ -66,21 +63,3 @@ workflows:
6663
requires:
6764
- build-docker-images
6865
- install-dependencies
69-
70-
jobs:
71-
coverage:
72-
machine: true
73-
steps:
74-
- ci-php/coverage-command:
75-
dockerComposeFile: "./docker/docker-compose.yml"
76-
dependencyCheckSumFile: "./composer.json"
77-
- run:
78-
name: Download cc-test-reporter
79-
command: |
80-
mkdir -p tmp/
81-
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/cc-test-reporter
82-
chmod +x ./tmp/cc-test-reporter
83-
- run:
84-
name: Upload coverage results to Code Climate
85-
command: |
86-
./tmp/cc-test-reporter after-build -p /var/www/html --coverage-input-type clover --exit-code $?

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
/composer.symlink
55
composer.lock
66
.phpunit.result.cache
7-
clover.xml

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 JobCloud AG
3+
Copyright (c) 2025 JobCloud AG
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ PHPSTAN = ./vendor/bin/phpstan
66
PHPCS = ./vendor/bin/phpcs --extensions=php
77
CONSOLE = ./bin/console
88
INFECTION = ./vendor/bin/infection
9+
COVCHK = ./vendor/bin/coverage-check
910

1011
clean:
1112
rm -rf ./build ./vendor
@@ -15,7 +16,7 @@ code-style: pcov-disable
1516
${PHPCS} --report-full --report-gitblame --standard=PSR12 ./src --exclude=Generic.Commenting.Todo --report-junit=build/logs/phpcs/junit.xml
1617

1718
coverage: pcov-enable
18-
${PHPUNIT} && ./vendor/bin/coverage-check clover.xml 100
19+
${PHPUNIT} && ${COVCHK} build/logs/phpunit/clover.xml 100
1920

2021
test: pcov-disable
2122
${PHPUNIT}
@@ -35,9 +36,8 @@ install-dependencies-lowest:
3536

3637
infection-testing:
3738
make coverage
38-
cp -f build/logs/phpunit/junit.xml build/logs/phpunit/coverage/junit.xml
3939
sudo php-ext-disable pcov
40-
${INFECTION} --coverage=build/logs/phpunit/coverage --min-msi=91 --threads=`nproc`
40+
${INFECTION} --coverage=build/logs/phpunit/ --min-msi=91 --threads=`nproc`
4141
sudo php-ext-enable pcov
4242

4343
pcov-enable:

‎composer.json‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,37 @@
1818
],
1919
"require": {
2020
"php": "^8.0",
21-
"ext-rdkafka": "^4.0|^5.0|^6.0",
22-
"ext-json": "*"
21+
"ext-json": "*",
22+
"ext-rdkafka": "^4.0|^5.0|^6.0"
2323
},
2424
"require-dev": {
25-
"phpunit/phpunit": "^9.4",
26-
"squizlabs/php_codesniffer": "^3.5.4",
27-
"phpstan/phpstan": "^1.8",
28-
"php-mock/php-mock-phpunit": "^2.6",
29-
"kwn/php-rdkafka-stubs": "^2.0.0",
25+
"ext-pcntl": "*",
26+
"flix-tech/avro-serde-php": "^2.2.0",
27+
"infection/infection": "^0.26.19",
28+
"johnkary/phpunit-speedtrap": "^v4.0.1",
29+
"kwn/php-rdkafka-stubs": "^v2.2.1",
30+
"php-mock/php-mock-phpunit": "^2.13.1",
31+
"phpstan/phpstan": "^2.1.31",
32+
"phpunit/phpunit": "^9.6.29",
3033
"rregeer/phpunit-coverage-check": "^0.3.1",
31-
"johnkary/phpunit-speedtrap": "^3.1",
32-
"flix-tech/avro-serde-php": "^1.4",
33-
"infection/infection": "^0.26"
34+
"squizlabs/php_codesniffer": "^4.0.0"
3435
},
3536
"autoload": {
3637
"psr-4": {
3738
"Jobcloud\\Kafka\\": "src/"
3839
}
3940
},
41+
"autoload-dev": {
42+
"psr-4": {
43+
"Jobcloud\\Kafka\\Tests\\": "tests/"
44+
}
45+
},
4046
"suggest": {
47+
"ext-pcntl": "",
4148
"flix-tech/avro-serde-php": "Is needed for Avro support"
4249
},
43-
"extra": {
44-
"branch-alias": {
45-
"dev-master": "2.0-dev"
46-
}
47-
},
4850
"config": {
51+
"sort-packages": true,
4952
"allow-plugins": {
5053
"infection/extension-installer": false
5154
}

‎docker/dev/php/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ RUN echo "$HOST_USER:x:$HOST_USER_ID:82:Linux User,,,:/home/$HOST_USER:" >> /etc
2424
addgroup $HOST_USER www-data
2525

2626
# COMPOSER: install binary and prestissimo
27-
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer --version=2.5.1
27+
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer
2828

2929
# PHP: Install php extensions
3030
RUN pecl channel-update pecl.php.net && \
31-
pecl install rdkafka-6.0.3 pcov && \
31+
pecl install rdkafka pcov && \
3232
docker-php-ext-install pcntl && \
3333
php-ext-enable rdkafka pcntl pcov
3434

‎docker/docker-compose.ci.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3.2'
21
services:
32
php:
43
build:

‎docker/docker-compose.yml‎ renamed to ‎docker/docker-compose.dev.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3.2'
21
services:
32
php:
43
build:

‎phpcs.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0"?>
22
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer" xsi:noNamespaceSchemaLocation="phpcs.xsd">
33
<file>src</file>
4+
<file>tests</file>
45
<rule ref="PSR12"/>
56
<arg name="report-gitblame"/>
67
<arg name="report-full"/>

‎phpunit.xml‎

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
backupGlobals="false"
4-
backupStaticAttributes="false"
53
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
114
forceCoversAnnotation="true"
12-
bootstrap="tests/bootstrap.php"
13-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd">
14-
<coverage>
15-
<include>
16-
<directory>src</directory>
17-
</include>
18-
<report>
19-
<clover outputFile="clover.xml"/>
20-
<html outputDirectory="build/logs/phpunit/coverage"/>
21-
<text outputFile="php://stdout" showOnlySummary="true"/>
22-
<xml outputDirectory="build/logs/phpunit/coverage/coverage-xml"/>
23-
</report>
24-
</coverage>
25-
<php>
26-
<ini name="max_execution_time" value="-1"/>
27-
<ini name="html_errors" value="false"/>
28-
<ini name="memory_limit" value="2G"/>
29-
</php>
30-
<testsuites>
31-
<testsuite name="Unit">
32-
<directory>./tests/Unit</directory>
33-
</testsuite>
34-
</testsuites>
35-
<logging>
36-
<junit outputFile="build/logs/phpunit/junit.xml"/>
37-
</logging>
38-
<listeners>
39-
<listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener"/>
40-
</listeners>
41-
</phpunit>
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd">
6+
<coverage>
7+
<include>
8+
<directory>src</directory>
9+
</include>
10+
<report>
11+
<clover outputFile="build/logs/phpunit/clover.xml"/>
12+
<html outputDirectory="build/logs/phpunit/coverage-html"/>
13+
<text outputFile="php://stdout" showOnlySummary="true"/>
14+
<xml outputDirectory="build/logs/phpunit/coverage-xml"/>
15+
</report>
16+
</coverage>
17+
<php>
18+
<ini name="max_execution_time" value="-1"/>
19+
<ini name="html_errors" value="false"/>
20+
<ini name="memory_limit" value="-1"/>
21+
</php>
22+
<testsuites>
23+
<testsuite name="Unit">
24+
<directory>./tests/Unit</directory>
25+
</testsuite>
26+
</testsuites>
27+
<logging>
28+
<junit outputFile="build/logs/phpunit/junit.xml"/>
29+
</logging>
30+
<listeners>
31+
<listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener"/>
32+
</listeners>
33+
</phpunit>

0 commit comments

Comments
 (0)