Pin Psalm and fixup issues

composer.json

@@ -32,7 +32,7 @@
         "phpunit/phpunit": "^9",
         "leproxy/leproxy": "^0.2.2",
         "revolt/event-loop-adapter-react": "^1",
-        "psalm/phar": "^5"
+        "psalm/phar": "~5.23.0"
     },
     "autoload": {
         "psr-4": {

examples/http-client-via-proxy.php

@@ -7,18 +7,25 @@
 use Amp\Http\Client\Request;
 use Amp\Http\Http1\Rfc7230;
 use Amp\Http\Tunnel\Http1TunnelConnector;
+use Amp\Http\Tunnel\Https1TunnelConnector;
+use Amp\Socket\ClientTlsContext;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 try {
+    $useHttps = (bool) ($argv[1] ?? false);
+    $peerName = $argv[1] ?? '';
+
     // If you need authentication, you can set a custom header (using Basic auth here)
     // $connector = new Http1TunnelConnector(new SocketAddress('127.0.0.1', 5512), [
     //     'proxy-authorization' => 'Basic ' . \base64_encode('user:pass'),
     // ]);
 
-    // If you have a proxy accepting HTTPS connections, you need to use Https1TunnelConnector instead:
-    // $connector = new Https1TunnelConnector(new SocketAddress('proxy.example.com', 5512));
-    $socketConnector = new Http1TunnelConnector('127.0.0.1:5512');
+    // If you have a proxy accepting HTTPS connections, the Https1TunnelConnector must be used, providing the
+    // peer name to the instance of ClientTlsContext.
+    $socketConnector = $useHttps
+        ? new Https1TunnelConnector('127.0.0.1:5512', new ClientTlsContext($peerName))
+        : new Http1TunnelConnector('127.0.0.1:5512');
 
     $client = (new HttpClientBuilder)
         ->usingPool(new UnlimitedConnectionPool(new DefaultConnectionFactory($socketConnector)))
@@ -33,7 +40,7 @@
     printf(
         "%s %s HTTP/%s\r\n",
         $request->getMethod(),
-        $request->getUri(),
+        (string) $request->getUri(),
         implode('+', $request->getProtocolVersions())
     );
 

examples/http-client-via-socks5.php

@@ -33,7 +33,7 @@
     printf(
         "%s %s HTTP/%s\r\n",
         $request->getMethod(),
-        $request->getUri(),
+        (string) $request->getUri(),
         implode('+', $request->getProtocolVersions())
     );
 

psalm.xml

@@ -7,12 +7,20 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     findUnusedBaselineEntry="true"
     findUnusedCode="true"
-    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
-        <directory name="src" />
+        <directory name="examples"/>
+        <directory name="src"/>
         <ignoreFiles>
-            <directory name="vendor" />
+            <directory name="vendor"/>
         </ignoreFiles>
     </projectFiles>
+
+    <issueHandlers>
+        <PossiblyUnusedMethod>
+            <errorLevel type="suppress">
+                <directory name="src"/>
+            </errorLevel>
+        </PossiblyUnusedMethod>
+    </issueHandlers>
 </psalm>

src/Internal/TunnelSocket.php

@@ -2,6 +2,7 @@
 
 namespace Amp\Http\Tunnel\Internal;
 
+use Amp\ByteStream\ReadableStreamIteratorAggregate;
 use Amp\ByteStream\ResourceStream;
 use Amp\Cancellation;
 use Amp\ForbidCloning;
@@ -21,12 +22,15 @@
 /**
  * @internal
  *
+ * @implements \IteratorAggregate<int, string>
+ *
  * @psalm-import-type HeaderParamArrayType from HttpMessage
  */
-final class TunnelSocket implements Socket
+final class TunnelSocket implements Socket, \IteratorAggregate
 {
     use ForbidCloning;
     use ForbidSerialization;
+    use ReadableStreamIteratorAggregate;
 
     /**
      * @internal
@@ -44,6 +48,7 @@ public static function tunnel(
         $request = new Request('http://' . \str_replace('tcp://', '', $target), 'CONNECT');
         $request->setHeaders($customHeaders);
 
+        $upgradedSocket = null;
         $request->setUpgradeHandler(static function (Socket $socket) use (&$upgradedSocket): void {
             $upgradedSocket = $socket;
         });