fix/dynamic property mock

.horde.yml

@@ -43,10 +43,13 @@ dependencies:
       psr/http-client: ^1.0.3
   dev:
     composer:
-      horde/test: ^3
       horde/url: ^3
   optional:
     ext:
       curl: '*'
       http: '*'
 vendor: horde
+
+quality:
+  phpstan:
+    level: 9

TESTING.md

@@ -0,0 +1,53 @@
+# Testing Horde_Http
+
+## Test Suites
+
+The test suite follows PSR-4 structure. It is divided into two types:
+
+### Unit Tests (test/Unit/)
+Fast and isolated tests which don't make real HTTP calls. Run these during development:
+
+```bash
+phpunit --testsuite="horde/http unit tests"
+```
+
+Time: ~0.4 seconds, 130 tests (includes mock client tests)
+
+### Live Integration Tests (test/Live/)
+Slow tests that make real HTTP calls to external servers. Run these as needed to debug specific issues:
+
+```bash
+phpunit --testsuite="horde/http live integration tests"
+```
+
+Time: ~10+ seconds (network dependent), 24 tests
+
+## Running All Tests
+
+```bash
+# Default: runs unit tests only (fast ~0.3s)
+phpunit
+
+# Run live integration tests
+phpunit --testsuite="horde/http live integration tests"
+
+# Run all tests (unit + live)
+phpunit --testsuite="horde/http unit tests" --testsuite="horde/http live integration tests"
+```
+
+## Test Configuration
+
+Integration tests use horde.org by default. Set the `HTTP_TEST_CONFIG` environment variable for a different target:
+
+```bash
+export HTTP_TEST_CONFIG='{"http":{"server":"example.com"}}'
+phpunit --testsuite="horde/http live integration tests"
+```
+
+## Test Structure
+
+Tests use PSR-4 autoloading:
+- test/Unit/ => Horde\Http\Test\Unit\
+- test/Live/ => Horde\Http\Test\Live\
+
+No bootstrap file needed - phpunit.xml.dist directly uses `vendor/autoload.php`.

composer.json

@@ -16,19 +16,19 @@
             "role": "lead"
         }
     ],
-    "time": "2026-03-07",
+    "time": "2026-03-23",
     "repositories": [],
     "require": {
         "php": "^7.4 || ^8",
-        "horde/exception": "^3 || dev-FRAMEWORK_6_0",
-        "horde/support": "^3 || dev-FRAMEWORK_6_0",
+        "horde/exception": "^3",
+        "horde/support": "^3",
         "psr/http-message": "^2",
         "psr/http-factory": "^1.0.2",
         "psr/http-client": "^1.0.3"
     },
     "require-dev": {
-        "horde/test": "^3 || dev-FRAMEWORK_6_0",
-        "horde/url": "^3 || dev-FRAMEWORK_6_0"
+        "horde/test": "^3",
+        "horde/url": "^3"
     },
     "suggest": {
         "ext-curl": "*",
@@ -57,10 +57,5 @@
         "psr/http-message-implementation": "^2",
         "psr/http-factory-implementation": "^1.0.2",
         "psr/http-client-implementation": "^1.0.3"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-FRAMEWORK_6_0": "3.x-dev"
-        }
     }
 }

doc/Horde/Http/examples/get-example-dot-com.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
  * Basic example for fetching a page with Horde_Http_Client
  *
