Commit Graph

18094 Commits

Author SHA1 Message Date
Christian Flothmann
d26040f356 [DomCrawler] fix the axes handling in a bc way
The previous fix in #11548 for handling XPath axes was not backward
compatible. In previous Symfony versions the Crawler handled nodes
by holding a "fake root node". This must be taken into account when
evaluating (relativizing) XPath expressions.
2014-08-09 11:40:56 +02:00
Christian Flothmann
dcce0357df add symfony/yaml suggestion to composer.json
The config:debug and yaml:lint commands use classes from the Yaml
component. Therefore, the installation of these packages should be
suggested to the user.
2014-08-08 22:59:22 +02:00
Fabien Potencier
5ca28c0d71 Merge branch '2.4' into 2.5
* 2.4:
  [HttpKernel] added an analyze of environment parameters for built-in server.
  change command to which available under most unix systems
  add way to test command under windows
  fix shell command injection
  [Form] allowed CallbackTransformer to use callable
  [Process] Added process synchronization to the incremental output tests
2014-08-08 17:50:54 +02:00
Fabien Potencier
05c3314a06 Merge branch '2.3' into 2.4
* 2.3:
  [HttpKernel] added an analyze of environment parameters for built-in server.
  change command to which available under most unix systems
  add way to test command under windows
  fix shell command injection
  [Form] allowed CallbackTransformer to use callable
  [Process] Added process synchronization to the incremental output tests
2014-08-08 17:50:44 +02:00
Fabien Potencier
61763452b7 bug #10914 [HttpKernel] added an analyze of environment parameters for built-in server (mauchede)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10914).

Discussion
----------

[HttpKernel] added an analyze of environment parameters for built-in server

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

With the built-in server, it is not possible to use the external parameters: environment variables are only in `$_ENV`.

Commits
-------

696b978 [HttpKernel] added an analyze of environment parameters for built-in server.
2014-08-08 17:50:03 +02:00
Morgan Auchede
696b978742 [HttpKernel] added an analyze of environment parameters for built-in server. 2014-08-08 17:50:03 +02:00
Fabien Potencier
3baea1f370 bug #11610 [Console] fixed output escaping when using the process helper (fabpot)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[Console] fixed output escaping when using the process helper

| 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

When displaying the output of a process run, we must escape the `<` to avoid any formatting.

Commits
-------

bf7a90e [Console] fixed output escaping when using the process helper
2014-08-08 16:32:04 +02:00
Fabien Potencier
bf7a90eb87 [Console] fixed output escaping when using the process helper 2014-08-08 16:16:59 +02:00
Fabien Potencier
d3edc2ddd6 feature #10853 provide a compiler pass for doctrine to register namespace aliases (dbu)
This PR was merged into the 2.6-dev branch.

Discussion
----------

provide a compiler pass for doctrine to register namespace aliases

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

I realized that the compiler pass only allows bundles to register folders to load entities / documents but not namespace alias to make things like `CmfRoutingBundle:Route` work. This is an attempt to provide a separate compiler pass for this. Maybe we should instead provide a new combined compiler pass and have users switch to the new pass if available.

