diff --git a/composer.json b/composer.json index cff2d85bcbba..63493330869a 100644 --- a/composer.json +++ b/composer.json @@ -75,14 +75,15 @@ "barracudanetworks/archivestream-php": "^1.0", "omnipay/braintree": "~2.0@dev", "gatepay/FedACHdir": "dev-master@dev", - "wepay/php-sdk": "^0.2" + "wepay/php-sdk": "^0.2", + "websight/l5-google-cloud-storage": "^1.0", + "fzaninotto/faker": "^1.5" }, "require-dev": { "phpunit/phpunit": "~4.0", "phpspec/phpspec": "~2.1", "codeception/codeception": "*", "codeception/c3": "~2.0", - "fzaninotto/faker": "^1.5", "symfony/dom-crawler": "~3.0" }, "autoload": { diff --git a/composer.lock b/composer.lock index d694f04f6960..c218f45b890b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +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" ], - "hash": "b2471aea1af5ef67a1379ad95b5138f7", - "content-hash": "df30a311df0341933d4ff2c3aa5974a6", + "hash": "392a09a61498eddc166665b7cdda1dde", + "content-hash": "1f86d83e1ef0bce86debfb45120e6db8", "packages": [ { "name": "agmscode/omnipay-agms", @@ -505,7 +505,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/f7b31bdbdceaaea930c71df20e4180b0b7172b4a", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/35ebf3a2ba9443e11fbdb9066cc363ec7b2245e4", "reference": "e97ed532f09e290b91ff7713b785ed7ab11d0812", "shasum": "" }, @@ -746,7 +746,7 @@ "laravel" ], "abandoned": "OpenSkill/Datatable", - "time": "2015-11-23 21:33:41" + "time": "2015-04-29 07:00:36" }, { "name": "classpreloader/classpreloader", @@ -2011,6 +2011,54 @@ ], "time": "2015-01-16 08:41:13" }, + { + "name": "fzaninotto/faker", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/fzaninotto/Faker.git", + "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123", + "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123", + "shasum": "" + }, + "require": { + "php": "^5.3.3|^7.0" + }, + "require-dev": { + "ext-intl": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~1.5" + }, + "type": "library", + "extra": { + "branch-alias": [] + }, + "autoload": { + "psr-4": { + "Faker\\": "src/Faker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "François Zaninotto" + } + ], + "description": "Faker is a PHP library that generates fake data for you.", + "keywords": [ + "data", + "faker", + "fixtures" + ], + "time": "2016-04-29 12:21:54" + }, { "name": "gatepay/FedACHdir", "version": "dev-master", @@ -2020,7 +2068,50 @@ "reference": "origin/master" }, "type": "library", - "time": "2016-04-29 12:01:22" + "time": "2016-05-09 12:00:35" + }, + { + "name": "google/apiclient", + "version": "1.1.7", + "source": { + "type": "git", + "url": "https://github.com/google/google-api-php-client.git", + "reference": "400f250a30ae1dd4c4a0a4f750fe973fc70e6311" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/google/google-api-php-client/zipball/400f250a30ae1dd4c4a0a4f750fe973fc70e6311", + "reference": "400f250a30ae1dd4c4a0a4f750fe973fc70e6311", + "shasum": "" + }, + "require": { + "php": ">=5.2.1" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*", + "squizlabs/php_codesniffer": "~2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Client library for Google APIs", + "homepage": "http://developers.google.com/api-client-library/php", + "keywords": [ + "google" + ], + "time": "2016-02-02 18:50:42" }, { "name": "guzzle/guzzle", @@ -4345,7 +4436,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-braintree/zipball/e4b4027c6a9e6443833490d0d51fd530f0a19f62", + "url": "https://api.github.com/repos/thephpleague/omnipay-braintree/zipball/a0c8b2152a8a5b7e14572b71d860f2ec26f20a87", "reference": "e4b4027c6a9e6443833490d0d51fd530f0a19f62", "shasum": "" }, @@ -5790,7 +5881,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/0ea7a647ee01e29c152814e11c2ea6307e5b0db9", + "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/88badbda83f1c16e2d94c41a869be37d9d9fef5a", "reference": "0ea7a647ee01e29c152814e11c2ea6307e5b0db9", "shasum": "" }, @@ -6610,6 +6701,53 @@ ], "time": "2015-08-12 08:09:37" }, + { + "name": "superbalist/flysystem-google-storage", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/Superbalist/flysystem-google-storage.git", + "reference": "441a8529680986a2d2063a268ee2918f51db1b79" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Superbalist/flysystem-google-storage/zipball/441a8529680986a2d2063a268ee2918f51db1b79", + "reference": "441a8529680986a2d2063a268ee2918f51db1b79", + "shasum": "" + }, + "require": { + "google/apiclient": "~1.1|^2.0.0@RC", + "league/flysystem": "~1.0", + "php": ">=5.4.0" + }, + "require-dev": { + "mockery/mockery": "0.9.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Superbalist\\Flysystem\\GoogleStorage\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Superbalist.com a division of Takealot Online (Pty) Ltd", + "email": "info@superbalist.com" + } + ], + "description": "Flysystem adapter for Google Cloud Storage", + "time": "2016-04-12 14:56:22" + }, { "name": "swiftmailer/swiftmailer", "version": "v5.4.1", @@ -8057,6 +8195,49 @@ ], "time": "2016-02-25 10:29:59" }, + { + "name": "websight/l5-google-cloud-storage", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/websightgmbh/l5-google-cloud-storage.git", + "reference": "c1cac9985dfce60010234c9dca127f3543d2d594" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/websightgmbh/l5-google-cloud-storage/zipball/c1cac9985dfce60010234c9dca127f3543d2d594", + "reference": "c1cac9985dfce60010234c9dca127f3543d2d594", + "shasum": "" + }, + "require": { + "illuminate/support": "~5.0.17|5.1.*|5.2.*", + "superbalist/flysystem-google-storage": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Websight\\GcsProvider\\": "src/Websight/GcsProvider/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Cedric Ziel", + "email": "ziel@websight.de" + } + ], + "description": "Laravel 5 Flysystem Google Cloud Storage Service Provider", + "homepage": "https://github.com/websightgmbh/l5-google-cloud-storage", + "keywords": [ + "Flysystem", + "laravel", + "laravel5" + ], + "time": "2016-03-04 11:57:00" + }, { "name": "wepay/php-sdk", "version": "0.2.7", @@ -8908,58 +9089,6 @@ ], "time": "2015-12-31 15:58:49" }, - { - "name": "fzaninotto/faker", - "version": "v1.5.0", - "source": { - "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "d0190b156bcca848d401fb80f31f504f37141c8d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d0190b156bcca848d401fb80f31f504f37141c8d", - "reference": "d0190b156bcca848d401fb80f31f504f37141c8d", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, - "suggest": { - "ext-intl": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5.x-dev" - } - }, - "autoload": { - "psr-4": { - "Faker\\": "src/Faker/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "François Zaninotto" - } - ], - "description": "Faker is a PHP library that generates fake data for you.", - "keywords": [ - "data", - "faker", - "fixtures" - ], - "time": "2015-05-29 06:29:14" - }, { "name": "phpspec/php-diff", "version": "v1.0.2", diff --git a/config/app.php b/config/app.php index d9aa4ef00030..bafe92b81d15 100644 --- a/config/app.php +++ b/config/app.php @@ -153,6 +153,7 @@ return [ 'Laravel\Socialite\SocialiteServiceProvider', 'Jlapp\Swaggervel\SwaggervelServiceProvider', 'Maatwebsite\Excel\ExcelServiceProvider', + Websight\GcsProvider\CloudStorageServiceProvider::class, /* * Application Service Providers... @@ -211,6 +212,7 @@ return [ 'Schema' => 'Illuminate\Support\Facades\Schema', 'Seeder' => 'Illuminate\Database\Seeder', 'Session' => 'Illuminate\Support\Facades\Session', + 'Storage' => 'Illuminate\Support\Facades\Storage', 'Str' => 'Illuminate\Support\Str', 'URL' => 'Illuminate\Support\Facades\URL', 'Validator' => 'Illuminate\Support\Facades\Validator', diff --git a/config/filesystems.php b/config/filesystems.php index da16e0e16766..68e35a498670 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -47,12 +47,12 @@ return [ 'driver' => 'local', 'root' => storage_path().'/app', ], - + 'logos' => [ 'driver' => 'local', 'root' => env('LOGO_PATH', public_path().'/logo'), ], - + 'documents' => [ 'driver' => 'local', 'root' => storage_path().'/documents', @@ -76,6 +76,13 @@ return [ 'url_type' => env('RACKSPACE_URL_TYPE', 'publicURL') ], + 'gcs' => [ + 'driver' => 'gcs', + 'service_account' => env('GCS_USERNAME', ''), + 'service_account_certificate' => storage_path() . '/credentials.p12', + 'service_account_certificate_password' => env('GCS_PASSWORD', ''), + 'bucket' => env('GCS_BUCKET', 'cloud-storage-bucket'), + ], ], ];