Commit Graph

16968 Commits

Author SHA1 Message Date
Fabien Potencier
dbf7eeb10f bug #10686 Fixing Yaml Loader/Dumper to use underscores instead of dashes (WouterJ)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Fixing Yaml Loader/Dumper to use underscores instead of dashes

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

Commits
-------

9ba2861 Fixed Yaml loader/dumper to use underscores
2014-04-10 14:59:31 +02:00
WouterJ
9ba2861408 Fixed Yaml loader/dumper to use underscores 2014-04-10 14:44:40 +02:00
Fabien Potencier
b5ba7e109b minor #10668 [RFR] [Serializer] Refactored XmlEncoder to remove dependency to SimpleXml (csarrazi)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[RFR] [Serializer] Refactored XmlEncoder to remove dependency to SimpleXml

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

Instead of switching between SimpleXml and DOM Xml, we only use DOM Xml, in order to parse the source XML when decoding an XML string.

Commits
-------

db44f0f [Serializer] Refactored XmlEncoder to remove dependency to SimpleXml
2014-04-10 04:23:19 +02:00
Charles Sarrazin
db44f0fdd7 [Serializer] Refactored XmlEncoder to remove dependency to SimpleXml 2014-04-10 02:57:01 +02:00
Fabien Potencier
648ce6a3d9 minor #10657 [TwigBundle] Fixed typo (pborreli)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[TwigBundle] Fixed typo

Commits
-------

46bb8b9 Fixed typo
2014-04-09 15:36:21 +02:00
Pascal Borreli
46bb8b99de Fixed typo 2014-04-09 09:13:16 +01:00
Fabien Potencier
5e6c089b71 Merge branch '2.4'
* 2.4:
  bumped Symfony version to 2.4.4
  updated VERSION for 2.4.3
  updated CHANGELOG for 2.4.3
  bumped Symfony version to 2.3.13
  updated VERSION for 2.3.12
  update CONTRIBUTORS for 2.3.12
  updated CHANGELOG for 2.3.12

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-04-05 18:03:59 +02:00
Fabien Potencier
43ee21ea2c Merge branch '2.3' into 2.4
* 2.3:
  bumped Symfony version to 2.3.13
  updated VERSION for 2.3.12
  update CONTRIBUTORS for 2.3.12
  updated CHANGELOG for 2.3.12

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-04-05 18:03:39 +02:00
Fabien Potencier
40db85d9da bumped Symfony version to 2.4.4 2014-04-05 13:49:17 +02:00
Fabien Potencier
3199b2e0d1 updated VERSION for 2.4.3 2014-04-04 12:27:02 +02:00
Fabien Potencier
4e777dfc1b updated CHANGELOG for 2.4.3 2014-04-04 11:31:00 +02:00
Fabien Potencier
2a61b5fe77 Merge branch '2.4'
* 2.4:
2014-04-04 11:27:51 +02:00
Fabien Potencier
c4404f6e64 reverted accidental merge of master
* origin/2.4: (204 commits)
  Revert PHPUnit version, revert APC configuration
  removed APC on the CLI for Travis as it does not work well with PHPUnit and Composer anyway
  [Security] Replace exception mocks with actual exception instances.
  Remove an unused argument.
  Use `Filesystem::chmod` instead of `chmod` when dumping file
  [Form] Added test for disabling buttons
  [Form] Added check for parent disabled status in Button form elements
  [Process] Fix Process test suite
  Fixes URL validator to accept single part urls
  [Form] Fixed infinite tests when ICU is available
  tweaked Travis configuration to get more tests running
  fixed float comparison in unit tests for HHVM
  upgraded PHPUnit to version 4 for better HHVM support
  [Process] fixed HHVM usage on the CLI
  Fix class names in ApcUniversalClassLoader tests.
  fixed the profiler when an uncalled listener throws an exception when instantiated
  fixed CS
  Added test case for 4c6a2d15095c13b2a35751b2b2712b183be489c4
  Fixed bug in ChoiceType triggering a warning when not using utf-8
  fixed typos
  ...
2014-04-04 11:27:09 +02:00
Fabien Potencier
27035b4661 minor #10632 [FrameworkBundle] Fix tests (jakzal)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[FrameworkBundle] Fix tests

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

