From 30ec919048011153b08829462f90c3610790dba3 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Nov 2017 21:45:31 -0800 Subject: [PATCH] Remove AWS package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We unfortunately can’t use it right now because it requires a symlink from the storage/app directory. Until we have a better way of checking for configuration issues and/or automatically handling that symlink creation, we’re pulling it for now, since it’s not used anywhere. --- composer.json | 1 - composer.lock | 193 +------------------------------------------------ config/app.php | 1 - config/aws.php | 25 ------- 4 files changed, 1 insertion(+), 219 deletions(-) delete mode 100644 config/aws.php diff --git a/composer.json b/composer.json index d947bae34a..5a55ec7406 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,6 @@ "type": "project", "require": { "php": ">=5.6.4", - "aws/aws-sdk-php-laravel": "^3.1", "barryvdh/laravel-debugbar": "^2.4", "doctrine/cache": "^1.6", "doctrine/common": "^2.7", diff --git a/composer.lock b/composer.lock index ddbd05de90..503020caf1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,144 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "a59ae31812095da54661fb3c25a0c061", + "content-hash": "53bd9d88d11d74732ab302b7ebd01af3", "packages": [ - { - "name": "aws/aws-sdk-php", - "version": "3.37.0", - "source": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "24031a1ffbcd26dea0e55662198a3f5454e02cff" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/24031a1ffbcd26dea0e55662198a3f5454e02cff", - "reference": "24031a1ffbcd26dea0e55662198a3f5454e02cff", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-pcre": "*", - "ext-simplexml": "*", - "ext-spl": "*", - "guzzlehttp/guzzle": "^5.3.1|^6.2.1", - "guzzlehttp/promises": "~1.0", - "guzzlehttp/psr7": "^1.4.1", - "mtdowling/jmespath.php": "~2.2", - "php": ">=5.5" - }, - "require-dev": { - "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-openssl": "*", - "nette/neon": "^2.3", - "phpunit/phpunit": "^4.8.35|^5.4.0", - "psr/cache": "^1.0" - }, - "suggest": { - "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": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "Aws\\": "src/" - }, - "files": [ - "src/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Amazon Web Services", - "homepage": "http://aws.amazon.com" - } - ], - "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project", - "homepage": "http://aws.amazon.com/sdkforphp", - "keywords": [ - "amazon", - "aws", - "cloud", - "dynamodb", - "ec2", - "glacier", - "s3", - "sdk" - ], - "time": "2017-11-07T00:13:20+00:00" - }, - { - "name": "aws/aws-sdk-php-laravel", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-php-laravel.git", - "reference": "3b946892d493b91b4920ec4facc4a0ad7195fb86" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php-laravel/zipball/3b946892d493b91b4920ec4facc4a0ad7195fb86", - "reference": "3b946892d493b91b4920ec4facc4a0ad7195fb86", - "shasum": "" - }, - "require": { - "aws/aws-sdk-php": "~3.0", - "illuminate/support": "~5.1", - "php": ">=5.5.9" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" - }, - "suggest": { - "laravel/framework": "To test the Laravel bindings", - "laravel/lumen-framework": "To test the Lumen bindings" - }, - "type": "library", - "autoload": { - "psr-4": { - "Aws\\Laravel\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Amazon Web Services", - "homepage": "http://aws.amazon.com" - } - ], - "description": "A simple Laravel 5 service provider for including the AWS SDK for PHP.", - "homepage": "http://aws.amazon.com/sdkforphp2", - "keywords": [ - "amazon", - "aws", - "dynamodb", - "ec2", - "laravel", - "laravel 5", - "s3", - "sdk" - ], - "time": "2016-01-18T06:57:07+00:00" - }, { "name": "barryvdh/laravel-debugbar", "version": "v2.4.3", @@ -2238,61 +2102,6 @@ ], "time": "2017-01-23T04:29:33+00:00" }, - { - "name": "mtdowling/jmespath.php", - "version": "2.4.0", - "source": { - "type": "git", - "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/adcc9531682cf87dfda21e1fd5d0e7a41d292fac", - "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac", - "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-12-03T22:08:25+00:00" - }, { "name": "neitanod/forceutf8", "version": "v2.0.1", diff --git a/config/app.php b/config/app.php index 66e0024538..d6b52a1deb 100755 --- a/config/app.php +++ b/config/app.php @@ -278,7 +278,6 @@ return [ */ Barryvdh\Debugbar\ServiceProvider::class, - Aws\Laravel\AwsServiceProvider::class, Intervention\Image\ImageServiceProvider::class, Collective\Html\HtmlServiceProvider::class, Spatie\Backup\BackupServiceProvider::class, diff --git a/config/aws.php b/config/aws.php deleted file mode 100644 index 8f86c6681e..0000000000 --- a/config/aws.php +++ /dev/null @@ -1,25 +0,0 @@ - env('AWS_REGION', 'us-east-1'), - 'version' => 'latest', - 'ua_append' => [ - 'L5MOD/' . AwsServiceProvider::VERSION, - ], -];