hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-1751_GOOGLE-AUTH_master (#2384)

Browse Source 
* PHRAS-1751_GOOGLE-AUTH_master
replace lib "alchemy/google-plus-api-client" by "google/apiclient"
had to downgrade facebook/php-sdk from 4 (does not exists ?) to 3 (abandoned anyway) to allow composer update.
see PHRAS-1752

* PHRAS-1751_GOOGLE-AUTH_master
revert composer.lock, only remove & update new google-sdk (composer full update make tests boot to fail. to see later)

* PHRAS-1751_GOOGLE-AUTH_master
fix unit test
This commit is contained in:
jygaulier
2017-11-30 10:45:56 +01:00
committed by GitHub
parent be811e8876
commit 8117d1ebc0
4 changed files with 583 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -37,7 +37,6 @@
"alchemy-fr/tcpdf-clone": "~6.0",
"alchemy/embed-bundle": "^0.3.4",
"alchemy/geonames-api-consumer": "~0.1.0",
"alchemy/google-plus-api-client": "~0.6.2",
"alchemy/mediavorus": "^0.4.4",
"alchemy/oauth2php": "1.0.0",
"alchemy/phlickr": "0.2.9",
@@ -60,6 +59,7 @@
"firebase/php-jwt": "^3.0.0",
"gedmo/doctrine-extensions": "~2.3.0",
"goodby/csv": "^1.3.0",
"google/apiclient": "^2.0",
"guzzle/guzzle": "~3.0",
"hoa/compiler": "~2.0",
"hoa/console": "~2.0",