summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [Security] removed deprecated classesFabien Potencier2013-03-232-58/+0
|
* Merge branch '2.2'Fabien Potencier2013-03-203-5/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: (70 commits) change wrapped exception message to be more usefull updated VERSION for 2.0.23 update CONTRIBUTORS for 2.0.23 updated CHANGELOG for 2.0.23 [Form] fixed failing test [DomCrawler] added support for query string with slash Fixed invalid file path for hiddeninput.exe on Windows. fix xsd definition for strict-requirements [WebProfilerBundle] Fixed the toolbar styles to apply them in IE8 [ClassLoader] fixed heredocs handling fixed handling of heredocs Add a public modifier to an interface method removing xdebug extension [HttpRequest] fixes Request::getLanguages() bug [HttpCache] added a test (cached content should be kept after purging) [DoctrineBridge] Fixed non-utf-8 recognition [Security] fixed HttpUtils class tests replaced new occurences of 'Request::create()' with '::create()' changed sub-requests creation to '::create()' fixed merge issue ... Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig src/Symfony/Component/DomCrawler/Link.php src/Symfony/Component/Translation/Translator.php
| * Merge branch '2.1' into 2.2Fabien Potencier2013-03-192-5/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * 2.1: Add a public modifier to an interface method [HttpRequest] fixes Request::getLanguages() bug [HttpCache] added a test (cached content should be kept after purging) [DoctrineBridge] Fixed non-utf-8 recognition [Security] fixed HttpUtils class tests
| | * Add a public modifier to an interface methodv2.1.9Elnur Abdurrakhimov2013-03-181-1/+1
| | |
| | * [Security] fixed HttpUtils class testsJean-François Simon2013-03-151-4/+4
| | |
| * | Merge branch '2.1' into 2.2Fabien Potencier2013-03-151-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * 2.1: changed sub-requests creation to '::create()' Conflicts: src/Symfony/Bundle/FrameworkBundle/HttpKernel.php src/Symfony/Component/Security/Http/HttpUtils.php
| | * changed sub-requests creation to '::create()'Jean-François Simon2013-03-151-1/+1
| | |
| * | fixed merge issueFabien Potencier2013-03-151-1/+1
| | |
| * | Merge branch '2.1' into 2.2Fabien Potencier2013-03-152-4/+26
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.1: sub-requests are now created with the same class as their parent [FrameworkBundle] removed BC break [FrameworkBundle] changed temp kernel name in cache:clear [DoctrineBridge] Avoids blob values to be logged by doctrine [Security] use current request attributes to generate redirect url? [Validator] fix showing wrong max file size for upload errors [TwigBridge] removed double var initialization (refs #7344) [2.1][TwigBridge] Fixes Issue #7342 in TwigBridge [FrameworkBundle] fixed cahe:clear command's warmup [TwigBridge] now enter/leave scope on Twig_Node_Module [TwigBridge] fixed fixed scope & trans_default_domain node visitor [TwigBridge] fixed non probant tests & added new one [BrowserKit] added ability to ignored malformed set-cookie header [Translation] removed wriong 'use' [Translation] added xliff loader/dumper with resname support [TwigBridge] fixes Conflicts: src/Symfony/Bundle/FrameworkBundle/HttpKernel.php src/Symfony/Component/Security/Http/HttpUtils.php src/Symfony/Component/Translation/Loader/XliffFileLoader.php src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
| | * sub-requests are now created with the same class as their parentJean-François Simon2013-03-141-1/+1
| | |
| | * [Security] use current request attributes to generate redirect url?Jean-François Simon2013-03-132-5/+27
| | |
* | | Merge branch '2.2'Fabien Potencier2013-03-061-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: (26 commits) [FrameworkBundle] Fixes invalid serialized objects in cache remove dead code in yaml component Fixed typo in UPGRADE-2.2 fixed typo RedisProfilerStorage wrong db-number/index-number selected [DependencyInjection] added a test for the previous merge (refs #7261) Unset loading[$id] in ContainerBuilder on exception Default validation message translation fix. remove() should not use deprecated getParent() so it does not trigger deprecation internally adjust routing tests to not use prefix in addCollection add test for uniqueness of resources added tests for addDefaults, addRequirements, addOptions adjust RouteCollectionTest for the addCollection change and refactor the tests to only skip the part that really needs the config component added tests for remove() that wasnt covered yet and special route name refactor interator test that was still assuming a tree adjust tests to no use addPrefix with options adjusted tests to not use RouteCollection::getPrefix [Routing] trigger deprecation warning for deprecated features that will be removed in 2.3 [Console] fixed StringInput binding [Console] added string input test ...
| * | merged branch pborreli/patch-6 (PR #7228)Fabien Potencier2013-03-011-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.2 branch. Commits ------- c6c71bf Fixed trailing whitespace Discussion ---------- Fixed trailing whitespace
| | * | Fixed trailing whitespacePascal Borreli2013-03-011-1/+1
| | | |
* | | | Merge branch '2.2'Fabien Potencier2013-03-012-1/+72
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: fixed CS Add persian translation to Components/Security bumped Symfony version to 2.2.1-DEV-DEV updated VERSION for 2.2.0 updated CHANGELOG for 2.2.0
| * | | fixed CSFabien Potencier2013-03-011-1/+1
| |/ /
| * | Add persian translation to Components/Securityfzerorubigd2013-03-011-0/+71
| | |
* | | Merge branch '2.2'Fabien Potencier2013-02-231-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: Defined stable version point of Doctrine. [HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750) Update composer.json [Form] Fixed TimeType not to render a "size" attribute in select tags [Form] Added test for "label" option to accept the value "0" Expanded fault-tolerance for unusual cookie dates Fix docblock type [Form] Fixed "label" option to accept the value "0" Added greek translation merged branch jfcixmedia/2.1 (PR #5838) added a note about a BC break for the path info of sub-request (closes #7138) [DomCrawler] lowered parsed protocol string (fixes #6986) [FrameworkBundle] Fix a BC for Hinclude global template [HttpKernel] fixed locale management when exiting sub-requests fixed HInclude renderer (closes #7113) Removed some leaking deprecation warning in the Form component [HttpKernel] hinclude fragment renderer must escape URIs properly to return valid html Conflicts: src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Security/composer.json
| * | Merge branch '2.1' into 2.2v2.2.0Fabien Potencier2013-02-231-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.1: Defined stable version point of Doctrine. [HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750) Update composer.json [Form] Fixed TimeType not to render a "size" attribute in select tags [Form] Added test for "label" option to accept the value "0" Expanded fault-tolerance for unusual cookie dates Fix docblock type [Form] Fixed "label" option to accept the value "0" merged branch jfcixmedia/2.1 (PR #5838) [DomCrawler] lowered parsed protocol string (fixes #6986) Conflicts: composer.json src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Validator/composer.json
| | * Defined stable version point of Doctrine.v2.1.8Guilherme Blanco2013-02-221-2/+2
| | |
* | | Merge branch '2.2'Fabien Potencier2013-02-112-2/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: Fixed XmlFileLoaderTest::testLoadThrowsExceptionWithInvalidFileEvenWithoutSchemaValidation moved file hash calculation to own method [Validator] Add check for existing metadata on property added support for the X-Forwarded-For header (closes #6982, closes #7000) fixed the IP address in HttpCache when calling the backend [EventDispatcher] Added assertion. [EventDispathcer] Fix removeListener [DependencyInjection] Add clone for resources which were introduced in 2.1 [DependencyInjection] Allow frozen containers to be dumped to graphviz Fix 'undefined index' error, when entering scope recursively [Security] fixed session creation on login (closes #7011) replaced usage of the deprecated pattern routing key (replaced with path) Add dot character `.` to legal mime subtype regular expression [HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes #6923, closes #6936)
| * | Merge branch '2.1' into 2.2Fabien Potencier2013-02-112-2/+23
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.1: added support for the X-Forwarded-For header (closes #6982, closes #7000) fixed the IP address in HttpCache when calling the backend [EventDispatcher] Added assertion. [EventDispathcer] Fix removeListener [DependencyInjection] Add clone for resources which were introduced in 2.1 [DependencyInjection] Allow frozen containers to be dumped to graphviz Fix 'undefined index' error, when entering scope recursively [Security] fixed session creation on login (closes #7011) Add dot character `.` to legal mime subtype regular expression [HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes #6923, closes #6936)
| | * [Security] fixed session creation on login (closes #7011)Adrien Samson2013-02-072-2/+23
| | |
* | | changed dependencies to allow all 2.3 versions of the components (closes #6983)Fabien Potencier2013-02-111-3/+3
| | |
* | | Merge branch '2.2'Fabien Potencier2013-02-112-11/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: (30 commits) [HttpFoundation] Added support for partial ranges in the BinaryFileResponse. [HttpFoundation] Fixed byte ranges in the BinaryFileResponse. updated required versions when depending on the HttpFoundation component updated required versions when depending on the HttpKernel component updated required versions when depending on the Config component updated required versions when depending on the Form component updated required versions when depending on the DependencyInjection component updated required versions when depending on the Validator component updated required versions when depending on the Translation component updated required versions when depending on the Routing component updated required versions when depending on the EventDispatcher component updated required versions when depending on the OptionsResolver component updated required versions when depending on the PropertyAccess component updated required versions when depending on the Security component updated required versions when depending on the Templating component updated required versions when depending on the Stopwatch component updated required versions when depending on the Process component updated required versions when depending on the Finder component updated required versions when depending on the Dom Crawler component use ~2.0 when depending on the Dom Crawler component ...
| * | updated required versions when depending on the HttpFoundation componentFabien Potencier2013-02-081-1/+1
| | |
| * | updated required versions when depending on the HttpKernel componentFabien Potencier2013-02-081-1/+1
| | |
| * | updated required versions when depending on the Form componentFabien Potencier2013-02-081-1/+1
| | |
| * | updated required versions when depending on the Validator componentFabien Potencier2013-02-081-2/+2
| | |
| * | updated required versions when depending on the Routing componentFabien Potencier2013-02-081-1/+1
| | |
| * | updated required versions when depending on the EventDispatcher componentFabien Potencier2013-02-081-1/+1
| | |
| * | added Universal* classes in the list of deprecated classes for 3.0Fabien Potencier2013-02-081-4/+4
| | |
* | | Merge branch '2.2'Fabien Potencier2013-02-0710-64/+387
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: [HttpFoundation] fixed Request::create() method [HttpKernel] fixed the creation of the Profiler directory [HttpKernel] fixed the hinclude fragment renderer when the template is empty bumped Symfony version to 2.2.0-RC2-DEV [DependencyInjection] enhanced some error messages [FrameworkBundle] fixed typo fixed typo tweaked previous merge [Security] fixed interface implementation (closes #6974) Add "'property_path' => false" deprecation message for forms fixed CS Added BCrypt password encoder. updated VERSION for 2.2.0-RC1 Removed underscores from test method names to be consistent with other components. [Security] fixed session creation when none is needed (closes #6917) [FrameworkBundle] removed obsolete comment (see 2e356c1) Micro-optimization [FrameworkBundle] removed extra whitespaces [Security] renamed Constraint namespace to Constraints for validator classes in order to be consistent with the whole current validator API. [FrameworkBundle] fixed wrong indentation on route debug output
| * | Merge branch '2.1' into 2.2Fabien Potencier2013-02-072-30/+34
| |\ \ | | |/ | | | | | | | | | | | | | | | * 2.1: [HttpKernel] fixed the creation of the Profiler directory [Security] fixed session creation when none is needed (closes #6917) [FrameworkBundle] removed obsolete comment (see 2e356c1)
| | * [Security] fixed session creation when none is needed (closes #6917)Fabien Potencier2013-02-042-30/+34
| | |
| * | [Security] fixed interface implementation (closes #6974)Fabien Potencier2013-02-052-8/+8
| | |
| * | fixed CSFabien Potencier2013-02-051-12/+14
| | |
| * | Added BCrypt password encoder.Elnur Abdurrakhimov2013-02-053-0/+259
| | |
| * | merged branch hhamon/user_password_constraints_namespace (PR #6960)Fabien Potencier2013-02-045-34/+92
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.2 branch. Commits ------- 35b62ac [Security] renamed Constraint namespace to Constraints for validator classes in order to be consistent with the whole current validator API. Discussion ---------- [Security] renamed Constraint namespace to Constraints for validator classes in order to be consistent with the whole current validator API. | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | yes (for people already using the ``UserPassword`` constraint class in their code) | Deprecations? | yes | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | -
| | * | [Security] renamed Constraint namespace to Constraints for validator classes ↵Hugo Hamon2013-02-045-34/+92
| | | | | | | | | | | | | | | | in order to be consistent with the whole current validator API.
* | | | Merge branch '2.2'Fabien Potencier2013-02-045-3/+255
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.2: fixed regression in the Finder component (it was possible to use it without using exec before, closes #6357) fixed a circular call (closes #6864) typo [Security] [Tests] added unit tests for the UserPasswordValidator class and made the validator service for the UserPassword constraint configurable. fixed wrong indentation tweaked previous commit [HttpKernel] Fix the URI signer (closes #6801) Add Arabic translations. [HttpKernel] fixed regression when rendering an inline controller and passing some objects (closes #6822) [FrameworkBundle] fixed typo renamed some classes and Twig functions to more descriptive names (refs #6871) Classcollectionloader: fix traits + enhancements Fix a deprecated method call in the tests Update `composer.json` files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version Correct comment in NativeSessionStorage regarding session.save_handler [Security] Add PHPDoc to AuthenticationEvents
| * | | Merge branch '2.1' into 2.2Fabien Potencier2013-02-041-0/+19
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | * 2.1: fixed a circular call (closes #6864) Correct comment in NativeSessionStorage regarding session.save_handler [Security] Add PHPDoc to AuthenticationEvents
| | * merged branch franmomu/add_phpdoc_to_authentication_events (PR #6831)Fabien Potencier2013-02-011-0/+19
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.1 branch. Commits ------- e7624b6 [Security] Add PHPDoc to AuthenticationEvents Discussion ---------- [Security] Added PHPDoc to AuthenticationEvents | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR |
| | | * [Security] Add PHPDoc to AuthenticationEventsFran Moreno2013-01-221-0/+19
| | | |
| * | | [Security] [Tests] added unit tests for the UserPasswordValidator class and ↵Hugo Hamon2013-02-022-1/+163
| | | | | | | | | | | | | | | | made the validator service for the UserPassword constraint configurable.
| * | | Add Arabic translations.Mahmoud Mostafa2013-02-011-0/+71
| | | |
| * | | Update `composer.json` files: - to allow versions ~2.2 (>=2.2,<3.0) of ↵Joseph Bielawski2013-02-011-2/+2
| | | | | | | | | | | | | | | | Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version
* | | | updated the branch alias in composer filesFabien Potencier2013-01-311-1/+1
|/ / /
* | | Merge branch '2.1'Fabien Potencier2013-01-231-0/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.1: [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder [Security] PHPDoc in SecurityEvents Fix typos in README Added an error message in the DebugClassLoader when using / instead of \. KNOWN_ISSUES with php 5.3.16 [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737) [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786) [Yaml] fixed #6773 [Yaml] fixed #6770 bumped Symfony version to 2.1.8-DEV bumped Symfony version to 2.0.23-DEV Conflicts: src/Symfony/Bundle/FrameworkBundle/Client.php src/Symfony/Component/HttpKernel/Kernel.php
| * | Merge branch '2.0' into 2.1Fabien Potencier2013-01-221-0/+18
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.0: [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder [Security] PHPDoc in SecurityEvents [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737) [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786) [Yaml] fixed #6773 [Yaml] fixed #6770 bumped Symfony version to 2.0.23-DEV Conflicts: src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Yaml/Inline.php src/Symfony/Component/Yaml/Tests/InlineTest.php
| | * merged branch franmomu/added_phpdoc_security_events (PR #6818)v2.0.24v2.0.23Fabien Potencier2013-01-211-0/+18
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was squashed before being merged into the 2.0 branch (closes #6818). Commits ------- 598ae9d [Security] PHPDoc in SecurityEvents Discussion ---------- [Security] PHPDoc in SecurityEvents | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | I'm not sure about the description given.
| | | * [Security] PHPDoc in SecurityEventsFran Moreno2013-01-211-0/+18
| | | |
* | | | Merge branch '2.1'Fabien Potencier2013-01-171-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.1: [Yaml] fixed default value Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes. added a way to enable/disable object support when parsing/dumping added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse() fixed CS [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder` fixes a bug when output/error output contains a % character [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689) [Profiler] [Redis] Fix sort of profiler rows. Fix version_compare() calls for PHP 5.5. Removed underscores from test method names to be consistent with other components. [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process) Fix version_compare() calls for PHP 5.5. Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5. removed the .gitattributes files (closes #6605, reverts #5674) [HttpKernel] Clarify misleading comment in ExceptionListener Conflicts: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php src/Symfony/Component/Process/Process.php
| * | | removed the .gitattributes files (closes #6605, reverts #5674)v2.1.7Fabien Potencier2013-01-091-2/+0
| | | |
* | | | merged branch toin0u/SecurityTranslation (PR #6761)Fabien Potencier2013-01-161-0/+71
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 68ac23f [Security] Added Danish translation Discussion ---------- [Security] Added Danish translation Bug fix: no Feature addition: no Backwards compatibility break: no Deprecations: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - License of the code: MIT Documentation PR: -
| * | | | [Security] Added Danish translationAntoine Corcy2013-01-161-0/+71
| | | | |
* | | | | Added Serbian Latin tanslation for security componentumpirsky2013-01-161-0/+71
| | | | |
* | | | | merged branch inmarelibero/patch-1 (PR #6729)Fabien Potencier2013-01-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- a5a04b8 fixed italian translation typo Discussion ---------- fixed italian translation typo
| * | | | | fixed italian translation typoEmanuele Gaspari2013-01-141-1/+1
| | | | | |
* | | | | | [Security] Fixed typo in cs translationMartin Hasoň2013-01-141-1/+1
|/ / / / /
* | | | | Added Galician translation in security componentrubenrua2013-01-131-0/+71
|/ / / /
* | | | [Security] fix Hungarian translationGábor Fási2013-01-121-1/+1
| | | |
* | | | merged branch franmomu/rename_catalonian_translation (PR #6714)Fabien Potencier2013-01-121-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- eeceafa [Security] Renamed catalonian translation file Discussion ---------- [Security] Renamed catalonian translation file Renamed as validators file in [Validator](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf) and in [Form](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Form/Resources/translations/validators.ca.xlf) following ISO639-1 language code.
| * | | | [Security] Renamed catalonian translation fileFran Moreno2013-01-111-0/+0
| | | | |
* | | | | merged branch alexolmos/patch-1 (PR #6712)Fabien Potencier2013-01-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- fb52d94 Update src/Symfony/Component/Security/Resources/translations/security.es_CA.xlf Discussion ---------- Update src/Symfony/Component/Security/Resources/translations/security.es... ..._CA.xlf
| * | | | | Update src/Symfony/Component/Security/Resources/translations/security.es_CA.xlfAlex Olmos2013-01-111-1/+1
| |/ / / /
* | | | | merged branch pborreli/typophpdoc (PR #6710)Fabien Potencier2013-01-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- b1c6881 Fixed PHPDoc Discussion ---------- Fixed PHPDoc
| * | | | | Fixed PHPDocPascal Borreli2013-01-111-1/+1
| |/ / / /
* | | | | merged branch jorgemartind/patch-1 (PR #6709)Fabien Potencier2013-01-121-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 9d31064 Update src/Symfony/Component/Security/Resources/translations/security.es_CA.xlf Discussion ---------- Update src/Symfony/Component/Security/Resources/translations/security.es... ..._CA.xlf [Security] update catalonian translation
| * | | | | Update src/Symfony/Component/Security/Resources/translations/security.es_CA.xlfjorgemartind2013-01-111-2/+2
| |/ / / / | | | | | | | | | | [Security] update catalonian translation
* | | | | merged branch lazyhammer/security-translations (PR #6711)Fabien Potencier2013-01-122-29/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 0a060ca Fix Russian and Ukrainian translations for Security component Discussion ---------- [Security] Fix Russian and Ukrainian translations
| * | | | | Fix Russian and Ukrainian translations for Security componentDmitrii Chekaliuk2013-01-112-29/+29
| |/ / / /
* | | | | Added Serbian Cyrillic tanslation for security componentumpirsky2013-01-111-0/+71
|/ / / /
* | | | merged branch Burgov/patch-3 (PR #6702)Fabien Potencier2013-01-111-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 6b669fb Update src/Symfony/Component/Security/Resources/translations/security.nl.xlf Discussion ---------- Update src/Symfony/Component/Security/Resources/translations/security.nl.xlf see #6668 Some more minor tweaks
| * | | | Update src/Symfony/Component/Security/Resources/translations/security.nl.xlfBart van den Burg2013-01-111-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | see #6668 Some more minor tweaks
* | | | | merged branch cristobal/master (PR #6707)Fabien Potencier2013-01-111-0/+71
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 83d0469 Create security.no.xlf Discussion ---------- Norwegian Translation for Security Norwegian Translation
| * | | | | Create security.no.xlfCristobal Dabed2013-01-111-0/+71
| |/ / / / | | | | | | | | | | Norwegian Translation
* | | | | Contribution to translation to Catalan of the security messagesJoan Cruz2013-01-111-0/+71
|/ / / /
* | | | Added Turkish translation for security componentSinan Eldem2013-01-111-0/+71
| | | |
* | | | merged branch sstok/patch-3 (PR #6691)Fabien Potencier2013-01-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 08f9c76 Update src/Symfony/Component/Security/Resources/translations/security.nl.xlf Discussion ---------- Minor tone of voice correction in security.nl.xlf For the Dutch people under us. http://www.kiezelcommunicatie.nl/kiezelblog/woorden-die-niet-meer-mogen-aflevering-1/ Yes I'm picky ;)
| * | | | Update src/Symfony/Component/Security/Resources/translations/security.nl.xlfSebastiaan Stok2013-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | For the Dutch people under us. http://www.kiezelcommunicatie.nl/kiezelblog/woorden-die-niet-meer-mogen-aflevering-1/ Yes I'm picky ;)
* | | | | Added Portuguese (Portugal) translation to SecurityTiago Brito2013-01-101-0/+71
|/ / / / | | | | | | | | | | | | Added Portuguese from Portugal translation for Security component
* | | | merged branch theUniC/master (PR #6684)Fabien Potencier2013-01-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 1edf302 Fixed some translation typos Discussion ---------- Fixed translation typos on the Security componente Hi, In my last PR I've introduced some translation typos on the Security component messages for the Spanish translation. So sorry. Christian.
| * | | | Fixed some translation typosChristian2013-01-101-3/+3
| | | | |
* | | | | merged branch pborreli/patch-5 (PR #6687)Fabien Potencier2013-01-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- d4bbb6b [Security] Missing trailing dot. Discussion ---------- [Security] Missing trailing dot.
| * | | | | [Security] Missing trailing dot.Pascal Borreli2013-01-101-1/+1
| | | | | |
* | | | | | merged branch pborreli/patch-4 (PR #6683)Fabien Potencier2013-01-101-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 53c5d9b [Security] Missing trailing dot. Discussion ---------- [Security] Missing trailing dot.
| * | | | | | [Security] Missing trailing dot.Pascal Borreli2013-01-101-2/+2
| | | | | | |
* | | | | | | merged branch tkinast/patch-1 (PR #6688)Fabien Potencier2013-01-101-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 77545a2 Update src/Symfony/Component/Security/Resources/translations/security.es.xlf Discussion ---------- Update src/Symfony/Component/Security/Resources/translations/security.es... ....xlf --------------------------------------------------------------------------- by mweimerskirch at 2013-01-10T17:43:38Z Duplicate of #6684?
| * | | | | | | Update src/Symfony/Component/Security/Resources/translations/security.es.xlftkinast2013-01-101-3/+3
| | |/ / / / / | |/| | | | |
* | | | | | | merged branch mweimerskirch/patch-10 (PR #6685)Fabien Potencier2013-01-101-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- a1ef9d8 Fixed 2 typos in French translation Discussion ---------- Fixed 2 typos in French translation
| * | | | | | | Fixed 2 typos in French translationMichel Weimerskirch2013-01-101-2/+2
| |/ / / / / /
* | | | | | | merged branch tobiassjosten/patch-1 (PR #6690)Fabien Potencier2013-01-101-0/+71
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 65bb3d2 Added Swedish translation Discussion ---------- Added Swedish translation
| * | | | | | Added Swedish translationTobias Sjösten2013-01-101-0/+71
| | | | | | |
* | | | | | | merged branch mweimerskirch/patch-9 (PR #6682)Fabien Potencier2013-01-101-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- b92973c Fixed German translations for security component Discussion ---------- Fixed German translations for security component authentication != authorisation plus a few other minor things
| * | | | | | | Fixed German translations for security componentMichel Weimerskirch2013-01-101-6/+6
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | authentication != authorisation + a few other minor things
* | | | | | | merged branch mweimerskirch/security_lb (PR #6681)Fabien Potencier2013-01-101-0/+71
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 9471a1c Added Luxembourgish translation for security component Discussion ---------- Added Luxembourgish translation for security component
| * | | | | | Added Luxembourgish translation for security componentMichel Weimerskirch2013-01-101-0/+71
| | | | | | |
* | | | | | | merged branch Seldaek/psr3 (PR #6628)Fabien Potencier2013-01-1020-25/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the master branch. Commits ------- 67d7423 Remove use of deprecated HttpKernel LoggerInterface dca4528 [HttpKernel] Extend psr/log's NullLogger class 1e5a890 [Monolog] Mark old non-PSR3 methods as deprecated 91a86f8 [HttpKernel][Monolog] Add PSR-3 support to the LoggerInterface Discussion ---------- [HttpKernel][MonologBridge] PSR-3 support This enables PSR-3 support and monolog 1.3+. The first commit is the main part. The rest deals with deprecation of short-hand methods (warn/err/crit/emerg) that are fully expanded in PSR-3 (warning/error/critical/emergency). The downside of deprecating them is that for bundles it's a bit harder to support older and newer versions. If that is too much of a hassle you can drop that for now and cherry pick the first commit. The upside is that it forces people to move towards PSR-3 compatible stuff, which means eventually we could completely drop the LoggerInterface from the framework. In any case I think the documentation should only mention the `Psr\Log\LoggerInterface` and people should start hinting against that. The change should be done in core as well I suppose. Anyway I wanted to throw this out there as it is to get feedback. --------------------------------------------------------------------------- by stof at 2013-01-09T09:15:15Z @Seldaek I also think you should change the typehint to use the PSR LoggerInterface in all classes using the logger --------------------------------------------------------------------------- by Seldaek at 2013-01-09T09:54:55Z OK updated according to all the feedback. I tested it in an app and it still seems to work so there shouldn't be any major issues. --------------------------------------------------------------------------- by Seldaek at 2013-01-09T09:59:55Z @fabpot if you merge please merge also the bundle PR, otherwise it won't be possible to update without conflict. --------------------------------------------------------------------------- by frosas at 2013-01-10T14:59:20Z I'm trying to understand why a `composer update` of a Symfony 2.1.* resulted in a fatal error. Shouldn't a stable version don't break like this? As @olaurendeau points, why Symfony depends 1.* instead of 1.2.*? Or why Monolog 1.3 breaks its public interface (EDIT: I'm not sure about it)? Or why isn't this PR being merged (into branch 2.1) at the same time Monolog 1.3 is released? Please, understand I'm not looking for who to blame, it's just I want to know if this situation is unexpected or if otherwise a `composer update` on a stable branch is not as innocent as it seems. --------------------------------------------------------------------------- by stof at 2013-01-10T15:06:51Z @frosas it cannot be merged into 2.1 as it is a BC break. The 2.1 branch has been updated to forbid Monolog 1.3 already --------------------------------------------------------------------------- by Seldaek at 2013-01-10T15:11:58Z @frosas you can blame me for releasing as 1.3.0 and not 2.0, but technically for monolog this isn't really a BC break, I just added an interface. The problem is due to the way it's used in symfony, it ended up as a fatal error. In any case the situation is now sorted out I think. --------------------------------------------------------------------------- by frosas at 2013-01-10T15:26:43Z @stof now I see this `>=1.0,<1.3-dev` change in the 2.1 branch. Now, shouldn't a new (2.1.7) version be released for all of us not in the dev minimum-stability? @Seldaek then do you see feasible to rely only in X.Y.* versions to avoid this kind of errors? --------------------------------------------------------------------------- by Seldaek at 2013-01-10T15:45:22Z @frosas relying on X.Y.* is painful because you always need to wait until someone updates the constraint to get the new version. Of course using ~1.3 like in this PR means if I fuck up and break BC people will update to it, but that's a less likely occurrence than the alternative I think, so I would rather not use X.Y.* --------------------------------------------------------------------------- by frosas at 2013-01-10T15:50:50Z @Seldaek you are right about this, but I was thinking more in changing it only for the stable versions. EDIT: I mean, how often do you need a new feature in a branch you only apply fixes to? --------------------------------------------------------------------------- by stof at 2013-01-10T15:57:32Z @frosas Monolog and Symfony have separate release cycles. Foorcing Symfony users to use an old version of Monolog until they update to a new version of Symfony whereas the newer Monolog is compatible is a bad idea. Thus, as Monolog keeps BC, it does not maintain bugfix releases for all older versions (just like Twig does too). So it would also forbid you to get the fixes done in newer Monolog versions. The incompatibility between Symfony 2.1 LoggerInterface and PSR-3 (whereas they expect exactly the same behavior and signature for methods with the same name) is unfortunate and is the reason why we get some issues here. --------------------------------------------------------------------------- by frosas at 2013-01-10T16:21:06Z @stof I appreciate you prefer to allow newer versions at the price of having to be constantly monitoring its changes to avoid breaks. Another similar but safer strategy would be to stick to X.Y.* versions and upgrade to X.Y+1.* once the new version integration is tested, but I understand this is discutible in projects as close to Symfony as Monolog. Returning to the issue, what do you say to release this 2.1.7 version? Or is it only me who is having issues here? --------------------------------------------------------------------------- by stof at 2013-01-10T16:26:20Z @frosas a minor release should not break BC when following smeantic versionning (Symfony warned about the fact it is not strictly followed for the first releases of 2.x). But as far as monolog is concerned, 1.3 is BC with 1.2. --------------------------------------------------------------------------- by Seldaek at 2013-01-10T16:49:55Z @frosas sorry I didn't get you still had the problem. I tagged a 2.1.7 of monologbundle which hopefully fixes your issue.
| * | | | | | | Remove use of deprecated HttpKernel LoggerInterfaceJordi Boggiano2013-01-0920-20/+21
| | | | | | | |