- * Copyright 2007-2017 Horde LLC (http://www.horde.org/)
+ * Copyright 2007-2026 Horde LLC (http://www.horde.org/)
  *
  * @author   Chuck Hagenbuch <[email protected]>
  * @license  http://www.horde.org/licenses/bsd BSD

doc/Horde/Http/examples/get-horde.org.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
  * Basic example for fetching a page with Horde\Http\Client
  *
- * Copyright 2007-2017 Horde LLC (http://www.horde.org/)
+ * Copyright 2007-2026 Horde LLC (http://www.horde.org/)
  *
  * @author   Chuck Hagenbuch <[email protected]>
  * @license  http://www.horde.org/licenses/bsd BSD
@@ -34,25 +35,25 @@
 // PSR-18 client
 
 $client = new CurlClient(
-    new ResponseFactory,
-    new StreamFactory,
-    new ClientOptions
+    new ResponseFactory(),
+    new StreamFactory(),
+    new ClientOptions()
 );
 print("Modern PSR-18 Curl Client: Plain HTTP GET\n");
-$requestFactory = new RequestFactory;
+$requestFactory = new RequestFactory();
 $request = $requestFactory->createRequest('GET', 'http://www.horde.org');
 $response = $client->sendRequest($request);
-print($response->getStatusCode() . "\n\n" . $response->getReasonPhrase() ."\n\n");
+print($response->getStatusCode() . "\n\n" . $response->getReasonPhrase() . "\n\n");
 
 print("Modern PSR-18 Curl Client: HTTPS GET\n");
-$requestFactory = new RequestFactory;
+$requestFactory = new RequestFactory();
 $request = $requestFactory->createRequest('GET', 'https://www.horde.org');
 $response = $client->sendRequest($request);
-print($response->getStatusCode() . "\n\n" . $response->getReasonPhrase() ."\n\n");
+print($response->getStatusCode() . "\n\n" . $response->getReasonPhrase() . "\n\n");
 
 print("Modern PSR-18 Curl Client: HTTPS GitHub\n");
-$requestFactory = new RequestFactory;
+$requestFactory = new RequestFactory();
 $request = $requestFactory->createRequest('GET', 'https://api.github.com/');
 $response = $client->sendRequest($request);
-print($response->getStatusCode() . "\n\n" . $response->getReasonPhrase() ."\n\n");
-print($response->getBody()->getContents());
+print($response->getStatusCode() . "\n\n" . $response->getReasonPhrase() . "\n\n");
+print($response->getBody()->getContents());

lib/Horde/Http/Response/Mock.php

@@ -22,6 +22,13 @@
  */
 class Horde_Http_Response_Mock extends Horde_Http_Response_Base
 {
+    /**
+     * Response stream.
+     *
+     * @var resource
+     */
+    protected $_stream;
+
     /**
      * Constructor
      */

phpunit.xml.dist

@@ -1,27 +1,26 @@
 <?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"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
 	     bootstrap="vendor/autoload.php"
-         cacheResultFile=".phpunit.cache/test-results"
          executionOrder="depends,defects"
-         forceCoversAnnotation="false"
-         beStrictAboutCoversAnnotation="true"
+         requireCoverageMetadata="false"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         verbose="true">
+         defaultTestSuite="horde/http unit tests">
     <testsuites>
-        <testsuite name="horde/http">
-            <directory>test</directory>
+        <testsuite name="horde/http unit tests">
+            <directory>test/Unit</directory>
+        </testsuite>
+        <testsuite name="horde/http live integration tests">
+            <directory>test/Live</directory>
         </testsuite>
     </testsuites>
 
-    <coverage cacheDirectory=".phpunit.cache/code-coverage"
-              processUncoveredFiles="true">
+    <source>
         <include>
             <directory suffix=".php">lib</directory>
             <directory suffix=".php">src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>

src/Client/Curl.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2007-2021 Horde LLC (http://www.horde.org/)
+ * Copyright 2007-2026 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file LICENSE for license information (BSD). If you
  * did not receive this file, see http://www.horde.org/licenses/bsd.

src/Client/Fopen.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2007-2021 Horde LLC (http://www.horde.org/)
+ * Copyright 2007-2026 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file LICENSE for license information (BSD). If you
  * did not receive this file, see http://www.horde.org/licenses/bsd.
@@ -122,13 +122,13 @@ public function sendRequest(RequestInterface $request): ResponseInterface
         $opts['ssl']['allow_self_signed'] = true;
 
         $context = stream_context_create($opts);
-        set_error_handler(array($this, 'errorHandler'), E_WARNING | E_NOTICE);
+        set_error_handler([$this, 'errorHandler'], E_WARNING | E_NOTICE);
         $streamResource = fopen($uri, 'rb', false, $context);
         restore_error_handler();
         if (!$streamResource) {
             if (
-                isset($this->errors[0]['message']) &&
-                preg_match('/HTTP\/(\d+\.\d+) (\d{3}) (.*)$/', $this->errors[0]['message'], $matches)
+                isset($this->errors[0]['message'])
+                && preg_match('/HTTP\/(\d+\.\d+) (\d{3}) (.*)$/', $this->errors[0]['message'], $matches)
             ) {
                 // Create a Response for the HTTP error code
                 return $this->responseFactory->createResponse($matches[0]);
@@ -138,7 +138,7 @@ public function sendRequest(RequestInterface $request): ResponseInterface
         }
 
         $meta = stream_get_meta_data($streamResource);
-        $headers = isset($meta['wrapper_data']) ? $meta['wrapper_data'] : [];
+        $headers = $meta['wrapper_data'] ?? [];
 
         //return new Response
         $headerList = $this->parseHeaders($headers);

src/Client/Mock.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * Copyright 2007-2021 Horde LLC (http://www.horde.org/)
+ * Copyright 2007-2026 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file LICENSE for license information (BSD). If you
  * did not receive this file, see http://www.horde.org/licenses/bsd.
@@ -13,7 +14,9 @@
  * @package  Http
  */
 declare(strict_types=1);
+
 namespace Horde\Http\Client;
+
 use OutOfBoundsException;
 use Horde\Http\Response;
 use Horde\Http\ResponseFactory;
@@ -95,14 +98,16 @@ public function addResponses(iterable $responses): void
      * @return ResponseInterface The response.
      */
     public function addResponse(
-        $body, string|int $code = 200, string $uri = '', array $headers = []
-    ): ResponseInterface
-    {
+        $body,
+        string|int $code = 200,
+        string $uri = '',
+        array $headers = []
+    ): ResponseInterface {
         // TODO: What about the uri?
         if ($body instanceof StreamInterface) {
             $stream = clone($body);
         } elseif (is_string($body)) {
-            $stream = $this->streamFactory->createStream($body);            
+            $stream = $this->streamFactory->createStream($body);
         } else {
             $stream = $this->streamFactory->createStreamFromResource($body);
         }
@@ -111,7 +116,7 @@ public function addResponse(
             $response = $response->withAddedHeader($name, $header);
         }
         $this->responses[] = $response;
-        return $response; 
+        return $response;
     }
 
     /**

src/Client/Options.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * Copyright 2020-2021 Horde LLC (http://www.horde.org/)
+ * Copyright 2020-2026 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file LICENSE for license information (BSD). If you
  * did not receive this file, see http://www.horde.org/licenses/bsd.
@@ -11,7 +12,9 @@
  * @package  Http
  */
 declare(strict_types=1);
+
 namespace Horde\Http\Client;
+
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\RequestFactoryInterface;
@@ -38,7 +41,7 @@ class Options
         'redirects' => 5,
         'timeout' => 5,
         'userAgent' => 'Horde\Http H6',
-        'verifyPeer' => true
+        'verifyPeer' => true,
     ];
 
     public function __construct(iterable $param = [])
@@ -57,4 +60,4 @@ public function getOption(string $name)
     {
         return $this->options[$name] ?? null;
     }
-}
+}