Merge branch 'main' into feature/add-predis-support

Author: LKaemmerling

.github/workflows/blackbox.yml

@@ -22,9 +22,10 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.4
+          php-version: 8.2
           coverage: none
       - name: Login to Docker Hub
+        continue-on-error: true
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -40,6 +41,3 @@ jobs:
         run: docker compose run phpunit env ADAPTER=apcng vendor/bin/phpunit tests/Test/
       - name: Run Blackbox with Redis
         run: docker compose run phpunit env ADAPTER=redis vendor/bin/phpunit tests/Test/
-
-
-

.github/workflows/checks.yml

@@ -17,6 +17,7 @@ jobs:
           path: ~/.composer/cache/files
           key: dependencies-code-checks
       - name: Login to Docker Hub
+        continue-on-error: true
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}

.github/workflows/tests.yml

@@ -6,10 +6,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        php: [ 8.1, 8.2, 8.3, 8.4 ]
-        redis-version: [ 5, 6, 7 ]
+        php: [ 8.2, 8.3, 8.4, 8.5 ]
+        redis-version: [ 5, 6, 7, 8 ]
 
     name: P${{ matrix.php }} - Redis ${{ matrix.redis-version }}
 
@@ -49,6 +49,7 @@ jobs:
           path: ~/.composer/cache/files
           key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
       - name: Login to Docker Hub
+        continue-on-error: true
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}

README.md

@@ -1,6 +1,7 @@
 # A prometheus client library written in PHP
 
 ![Tests](https://github.com/promphp/prometheus_client_php/workflows/Tests/badge.svg)
+[![Slack](https://img.shields.io/badge/Slack-join%20chat-brightgreen)](https://join.slack.com/t/promphp/shared_invite/zt-iqbocinr-R809BvkEhjuC9W6RRoOofA)
 
 This library uses Redis or APCu to do the client side aggregation.
 If using Redis, we recommend running a local Redis instance next to your PHP workers.
@@ -135,7 +136,7 @@ composer require promphp/prometheus_push_gateway_php
 
 ### Dependencies
 
-* PHP ^7.2 | ^8.0
+* PHP ^8.2 (only [supported PHP versions](https://www.php.net/supported-versions.php) are supported)
 * PHP Redis extension
 * PHP APCu extension
 * [Composer](https://getcomposer.org/doc/00-intro.md#installation-linux-unix-osx)

composer.json

@@ -15,7 +15,7 @@
         "lkaemmerling/prometheus_client_php": "*"
     },
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.2",
         "ext-json": "*"
     },
     "require-dev": {
@@ -35,7 +35,7 @@
         "ext-apc": "Required if using APCu.",
         "ext-pdo": "Required if using PDO.",
         "promphp/prometheus_push_gateway_php": "An easy client for using Prometheus PushGateway.",
-        "symfony/polyfill-apcu": "Required if you use APCu on PHP8.0+"
+        "symfony/polyfill-apcu": "Required if you use APCu."
     },
     "autoload": {
         "psr-4": {

src/Prometheus/Storage/APCng.php

@@ -825,7 +825,7 @@ private function decrementKeyWithValue(string $key, $val): void
      */
     private function convertToIncrementalInteger($val): int
     {
-        return intval($val * $this->precisionMultiplier);
+        return @intval($val * $this->precisionMultiplier);
     }
 
     private function convertIncrementalIntegerToFloat(int $val): float