This [fixes the build](https://travis-ci.org/jakzal/symfony/builds/22199535) [![Build Status](https://travis-ci.org/jakzal/symfony.svg?branch=framework-bundle-tests-fix)](https://travis-ci.org/jakzal/symfony) by only initializing a fully configured validation service if APC is available. At the moment we only provide ApcCache for mapping' caching (out of the box). DoctrineCache is available but not configured. I also added an additional test case to verify that a validation service can be created on php >=5.5.

Commits
-------

009c4b8 [FrameworkBundle] Only initialize a fully configured service if APC is available.
2014-04-03 21:17:37 +02:00
Jakub Zalas
009c4b8451 [FrameworkBundle] Only initialize a fully configured service if APC is available.
At the moment we only provide ApcCache for mapping caching (out of the box). DoctrineCache is available but not configured.
2014-04-03 17:10:06 +01:00
Fabien Potencier
bc6020d8d7 bug #10629 [DependencyInjection] Fix #10626, use better check on attribute existence and values on XML load (romainneutron)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[DependencyInjection] Fix #10626, use better check on attribute existence and values on XML load

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

Commits
-------

8163427 [DependencyInjection] Fix #10626, use better check on attribute existence and values on XML load
2014-04-03 17:02:32 +02:00
Romain Neutron
8163427b71 [DependencyInjection] Fix #10626, use better check on attribute existence and values on XML load 2014-04-03 14:00:33 +02:00
Fabien Potencier
a18ee423f9 bumped Symfony version to 2.3.13 2014-04-03 10:18:27 +02:00
Fabien Potencier
3574df3d5e updated VERSION for 2.3.12 2014-04-03 07:42:39 +02:00
Fabien Potencier
aaa9a0b78a update CONTRIBUTORS for 2.3.12 2014-04-03 07:41:30 +02:00
Fabien Potencier
efbf323412 updated CHANGELOG for 2.3.12 2014-04-03 07:40:57 +02:00
Fabien Potencier
8d69022c04 Merge branch '2.4'
* 2.4:
  Revert PHPUnit version, revert APC configuration
  removed APC on the CLI for Travis as it does not work well with PHPUnit and Composer anyway
  [Security] Replace exception mocks with actual exception instances.
  Remove an unused argument.
  Use `Filesystem::chmod` instead of `chmod` when dumping file
  [Form] Added test for disabling buttons
  [Form] Added check for parent disabled status in Button form elements
  Fixes URL validator to accept single part urls
  tweaked Travis configuration to get more tests running
  fixed float comparison in unit tests for HHVM
  upgraded PHPUnit to version 4 for better HHVM support
  [Process] fixed HHVM usage on the CLI
  Fix class names in ApcUniversalClassLoader tests.
  fixed the profiler when an uncalled listener throws an exception when instantiated
  fixed CS
  Added test case for 4c6a2d15095c13b2a35751b2b2712b183be489c4
  Fixed bug in ChoiceType triggering a warning when not using utf-8
  fixed CS
  Avoid levenshtein comparison when using ContainerBuilder.
2014-04-03 07:23:57 +02:00
Fabien Potencier
785e82f814 Merge branch '2.3' into 2.4
* 2.3:
  Revert PHPUnit version, revert APC configuration
  removed APC on the CLI for Travis as it does not work well with PHPUnit and Composer anyway
  [Security] Replace exception mocks with actual exception instances.
  Remove an unused argument.
  Use `Filesystem::chmod` instead of `chmod` when dumping file
  [Form] Added test for disabling buttons
  [Form] Added check for parent disabled status in Button form elements
  Fixes URL validator to accept single part urls
  tweaked Travis configuration to get more tests running
  fixed float comparison in unit tests for HHVM
  upgraded PHPUnit to version 4 for better HHVM support
  [Process] fixed HHVM usage on the CLI
  Fix class names in ApcUniversalClassLoader tests.
  fixed the profiler when an uncalled listener throws an exception when instantiated
  fixed CS
  Added test case for 4c6a2d15095c13b2a35751b2b2712b183be489c4
  Fixed bug in ChoiceType triggering a warning when not using utf-8
  fixed CS
  Avoid levenshtein comparison when using ContainerBuilder.

Conflicts:
	src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
2014-04-03 07:23:50 +02:00
Fabien Potencier
23709374a8 minor #10623 [2.3] Fix travis build (fabpot, romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fix travis build

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

This PR replaces #10595 and fixes travis build on branch 2.3

Commits
-------

f613caa Revert PHPUnit version, revert APC configuration
9bdd3d1 removed APC on the CLI for Travis as it does not work well with PHPUnit and Composer anyway
2014-04-03 07:18:54 +02:00
Fabien Potencier
dfe383776a minor #10621 [Security] Replace exception mocks with actual exception instances. (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Replace exception mocks with actual exception instances.

It is done for two reasons:
* consistency - we use real exception objects in most of the code
* latest phpunit does not like the way we were creating mocks for exceptions (it could be also fixed by letting phpunit to call the original constructor)

Commits
-------

9438f88 [Security] Replace exception mocks with actual exception instances.
2014-04-03 07:00:33 +02:00
Romain Neutron
f613caaf5e Revert PHPUnit version, revert APC configuration 2014-04-03 00:30:22 +02:00
Fabien Potencier
9bdd3d189d removed APC on the CLI for Travis as it does not work well with PHPUnit and Composer anyway 2014-04-03 00:28:00 +02:00
Fabien Potencier
b7be0b86b9 Merge branch '2.4'
* 2.4:
  [Process] Fix Process test suite
  [Form] Fixed infinite tests when ICU is available
2014-04-02 19:10:49 +02:00
Fabien Potencier
8774a34662 minor #10620 Fix travis build (romainneutron)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Fix travis build

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

Since #10287 and #10606 have been merged, errors occur in FrameworkBundle and Console component. This patch solves this. After merging 2.4 in master (that would fix Process suite), everything should be green.

Commits
-------

099e480 Fix travis build
2014-04-02 19:10:34 +02:00
Romain Neutron
099e480c1c Fix travis build 2014-04-02 18:54:39 +02:00
Fabien Potencier
db4230ef8c feature #10619 [DependencyInjection] Use DOM instead of SimpleXML for namespace support (sandermarechal, romainneutron)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[DependencyInjection] Use DOM instead of SimpleXML for namespace support

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

This PR replaces #9350

Commits
-------

a3c60c8 [DependencyInjection] Deprecate SimpleXMLElement
33c91f9 [DependencyInjection] Use DOM instead of SimpleXML for namespace support
2014-04-02 17:51:57 +02:00
Fabien Potencier
afc34cf14c feature #10606 [Console] added a better way to ask questions to the user (fabpot, romainneutron)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Console] added a better way to ask questions to the user

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

This PR replaces #9811

- [x] add missing phpdocs
- [x] add unit tests
- [ ] submit doc PR

Commits
-------

336bba2 [Console] Add docblocks and unit tests to QuestionHelper
c413f89 [Console] added a better way to ask questions to the user
2014-04-02 17:45:58 +02:00
Romain Neutron
a3c60c8039 [DependencyInjection] Deprecate SimpleXMLElement 2014-04-02 17:32:21 +02:00
Sander Marechal
33c91f9be8 [DependencyInjection] Use DOM instead of SimpleXML for namespace support 2014-04-02 17:32:21 +02:00
Romain Neutron
336bba2fd8 [Console] Add docblocks and unit tests to QuestionHelper 2014-04-02 17:11:48 +02:00
Fabien Potencier
01f21e3c31 bug #10604 [PropertyAccessor] Wrong number of parameters (coma)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[PropertyAccessor] Wrong number of parameters

| 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

Since [6d2af217aafd03e3f1600ce0ebc9c30cf0a7fc70#diff-3e45cf556c0330623c0167841d303dff](6d2af217aa (diff-3e45cf556c0330623c0167841d303dff)) the PropertyAccessor is failing on setters with default values because  [ReflectionFunctionAbstract::getNumberOfRequiredParameters](http://www.php.net/manual/es/reflectionfunctionabstract.getnumberofparameters.php) only count the parameters without default values.

Commits
-------

6157be0 Wrong number of parameters
2014-04-01 18:23:27 +02:00
Fabien Potencier
8ced461899 feature #10600 [DependencyInjection] added a simple way to replace a service by keeping a reference to the old one (romainneutron)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[DependencyInjection] added a simple way to replace a service by keeping a reference to the old one

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #5920
| License       | MIT
| Doc PR | https://github.com/symfony/symfony-docs/issues/3745

This PR replaces #9003. Here's the todo list:
 - [x] add a cookbook entry for this new feature
 - [x] add support in all loaders/dumpers
 - [x] add unit tests
 - [x] see if there are use cases in Symfony that would benefit from this new feature
 - [x] find the best name for this feature

I've implemented YAML and XML Loader / Dumper.
From what I see, PhpDumper, PhpLoader, IniLoader, GraphvizDumper do not require an update, am I wrong?

Commits
-------

140f807 [DependencyInjection] Update dumpers and loaders, add unit tests
1eb1f4d [DependencyInjection] added a simple way to replace a service by keeping a reference to the old one
2014-04-01 18:20:59 +02:00
Jakub Zalas
9438f88af0 [Security] Replace exception mocks with actual exception instances.
It is done for two reasons:
* consistency - we use real exception objects in most of the code
* latest phpunit does not like the way we were creating mocks for exceptions (it could be also fixed by letting phpunit to call the original constructor)
2014-04-01 15:48:06 +01:00
Fabien Potencier
c413f89723 [Console] added a better way to ask questions to the user 2014-04-01 14:31:41 +02:00
Eduardo García Sanz
6157be0a1d Wrong number of parameters
Wrong number of parameters

Wrong number of parameters

Wrong number of parameters
2014-04-01 14:30:09 +02:00
Romain Neutron
140f807346 [DependencyInjection] Update dumpers and loaders, add unit tests 2014-04-01 14:25:44 +02:00
Fabien Potencier
8aa194c0a6 minor #10601 [HttpKernel] HttpCache typo (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] HttpCache typo

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

Commits
-------

8882dad Remove an unused argument.
2014-04-01 08:01:53 +02:00
Jakub Zalas
8882dad46e Remove an unused argument. 2014-03-31 22:49:46 +01:00
Fabien Potencier
1eb1f4dd73 [DependencyInjection] added a simple way to replace a service by keeping a reference to the old one 2014-03-31 20:47:44 +02:00
Fabien Potencier
58bed5d200 feature #10593 [Templating] Added ability to set a specific version of the asset (romainneutron)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Templating] Added ability to set a specific version of the asset

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/3742/files

This PR replaces #6092

Commits
-------

1642094 [Templating] Update changelog
6fce503 [Templating] Added ability to set a specific version of the asset
2014-03-31 15:55:50 +02:00
Romain Neutron
1642094cfe [Templating] Update changelog 2014-03-31 15:27:29 +02:00
Martin Hasoň
6fce503432 [Templating] Added ability to set a specific version of the asset 2014-03-31 15:27:29 +02:00
Fabien Potencier
7792ba90db fixed typo in composer.json 2014-03-31 13:19:58 +02:00
Fabien Potencier
b094ea7fe2 bug #10586 Fixes URL validator to accept single part urls (merk)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixes URL validator to accept single part urls

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

This PR replaces #6817 and has been rebased for 2.3, making a change to the regex to be simpler for single dot matches. (changing `([\pL\pN\pS-\.])+([\.]{0,1}[\pL]+[\.]{0,1})` to `([\pL\pN\pS-\.])+(\.?[\pL]+\.?)`)

Commits
-------

91e226e Fixes URL validator to accept single part urls
2014-03-31 13:10:34 +02:00
Fabien Potencier
3e678e7923 minor #10590 [2.3] Use Filesystem::chmod instead of chmod when dumping file (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Use `Filesystem::chmod` instead of `chmod` when dumping file

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

This adds consistency as discussed in ca5eea5c19 (commitcomment-5804089)

Commits
-------

c2ffefd Use `Filesystem::chmod` instead of `chmod` when dumping file
2014-03-31 13:09:33 +02:00