Merge pull request #19 from icewind1991/countwrapper-seek

handle seeks in countwrapper
icewind1991 · Dec 5, 2024 · cb2bd3e · cb2bd3e
2 parents 89a8191 + 7ad8ece
commit cb2bd3e
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,36 +7,36 @@ name: CI
 jobs:
   php-cs-fixer:
     name: PHP-CS-Fixer
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.3'
       - name: PHP-CS-Fixer
         uses: OskarStark/[email protected]
         with:
           args: --diff --dry-run --allow-risky yes --stop-on-violation --using-cache=no --path-mode=intersection
 
   phpstan:
     name: PHPStan Static Analysis
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.3'
       - name: Composer
         run: composer install
       - env:
           BACKEND: smbclient
         run: php ./vendor/bin/phpstan analyse --level 5 src
 
   phpunit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Unit tests
 
     strategy:
@@ -45,9 +45,13 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
+          - "8.2"
+          - "8.3"
+          - "8.4"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -62,7 +66,7 @@ jobs:
           files: ./coverage.xml
 
   phpunit-8:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Unit tests
 
     strategy:
@@ -72,7 +76,7 @@ jobs:
           - "7.2"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

diff --git a/src/CountWrapper.php b/src/CountWrapper.php
@@ -60,6 +60,17 @@ protected function open() {
 		return true;
 	}
 
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        if ($whence === SEEK_SET) {
+            $this->readCount = $offset;
+            $this->writeCount = $offset;
+        } else if ($whence === SEEK_CUR) {
+            $this->readCount += $offset;
+            $this->writeCount += $offset;
+        }
+        return parent::stream_seek($offset, $whence);
+    }
+
 	public function dir_opendir($path, $options) {
 		return $this->open();
 	}

diff --git a/tests/CountWrapperTest.php b/tests/CountWrapperTest.php
@@ -46,4 +46,22 @@ public function testWriteCount() {
 		fclose($wrapped);
 		$this->assertSame(6, $count);
 	}
+
+    public function testReadCountSeek() {
+        $count = 0;
+
+        $source = fopen('php://temp', 'r+');
+        fwrite($source, 'foobar');
+        rewind($source);
+
+        $wrapped = CountWrapper::wrap($source, function ($readCount) use (&$count) {
+            $count = $readCount;
+        });
+
+        stream_get_contents($wrapped);
+        fseek($wrapped, 3);
+        stream_get_contents($wrapped);
+        fclose($wrapped);
+        $this->assertSame(6, $count);
+    }
 }