Implemented SiteAccess-aware Flysystem v2 integration

ibexa · Dec 12, 2022 · a198a5d · a198a5d
1 parent 7b39720
commit a198a5d
Show file tree

Hide file tree

Showing 13 changed files with 801 additions and 141 deletions.
diff --git a/src/bundle/Core/Resources/config/default_settings.yml b/src/bundle/Core/Resources/config/default_settings.yml
@@ -256,8 +256,11 @@ parameters:
     ##
     ibexa.orm.entity_mappings: []
 
+    # fallback for existing project configuration, should be overridden
+    dfs_nfs_path: '%ibexa.io.dir.storage%'
+
     ibexa.io.nfs.adapter.config:
-        root: './'
+        root: '%dfs_nfs_path%'
         path: '$var_dir$/$storage_dir$/'
         writeFlags: ~
         linkHandling: ~

diff --git a/src/bundle/IO/Flysystem/Adapter/SiteAccessAwareLocalAdapter.php b/src/bundle/IO/Flysystem/Adapter/SiteAccessAwareLocalAdapter.php
diff --git a/src/bundle/IO/Resources/config/io.yml b/src/bundle/IO/Resources/config/io.yml
@@ -97,20 +97,6 @@ services:
         class: Ibexa\Bundle\IO\ApiLoader\HandlerRegistry
 
     # Inject the siteaccess config into a few io services
-    Ibexa\Core\IO\Adapter\LocalAdapter:
-        autoconfigure: true
-        arguments:
-            - '@Ibexa\Core\IO\IOConfigProvider'
-            - '@ibexa.config.resolver'
-
-    Ibexa\Bundle\IO\Flysystem\Adapter\SiteAccessAwareLocalAdapter:
-        arguments:
-            $configProcessor: '@Ibexa\Contracts\Core\SiteAccess\ConfigProcessor'
-            $config: '%ibexa.io.nfs.adapter.config%'
-
-    ibexa.io.nfs.adapter.site_access_aware:
-        alias: Ibexa\Bundle\IO\Flysystem\Adapter\SiteAccessAwareLocalAdapter
-
     Ibexa\Core\IO\UrlDecorator\AbsolutePrefix:
         class: Ibexa\Core\IO\UrlDecorator\AbsolutePrefix
         arguments:

diff --git a/src/lib/IO/Adapter/LocalAdapter.php b/src/lib/IO/Adapter/LocalAdapter.php