From 28a8f9df71c56936ec93ca24a40ab4f7e6f11354 Mon Sep 17 00:00:00 2001 From: Guilherme Donato Date: Thu, 3 Jan 2019 18:02:28 -0200 Subject: [PATCH 1/2] fixed HWIOAuthBundle integration PROCERGS#828 --- app/config/config.yml | 2 +- .../CoreBundle/Security/User/Provider/FOSUBUserProvider.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 18709682c..3574946e5 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -307,7 +307,7 @@ hwi_oauth: type: facebook client_id: %facebook_app_id% client_secret: %facebook_app_secret% - scope: "email user_about_me user_birthday user_location" + scope: "email user_birthday user_location" twitter: type: twitter client_id: %twitter_app_key% diff --git a/src/LoginCidadao/CoreBundle/Security/User/Provider/FOSUBUserProvider.php b/src/LoginCidadao/CoreBundle/Security/User/Provider/FOSUBUserProvider.php index 6bcd35adb..8d63397b5 100644 --- a/src/LoginCidadao/CoreBundle/Security/User/Provider/FOSUBUserProvider.php +++ b/src/LoginCidadao/CoreBundle/Security/User/Provider/FOSUBUserProvider.php @@ -176,7 +176,7 @@ public function loadUserByOAuthUserResponse(UserResponseInterface $response) $this->userManager->updateCanonicalFields($user); /** @var ConstraintViolationList $errors */ - $errors = $this->validator->validate($user, ['LoginCidadaoProfile']); + $errors = $this->validator->validate($user, null, ['LoginCidadaoProfile']); if (count($errors) > 0) { foreach ($errors as $error) { if ($error->getPropertyPath() === 'email' From b17be6f615a6212f463e1923edd37157f664c573 Mon Sep 17 00:00:00 2001 From: Guilherme Donato Date: Thu, 3 Jan 2019 18:38:53 -0200 Subject: [PATCH 2/2] updated composer version --- composer.json | 2 +- composer.lock | 137 ++++++++++++++++++++++++++------------------------ 2 files changed, 72 insertions(+), 67 deletions(-) diff --git a/composer.json b/composer.json index 32756a0db..b205ad5fd 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "procergs/login-cidadao", - "version": "1.20.0", + "version": "1.20.1", "license": "AGPL-3.0", "type": "project", "description": "login-cidadao", diff --git a/composer.lock b/composer.lock index faa7e3b2c..0e284daab 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "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": "e8bd58d11de8f99730c8f82dcb1f0500", + "content-hash": "945a6cd4d0ecce39d6077c8fa30dd5b3", "packages": [ { "name": "beelab/recaptcha2-bundle", @@ -821,16 +821,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.9.1", + "version": "v2.9.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "ec74d6e300d78fbc896669c3ca57ef9719adc9c6" + "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/ec74d6e300d78fbc896669c3ca57ef9719adc9c6", - "reference": "ec74d6e300d78fbc896669c3ca57ef9719adc9c6", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9", + "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9", "shasum": "" }, "require": { @@ -899,7 +899,7 @@ "php", "queryobject" ], - "time": "2018-12-14T04:51:13+00:00" + "time": "2018-12-31T03:27:51+00:00" }, { "name": "doctrine/doctrine-bundle", @@ -1901,62 +1901,63 @@ }, { "name": "friendsofsymfony/rest-bundle", - "version": "2.4.0", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "3725279a6554c1d894eee0b377f49d3f69e3c217" + "reference": "a5fc73b84bdb2f0fdf58a717b322ceb6997f7bf3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/3725279a6554c1d894eee0b377f49d3f69e3c217", - "reference": "3725279a6554c1d894eee0b377f49d3f69e3c217", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/a5fc73b84bdb2f0fdf58a717b322ceb6997f7bf3", + "reference": "a5fc73b84bdb2f0fdf58a717b322ceb6997f7bf3", "shasum": "" }, "require": { "doctrine/inflector": "^1.0", "php": "^5.5.9|~7.0", "psr/log": "^1.0", - "symfony/config": "^2.7|^3.0|^4.0", - "symfony/debug": "^2.7|^3.0|^4.0", - "symfony/dependency-injection": "^2.7|^3.0|^4.0", - "symfony/event-dispatcher": "^2.7|^3.0|^4.0", - "symfony/finder": "^2.7|^3.0|^4.0", - "symfony/framework-bundle": "^2.7|^3.0|^4.0", - "symfony/http-foundation": "^2.7|^3.0|^4.0", - "symfony/http-kernel": "^2.7|^3.0|^4.0", - "symfony/routing": "^2.7|^3.0|^4.0", - "symfony/security-core": "^2.7|^3.0|^4.0", - "symfony/templating": "^2.7|^3.0|^4.0", + "symfony/config": "^3.4|^4.0", + "symfony/debug": "^3.4|^4.0", + "symfony/dependency-injection": "^3.4|^4.0", + "symfony/event-dispatcher": "^3.4|^4.0", + "symfony/finder": "^3.4|^4.0", + "symfony/framework-bundle": "^3.4|^4.0", + "symfony/http-foundation": "^3.4|^4.0", + "symfony/http-kernel": "^3.4|^4.0", + "symfony/routing": "^3.4|^4.0", + "symfony/security-core": "^3.4|^4.0", + "symfony/templating": "^3.4|^4.0", "willdurand/jsonp-callback-validator": "^1.0", "willdurand/negotiation": "^2.0" }, "conflict": { - "jms/serializer": "1.3.0", - "jms/serializer-bundle": "<1.2.0", + "jms/serializer": "<1.13.0", + "jms/serializer-bundle": "<2.0.0", "sensio/framework-extra-bundle": "<3.0.13" }, "require-dev": { - "jms/serializer-bundle": "^1.2|^2.0", + "jms/serializer": "^1.13|^2.0", + "jms/serializer-bundle": "^2.3.1|^3.0", "phpoption/phpoption": "^1.1", "psr/http-message": "^1.0", "sensio/framework-extra-bundle": "^3.0.13|^4.0|^5.0", - "symfony/asset": "^2.7|^3.0|^4.0", - "symfony/browser-kit": "^2.7|^3.0|^4.0", - "symfony/css-selector": "^2.7|^3.0|^4.0", + "symfony/asset": "^3.4|^4.0", + "symfony/browser-kit": "^3.4|^4.0", + "symfony/css-selector": "^3.4|^4.0", "symfony/dependency-injection": "^2.7.20|^3.0|^4.0", "symfony/expression-language": "~2.7|^3.0|^4.0", - "symfony/form": "^2.7|^3.0|^4.0", - "symfony/phpunit-bridge": "^4.0", - "symfony/security-bundle": "^2.7|^3.0|^4.0", + "symfony/form": "^3.4|^4.0", + "symfony/phpunit-bridge": "^4.1.8", + "symfony/security-bundle": "^3.4|^4.0", "symfony/serializer": "^2.7.11|^3.0.4|^4.0", - "symfony/twig-bundle": "^2.7|^3.0|^4.0", - "symfony/validator": "^2.7|^3.0|^4.0", - "symfony/web-profiler-bundle": "^2.7|^3.0|^4.0", - "symfony/yaml": "^2.7|^3.0|^4.0" + "symfony/twig-bundle": "^3.4|^4.0", + "symfony/validator": "^3.4|^4.0", + "symfony/web-profiler-bundle": "^3.4|^4.0", + "symfony/yaml": "^3.4|^4.0" }, "suggest": { - "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ^1.0", + "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ^2.0|^3.0", "sensio/framework-extra-bundle": "Add support for the request body converter and the view response listener, requires ^3.0", "symfony/expression-language": "Add support for using the expression language in the routing, requires ^2.7|^3.0", "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ^2.7|^3.0", @@ -1965,7 +1966,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.4-dev" + "dev-master": "2.5-dev" } }, "autoload": { @@ -1999,7 +2000,7 @@ "keywords": [ "rest" ], - "time": "2018-08-21T16:54:14+00:00" + "time": "2019-01-03T13:05:12+00:00" }, { "name": "friendsofsymfony/user-bundle", @@ -3308,26 +3309,26 @@ }, { "name": "knplabs/gaufrette", - "version": "v0.7.0", + "version": "v0.8.0", "source": { "type": "git", "url": "https://github.com/KnpLabs/Gaufrette.git", - "reference": "a0627e91e8753f442eea6560cb347151cd306b2c" + "reference": "1f7c4bf5fa603d9396ba812cf3171713adc7b394" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/Gaufrette/zipball/a0627e91e8753f442eea6560cb347151cd306b2c", - "reference": "a0627e91e8753f442eea6560cb347151cd306b2c", + "url": "https://api.github.com/repos/KnpLabs/Gaufrette/zipball/1f7c4bf5fa603d9396ba812cf3171713adc7b394", + "reference": "1f7c4bf5fa603d9396ba812cf3171713adc7b394", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.1" }, "conflict": { "microsoft/windowsazure": "<0.4.3" }, "require-dev": { - "akeneo/phpspec-skip-example-extension": "~1.2", + "akeneo/phpspec-skip-example-extension": "^4.0", "amazonwebservices/aws-sdk-for-php": "1.5.*", "aws/aws-sdk-php": "^2.4.12||~3", "doctrine/dbal": ">=2.3", @@ -3338,8 +3339,8 @@ "mikey179/vfsstream": "~1.2.0", "mongodb/mongodb": "^1.1", "phpseclib/phpseclib": "^2.0", - "phpspec/phpspec": "~2.4", - "phpunit/phpunit": "^5.6.8", + "phpspec/phpspec": "~5.1", + "phpunit/phpunit": "~7.5", "rackspace/php-opencloud": "^1.9.2" }, "suggest": { @@ -3363,7 +3364,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.7.x-dev" + "dev-master": "0.9.x-dev" } }, "autoload": { @@ -3393,7 +3394,7 @@ "filesystem", "media" ], - "time": "2018-08-30T13:26:15+00:00" + "time": "2018-12-21T14:09:42+00:00" }, { "name": "knplabs/knp-components", @@ -4418,16 +4419,16 @@ }, { "name": "php-http/client-common", - "version": "1.8.2", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/php-http/client-common.git", - "reference": "efe327f4305813aa9025662259b78323d25b9948" + "reference": "9c21b6058caafdf2fcc99a0cabdf31b3ecb33961" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/efe327f4305813aa9025662259b78323d25b9948", - "reference": "efe327f4305813aa9025662259b78323d25b9948", + "url": "https://api.github.com/repos/php-http/client-common/zipball/9c21b6058caafdf2fcc99a0cabdf31b3ecb33961", + "reference": "9c21b6058caafdf2fcc99a0cabdf31b3ecb33961", "shasum": "" }, "require": { @@ -4449,7 +4450,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8-dev" + "dev-master": "1.9.x-dev" } }, "autoload": { @@ -4475,7 +4476,7 @@ "http", "httplug" ], - "time": "2018-12-14T22:12:45+00:00" + "time": "2019-01-03T10:59:55+00:00" }, { "name": "php-http/curl-client", @@ -4535,24 +4536,27 @@ }, { "name": "php-http/discovery", - "version": "1.4.0", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "9a6cb24de552bfe1aa9d7d1569e2d49c5b169a33" + "reference": "ffef11d54171336d841a34816a35bc035fb8cef0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/9a6cb24de552bfe1aa9d7d1569e2d49c5b169a33", - "reference": "9a6cb24de552bfe1aa9d7d1569e2d49c5b169a33", + "url": "https://api.github.com/repos/php-http/discovery/zipball/ffef11d54171336d841a34816a35bc035fb8cef0", + "reference": "ffef11d54171336d841a34816a35bc035fb8cef0", "shasum": "" }, "require": { "php": "^5.5 || ^7.0" }, + "conflict": { + "nyholm/psr7": "<1.0" + }, "require-dev": { "henrikbjorn/phpspec-code-coverage": "^2.0.2", - "php-http/httplug": "^1.0", + "php-http/httplug": "^1.0|^2.0", "php-http/message-factory": "^1.0", "phpspec/phpspec": "^2.4", "puli/composer-plugin": "1.0.0-beta10" @@ -4564,7 +4568,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -4593,7 +4597,7 @@ "message", "psr7" ], - "time": "2018-02-06T10:55:24+00:00" + "time": "2018-12-31T07:31:26+00:00" }, { "name": "php-http/httplug", @@ -9329,20 +9333,21 @@ }, { "name": "webmozart/assert", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a" + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a", + "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9", + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "phpunit/phpunit": "^4.6", @@ -9375,7 +9380,7 @@ "check", "validate" ], - "time": "2018-01-29T19:49:41+00:00" + "time": "2018-12-25T11:19:39+00:00" } ], "aliases": [],