Commit Graph

13536 Commits

Author SHA1 Message Date
Stéphane PY
b949c49f26 [2.4][HttpKernel] Fix issue #10209
When the profiler has `only_exception` option activated and a subrequest
throw an exception, the parent profile cannot be found.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT
2014-02-18 11:56:22 +01:00
Fabien Potencier
82d9a76996 bumped Symfony version to 2.4.3 2014-02-12 22:00:41 +01:00
Fabien Potencier
b70633f92f updated VERSION for 2.4.2 2014-02-12 20:27:03 +01:00
Fabien Potencier
a6b1247689 fixed various inconsistencies 2014-02-11 16:39:28 +01:00
Fabien Potencier
e2ac5dfc78 Merge branch '2.3' into 2.4
* 2.3:
  fixed various inconsistencies
  reduced recursion when building DumperPrefixCollection
  renamed variables - making next change more readable
  removing dead code.
  [DomCrawler] Fixed filterXPath() chaining
  [DomCrawler] Fixed incorrect handling of image inputs

Conflicts:
	src/Symfony/Component/DomCrawler/Crawler.php
	src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
	src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
	src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
	src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php
	src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
2014-02-11 14:52:09 +01:00
Fabien Potencier
eb3f6c6efb fixed various inconsistencies 2014-02-11 11:29:24 +01:00
Arnaud Le Blanc
979d5c0229 reduced recursion when building DumperPrefixCollection 2014-02-10 15:33:09 +01:00
Arnaud Le Blanc
e0cf2440e9 renamed variables - making next change more readable 2014-02-10 15:33:09 +01:00
inalgnu
fdecc69e98 removing dead code. 2014-02-10 15:31:47 +01:00
Fabien Potencier
4ab78e0561 minor #10222 [ExpressionLanguage] added some documentation about functions (fabpot)
This PR was merged into the 2.4 branch.

Discussion
----------

[ExpressionLanguage] added some documentation about functions

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

This adds documentation about how to define a function in the expression language.

Commits
-------

600d481 [ExpressionLanguage] added some documentation about functions
2014-02-10 15:27:45 +01:00
Fabien Potencier
d8f55f5872 [ExpressionLanguage] added some tests for the built-in constant() function 2014-02-10 08:08:57 +01:00
Fabien Potencier
600d48162a [ExpressionLanguage] added some documentation about functions 2014-02-10 07:34:14 +01:00
Robbert Klarenbeek
43a771614c [DomCrawler] Fixed filterXPath() chaining 2014-02-05 17:30:33 +01:00
Robbert Klarenbeek
816cf179ee [DomCrawler] Fixed incorrect handling of image inputs 2014-02-04 21:33:58 +01:00
Fabien Potencier
aca1686895 Merge branch '2.3' into 2.4
* 2.3:
  added missing @deprecated tag
  Fixed recursion level incrementing in FlattenException::flattenArgs().
  [HttpKernel] fixed wrong reference in TraceableEventDispatcher

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
2014-02-04 11:54:30 +01:00
Fabien Potencier
6a4d765c43 bug #10191 [HttpKernel] fixed wrong reference in TraceableEventDispatcher (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] fixed wrong reference in TraceableEventDispatcher

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

This PR fixes #9748 and #9727 by removing the `id` state. Only private method signatures have been changed, so that qualifies for a fix in 2.3.

The `getNotCalledListeners()` is a bit special as it tries to get non-called listeners. It passes `null` as the event id as if a listener has been called more than once, getting the first call is enough.

Commits
-------

acd3317 [HttpKernel] fixed wrong reference in TraceableEventDispatcher
2014-02-04 08:14:12 +01:00
Fabien Potencier
fefd4df4a5 added missing @deprecated tag 2014-02-04 08:13:29 +01:00
sun
de32b8e3b9 Fixed recursion level incrementing in FlattenException::flattenArgs(). 2014-02-04 08:06:39 +01:00
Fabien Potencier
3d91128d05 Merge branch '2.3' into 2.4
* 2.3:
  $default can be string
  Fix wording for Process class documentation
  Option can be bool too (eg. --force)
  [Form] Update DateTime objects only if the actual value has changed
  Revert "bug #10091 [Translation] Update PluralizationRules.php (guilhermeblanco)"
  [HttpFoundation] fixed typo
  Added delta for Request comparison
  add zh_TW validator translations
  Added Bulgarian translation for security component
