Commit Graph

7985 Commits

Author SHA1 Message Date
Bernhard Schussek
d0faf5531d [Locale] Fixed: StubLocale::setDefault() throws no exception when "en" is passed 2013-08-24 16:25:01 +02:00
Bernhard Schussek
2b3dcb9171 [Translation] Grammar fix 2013-08-24 14:29:44 +02:00
Fabien Potencier
b2cbc67289 merged branch jfsimon/issue-8472 (PR #8841)
This PR was merged into the 2.2 branch.

Discussion
----------

[Yaml] fixed embedded folded string parsing

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8779

Commits
-------

566d79c [Yaml] fixed embedded folded string parsing
2013-08-24 08:58:46 +02:00
Jean-François Simon
566d79c2f8 [Yaml] fixed embedded folded string parsing 2013-08-24 08:36:00 +02:00
Fabien Potencier
33b0a177b5 [Validator] fixed Boolean handling in XML constraint mappings (closes #5603) 2013-08-23 17:55:54 +02:00
Fabien Potencier
6610a7c80e Merge branch '2.2' into 2.3
* 2.2:
  fixed request format when forwarding a request
  [HttpKernel] added a comment to warn about possible inconsistencies
  added a functional test for locale handling in sub-requests
  Fixed issue #6932 - Inconsistent locale handling in subrequests
  fixed locale of sub-requests when explicitely set by the developer (refs #8821)

Conflicts:
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
2013-08-23 17:31:47 +02:00
Fabien Potencier
2165d5dffb merged branch fabpot/format-forward (PR #8829)
This PR was merged into the 2.2 branch.

Discussion
----------

fixed request format when forwarding a request

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6932
| License       | MIT
| Doc PR        | n/a

When calling forward() in a controller, the format is not the same as for the master request.

Commits
-------

7e87eb1 fixed request format when forwarding a request
2013-08-23 17:30:05 +02:00
Fabien Potencier
dac6e3dfc2 merged branch fabpot/fragment-locale (PR #8822)
This PR was merged into the 2.2 branch.

Discussion
----------

fixed locale management in sub-requests

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6932, #5532, #8604
| License       | MIT
| Doc PR        | n/a

Same fix as #8821 but for `_locale`, and a rebase of #8604.

Commits
-------

7117328 [HttpKernel] added a comment to warn about possible inconsistencies
c4636e1 added a functional test for locale handling in sub-requests
05fdb12 Fixed issue #6932 - Inconsistent locale handling in subrequests
b3c3159 fixed locale of sub-requests when explicitely set by the developer (refs #8821)
2013-08-23 17:29:43 +02:00
Bernhard Schussek
0951b8de16 [Translation] Fixed regression: When only one rule is passed to transChoice(), this rule should be used 2013-08-23 17:24:14 +02:00
Fabien Potencier
39f59b0fe9 Merge branch '2.2' into 2.3
* 2.2:
  [Routing] fix phpdoc
  [Yaml] Fix comment containing a colon on a scalar line being parsed as a hash.
2013-08-23 17:14:07 +02:00
Fabien Potencier
599aab424a merged branch bschussek/form-submit-2.2 (PR #8827)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form][2.2] Fixed Form::submit() to react to dynamic form modifications

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

ref #3767, #3768, #4548, #8748
cc @Burgov

This PR ensures that fields that are added during the submission process of a form are submitted as well. For example:

```php
$builder = $this->createFormBuilder()
    ->add('country', 'choice', ...)
    ->getForm();

$builder->get('country')->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
    $form = $event->getForm()->getParent();
    $country = $event->getForm()->getData();

    $form->add('province', 'choice', /* ... something with $country ... */);
});
```

Currently, the field "province" will not be submitted, because the submission loop uses `foreach`, which ignores changes in the underyling array.

Additionally, this PR ensures that `setData()` is called on *every* element of a form (except those inheriting their parent data) when `setData()` is called on the root element (i.e., during initialization). Currently, when some of the intermediate nodes (e.g. embedded forms) are submitted with an empty value, `setData()` won't be called on the nodes below (i.e. the fields of the embedded form) until `get*Data()` is called on them. If `getData()` is *not* called before `createView()`, any effects of `*_DATA` event listeners attached to those fields will not be visible in the view.

Commits
-------

cd27e1f [Form] Extracted ReferencingArrayIterator out of VirtualFormAwareIterator
ccaaedf [Form] PropertyPathMapper::mapDataToForms() *always* calls setData() on every child to ensure that all *_DATA events were fired when the initialization phase is over (except for virtual forms)
19b483f [Form] Removed superfluous reset() call
00bc270 [Form] Fixed: submit() reacts to dynamic modifications of the form children
2013-08-23 17:11:03 +02:00
Tobias Schultze
ee3cb88ec7 [Routing] fix phpdoc 2013-08-23 16:06:02 +02:00
Bernhard Schussek
7a34d96dcd Merge branch 'form-submit-2.2' into form-submit-2.3
Conflicts:
	src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php
2013-08-23 13:18:39 +02:00
Bernhard Schussek
cd27e1facb [Form] Extracted ReferencingArrayIterator out of VirtualFormAwareIterator 2013-08-23 13:16:42 +02:00
Olivier
4563f1ba20 [Yaml] Fix comment containing a colon on a scalar line being parsed as a hash. 2013-08-22 15:12:42 +02:00
Fabien Potencier
7e87eb1fdf fixed request format when forwarding a request 2013-08-22 14:43:23 +02:00
Bernhard Schussek
3cb8a804f4 [Form] Added a test that ensures that setData() reacts to dynamic modifications of a form's children 2013-08-22 14:21:53 +02:00
Bernhard Schussek
07d14e5ff2 [Form] Removed exception in Button::setData(): setData() is now always called for all elements in the
form tree during the initialization of the tree
2013-08-22 14:19:04 +02:00
Bernhard Schussek
b9a37703a6 [Form] Removed call to deprecated method 2013-08-22 14:18:47 +02:00
Bernhard Schussek
878e27cd99 Merge branch 'form-submit-2.2' into form-submit-2.3
Conflicts:
	src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
2013-08-22 14:12:19 +02:00
Bernhard Schussek
ccaaedfcbb [Form] PropertyPathMapper::mapDataToForms() *always* calls setData() on every child to ensure
that all *_DATA events were fired when the initialization phase is over (except for virtual forms)
2013-08-22 14:10:15 +02:00
Bernhard Schussek
19b483f2ea [Form] Removed superfluous reset() call 2013-08-22 13:38:57 +02:00
Bernhard Schussek
5d60a4fa0a Merge branch 'form-submit-2.2' into form-submit-2.3
Conflicts:
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/Form/Tests/AbstractFormTest.php
	src/Symfony/Component/Form/Tests/CompoundFormTest.php
	src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php
2013-08-22 13:28:18 +02:00
Bernhard Schussek
00bc2708bc [Form] Fixed: submit() reacts to dynamic modifications of the form children 2013-08-22 13:20:04 +02:00
Fabien Potencier
7117328bd7 [HttpKernel] added a comment to warn about possible inconsistencies 2013-08-22 09:01:15 +02:00
Charles Sarrazin
05fdb12ad9 Fixed issue #6932 - Inconsistent locale handling in subrequests
The fix consists in passing the locale in the controller reference,
inside the routablefragment renderer.
2013-08-22 08:57:23 +02:00
Fabien Potencier
b3c31593c7 fixed locale of sub-requests when explicitely set by the developer (refs #8821) 2013-08-22 08:48:41 +02:00
Fabien Potencier
8e1cb3e3ca Merge branch '2.2' into 2.3
* 2.2:
  [Locale] fixed build-data exit code in case of an error
  fixed request format of sub-requests when explicitely set by the developer (closes #8787)
  Sets _format attribute only if it wasn't set previously by the user.
  Exclude little words of 'ee' to 'oo' plural transformation
  fixed the format of the request used to render an exception
  Fix typo in the check_path validator
  added a missing use statement (closes #8808)
  fix for Process:isSuccessful()

Conflicts:
	UPGRADE-3.0.md
	src/Symfony/Component/Locale/Resources/data/build-data.php
2013-08-22 08:42:25 +02:00
Fabien Potencier
1ad64ee7a3 merged branch fabpot/inline-fragment-format (PR #8821)
This PR was merged into the 2.2 branch.

Discussion
----------

Sets _format attribute only if it wasn't set previously by the user

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8787, #8791
| License       | MIT
| Doc PR        |

Commits
-------

9bb7a3d fixed request format of sub-requests when explicitely set by the developer (closes #8787)
fa35597 Sets _format attribute only if it wasn't set previously by the user.
2013-08-22 08:30:26 +02:00
Fabien Potencier
8ab368d104 merged branch fabpot/exception-format (PR #8819)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpKernel] Fix request _format duplication for HttpKernel's ExceptionListener

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8777, #8778
| License       | MIT

This is a better fix for #8777.

Commits
-------

f946108 fixed the format of the request used to render an exception
2013-08-22 08:27:52 +02:00
Fabien Potencier
b72bc0b257 [Locale] fixed build-data exit code in case of an error
When passing a message to the exit() function, PHP returns 0 instead of
an error code.
2013-08-22 08:25:58 +02:00
Fabien Potencier
9bb7a3ddcb fixed request format of sub-requests when explicitely set by the developer (closes #8787) 2013-08-22 07:46:12 +02:00
David Marín
fa35597755 Sets _format attribute only if it wasn't set previously by the user.
Fixes #8787
2013-08-22 07:45:36 +02:00
sumbobyboys
6453c1a018 Exclude little words of 'ee' to 'oo' plural transformation
The plural form of 'bee' and 'fee' are not 'foo' and 'boo'. In general words smaller than 3 letters doesn't change to a 'oo' form.
2013-08-22 06:15:06 +02:00
Fabien Potencier
f946108d65 fixed the format of the request used to render an exception 2013-08-22 05:11:17 +02:00
Fabien Potencier
5f7219e2ab added a missing use statement (closes #8808) 2013-08-21 22:48:51 +02:00
Fabien Potencier
78e5f47849 merged branch tgabi333/2.2 (PR #8815)
This PR was merged into the 2.2 branch.

Discussion
----------

[Process] fix for Process:isSuccessful()

| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes]
| Fixed tickets | []
| License       | MIT
| Doc PR        | []

This is a rebase of https://github.com/symfony/symfony/pull/8801

If you call isSuccessful() on a running process you would get true because of 0 == null. I think that is not the expected behavior and that is not what phpdoc @return block said so.

Commits
-------

262879d fix for Process:isSuccessful()
2013-08-21 17:32:30 +02:00
Tóth Gábor
262879d8b5 fix for Process:isSuccessful() 2013-08-21 16:50:47 +02:00
Jordi Boggiano
fd2f63382a Include untrusted host in the exception message 2013-08-21 12:06:02 +02:00
Fabien Potencier
4cfbdf11c3 Merge branch '2.2' into 2.3
* 2.2:
  [Process] Use a consistent way to reset data of the process latest run
  CS fix
  [HttpFoundation] Fixed removing a nonexisting namespaced attribute.
  [Validation] Fixed IdentityTranslator to pass correct Locale to MessageSelector
  SwiftMailerHandler in Monolog bridge now able to react to kernel.terminate event

Conflicts:
	src/Symfony/Component/Process/Process.php
2013-08-21 09:58:38 +02:00
Fabien Potencier
36b5d19d9d merged branch romainneutron/properties-reset (PR #8806)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Process] Use a consistent way to reset data of the process latest run

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT

It is actually useful when cloning or running again a process.

Commits
-------

0723c10 [Process] Use a consistent way to reset data of the process latest run
2013-08-21 09:09:53 +02:00
Romain Neutron
0723c10239 [Process] Use a consistent way to reset data of the process latest run
It is actually useful when cloning or running again a process.
2013-08-20 20:43:40 +02:00
Fabien Potencier
98e1795915 merged branch jakzal/bugfix/remove-nonexisting-attr-8387 (PR #8790)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpFoundation] Fixed removing a nonexisting namespaced attribute

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8387
| License       | MIT
| Doc PR        | -

Commits
-------

85a9c9d [HttpFoundation] Fixed removing a nonexisting namespaced attribute.
2013-08-19 16:06:24 +02:00
Jakub Zalas
85a9c9d114 [HttpFoundation] Fixed removing a nonexisting namespaced attribute. 2013-08-19 11:17:50 +01:00
Bernhard Schussek
191d3203d0 [Validation] Fixed IdentityTranslator to pass correct Locale to MessageSelector 2013-08-19 12:15:39 +02:00
Fabien Potencier
49eb608b72 Merge branch '2.2' into 2.3
* 2.2:
  fixed CS
  {HttpFoundation] [Session] fixed session compatibility with memcached/redis session storage
  fixed CS
  Fixes for hasParameterOption and getParameterOption methods of ArgvInput
2013-08-17 18:34:49 +02:00
Fabien Potencier
b46e0ad556 fixed CS 2013-08-17 18:32:21 +02:00
Tom Avery
99adcf1f6a {HttpFoundation] [Session] fixed session compatibility with memcached/redis session storage
Per https://bugs.php.net/bug.php?id=61470, and in fixing #7380, the following error occurs when using a Memcache or Redis session store w/ Symfony security: "Authentication exception occurred; redirecting to authentication entry point (A Token was not found in the SecurityContext.)".  This patch applies the first fix only if the session store is "files"

{HttpFoundation] [Session] fixed session compatibility with memcached/redis session storage

Per https://bugs.php.net/bug.php?id=61470, and in fixing #7380, the following error occurs when using a Memcache or Redis session store w/ Symfony security: "Authentication exception occurred; redirecting to authentication entry point (A Token was not found in the SecurityContext.)".  This patch applies the first fix only if the session store is "files"
2013-08-17 18:31:20 +02:00
Fabien Potencier
bd4488b5c8 fixed CS 2013-08-17 18:29:09 +02:00
Vasily Khayrulin
ab9a96b774 Fixes for hasParameterOption and getParameterOption methods of ArgvInput 2013-08-17 18:27:58 +02:00
Fabien Potencier
91e5b10d05 Merge branch '2.2' into 2.3
* 2.2:
  Added sleep() workaround for windows php rename bug
  [HttpKernel] removed unused variable

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-08-15 19:08:02 +02:00
Fabien Potencier
282b05cbc1 [HttpKernel] removed unused variable 2013-08-15 15:02:15 +02:00
Bernhard Schussek
c342715679 [Form] Fixed: Added "validation_groups" option to submit button 2013-08-15 14:37:02 +02:00
Romain Neutron
fa01e6b4d3 [Process] Fix for #8754 (Timed-out processes are successful) 2013-08-15 00:22:46 +02:00
Fabien Potencier
4af7276f89 merged branch romainneutron/fix-8742 (PR #8744)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix #8742 : Signal-terminated processes are not successful

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | require #8741 to be merged to pass tests
| Fixed tickets | #8742
| License       | MIT

Commits
-------

909fab6 [Process] Fix #8742 : Signal-terminated processes are not successful
2013-08-14 14:58:19 +02:00
Fabien Potencier
16413ffcc7 Merge branch '2.2' into 2.3
* 2.2:
  [Process] Revert change
  [Process] Fix #8746 : slowness added in unit tests since #8741
2013-08-14 14:57:12 +02:00
Romain Neutron
8c4bae3592 [Process] Revert change 2013-08-14 13:29:25 +02:00
Romain Neutron
8d9c7c6fae [Process] Fix #8746 : slowness added in unit tests since #8741 2013-08-14 12:41:24 +02:00
Romain Neutron
909fab6979 [Process] Fix #8742 : Signal-terminated processes are not successful 2013-08-14 12:31:50 +02:00
Fabien Potencier
11018011dd Merge branch '2.2' into 2.3
* 2.2:
  corrected English grammar (s/does not exists/does not exist)
  [Process] Add more precision to Process::stop timeout
  [Process] Avoid zombie process in case of unit tests failure
  [Process] Fix #8739
  [Process] Add failing test for #8739
  [Process] Fix CS
  Fixed documentation grammar for AuthenticationManagerInterface::authenticate()
  [Validator] fixed the wrong isAbstract() check against the class (fixed #8589)
  [TwigBridge] Prevent code extension to display warning
  Use strstr instead of strpos

Conflicts:
	src/Symfony/Component/Finder/Shell/Command.php
	src/Symfony/Component/Process/Process.php
2013-08-13 22:18:00 +02:00
Fabien Potencier
f6e664d9b9 merged branch romainneutron/process-callbacks-2.2 (PR #8741)
This PR was merged into the 2.2 branch.

Discussion
----------

[Process][2.2] Fix #8739

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8739
| License       | MIT

This adds a fix to #8739. Whenever a call is done to to any non-blocking methods (`Process::isRunning`, `Process::isStopped`, `Process::isTerminated`, `Process::getStatus`, `Process::getPid`...), buffers are read, and callback executed.

Such code will now work :

```
$process->start(function ($type, $data) {
    echo $data;
});

while ($process->isRunning()) {
    // some stuff
    // callback is executed
}
```

Commits
-------

fa769a2 [Process] Add more precision to Process::stop timeout
57d4159 [Process] Avoid zombie process in case of unit tests failure
3ef517b [Process] Fix #8739
7716fb2 [Process] Add failing test for #8739
bff6f3c [Process] Fix CS
2013-08-13 22:10:11 +02:00
Douglas Greenshields
d74eaf9603 corrected English grammar (s/does not exists/does not exist) 2013-08-13 20:56:24 +01:00
Romain Neutron
fa769a2c21 [Process] Add more precision to Process::stop timeout 2013-08-13 19:23:51 +02:00
Romain Neutron
57d4159133 [Process] Avoid zombie process in case of unit tests failure 2013-08-13 18:52:19 +02:00
Romain Neutron
3ef517b356 [Process] Fix #8739 2013-08-13 18:52:18 +02:00
Romain Neutron
7716fb25ab [Process] Add failing test for #8739 2013-08-13 18:22:32 +02:00
Romain Neutron
bff6f3c4a6 [Process] Fix CS 2013-08-13 18:22:25 +02:00
Jaik Dean
9a29e5bade Fixed documentation grammar for AuthenticationManagerInterface::authenticate() 2013-08-13 09:47:14 +02:00
marcj
18896d5a9e [Validator] fixed the wrong isAbstract() check against the class (fixed #8589) 2013-08-12 23:46:36 +02:00
Dmitrii Chekaliuk
96aec0f49c Fix internal sub-request creation
Fixes the creation of internal sub-request in case of disabled trusted
client-ip header
2013-08-11 19:29:22 +02:00
Fabien Potencier
2b2c1167ef merged branch jakzal/2.3-form-button-fix (PR #8349)
This PR was squashed before being merged into the 2.3 branch (closes #8349).

Discussion
----------

[Form] Moved auto_initialize option to the BaseType

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8162
| License       | MIT
| Doc PR        | -

I'm not fully confident in this change, so let someone review it before mergin please. My thinking was - since "auto_initialized" option is always passed to a form factory, it should be required by the base type.

Commits
-------

6ed0fdf [Form] Moved auto_initialize option to the BaseType
2013-08-09 14:45:16 +02:00
Jakub Zalas
6ed0fdfda4 [Form] Moved auto_initialize option to the BaseType 2013-08-09 14:45:15 +02:00
Lee Rowlands
2769c9dbb1 Use strstr instead of strpos 2013-08-09 09:16:43 +02:00
ShiraNai7
e47657dba1 Make sure ContextErrorException is loaded during compile time errors 2013-08-08 16:16:10 +02:00
Fabien Potencier
ffe5567955 merged branch EmmanuelVella/validators (PR #8577)
This PR was merged into the 2.3 branch.

Discussion
----------

Validators

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

This PR avoid comparison validators to be executed if the compared value is null.

Commits
-------

48338fc Ignore null value in comparison validators
2013-08-08 16:01:12 +02:00
Helmer Aaviksoo
98f6969e9c Fix empty process argument escaping on Windows 2013-08-08 14:56:07 +02:00
Joseph Bielawski
0d07af896b [BrowserKit] Pass headers when followRedirect() is called 2013-08-08 14:24:29 +02:00
Fabien Potencier
b463a70d73 Merge branch '2.2' into 2.3
* 2.2:
  added missing support for the new output API in PHP 5.4+
  Fixed bug introduced in #8675
  made the filesystem loader compatible with Twig 2.0
  bumped Symfony version to 2.2.6
  updated VERSION for 2.2.5
  update CONTRIBUTORS for 2.2.5
  updated CHANGELOG for 2.2.5
  replaced deprecated Twig features

Conflicts:
	src/Symfony/Bridge/Twig/Extension/FormExtension.php
	src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
	src/Symfony/Component/HttpKernel/Kernel.php
2013-08-08 14:02:32 +02:00
KUBO Atsuhiro
1a73b44df0 added missing support for the new output API in PHP 5.4+ 2013-08-08 14:01:00 +02:00
Fabien Potencier
879e271fb8 merged branch bschussek/icu51 (PR #8680)
This PR was merged into the 2.3 branch.

Discussion
----------

[Intl] Updated stubs to reflect ICU 51.2

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

In addition to the upgrade of the ICU component to ICU 51.2, this PR upgrades the stub classes to behave like their C counterparts do with ICU 51.2.

Commits
-------

8fa0453 [Intl] Updated stubs to reflect ICU 51.2
2013-08-08 12:59:14 +02:00
Fabien Potencier
6cc192957d bumped Symfony version to 2.3.4-DEV 2013-08-07 20:24:25 +02:00
Fabien Potencier
17aefe6c8e updated VERSION for 2.3.3 2013-08-07 19:11:16 +02:00
Fabien Potencier
1bd67a5221 bumped Symfony version to 2.2.6 2013-08-07 19:08:15 +02:00
Fabien Potencier
88a6833e17 updated VERSION for 2.2.5 2013-08-07 17:57:43 +02:00
Fabien Potencier
f8ffb80067 Merge branch '2.2' into 2.3
* 2.2:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
2013-08-07 16:02:06 +02:00
Fabien Potencier
b8b972fe74 Merge branch '2.1' into 2.2
* 2.1:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/HttpFoundation/Request.php
2013-08-07 16:00:53 +02:00
Fabien Potencier
31f0efd7bc Merge branch '2.0' into 2.1
* 2.0:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
2013-08-07 15:58:42 +02:00
Bernhard Schussek
8fa0453cfc [Intl] Updated stubs to reflect ICU 51.2 2013-08-06 15:22:18 +02:00
Jean-François Simon
c35cc5b900 added trusted hosts check 2013-08-06 09:14:49 +02:00
Fabien Potencier
3911cfa66f Merge branch '2.2' into 2.3
* 2.2:
  [Validator] fixed metadata serialization
  Fixed metadata serialization
2013-08-06 07:59:49 +02:00
Fabien Potencier
5d93815d84 Merge branch '2.1' into 2.2
* 2.1:
  [Validator] fixed metadata serialization
  Fixed metadata serialization
2013-08-06 07:59:38 +02:00
Fabien Potencier
5129d3f5d8 [Validator] fixed metadata serialization 2013-08-06 07:58:11 +02:00
Fabien Potencier
97fbb28f75 Merge branch '2.0' into 2.1
* 2.0:
  Fixed metadata serialization
2013-08-06 07:56:20 +02:00
Bernhard Schussek
6d555bc1a6 Fixed metadata serialization 2013-08-06 07:55:32 +02:00
Fabien Potencier
4de3a06f9b Merge branch '2.2' into 2.3
* 2.2:
  fix some file mode bug 755->644
2013-08-06 07:49:23 +02:00
bronze1man
addd560b0d fix some file mode bug 755->644 2013-08-06 10:31:28 +08:00
Fabien Potencier
fbb78ec62f merged branch jakzal/2.3-fragment-handler-fix (PR #8653)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Added a missing use statement

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Build was broken by #8572 merged into 2.3 and master.

Commits
-------

ccb497a [HttpKernel] Added a missing use statement.
2013-08-03 07:54:12 +02:00
Jakub Zalas
ccb497a553 [HttpKernel] Added a missing use statement.
Broken by #8572.
2013-08-03 00:18:34 +01:00
Jakub Zalas
9f3b1e128d [Process] Increased the timeout in a test to prevent random failures when travis is under a heavy load. 2013-08-02 22:51:01 +01:00
Fabien Potencier
00c0237efa fixed typo 2013-08-02 23:24:57 +02:00
Fabien Potencier
64535bbcb2 Merge branch '2.2' into 2.3
* 2.2:
  [HttpKernel] added a missing dep for dev
  [Form] fixed wrong call to setTimeZone() (closes #8644)
  Fix issue with \DateTimeZone::UTC / 'UTC' for PHP 5.4
  [Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser
  [routing] added ability for apache matcher to handle array values
  removed dead code and fixed CS
  [Validator] fixed StaticMethodLoader trying to invoke methods of abstract classes (closes #8589)

Conflicts:
	src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php
	src/Symfony/Component/Form/FormConfigBuilder.php
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Validator/Tests/GraphWalkerTest.php
2013-08-02 22:53:38 +02:00
Fabien Potencier
e18f3edb6a moved some fixed dep versions from 2.2.* to ~2.2 (refs #8613) 2013-08-02 15:48:04 +02:00
Fabien Potencier
a741414a5a [HttpKernel] added a missing dep for dev 2013-08-02 15:42:49 +02:00
Fabien Potencier
ef69619614 merged branch bschussek/issue8111 (PR #8638)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fixed patched forms to be valid even if children are not submitted

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8111
| License       | MIT
| Doc PR        | -

#8362 was reverted because it introduces a failing test that is caused by a regression. This PR takes the alternative approach that

* unsubmitted fields in the PATCH request remain unsubmitted
* `isValid()` ignores unsubmitted children
* `mapFormsToData()` ignores unsubmitted children

In my opinion this is a more proper solution than #8362.

Commits
-------

85330a6 [Form] Fixed patched forms to be valid even if children are not submitted
50f201e Revert "[Form] Fix of "PATCH'ed forms are never valid""
2013-08-02 15:20:14 +02:00
Fabien Potencier
adca1ef5cc merged branch bschussek/issue8385 (PR #8636)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fixed: If a form is not present in a request, it is not automatically submitted

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8385
| License       | MIT
| Doc PR        | -

This PR changes the following behavior of `handleRequest()`:

Current behavior:

```php
$_POST = array('foo' => 'bar');
$form = $factory->createNamed('myform', 'mytype');

// "myform" is not present in the request
$form->handleRequest();

assert(true === $form->isSubmitted());
```

Behavior after PR:

```php
$_POST = array('foo' => 'bar');
$form = $factory->createNamed('myform', 'mytype');

// "myform" is not present in the request
$form->handleRequest();

assert(false === $form->isSubmitted());
```

As #8385 pointed out, the latter behavior is expected, so I consider the current behavior a bug.

Commits
-------

cb5e765 [Form] Fixed: If a form is not present in a request, it is not automatically submitted
2013-08-02 15:19:16 +02:00
Fabien Potencier
888a2e4a64 merged branch langj/readme-link-fix (PR #8632)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixes link indices

Fixes links in the symfony/intl README.md

Commits
-------

d1e5710 Fixes link indices
2013-08-02 15:14:22 +02:00
Fabien Potencier
e82a44ba99 merged branch bschussek/issue8526 (PR #8622)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser

| Q             | A
| ------------- | ---
| Bug fix?      | yes (together with #8623)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7678 #8478 #8526
| License       | MIT
| Doc PR        | -

Commits
-------

97cbb19 [Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser
2013-08-02 15:12:51 +02:00
Fabien Potencier
3d5d8edbb5 merged branch jfsimon/issue-8567 (PR #8608)
This PR was merged into the 2.2 branch.

Discussion
----------

[Routing] add ability for apache matcher to handle array values

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8567

Commits
-------

c138304 [routing] added ability for apache matcher to handle array values
2013-08-02 15:06:40 +02:00
Fabien Potencier
cd51d822b1 [Form] fixed wrong call to setTimeZone() (closes #8644) 2013-08-02 15:04:40 +02:00
Bob den Otter
5c359a87f9 Fix issue with \DateTimeZone::UTC / 'UTC' for PHP 5.4 2013-08-02 13:14:00 +02:00
Bernhard Schussek
85330a6863 [Form] Fixed patched forms to be valid even if children are not submitted 2013-08-01 18:07:41 +02:00
Bernhard Schussek
50f201ec64 Revert "[Form] Fix of "PATCH'ed forms are never valid""
This reverts commit a2b15359d8.

Conflicts:
	src/Symfony/Component/Form/Form.php

The commit is reverted because it introduces a bug demonstrated by a currently failing test.
2013-08-01 17:40:17 +02:00
Bernhard Schussek
cb5e765f58 [Form] Fixed: If a form is not present in a request, it is not automatically submitted 2013-08-01 17:20:43 +02:00
Jörn Lang
d1e571004d Fixes link indices 2013-08-01 14:40:45 +02:00
Bernhard Schussek
97cbb19bce [Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser 2013-08-01 10:41:32 +02:00
Bernhard Schussek
dbd14fc78f Revert "[Form] Remove "value" attribute on empty_value option"
This reverts commit 9e849eb78b.

Reasons for the revert:

* https://github.com/symfony/symfony/issues/8478
* https://github.com/symfony/symfony/issues/8526
2013-08-01 10:34:30 +02:00
Jean-François Simon
c138304823 [routing] added ability for apache matcher to handle array values 2013-07-30 13:22:46 +02:00
Fabien Potencier
b970d172cb merged branch fabpot/dead-code (PR #8572)
This PR was merged into the 2.2 branch.

Discussion
----------

removed dead code and fixed CS

| 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
-------

7d58147 removed dead code and fixed CS
2013-07-28 22:42:16 +02:00
Fabien Potencier
7d581471ce removed dead code and fixed CS 2013-07-28 20:26:16 +02:00
Fabien Potencier
b41cf82651 [Validator] fixed StaticMethodLoader trying to invoke methods of abstract classes (closes #8589) 2013-07-28 20:24:29 +02:00
Fabien Potencier
9d53905b88 Merge branch '2.2' into 2.3
* 2.2:
  return 0 if there is no valid data
  [Tests] Tests on php 5.5 should pass
  [Twig] fixed TwigEngine::exists() method when a template contains a syntax error (closes #88546)
2013-07-27 07:01:40 +02:00
Fabien Potencier
de1915f405 merged branch Flask/ticket_8548 (PR #8575)
This PR was squashed before being merged into the 2.3 branch (closes #8575).

Discussion
----------

[Form] fixes empty file-inputs get treated as extra field

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8548, #8566
| License       | MIT

Commits
-------

e5fba3c [Form] fixes empty file-inputs get treated as extra field
2013-07-26 13:48:41 +02:00
Flavian Sierk
e5fba3cf83 [Form] fixes empty file-inputs get treated as extra field 2013-07-26 13:48:40 +02:00
Dominik Zogg
3553c71d1a return 0 if there is no valid data 2013-07-25 19:15:09 +02:00
Fabien Potencier
364ccd1cb3 merged branch bronze1man/PR-setLazy-parent-2.3 (PR #8573)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] setLazy not work on DefinitionDecorator

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8570
| License       | MIT
| Doc PR        | n/a

Commits
-------

970ce2c [DependencyInjection] fixed #8570
2013-07-25 19:13:25 +02:00
Fabien Potencier
7dc211a263 merged branch fabpot/null-services (PR #8582)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] fixed regression where setting a service to null did not trigger a re-creation of the service when getting it (closes #8392)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8392
| License       | MIT
| Doc PR        | n/a

Commits
-------

50d0727 [DependencyInjection] fixed regression where setting a service to null did not trigger a re-creation of the service when getting it
2013-07-25 19:04:05 +02:00
Fabien Potencier
50d0727477 [DependencyInjection] fixed regression where setting a service to null did not trigger a re-creation of the service when getting it 2013-07-25 17:41:27 +02:00
Emmanuel Vella
48338fcf10 Ignore null value in comparison validators 2013-07-25 14:05:03 +02:00
bronze1man
970ce2c413 [DependencyInjection] fixed #8570 2013-07-25 13:55:15 +08:00
Fabien Potencier
2e2a36ca24 fixed file permission 2013-07-24 19:57:25 +02:00
Fabien Potencier
b45f18b81d Merge branch '2.2' into 2.3
* 2.2:
  [Validator] fixed ConstraintViolation:: incorrect when nested
  handle Optional and Required constraints from XML or YAML sources correctly
  added missing comments to WebTestCase
  Fixed #8455: PhpExecutableFinder::find() does not always return the correct binary
  [DependencyInjection] Fix Container::camelize to convert beginning and ending chars
  [Validator] Fixed groups argument misplace for validateValue method from validator class

Conflicts:
	src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php
	src/Symfony/Component/Validator/Tests/GraphWalkerTest.php
2013-07-21 22:18:49 +02:00
Fabien Potencier
a67c137278 merged branch venu/ticket_8351#2.2 (PR #8421)
This PR was squashed before being merged into the 2.2 branch (closes #8421).

Discussion
----------

[Validator] fixed ConstraintViolation::$propertyPath incorrect when nested

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8351
| License       | MIT

In nested constraints, the property path will be overwritten in the context (as there would be a recursive call to CollectionValidotor when nested). Reason is, in ConstraintValidatorFactory object is loaded from memory if exists and context is initialized with the new context. So, other constraints after the nested constraints PropertyPath would be wrong.

So I think better create a new object for CollectionValidator always.

see this https://gist.github.com/alexkappa/5851274
It shows [name][email] even though the email is not under the name node.

Commits
-------

28e0709 [Validator] fixed ConstraintViolation:: incorrect when nested
2013-07-21 22:10:38 +02:00
Venu
28e070974a [Validator] fixed ConstraintViolation:: incorrect when nested 2013-07-21 22:10:37 +02:00
Fabien Potencier
9d98c417ec merged branch biozshock/patch-form-fix (PR #8362)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fix of "PATCH'ed forms are never valid". Fixes #8111

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8111
| License       | MIT

Commits
-------

a2b1535 [Form] Fix of "PATCH'ed forms are never valid"
2013-07-21 21:54:59 +02:00
Christian Flothmann
890934d33d handle Optional and Required constraints from XML or YAML sources correctly 2013-07-21 21:45:37 +02:00
Fabien Potencier
810cf3f332 merged branch venu/groups_argument_fix (PR #8422)
This PR was merged into the 2.2 branch.

Discussion
----------

[Validator] Fixed groups argument misplace for validateValue method from validator class

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT

Signature of validateValue method in ExecutionContext Class is this.
```
public function validateValue($value, $constraints, $subPath = '', $groups = null)
```

But this was called wrongly in Validator Class.

Commits
-------

d3eb9b7 [Validator] Fixed groups argument misplace for validateValue method from validator class
2013-07-21 21:21:34 +02:00
Patrick Allaert
a2eca45051 Fixed #8455: PhpExecutableFinder::find() does not always return the correct binary 2013-07-21 14:15:26 +02:00
Martin Hasoň
4146587ce7 Added missing files .gitignore 2013-07-21 14:12:18 +02:00
Jérôme Tamarelle
485d53aead [DependencyInjection] Fix Container::camelize to convert beginning and ending chars
To convert a service ID exactly like Container::get
2013-07-21 11:38:59 +02:00
Fabien Potencier
183796312d Merge branch '2.2' into 2.3
* 2.2:
  [PropertyAccess] added moves to pluralMap
  [Security] fixed issue where authentication listeners clear unrelated tokens
  fix issue #8499 modelChoiceList call getPrimaryKey on a non object
  [DependencyInjection] Add exception for service name not dumpable in PHP

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
	src/Symfony/Component/Security/Tests/Http/Firewall/BasicAuthenticationListenerTest.php
2013-07-20 09:42:02 +02:00
Fabien Potencier
017c44d2c3 merged branch GromNaN/2.3-di-dump-exception (PR #8524)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection][2.3] Add exception for service name not dumpable in PHP

Same as #8494 for branch 2.3 since the DI component has been refactored (bb797ee755, f1c2ab78af)

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8485 #8030
| License       | MIT
| Doc PR        | n/a

Throws an exception when the DIC is dumped to PHP, before generating invalid PHP.
The regex comes from the PHP doc: http://www.php.net/manual/en/language.oop5.basic.php

Commits
-------

9ac3556 [DependencyInjection] Add exception for service name not dumpable in PHP
2013-07-20 09:33:53 +02:00
Fabien Potencier
4970770d9c merged branch GromNaN/di-dump-exception (PR #8494)
This PR was merged into the 2.2 branch.

Discussion
----------

[DependencyInjection] Add exception for service name not dumpable in PHP

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8485 #8030
| License       | MIT
| Doc PR        | n/a

Throws an exception when the DIC is dumped to PHP, before generating invalid PHP.
The regex comes from the PHP doc: http://www.php.net/manual/en/language.oop5.basic.php

Commits
-------

242b318 [DependencyInjection] Add exception for service name not dumpable in PHP
2013-07-20 09:33:16 +02:00
Fabien Potencier
c3d7eb967c merged branch alcaeus/ticket_8226 (PR #8528)
This PR was merged into the 2.2 branch.

Discussion
----------

[Security] fixed issue where x509 authentication clears unrelated tokens

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8226
| License       | MIT
| Doc PR        | symfony/symfony-docs#2825
| Notes          | Replaces PR #8283

TODO:
- [x] Feedback on change to make sure security is not affected
- [x] Fix other authentication listeners (they suffer the same problem)
- [x] Write unit tests for bug and maybe a few listener classes as well

This pull request is the summary of the problem mentioned in the ticket above.
It only fixes the "disappearing token" problem for one authentication provider, not all. If acceptable, the change needs to be applied to all authentication listeners since they always clear all tokens from the security context.

Commits
-------

2317443 [Security] fixed issue where authentication listeners clear unrelated tokens
2013-07-20 08:54:49 +02:00
Ian Phillips
d6cafcd63c [PropertyAccess] added moves to pluralMap 2013-07-19 16:05:19 -07:00
alcaeus
2317443708 [Security] fixed issue where authentication listeners clear unrelated tokens
This commit fixes an issue where authentication listeners clear all security tokens in case of authentication failure.
This behavior makes it impossible to combine certain authentication mechanisms, notably x509 with form-based login.
2013-07-19 23:56:43 +02:00
lancergr
658579a5c3 added greek translation 2013-07-19 12:20:37 +02:00
Jérôme Tamarelle
9ac3556825 [DependencyInjection] Add exception for service name not dumpable in PHP 2013-07-19 09:14:04 +02:00
Fabien Potencier
40f7e6875f bumped Symfony version to 2.3.3-DEV 2013-07-17 10:47:37 +02:00
Fabien Potencier
b82eb2f371 updated VERSION for 2.3.2 2013-07-17 08:22:21 +02:00
Fabien Potencier
a3fbf0082d Merge branch '2.2' into 2.3
* 2.2:
  fixed typo
  bumped Symfony version to 2.2.5
  updated VERSION for 2.2.4
  update CONTRIBUTORS for 2.2.4
  updated CHANGELOG for 2.2.4
  Fixed NativeSessionStorage:regenerate when does not exists
  removed extraneous whitespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-07-17 07:57:53 +02:00
Jérôme Tamarelle
242b3184b9 [DependencyInjection] Add exception for service name not dumpable in PHP 2013-07-16 14:47:20 +02:00
Fabien Potencier
ddebe064db fixed typo 2013-07-16 10:48:55 +02:00
Fabien Potencier
002d9e80e9 bumped Symfony version to 2.2.5 2013-07-15 22:44:57 +02:00
Fabien Potencier
76f918a125 updated VERSION for 2.2.4 2013-07-15 14:28:01 +02:00
Grégoire Pineau
52e530da1f Fixed NativeSessionStorage:regenerate when does not exists 2013-07-15 14:12:07 +02:00
Fabien Potencier
adde057877 removed extraneous whitespaces 2013-07-13 21:08:31 +02:00
Fabien Potencier
c2c156835f Merge branch '2.2' into 2.3
* 2.2:
  Reverts JSON_NUMERIC_CHECK
  Just a Typo
  [Yaml] removed wrong comment removal inside a string block
  Fixing configuration validation error messages.
  [HtppKernel] fixed inline fragment renderer
  fixed inline fragment renderer
  ProgressHelper shows percentage complete.
  Comment fixed: RedrawFrequency is measured in steps.
  fix handling of a default 'template' as a string

Conflicts:
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
2013-07-11 21:36:36 +02:00
Brian Corrigan
bb59f40178 Reverts JSON_NUMERIC_CHECK
We shouldn't be coercing types.
2013-07-11 21:34:16 +02:00
Moritz Borgmann
306b704bb0 Just a Typo 2013-07-11 17:52:51 +02:00
Fabien Potencier
81a49c638a merged branch jfsimon/issue-8145 (PR #8472)
This PR was merged into the 2.2 branch.

Discussion
----------

[Yaml] removed wrong comment removal inside a string block

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8145
| License       | MIT
| Doc PR        | none

Commits
-------

9c5f8c6 [Yaml] removed wrong comment removal inside a string block
2013-07-11 17:50:16 +02:00
Fabien Potencier
577bc82b02 merged branch jfsimon/issue-8450 (PR #8468)
This PR was merged into the 2.2 branch.

Discussion
----------

[HtppKernel] fixed inline fragment renderer

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8450
| License       | MIT
| Doc PR        | none

Commits
-------

2dc1ee0 [HtppKernel] fixed inline fragment renderer
2013-07-11 17:49:50 +02:00
Jean-François Simon
9c5f8c6b96 [Yaml] removed wrong comment removal inside a string block 2013-07-11 11:28:01 +02:00
Paul Seiffert
aaa40e5902 Fixing configuration validation error messages.
The min and max validation functions lead to incorrect error messages.
2013-07-10 16:03:01 +02:00
Jean-François Simon
2dc1ee04b4 [HtppKernel] fixed inline fragment renderer 2013-07-10 16:02:46 +02:00
Jean-François Simon
06b69b859a fixed inline fragment renderer 2013-07-10 09:34:46 +02:00
Fabien Potencier
ce2fae1953 merged branch reenl/fix-round-issues (PR #8447)
This PR was merged into the 2.2 branch.

Discussion
----------

[Console] Show completed percentage, not a rounded value.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This pull request has 2 minor changes:
- 199/200 => 99% instead of 100% (there was no test case and I added one, everything else passes) In the past the value was rounded, the progress bar ended up being 100% for 0.5% of the total execution time. That means 18 seconds on a 1 hour process.
- Fixed the comments to match the inner workings of RedrawFrequency.

First Symfony PR and second overall so hope I just did this the right way.

PR #8419 Rebased for 2.2

Commits
-------

91bb757 ProgressHelper shows percentage complete.
40591b9 Comment fixed: RedrawFrequency is measured in steps.
2013-07-08 16:59:54 +02:00
Fabien Potencier
2d61ebf26b merged branch lsmith77/fix_include_default_text (PR #8445)
This PR was merged into the 2.2 branch.

Discussion
----------

Fix include default text

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: [![Build Status](https://travis-ci.org/lsmith77/symfony.png?branch=fix_include_default_text)](https://travis-ci.org/lsmith77/symfony)
Fixes the following tickets: -
License of the code: MIT

Commits
-------

9d1004b fix handling of a default 'template' as a string
2013-07-08 16:43:11 +02:00
Reen Lokum
91bb7578c2 ProgressHelper shows percentage complete.
In the past the value was rounded, the progressbar ended up being 100% for 0.5%
of the total execution time. That means 18 seconds on a 1 hour process.
2013-07-08 16:34:53 +02:00
Reen Lokum
40591b92c8 Comment fixed: RedrawFrequency is measured in steps. 2013-07-08 16:24:02 +02:00
Fabien Potencier
686bbb61c4 Merge branch '2.2' into 2.3
* 2.2:
  Update JsonResponse.php
  [HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124)
  [WebProfiler] fix content-type parameter
  Replace romaji period characters with Japanese style zenkaku period characters
  Passed the config when building the Configuration in ConfigurableExtension

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
2013-07-08 15:36:15 +02:00
Lukas Kahwe Smith
9d1004b59e fix handling of a default 'template' as a string 2013-07-08 15:32:00 +02:00
Sorin Gitlan
218bb907ef Update JsonResponse.php
Added JSON_NUMERIC_CHECK flag to fix issues when json response is used in JavaScript apps and especially in AngularJS.
2013-07-08 15:12:21 +02:00
Fabien Potencier
4efac29ba2 merged branch fabpot/removed-unused-code (PR #8440)
This PR was merged into the 2.3 branch.

Discussion
----------

removed unused code

| 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
-------

c60bdf5 removed unused code
2013-07-08 15:00:35 +02:00
Fabien Potencier
82dbaee06d [HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124) 2013-07-08 11:12:10 +02:00
entering
4d2051c1d4 CookieJar remove unneeded var, Client remove unneeded else 2013-07-07 17:48:29 +02:00
WouterJ
8bb4e4d332 [DI] Fixed bug requesting non existing service from dumped frozen container 2013-07-07 17:47:47 +02:00
Venu
d3eb9b7041 [Validator] Fixed groups argument misplace for validateValue method from validator class 2013-07-04 23:18:29 +05:30
František Bereň
ab9e3eede1 Update validators.sk.xlf 2013-07-03 12:44:49 +02:00
Fabien Potencier
41f5c184b7 merged branch stof/config_argument (PR #8359)
This PR was merged into the 2.2 branch.

Discussion
----------

Passed the config when building the Configuration in ConfigurableExtension

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

This passes the config to ``getConfiguration`` instead of passing an empty array in ConfigurableExtension. This makes the class usable for bundle overwriting the ``getConfiguration`` method to use the config instead of using the default logic (which does not need the config).

Commits
-------

a830001 Passed the config when building the Configuration in ConfigurableExtension
2013-07-02 14:49:11 +02:00
Warwick
b602544bf7 Replace romaji period characters with Japanese style zenkaku period characters
Found 4 of the Japanese translations inconsistently used romaji style periods. Replaced with zenkaku periods.
2013-07-02 09:41:45 +02:00
Joseph Bielawski
d400b5a1fd Return BC compatibility for @Route parameters and default values 2013-07-01 15:05:54 +02:00
Fabien Potencier
4c0bfd3313 fixed CS 2013-07-01 14:24:43 +02:00
Fabien Potencier
af101a5a63 Merge branch '2.2' into 2.3
* 2.2:
  fixed CS
  typo first->second
  Fixed variable name used in translation cache

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
	src/Symfony/Component/CssSelector/Node/FunctionNode.php
	src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
2013-07-01 14:17:23 +02:00
Fabien Potencier
fdf2d6228c fixed CS 2013-07-01 14:15:46 +02:00
Jakub Zalas
e46fd4e8fa [Console] Avoided an unnecessary check.
It only makes sense to do the second check if the --no-interaction
option was not passed.

Running posix_isatty() raises a warning with some stream types (like MEMORY).
With this patch, warning could be avoided by passing the --no-interaction option.
2013-06-30 20:29:21 +02:00
Christophe Coevoet
0cc8872cab Added missing French validator translations 2013-06-27 13:04:11 +02:00
Artem Lopata
a2b15359d8 [Form] Fix of "PATCH'ed forms are never valid"
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8111
| License       | MIT
2013-06-27 09:49:09 +03:00
Luis Cordova
1b0f69373c typo first->second 2013-06-27 08:12:14 +02:00
Christophe Coevoet
a830001ca3 Passed the config when building the Configuration in ConfigurableExtension 2013-06-26 14:56:23 +02:00
Fabien Potencier
c60bdf5459 removed unused code 2013-06-26 10:36:28 +02:00
Fabien Potencier
d7999d7108 Merge branch '2.2' into 2.3
* 2.2:
  [Form] fixed INF usage which does not work on Solaris (closes #8246)
  Fix grammar
  bumped Symfony version to 2.2.4
  updated VERSION for 2.2.3
  update CONTRIBUTORS for 2.2.3
  updated CHANGELOG for 2.2.3
  [Process] Disable exception on stream_select timeout
  [HttpFoundation] fixed issue with session_regenerate_id (closes #7380)
  [DomCrawler] added a note about the default charset
  [Console] fixed regression when calling a command foo:bar if there is another one like foo:bar:baz (closes #8245)
  force the Content-Type to html in the web profiler controllers

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-06-23 10:16:02 +02:00
Fabien Potencier
c875d0aae1 [Form] fixed INF usage which does not work on Solaris (closes #8246) 2013-06-23 09:35:41 +02:00
Michael Squires
a2e440a52c Fix grammar 2013-06-23 08:56:04 +02:00
Jakub Zalas
349218692e [Intl] Fixed tests failing on PHP 5.5 2013-06-21 09:19:25 +01:00
Fabien Potencier
5b14665964 bumped Symfony version to 2.2.4 2013-06-19 15:03:30 +02:00
Fabien Potencier
74a033d95b updated VERSION for 2.2.3 2013-06-19 14:09:49 +02:00
Jakub Zalas
494e8035ad [DependencyInjection] Replaced try/catch block with an @expectedException annotation in a test. 2013-06-17 14:32:29 +01:00
Fabien Potencier
caaaec3155 [CssSelector] tweaked README file (closes #8287) 2013-06-17 09:15:51 +02:00
Jean-François Simon
0cb95e07ac added a node about HTML extension in readme 2013-06-17 09:13:34 +02:00
Jakub Zalas
ab1439eb32 [Console] Fixed the table rendering with multi-byte strings. 2013-06-15 18:55:04 +01:00