diff --git a/common/oatbox/filesystem/FileSystem.php b/common/oatbox/filesystem/FileSystem.php index 85dde8a3e..71927f6fa 100644 --- a/common/oatbox/filesystem/FileSystem.php +++ b/common/oatbox/filesystem/FileSystem.php @@ -82,7 +82,7 @@ protected function getFileSystem() * * @return FilesystemAdapter adapter */ - private function getAdapter() + public function getAdapter() { return $this->getFileSystem()->getAdapter(); } diff --git a/common/oatbox/filesystem/utils/FlyWrapperTrait.php b/common/oatbox/filesystem/utils/FlyWrapperTrait.php index 5f54eb8e9..caf7a3498 100644 --- a/common/oatbox/filesystem/utils/FlyWrapperTrait.php +++ b/common/oatbox/filesystem/utils/FlyWrapperTrait.php @@ -36,7 +36,7 @@ public function writeStream($path, $resource, Config $config) /** * (non-PHPdoc) - * @see \League\Flysystem\FilesystemAdapter::update() + * @see \League\Flysystem\FilesystemAdapter::write() */ public function update($path, $contents, Config $config) { @@ -47,7 +47,7 @@ public function update($path, $contents, Config $config) /** * (non-PHPdoc) - * @see \League\Flysystem\FilesystemAdapter::updateStream() + * @see \League\Flysystem\FilesystemAdapter::writeStream() */ public function updateStream($path, $resource, Config $config) { diff --git a/composer.json b/composer.json index ec7e78591..bab286647 100755 --- a/composer.json +++ b/composer.json @@ -59,8 +59,9 @@ "doctrine/dbal": "^2.12", "doctrine/annotations": "^1.13", "laminas/laminas-servicemanager": "~2.5.0", - "league/flysystem": "~1.0", - "league/flysystem-memory": "~1.0", + "league/flysystem": "^2.0", + "league/flysystem-memory": "^2.0", + "league/flysystem-google-cloud-storage": "^2.0", "oat-sa/oatbox-extension-installer": "~1.1||dev-master", "oat-sa/lib-generis-search": "^2.3.0", "monolog/monolog": "^1.23.0", @@ -86,7 +87,7 @@ "php-mock/php-mock": "^2.0" }, "suggest": { - "superbalist/flysystem-google-storage": "Supports google flystore" + "league/flysystem-google-cloud-storage": "Supports google flystore" }, "autoload": { "psr-4": { @@ -107,5 +108,10 @@ "psr-4": { "oat\\generis\\test\\": "generis/test/" } + }, + "config": { + "allow-plugins": { + "oat-sa/oatbox-extension-installer": true + } } }