Merge branch 'v1.6' into v1.x

bovigo · Feb 23, 2022 · 7a20ce2 · 7a20ce2
2 parents 0de6a28 + 17d16a8
commit 7a20ce2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/runTests.yml b/.github/workflows/runTests.yml
@@ -24,6 +24,7 @@ jobs:
           - '7.4'
           - '8.0'
           - '8.1'
+          - '8.2'
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:
@@ -58,11 +59,11 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install dependencies for PHP < 8.0
-        if: matrix.php-versions != '8.0' && matrix.php-versions != '8.1'
+        if: matrix.php-versions != '8.0' && matrix.php-versions != '8.1' && matrix.php-versions != '8.2'
         run: composer install --prefer-dist --no-progress
 
       - name: Install PHPUnit 8 for PHP 8
-        if: matrix.php-versions == '8.0' || matrix.php-versions == '8.1'
+        if: matrix.php-versions == '8.0' || matrix.php-versions == '8.1' || matrix.php-versions == '8.2'
         run: |
           composer require --dev phpunit/phpunit:8.5.17 --ignore-platform-reqs
           git apply --reject --whitespace=fix src/test/patches/php8-return-types.diff

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,11 @@
     - `org\bovigo\vfs\content\SeekableFileContent`
   * raised requirement for minimum PHP version to 5.6.0
 
+1.6.11 (2022-??-??)
+-------------------
+
+  * Add support for PHP 8.2's `$content` property in `vfsStreamWrapper`
+
 1.6.10 (2021-09-25)
 -------------------
 

diff --git a/src/StreamWrapper.php b/src/StreamWrapper.php
@@ -84,6 +84,12 @@ class StreamWrapper
      * file mode: read and write
      */
     const ALL                    = 2;
+    /**
+     * The current context or null if none passed.
+     *
+     * @var resource|null
+     */
+    public $context;
     /**
      * switch whether class has already been registered as stream wrapper or not
      *

diff --git a/tests/phpt/bug71287.phpt b/tests/phpt/bug71287.phpt
@@ -6,6 +6,12 @@ See https://github.com/mikey179/vfsStream/issues/120
 --FILE--
 <?php
 class Stream {
+    /**
+     * The current context or null if none passed.
+     *
+     * @var resource|null
+     */
+    public $context;
     public function stream_open($path, $mode, $options, $opened_path) {
 
         return true;