summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* minor #12774 Docblock Fixes (GrahamCampbell)Fabien Potencier2014-11-3037-141/+201
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- Docblock Fixes | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A ##### This pull request fixes the docblock alignment as requested in #12760. It was also necessary for me to ensure the `@return` annotations were correctly separated in order to accurately align the `@param` annotations. Commits ------- 443307e Docblock fixes
| * Docblock fixesGraham Campbell2014-11-3037-141/+201
| |
* | Tweaked the password-compat version constraintGraham Campbell2014-11-301-1/+1
|/
* Azerbaijani localev2.3.22Farhad Safarov2014-11-192-0/+142
|
* compare version using PHP_VERSION_IDChristian Flothmann2014-11-172-2/+2
| | | | | | To let opcode caches optimize cached code, the `PHP_VERSION_ID` constant is used to detect the current PHP version instead of calling `version_compare()` with `PHP_VERSION`.
* Add machine readable eventsDaniel Wehner2014-11-161-0/+4
|
* [Translations] Added missing Hebrew language trans-unit sourcesMichael H. Arieli2014-11-122-0/+142
|
* minor #12293 Remove aligned '=>' and '=' (disquedur)Fabien Potencier2014-10-2619-83/+83
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was squashed before being merged into the 2.3 branch (closes #12293). Discussion ---------- Remove aligned '=>' and '=' | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | [https://github.com/symfony/symfony/issues/12284] | License | MIT Could you said to me if i should make an other PR for 2.5 branch. Commits ------- 51312d3 Remove aligned '=>' and '='
| * Remove aligned '=>' and '='Disquedur2014-10-2619-83/+83
| |
* | Improved the phpdoc for security token classesChristophe Coevoet2014-10-242-5/+5
|/
* Lithuanian security translationsv2.3.21Tadas Gliaubicas2014-10-151-0/+71
|
* bug #10242 Missing checkPreAuth from RememberMeAuthenticationProviderv2.3.20Mathieu Morlon2014-09-242-13/+9
|
* fixed CSFabien Potencier2014-09-2233-118/+134
|
* [Security] Added more testsMarc Torres2014-09-151-0/+42
|
* minor #11822 [Security] Use hash_equals for constant-time string comparison ↵Fabien Potencier2014-09-102-4/+50
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (again) (dunglas) This PR was merged into the 2.3 branch. Discussion ---------- [Security] Use hash_equals for constant-time string comparison (again) | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Use the `hash_equals` function (introduced in PHP 5.6) for timing attack safe string comparison when available. Add in the DocBlock that length will leak (https://github.com/symfony/symfony/pull/11797#issuecomment-53990712). Commits ------- 3071557 [Security] Add more tests for StringUtils::equals 03bd74b [Security] Use hash_equals for constant-time string comparison
| * [Security] Add more tests for StringUtils::equalsKévin Dunglas2014-09-041-3/+41
| |
| * [Security] Use hash_equals for constant-time string comparisonKévin Dunglas2014-09-041-1/+9
| |
* | [Security] Fix usage of unexistent method in DoctrineAclCache.Morgan Auchede2014-09-051-1/+4
|/
* fixing typo in a commentv2.3.19Christian Flothmann2014-09-011-1/+1
|
* minor #11574 [Security] Made optimization on constant-time algorithm ↵Fabien Potencier2014-08-311-8/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing modulus operator (yosmanyga) This PR was merged into the 2.3 branch. Discussion ---------- [Security] Made optimization on constant-time algorithm removing modulus operator | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This fix improves the constant-time algorithm used to compare strings, as it removes the `%` operator inside the loop. Commits ------- 000bd0d Made optimization deprecating modulus operator
| * Made optimization deprecating modulus operatorYosmany Garcia2014-08-141-8/+4
| |
* | Fixed the phpdoc of the VoterInterfaceChristophe Coevoet2014-08-251-1/+1
| |
* | [Validator] Backported constraint validator tests from 2.5Bernhard Schussek2014-08-141-0/+168
|/
* minor #11483 fix some docblocks (xabbuh)Fabien Potencier2014-08-023-3/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- fix some docblocks | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 1775da5 fix some docblocks
| * fix some docblocksChristian Flothmann2014-08-023-3/+7
| |
* | Unify null comparisonsWouterJ2014-07-261-1/+1
|/
* removed defaults from PHPUnit configurationv2.3.18Christian Raue2014-07-071-6/+0
|
* added XSD to PHPUnit configurationv2.3.17Christian Raue2014-07-071-2/+3
|
* [Security] Add check for supported attributes in AclVoterv2.3.16v2.3.15v2.3.14Arturs Vonda2014-05-082-3/+34
|
* added @Target annotationsv2.3.13Fabien Potencier2014-04-231-0/+1
|
* Fixed incompatibility of x509 auth with nginxalcaeus2014-04-222-21/+43
|
* minor #10717 unified return null usages (fabpot)Fabien Potencier2014-04-189-13/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- unified return null usages | Q | A | ------------- | --- | License | MIT This PR unifies the way we return `null` from a function or method: * always use `return;` instead of `return null;` (the current code base uses both); * never use `return;` at the end of a function/method. Commits ------- d1d569b unified return null usages
| * unified return null usagesFabien Potencier2014-04-169-13/+10
| |
* | [Security] fix DBAL connection typehintTobias Schultze2014-04-172-6/+15
| |
* | fixed types in phpdocsFabien Potencier2014-04-1630-49/+49
|/
* minor #10713 made {@inheritdoc} annotations consistent across the board (fabpot)Fabien Potencier2014-04-1645-109/+109
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- made {@inheritdoc} annotations consistent across the board | Q | A | ------------- | --- | License | MIT Commits ------- 810b9ed made {@inheritdoc} annotations consistent across the board
| * made {@inheritdoc} annotations consistent across the boardFabien Potencier2014-04-1645-109/+109
| |
* | fixed types in phpdocsFabien Potencier2014-04-161-1/+1
|/
* minor #10701 Made types used by Symfony compatible with the ones of Hack ↵Fabien Potencier2014-04-1530-133/+133
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fabpot) This PR was merged into the 2.3 branch. Discussion ---------- Made types used by Symfony compatible with the ones of Hack | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a PHP supports several ways to express types: like Boolean/bool or integer/int. Hack only supports one of them, so this PR proposes to use the Hack type to make Symfony a bit more "compatible" with Hack (gradual upgrade ;)). Commits ------- 3c9c10f made phpdoc types consistent with those defined in Hack 0555b7f made types consistent with those defined in Hack
| * made phpdoc types consistent with those defined in HackFabien Potencier2014-04-1529-124/+124
| |
| * made types consistent with those defined in HackFabien Potencier2014-04-135-9/+9
| |
* | minor #10708 Add support Thai translations (liverbool)Fabien Potencier2014-04-151-0/+71
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was squashed before being merged into the 2.3 branch (closes #10708). Discussion ---------- Add support Thai translations Add [Thai](http://www.thai-language.com/) translations to: + Symfony/Component/Validator/Resources/translations/ + Symfony/Component/Security/Resources/translations/ Commits ------- 4bc2951 Add support Thai translations
| * Add support Thai translationsツ Liverbool2014-04-151-0/+71
| |
* | [Security] Replace exception mocks with actual exception instances.v2.3.12Jakub Zalas2014-04-015-13/+17
| | | | | | | | | | | | It is done for two reasons: * consistency - we use real exception objects in most of the code * latest phpunit does not like the way we were creating mocks for exceptions (it could be also fixed by letting phpunit to call the original constructor)
* | Update DefaultAuthenticationSuccessHandler.phpureimers2014-03-141-3/+0
| |
* | Update BCryptPasswordEncoder.phpv2.3.11szymek2014-02-191-0/+1
| |
* | fixed various inconsistenciesv2.3.10Fabien Potencier2014-02-118-48/+48
| |
* | Added Bulgarian translation for security componentRoumen Damianoff2014-01-261-0/+71
| |
* | Create security.id.xlfUlumuddin Cahyadi Yunus2014-01-261-0/+71
| |
* | [Security] Add zh_CN translationsWang Jingyu2014-01-251-0/+71
| |
* | fixed attribute "source-language" for translationsChristian Raue2014-01-212-2/+2
| |
* | Updated Vietnamese translationHa Phan2014-01-201-0/+71
| |
* | [Validator] Translate validator messages into Brazilian PortugueseAndreia Bohner2014-01-191-4/+4
| |
* | Added missing Croatian translationsGoran Juric2014-01-171-0/+71
| |
* | [Component/Security] Fixed some phpdocs in Security/CoreJoseph Bielawski2014-01-1715-41/+94
| |
* | update year on licensesLuis Cordova2014-01-071-1/+1
| |
* | minor #9920 removed unneeded use statements (fabpot)v2.3.9Fabien Potencier2014-01-017-8/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- removed unneeded use statements | Q | A | ------------- | --- | License | MIT Commits ------- 7f9a366 removed unneeded use statements
| * | removed unneeded use statementsFabien Potencier2014-01-017-8/+0
| | |
* | | [Security] fixed pre/post authentication checksFabien Potencier2013-12-312-32/+32
|/ /
* | fixes PSR-0 issues in testsFabien Potencier2013-12-307-4/+4
| |
* | bug #8997 [Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role. ↵Fabien Potencier2013-12-292-2/+68
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (pawaclawczyk) This PR was squashed before being merged into the 2.3 branch (closes #8997). Discussion ---------- [Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role. <table> <tr> <td><b>Q</b></td> <td><b>A</b></td> </tr> <tr> <td>Bug fix?</td> <td>yes</td> </tr> <tr> <td>New feature</td> <td>no</td> </tr> <tr> <td>BC breaks?</td> <td>no</td> </tr> <tr> <td>Deprecations?</td> <td>no</td> </tr> <tr> <td>Tests pass?</td> <td>yes</td> </tr> <tr> <td>Fixed tickets</td> <td>#3085, #8974</td> </tr> <tr> <td>License</td> <td>MIT</td> </tr> <tr> <td>Doc PR</td> <td>n/a</td> </tr> </table> Problem occurs while user is impersonated. Authentication process generates new token and doeas not preserve role ```ROLE_PREVIOUS_ADMIN```. Ex. when parameter ```security.always_authenticate_before_granting``` is enabled. Commits ------- a7baa3b [Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role.
| * | [Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role.Paweł Wacławczyk2013-12-292-2/+68
| | |
* | | [Security] removed obsolete commentFabien Potencier2013-12-291-1/+0
| | |
* | | [Security] made code easier to understand, added some missing unit testsFabien Potencier2013-12-292-75/+248
| | |
* | | [Security] fixed error 500 instead of 403 if previous exception is provided ↵Tomasz Szymczyk2013-12-281-51/+67
| | | | | | | | | | | | to AccessDeniedException
* | | fixed acronymsFabien Potencier2013-12-282-3/+3
| | |
* | | fixed CS for lambdasFabien Potencier2013-12-281-1/+1
| | |
* | | minor #9869 fixed various typos (fabpot)Fabien Potencier2013-12-271-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- fixed various typos | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 2f15ac7 fixed various typos
| * | | fixed various typosFabien Potencier2013-12-271-2/+2
| | | |
* | | | Fix parent serialization of user objectDavid de Boer2013-12-232-1/+49
|/ / /
* | | fix #9356 [Security] Logger should manipulate the user reloaded from providerMatthieu Auger2013-12-201-3/+4
| | |
* | | Merge branch '2.2' into 2.3v2.3.8Fabien Potencier2013-11-2511-11/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: fixed some typos fixed @expectedException class names Conflicts: src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php src/Symfony/Component/Console/Tests/Command/CommandTest.php src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
| * | | fixed @expectedException class namesv2.2.11Fabien Potencier2013-11-2511-11/+11
| | | |
* | | | Merge branch '2.2' into 2.3Fabien Potencier2013-11-233-30/+158
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: No Entity Manager defined exception fixed CS [Acl] Fix for issue #9433 [Validator] fix docblock typos [DependencyInjection] removed the unused Reference and Parameter classes use statements from the compiled container class Fix mistake in translation's service definition. if handler_id is identical to null fix CS fix Fixed ModelChoiceList tests in Propel1 bridge. [AclProvider] Fix incorrect behaviour when partial results returned from cache Check if the pipe array is empty before calling stream_select() re-factor Propel1 ModelChoiceList [Locale] fixed the failing test described in #9455 [Process] fix phpdoc and timeout of 0 bug #9445 [BrowserKit] fixed protocol-relative url redirection Conflicts: src/Symfony/Component/BrowserKit/Tests/ClientTest.php src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php
| * | | fixed CSFabien Potencier2013-11-221-5/+5
| | | |
| * | | bug #9485 [Acl] Fix for issue #9433 (guilro)Fabien Potencier2013-11-222-26/+145
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was squashed before being merged into the 2.2 branch (closes #9485). Discussion ---------- [Acl] Fix for issue #9433 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #9433 | License | MIT | Doc PR | Two new test for issue #9433 : `testUpdateAclInsertingMultipleObjectFieldAcesThrowsDBConstraintViolations()` `testUpdateAclDeletingObjectFieldAcesThrowsDBConstraintViolations()` The change to `updateAces()` line 857 is enough to make the first test succeed. When changing the `order` field value to a higher value, we must first change the value of the next entry (and all the next entries recursively) to preserve uniqueness of the `order` field in the database. All the other changes are for the second test. In the former `updateAcl()` method, we commit the changes of the existing ACEs to the database before deleting or adding the new ones. We must delete the old ACEs before changing the existing ACEs in order to preserve uniqueness of the `order` field in the database. Commits ------- a38fab9 [Acl] Fix for issue #9433
| | * | | [Acl] Fix for issue #9433Guillaume Royer2013-11-222-26/+145
| | | | |
| * | | | [AclProvider] Fix incorrect behaviour when partial results returned from cacheDavid Stone2013-11-151-2/+11
| |/ / /
* | | | Merge branch '2.2' into 2.3v2.3.7Fabien Potencier2013-10-301-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: fixed CS Fixed the error handling when decoding invalid XML to avoid a Warning [Form] Fixed: The "data" option is taken into account even if it is NULL [DomCrawler] [HttpFoundation] Make `Content-Type` attributes identification case-insensitive Conflicts: src/Symfony/Component/Form/Extension/Core/Type/FormType.php
| * | | fixed CSv2.2.10Fabien Potencier2013-10-301-1/+1
| | | |
* | | | Merge branch '2.2' into 2.3Fabien Potencier2013-10-261-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 2.2: Fixed English usage for existing users. [Process] Fix #9343 : revert file handle usage on Windows platform
| * | | Fixed English usage for existing users.Michael Genereux2013-10-241-1/+1
| | | |
* | | | Merge branch '2.2' into 2.3Fabien Potencier2013-10-181-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: [DoctrineBridge] Added type check to prevent calling clear() on arrays [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty Fix docblock typo Conflicts: src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
| * | | Fix docblock typoAdrien Brault2013-10-171-1/+1
| | | |
* | | | Merge branch '2.2' into 2.3Fabien Potencier2013-10-172-1/+71
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: [DoctrineBridge] Loosened CollectionToArrayTransformer::transform() to accept arrays Removed unused use statements. Make usleep longer and simplify assertions Added japanese translation resource for security component. [Yaml] Fixed the escaping of strings starting with a dash when dumping Fix in ChainLoader.php fixed wrong started states
| * | | Removed unused use statements.Hugo Hamon2013-10-161-1/+0
| | | |
| * | | Added japanese translation resource for security component.hidenorigoto2013-10-151-0/+71
| | | |
* | | | Merge branch '2.2' into 2.3v2.3.6Fabien Potencier2013-10-1010-3/+126
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: bumped Symfony version to 2.2.10 updated VERSION for 2.2.9 update CONTRIBUTORS for 2.2.9 updated CHANGELOG for 2.2.9 [Security] limited the password length passed to encoders assets:install command should mirror .dotfiles (.htaccess) PoFileDumper - PO headers removed whitespaces Conflicts: src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
| * | | [Security] limited the password length passed to encodersv2.2.9Fabien Potencier2013-10-1010-2/+129
| | | |
* | | | Merge branch '2.2' into 2.3Fabien Potencier2013-10-011-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 2.2: Fix: duplicate usage of Symfony\Component\HttpFoundation\Response
| * | | Fix: duplicate usage of Symfony\Component\HttpFoundation\Responsesimpson2013-10-011-1/+0
| | | |
* | | | Merge branch '2.2' into 2.3Fabien Potencier2013-09-2918-12/+84
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: fixed Client when using the terminable event Fix problem with Windows file links (backslash in JavaScript string) [Security] fixed wrong phpdoc [Routing] removed extra argument [HttpFoundation] Header `HTTP_X_FORWARDED_PROTO` can contain various values Some proxies use `ssl` instead of `https`, as well as Lighttpd mod_proxy allows value chaining (`https, http`, where `https` is always first when request is encrypted). Added doc comments Conflicts: src/Symfony/Component/HttpFoundation/Request.php
| * | | [Security] fixed wrong phpdocFabien Potencier2013-09-271-3/+1
| | | |
| * | | Added doc commentsPiotr Antosik2013-09-1918-10/+84
| | | |
* | | | Set cost type to integerv2.3.5datibbaw2013-09-271-1/+1
| |_|/ |/| | | | | | | | This seems to be a remnant of when the code dealt with crypt() directly. The password_hash() function expects the cost option to be an LVAL (it does a type conversion for strings).
* | | Merge branch '2.2' into 2.3Fabien Potencier2013-09-222-5/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: [Locale] added support for the position argument to NumberFormatter::parse() [Locale] added some more stubs for the number formatter [Yaml] fixed typo [Yaml] fixed a test on PHP < 5.4 [DomCrawler]Crawler guess charset from html fixed PHP 5.3 compatibility [Yaml] reverted previous merge partially (refs #8897) [Security] remove unused logger [Security] fix typo [Yaml] Fixed filename in the ParseException message Conflicts: src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/Locale/Stub/StubNumberFormatter.php src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
| * | merged branch Tobion/security-fix-typo (PR #9069)v2.2.8v2.2.7Fabien Potencier2013-09-192-5/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.2 branch. Discussion ---------- [Security] fix typo and remove unused logger | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT Commits ------- a33cc51 [Security] remove unused logger 62de9c1 [Security] fix typo
| | * | [Security] remove unused loggerTobias Schultze2013-09-181-4/+1
| | | |
| | * | [Security] fix typoTobias Schultze2013-09-181-1/+1
| | | |
* | | | Merge branch '2.2' into 2.3Fabien Potencier2013-09-1918-4/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: Fix some annotates [FrameworkBundle] made sure that the debug event dispatcher is used everywhere [HttpKernel] remove unneeded strtoupper updated the composer install command to reflect changes in Composer Conflicts: src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Command/Command.php src/Symfony/Component/Console/Input/InputDefinition.php src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php src/Symfony/Component/Form/Form.php src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php src/Symfony/Component/Locale/Locale.php src/Symfony/Component/Locale/README.md src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php