* [x] [Doctrine ORM](https://github.com/doctrine/DoctrineBundle/pull/316)
* [x] [DoctrinePHPCRBundle](https://github.com/doctrine/DoctrinePHPCRBundle/pull/158)
* [ ] Doctrine CouchDB
* [ ] Doctrine MongoDB

Commits
-------

9a62ab3 provide a compiler pass for doctrine to register namespace aliases and not only mapping drivers
2014-08-08 15:37:19 +02:00
Christian Flothmann
f5bc18d648 return empty metadata collection if none do exist
The PropertyMetadataContainerInterface defines that the method
getPropertyMetadata() has to return an empty collection if no
metadata have been configured for the given property. Though, its
implementation in the ClassMetadata class didn't check for
existence of such metadata. This behavior led to unexpected PHP
notices when validating a property or a property value of a property
without any configured constraints (only affects the new 2.5 API).
Additionally, the getMemberMetadatas() didn't check for existing
array keys as well which has also been fixed.
2014-08-08 11:23:54 +02:00
Christian Flothmann
24fb66ddf3 remove volatile tests
Some tests relying on timings and external network resources were not
reliable and occasionally made builds on Travis fail.
2014-08-08 10:12:23 +02:00
Fabien Potencier
56f934f8f6 minor #11608 [Validator] Added Swedish translations (78) (Nyholm)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[Validator] Added Swedish translations (78)

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

Added the missing Swedish translations into master.

Commits
-------

d2bd92f [Validator] Added Swedish translations
2014-08-08 08:21:06 +02:00
Fabien Potencier
88149209ae [Console] fixed style creation when providing an unknown tag option 2014-08-07 17:55:24 +02:00
Tobias Nyholm
d2bd92f681 [Validator] Added Swedish translations 2014-08-07 17:09:41 +02:00
Fabien Potencier
6b8fe14f3c minor #11587 [Validator] Removed legacy validator classes (webmozart)
This PR was merged into the 2.5 branch.

Discussion
----------

[Validator] Removed legacy validator classes

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

This PR removes the legacy validator classes again and adds the API checks inside the constraint validators instead.

Commits
-------

e844ed0 [Validator] Removed legacy validator classes
2014-08-07 15:09:54 +02:00
Fabien Potencier
56a75179d1 minor #11565 [Process] Added process synchronization to the incremental output tests (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Added process synchronization to the incremental output tests

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

The tests currently fail from time to time if the executing machine is under
heavy load. This leads to false negatives on Travis CI.

A side effect of the change is that the tests are much faster now.

Commits
-------

6dd3946 [Process] Added process synchronization to the incremental output tests
2014-08-07 15:08:01 +02:00
Fabien Potencier
976a1cc11c bug #11598 [Finder] Shell escape and windows support (Gordon Franke, gimler)
This PR was merged into the 2.3 branch.

Discussion
----------

[Finder] Shell escape and windows support

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

Add escaping of command passed to Shell::testCommand().
Fix todo add support for windows.

Commits
-------

c70a226 change command to which available under most unix systems
85e77b1 add way to test command under windows
4fa9288 fix shell command injection
2014-08-07 15:06:53 +02:00
Gordon Franke
c70a226121 change command to which available under most unix systems
agree i will change it which is available under suse, ubuntu, debian, fedora, bsd
2014-08-07 14:55:21 +02:00
Bernhard Schussek
8bedf86f31 bug #11582 [DoctrineBridge] Changed UniqueEntityValidator to use the 2.5 Validation API (webmozart)
This PR was merged into the 2.5 branch.

Discussion
----------

[DoctrineBridge] Changed UniqueEntityValidator to use the 2.5 Validation API

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

Commits
-------

f45f1ab [DoctrineBridge] Changed UniqueEntityValidator to use the 2.5 Validation API
2014-08-07 09:58:17 +02:00
Gordon Franke
85e77b14f7 add way to test command under windows 2014-08-07 09:02:32 +02:00
Gordon Franke
4fa9288fda fix shell command injection 2014-08-07 09:01:16 +02:00
David Buchmann
9a62ab3e24 provide a compiler pass for doctrine to register namespace aliases and not only mapping drivers 2014-08-06 17:05:36 +02:00
Bernhard Schussek
72b70636ba minor #11576 [Form] allowed CallbackTransformer to use callable (issei-m)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11576).

Discussion
----------

[Form] allowed CallbackTransformer to use callable

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

I want to use the callable(i.e. inner class methods) in CallbackTransformer, but its current constructor is defined argument type hinting for \Closure so i can't.

Commits
-------

e77022b [Form] allowed CallbackTransformer to use callable
2014-08-06 15:53:52 +02:00
Issei.M
e77022ba6d [Form] allowed CallbackTransformer to use callable 2014-08-06 15:53:52 +02:00
Bernhard Schussek
6dd3946a7e [Process] Added process synchronization to the incremental output tests
The tests currently fail from time to time if the executing machine is under
heavy load. This leads to false negatives on Travis CI.

A side effect of the change is that the tests are much faster now.
2014-08-06 15:45:25 +02:00
Bernhard Schussek
e844ed0fb5 [Validator] Removed legacy validator classes 2014-08-06 15:23:29 +02:00
Bernhard Schussek
f45f1ab20c [DoctrineBridge] Changed UniqueEntityValidator to use the 2.5 Validation API 2014-08-06 15:02:45 +02:00
Bernhard Schussek
fba2393297 minor #11585 [SecurityBundle] Added UserPasswordValidator tests for the different Validation APIs (webmozart)
This PR was merged into the 2.5 branch.

Discussion
----------

[SecurityBundle] Added UserPasswordValidator tests for the different Validation APIs

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

Commits
-------

0653426 [SecurityBundle] Added UserPasswordValidator tests for the different Validation APIs
2014-08-06 15:00:40 +02:00
Bernhard Schussek
06534265ad [SecurityBundle] Added UserPasswordValidator tests for the different Validation APIs 2014-08-06 14:45:51 +02:00
Fabien Potencier
0c13296d30 bumped Symfony version to 2.5.4 2014-08-06 10:24:10 +02:00
Fabien Potencier
f077a238c7 updated VERSION for 2.5.3 2014-08-06 09:03:01 +02:00
Fabien Potencier
b8f6995025 updated CHANGELOG for 2.5.3 2014-08-06 09:02:47 +02:00
Fabien Potencier
6f07919307 Merge branch '2.4' into 2.5
* 2.4:
  Fixed relative redirects for ambiguous paths
  [BrowserKit] Fix browser kit redirect with ports
  [TwigBridge] [Form] Fixed some extra empty spaces
  Plural fix
  removed some .gitattributes that should have been removed a lot time ago
  [DependencyInjection] fixed missing 'factory-class' attribute in XmlDumper output
  fixed whitespace in Twig form template
  built-in server: exit when docroot does not exist

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
2014-08-06 08:44:37 +02:00
Fabien Potencier
6f56ea423d Merge branch '2.3' into 2.4
* 2.3:
  Fixed relative redirects for ambiguous paths
  [BrowserKit] Fix browser kit redirect with ports
  [TwigBridge] [Form] Fixed some extra empty spaces
  Plural fix
  removed some .gitattributes that should have been removed a lot time ago
  [DependencyInjection] fixed missing 'factory-class' attribute in XmlDumper output
  fixed whitespace in Twig form template
  built-in server: exit when docroot does not exist

Conflicts:
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
2014-08-06 08:41:27 +02:00
Fabien Potencier
cd322c42a8 bug #11571 [Form] Fixed FormValidator compatibility with the non-BC 2.5 Validation API (webmozart)
This PR was merged into the 2.5 branch.

Discussion
----------

[Form] Fixed FormValidator compatibility with the non-BC 2.5 Validation API

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

Commits
-------

6ac130e [Form] Fixed FormValidator compatibility with the non-BC 2.5 Validation API
2014-08-06 08:10:28 +02:00
Fabien Potencier
acab0a9b05 minor #11555 [TwigBridge] [Form] Fixed some extra empty spaces (eiannone)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[TwigBridge] [Form] Fixed some extra empty spaces

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

The extra spaces were introduced by commit 8f9ed3ebb9 by @chrisguitarguy

Commits
-------

5f06d96 Fixed some extra empty spaces
2014-08-06 08:05:35 +02:00
Bernhard Schussek
09f252a3e2 feature #11505 [Validator] Fixed group handling in composite constraints (webmozart)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[Validator] Fixed group handling in composite constraints

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

With this PR, it finally becomes possible to set the groups of nested constraints in All and Collection:

```php
/**
 * @Assert\Collection({
 *     "foo" = @Assert\NotNull(groups = "Strict"),
 *     "bar" = @Assert\NotBlank(groups = "Regular"),
 * })
 */
private $attr;
```

The group logic is implemented as described in [this comment](https://github.com/symfony/symfony/pull/4453#issuecomment-16513727).

This PR supports the implementation of #9888 which should now become fairly simple.

Commits
-------

f6c070d [Validator] Fixed group handling in composite constraints
2014-08-05 19:02:43 +02:00
Bernhard Schussek
f6c070d073 [Validator] Fixed group handling in composite constraints 2014-08-05 17:52:01 +02:00
Bernhard Schussek
6ac130e331 [Form] Fixed FormValidator compatibility with the non-BC 2.5 Validation API 2014-08-05 17:39:31 +02:00
Bernhard Schussek
27a2280d29 Merge branch '2.5'
* 2.5: (33 commits)
  [Validator] Added Swedish translations
  [Validator] Fixed ExpressionValidator when the validation root is not an object
  [Validator] Fixed: Made it possible (again) to pass a class name to Validator::validatePropertyValue()
  Fix incorrect romanian plural translations
  fix axes handling in Crawler::filterXPath()
  fix some docblocks
  Fixed self-reference in 'service_container' service breaks garbage collection (and clone).
  [Process] Fix tests when pcntl is not available.
  [DependencyInjection] Roll back changes made to generated files.
  [Console] Roll back changes made to fixture files.
  Issue #11489 Added some CA and ES translations
  [Validator] Added more detailed inline documentation
  [Validator] Removed information from the violation output if the value is an array, object or resource
  partially reverted previous commit
  fixed CS
  Add point about ConsoleLogger to Console 2.5 changelog
  [Validator] Fixed failing tests
  [Validator] CS fixes
  [FrameworkBundle] Made ConstraintValidatorFactory aware of the legacy validators
  [Validator] Added extensive test coverage for the constraint validators for the different APIs
  ...

Conflicts:
	src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf
2014-08-05 11:07:51 +02:00
Bernhard Schussek
98c0621d21 Merge branch '2.4' into 2.5
* 2.4: (24 commits)
  [Validator] Added Swedish translations
  Fix incorrect romanian plural translations
  fix axes handling in Crawler::filterXPath()
  fix some docblocks
  Fixed self-reference in 'service_container' service breaks garbage collection (and clone).
  [Process] Fix tests when pcntl is not available.
  [DependencyInjection] Roll back changes made to generated files.
  [Console] Roll back changes made to fixture files.
  Issue #11489 Added some CA and ES translations
  [Validator] Added more detailed inline documentation
  [Validator] Removed information from the violation output if the value is an array, object or resource
  partially reverted previous commit
  fixed CS
  properly handle null data when denormalizing
  [Validator] Renamed valueToString() to formatValue(); added missing formatValue() calls
  [Validator] Fixed CS
  [Validator] Fixed date-to-string conversion tests to match ICU 51
  [Validator] Added "{{ value }}" parameters where they were missing
  [Validator] Simplified and explained the LuhnValidator
  [Validator] Simplified IssnValidator
  ...

Conflicts:
	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
	src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Constraints/FileValidator.php
	src/Symfony/Component/Validator/Constraints/Isbn.php
	src/Symfony/Component/Validator/Constraints/IsbnValidator.php
	src/Symfony/Component/Validator/Constraints/LengthValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
	src/Symfony/Component/Validator/Tests/Constraints/BlankValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FalseValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/NullValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/TrueValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
2014-08-05 11:00:40 +02:00
Fabien Potencier
678f7728eb bug #11499 [BrowserKit] Fixed relative redirects for ambiguous paths (pkruithof)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11499).

Discussion
----------

[BrowserKit] Fixed relative redirects for ambiguous paths

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

This fixes a problem I discovered today during Mink testing: I have a route with a slug and id, separated by colon (`/{slug}:{id}`). When the `HTTP_HOST` is being normalized it only checks for array key existence, not emptyness. In this case it was `false` due to the `parse_url` call in `updateServerFromUri`, which cannot handle this case:

```
$> php -r "var_dump(parse_url('/redirect', PHP_URL_HOST));"                                                                               NULL

$> php -r "var_dump(parse_url('/redirect:1234', PHP_URL_HOST));"                                                                          bool(false)
```

So now the url becomes `http:///redirect:1234`, because of the missing host.

Commits
-------

5ecc449 Fixed relative redirects for ambiguous paths
2014-08-05 09:20:56 +02:00
Peter Kruithof
5ecc449898 Fixed relative redirects for ambiguous paths 2014-08-05 09:20:55 +02:00
Fabien Potencier
6094b5b3a9 bug #11516 [BrowserKit] Fix browser kit redirect with ports (dakota)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11516).

Discussion
----------

[BrowserKit] Fix browser kit redirect with ports

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

Whilst using Mink to do automated tests, I encountered a problem where redirects with ports would not work as the port was removed in the `updateServerFromURI()` method. This PR fixes the problem.

During my testing I encountered `$client->followRedirects(false);` in the ClientTest class that was causing the redirectWithPort test to pass even though it should have been failing (Removing the line caused the test to correctly fail before the patch was written)

Commits
-------

39973de [BrowserKit] Fix browser kit redirect with ports
2014-08-05 09:17:23 +02:00
Walther Lalk
39973de230 [BrowserKit] Fix browser kit redirect with ports 2014-08-05 09:17:23 +02:00
Fabien Potencier
e76561dbc0 bug #11545 [Bundle][FrameworkBundle] built-in server: exit when docroot does not exist (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Bundle][FrameworkBundle] built-in server: exit when docroot does not exist

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

When the server:run command is run with an invalid document root
directory (for example, when being in the app directory and not
changing the document root to ../web/), the command crashes on Windows
with a 267 exit code. On Linux, the server starts but just publishes
internal server errors.

Commits
-------

f143254 built-in server: exit when docroot does not exist
2014-08-05 09:12:57 +02:00
Fabien Potencier
24c49841c8 minor #11554 [TwigBridge] [Form] Fixed some extra empty spaces (eiannone)
This PR was squashed before being merged into the 2.3 branch (closes #11554).

Discussion
----------

[TwigBridge] [Form] Fixed some extra empty spaces

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

Extra empty spaces for choice_widget_collapsed, they were introduced by commit 8f9ed3ebb9 by @chrisguitarguy

Commits
-------

16bd88e [TwigBridge] [Form] Fixed some extra empty spaces
2014-08-05 09:07:37 +02:00
Emanuele Iannone
16bd88e61f [TwigBridge] [Form] Fixed some extra empty spaces 2014-08-05 09:07:37 +02:00
Fabien Potencier
1ba7c72b09 minor #11550 [Form] fix whitespace in Twig form template (craue)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] fix whitespace in Twig form template

| Q             | A
| ------------- | ---
| Bug fix?      | kind of (after updating from 2.3.17 to 2.3.18, some of my tests were broken because of this)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | they should, let's see what Travis has to say...
| Fixed tickets | --
| License       | MIT
| Doc PR        | --

This fixes some whitespace rendering.

after merging #11386:
```html
<input type="text" id="myfield" name="myfield"     value="blah" />
```

before merging #11386 and with this PR again:
```html
<input type="text" id="myfield" name="myfield" value="blah" />
```

Commits
-------

8504d02 fixed whitespace in Twig form template
2014-08-05 09:06:43 +02:00
Fabien Potencier
e17276b197 bug #11560 Plural fix (1emming)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11560).

Discussion
----------

Plural fix

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

*BC note - this breaks code if people build on top of the incorrect returned value `drife`.

Fixes the `singular` for `drives`. I've added more test values to prove more edge cases and to show this changes doesn't break other `singular`-look ups.
In the test class i've added a few `known issues` for later reference/fixure.

Commits
-------

9b550d6 Plural fix
2014-08-05 09:05:25 +02:00