Merge pull request #21 from City-of-Helsinki/UHF-X-issue-3387094

UHF-X: PHP 8.2 support
City-of-Helsinki · Nov 8, 2023 · 92684fb · 92684fb
2 parents c54a5f6 + ba64a9c
commit 92684fb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -11,5 +11,12 @@
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
         "drupal/coder": "^8.3"
+    },
+    "extra": {
+        "patches": {
+            "twistor/flysystem-stream-wrapper": {
+                "PHP 8.2 support (https://www.drupal.org/project/flysystem/issues/3387094)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/ddb222622b92d1c2b7db975a84167a00579a1ad0/patches/3387094-add-context-property-to-stream-wrapper.patch"
+            }
+        }
     }
 }
diff --git a/patches/3387094-add-context-property-to-stream-wrapper.patch b/patches/3387094-add-context-property-to-stream-wrapper.patch
@@ -0,0 +1,18 @@
+diff --git a/src/FlysystemStreamWrapper.php b/src/FlysystemStreamWrapper.php
+index 93a79b6..5c5a200 100644
+--- a/src/FlysystemStreamWrapper.php
++++ b/src/FlysystemStreamWrapper.php
+@@ -25,6 +25,13 @@ class FlysystemStreamWrapper
+      */
+     const STREAM_URL_IGNORE_SIZE = 8;
+
++    /**
++     * PHP-passed stream context.
++     *
++     * @var resource|null
++     */
++    public $context;
++
+     /**
+      * The registered filesystems.
+      *