2014-02-03 18:15:33 +01:00
Fabien Potencier
acd3317de8 [HttpKernel] fixed wrong reference in TraceableEventDispatcher 2014-02-03 18:13:40 +01:00
Jacques Moati
7e389fe955 $default can be string 2014-02-03 07:37:35 +01:00
lol768
905f2a091b Fix wording for Process class documentation 2014-02-02 16:17:32 +01:00
Jacques Moati
418429275d Option can be bool too (eg. --force) 2014-02-01 19:08:59 +01:00
Fabien Potencier
e973fa45f5 bug #10151 [Form] Update DateTime objects only if the actual value has changed (peterrehm)
This PR was squashed before being merged into the 2.3 branch (closes #10151).

Discussion
----------

[Form] Update DateTime objects only if the actual value has changed

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

Right now the Form component replaces DateTime fields with new Objects, therefore the hash is changing.
This leads to unnecessary database updated when working with doctrine. With this patch the DateTime object
of the actual entity is only replaced if the value has been changed.

Commits
-------

1f22d3a [Form] Update DateTime objects only if the actual value has changed
2014-01-29 07:46:08 +01:00
Peter Rehm
1f22d3a564 [Form] Update DateTime objects only if the actual value has changed 2014-01-29 07:46:08 +01:00
Fabien Potencier
c476d13b57 Revert "bug #10091 [Translation] Update PluralizationRules.php (guilhermeblanco)"
This reverts commit 61625b466d, reversing
changes made to 3558588891.
2014-01-28 16:54:04 +01:00
Fabien Potencier
625a4b9650 [HttpFoundation] fixed typo 2014-01-28 16:07:56 +01:00
Sébastien Lavoie
72d45839f0 Added delta for Request comparison
Sometimes, tests are failing because REQUEST_TIME
changes between the creation of the various sub-requests.

By using delta, we allow maximum of second of difference.

Example: https://travis-ci.org/symfony/symfony/jobs/17668158#L511
2014-01-27 08:59:15 +01:00
Fabien Potencier
0cb789a369 minor #10144 [Validator][Translation] add zh_TW validator translations (RickySu)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator][Translation] add zh_TW validator translations

add Traditional Chinese validator translations.

Commits
-------

c755e85 add zh_TW validator translations
2014-01-27 08:55:41 +01:00
Ricky Su
c755e85a39 add zh_TW validator translations 2014-01-27 09:55:33 +08:00
Roumen Damianoff
e9cc2283c8 Added Bulgarian translation for security component 2014-01-26 22:34:10 +01:00
Fabien Potencier
6c11d55b06 Merge branch '2.3' into 2.4
* 2.3:
  fixed CS
  allow the TextAreaFormField to be used with valid/invalid HTML
  Create security.id.xlf
  [DependencyInjection] Remove unneeded file
  [Twig] removed obsolete conditions on Twig versions
  added lines to exceptions for the trans and transchoice tags
  [Form] Make FormInterface::add docblock more explicit
  [Security] Add zh_CN translations
  [Validator][Translation]update zh_CN translations
  [Validator] Minor fix in XmlLoader
2014-01-26 22:33:04 +01:00
Fabien Potencier
9b27d8a7a9 fixed CS 2014-01-26 22:32:47 +01:00
Daniel Wehner
3db1b10efd allow the TextAreaFormField to be used with valid/invalid HTML 2014-01-26 22:32:17 +01:00
Fabien Potencier
bacedeab2a minor #10136 [DependencyInjection] Remove unneeded file (florianv)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Remove unneeded file

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

I think the file was moved here by mistake from the fixtures.

Commits
-------

caf1809 [DependencyInjection] Remove unneeded file
2014-01-26 08:49:07 +01:00
Ulumuddin Cahyadi Yunus
7edb5dec3a Create security.id.xlf 2014-01-26 03:55:58 +08:00
florianv
caf180959f [DependencyInjection] Remove unneeded file 2014-01-25 20:23:00 +01:00
Fabien Potencier
eb74cb6604 bug #10131 added lines to exceptions for the trans and transchoice tags (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

added lines to exceptions for the trans and transchoice tags

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

Commits
-------

ee0470d added lines to exceptions for the trans and transchoice tags
2014-01-25 11:13:52 +01:00
Fabien Potencier
aedb919676 minor #10132 Remove obsolete conditions (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

Remove obsolete conditions

| 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

In `composer.json`, Twig version is set to 1.12 as a minimum, so all conditions about earlier Twig versions can be safely removed.

Commits
-------

c3ff76a [Twig] removed obsolete conditions on Twig versions
2014-01-25 11:12:48 +01:00
Fabien Potencier
82031dd66e minor #10129 [Form] Make FormInterface::add docblock more explicit (billhance)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Make FormInterface::add docblock more explicit

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

When replacing a child form from within a form event, it's not obvious that you have to use the 'add' method. Though it's minor, this will save somebody a google search.

Commits
-------

23216aa [Form] Make FormInterface::add docblock more explicit
2014-01-25 11:04:07 +01:00
Fabien Potencier
c3ff76a989 [Twig] removed obsolete conditions on Twig versions 2014-01-25 10:57:36 +01:00
Fabien Potencier
ee0470d110 added lines to exceptions for the trans and transchoice tags 2014-01-25 10:55:07 +01:00
Jakub Zalas
38691da482 [FrameworkBundle] Merged multiple line input into one line to fix the tests.
This was initially done in b85577bb96, but
reverted when merging and solving conflicts from 2.3 branch
(07de76122b).
2014-01-25 00:00:10 +00:00
Bill Hance
23216aa113 [Form] Make FormInterface::add docblock more explicit
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | 
| License       | MIT
| Doc PR        | 

When replacing a child form from within a form event, it's not obvious that you have to use the 'add' method. Though it's minor, this will save somebody a google search.
2014-01-24 15:53:20 -08:00
Wang Jingyu
27630ebfa1 [Security] Add zh_CN translations 2014-01-25 02:33:21 +08:00
Marco Jantke
0a2bb7b476 Routing condition bugfix 2014-01-24 19:08:49 +01:00
Wang Jingyu
064346acdd [Validator][Translation]update zh_CN translations
* add new trans-units
* change some translations
* change punctuations, whitespaces
2014-01-25 01:47:30 +08:00
Fabien Potencier
07de76122b Merge branch '2.3' into 2.4
* 2.3: (30 commits)
  Update validators.ro.xlf
  add non-standard port to HTTP_HOST
  fixed attribute "source-language" for translations
  Update PluralizationRules.php
  Update validators.pt_BR.xlf
  Translated remaining items (57-72)
  Updated Vietnamese translation
  added missing dot in translation
  updated Arabic translations
  Update validators.id.xlf
  [Validator] Translate validator messages into Brazilian Portuguese
  Added more Swedish validator translations
  Update validators.ca.xlf
  fixed typos in Welsh translation
  Added missing Croatian translations
  [Form] fixed allow render 0 and 0.0 numeric input values
  Fixed validators.nl.xlf
  [Component/Security] Fixed some phpdocs in Security/Core
  Completed Luxembourgish translation
  Fixing the Logger deprecation notices to match the correct method name it should be informing of
  ...

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_simple.html.php
	src/Symfony/Component/Console/Application.php
2014-01-24 15:36:08 +01:00
florianv
16b726c043 [Validator] Minor fix in XmlLoader 2014-01-24 14:40:35 +01:00
Ionel Scutelnicu
d82f83037d Update validators.ro.xlf
some typo errors have been fixed
2014-01-24 10:08:30 +02:00