From 3b1fd53508639e0eeefd9f55ad7935201af2a102 Mon Sep 17 00:00:00 2001 From: Mahmoud Saada Date: Tue, 16 Feb 2016 16:10:23 -0800 Subject: [PATCH] upgrade aws s3 v2 adapter to v3 --- README.md | 7 +- composer.json | 2 +- composer.lock | 786 +++++++++++++++++++++++++++------------- src/AwsS3Filesystem.php | 24 +- 4 files changed, 547 insertions(+), 272 deletions(-) diff --git a/README.md b/README.md index dd75e3d..41410eb 100644 --- a/README.md +++ b/README.md @@ -92,13 +92,13 @@ return [ Either run ```bash -$ composer require league/flysystem-aws-s3-v2 +$ composer require league/flysystem-aws-s3-v3 ``` or add ``` -"league/flysystem-aws-s3-v2": "~1.0" +"league/flysystem-aws-s3-v3": "~1.0" ``` to the `require` section of your `composer.json` file and configure application `components` as follows @@ -113,7 +113,8 @@ return [ 'key' => 'your-key', 'secret' => 'your-secret', 'bucket' => 'your-bucket', - // 'region' => 'your-region', + 'region' => 'your-region', + // 'version' => 'latest', // 'baseUrl' => 'your-base-url', // 'prefix' => 'your-prefix', // 'options' => [], diff --git a/composer.json b/composer.json index ca9a26d..8050768 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "league/flysystem": "~1.0" }, "require-dev": { - "league/flysystem-aws-s3-v2": "~1.0", + "league/flysystem-aws-s3-v3": "~1.0", "league/flysystem-azure": "~1.0", "league/flysystem-cached-adapter": "~1.0", "league/flysystem-copy": "~1.0", diff --git a/composer.lock b/composer.lock index 6b7362d..018e05a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,40 +4,27 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "9792244f513efd8af343d363ed0c85ee", + "hash": "7e671503e3abfecaff1873585b7d3f45", + "content-hash": "bad1ed9b0935f52be00882dac7490806", "packages": [ { "name": "bower-asset/jquery", - "version": "2.1.4", + "version": "2.2.0", "source": { "type": "git", - "url": "https://github.com/jquery/jquery.git", - "reference": "7751e69b615c6eca6f783a81e292a55725af6b85" + "url": "https://github.com/jquery/jquery-dist.git", + "reference": "6fc01e29bdad0964f62ef56d01297039cdcadbe5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jquery/jquery/zipball/7751e69b615c6eca6f783a81e292a55725af6b85", - "reference": "7751e69b615c6eca6f783a81e292a55725af6b85", + "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/6fc01e29bdad0964f62ef56d01297039cdcadbe5", + "reference": "6fc01e29bdad0964f62ef56d01297039cdcadbe5", "shasum": "" }, - "require-dev": { - "bower-asset/qunit": "1.14.0", - "bower-asset/requirejs": "2.1.10", - "bower-asset/sinon": "1.8.1", - "bower-asset/sizzle": "2.1.1-patch2" - }, "type": "bower-asset-library", "extra": { "bower-asset-main": "dist/jquery.js", "bower-asset-ignore": [ - "**/.*", - "build", - "dist/cdn", - "speed", - "test", - "*.md", - "AUTHORS.txt", - "Gruntfile.js", "package.json" ] }, @@ -45,6 +32,7 @@ "MIT" ], "keywords": [ + "browser", "javascript", "jquery", "library" @@ -52,16 +40,16 @@ }, { "name": "bower-asset/jquery.inputmask", - "version": "3.1.63", + "version": "3.2.7", "source": { "type": "git", "url": "https://github.com/RobinHerbots/jquery.inputmask.git", - "reference": "c40c7287eadc31e341ebbf0c02352eb55b9cbc48" + "reference": "5a72c563b502b8e05958a524cdfffafe9987be38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/c40c7287eadc31e341ebbf0c02352eb55b9cbc48", - "reference": "c40c7287eadc31e341ebbf0c02352eb55b9cbc48", + "url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/5a72c563b502b8e05958a524cdfffafe9987be38", + "reference": "5a72c563b502b8e05958a524cdfffafe9987be38", "shasum": "" }, "require": { @@ -70,23 +58,17 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": [ - "./dist/inputmask/jquery.inputmask.js", - "./dist/inputmask/jquery.inputmask.extensions.js", - "./dist/inputmask/jquery.inputmask.date.extensions.js", - "./dist/inputmask/jquery.inputmask.numeric.extensions.js", - "./dist/inputmask/jquery.inputmask.phone.extensions.js", - "./dist/inputmask/jquery.inputmask.regex.extensions.js" + "./dist/inputmask/inputmask.js" ], "bower-asset-ignore": [ - "**/.*", - "qunit/", - "nuget/", - "tools/", - "js/", - "*.md", - "build.properties", - "build.xml", - "jquery.inputmask.jquery.json" + "**/*", + "!dist/*", + "!dist/inputmask/*", + "!dist/min/*", + "!dist/min/inputmask/*", + "!extra/bindings/*", + "!extra/dependencyLibs/*", + "!extra/phone-codes/*" ] }, "license": [ @@ -132,16 +114,16 @@ }, { "name": "bower-asset/yii2-pjax", - "version": "v2.0.4", + "version": "v2.0.5", "source": { "type": "git", "url": "https://github.com/yiisoft/jquery-pjax.git", - "reference": "3f20897307cca046fca5323b318475ae9dac0ca0" + "reference": "6818718408086db6bdcf33649cecb86b6b4f9b67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/3f20897307cca046fca5323b318475ae9dac0ca0", - "reference": "3f20897307cca046fca5323b318475ae9dac0ca0", + "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/6818718408086db6bdcf33649cecb86b6b4f9b67", + "reference": "6818718408086db6bdcf33649cecb86b6b4f9b67", "shasum": "" }, "require": { @@ -269,30 +251,30 @@ }, { "name": "league/flysystem", - "version": "1.0.3", + "version": "1.0.16", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "3c2400a99ccc3be6884d40361890010449c6b447" + "reference": "183e1a610664baf6dcd6fceda415baf43cbdc031" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3c2400a99ccc3be6884d40361890010449c6b447", - "reference": "3c2400a99ccc3be6884d40361890010449c6b447", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/183e1a610664baf6dcd6fceda415baf43cbdc031", + "reference": "183e1a610664baf6dcd6fceda415baf43cbdc031", "shasum": "" }, "require": { "php": ">=5.4.0" }, + "conflict": { + "league/flysystem-sftp": "<1.0.6" + }, "require-dev": { "ext-fileinfo": "*", - "league/phpunit-coverage-listener": "~1.1", "mockery/mockery": "~0.9", - "phpspec/phpspec": "~2.0", + "phpspec/phpspec": "^2.2", "phpspec/prophecy-phpunit": "~1.0", - "phpunit/phpunit": "~4.1", - "predis/predis": "~1.0", - "tedivm/stash": "~0.12.0" + "phpunit/phpunit": "~4.8" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -306,8 +288,7 @@ "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files", "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib", "league/flysystem-webdav": "Allows you to use WebDAV storage", - "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter", - "predis/predis": "Allows you to use Predis for caching" + "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter" }, "type": "library", "extra": { @@ -330,10 +311,11 @@ "email": "info@frenky.net" } ], - "description": "Many filesystems, one API.", + "description": "Filesystem abstraction: Many filesystems, one API.", "keywords": [ "Cloud Files", "WebDAV", + "abstraction", "aws", "cloud", "copy.com", @@ -341,6 +323,7 @@ "file systems", "files", "filesystem", + "filesystems", "ftp", "rackspace", "remote", @@ -348,33 +331,34 @@ "sftp", "storage" ], - "time": "2015-03-29 14:01:43" + "time": "2015-12-19 20:16:43" }, { "name": "yiisoft/yii2", - "version": "2.0.4", + "version": "2.0.7", "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-framework.git", - "reference": "726867caee3f23aa7a6975c801e64b6021e14f86" + "reference": "f45651582cb853b4326730d9d187a0f7a44a45a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/726867caee3f23aa7a6975c801e64b6021e14f86", - "reference": "726867caee3f23aa7a6975c801e64b6021e14f86", + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/f45651582cb853b4326730d9d187a0f7a44a45a3", + "reference": "f45651582cb853b4326730d9d187a0f7a44a45a3", "shasum": "" }, "require": { - "bower-asset/jquery": "2.1.*@stable | 1.11.*@stable", - "bower-asset/jquery.inputmask": "3.1.*", + "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable", + "bower-asset/jquery.inputmask": "~3.2.2", "bower-asset/punycode": "1.3.*", - "bower-asset/yii2-pjax": ">=2.0.1", + "bower-asset/yii2-pjax": "~2.0.1", "cebe/markdown": "~1.0.0 | ~1.1.0", + "ext-ctype": "*", "ext-mbstring": "*", "ezyang/htmlpurifier": "4.6.*", "lib-pcre": "*", "php": ">=5.4.0", - "yiisoft/yii2-composer": "*" + "yiisoft/yii2-composer": "~2.0.4" }, "bin": [ "yii" @@ -428,6 +412,11 @@ "name": "Paul Klimov", "email": "klimov.paul@gmail.com", "role": "Core framework development" + }, + { + "name": "Dmitry Naumenko", + "email": "d.naumenko.a@gmail.com", + "role": "Core framework development" } ], "description": "Yii PHP Framework Version 2", @@ -436,24 +425,24 @@ "framework", "yii2" ], - "time": "2015-05-10 20:09:47" + "time": "2016-02-14 14:45:55" }, { "name": "yiisoft/yii2-composer", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-composer.git", - "reference": "ca8d23707ae47d20b0454e4b135c156f6da6d7be" + "reference": "7452fd908a5023b8bb5ea1b123a174ca080de464" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/ca8d23707ae47d20b0454e4b135c156f6da6d7be", - "reference": "ca8d23707ae47d20b0454e4b135c156f6da6d7be", + "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/7452fd908a5023b8bb5ea1b123a174ca080de464", + "reference": "7452fd908a5023b8bb5ea1b123a174ca080de464", "shasum": "" }, "require": { - "composer-plugin-api": "1.0.0" + "composer-plugin-api": "^1.0" }, "type": "composer-plugin", "extra": { @@ -483,52 +472,65 @@ "extension installer", "yii2" ], - "time": "2015-03-01 06:22:44" + "time": "2016-02-06 00:49:24" } ], "packages-dev": [ { "name": "aws/aws-sdk-php", - "version": "2.8.3", + "version": "3.15.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "85c5224582acf507afad232da20a7ef0b2ec0073" + "reference": "5e6078913293576de969703481994b77c380ca30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/85c5224582acf507afad232da20a7ef0b2ec0073", - "reference": "85c5224582acf507afad232da20a7ef0b2ec0073", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5e6078913293576de969703481994b77c380ca30", + "reference": "5e6078913293576de969703481994b77c380ca30", "shasum": "" }, "require": { - "guzzle/guzzle": "~3.7", - "php": ">=5.3.3" + "guzzlehttp/guzzle": "~5.3|~6.0.1|~6.1", + "guzzlehttp/promises": "~1.0", + "guzzlehttp/psr7": "~1.0", + "mtdowling/jmespath.php": "~2.2", + "php": ">=5.5" }, "require-dev": { - "doctrine/cache": "~1.0", + "andrewsville/php-token-reflection": "^1.4", + "aws/aws-php-sns-message-validator": "~1.0", + "behat/behat": "~3.0", + "doctrine/cache": "~1.4", + "ext-dom": "*", + "ext-json": "*", "ext-openssl": "*", - "monolog/monolog": "~1.4", - "phpunit/phpunit": "~4.0", - "symfony/yaml": "~2.1" + "ext-pcre": "*", + "ext-simplexml": "*", + "ext-spl": "*", + "nette/neon": "^2.3", + "phpunit/phpunit": "~4.0|~5.0", + "psr/cache": "^1.0" }, "suggest": { - "doctrine/cache": "Adds support for caching of credentials and responses", - "ext-apc": "Allows service description opcode caching, request and response caching, and credentials caching", - "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages", - "monolog/monolog": "Adds support for logging HTTP requests and responses", - "symfony/yaml": "Eases the ability to write manifests for creating jobs in AWS Import/Export" + "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", + "doctrine/cache": "To use the DoctrineCacheAdapter", + "ext-curl": "To send requests using cURL", + "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { - "psr-0": { - "Aws": "src/" - } + "psr-4": { + "Aws\\": "src/" + }, + "files": [ + "src/functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -552,20 +554,20 @@ "s3", "sdk" ], - "time": "2015-05-07 21:02:23" + "time": "2016-02-11 23:23:31" }, { "name": "barracuda/copy", - "version": "1.1.6", + "version": "1.1.7", "source": { "type": "git", "url": "https://github.com/copy-app/php-client-library.git", - "reference": "ef60bee6a57ad171258391f981dbd395ececa3e0" + "reference": "83d8b7e93b3cdc6c6a978f1d88d26b31eac4a255" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/copy-app/php-client-library/zipball/ef60bee6a57ad171258391f981dbd395ececa3e0", - "reference": "ef60bee6a57ad171258391f981dbd395ececa3e0", + "url": "https://api.github.com/repos/copy-app/php-client-library/zipball/83d8b7e93b3cdc6c6a978f1d88d26b31eac4a255", + "reference": "83d8b7e93b3cdc6c6a978f1d88d26b31eac4a255", "shasum": "" }, "require": { @@ -594,20 +596,20 @@ "keywords": [ "copy" ], - "time": "2015-03-07 14:30:23" + "time": "2015-05-27 21:28:58" }, { "name": "dropbox/dropbox-sdk", - "version": "v1.1.5", + "version": "v1.1.6", "source": { "type": "git", "url": "https://github.com/dropbox/dropbox-sdk-php.git", - "reference": "138bfec02f042fa6a4b384c0ae7ebe92ad122bbd" + "reference": "6901f8122458e0ce7e391468c0cf6cca465bd0ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dropbox/dropbox-sdk-php/zipball/138bfec02f042fa6a4b384c0ae7ebe92ad122bbd", - "reference": "138bfec02f042fa6a4b384c0ae7ebe92ad122bbd", + "url": "https://api.github.com/repos/dropbox/dropbox-sdk-php/zipball/6901f8122458e0ce7e391468c0cf6cca465bd0ee", + "reference": "6901f8122458e0ce7e391468c0cf6cca465bd0ee", "shasum": "" }, "require": { @@ -633,7 +635,7 @@ "keywords": [ "dropbox" ], - "time": "2015-02-23 20:51:29" + "time": "2015-06-29 21:47:57" }, { "name": "eher/oauth", @@ -764,26 +766,85 @@ "time": "2015-03-18 18:23:50" }, { - "name": "league/flysystem-aws-s3-v2", - "version": "1.0.1", + "name": "guzzlehttp/guzzle", + "version": "6.1.1", "source": { "type": "git", - "url": "https://github.com/thephpleague/flysystem-aws-s3-v2.git", - "reference": "dfb35efdbd1261b114d0dcb6785b4d1c05467e0f" + "url": "https://github.com/guzzle/guzzle.git", + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v2/zipball/dfb35efdbd1261b114d0dcb6785b4d1c05467e0f", - "reference": "dfb35efdbd1261b114d0dcb6785b4d1c05467e0f", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c", + "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c", "shasum": "" }, "require": { - "aws/aws-sdk-php": "~2.7", - "league/flysystem": "~1.0", - "php": ">=5.4.0" + "guzzlehttp/promises": "~1.0", + "guzzlehttp/psr7": "~1.1", + "php": ">=5.5.0" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "~4.0", + "psr/log": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.1-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2015-11-23 00:47:50" + }, + { + "name": "guzzlehttp/promises", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea", + "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" }, "require-dev": { - "mockery/mockery": "0.9.*", "phpunit/phpunit": "~4.0" }, "type": "library", @@ -794,7 +855,119 @@ }, "autoload": { "psr-4": { - "League\\Flysystem\\AwsS3v2\\": "src/" + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "time": "2015-10-15 22:28:00" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5d04bdd2881ac89abde1fb78cc234bce24327bb", + "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "PSR-7 message implementation", + "keywords": [ + "http", + "message", + "stream", + "uri" + ], + "time": "2016-01-23 01:23:02" + }, + { + "name": "league/flysystem-aws-s3-v3", + "version": "1.0.9", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", + "reference": "595e24678bf78f8107ebc9355d8376ae0eb712c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/595e24678bf78f8107ebc9355d8376ae0eb712c6", + "reference": "595e24678bf78f8107ebc9355d8376ae0eb712c6", + "shasum": "" + }, + "require": { + "aws/aws-sdk-php": "^3.0.0", + "league/flysystem": "~1.0", + "php": ">=5.5.0" + }, + "require-dev": { + "henrikbjorn/phpspec-code-coverage": "~1.0.1", + "phpspec/phpspec": "^2.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Flysystem\\AwsS3v3\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -807,21 +980,21 @@ "email": "info@frenky.net" } ], - "description": "Flysystem adapter for AWS S3 SDK v2", - "time": "2015-02-10 13:16:47" + "description": "Flysystem adapter for the AWS S3 SDK v3.x", + "time": "2015-11-19 08:44:16" }, { "name": "league/flysystem-azure", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-azure.git", - "reference": "90ee5c9f5b3ce65926f3ff00f4870b04ae6ec9b4" + "reference": "705f40420f1c2d33c42995714e9ee11e4a46b693" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-azure/zipball/90ee5c9f5b3ce65926f3ff00f4870b04ae6ec9b4", - "reference": "90ee5c9f5b3ce65926f3ff00f4870b04ae6ec9b4", + "url": "https://api.github.com/repos/thephpleague/flysystem-azure/zipball/705f40420f1c2d33c42995714e9ee11e4a46b693", + "reference": "705f40420f1c2d33c42995714e9ee11e4a46b693", "shasum": "" }, "require": { @@ -858,20 +1031,20 @@ } ], "description": "Flysystem adapter for Windows Azure", - "time": "2015-02-01 09:16:34" + "time": "2015-07-07 19:21:10" }, { "name": "league/flysystem-cached-adapter", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-cached-adapter.git", - "reference": "696697b56f00f8ec003d23810b52ab00e68df575" + "reference": "7bb5cd9d996904cf43d7da8ba45a724ff8c7ef14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/696697b56f00f8ec003d23810b52ab00e68df575", - "reference": "696697b56f00f8ec003d23810b52ab00e68df575", + "url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/7bb5cd9d996904cf43d7da8ba45a724ff8c7ef14", + "reference": "7bb5cd9d996904cf43d7da8ba45a724ff8c7ef14", "shasum": "" }, "require": { @@ -885,6 +1058,9 @@ "predis/predis": "~1.0", "tedivm/stash": "~0.12" }, + "suggest": { + "ext-phpredis": "Pure C implemented extension for PHP" + }, "type": "library", "autoload": { "psr-4": { @@ -902,7 +1078,7 @@ } ], "description": "An adapter decorator to enable meta-data caching.", - "time": "2015-02-03 08:09:49" + "time": "2015-07-09 21:00:39" }, { "name": "league/flysystem-copy", @@ -953,16 +1129,16 @@ }, { "name": "league/flysystem-dropbox", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-dropbox.git", - "reference": "2f464a6a80c0dcc2113a8cc636ca9d4a0fc26617" + "reference": "4f35668411642e8f8513c58f4906e08dfc0a5a07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-dropbox/zipball/2f464a6a80c0dcc2113a8cc636ca9d4a0fc26617", - "reference": "2f464a6a80c0dcc2113a8cc636ca9d4a0fc26617", + "url": "https://api.github.com/repos/thephpleague/flysystem-dropbox/zipball/4f35668411642e8f8513c58f4906e08dfc0a5a07", + "reference": "4f35668411642e8f8513c58f4906e08dfc0a5a07", "shasum": "" }, "require": { @@ -971,8 +1147,7 @@ "php": ">=5.4.0" }, "require-dev": { - "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.8" }, "type": "library", "extra": { @@ -996,7 +1171,7 @@ } ], "description": "Flysystem adapter for Dropbox", - "time": "2015-01-21 22:19:57" + "time": "2015-12-19 13:50:27" }, { "name": "league/flysystem-gridfs", @@ -1046,16 +1221,16 @@ }, { "name": "league/flysystem-rackspace", - "version": "1.0.1", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-rackspace.git", - "reference": "c44e4072cf93c9e1b6ee9a125ad84c827e13adca" + "reference": "61104a941849cb1224b78f079bee95bd343fbbb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-rackspace/zipball/c44e4072cf93c9e1b6ee9a125ad84c827e13adca", - "reference": "c44e4072cf93c9e1b6ee9a125ad84c827e13adca", + "url": "https://api.github.com/repos/thephpleague/flysystem-rackspace/zipball/61104a941849cb1224b78f079bee95bd343fbbb3", + "reference": "61104a941849cb1224b78f079bee95bd343fbbb3", "shasum": "" }, "require": { @@ -1089,20 +1264,20 @@ } ], "description": "Flysystem adapter for Rackspace", - "time": "2015-04-02 07:47:54" + "time": "2015-09-15 11:00:00" }, { "name": "league/flysystem-replicate-adapter", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-replicate-adapter.git", - "reference": "f1ad22787c527e0d9daee225296fee3a9e3333a1" + "reference": "864e80409c0918b0ed6921c3941247017d9db77c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-replicate-adapter/zipball/f1ad22787c527e0d9daee225296fee3a9e3333a1", - "reference": "f1ad22787c527e0d9daee225296fee3a9e3333a1", + "url": "https://api.github.com/repos/thephpleague/flysystem-replicate-adapter/zipball/864e80409c0918b0ed6921c3941247017d9db77c", + "reference": "864e80409c0918b0ed6921c3941247017d9db77c", "shasum": "" }, "require": { @@ -1135,26 +1310,26 @@ } ], "description": "Flysystem adapter for Replica's", - "time": "2015-01-21 22:20:16" + "time": "2015-08-18 21:07:17" }, { "name": "league/flysystem-sftp", - "version": "1.0.4", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-sftp.git", - "reference": "c0646ab870843f60bb0af51c9c8055f042e647ee" + "reference": "c32e064127625054e1356bd154d9c8a284fce8f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/c0646ab870843f60bb0af51c9c8055f042e647ee", - "reference": "c0646ab870843f60bb0af51c9c8055f042e647ee", + "url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/c32e064127625054e1356bd154d9c8a284fce8f3", + "reference": "c32e064127625054e1356bd154d9c8a284fce8f3", "shasum": "" }, "require": { "league/flysystem": "~1.0", "php": ">=5.4.0", - "phpseclib/phpseclib": "~0.3.8" + "phpseclib/phpseclib": "~2.0" }, "require-dev": { "mockery/mockery": "0.9.*", @@ -1182,20 +1357,20 @@ } ], "description": "Flysystem adapter for SFTP", - "time": "2015-04-16 11:42:20" + "time": "2015-12-08 14:46:21" }, { "name": "league/flysystem-webdav", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-webdav.git", - "reference": "1b82edf84844aa17b60839d1d5bf8ff39099fe2f" + "reference": "5eac573d7250f768e91f55f396a98765c9cd1be2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-webdav/zipball/1b82edf84844aa17b60839d1d5bf8ff39099fe2f", - "reference": "1b82edf84844aa17b60839d1d5bf8ff39099fe2f", + "url": "https://api.github.com/repos/thephpleague/flysystem-webdav/zipball/5eac573d7250f768e91f55f396a98765c9cd1be2", + "reference": "5eac573d7250f768e91f55f396a98765c9cd1be2", "shasum": "" }, "require": { @@ -1229,7 +1404,7 @@ } ], "description": "Flysystem adapter for WebDAV", - "time": "2015-01-21 22:20:23" + "time": "2015-05-18 19:55:15" }, { "name": "league/flysystem-ziparchive", @@ -1347,20 +1522,75 @@ "description": "Produce and apply json-patch objects", "time": "2015-01-05 21:19:54" }, + { + "name": "mtdowling/jmespath.php", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/jmespath/jmespath.php.git", + "reference": "192f93e43c2c97acde7694993ab171b3de284093" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/192f93e43c2c97acde7694993ab171b3de284093", + "reference": "192f93e43c2c97acde7694993ab171b3de284093", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "bin": [ + "bin/jp.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "JmesPath\\": "src/" + }, + "files": [ + "src/JmesPath.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Declaratively specify how to extract elements from a JSON document", + "keywords": [ + "json", + "jsonpath" + ], + "time": "2016-01-05 18:25:05" + }, { "name": "pear-pear.php.net/Archive_Tar", - "version": "1.3.16", + "version": "1.4.0", "dist": { "type": "file", - "url": "http://pear.php.net/get/Archive_Tar-1.3.16.tgz", + "url": "http://pear.php.net/get/Archive_Tar-1.4.0.tgz", "reference": null, "shasum": null }, "require": { - "php": ">=4.3.0.0" + "php": ">=5.2.0.0" }, "replace": { - "pear-pear/archive_tar": "== 1.3.16.0" + "pear-pear/archive_tar": "== 1.4.0.0" }, "type": "pear-library", "autoload": { @@ -1372,16 +1602,16 @@ "/" ], "license": [ - "New BSD\n License" + "New BSD License" ], "description": "This class provides handling of tar files in PHP.\nIt supports creating, listing, extracting and adding to tar files.\nGzip support is available if PHP has the zlib extension built-in or\nloaded. Bz2 compression is also supported with the bz2 extension loaded." }, { "name": "pear-pear.php.net/Console_Getopt", - "version": "1.4.0", + "version": "1.4.1", "dist": { "type": "file", - "url": "http://pear.php.net/get/Console_Getopt-1.4.0.tgz", + "url": "http://pear.php.net/get/Console_Getopt-1.4.1.tgz", "reference": null, "shasum": null }, @@ -1389,7 +1619,7 @@ "php": ">=5.4.0.0" }, "replace": { - "pear-pear/console_getopt": "== 1.4.0.0" + "pear-pear/console_getopt": "== 1.4.1.0" }, "type": "pear-library", "autoload": { @@ -1401,26 +1631,26 @@ "/" ], "license": [ - "PHP License" + "BSD-2-Clause" ], - "description": "This is a PHP implementation of "getopt" supporting both\nshort and long options." + "description": "This is a PHP implementation of \"getopt\" supporting both\nshort and long options." }, { "name": "pear-pear.php.net/HTTP_Request2", - "version": "2.2.1", + "version": "2.3.0", "dist": { "type": "file", - "url": "http://pear.php.net/get/HTTP_Request2-2.2.1.tgz", + "url": "http://pear.php.net/get/HTTP_Request2-2.3.0.tgz", "reference": null, "shasum": null }, "require": { - "pear-pear.php.net/net_url2": ">=2.0.0.0", + "pear-pear.php.net/net_url2": ">=2.2.0.0", "pear-pear.php.net/pear": ">=1.9.2.0", "php": ">=5.2.0.0" }, "replace": { - "pear-pear/http_request2": "== 2.2.1.0" + "pear-pear/http_request2": "== 2.3.0.0" }, "type": "pear-library", "autoload": { @@ -1432,24 +1662,24 @@ "/" ], "license": [ - "BSD License" + "BSD 3-Clause License" ], "description": "PHP5 rewrite of HTTP_Request package (with parts of HTTP_Client). Provides\ncleaner API and pluggable Adapters:\n * Socket adapter, based on old HTTP_Request code,\n * Curl adapter, wraps around PHP's cURL extension,\n * Mock adapter, to use for testing packages dependent on HTTP_Request2.\nSupports POST requests with data and file uploads, basic and digest\nauthentication, cookies, managing cookies across requests, proxies, gzip and\ndeflate encodings, redirects, monitoring the request progress with Observers..." }, { "name": "pear-pear.php.net/Mail_Mime", - "version": "1.8.9", + "version": "1.10.0", "dist": { "type": "file", - "url": "http://pear.php.net/get/Mail_Mime-1.8.9.tgz", + "url": "http://pear.php.net/get/Mail_Mime-1.10.0.tgz", "reference": null, "shasum": null }, "require": { - "php": ">=4.3.0.0" + "php": ">=5.0.0.0" }, "replace": { - "pear-pear/mail_mime": "== 1.8.9.0" + "pear-pear/mail_mime": "== 1.10.0.0" }, "type": "pear-library", "autoload": { @@ -1526,28 +1756,28 @@ }, { "name": "pear-pear.php.net/PEAR", - "version": "1.9.5", + "version": "1.10.1", "dist": { "type": "file", - "url": "http://pear.php.net/get/PEAR-1.9.5.tgz", + "url": "http://pear.php.net/get/PEAR-1.10.1.tgz", "reference": null, "shasum": null }, "require": { "ext-pcre": "*", "ext-xml": "*", - "pear-pear.php.net/archive_tar": ">=1.3.11.0", - "pear-pear.php.net/console_getopt": ">=1.2.0.0", - "pear-pear.php.net/structures_graph": ">=1.0.2.0", - "pear-pear.php.net/xml_util": ">=1.2.0.0", - "php": ">=4.4.0.0,!=5.0.0.0,!=5.1.0.0,!=5.1.1.0,!=5.1.2.0,!=5.1.3.0,!=5.1.4.0,!=5.1.5.0" + "pear-pear.php.net/archive_tar": ">=1.4.0.0", + "pear-pear.php.net/console_getopt": ">=1.4.1.0", + "pear-pear.php.net/structures_graph": ">=1.1.0.0", + "pear-pear.php.net/xml_util": ">=1.3.0.0", + "php": ">=5.4.0.0" }, "conflict": { "pear-pear.php.net/pear_frontend_gtk": "<0.4.0.0", "pear-pear.php.net/pear_frontend_web": "<=0.4.0.0" }, "replace": { - "pear-pear/pear": "== 1.9.5.0" + "pear-pear/pear": "== 1.10.1.0" }, "type": "pear-library", "autoload": { @@ -1565,10 +1795,10 @@ }, { "name": "pear-pear.php.net/Structures_Graph", - "version": "1.1.0", + "version": "1.1.1", "dist": { "type": "file", - "url": "http://pear.php.net/get/Structures_Graph-1.1.0.tgz", + "url": "http://pear.php.net/get/Structures_Graph-1.1.1.tgz", "reference": null, "shasum": null }, @@ -1576,7 +1806,7 @@ "php": ">=5.3.0.0" }, "replace": { - "pear-pear/structures_graph": "== 1.1.0.0" + "pear-pear/structures_graph": "== 1.1.1.0" }, "type": "pear-library", "autoload": { @@ -1588,7 +1818,7 @@ "/" ], "license": [ - "LGPL License" + "LGPL-3.0+" ], "description": "Structures_Graph is a package for creating and manipulating graph datastructures. It allows building of directed\nand undirected graphs, with data and metadata stored in nodes. The library provides functions for graph traversing\nas well as for characteristic extraction from the graph topology." }, @@ -1624,54 +1854,40 @@ }, { "name": "phpseclib/phpseclib", - "version": "0.3.10", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "d15bba1edcc7c89e09cc74c5d961317a8b947bf4" + "reference": "ba6fb78f727cd09f2a649113b95468019e490585" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d15bba1edcc7c89e09cc74c5d961317a8b947bf4", - "reference": "d15bba1edcc7c89e09cc74c5d961317a8b947bf4", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/ba6fb78f727cd09f2a649113b95468019e490585", + "reference": "ba6fb78f727cd09f2a649113b95468019e490585", "shasum": "" }, "require": { - "php": ">=5.0.0" + "php": ">=5.3.3" }, "require-dev": { "phing/phing": "~2.7", "phpunit/phpunit": "~4.0", "sami/sami": "~2.0", - "squizlabs/php_codesniffer": "~1.5" + "squizlabs/php_codesniffer": "~2.0" }, "suggest": { "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", - "ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.", - "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP < 4.3.3." + "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", + "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", + "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.3-dev" - } - }, "autoload": { - "psr-0": { - "Crypt": "phpseclib/", - "File": "phpseclib/", - "Math": "phpseclib/", - "Net": "phpseclib/", - "System": "phpseclib/" - }, - "files": [ - "phpseclib/Crypt/Random.php" - ] + "psr-4": { + "phpseclib\\": "phpseclib/" + } }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "phpseclib/" - ], "license": [ "MIT" ], @@ -1695,6 +1911,11 @@ "name": "Hans-Jürgen Petrich", "email": "petrich@tronic-media.com", "role": "Developer" + }, + { + "name": "Graham Campbell", + "email": "graham@alt-three.com", + "role": "Developer" } ], "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", @@ -1718,7 +1939,56 @@ "x.509", "x509" ], - "time": "2015-01-28 21:50:33" + "time": "2016-01-18 17:07:21" + }, + { + "name": "psr/http-message", + "version": "1.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2015-05-04 20:22:00" }, { "name": "psr/log", @@ -1760,16 +2030,16 @@ }, { "name": "rackspace/php-opencloud", - "version": "v1.14.1", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/rackspace/php-opencloud.git", - "reference": "46c672e3b2fc9cea545f6647290609ceddfd8fe3" + "reference": "d6b71feed7f9e7a4b52e0240a79f06473ba69c8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rackspace/php-opencloud/zipball/46c672e3b2fc9cea545f6647290609ceddfd8fe3", - "reference": "46c672e3b2fc9cea545f6647290609ceddfd8fe3", + "url": "https://api.github.com/repos/rackspace/php-opencloud/zipball/d6b71feed7f9e7a4b52e0240a79f06473ba69c8c", + "reference": "d6b71feed7f9e7a4b52e0240a79f06473ba69c8c", "shasum": "" }, "require": { @@ -1782,6 +2052,7 @@ "apigen/apigen": "~4.0", "fabpot/php-cs-fixer": "1.0.*@dev", "jakub-onderka/php-parallel-lint": "0.*", + "phpspec/prophecy": "~1.4", "phpunit/phpunit": "4.3.*", "satooshi/php-coveralls": "0.6.*@dev" }, @@ -1789,8 +2060,7 @@ "autoload": { "psr-0": { "OpenCloud": [ - "lib/", - "tests/" + "lib/" ] } }, @@ -1799,19 +2069,10 @@ "Apache-2.0" ], "authors": [ - { - "name": "Glen Campbell", - "email": "glen.campbell@rackspace.com" - }, { "name": "Jamie Hannaford", "email": "jamie.hannaford@rackspace.com", "homepage": "https://github.com/jamiehannaford" - }, - { - "name": "Shaunak Kashyap", - "email": "shaunak.kashyap@rackspace.com", - "homepage": "https://github.com/ycombinator" } ], "description": "PHP SDK for Rackspace/OpenStack APIs", @@ -1822,20 +2083,20 @@ "rackspace", "swift" ], - "time": "2015-05-07 11:48:54" + "time": "2016-01-29 10:34:57" }, { "name": "sabre/dav", - "version": "2.1.3", + "version": "2.1.9", "source": { "type": "git", "url": "https://github.com/fruux/sabre-dav.git", - "reference": "6a8aec204688d36681e0185fbaf1974b97e4a070" + "reference": "ee2d454758543cc77f2fa94ca849cc1e1f3fcb7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/6a8aec204688d36681e0185fbaf1974b97e4a070", - "reference": "6a8aec204688d36681e0185fbaf1974b97e4a070", + "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/ee2d454758543cc77f2fa94ca849cc1e1f3fcb7c", + "reference": "ee2d454758543cc77f2fa94ca849cc1e1f3fcb7c", "shasum": "" }, "require": { @@ -1849,9 +2110,9 @@ "ext-simplexml": "*", "ext-spl": "*", "php": ">=5.4.1", - "sabre/event": "~2.0.0", - "sabre/http": "~3.0.0", - "sabre/vobject": "~3.3" + "sabre/event": "^2.0.0", + "sabre/http": "^3.0.0", + "sabre/vobject": "^3.3.4" }, "require-dev": { "evert/phpdoc-md": "~0.1.0", @@ -1896,25 +2157,29 @@ "framework", "iCalendar" ], - "time": "2015-02-25 18:13:20" + "time": "2016-01-25 20:59:35" }, { "name": "sabre/event", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/fruux/sabre-event.git", - "reference": "f33d60742d7dff63d3722d0f70016704bf32e8db" + "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruux/sabre-event/zipball/f33d60742d7dff63d3722d0f70016704bf32e8db", - "reference": "f33d60742d7dff63d3722d0f70016704bf32e8db", + "url": "https://api.github.com/repos/fruux/sabre-event/zipball/337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff", + "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff", "shasum": "" }, "require": { "php": ">=5.4.1" }, + "require-dev": { + "phpunit/phpunit": "*", + "sabre/cs": "~0.0.1" + }, "type": "library", "autoload": { "psr-4": { @@ -1943,7 +2208,7 @@ "promise", "signal" ], - "time": "2014-10-06 23:26:48" + "time": "2015-05-19 10:24:22" }, { "name": "sabre/http", @@ -1998,16 +2263,16 @@ }, { "name": "sabre/vobject", - "version": "3.4.2", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/fruux/sabre-vobject.git", - "reference": "0c90f60dae40137f1903c7b5915d3691c4fc99b0" + "reference": "061dd47ce40074bf63da8e3d6dbe7f18b5a4f3a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruux/sabre-vobject/zipball/0c90f60dae40137f1903c7b5915d3691c4fc99b0", - "reference": "0c90f60dae40137f1903c7b5915d3691c4fc99b0", + "url": "https://api.github.com/repos/fruux/sabre-vobject/zipball/061dd47ce40074bf63da8e3d6dbe7f18b5a4f3a4", + "reference": "061dd47ce40074bf63da8e3d6dbe7f18b5a4f3a4", "shasum": "" }, "require": { @@ -2060,33 +2325,31 @@ "jCard", "vCard" ], - "time": "2015-02-25 17:47:50" + "time": "2016-01-11 18:13:23" }, { "name": "symfony/event-dispatcher", - "version": "v2.6.7", - "target-dir": "Symfony/Component/EventDispatcher", + "version": "v2.8.2", "source": { "type": "git", - "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "ee278f7c851533e58ca307f66305ccb9188aceda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/672593bc4b0043a0acf91903bb75a1c82d8f2e02", - "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ee278f7c851533e58ca307f66305ccb9188aceda", + "reference": "ee278f7c851533e58ca307f66305ccb9188aceda", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.6", - "symfony/expression-language": "~2.6", - "symfony/phpunit-bridge": "~2.7", - "symfony/stopwatch": "~2.3" + "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0" }, "suggest": { "symfony/dependency-injection": "", @@ -2095,13 +2358,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.8-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2119,7 +2385,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:18:45" + "time": "2016-01-13 10:28:07" } ], "aliases": [], diff --git a/src/AwsS3Filesystem.php b/src/AwsS3Filesystem.php index 44fad8c..f3b36b3 100644 --- a/src/AwsS3Filesystem.php +++ b/src/AwsS3Filesystem.php @@ -8,7 +8,7 @@ namespace creocoder\flysystem; use Aws\S3\S3Client; -use League\Flysystem\AwsS3v2\AwsS3Adapter; +use League\Flysystem\AwsS3v3\AwsS3Adapter; use yii\base\InvalidConfigException; /** @@ -34,6 +34,10 @@ class AwsS3Filesystem extends Filesystem * @var string */ public $baseUrl; + /** + * @var string + */ + public $version; /** * @var string */ @@ -72,7 +76,12 @@ public function init() */ protected function prepareAdapter() { - $config = ['key' => $this->key, 'secret' => $this->secret]; + $config = [ + 'credentials' => [ + 'key' => $this->key, + 'secret' => $this->secret + ] + ]; if ($this->region !== null) { $config['region'] = $this->region; @@ -82,11 +91,10 @@ protected function prepareAdapter() $config['base_url'] = $this->baseUrl; } - return new AwsS3Adapter( - S3Client::factory($config), - $this->bucket, - $this->prefix, - $this->options - ); + $config['version'] = (($this->version !== null) ? $this->version : 'latest'); + + $client = new S3Client($config); + + return new AwsS3Adapter($client, $this->bucket, $this->prefix, $this->options); } }