Commit Graph

16376 Commits

Author SHA1 Message Date
Fabien Potencier
23acc24015 [Debug] made order of suggestions predictable in error messages 2014-02-03 11:14:18 +01:00
Fabien Potencier
7affb71196 minor #10172 [WebProfilerBundle] Use inline images instead of asset() in form-panel (Danez)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[WebProfilerBundle] Use inline images instead of asset() in form-panel

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | silexphp/Silex-WebProfiler#33
| License       | MIT
| Doc PR        |

In the ```form.html.twig```-template in dev-master the twig function ```assert()``` is used to load the images for the toggle-buttons. This is bad, as the profiler is also used in other projects, which maybe do not have an ```assert()``` function, like Silex.
 In version 2.4.x this is not an issue, as the new images were introduced for 2.5.

I change the assert() part to inline data-images with this [converter](http://www.askapache.com/online-tools/base64-image-converter/). Compression was enabled, so the images should be as small as possible. I also compressed the toolbar-icon a little bit further.

While switching between before (dev-master) and after (this PR) I have not spotted any visual difference.

Commits
-------

12eabd8 remove unused icons
f259157 Further compress icon
eb6d02c Use inline images instead of asset() function
2014-02-01 20:51:15 +01:00
Daniel Tschinder
12eabd8d60 remove unused icons 2014-02-01 20:22:15 +01:00
Fabien Potencier
7c3a3e11cf minor #10160 [Translation] [Loader] Add INI_SCANNER_RAW to parse ini files (TeLiXj)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Translation] [Loader] Add INI_SCANNER_RAW to parse ini files

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

INI_SCANNER_RAW change the default scanner mode of parse_ini_files to parse all values without evaluate. This allow values with single quotes, "no" and "false" and raise an error if you use the deprecated "#" as comment character.
This change is specially good for shared translations, because a translator haven't to know that he can't use a few restricted terms.
And has a residual improvement: it's twice fast that use the default value (INI_SCANNER_NORMAL) in my tests

Commits
-------

5ef60f1 [Translation] [Loader] Add INI_SCANNER_RAW to parse ini files
2014-02-01 17:52:05 +01:00
Daniel Tschinder
f2591572ea Further compress icon 2014-01-31 22:00:20 +01:00
Daniel Tschinder
eb6d02cd15 Use inline images instead of asset() function
For compatibility to other projects using assert() should not be used in webProfiler-templates.
2014-01-31 18:39:01 +01:00
TeLiXj
5ef60f1494 [Translation] [Loader] Add INI_SCANNER_RAW to parse ini files
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | yes
| Deprecations? | no
| Tests pass?   | no
| Fixed tickets | 
| License       | MIT
| Doc PR        | 

INI_SCANNER_RAW change the default scanner mode of parse_ini_files to parse all values without evaluate. This allow values with single quotes, "no" and "false" and raise an error if you use the deprecated "#" as comment character.
This change is specially good for shared translations, because a translator haven't to know that he can't use a few restricted terms.
And has a residual improvement: it's twice fast that use the default value (INI_SCANNER_NORMAL) in my tests
2014-01-29 22:47:07 +01:00
Fabien Potencier
d61f4921e6 minor #10149 Fixed grammar in Hungarian translations (r1pp3rj4ck)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Fixed grammar in Hungarian translations

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

Commits
-------

7f74049 Fixed grammar in Hungarian translations
2014-01-28 10:28:20 +01:00
r1pp3rj4ck
7f740493ba Fixed grammar in Hungarian translations 2014-01-27 23:45:52 +01:00
Fabien Potencier
6a0de7f512 Merge branch '2.4'
* 2.4:
  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
  [FrameworkBundle] Merged multiple line input into one line to fix the tests.
  [Form] Make FormInterface::add docblock more explicit
  [Security] Add zh_CN translations
  Routing condition bugfix
  [Validator][Translation]update zh_CN translations
  [Validator] Minor fix in XmlLoader
2014-01-26 22:33:16 +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
Fabien Potencier
545a21870e bug #10140 allow the TextAreaFormField to be used with valid/invalid HTML (dawehner)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10140).

Discussion
----------

allow the TextAreaFormField to be used with valid/invalid HTML

The TextAreaFormField previously used saveXML to get a representation of the child nodes of an textarea.
This works pretty fine on simple text is causes issues in case you have broken HTML, as saveXML
will potentially also break encoding/change the structure.

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

Commits
-------

157a9de allow the TextAreaFormField to be used with valid/invalid HTML
2014-01-26 22:32:17 +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
Fabien Potencier
845f8061de minor #10137 [Security] [Translations] added security.id.xlf (ucay)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] [Translations] added security.id.xlf

added translation for Bahasa Indonesia

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

Commits
-------

7edb5de Create security.id.xlf
2014-01-26 08:43:47 +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
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