@@ -25,12 +25,12 @@ |
||
| 25 | 25 | use OC\BackgroundJob\QueuedJob; |
| 26 | 26 | |
| 27 | 27 | class CallableJob extends QueuedJob { |
| 28 | - protected function run($serializedCallable) { |
|
| 29 | - $callable = unserialize($serializedCallable); |
|
| 30 | - if (is_callable($callable)) { |
|
| 31 | - $callable(); |
|
| 32 | - } else { |
|
| 33 | - throw new \InvalidArgumentException('Invalid serialized callable'); |
|
| 34 | - } |
|
| 35 | - } |
|
| 28 | + protected function run($serializedCallable) { |
|
| 29 | + $callable = unserialize($serializedCallable); |
|
| 30 | + if (is_callable($callable)) { |
|
| 31 | + $callable(); |
|
| 32 | + } else { |
|
| 33 | + throw new \InvalidArgumentException('Invalid serialized callable'); |
|
| 34 | + } |
|
| 35 | + } |
|
| 36 | 36 | } |
@@ -24,23 +24,23 @@ |
||
| 24 | 24 | namespace OC\Template; |
| 25 | 25 | |
| 26 | 26 | class ResourceNotFoundException extends \LogicException { |
| 27 | - protected $resource; |
|
| 28 | - protected $webPath; |
|
| 27 | + protected $resource; |
|
| 28 | + protected $webPath; |
|
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * @param string $resource |
|
| 32 | - * @param string $webPath |
|
| 33 | - */ |
|
| 34 | - public function __construct($resource, $webPath) { |
|
| 35 | - parent::__construct('Resource not found'); |
|
| 36 | - $this->resource = $resource; |
|
| 37 | - $this->webPath = $webPath; |
|
| 38 | - } |
|
| 30 | + /** |
|
| 31 | + * @param string $resource |
|
| 32 | + * @param string $webPath |
|
| 33 | + */ |
|
| 34 | + public function __construct($resource, $webPath) { |
|
| 35 | + parent::__construct('Resource not found'); |
|
| 36 | + $this->resource = $resource; |
|
| 37 | + $this->webPath = $webPath; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * @return string |
|
| 42 | - */ |
|
| 43 | - public function getResourcePath() { |
|
| 44 | - return $this->webPath . '/' . $this->resource; |
|
| 45 | - } |
|
| 40 | + /** |
|
| 41 | + * @return string |
|
| 42 | + */ |
|
| 43 | + public function getResourcePath() { |
|
| 44 | + return $this->webPath . '/' . $this->resource; |
|
| 45 | + } |
|
| 46 | 46 | } |
@@ -23,35 +23,35 @@ |
||
| 23 | 23 | namespace OC\Memcache; |
| 24 | 24 | |
| 25 | 25 | trait CASTrait { |
| 26 | - abstract public function get($key); |
|
| 26 | + abstract public function get($key); |
|
| 27 | 27 | |
| 28 | - abstract public function set($key, $value, $ttl = 0); |
|
| 28 | + abstract public function set($key, $value, $ttl = 0); |
|
| 29 | 29 | |
| 30 | - abstract public function remove($key); |
|
| 30 | + abstract public function remove($key); |
|
| 31 | 31 | |
| 32 | - abstract public function add($key, $value, $ttl = 0); |
|
| 32 | + abstract public function add($key, $value, $ttl = 0); |
|
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * Compare and set |
|
| 36 | - * |
|
| 37 | - * @param string $key |
|
| 38 | - * @param mixed $old |
|
| 39 | - * @param mixed $new |
|
| 40 | - * @return bool |
|
| 41 | - */ |
|
| 42 | - public function cas($key, $old, $new) { |
|
| 43 | - //no native cas, emulate with locking |
|
| 44 | - if ($this->add($key . '_lock', true)) { |
|
| 45 | - if ($this->get($key) === $old) { |
|
| 46 | - $this->set($key, $new); |
|
| 47 | - $this->remove($key . '_lock'); |
|
| 48 | - return true; |
|
| 49 | - } else { |
|
| 50 | - $this->remove($key . '_lock'); |
|
| 51 | - return false; |
|
| 52 | - } |
|
| 53 | - } else { |
|
| 54 | - return false; |
|
| 55 | - } |
|
| 56 | - } |
|
| 34 | + /** |
|
| 35 | + * Compare and set |
|
| 36 | + * |
|
| 37 | + * @param string $key |
|
| 38 | + * @param mixed $old |
|
| 39 | + * @param mixed $new |
|
| 40 | + * @return bool |
|
| 41 | + */ |
|
| 42 | + public function cas($key, $old, $new) { |
|
| 43 | + //no native cas, emulate with locking |
|
| 44 | + if ($this->add($key . '_lock', true)) { |
|
| 45 | + if ($this->get($key) === $old) { |
|
| 46 | + $this->set($key, $new); |
|
| 47 | + $this->remove($key . '_lock'); |
|
| 48 | + return true; |
|
| 49 | + } else { |
|
| 50 | + $this->remove($key . '_lock'); |
|
| 51 | + return false; |
|
| 52 | + } |
|
| 53 | + } else { |
|
| 54 | + return false; |
|
| 55 | + } |
|
| 56 | + } |
|
| 57 | 57 | } |
@@ -23,32 +23,32 @@ |
||
| 23 | 23 | namespace OC\Memcache; |
| 24 | 24 | |
| 25 | 25 | trait CADTrait { |
| 26 | - abstract public function get($key); |
|
| 26 | + abstract public function get($key); |
|
| 27 | 27 | |
| 28 | - abstract public function remove($key); |
|
| 28 | + abstract public function remove($key); |
|
| 29 | 29 | |
| 30 | - abstract public function add($key, $value, $ttl = 0); |
|
| 30 | + abstract public function add($key, $value, $ttl = 0); |
|
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * Compare and delete |
|
| 34 | - * |
|
| 35 | - * @param string $key |
|
| 36 | - * @param mixed $old |
|
| 37 | - * @return bool |
|
| 38 | - */ |
|
| 39 | - public function cad($key, $old) { |
|
| 40 | - //no native cas, emulate with locking |
|
| 41 | - if ($this->add($key . '_lock', true)) { |
|
| 42 | - if ($this->get($key) === $old) { |
|
| 43 | - $this->remove($key); |
|
| 44 | - $this->remove($key . '_lock'); |
|
| 45 | - return true; |
|
| 46 | - } else { |
|
| 47 | - $this->remove($key . '_lock'); |
|
| 48 | - return false; |
|
| 49 | - } |
|
| 50 | - } else { |
|
| 51 | - return false; |
|
| 52 | - } |
|
| 53 | - } |
|
| 32 | + /** |
|
| 33 | + * Compare and delete |
|
| 34 | + * |
|
| 35 | + * @param string $key |
|
| 36 | + * @param mixed $old |
|
| 37 | + * @return bool |
|
| 38 | + */ |
|
| 39 | + public function cad($key, $old) { |
|
| 40 | + //no native cas, emulate with locking |
|
| 41 | + if ($this->add($key . '_lock', true)) { |
|
| 42 | + if ($this->get($key) === $old) { |
|
| 43 | + $this->remove($key); |
|
| 44 | + $this->remove($key . '_lock'); |
|
| 45 | + return true; |
|
| 46 | + } else { |
|
| 47 | + $this->remove($key . '_lock'); |
|
| 48 | + return false; |
|
| 49 | + } |
|
| 50 | + } else { |
|
| 51 | + return false; |
|
| 52 | + } |
|
| 53 | + } |
|
| 54 | 54 | } |
@@ -33,27 +33,27 @@ |
||
| 33 | 33 | */ |
| 34 | 34 | class CoreCapabilities implements ICapability { |
| 35 | 35 | |
| 36 | - /** @var IConfig */ |
|
| 37 | - private $config; |
|
| 36 | + /** @var IConfig */ |
|
| 37 | + private $config; |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @param IConfig $config |
|
| 41 | - */ |
|
| 42 | - public function __construct(IConfig $config) { |
|
| 43 | - $this->config = $config; |
|
| 44 | - } |
|
| 39 | + /** |
|
| 40 | + * @param IConfig $config |
|
| 41 | + */ |
|
| 42 | + public function __construct(IConfig $config) { |
|
| 43 | + $this->config = $config; |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - /** |
|
| 47 | - * Return this classes capabilities |
|
| 48 | - * |
|
| 49 | - * @return array |
|
| 50 | - */ |
|
| 51 | - public function getCapabilities() { |
|
| 52 | - return [ |
|
| 53 | - 'core' => [ |
|
| 54 | - 'pollinterval' => $this->config->getSystemValue('pollinterval', 60), |
|
| 55 | - 'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'), |
|
| 56 | - ] |
|
| 57 | - ]; |
|
| 58 | - } |
|
| 46 | + /** |
|
| 47 | + * Return this classes capabilities |
|
| 48 | + * |
|
| 49 | + * @return array |
|
| 50 | + */ |
|
| 51 | + public function getCapabilities() { |
|
| 52 | + return [ |
|
| 53 | + 'core' => [ |
|
| 54 | + 'pollinterval' => $this->config->getSystemValue('pollinterval', 60), |
|
| 55 | + 'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'), |
|
| 56 | + ] |
|
| 57 | + ]; |
|
| 58 | + } |
|
| 59 | 59 | } |
@@ -27,19 +27,19 @@ |
||
| 27 | 27 | * Defines the mount point to be (re)moved by the user |
| 28 | 28 | */ |
| 29 | 29 | interface MoveableMount { |
| 30 | - /** |
|
| 31 | - * Move the mount point to $target |
|
| 32 | - * |
|
| 33 | - * @param string $target the target mount point |
|
| 34 | - * @return bool |
|
| 35 | - */ |
|
| 36 | - public function moveMount($target); |
|
| 30 | + /** |
|
| 31 | + * Move the mount point to $target |
|
| 32 | + * |
|
| 33 | + * @param string $target the target mount point |
|
| 34 | + * @return bool |
|
| 35 | + */ |
|
| 36 | + public function moveMount($target); |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * Remove the mount points |
|
| 40 | - * |
|
| 41 | - * @return mixed |
|
| 42 | - * @return bool |
|
| 43 | - */ |
|
| 44 | - public function removeMount(); |
|
| 38 | + /** |
|
| 39 | + * Remove the mount points |
|
| 40 | + * |
|
| 41 | + * @return mixed |
|
| 42 | + * @return bool |
|
| 43 | + */ |
|
| 44 | + public function removeMount(); |
|
| 45 | 45 | } |
@@ -29,21 +29,21 @@ |
||
| 29 | 29 | * Listen to hooks and update the mount cache as needed |
| 30 | 30 | */ |
| 31 | 31 | class UserMountCacheListener { |
| 32 | - /** |
|
| 33 | - * @var IUserMountCache |
|
| 34 | - */ |
|
| 35 | - private $userMountCache; |
|
| 32 | + /** |
|
| 33 | + * @var IUserMountCache |
|
| 34 | + */ |
|
| 35 | + private $userMountCache; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * UserMountCacheListener constructor. |
|
| 39 | - * |
|
| 40 | - * @param IUserMountCache $userMountCache |
|
| 41 | - */ |
|
| 42 | - public function __construct(IUserMountCache $userMountCache) { |
|
| 43 | - $this->userMountCache = $userMountCache; |
|
| 44 | - } |
|
| 37 | + /** |
|
| 38 | + * UserMountCacheListener constructor. |
|
| 39 | + * |
|
| 40 | + * @param IUserMountCache $userMountCache |
|
| 41 | + */ |
|
| 42 | + public function __construct(IUserMountCache $userMountCache) { |
|
| 43 | + $this->userMountCache = $userMountCache; |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - public function listen(Manager $manager) { |
|
| 47 | - $manager->listen('\OC\User', 'postDelete', [$this->userMountCache, 'removeUserMounts']); |
|
| 48 | - } |
|
| 46 | + public function listen(Manager $manager) { |
|
| 47 | + $manager->listen('\OC\User', 'postDelete', [$this->userMountCache, 'removeUserMounts']); |
|
| 48 | + } |
|
| 49 | 49 | } |
@@ -37,45 +37,45 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | trait LocalTempFileTrait { |
| 39 | 39 | |
| 40 | - /** @var string[] */ |
|
| 41 | - protected $cachedFiles = []; |
|
| 40 | + /** @var string[] */ |
|
| 41 | + protected $cachedFiles = []; |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @param string $path |
|
| 45 | - * @return string |
|
| 46 | - */ |
|
| 47 | - protected function getCachedFile($path) { |
|
| 48 | - if (!isset($this->cachedFiles[$path])) { |
|
| 49 | - $this->cachedFiles[$path] = $this->toTmpFile($path); |
|
| 50 | - } |
|
| 51 | - return $this->cachedFiles[$path]; |
|
| 52 | - } |
|
| 43 | + /** |
|
| 44 | + * @param string $path |
|
| 45 | + * @return string |
|
| 46 | + */ |
|
| 47 | + protected function getCachedFile($path) { |
|
| 48 | + if (!isset($this->cachedFiles[$path])) { |
|
| 49 | + $this->cachedFiles[$path] = $this->toTmpFile($path); |
|
| 50 | + } |
|
| 51 | + return $this->cachedFiles[$path]; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * @param string $path |
|
| 56 | - */ |
|
| 57 | - protected function removeCachedFile($path) { |
|
| 58 | - unset($this->cachedFiles[$path]); |
|
| 59 | - } |
|
| 54 | + /** |
|
| 55 | + * @param string $path |
|
| 56 | + */ |
|
| 57 | + protected function removeCachedFile($path) { |
|
| 58 | + unset($this->cachedFiles[$path]); |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * @param string $path |
|
| 63 | - * @return string |
|
| 64 | - */ |
|
| 65 | - protected function toTmpFile($path) { //no longer in the storage api, still useful here |
|
| 66 | - $source = $this->fopen($path, 'r'); |
|
| 67 | - if (!$source) { |
|
| 68 | - return false; |
|
| 69 | - } |
|
| 70 | - if ($pos = strrpos($path, '.')) { |
|
| 71 | - $extension = substr($path, $pos); |
|
| 72 | - } else { |
|
| 73 | - $extension = ''; |
|
| 74 | - } |
|
| 75 | - $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($extension); |
|
| 76 | - $target = fopen($tmpFile, 'w'); |
|
| 77 | - \OC_Helper::streamCopy($source, $target); |
|
| 78 | - fclose($target); |
|
| 79 | - return $tmpFile; |
|
| 80 | - } |
|
| 61 | + /** |
|
| 62 | + * @param string $path |
|
| 63 | + * @return string |
|
| 64 | + */ |
|
| 65 | + protected function toTmpFile($path) { //no longer in the storage api, still useful here |
|
| 66 | + $source = $this->fopen($path, 'r'); |
|
| 67 | + if (!$source) { |
|
| 68 | + return false; |
|
| 69 | + } |
|
| 70 | + if ($pos = strrpos($path, '.')) { |
|
| 71 | + $extension = substr($path, $pos); |
|
| 72 | + } else { |
|
| 73 | + $extension = ''; |
|
| 74 | + } |
|
| 75 | + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($extension); |
|
| 76 | + $target = fopen($tmpFile, 'w'); |
|
| 77 | + \OC_Helper::streamCopy($source, $target); |
|
| 78 | + fclose($target); |
|
| 79 | + return $tmpFile; |
|
| 80 | + } |
|
| 81 | 81 | } |
@@ -29,80 +29,80 @@ |
||
| 29 | 29 | use OCP\Files\Storage\IStorageFactory; |
| 30 | 30 | |
| 31 | 31 | class StorageFactory implements IStorageFactory { |
| 32 | - /** |
|
| 33 | - * @var array[] [$name=>['priority'=>$priority, 'wrapper'=>$callable] $storageWrappers |
|
| 34 | - */ |
|
| 35 | - private $storageWrappers = []; |
|
| 32 | + /** |
|
| 33 | + * @var array[] [$name=>['priority'=>$priority, 'wrapper'=>$callable] $storageWrappers |
|
| 34 | + */ |
|
| 35 | + private $storageWrappers = []; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * allow modifier storage behaviour by adding wrappers around storages |
|
| 39 | - * |
|
| 40 | - * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage |
|
| 41 | - * |
|
| 42 | - * @param string $wrapperName name of the wrapper |
|
| 43 | - * @param callable $callback callback |
|
| 44 | - * @param int $priority wrappers with the lower priority are applied last (meaning they get called first) |
|
| 45 | - * @param \OCP\Files\Mount\IMountPoint[] $existingMounts existing mount points to apply the wrapper to |
|
| 46 | - * @return bool true if the wrapper was added, false if there was already a wrapper with this |
|
| 47 | - * name registered |
|
| 48 | - */ |
|
| 49 | - public function addStorageWrapper($wrapperName, $callback, $priority = 50, $existingMounts = []) { |
|
| 50 | - if (isset($this->storageWrappers[$wrapperName])) { |
|
| 51 | - return false; |
|
| 52 | - } |
|
| 37 | + /** |
|
| 38 | + * allow modifier storage behaviour by adding wrappers around storages |
|
| 39 | + * |
|
| 40 | + * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage |
|
| 41 | + * |
|
| 42 | + * @param string $wrapperName name of the wrapper |
|
| 43 | + * @param callable $callback callback |
|
| 44 | + * @param int $priority wrappers with the lower priority are applied last (meaning they get called first) |
|
| 45 | + * @param \OCP\Files\Mount\IMountPoint[] $existingMounts existing mount points to apply the wrapper to |
|
| 46 | + * @return bool true if the wrapper was added, false if there was already a wrapper with this |
|
| 47 | + * name registered |
|
| 48 | + */ |
|
| 49 | + public function addStorageWrapper($wrapperName, $callback, $priority = 50, $existingMounts = []) { |
|
| 50 | + if (isset($this->storageWrappers[$wrapperName])) { |
|
| 51 | + return false; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - // apply to existing mounts before registering it to prevent applying it double in MountPoint::createStorage |
|
| 55 | - foreach ($existingMounts as $mount) { |
|
| 56 | - $mount->wrapStorage($callback); |
|
| 57 | - } |
|
| 54 | + // apply to existing mounts before registering it to prevent applying it double in MountPoint::createStorage |
|
| 55 | + foreach ($existingMounts as $mount) { |
|
| 56 | + $mount->wrapStorage($callback); |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - $this->storageWrappers[$wrapperName] = ['wrapper' => $callback, 'priority' => $priority]; |
|
| 60 | - return true; |
|
| 61 | - } |
|
| 59 | + $this->storageWrappers[$wrapperName] = ['wrapper' => $callback, 'priority' => $priority]; |
|
| 60 | + return true; |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * Remove a storage wrapper by name. |
|
| 65 | - * Note: internal method only to be used for cleanup |
|
| 66 | - * |
|
| 67 | - * @param string $wrapperName name of the wrapper |
|
| 68 | - * @internal |
|
| 69 | - */ |
|
| 70 | - public function removeStorageWrapper($wrapperName) { |
|
| 71 | - unset($this->storageWrappers[$wrapperName]); |
|
| 72 | - } |
|
| 63 | + /** |
|
| 64 | + * Remove a storage wrapper by name. |
|
| 65 | + * Note: internal method only to be used for cleanup |
|
| 66 | + * |
|
| 67 | + * @param string $wrapperName name of the wrapper |
|
| 68 | + * @internal |
|
| 69 | + */ |
|
| 70 | + public function removeStorageWrapper($wrapperName) { |
|
| 71 | + unset($this->storageWrappers[$wrapperName]); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * Create an instance of a storage and apply the registered storage wrappers |
|
| 76 | - * |
|
| 77 | - * @param \OCP\Files\Mount\IMountPoint $mountPoint |
|
| 78 | - * @param string $class |
|
| 79 | - * @param array $arguments |
|
| 80 | - * @return \OCP\Files\Storage |
|
| 81 | - */ |
|
| 82 | - public function getInstance(IMountPoint $mountPoint, $class, $arguments) { |
|
| 83 | - return $this->wrap($mountPoint, new $class($arguments)); |
|
| 84 | - } |
|
| 74 | + /** |
|
| 75 | + * Create an instance of a storage and apply the registered storage wrappers |
|
| 76 | + * |
|
| 77 | + * @param \OCP\Files\Mount\IMountPoint $mountPoint |
|
| 78 | + * @param string $class |
|
| 79 | + * @param array $arguments |
|
| 80 | + * @return \OCP\Files\Storage |
|
| 81 | + */ |
|
| 82 | + public function getInstance(IMountPoint $mountPoint, $class, $arguments) { |
|
| 83 | + return $this->wrap($mountPoint, new $class($arguments)); |
|
| 84 | + } |
|
| 85 | 85 | |
| 86 | - /** |
|
| 87 | - * @param \OCP\Files\Mount\IMountPoint $mountPoint |
|
| 88 | - * @param \OCP\Files\Storage $storage |
|
| 89 | - * @return \OCP\Files\Storage |
|
| 90 | - */ |
|
| 91 | - public function wrap(IMountPoint $mountPoint, $storage) { |
|
| 92 | - $wrappers = array_values($this->storageWrappers); |
|
| 93 | - usort($wrappers, function ($a, $b) { |
|
| 94 | - return $b['priority'] - $a['priority']; |
|
| 95 | - }); |
|
| 96 | - /** @var callable[] $wrappers */ |
|
| 97 | - $wrappers = array_map(function ($wrapper) { |
|
| 98 | - return $wrapper['wrapper']; |
|
| 99 | - }, $wrappers); |
|
| 100 | - foreach ($wrappers as $wrapper) { |
|
| 101 | - $storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint); |
|
| 102 | - if (!($storage instanceof \OCP\Files\Storage)) { |
|
| 103 | - throw new \Exception('Invalid result from storage wrapper'); |
|
| 104 | - } |
|
| 105 | - } |
|
| 106 | - return $storage; |
|
| 107 | - } |
|
| 86 | + /** |
|
| 87 | + * @param \OCP\Files\Mount\IMountPoint $mountPoint |
|
| 88 | + * @param \OCP\Files\Storage $storage |
|
| 89 | + * @return \OCP\Files\Storage |
|
| 90 | + */ |
|
| 91 | + public function wrap(IMountPoint $mountPoint, $storage) { |
|
| 92 | + $wrappers = array_values($this->storageWrappers); |
|
| 93 | + usort($wrappers, function ($a, $b) { |
|
| 94 | + return $b['priority'] - $a['priority']; |
|
| 95 | + }); |
|
| 96 | + /** @var callable[] $wrappers */ |
|
| 97 | + $wrappers = array_map(function ($wrapper) { |
|
| 98 | + return $wrapper['wrapper']; |
|
| 99 | + }, $wrappers); |
|
| 100 | + foreach ($wrappers as $wrapper) { |
|
| 101 | + $storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint); |
|
| 102 | + if (!($storage instanceof \OCP\Files\Storage)) { |
|
| 103 | + throw new \Exception('Invalid result from storage wrapper'); |
|
| 104 | + } |
|
| 105 | + } |
|
| 106 | + return $storage; |
|
| 107 | + } |
|
| 108 | 108 | } |