Pull request #117: NETCURL-347

Merge in LIB/tornelib-php-netcurl from NETCURL-347 to master

* commit '22f41949c220146cd422c9440ace67db74dc6556':
  NETCURL-347

Author: Tornevall

src/Module/Config/WrapperConfig.php

@@ -533,23 +533,6 @@ public function resetStreamData()
         return $this;
     }
 
-    /**
-     * Returns compatibility functions from for example NetCurl 6.0.
-     * @return array
-     * @since 6.1.2
-     * @noinspection PhpFullyQualifiedNameUsageInspection
-     */
-    public function getCompatibilityMethods()
-    {
-        $return = [];
-        if (class_exists('\TorneLIB\Compatibility\NetCurl\Methods')) {
-            /** @noinspection PhpUndefinedClassInspection */
-            $return = \TorneLIB\Compatibility\NetCurl\Methods::getCompatibilityMethods();
-        }
-
-        return $return;
-    }
-
     /**
      * Throw on any code that matches the store throwableHttpCode (use with setThrowableHttpCodes())
      *

src/Module/Network/NetWrapper.php

@@ -384,11 +384,6 @@ public function getCurrentWrapperClass($short = false)
      */
     public function __call($name, $arguments)
     {
-        $compatibilityMethods = $this->CONFIG->getCompatibilityMethods();
-        if (isset($compatibilityMethods[$name])) {
-            $name = $compatibilityMethods[$name];
-        }
-
         if ($name === 'setAuth') {
             // Abbreviation for setAuthentication.
             return call_user_func_array([$this, 'setAuthentication'], $arguments);

src/Module/Network/Wrappers/CurlWrapper.php

@@ -1239,32 +1239,6 @@ public function getTimeout()
         return $this->CONFIG->getTimeout();
     }
 
-    /**
-     * @param $name
-     * @param $arguments
-     * @return mixed
-     * @throws ExceptionHandler
-     * @since 6.1.2
-     */
-    public function __call($name, $arguments)
-    {
-        $return = null;
-
-        $compatibilityMethods = $this->CONFIG->getCompatibilityMethods();
-        if (isset($compatibilityMethods[$name])) {
-            $name = $compatibilityMethods[$name];
-            $return = call_user_func_array([$this, $name], $arguments);
-        }
-
-        if (!is_null($return)) {
-            return $return;
-        }
-        throw new ExceptionHandler(
-            sprintf('Function "%s" not available.', $name),
-            Constants::LIB_METHOD_OR_LIBRARY_UNAVAILABLE
-        );
-    }
-
     /**
      * @param $curlHandle
      * @param $header

src/Module/Network/Wrappers/SimpleStreamWrapper.php

@@ -562,11 +562,7 @@ public function __call($name, $arguments)
     {
         $return = null;
 
-        $compatibilityMethods = $this->CONFIG->getCompatibilityMethods();
-        if (isset($compatibilityMethods[$name])) {
-            $name = $compatibilityMethods[$name];
-            $return = call_user_func_array([$this, $name], $arguments);
-        } elseif (method_exists($this->CONFIG, $name)) {
+        if (method_exists($this->CONFIG, $name)) {
             /**
              * Makeing sure setSsl and other configuration is callable from the StreamWrapper.
              * @since 6.1.5

tests/curlWrapperTest.php

@@ -435,22 +435,6 @@ public function basicGetHeaderUserAgent()
         static::assertSame($curlRequest->getHeader('content-type'), 'application/json');
     }
 
-    /**
-     * @test
-     * @throws ExceptionHandler
-     * @since 6.1.2
-     */
-    public function getParsedResponse()
-    {
-        static::expectException(ExceptionHandler::class);
-
-        $curlWrapperRequest = new CurlWrapper();
-        $curlWrapperRequest->request('https://ipv4.netcurl.org');
-        /** @noinspection ForgottenDebugOutputInspection */
-        $p = $curlWrapperRequest->getParsedResponse();
-        static::assertTrue(isset($p->ip));
-    }
-
     /**
      * @test
      * Ask for multiple urls.