Commit Graph

16816 Commits

Author SHA1 Message Date
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
774674efbf feature #10112 [Routing] Add createRoute method for AnnotationClassLoader (henrikbjorn)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Routing] Add createRoute method for AnnotationClassLoader

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

This allows to use a custom route class. So if you want to support
annotations for Routing in Silex it can now be done while keeping the
custom routing options Silex supports.

Commits
-------

97404b3 Add createRoute method for AnnotationClassLoader
2014-01-25 11:05:55 +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
Fabien Potencier
f71193c055 minor #10124 [Security] Add zh_CN translations (foxwoods)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Add zh_CN translations

| Q             | A
| ------------- | ---
| License       | MIT

Commits
-------

27630eb [Security] Add zh_CN translations
2014-01-25 09:23:17 +01:00
Fabien Potencier
65ea9884df minor #10130 [FrameworkBundle] Fixed the tests (jakzal)
This PR was merged into the 2.4 branch.

Discussion
----------

[FrameworkBundle] Fixed the tests

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

This template was already converted to a one liner before in b85577bb96, but
that change was reverted when merging and solving conflicts from 2.3 branch (07de76122b).

Commits
-------

38691da [FrameworkBundle] Merged multiple line input into one line to fix the tests.
2014-01-25 09:22:44 +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
Fabien Potencier
664d055a64 bug #10002 Routing condition bugfix (marco-jantke)
This PR was submitted for the 2.4-dev branch but it was merged into the 2.4 branch instead (closes #10002).

Discussion
----------

Routing condition bugfix

[Routing] Fixed inheriting of condition to sub routes for xml and yaml configuration.

Commits
-------

bb7e15e Routing condition bugfix
2014-01-24 19:08:49 +01:00
Marco Jantke
0a2bb7b476 Routing condition bugfix 2014-01-24 19:08:49 +01:00
Fabien Potencier
48859903e4 minor #10121 [Validator] update zh_CN translations (foxwoods)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] update zh_CN translations

| Q             | A
| ------------- | ---
| License       | MIT

* add new trans-units
* change some translations
* change punctuations, whitespaces

Commits
-------

064346a [Validator][Translation]update zh_CN translations
2014-01-24 19:07:29 +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
4e137cc7cb feature #10064 [TwigBridge] Added support for json format in twig:lint command (lyrixx)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[TwigBridge] Added support for json format in twig:lint command

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

Commits
-------

4d2f94a [TwigBridge] Added support for json format in twig:lint command
621f991 [TwigBridge] Cleaned documentation of twig:lint command
2014-01-24 17:58:46 +01:00
Fabien Potencier
bd65c9c498 bug #10119 [Validator] Minor fix in XmlFileLoader (florianv)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Minor fix in XmlFileLoader

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

An instance of `\SimpleXMLElement` is passed to the `newConstraint` method instead of a string which can lead to weird type juggling issues.

Commits
-------

16b726c [Validator] Minor fix in XmlLoader
2014-01-24 17:40:46 +01:00
Fabien Potencier
2e2a65c0f4 Merge branch '2.4'
* 2.4: (35 commits)
  Update validators.ro.xlf
  add non-standard port to HTTP_HOST
  fixed attribute "source-language" for translations
  [Process] clarify idle timeout
  [Security] fix DI for SimpleFormAuthenticationListener
  Update PluralizationRules.php
  Update validators.pt_BR.xlf
  Translated remaining items (57-72)
  Updated Vietnamese translation
  allow null value in fragment handler
  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
  ...

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
2014-01-24 15:36:35 +01: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
Fabien Potencier
2381680a7e minor #10115 Update validators.ro.xlf (IonelScutelnicu)
This PR was merged into the 2.3 branch.

Discussion
----------

Update validators.ro.xlf

some typo errors have been fixed

Commits
-------

d82f830 Update validators.ro.xlf
2014-01-24 09:32:08 +01:00
Ionel Scutelnicu
d82f83037d Update validators.ro.xlf
some typo errors have been fixed
2014-01-24 10:08:30 +02:00
Fabien Potencier
3ce5ac084e bug #10078 [BrowserKit] add non-standard port to HTTP_HOST server param (kbond)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10078).

Discussion
----------

[BrowserKit] add non-standard port to HTTP_HOST server param

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/Behat/MinkGoutteDriver/issues/25
| License       | MIT
| Doc PR        | n/a

This fix will allow using BrowserKit with php's webserver.

Commits
-------

5f25639 [BrowserKit] add non-standard port to HTTP_HOST
2014-01-24 07:18:17 +01:00
Kevin Bond
247604c9b4 add non-standard port to HTTP_HOST 2014-01-24 07:18:16 +01:00
Fabien Potencier
78d49fbe8c minor #10081 [FrameworkBundle] Pretty Ppint json ouput of yaml:lint command (lyrixx)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[FrameworkBundle] Pretty Ppint json ouput of yaml:lint command

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

Commits
-------

689e9bf [FrameworkBundle] Pretty Ppint json ouput of yaml:lint command
2014-01-24 07:16:38 +01:00
Fabien Potencier
8c47a9fabc bug #10095 [Security] fix DI for SimpleFormAuthenticationListener (Tobion)
This PR was merged into the 2.4 branch.

Discussion
----------

[Security] fix DI for SimpleFormAuthenticationListener

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

The problematic commit was f2f15f54f9

Commits
-------

b3f5fa9 [Security] fix DI for SimpleFormAuthenticationListener
2014-01-24 07:15:26 +01:00
Fabien Potencier
2ccb868bd6 minor #10097 [Process] clarify idle timeout (Tobion)
This PR was merged into the 2.4 branch.

Discussion
----------

[Process] clarify idle timeout

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

Makes idle timeout in line with #9466

Commits
-------

9f07b4d [Process] clarify idle timeout
2014-01-24 07:13:30 +01:00
Henrik Bjørnskov
97404b3614 Add createRoute method for AnnotationClassLoader
This allows to use a custom route class. So if you want to support
annotations for Routing in Silex it can now be done while keeping the
custom routing options Silex supports.
2014-01-23 11:11:15 +01:00
Fabien Potencier
d99507b964 minor #10101 fix attribute "source-language" for translations (craue)
This PR was merged into the 2.3 branch.

Discussion
----------

fix attribute "source-language" for translations

| Q             | A
| ------------- | ---
| Fixed tickets | --
| License       | MIT

Commits
-------

7434550 fixed attribute "source-language" for translations
2014-01-22 08:08:26 +01:00
Christian Raue
7434550284 fixed attribute "source-language" for translations 2014-01-21 21:48:24 +01:00
Tobias Schultze
9f07b4db25 [Process] clarify idle timeout 2014-01-21 10:48:43 +01:00
Tobias Schultze
b3f5fa9b73 [Security] fix DI for SimpleFormAuthenticationListener 2014-01-21 10:08:13 +01:00
Fabien Potencier
61625b466d bug #10091 [Translation] Update PluralizationRules.php (guilhermeblanco)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10091).

Discussion
----------

[Translation] Update PluralizationRules.php

As a native brazilian portuguese speaker, and also respecting http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#pt definitions, 0 elements are normally used in plural form.

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

Commits
-------

ab29792 Update PluralizationRules.php
2014-01-21 06:04:52 +01:00
Guilherme Blanco
324ad4ccfd Update PluralizationRules.php 2014-01-21 06:04:52 +01:00
Fabien Potencier
3558588891 minor #10090 [Validator] Update validators.pt_BR.xlf (guilhermeblanco)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Update validators.pt_BR.xlf

Fixes for pt_BR validator translations.
As a native speaker, here are the necessary changes to make validators 100% compatible with Brazilian portuguese. =D

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

Commits
-------

f637920 Update validators.pt_BR.xlf
2014-01-21 06:01:35 +01:00
Guilherme Blanco
f637920e98 Update validators.pt_BR.xlf
Fixes for pt_BR validator translations.
2014-01-20 20:48:14 -05:00
Fabien Potencier
89171a8764 minor #10082 Finished Bulgarian translation (e-ivanov)
This PR was merged into the 2.3 branch.

Discussion
----------

Finished Bulgarian translation

Commits
-------

d6a7dc9 Translated remaining items (57-72)
2014-01-20 12:47:08 +01:00
e-ivanov
d6a7dc9236 Translated remaining items (57-72) 2014-01-20 13:18:55 +02:00
Grégoire Pineau
689e9bf001 [FrameworkBundle] Pretty Ppint json ouput of yaml:lint command 2014-01-20 10:15:51 +01:00
Grégoire Pineau
4d2f94a7c3 [TwigBridge] Added support for json format in twig:lint command 2014-01-20 10:09:22 +01:00
Fabien Potencier
74e31fe7f6 minor #10080 Updated Vietnamese translation (haphan)
This PR was merged into the 2.3 branch.

Discussion
----------

Updated Vietnamese translation

Complete Vietnamese translation.

Commits
-------

905ae83 Updated Vietnamese translation
2014-01-20 08:46:20 +01:00
Ha Phan
905ae83fb2 Updated Vietnamese translation 2014-01-20 14:33:46 +07:00
Fabien Potencier
c8734aaa4d bug #10053 [Form] fixed allow render 0 numeric input value (dczech)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] fixed allow render 0 numeric input value

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

Commits
-------

82f98c4 [Form] fixed allow render 0 and 0.0 numeric input values
2014-01-20 07:36:49 +01:00
Fabien Potencier
783a45d0e4 bug #10067 [HttpKernel] allow null value in fragment handler (kbond)
This PR was submitted for the 2.4-dev branch but it was merged into the 2.4 branch instead (closes #10067).

Discussion
----------

[HttpKernel] allow null value in fragment handler

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

Commits
-------

534deef [HttpKernel] allow null value in fragment handler
2014-01-20 07:30:15 +01:00
Kevin Bond
c29958f82f allow null value in fragment handler 2014-01-20 07:30:15 +01:00
Fabien Potencier
95a8913b78 added missing dot in translation 2014-01-20 07:28:27 +01:00
Fabien Potencier
3dbe35f2a0 minor #10069 updated Arabic translations (ArabCoders)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10069).

Discussion
----------

updated Arabic translations

added the missing trans-units of 64 to 72

Commits
-------

1ff1d9c updated Arabic translations
2014-01-20 07:27:46 +01:00
Abdul.Mohsen B. A. A
770a94df4e updated Arabic translations
added the missing trans-units of 64 to 72
2014-01-20 07:27:46 +01:00
Fabien Potencier
d8abd64ae6 minor #10079 Update validators.id.xlf (ucay)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10079).

Discussion
----------

Update validators.id.xlf

Update validators for indonesian language

Commits
-------

b7a23bf Update validators.id.xlf
2014-01-20 07:22:07 +01:00