fix: resolve deprecations for implicitly nullable parameters in PHP 8.4 (#231)

* fix: resolve deprecations for implicitly nullable parameters in PHP 8.4

* Update actions/cache from v2 to v3

* Update workflows to use the latest output method

* Fix composer cache directory setup

* Fix composer cache directory output in CI

* Fix mysqli connection test.

* Renamed abstract test classes to avoid warnings

* Fix namespace issue in MysqliTest

* Update CI to upload coverage report for PHP 8.1

* Revert version number in Docker Compose file.

* Use `docker compose` instead of `docker-compose`.

* Skip testing mysql connection on non-Linux systems


* Disable Codecov coverage upload in the CI workflow

* Remove code coverage in CI

---------

Co-authored-by: dmajka <dawid.majka@verestro.com>

Author: wesolydexter

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ["7.4", "8.0", "8.1"]
+        php-versions: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -27,9 +27,9 @@ jobs:
           extensions: mysql
       - name: Get composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir | tr -d '\n' | tr -d '\r')" >> $GITHUB_OUTPUT
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -44,17 +44,3 @@ jobs:
         run: composer static-check
       - name: Run tests
         run: composer test -- --coverage-clover=build/logs/clover.xml
-      - name: Upload coverage report to codecov service
-        if: ${{ matrix.operating-system == 'ubuntu-latest' && matrix.php-versions == '8.0' }}
-        run: |
-          wget -c -nc --retry-connrefused --tries=0 https://github.com/satooshi/php-coveralls/releases/download/v2.4.3/php-coveralls.phar
-          chmod +x php-coveralls.phar
-          php php-coveralls.phar --version
-          mkdir -p build/logs
-          php php-coveralls.phar -v
-          bash <(curl -s https://codecov.io/bash)
-        env:
-          # Running coveralls with default config did not work so followed the workaround below:
-          # https://github.com/php-coveralls/php-coveralls/issues/273#issuecomment-537473525
-          COVERALLS_RUN_LOCALLY: 1
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

.gitignore

@@ -2,3 +2,4 @@ composer.phar
 composer.lock
 /vendor/
 .phpunit.result.cache
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,18 @@
+<?php
+
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+
+$finder = PhpCsFixer\Finder::create()
+    ->in('src')
+    ->in('tests')
+;
+
+return (new PhpCsFixer\Config())
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setRules(
+        [
+            'nullable_type_declaration_for_default_null_value' => true,
+        ]
+    )
+    ->setFinder($finder)
+;

README.md

@@ -2,7 +2,6 @@
 
 ![CI](https://github.com/openzipkin/zipkin-php/workflows/CI/badge.svg)
 [![Latest Stable Version](https://poser.pugx.org/openzipkin/zipkin/v/stable)](https://packagist.org/packages/openzipkin/zipkin)
-[![Coverage Status](https://coveralls.io/repos/github/openzipkin/zipkin-php/badge.svg)](https://coveralls.io/github/openzipkin/zipkin-php)
 [![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.4-8892BF.svg)](https://php.net/)
 [![Total Downloads](https://poser.pugx.org/openzipkin/zipkin/downloads)](https://packagist.org/packages/openzipkin/zipkin)
 [![License](https://img.shields.io/packagist/l/openzipkin/zipkin.svg)](https://github.com/openzipkin/zipkin-php/blob/master/LICENSE)

composer.json

@@ -27,6 +27,7 @@
     },
     "require-dev": {
         "ext-mysqli": "*",
+        "friendsofphp/php-cs-fixer": "^3.75",
         "jcchavezs/httptest": "~0.2",
         "middlewares/fast-route": "^2.0",
         "middlewares/request-handler": "^2.0",

src/Zipkin/Instrumentation/Http/Client/HttpClientTracing.php

@@ -27,8 +27,8 @@ class HttpClientTracing
 
     public function __construct(
         Tracing $tracing,
-        HttpClientParser $parser = null,
-        callable $requestSampler = null
+        ?HttpClientParser $parser = null,
+        ?callable $requestSampler = null
     ) {
         $this->tracing = $tracing;
         $this->parser = $parser ?? new DefaultHttpClientParser();

src/Zipkin/Instrumentation/Http/Server/HttpServerTracing.php

@@ -26,8 +26,8 @@ class HttpServerTracing
 
     public function __construct(
         Tracing $tracing,
-        HttpServerParser $parser = null,
-        callable $requestSampler = null
+        ?HttpServerParser $parser = null,
+        ?callable $requestSampler = null
     ) {
         $this->tracing = $tracing;
         $this->parser = $parser ?? new DefaultHttpServerParser();

src/Zipkin/Instrumentation/Mysqli/Mysqli.php

@@ -30,12 +30,12 @@ final class Mysqli extends \Mysqli
     public function __construct(
         Tracer $tracer,
         array $options = [],
-        string $host = null,
-        string $user = null,
-        string $password = null,
+        ?string $host = null,
+        ?string $user = null,
+        ?string $password = null,
         string $database = '',
-        int $port = null,
-        string $socket = null
+        ?int $port = null,
+        ?string $socket = null
     ) {
         self::validateOptions($options);
         $this->tracer = $tracer;
@@ -65,7 +65,7 @@ private static function validateOptions(array $opts): void
         }
     }
 
-    private function addsTagsAndRemoteEndpoint(Span $span, string $query = null): void
+    private function addsTagsAndRemoteEndpoint(Span $span, ?string $query = null): void
     {
         if ($query !== null && $this->options['tag_query']) {
             $span->tag('sql.query', $query);

src/Zipkin/NoopSpan.php

@@ -37,7 +37,7 @@ public function getContext(): TraceContext
      * Spans can be modified before calling start. For example, you can add tags to the span and
      * set its name without lock contention.
      */
-    public function start(int $timestamp = null): void
+    public function start(?int $timestamp = null): void
     {
     }
 
@@ -87,7 +87,7 @@ public function setError(Throwable $e): void
      * @return void
      * @see Annotations
      */
-    public function annotate(string $value, int $timestamp = null): void
+    public function annotate(string $value, ?int $timestamp = null): void
     {
     }
 
@@ -113,7 +113,7 @@ public function abandon(): void
      * {@link zipkin.Span#duration Zipkin's span duration} is derived by subtracting the start
      * timestamp from this, and set when appropriate.
      */
-    public function finish(int $timestamp = null): void
+    public function finish(?int $timestamp = null): void
     {
     }
 

src/Zipkin/NoopSpanCustomizer.php

@@ -23,7 +23,7 @@ public function tag(string $key, string $value): void
     /**
      * {@inheritdoc}
      */
-    public function annotate(string $value, int $timestamp = null): void
+    public function annotate(string $value, ?int $timestamp = null): void
     {
     }
 }