8.5 compatibility

Author: bkdotcom

README.md

@@ -104,11 +104,9 @@ $monolog->critical('all your base are belong to them');
 
 ## Tests / Quality
 
-![Supported PHP versions](https://img.shields.io/static/v1?label=PHP&message=5.4%20-%208.4&color=blue)
+![Supported PHP versions](https://img.shields.io/static/v1?label=PHP&message=5.4%20-%208.5&color=blue)
 ![Build Status](https://img.shields.io/github/actions/workflow/status/bkdotcom/PHPDebugConsole/phpunit.yml.svg?branch=master&logo=github)
 [![Codacy Score](https://img.shields.io/codacy/grade/e950849edfd9463b993386080d39875e/master.svg?logo=codacy)](https://app.codacy.com/gh/bkdotcom/PHPDebugConsole/dashboard)
-[![Maintainability](https://img.shields.io/codeclimate/maintainability/bkdotcom/PHPDebugConsole.svg?logo=codeclimate)](https://codeclimate.com/github/bkdotcom/PHPDebugConsole)
-[![Coverage](https://img.shields.io/codeclimate/coverage-letter/bkdotcom/PHPDebugConsole.svg?logo=codeclimate)](https://codeclimate.com/github/bkdotcom/PHPDebugConsole)
 
 ## Changelog
 

src/Container/Container.php

@@ -192,7 +192,7 @@ public function extend($name, $callable)
     public function factory($invokable)
     {
         Utility::assertInvokable($invokable);
-        $this->factories->attach($invokable);
+        $this->factories->offsetSet($invokable);
         return $invokable;
     }
 
@@ -393,7 +393,7 @@ public function offsetUnset($name)
     public function protect($invokable)
     {
         Utility::assertInvokable($invokable);
-        $this->protected->attach($invokable);
+        $this->protected->offsetSet($invokable);
         return $invokable;
     }
 

src/CurlHttpMessage/CurlReqRes.php

@@ -80,7 +80,9 @@ public function __destruct()
             // ignore error
         });
         try {
-            \curl_close($this->curlHandle);
+            if (PHP_VERSION_ID < 80000) {
+                \curl_close($this->curlHandle);
+            }
         } catch (ErrorException $e) {
             // ignore exception
         }
@@ -163,7 +165,7 @@ public function setCurlHandle($curlHandle)
     {
         if ($curlHandle === null) {
             $this->unsetOptions();
-            if ($this->curlHandleInternal) {
+            if (PHP_VERSION_ID < 80000 && $this->curlHandleInternal) {
                 \curl_close($this->curlHandle);
             }
             $this->curlHandle = null;

src/CurlHttpMessage/Handler/Curl.php

@@ -49,7 +49,9 @@ private function getCurlHandle()
             return $this->curlHandle;
         }
         if (\function_exists('curl_reset') === false) {
-            \curl_close($this->curlHandle);
+            if (PHP_VERSION_ID < 80000) {
+                \curl_close($this->curlHandle);
+            }
             $this->curlHandle = \curl_init();
             return $this->curlHandle;
         }

src/CurlHttpMessage/Handler/CurlMulti.php

@@ -216,7 +216,9 @@ private function releaseHandle(CurlReqRes $curlReqRes)
         $curlHandle = $curlReqRes->getCurlHandle();
         $curlReqRes->setCurlHandle(null);
         if (\count($this->idleHandles) >= $this->options['maxIdleHandles']) {
-            \curl_close($curlHandle);
+            if (PHP_VERSION_ID < 80000) {
+                \curl_close($curlHandle);
+            }
             return;
         }
         if (\function_exists('curl_reset')) {

src/Debug/Abstraction/AbstractString.php

@@ -316,7 +316,7 @@ private function getMaxLen($cat, $strlen)
         $stringMaxLen = $this->cfg['brief']
             ? $this->cfg['stringMaxLenBrief']
             : $this->cfg['stringMaxLen'];
-        $maxLen = \array_key_exists($cat, $stringMaxLen)
+        $maxLen = $cat && \array_key_exists($cat, $stringMaxLen)
             ? $stringMaxLen[$cat]
             : $stringMaxLen['other'];
 

src/Debug/Abstraction/Object/Properties.php

@@ -151,6 +151,9 @@ private function addViaRef(Abstraction $abs)
                 if ($refProperty->isDefault() === false) {
                     continue;
                 }
+                if (PHP_VERSION_ID < 80100) {
+                    $refProperty->setAccessible(true); // only accessible via reflection
+                }
                 $name = $refProperty->getName();
                 $info = isset($properties[$name])
                     ? $properties[$name]
@@ -179,7 +182,6 @@ private function addViaRef(Abstraction $abs)
     protected function buildViaRef(Abstraction $abs, ReflectionProperty $refProperty, $isDynamic = false)
     {
         $phpDoc = $this->helper->getPhpDocVar($refProperty, $abs['fullyQualifyPhpDocType']);
-        $refProperty->setAccessible(true); // only accessible via reflection
         return static::buildValues(array(
             'attributes' => $abs['cfgFlags'] & AbstractObject::PROP_ATTRIBUTE_COLLECT
                 ? $this->helper->getAttributes($refProperty)

src/Debug/Abstraction/Object/PropertiesInstance.php

@@ -261,7 +261,9 @@ private function mergeOverrideValue(array $propInfo, $overrideValue)
      */
     private function valueFromReflection(array $propInfo, Abstraction $abs, ReflectionProperty $refProperty)
     {
-        $refProperty->setAccessible(true); // only accessible via reflection
+        if (PHP_VERSION_ID < 80100) {
+            $refProperty->setAccessible(true); // only accessible via reflection
+        }
         if ($propInfo['isVirtual']) {
             return $this->valueFromReflectionVirtual($propInfo, $abs, $refProperty);
         }

src/Debug/Collector/PhpCurlClass.php

@@ -292,9 +292,11 @@ private function setReflection()
     {
         $classRef = (new ReflectionObject($this))->getParentClass();
         $optionsRef = $classRef->getProperty('options');
-        $optionsRef->setAccessible(true);
         $parseReqHeadersRef = $classRef->getMethod('parseRequestHeaders');
-        $parseReqHeadersRef->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $optionsRef->setAccessible(true);
+            $parseReqHeadersRef->setAccessible(true);
+        }
         $this->reflection = array(
             'options' => $optionsRef,
             'parseReqHeaders' => $parseReqHeadersRef,

src/Debug/Collector/SoapClient.php

@@ -105,11 +105,11 @@ public function __call($name, $args)
      * {@inheritDoc}
      */
     #[\ReturnTypeWillChange]
-    public function __doRequest($request, $location, $action, $version, $oneWay = 0)
+    public function __doRequest($request, $location, $action, $version, $oneWay = 0, $uriParserClass = null)
     {
         $exception = null;
         try {
-            $xmlResponse = parent::__doRequest($request, $location, $action, $version, $oneWay);
+            $xmlResponse = parent::__doRequest($request, $location, $action, $version, $oneWay, $uriParserClass);
         } catch (SoapFault $e) {
             // we'll rethrow bellow
         }