diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-12 17:16:46 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-12 17:16:46 +0200 |
| commit | 165c5e5d50896e657ff2b0d1663b4b224ef8294c (patch) | |
| tree | 1091443805aa5cc9017bc149b60ae3b052ef715f | |
| parent | 91520c37bd5317989094f5f9305ba0ce1c9a968f (diff) | |
| parent | 69aa8266619387ed128df04d9909e8eda7e2e866 (diff) | |
| download | symfony-security-165c5e5d50896e657ff2b0d1663b4b224ef8294c.zip symfony-security-165c5e5d50896e657ff2b0d1663b4b224ef8294c.tar.gz symfony-security-165c5e5d50896e657ff2b0d1663b4b224ef8294c.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7: (70 commits)
[travis] Use container-based infrastructure
[HttpKernel] use ConfigCache::getPath() method when it exists
[PropertyAccess] Fix setting public property on a class having a magic getter
[Routing] Display file which contain deprecated option
ContainerInterface: unused exception dropped
bumped Symfony version to 2.6.8
updated VERSION for 2.6.7
updated CHANGELOG for 2.6.7
bumped Symfony version to 2.3.29
updated VERSION for 2.3.28
update CONTRIBUTORS for 2.3.28
updated CHANGELOG for 2.3.28
[Debug] Fixed ClassNotFoundFatalErrorHandlerTest
[SecurityBundle] use access decision constants in config
[SecurityBundle] use session auth constants in config
PhpDoc fix in AbstractRememberMeServices
[Filesystem] Simplified an if statement
[SecurityBundle] Use Enum Nodes Instead Of Scalar
[Debug 2.3] Fix test for PHP7
[HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed
...
Conflicts:
src/Symfony/Bundle/DebugBundle/composer.json
src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
src/Symfony/Component/Form/README.md
src/Symfony/Component/Intl/README.md
src/Symfony/Component/Security/README.md
src/Symfony/Component/Translation/Loader/CsvFileLoader.php
src/Symfony/Component/Translation/Loader/IniFileLoader.php
src/Symfony/Component/Translation/Loader/MoFileLoader.php
src/Symfony/Component/Translation/Loader/PhpFileLoader.php
src/Symfony/Component/Translation/Loader/PoFileLoader.php
src/Symfony/Component/Translation/Loader/YamlFileLoader.php
src/Symfony/Component/Translation/README.md
src/Symfony/Component/Translation/Translator.php
src/Symfony/Component/Validator/README.md
| -rw-r--r-- | Http/RememberMe/AbstractRememberMeServices.php | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | Resources/translations/security.pt_PT.xlf | 6 | ||||
| -rw-r--r-- | composer.json | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php index 047d624..3ac584a 100644 --- a/Http/RememberMe/AbstractRememberMeServices.php +++ b/Http/RememberMe/AbstractRememberMeServices.php @@ -217,7 +217,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * @param array $cookieParts * @param Request $request * - * @return TokenInterface + * @return UserInterface */ abstract protected function processAutoLoginCookie(array $cookieParts, Request $request); @@ -11,7 +11,7 @@ Resources Documentation: -http://symfony.com/doc/2.8/book/security.html +https://symfony.com/doc/2.8/book/security.html Tests ----- diff --git a/Resources/translations/security.pt_PT.xlf b/Resources/translations/security.pt_PT.xlf index e661000..f2af13e 100644 --- a/Resources/translations/security.pt_PT.xlf +++ b/Resources/translations/security.pt_PT.xlf @@ -4,7 +4,7 @@ <body> <trans-unit id="1"> <source>An authentication exception occurred.</source> - <target>Ocorreu um excepção durante a autenticação.</target> + <target>Ocorreu uma excepção durante a autenticação.</target> </trans-unit> <trans-unit id="2"> <source>Authentication credentials could not be found.</source> @@ -20,7 +20,7 @@ </trans-unit> <trans-unit id="5"> <source>Cookie has already been used by someone else.</source> - <target>Este cookie já esta em uso.</target> + <target>Este cookie já está em uso.</target> </trans-unit> <trans-unit id="6"> <source>Not privileged to request the resource.</source> @@ -64,7 +64,7 @@ </trans-unit> <trans-unit id="16"> <source>Account is locked.</source> - <target>A conta esta trancada.</target> + <target>A conta está trancada.</target> </trans-unit> </body> </file> diff --git a/composer.json b/composer.json index e3343ea..75abcf8 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "library", "description": "Symfony Security Component", "keywords": [], - "homepage": "http://symfony.com", + "homepage": "https://symfony.com", "license": "MIT", "authors": [ { @@ -12,7 +12,7 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "require": { |