From b0a3ec410dd91f8d55b1463c2ecf84e65f92749f Mon Sep 17 00:00:00 2001 From: Thierry Thuon Date: Mon, 9 Jan 2017 11:55:29 +0100 Subject: [PATCH 1/2] Upgrade filesystem version --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index d95c404..325c936 100644 --- a/composer.json +++ b/composer.json @@ -15,8 +15,8 @@ { "gears/di": "*", "gears/string": "^0.6.0", - "symfony/process": "2.*", - "symfony/filesystem": "2.*", + "symfony/process": "2.*|3.*", + "symfony/filesystem": "2.*|3.*", "jakoch/phantomjs-installer": "1.9.8" }, "require-dev": @@ -26,7 +26,7 @@ "guzzlehttp/guzzle": "4.*", "sgh/pdfbox": "dev-master", "google/apiclient": "1.*", - "symfony/finder": "2.*" + "symfony/finder": "2.*|3.*" }, "scripts": { From da3c8f9bbe1d2cc30888ccf962d668b236d04998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nathana=C3=ABl?= Date: Thu, 6 Apr 2017 10:06:28 +0200 Subject: [PATCH 2/2] Allowed for Google 2.* API --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 325c936..b49d035 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "phpunit/phpunit": "4.*", "guzzlehttp/guzzle": "4.*", "sgh/pdfbox": "dev-master", - "google/apiclient": "1.*", + "google/apiclient": "1.*|2.*", "symfony/finder": "2.*|3.*" }, "scripts":