Fix PHP 8.4 deprecation warnings and upgrade PHPUnit

Author: TomA-R

composer.json

@@ -9,8 +9,9 @@
         "psr/log": "^1.0"
     },
     "require-dev": {
+        "ergebnis/phpunit-slow-test-detector": "^2.17",
         "phpdocumentor/phpdocumentor": "^2.8.5",
-        "phpunit/phpunit": "~4.8.20"
+        "phpunit/phpunit": "~9"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -322,7 +322,7 @@ protected function joinFromArray(Span $span, $carrier) {
     }
 
     protected function _startsWith($haystack, $needle) {
-         return (substr($haystack, 0, strlen($needle)) === $needle);
+         return (str_starts_with($haystack, $needle));
     }
 
     // PHP does not have an event loop or timer threads. Instead manually check as

lib/Client/ClientTracer.php

@@ -19,7 +19,7 @@ class TransportHTTPJSON {
      */
     protected $logger;
 
-    public function __construct(LoggerInterface $logger = null) {
+    public function __construct(?LoggerInterface $logger = null) {
 
         $this->logger = $logger ?: new SystemLogger;
         $this->_timeout = ini_get("default_socket_timeout");

lib/Client/Transports/TransportHTTPJSON.php

@@ -19,7 +19,7 @@ class TransportHTTPPROTO {
      */
     protected $logger;
 
-    public function __construct(LoggerInterface $logger = null) {
+    public function __construct(?LoggerInterface $logger = null) {
 
         $this->logger = $logger ?: new SystemLogger;
         $this->_timeout = ini_get("default_socket_timeout");

lib/Client/Transports/TransportHTTPPROTO.php

@@ -10,13 +10,13 @@ class TransportUDP {
 
     protected $_sock = NULL;
     protected $_host = NULL;
-    protected $_post = NULL;
+    protected $_port = NULL;
     /**
      * @var LoggerInterface
      */
     protected $logger;
 
-    public function __construct(LoggerInterface $logger = null) {
+    public function __construct(?LoggerInterface $logger = null) {
 
         $this->logger = $logger ?: new SystemLogger;
     }

lib/Client/Transports/TransportUDP.php

@@ -18,7 +18,7 @@
  * under the License.
  *
  * ClassLoader to load Thrift library and definitions
- * Inspired from UniversalClassLoader from Symfony 2 
+ * Inspired from UniversalClassLoader from Symfony 2
  *
  * @package thrift.classloader
  */
@@ -146,7 +146,7 @@ public function findFile($class)
             foreach ($this->namespaces as $ns => $dirs)
             {
                 //Don't interfere with other autoloaders
-                if (0 !== strpos($namespace, $ns))
+                if (!str_starts_with($namespace, $ns))
                 {
                     continue;
                 }
@@ -184,7 +184,7 @@ public function findFile($class)
             foreach ($this->definitions as $ns => $dirs)
             {
                 //Don't interfere with other autoloaders
-                if (0 !== strpos($namespace, $ns))
+                if (!str_starts_with($namespace, $ns))
                 {
                     continue;
                 }

lib/vendor/Thrift/ClassLoader/ThriftClassLoader.php

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
     colors="true"
+    failOnWarning="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
+    failOnRisky="true"
+    backupGlobals="false"
     >
     <php>
         <ini name="memory_limit" value="-1"/>
@@ -17,31 +21,31 @@
         </testsuite>
     </testsuites>
 
-    <!-- Setup a listener for fixtures -->
-    <listeners>
-        <listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener">
+    <extensions>
+        <extension class="Ergebnis\PHPUnit\SlowTestDetector\Extension">
             <arguments>
                 <array>
-                    <element key="slowThreshold">
-                        <integer>250</integer>
+                    <element key="maximum-count">
+                        <integer>40</integer>
                     </element>
-                    <element key="reportLength">
-                        <integer>50</integer>
+                    <element key="maximum-duration">
+                        <integer>500</integer>
                     </element>
                 </array>
             </arguments>
-        </listener>
-    </listeners>
+        </extension>
+    </extensions>
 
-    <!-- Prevent coverage reports from looking in tests and vendors -->
-    <filter>
-        <blacklist>
+    <coverage>
+        <include>
+            <directory suffix=".php">./lib/</directory>
+        </include>
+        <exclude>
             <directory suffix=".php">./vendor/</directory>
             <directory suffix=".ctp">./vendor/</directory>
-
             <directory suffix=".php">./test/</directory>
             <directory suffix=".ctp">./test/</directory>
-        </blacklist>
-    </filter>
+        </exclude>
+    </coverage>
 
 </phpunit>

phpunit.xml.dist

@@ -1,12 +1,14 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Class BaseLightStepTest
  * @author Josh Wickham
  * @copyright &copy; 2016 Life360, Inc.
  * @since 6/10/16
  */
-abstract class BaseLightStepTest extends PHPUnit_Framework_TestCase
+abstract class BaseLightStepTest extends TestCase
 {
     protected function createTestTracer($component_name, $access_token) {
         $opts = [
@@ -24,7 +26,10 @@ protected function createTestTracer($component_name, $access_token) {
      * @return mixed
      */
     protected function peek($obj, $field) {
-        return PHPUnit_Framework_Assert::readAttribute($obj, $field);
+        $reflection = new ReflectionClass($obj);
+        $property = $reflection->getProperty($field);
+        $property->setAccessible(true);
+        return $property->getValue($obj);
     }
 
 }

test/BaseLightStepTest.php

@@ -13,10 +13,13 @@ class ClientTracerTest extends BaseLightStepTest
      */
     public function testCorrectTransportSelected($key, $class)
     {
-
         $tracer = new ClientTracer(['transport' => $key]);
 
-        $this->assertInstanceOf($class, $this->readAttribute($tracer, '_transport'));
+        $reflection = new ReflectionClass($tracer);
+        $property = $reflection->getProperty('_transport');
+        $property->setAccessible(true);
+        $tracerTransport = $property->getValue($tracer);
+        $this->assertInstanceOf($class, $tracerTransport);
     }
 
     public function transports()
@@ -61,7 +64,7 @@ public function testSettingCustomTracerAttributes() {
         $attributes = $this->peek($tracer, '_options')['attributes'];
 
         $this->assertArrayHasKey('foo', $attributes);
-        $this->assertSame($attributes['foo'], 'bar');
+        $this->assertSame('bar', $attributes['foo']);
     }
 
     public function testAddingCustomAttributeDoesNotRemoveDefaultAttributes() {