From e1458fc0bf481d9c6db1ce2fa986be8d32506345 Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh Date: Fri, 11 Mar 2022 13:27:25 +0000 Subject: [PATCH 01/13] Add Linode Adapter --- composer.lock | 401 +++++++++++---------- src/Storage/Device/ObjectStorage.php | 50 +++ src/Storage/Storage.php | 1 + tests/Storage/Device/ObjectStorageTest.php | 30 ++ 4 files changed, 282 insertions(+), 200 deletions(-) create mode 100644 src/Storage/Device/ObjectStorage.php create mode 100644 tests/Storage/Device/ObjectStorageTest.php diff --git a/composer.lock b/composer.lock index 6f813ef2..3a1b56b0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "124a0248853b18b623e8a315d291e9c0", + "content-hash": "1df212eaa94b7c555a893db0225a179b", "packages": [ { "name": "utopia-php/framework", - "version": "0.19.2", + "version": "0.19.7", "source": { "type": "git", "url": "https://github.com/utopia-php/framework.git", - "reference": "49e4374b97c0f4d14bc84b424bdc9c3b7747e15f" + "reference": "f17afe77a21873b9be18ebc05283813468b4283a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/framework/zipball/49e4374b97c0f4d14bc84b424bdc9c3b7747e15f", - "reference": "49e4374b97c0f4d14bc84b424bdc9c3b7747e15f", + "url": "https://api.github.com/repos/utopia-php/framework/zipball/f17afe77a21873b9be18ebc05283813468b4283a", + "reference": "f17afe77a21873b9be18ebc05283813468b4283a", "shasum": "" }, "require": { @@ -51,9 +51,9 @@ ], "support": { "issues": "https://github.com/utopia-php/framework/issues", - "source": "https://github.com/utopia-php/framework/tree/0.19.2" + "source": "https://github.com/utopia-php/framework/tree/0.19.7" }, - "time": "2021-12-07T09:29:35+00:00" + "time": "2022-02-18T00:04:49+00:00" } ], "packages-dev": [ @@ -63,12 +63,12 @@ "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "591e06ec427c2d2e5018172552b9354c208419e7" + "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/591e06ec427c2d2e5018172552b9354c208419e7", - "reference": "591e06ec427c2d2e5018172552b9354c208419e7", + "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", "shasum": "" }, "require": { @@ -91,13 +91,13 @@ } }, "autoload": { - "psr-4": { - "Amp\\": "lib" - }, "files": [ "lib/functions.php", "lib/Internal/functions.php" - ] + ], + "psr-4": { + "Amp\\": "lib" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -137,7 +137,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/master" + "source": "https://github.com/amphp/amp/tree/v2.6.2" }, "funding": [ { @@ -145,7 +145,7 @@ "type": "github" } ], - "time": "2021-12-03T13:45:05+00:00" + "time": "2022-02-20T17:52:18+00:00" }, { "name": "amphp/byte-stream", @@ -181,12 +181,12 @@ } }, "autoload": { - "psr-4": { - "Amp\\ByteStream\\": "lib" - }, "files": [ "lib/functions.php" - ] + ], + "psr-4": { + "Amp\\ByteStream\\": "lib" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -231,12 +231,12 @@ "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "1927b0a81e48643ca45c4a55b34a7645b04f3acc" + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/1927b0a81e48643ca45c4a55b34a7645b04f3acc", - "reference": "1927b0a81e48643ca45c4a55b34a7645b04f3acc", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", "shasum": "" }, "require": { @@ -281,7 +281,7 @@ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/master" + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" }, "funding": [ { @@ -297,7 +297,7 @@ "type": "tidelift" } ], - "time": "2021-09-16T13:11:31+00:00" + "time": "2022-01-17T14:14:24+00:00" }, { "name": "composer/semver", @@ -305,19 +305,19 @@ "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "83e511e247de329283478496f7a1e114c9517506" + "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506", - "reference": "83e511e247de329283478496f7a1e114c9517506", + "url": "https://api.github.com/repos/composer/semver/zipball/a951f614bd64dcd26137bc9b7b2637ddcfc57649", + "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.54", + "phpstan/phpstan": "^1.4", "symfony/phpunit-bridge": "^4.2 || ^5" }, "default-branch": true, @@ -363,7 +363,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.6" + "source": "https://github.com/composer/semver/tree/3.2.9" }, "funding": [ { @@ -379,7 +379,7 @@ "type": "tidelift" } ], - "time": "2021-10-25T11:34:17+00:00" + "time": "2022-02-04T13:58:43+00:00" }, { "name": "composer/xdebug-handler", @@ -387,12 +387,12 @@ "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "f27e06cd9675801df441b3656569b328e04aa37c" + "reference": "dee81bf97571cb7168019825ee9522e8dc2a5936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f27e06cd9675801df441b3656569b328e04aa37c", - "reference": "f27e06cd9675801df441b3656569b328e04aa37c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/dee81bf97571cb7168019825ee9522e8dc2a5936", + "reference": "dee81bf97571cb7168019825ee9522e8dc2a5936", "shasum": "" }, "require": { @@ -427,7 +427,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/1.4.6" + "source": "https://github.com/composer/xdebug-handler/tree/1.4" }, "funding": [ { @@ -443,7 +443,7 @@ "type": "tidelift" } ], - "time": "2021-03-25T17:01:18+00:00" + "time": "2022-01-05T14:26:21+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -488,25 +488,26 @@ "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "6410c4b8352cb64218641457cef64997e6b784fb" + "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/6410c4b8352cb64218641457cef64997e6b784fb", - "reference": "6410c4b8352cb64218641457cef64997e6b784fb", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", + "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.0", + "doctrine/coding-standard": "^9", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpbench/phpbench": "^0.16 || ^1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.22" }, "type": "library", "autoload": { @@ -549,7 +550,7 @@ "type": "tidelift" } ], - "time": "2020-11-10T19:05:51+00:00" + "time": "2022-03-03T08:28:38+00:00" }, { "name": "felixfbecker/advanced-json-rpc", @@ -602,12 +603,12 @@ "source": { "type": "git", "url": "https://github.com/felixfbecker/php-language-server-protocol.git", - "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730" + "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730", - "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842", + "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842", "shasum": "" }, "require": { @@ -649,9 +650,9 @@ ], "support": { "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", - "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/1.5.1" + "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/master" }, - "time": "2021-02-22T14:02:09+00:00" + "time": "2022-03-02T22:36:06+00:00" }, { "name": "myclabs/deep-copy", @@ -659,34 +660,35 @@ "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" + "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", + "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, - "replace": { - "myclabs/deep-copy": "self.version" + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3,<3.2.2" }, "require-dev": { - "doctrine/collections": "^1.0", - "doctrine/common": "^2.6", - "phpunit/phpunit": "^7.1" + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "default-branch": true, "type": "library", "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, "files": [ "src/DeepCopy/deep_copy.php" - ] + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -702,7 +704,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" }, "funding": [ { @@ -710,7 +712,7 @@ "type": "tidelift" } ], - "time": "2020-11-13T09:40:50+00:00" + "time": "2022-03-03T13:19:32+00:00" }, { "name": "netresearch/jsonmapper", @@ -878,16 +880,17 @@ "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "36d8a21e851a9512db2b086dc5ac2c61308f0138" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/36d8a21e851a9512db2b086dc5ac2c61308f0138", + "reference": "36d8a21e851a9512db2b086dc5ac2c61308f0138", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -929,22 +932,28 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/master" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2022-02-21T19:55:33+00:00" }, { "name": "phar-io/version", - "version": "3.1.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/phar-io/version.git", - "reference": "bae7c545bef187884426f042434e561ab1ddb182" + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182", - "reference": "bae7c545bef187884426f042434e561ab1ddb182", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", "shasum": "" }, "require": { @@ -980,9 +989,9 @@ "description": "Library for handling version information and constraints", "support": { "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.1.0" + "source": "https://github.com/phar-io/version/tree/3.2.1" }, - "time": "2021-02-23T14:00:09+00:00" + "time": "2022-02-21T01:04:05+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -1043,12 +1052,12 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" + "reference": "21481a5c97e8332f7279e31219c32faa2da21c79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/21481a5c97e8332f7279e31219c32faa2da21c79", + "reference": "21481a5c97e8332f7279e31219c32faa2da21c79", "shasum": "" }, "require": { @@ -1059,7 +1068,7 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2", + "mockery/mockery": "~1.3.5", "psalm/phar": "^4.8" }, "default-branch": true, @@ -1091,9 +1100,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" }, - "time": "2021-10-19T17:43:47+00:00" + "time": "2021-12-27T22:36:43+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -1101,12 +1110,12 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "f8ec4ab631de5a97769e66b13418c3b8b24e81f4" + "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/f8ec4ab631de5a97769e66b13418c3b8b24e81f4", - "reference": "f8ec4ab631de5a97769e66b13418c3b8b24e81f4", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", + "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", "shasum": "" }, "require": { @@ -1142,9 +1151,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.x" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" }, - "time": "2021-11-24T08:29:39+00:00" + "time": "2022-01-04T19:58:01+00:00" }, { "name": "phpspec/prophecy", @@ -1220,12 +1229,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "299e0a60b0f5bd3296fd52290a585ac2b2517b65" + "reference": "9a61ec72f0d2b0b1d3f7431f90ab936b9c0e2062" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/299e0a60b0f5bd3296fd52290a585ac2b2517b65", - "reference": "299e0a60b0f5bd3296fd52290a585ac2b2517b65", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9a61ec72f0d2b0b1d3f7431f90ab936b9c0e2062", + "reference": "9a61ec72f0d2b0b1d3f7431f90ab936b9c0e2062", "shasum": "" }, "require": { @@ -1289,7 +1298,7 @@ "type": "github" } ], - "time": "2021-12-05T09:19:13+00:00" + "time": "2022-03-08T06:18:06+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1297,12 +1306,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" + "reference": "38b24367e1b340aa78b96d7cab042942d917bb84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/38b24367e1b340aa78b96d7cab042942d917bb84", + "reference": "38b24367e1b340aa78b96d7cab042942d917bb84", "shasum": "" }, "require": { @@ -1349,7 +1358,7 @@ "type": "github" } ], - "time": "2021-12-02T12:48:52+00:00" + "time": "2022-02-11T16:23:04+00:00" }, { "name": "phpunit/php-invoker", @@ -1538,12 +1547,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "02eb251b5a2c3dae82e16774eca8fabf7039fd7b" + "reference": "d62a25e0a8ec2efef34d85023cdae489af08a786" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/02eb251b5a2c3dae82e16774eca8fabf7039fd7b", - "reference": "02eb251b5a2c3dae82e16774eca8fabf7039fd7b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d62a25e0a8ec2efef34d85023cdae489af08a786", + "reference": "d62a25e0a8ec2efef34d85023cdae489af08a786", "shasum": "" }, "require": { @@ -1559,7 +1568,7 @@ "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2.7", + "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -1594,11 +1603,11 @@ } }, "autoload": { - "classmap": [ - "src/" - ], "files": [ "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1633,7 +1642,7 @@ "type": "github" } ], - "time": "2021-11-29T15:44:44+00:00" + "time": "2022-03-09T06:54:34+00:00" }, { "name": "psr/container", @@ -2172,12 +2181,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" + "reference": "428c31e2ea8b292aa814bc460cf28d58eba4d2ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/428c31e2ea8b292aa814bc460cf28d58eba4d2ba", + "reference": "428c31e2ea8b292aa814bc460cf28d58eba4d2ba", "shasum": "" }, "require": { @@ -2241,20 +2250,20 @@ "type": "github" } ], - "time": "2021-11-11T14:18:36+00:00" + "time": "2022-03-06T06:59:32+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.3", + "version": "5.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49" + "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49", - "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", "shasum": "" }, "require": { @@ -2297,7 +2306,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" }, "funding": [ { @@ -2305,7 +2314,7 @@ "type": "github" } ], - "time": "2021-06-11T13:31:12+00:00" + "time": "2022-02-14T08:28:10+00:00" }, { "name": "sebastian/lines-of-code", @@ -2584,7 +2593,6 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" }, "funding": [ @@ -2601,12 +2609,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "f24cbc541026c3bb7d27c647f0f9ea337135b22a" + "reference": "6f7a93739024454b06e4933ff0a42d88bb54f336" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/f24cbc541026c3bb7d27c647f0f9ea337135b22a", - "reference": "f24cbc541026c3bb7d27c647f0f9ea337135b22a", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/6f7a93739024454b06e4933ff0a42d88bb54f336", + "reference": "6f7a93739024454b06e4933ff0a42d88bb54f336", "shasum": "" }, "require": { @@ -2649,7 +2657,7 @@ "type": "github" } ], - "time": "2021-06-18T06:28:45+00:00" + "time": "2022-03-09T17:15:41+00:00" }, { "name": "sebastian/version", @@ -2710,12 +2718,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4" + "reference": "d8111acc99876953f52fe16d4c50eb60940d49ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", - "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", + "url": "https://api.github.com/repos/symfony/console/zipball/d8111acc99876953f52fe16d4c50eb60940d49ad", + "reference": "d8111acc99876953f52fe16d4c50eb60940d49ad", "shasum": "" }, "require": { @@ -2786,7 +2794,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.1" + "source": "https://github.com/symfony/console/tree/v5.4.5" }, "funding": [ { @@ -2802,7 +2810,7 @@ "type": "tidelift" } ], - "time": "2021-12-09T11:22:43+00:00" + "time": "2022-02-24T12:45:35+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2810,12 +2818,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced" + "reference": "893fd20d9ae41a0bae2b9cbdd581ac0cf3917de3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", - "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/893fd20d9ae41a0bae2b9cbdd581ac0cf3917de3", + "reference": "893fd20d9ae41a0bae2b9cbdd581ac0cf3917de3", "shasum": "" }, "require": { @@ -2825,7 +2833,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "3.1-dev" }, "thanks": { "name": "symfony/contracts", @@ -2854,7 +2862,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/main" }, "funding": [ { @@ -2870,11 +2878,11 @@ "type": "tidelift" } ], - "time": "2021-11-01T23:48:49+00:00" + "time": "2021-11-29T18:10:03+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "dev-main", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -2895,7 +2903,6 @@ "suggest": { "ext-ctype": "For best performance" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -2907,12 +2914,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2937,7 +2944,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/main" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" }, "funding": [ { @@ -2957,7 +2964,7 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "dev-main", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -2975,7 +2982,6 @@ "suggest": { "ext-intl": "For best performance" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -2987,12 +2993,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3019,7 +3025,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/main" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" }, "funding": [ { @@ -3039,7 +3045,7 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "dev-main", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -3057,7 +3063,6 @@ "suggest": { "ext-intl": "For best performance" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3069,12 +3074,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -3104,7 +3109,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" }, "funding": [ { @@ -3124,7 +3129,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "dev-main", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -3145,7 +3150,6 @@ "suggest": { "ext-mbstring": "For best performance" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3157,12 +3161,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3188,7 +3192,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/main" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" }, "funding": [ { @@ -3208,7 +3212,7 @@ }, { "name": "symfony/polyfill-php73", - "version": "dev-main", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -3223,7 +3227,6 @@ "require": { "php": ">=7.1" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3235,12 +3238,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -3268,7 +3271,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/main" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0" }, "funding": [ { @@ -3288,22 +3291,21 @@ }, { "name": "symfony/polyfill-php80", - "version": "dev-main", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", "shasum": "" }, "require": { "php": ">=7.1" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3315,12 +3317,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -3352,7 +3354,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/main" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" }, "funding": [ { @@ -3368,7 +3370,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T13:58:33+00:00" + "time": "2022-03-04T08:16:47+00:00" }, { "name": "symfony/service-contracts", @@ -3376,12 +3378,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603" + "reference": "bc0a2247c72d29241b5a06fb60dc1c9d9acf2a3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/36715ebf9fb9db73db0cb24263c79077c6fe8603", - "reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bc0a2247c72d29241b5a06fb60dc1c9d9acf2a3a", + "reference": "bc0a2247c72d29241b5a06fb60dc1c9d9acf2a3a", "shasum": "" }, "require": { @@ -3398,7 +3400,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "3.1-dev" }, "thanks": { "name": "symfony/contracts", @@ -3435,7 +3437,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.0.0" + "source": "https://github.com/symfony/service-contracts/tree/main" }, "funding": [ { @@ -3451,20 +3453,20 @@ "type": "tidelift" } ], - "time": "2021-11-04T17:53:12+00:00" + "time": "2021-11-29T18:10:03+00:00" }, { "name": "symfony/string", - "version": "6.1.x-dev", + "version": "6.0.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "aa14a00c4701b9cfbe21aec46972c493b3edddf5" + "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/aa14a00c4701b9cfbe21aec46972c493b3edddf5", - "reference": "aa14a00c4701b9cfbe21aec46972c493b3edddf5", + "url": "https://api.github.com/repos/symfony/string/zipball/522144f0c4c004c80d56fa47e40e17028e2eefc2", + "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2", "shasum": "" }, "require": { @@ -3485,12 +3487,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Symfony\\Component\\String\\": "" - }, "files": [ "Resources/functions.php" ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, "exclude-from-classmap": [ "/Tests/" ] @@ -3520,7 +3522,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/6.1" + "source": "https://github.com/symfony/string/tree/6.0" }, "funding": [ { @@ -3536,7 +3538,7 @@ "type": "tidelift" } ], - "time": "2021-12-11T14:57:13+00:00" + "time": "2022-01-02T09:55:41+00:00" }, { "name": "theseer/tokenizer", @@ -3664,13 +3666,13 @@ } }, "autoload": { - "psr-4": { - "Psalm\\": "src/Psalm/" - }, "files": [ "src/functions.php", "src/spl_object_id.php" - ] + ], + "psr-4": { + "Psalm\\": "src/Psalm/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3799,27 +3801,26 @@ }, { "name": "webmozart/path-util", - "version": "dev-master", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/webmozart/path-util.git", - "reference": "6099b5238073f87f246863fd58c2e447acfc0d24" + "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/path-util/zipball/6099b5238073f87f246863fd58c2e447acfc0d24", - "reference": "6099b5238073f87f246863fd58c2e447acfc0d24", + "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725", + "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725", "shasum": "" }, "require": { - "php": "^5.3.3|^7.0", + "php": ">=5.3.3", "webmozart/assert": "~1.0" }, "require-dev": { "phpunit/phpunit": "^4.6", "sebastian/version": "^1.0.1" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3844,10 +3845,10 @@ "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.", "support": { "issues": "https://github.com/webmozart/path-util/issues", - "source": "https://github.com/webmozart/path-util/tree/master" + "source": "https://github.com/webmozart/path-util/tree/2.3.0" }, "abandoned": "symfony/filesystem", - "time": "2021-11-08T08:17:20+00:00" + "time": "2015-12-17T08:42:14+00:00" } ], "aliases": [], @@ -3856,8 +3857,8 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.4" + "php": ">=8.0" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } diff --git a/src/Storage/Device/ObjectStorage.php b/src/Storage/Device/ObjectStorage.php new file mode 100644 index 00000000..4f14ee10 --- /dev/null +++ b/src/Storage/Device/ObjectStorage.php @@ -0,0 +1,50 @@ +headers['host'] = $bucket.'.'.$region.'.'.'linodeobjects.com'; + } + + /** + * @return string + */ + public function getName(): string + { + return 'Linode Object Storage'; + } + + /** + * @return string + */ + public function getDescription(): string + { + return 'Linode Object Storage'; + } +} diff --git a/src/Storage/Storage.php b/src/Storage/Storage.php index 8e8d6c29..ddc3b13b 100644 --- a/src/Storage/Storage.php +++ b/src/Storage/Storage.php @@ -13,6 +13,7 @@ class Storage const DEVICE_LOCAL = 'Local'; const DEVICE_S3 = 'S3'; const DEVICE_DO_SPACES = 'DOSpaces'; + const DEVICE_OBJECT_STORAGE='ObjectStorage'; /** * Devices. diff --git a/tests/Storage/Device/ObjectStorageTest.php b/tests/Storage/Device/ObjectStorageTest.php new file mode 100644 index 00000000..2e7f01d8 --- /dev/null +++ b/tests/Storage/Device/ObjectStorageTest.php @@ -0,0 +1,30 @@ +root = 'root'; + $key = $_SERVER['OBJECT_STORAGE_ACCESS_KEY'] ?? ''; + $secret = $_SERVER['OBJECT_STORAGE_SECRET'] ?? ''; + $bucket = "everly-test"; + + $this->object = new ObjectStorage($this->root, $key, $secret, $bucket, ObjectStorage::EU_CENTRAL_1, ObjectStorage::ACL_PRIVATE); + + } + + protected function getAdapterName(): string + { + return 'Linode Object Storage'; + } + + protected function getAdapterDescription(): string + { + return 'Linode Object Storage'; + } +} From 761c116dcc7e935e842e1fd0778759e62c572965 Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh Date: Wed, 16 Mar 2022 17:08:25 +0000 Subject: [PATCH 02/13] Change name for Linode adapter --- composer.lock | 46 +++++++++---------- .../Device/{ObjectStorage.php => Linode.php} | 2 +- tests/Storage/Device/LinodeTest.php | 30 ++++++++++++ tests/Storage/Device/ObjectStorageTest.php | 30 ------------ 4 files changed, 54 insertions(+), 54 deletions(-) rename src/Storage/Device/{ObjectStorage.php => Linode.php} (97%) create mode 100644 tests/Storage/Device/LinodeTest.php delete mode 100644 tests/Storage/Device/ObjectStorageTest.php diff --git a/composer.lock b/composer.lock index 3a1b56b0..29ee93be 100644 --- a/composer.lock +++ b/composer.lock @@ -305,12 +305,12 @@ "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649" + "reference": "5d8e574bb0e69188786b8ef77d43341222a41a71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/a951f614bd64dcd26137bc9b7b2637ddcfc57649", - "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649", + "url": "https://api.github.com/repos/composer/semver/zipball/5d8e574bb0e69188786b8ef77d43341222a41a71", + "reference": "5d8e574bb0e69188786b8ef77d43341222a41a71", "shasum": "" }, "require": { @@ -363,7 +363,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.9" + "source": "https://github.com/composer/semver/tree/3.3.1" }, "funding": [ { @@ -379,7 +379,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T13:58:43+00:00" + "time": "2022-03-16T11:22:07+00:00" }, { "name": "composer/xdebug-handler", @@ -1110,12 +1110,12 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" + "reference": "77a32518733312af16a44300404e945338981de3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", + "reference": "77a32518733312af16a44300404e945338981de3", "shasum": "" }, "require": { @@ -1151,9 +1151,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.x" }, - "time": "2022-01-04T19:58:01+00:00" + "time": "2022-03-15T21:29:03+00:00" }, { "name": "phpspec/prophecy", @@ -1547,12 +1547,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d62a25e0a8ec2efef34d85023cdae489af08a786" + "reference": "5fc83848551ec5fc0086af8024efc9c42fcde559" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d62a25e0a8ec2efef34d85023cdae489af08a786", - "reference": "d62a25e0a8ec2efef34d85023cdae489af08a786", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5fc83848551ec5fc0086af8024efc9c42fcde559", + "reference": "5fc83848551ec5fc0086af8024efc9c42fcde559", "shasum": "" }, "require": { @@ -1582,7 +1582,7 @@ "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^2.3.4", + "sebastian/type": "^3.0", "sebastian/version": "^3.0.2" }, "require-dev": { @@ -1642,7 +1642,7 @@ "type": "github" } ], - "time": "2022-03-09T06:54:34+00:00" + "time": "2022-03-15T10:09:15+00:00" }, { "name": "psr/container", @@ -2605,28 +2605,28 @@ }, { "name": "sebastian/type", - "version": "2.3.x-dev", + "version": "3.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "6f7a93739024454b06e4933ff0a42d88bb54f336" + "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/6f7a93739024454b06e4933ff0a42d88bb54f336", - "reference": "6f7a93739024454b06e4933ff0a42d88bb54f336", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", + "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", "shasum": "" }, "require": { "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2649,7 +2649,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/2.3" + "source": "https://github.com/sebastianbergmann/type/tree/3.0.0" }, "funding": [ { @@ -2657,7 +2657,7 @@ "type": "github" } ], - "time": "2022-03-09T17:15:41+00:00" + "time": "2022-03-15T09:54:48+00:00" }, { "name": "sebastian/version", diff --git a/src/Storage/Device/ObjectStorage.php b/src/Storage/Device/Linode.php similarity index 97% rename from src/Storage/Device/ObjectStorage.php rename to src/Storage/Device/Linode.php index 4f14ee10..affd723b 100644 --- a/src/Storage/Device/ObjectStorage.php +++ b/src/Storage/Device/Linode.php @@ -4,7 +4,7 @@ use Utopia\Storage\Device\S3; -class ObjectStorage extends S3 +class Linode extends S3 { /** * Regions constants diff --git a/tests/Storage/Device/LinodeTest.php b/tests/Storage/Device/LinodeTest.php new file mode 100644 index 00000000..3d1fdfb5 --- /dev/null +++ b/tests/Storage/Device/LinodeTest.php @@ -0,0 +1,30 @@ +root = 'root'; + $key = $_SERVER['LINODE_ACCESS_KEY'] ?? ''; + $secret = $_SERVER['LINODE_SECRET'] ?? ''; + $bucket = ""; + + $this->object = new Linode($this->root, $key, $secret, $bucket, Linode::EU_CENTRAL_1, Linode::ACL_PRIVATE); + + } + + protected function getAdapterName(): string + { + return 'Linode Object Storage'; + } + + protected function getAdapterDescription(): string + { + return 'Linode Object Storage'; + } +} diff --git a/tests/Storage/Device/ObjectStorageTest.php b/tests/Storage/Device/ObjectStorageTest.php deleted file mode 100644 index 2e7f01d8..00000000 --- a/tests/Storage/Device/ObjectStorageTest.php +++ /dev/null @@ -1,30 +0,0 @@ -root = 'root'; - $key = $_SERVER['OBJECT_STORAGE_ACCESS_KEY'] ?? ''; - $secret = $_SERVER['OBJECT_STORAGE_SECRET'] ?? ''; - $bucket = "everly-test"; - - $this->object = new ObjectStorage($this->root, $key, $secret, $bucket, ObjectStorage::EU_CENTRAL_1, ObjectStorage::ACL_PRIVATE); - - } - - protected function getAdapterName(): string - { - return 'Linode Object Storage'; - } - - protected function getAdapterDescription(): string - { - return 'Linode Object Storage'; - } -} From fde768b3e54054133ab5f9d6353b604b59ef0886 Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh Date: Wed, 16 Mar 2022 17:36:13 +0000 Subject: [PATCH 03/13] Add Linode under Supported device --- src/Storage/Storage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Storage/Storage.php b/src/Storage/Storage.php index ddc3b13b..aea36b95 100644 --- a/src/Storage/Storage.php +++ b/src/Storage/Storage.php @@ -13,7 +13,7 @@ class Storage const DEVICE_LOCAL = 'Local'; const DEVICE_S3 = 'S3'; const DEVICE_DO_SPACES = 'DOSpaces'; - const DEVICE_OBJECT_STORAGE='ObjectStorage'; + const DEVICE_LINODE='Linode'; /** * Devices. From f8a6e271514460c999249ecbdadbe24af52e3ad7 Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh Date: Wed, 16 Mar 2022 17:40:19 +0000 Subject: [PATCH 04/13] Add Linode Object Storage to readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bf612684..785c3107 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ![Total Downloads](https://img.shields.io/packagist/dt/utopia-php/storage.svg) [![Discord](https://img.shields.io/discord/564160730845151244?label=discord)](https://appwrite.io/discord) -Utopia Storage library is simple and lite library for managing application storage. It supports multiple storage adapters. We already support AWS S3 storage and Digitalocean Spaces storage. This library is aiming to be as simple and easy to learn and use. This library is maintained by the [Appwrite team](https://appwrite.io). +Utopia Storage library is simple and lite library for managing application storage. It supports multiple storage adapters. We already support AWS S3 storage, Digitalocean Spaces storage and Linode Object Storage. This library is aiming to be as simple and easy to learn and use. This library is maintained by the [Appwrite team](https://appwrite.io). This library is part of the [Utopia Framework](https://github.com/utopia-php/framework) project. From 90a8961f9cc8f549fc9b1342cf9ca5371d302ab5 Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh <77877486+everly-gif@users.noreply.github.com> Date: Wed, 16 Mar 2022 23:41:50 +0530 Subject: [PATCH 05/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 785c3107..7078d384 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ![Total Downloads](https://img.shields.io/packagist/dt/utopia-php/storage.svg) [![Discord](https://img.shields.io/discord/564160730845151244?label=discord)](https://appwrite.io/discord) -Utopia Storage library is simple and lite library for managing application storage. It supports multiple storage adapters. We already support AWS S3 storage, Digitalocean Spaces storage and Linode Object Storage. This library is aiming to be as simple and easy to learn and use. This library is maintained by the [Appwrite team](https://appwrite.io). +Utopia Storage library is simple and lite library for managing application storage. It supports multiple storage adapters. We already support AWS S3 storage, Digitalocean Spaces storage and Linode Object storage. This library is aiming to be as simple and easy to learn and use. This library is maintained by the [Appwrite team](https://appwrite.io). This library is part of the [Utopia Framework](https://github.com/utopia-php/framework) project. @@ -58,4 +58,4 @@ Utopia Framework requires PHP 7.4 or later. We recommend using the latest PHP ve ## Copyright and license -The MIT License (MIT) [http://www.opensource.org/licenses/mit-license.php](http://www.opensource.org/licenses/mit-license.php) \ No newline at end of file +The MIT License (MIT) [http://www.opensource.org/licenses/mit-license.php](http://www.opensource.org/licenses/mit-license.php) From 9c314aa0ceffe6d4c9d3193d53058247ca56a7c7 Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh <77877486+everly-gif@users.noreply.github.com> Date: Mon, 28 Mar 2022 21:18:56 +0530 Subject: [PATCH 06/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cc34648f..89f9d443 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ![Total Downloads](https://img.shields.io/packagist/dt/utopia-php/storage.svg) [![Discord](https://img.shields.io/discord/564160730845151244?label=discord)](https://appwrite.io/discord) -Utopia Storage library is simple and lite library for managing application storage. It supports multiple storage adapters. We already support AWS S3 storage, Digitalocean Spaces storage, Backblaze B2 Cloud storage and Linode object storage. This library is aiming to be as simple and easy to learn and use. This library is maintained by the [Appwrite team](https://appwrite.io). +Utopia Storage library is simple and lite library for managing application storage. It supports multiple storage adapters. We already support AWS S3 storage, Digitalocean Spaces storage, Backblaze B2 Cloud storage, Linode Object storage and Wasabi cloud storage. This library is aiming to be as simple and easy to learn and use. This library is maintained by the [Appwrite team](https://appwrite.io). This library is part of the [Utopia Framework](https://github.com/utopia-php/framework) project. From e62ee22d6d9ed41ec1568b3925aff56b6b348719 Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh <77877486+everly-gif@users.noreply.github.com> Date: Mon, 28 Mar 2022 21:19:45 +0530 Subject: [PATCH 07/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 89f9d443..fa6456a0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ![Total Downloads](https://img.shields.io/packagist/dt/utopia-php/storage.svg) [![Discord](https://img.shields.io/discord/564160730845151244?label=discord)](https://appwrite.io/discord) -Utopia Storage library is simple and lite library for managing application storage. It supports multiple storage adapters. We already support AWS S3 storage, Digitalocean Spaces storage, Backblaze B2 Cloud storage, Linode Object storage and Wasabi cloud storage. This library is aiming to be as simple and easy to learn and use. This library is maintained by the [Appwrite team](https://appwrite.io). +Utopia Storage library is simple and lite library for managing application storage. It supports multiple storage adapters. We already support AWS S3 storage, Digitalocean Spaces storage, Backblaze B2 Cloud storage, Linode Object storage and Wasabi Cloud storage. This library is aiming to be as simple and easy to learn and use. This library is maintained by the [Appwrite team](https://appwrite.io). This library is part of the [Utopia Framework](https://github.com/utopia-php/framework) project. From e47d2d1f251485155b2bea305ec429f2d2bd35fa Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh <77877486+everly-gif@users.noreply.github.com> Date: Mon, 28 Mar 2022 21:22:53 +0530 Subject: [PATCH 08/13] Update Storage.php --- src/Storage/Storage.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Storage/Storage.php b/src/Storage/Storage.php index e7ff68ef..93ce6077 100644 --- a/src/Storage/Storage.php +++ b/src/Storage/Storage.php @@ -13,11 +13,11 @@ class Storage const DEVICE_LOCAL = 'Local'; const DEVICE_S3 = 'S3'; const DEVICE_DO_SPACES = 'DOSpaces'; -<<<<<<< HEAD - const DEVICE_LINODE='Linode'; -======= const DEVICE_BACKBLAZE = 'BackBlaze'; ->>>>>>> 91f354487e987e5b0512c5a4fbe1bd3760d1e084 + const DEVICE_LINODE='Linode'; + + + /** * Devices. @@ -123,4 +123,4 @@ public static function human(int $bytes, $decimals = 2, $system = 'metric') return sprintf("%.{$decimals}f%s", $bytes / pow($mod, $factor), $units[$system][$factor]); } -} \ No newline at end of file +} From 287ceead13b7d7f952272aa502fa3e11e0469b7a Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh <77877486+everly-gif@users.noreply.github.com> Date: Mon, 28 Mar 2022 21:23:13 +0530 Subject: [PATCH 09/13] Update Storage.php --- src/Storage/Storage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Storage/Storage.php b/src/Storage/Storage.php index 93ce6077..f84d1dae 100644 --- a/src/Storage/Storage.php +++ b/src/Storage/Storage.php @@ -14,7 +14,7 @@ class Storage const DEVICE_S3 = 'S3'; const DEVICE_DO_SPACES = 'DOSpaces'; const DEVICE_BACKBLAZE = 'BackBlaze'; - const DEVICE_LINODE='Linode'; + const DEVICE_LINODE= 'Linode'; From c070e4faddd21f2d8e7c4559bf58d9ca34fc1462 Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh <77877486+everly-gif@users.noreply.github.com> Date: Mon, 28 Mar 2022 21:24:43 +0530 Subject: [PATCH 10/13] remove blank lines --- src/Storage/Storage.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Storage/Storage.php b/src/Storage/Storage.php index f84d1dae..cc27a41e 100644 --- a/src/Storage/Storage.php +++ b/src/Storage/Storage.php @@ -16,9 +16,6 @@ class Storage const DEVICE_BACKBLAZE = 'BackBlaze'; const DEVICE_LINODE= 'Linode'; - - - /** * Devices. * From afac419ed8b5d99f17e37948eae66922187526e0 Mon Sep 17 00:00:00 2001 From: Everly Precia Suresh Date: Mon, 28 Mar 2022 17:04:33 +0000 Subject: [PATCH 11/13] fix merge conflicts --- composer.lock | 8 -------- 1 file changed, 8 deletions(-) diff --git a/composer.lock b/composer.lock index bbdb9ec5..e6e499b5 100644 --- a/composer.lock +++ b/composer.lock @@ -363,11 +363,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", -<<<<<<< HEAD "source": "https://github.com/composer/semver/tree/3.3.1" -======= - "source": "https://github.com/composer/semver/tree/3.2.9" ->>>>>>> 91f354487e987e5b0512c5a4fbe1bd3760d1e084 }, "funding": [ { @@ -383,11 +379,7 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2022-03-16T11:22:07+00:00" -======= - "time": "2022-02-04T13:58:43+00:00" ->>>>>>> 91f354487e987e5b0512c5a4fbe1bd3760d1e084 }, { "name": "composer/xdebug-handler", From eb4477ab8f828d1be6909bdf04366a21fb9631eb Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 29 Mar 2022 08:58:47 +0300 Subject: [PATCH 12/13] Update LinodeTest.php --- tests/Storage/Device/LinodeTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Storage/Device/LinodeTest.php b/tests/Storage/Device/LinodeTest.php index 3d1fdfb5..d0de8440 100644 --- a/tests/Storage/Device/LinodeTest.php +++ b/tests/Storage/Device/LinodeTest.php @@ -12,7 +12,7 @@ protected function init(): void $this->root = 'root'; $key = $_SERVER['LINODE_ACCESS_KEY'] ?? ''; $secret = $_SERVER['LINODE_SECRET'] ?? ''; - $bucket = ""; + $bucket = 'linode-tests'; $this->object = new Linode($this->root, $key, $secret, $bucket, Linode::EU_CENTRAL_1, Linode::ACL_PRIVATE); From 674cb10fbfa0918edb127159a7fc24dd0b92fcd2 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 29 Mar 2022 09:24:34 +0300 Subject: [PATCH 13/13] Update LinodeTest.php --- tests/Storage/Device/LinodeTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Storage/Device/LinodeTest.php b/tests/Storage/Device/LinodeTest.php index d0de8440..e5808fe5 100644 --- a/tests/Storage/Device/LinodeTest.php +++ b/tests/Storage/Device/LinodeTest.php @@ -12,7 +12,7 @@ protected function init(): void $this->root = 'root'; $key = $_SERVER['LINODE_ACCESS_KEY'] ?? ''; $secret = $_SERVER['LINODE_SECRET'] ?? ''; - $bucket = 'linode-tests'; + $bucket = 'everly-test'; $this->object = new Linode($this->root, $key, $secret, $bucket, Linode::EU_CENTRAL_1, Linode::ACL_PRIVATE);