Skip to content

Commit

Permalink
refactor: use official google bucket adapter
Browse files Browse the repository at this point in the history
  • Loading branch information
kilatib authored and augustas committed Aug 2, 2024
1 parent 813b33d commit 1b69844
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion common/oatbox/filesystem/FileSystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected function getFileSystem()
*
* @return FilesystemAdapter adapter
*/
private function getAdapter()
public function getAdapter()
{
return $this->getFileSystem()->getAdapter();
}
Expand Down
4 changes: 2 additions & 2 deletions common/oatbox/filesystem/utils/FlyWrapperTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand Down
12 changes: 9 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand All @@ -107,5 +108,10 @@
"psr-4": {
"oat\\generis\\test\\": "generis/test/"
}
},
"config": {
"allow-plugins": {
"oat-sa/oatbox-extension-installer": true
}
}
}

0 comments on commit 1b69844

Please sign in to comment.