v2.4 wip

sirn-se · sirn-se · commit 5adfd1e765bf · 2025-09-06T13:59:30.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,10 +1,11 @@
-.gitattributes         export-ignore
-.github                export-ignore
-.gitignore             export-ignore
-docs                   export-ignore
-Makefile               export-ignore
-phpcs.xml              export-ignore
-phpstan.neon           export-ignore
-phpunit.xml            export-ignore
-README.md              export-ignore
-tests                  export-ignore
+.gitattributes      export-ignore
+.github/            export-ignore
+.gitignore          export-ignore
+docs/               export-ignore
+examples/           export-ignore
+Makefile            export-ignore
+phpcs.xml           export-ignore
+phpstan.neon        export-ignore
+phpunit.xml         export-ignore
+README.md           export-ignore
+tests/              export-ignore
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -85,12 +85,8 @@ jobs:
         restore-keys: ${{ runner.os }}-composer-
     - name: Install dependencies
       run: composer install --prefer-dist
-    - name: Code coverage build
-      run: XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover build/logs/clover.xml
-    - name: Code coverage upload
-      env:
-        COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: vendor/bin/php-coveralls -v
+    - name: Code coverage
+      run: vendor/bin/phpunit --coverage-clover coverage/clover.xml -d --min-coverage=100
 
   stan:
     runs-on: ubuntu-latest
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .phpunit.result.cache
+build/
 composer.lock
 composer.phar
 coverage/
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Sören Jensen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Makefile b/Makefile
@@ -14,12 +14,8 @@ cs: composer.lock
 stan: composer.lock
 	./vendor/bin/phpstan analyse --memory-limit 256M
 
-coverage: composer.lock build
-	XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
-	./vendor/bin/php-coveralls -v
-
-coverage-summary: composer.lock
-	XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-html=coverage
+coverage: composer.lock
+	./vendor/bin/phpunit --coverage-clover coverage/clover.xml --coverage-html=coverage -d --min-coverage=100
 
 composer.phar:
 	curl -s http://getcomposer.org/installer | php
@@ -29,11 +25,7 @@ composer.lock: composer.phar
 
 vendor/bin/phpunit: install
 
-build:
-	mkdir build
-
 clean:
 	rm composer.lock
 	rm -r vendor
 	rm -r coverage
-	rm -r build
diff --git a/composer.json b/composer.json
@@ -33,6 +33,7 @@
         "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^10.0 | ^11.0  | ^12.0",
         "phrity/net-uri": "^2.0",
+        "robiningelbrecht/phpunit-coverage-tools": "^1.9",
         "squizlabs/php_codesniffer": "^3.5"
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -7,4 +7,4 @@ parameters:
 	exceptions:
 	    check:
 	        tooWideThrowType: true
-	    implicitThrows: false
+	    implicitThrows: false
diff --git a/phpunit.xml b/phpunit.xml
@@ -11,15 +11,20 @@
     displayDetailsOnTestsThatTriggerNotices="true"
     displayDetailsOnTestsThatTriggerWarnings="true"
 >
-  <coverage/>
-  <testsuites>
-    <testsuite name="Unit tests">
-      <directory suffix=".php">tests/suites/</directory>
-    </testsuite>
-  </testsuites>
-  <source>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-  </source>
+    <testsuites>
+        <testsuite name="Unit tests">
+            <directory suffix=".php">tests/suites</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </source>
+    <extensions>
+        <bootstrap class="RobinIngelbrecht\PHPUnitCoverageTools\PhpUnitExtension">
+            <parameter name="exitOnLowCoverage" value="1"/>
+            <parameter name="cleanUpCloverXml" value="0"/>
+        </bootstrap>
+    </extensions>
 </phpunit>
diff --git a/src/SocketStream.php b/src/SocketStream.php
@@ -7,7 +7,7 @@
 /**
  * SocketStream class.
  */
-class SocketStream extends Stream
+class SocketStream extends Stream implements StreamInterface
 {
     // ---------- Configuration ---------------------------------------------------------------------------------------
 
diff --git a/src/Stream.php b/src/Stream.php
@@ -4,7 +4,6 @@
 
 use InvalidArgumentException;
 use Phrity\Util\ErrorHandler;
-use Psr\Http\Message\StreamInterface;
 use Stringable;
 use Throwable;
 
diff --git a/src/StreamCollection.php b/src/StreamCollection.php
@@ -15,7 +15,7 @@
 class StreamCollection implements Countable, Iterator
 {
     protected ErrorHandler $handler;
-    /** @var array<string, Stream> */
+    /** @var array<string, StreamInterface> */
     private array $streams = [];
 
     /**
@@ -31,12 +31,12 @@ public function __construct()
 
     /**
      * Attach stream to collection.
-     * @param Stream $attach Stream to attach.
+     * @param StreamInterface $attach Stream to attach.
      * @param string|null $key Definable name of stream.
      * @return string Name of stream.
      * @throws StreamException If already attached.
      */
-    public function attach(Stream $attach, string|null $key = null): string
+    public function attach(StreamInterface $attach, string|null $key = null): string
     {
         if ($key && array_key_exists($key, $this->streams)) {
             throw new StreamException(StreamException::COLLECT_KEY_CONFLICT, ['key' => $key]);
@@ -48,10 +48,10 @@ public function attach(Stream $attach, string|null $key = null): string
 
     /**
      * Detach stream from collection.
-     * @param Stream|string $detach Stream or name of stream  to detach.
+     * @param StreamInterface|string $detach Stream or name of stream to detach.
      * @return bool If a stream was detached.
      */
-    public function detach(Stream|string $detach): bool
+    public function detach(StreamInterface|string $detach): bool
     {
         if (is_string($detach)) {
             if (array_key_exists($detach, $this->streams)) {
@@ -157,9 +157,9 @@ public function count(): int
 
     /**
      * Return the current stream.
-     * @return Stream|null Current stream.
+     * @return StreamInterface|null Current stream.
      */
-    public function current(): Stream|null
+    public function current(): StreamInterface|null
     {
         return current($this->streams) ?: null;
     }
diff --git a/src/StreamInterface.php b/src/StreamInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Phrity\Net;
+
+use Psr\Http\Message\StreamInterface as PsrStreamInterface;
+
+/**
+ * StreamInterface.
+ */
+interface StreamInterface extends PsrStreamInterface
+{
+    /**
+     * @return Context
+     */
+    public function getContext(): Context;
+
+    /**
+     * @return resource|null
+     */
+    public function getResource(): mixed;
+}

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`"phpstan/phpstan": "^2.0",`
`34`	`34`	`"phpunit/phpunit": "^10.0 \| ^11.0 \| ^12.0",`
`35`	`35`	`"phrity/net-uri": "^2.0",`
	`36`	`+ "robiningelbrecht/phpunit-coverage-tools": "^1.9",`
`36`	`37`	`"squizlabs/php_codesniffer": "^3.5"`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`/**`
`8`	`8`	`* SocketStream class.`
`9`	`9`	`*/`
`10`		`-class SocketStream extends Stream`
	`10`	`+class SocketStream extends Stream implements StreamInterface`
`11`	`11`	`{`
`12`	`12`	`// ---------- Configuration ---------------------------------------------------------------------------------------`
`13`	`13`