Commit Graph

24951 Commits

Author SHA1 Message Date
Christian Flothmann
20d4c5842a Merge branch '2.7' into 2.8
* 2.7:
  [DependencyInjection] fix tests
2016-02-24 19:55:13 +01:00
Carson Full
cdfb696716 [HttpFoundation] Remove @throws from ParameterBag::get() PHPDoc. This was for the now removed deep flag. 2016-02-24 12:32:18 -06:00
Nicolas Grekas
852f9994ad Update contributing docs 2016-02-24 15:36:06 +01:00
Nicolas Grekas
44ae785064 [Console] Fix escaping of trailing backslashes 2016-02-24 15:09:34 +01:00
Jules Pietri
6977583b3d [2.8] [Form] minor fix some tests with placeholder in AbstractLayout 2016-02-24 10:36:18 +01:00
Fabien Potencier
a7fee1244e bug #17074 Fix constraint validator alias being required (Triiistan)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17074).

Discussion
----------

Fix constraint validator alias being required

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #16805
| License       | MIT
| Doc PR        | symfony/symfony-docs#6055

This is my first contribution, so everything might not be in perfect order.

Follow-up of #16841 on the right branch.

Commits
-------

5136c30 Fix constraint validator alias being required
2016-02-23 21:06:57 +01:00
Tristan Roussel
5136c308f2 Fix constraint validator alias being required 2016-02-23 21:06:57 +01:00
Fabien Potencier
40e5f78acc minor #17909 [DependencyInjection] fix tests (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] fix tests

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

Commits
-------

0de2107 [DependencyInjection] fix tests
2016-02-23 21:05:53 +01:00
Christian Flothmann
0de21071c3 [DependencyInjection] fix tests 2016-02-23 20:37:29 +01:00
Fabien Potencier
4cbb3fdb64 Merge branch '2.7' into 2.8
* 2.7:
  Validate XLIFF translation files
  [DependencyInjection] replace alias in factories
  replace alias in factory services
2016-02-23 19:27:29 +01:00
Fabien Potencier
6190058d5b bug #17866 [DependencyInjection] replace alias in factories (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] replace alias in factories

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

Commits
-------

b43b79b [DependencyInjection] replace alias in factories
2016-02-23 19:20:19 +01:00
Fabien Potencier
6bb1c6d737 Merge branch '2.3' into 2.7
* 2.3:
  Validate XLIFF translation files
  replace alias in factory services
2016-02-23 19:18:09 +01:00
Fabien Potencier
4b33fd3d45 bug #17867 [DependencyInjection] replace alias in factory services (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] replace alias in factory services

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

Commits
-------

56f8798 replace alias in factory services
2016-02-23 19:17:24 +01:00
Fabien Potencier
0807ff77d0 minor #17903 Validate XLIFF translation files (javiereguiluz)
This PR was squashed before being merged into the 2.3 branch (closes #17903).

Discussion
----------

Validate XLIFF translation files

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

In #17902 @stof proposed to add a simple test to validate `.xlf` files (to avoid issues like #17893).

This is a proposal for that test. My questions:

**1)** Do you agree displaying detailed error messages when the XML is not valid. Example output for the #17893 error:

![error_log](https://cloud.githubusercontent.com/assets/73419/13250664/932d2f14-da2b-11e5-8ea0-ecb43f58feea.png)

Or is it enough displaying just the PHPUnit error message and let the user figure out the details?

![simple_error](https://cloud.githubusercontent.com/assets/73419/13250671/a3b4bfd2-da2b-11e5-9277-454d0dd160b2.png)

**2)** How do I validate the translation files of the Security and Form components? Do I just copy+paste this test in those components?

Commits
-------

db03055 Validate XLIFF translation files
2016-02-23 19:12:36 +01:00
Javier Eguiluz
db0305569d Validate XLIFF translation files 2016-02-23 19:12:35 +01:00
Fabien Potencier
6782cfa011 Merge branch '2.8' into 3.0
* 2.8:
  fixed typo
  fixed typo
  Fixed a minor XML issue in a translation file
  Fix merge
  Fix merge
  Fix merge
  Fix merge
  Update twig.html.twig
  PhpUnitNoDedicateAssertFixer results
  Improve Norwegian translations
  [2.7] [FrameworkBundle] minor fix tests added by #17569
  Fixed the antialiasing of the toolbar text
  Simplify markdown for PR template
  fixed CS
  fixed CS
  documented the $url parameter better
  [Form] add test for ArrayChoiceList handling null
  [Form] fix edge cases with choice placeholder
  register commands from kernel when accessing list
  Update FileSystem
2016-02-23 16:16:06 +01:00
Fabien Potencier
ddc8eceba3 Merge branch '2.7' into 2.8
* 2.7:
  fixed typo
  fixed typo
2016-02-23 16:11:44 +01:00
Fabien Potencier
b537bf1ced fixed typo 2016-02-23 16:11:23 +01:00
Fabien Potencier
a91a9e5886 Merge branch '2.3' into 2.7
* 2.3:
  fixed typo
2016-02-23 16:11:10 +01:00
Fabien Potencier
5f08b45430 fixed typo 2016-02-23 16:09:32 +01:00
Nicolas Grekas
4d56e5674a Merge branch '2.7' into 2.8
* 2.7:
  Fixed a minor XML issue in a translation file
2016-02-23 13:13:47 +01:00
Nicolas Grekas
4b41b079f0 Merge branch '2.3' into 2.7
* 2.3:
  Fixed a minor XML issue in a translation file
2016-02-23 13:13:02 +01:00
Nicolas Grekas
4c304218b2 minor #17902 Fixed a minor XML issue in a translation file (javiereguiluz)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed a minor XML issue in a translation file

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

Commits
-------

3135742 Fixed a minor XML issue in a translation file
2016-02-23 13:12:09 +01:00
Martin Hasoň
ce0357e2a5 [DependencyInjection] Simplified code in AutowirePass 2016-02-23 13:01:22 +01:00
Javier Eguiluz
3135742c94 Fixed a minor XML issue in a translation file 2016-02-23 11:57:32 +01:00
Nicolas Grekas
7cab4f24ae Fix merge 2016-02-23 08:42:06 +01:00
Nicolas Grekas
1083ffe273 Merge branch '2.7' into 2.8
* 2.7:
  Fix merge
2016-02-23 08:41:20 +01:00
Nicolas Grekas
b58b3a83e5 Fix merge 2016-02-23 08:38:51 +01:00
Christian Flothmann
b43b79bd71 [DependencyInjection] replace alias in factories 2016-02-22 18:00:41 +01:00
Nicolas Grekas
af2d41939d Fix merge 2016-02-22 17:50:46 +01:00
Nicolas Grekas
8b36290e36 Merge branch '2.7' into 2.8
* 2.7:
  Fix merge
2016-02-22 17:41:45 +01:00
Nicolas Grekas
fd827b3366 Fix merge 2016-02-22 17:41:31 +01:00
Nicolas Grekas
07535e9e84 Merge branch '2.7' into 2.8
* 2.7:
  PhpUnitNoDedicateAssertFixer results
  Improve Norwegian translations
  Simplify markdown for PR template
2016-02-22 17:12:45 +01:00
Nicolas Grekas
ba35f3d7bb Merge branch '2.3' into 2.7
* 2.3:
  PhpUnitNoDedicateAssertFixer results
  Improve Norwegian translations
  Simplify markdown for PR template

Conflicts:
	src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
	src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
2016-02-22 17:12:29 +01:00
Nicolas Grekas
562d4d6ce0 [ci] clone with depth=1 to kill push-forced PRs 2016-02-22 17:04:21 +01:00
Fabien Potencier
4e253da47c bug #17865 [FrameworkBundle] disable the assets helper when assets are disabled (xabbuh)
This PR was merged into the 3.0 branch.

Discussion
----------

[FrameworkBundle] disable the assets helper when assets are disabled

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

Commits
-------

c18f781 disable the assets helper when assets are disabled
2016-02-22 16:34:00 +01:00
Jules Pietri
8f918e5f84 [Form] refactor RadioListMapper::mapDataToForm()
This fixes "false" choice pre selection when `ChoiceType`
is `expanded` and not `multiple`
2016-02-22 16:33:26 +01:00
Jules Pietri
3eac4693ad [Form] fix choice value "false" in ChoiceType 2016-02-22 16:33:26 +01:00
Fabien Potencier
9124c28b10 minor #17872 [CS] PHPUnit dedicate assert fixer acceptance test (SpacePossum)
This PR was merged into the 2.3 branch.

Discussion
----------

[CS] PHPUnit dedicate assert fixer acceptance test

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

The goal of this PR is _not_ to have it merge, but to check with SF community if a new Fixer (https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1792) should be added to the set of Symfony fixers (at PHP-CS-Fixer).

Commits
-------

7aff7f4 PhpUnitNoDedicateAssertFixer results
2016-02-22 16:29:01 +01:00
Fabien Potencier
5324e5b315 Merge branch '2.7' into 2.8
* 2.7:
  Update twig.html.twig
  [2.7] [FrameworkBundle] minor fix tests added by #17569
  fixed CS
  fixed CS
  documented the $url parameter better
  [Form] add test for ArrayChoiceList handling null
  [Form] fix edge cases with choice placeholder
  register commands from kernel when accessing list
  Update FileSystem
2016-02-22 16:02:30 +01:00
Fabien Potencier
24cdae71a1 minor #17883 Update twig.html.twig (tvlooy)
This PR was merged into the 2.7 branch.

Discussion
----------

Update twig.html.twig

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

Replace base64 template icon with svg version. If you set the Content-Security-Policy you would need to provide "img-src 'self' data:;" just for that icon (or get an error in the console). This should be fixed in the new version of the toolbar but it would be nice to have a fix for 2.7 LTS too.

Commits
-------

d29f04c Update twig.html.twig
2016-02-22 16:01:50 +01:00
Fabien Potencier
98a946a481 minor #17859 [2.7] [FrameworkBundle] minor fix tests added by #17569 (HeahDude)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [FrameworkBundle] minor fix tests added by #17569

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

Commits
-------

ce6e5ac [2.7] [FrameworkBundle] minor fix tests added by #17569
2016-02-22 15:50:41 +01:00
Tom Van Looy
d29f04c149 Update twig.html.twig
Replace base64 template icon with svg version. If you set the Content-Security-Policy you would need to provide "img-src 'self' data:;" just for that icon (or get an error in the console). This should be fixed in the new version of the toolbar but it would be nice to have a fix for 2.7 LTS too.
2016-02-22 14:30:57 +01:00
Benoît Burnichon
aaad5bd3d1 Add check on If-Range header
Also verify edge case where no last-modified header is available
2016-02-22 12:57:02 +01:00
SpacePossum
7aff7f42c1 PhpUnitNoDedicateAssertFixer results 2016-02-21 12:34:19 +01:00
Christian Flothmann
56f87982d8 replace alias in factory services 2016-02-20 20:14:11 +01:00
Christian Flothmann
c18f781684 disable the assets helper when assets are disabled 2016-02-20 17:58:32 +01:00
Fabien Potencier
d8ad5a2cd4 minor #17862 Improve Norwegian translations (valisj)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #17862).

Discussion
----------

Improve Norwegian translations

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

This PR (1) fixes multiple grammatical errors in the Norwegian translations and (2) adds missing translations.

Commits
-------

73a5d6c Improve Norwegian translations
2016-02-20 17:42:17 +01:00
Valentin Jonovs
73a5d6c684 Improve Norwegian translations 2016-02-20 17:42:01 +01:00
Fabien Potencier
095ebbed83 bug #17860 Fixed the antialiasing of the toolbar text (javiereguiluz)
This PR was merged into the 2.8 branch.

Discussion
----------

Fixed the antialiasing of the toolbar text

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

### Problem

The Symfony toolbar looks ugly in some situations (the text is too thin and unreadable); for example inside a SonataAdmin backend:

(top: toolbar in a normal page; bottom: toolbar in Sonata backend; if you don't see any difference, click on the image to zoom it)

#### Chrome

![before_chrome](https://cloud.githubusercontent.com/assets/73419/13181902/8836e586-d72f-11e5-9394-490f81978606.png)

#### Firefox

![before_firefox](https://cloud.githubusercontent.com/assets/73419/13181905/8cca5eac-d72f-11e5-9905-b85cb5249a45.png)

### Solution

The cause of this problem are the styles applied by the popular AdminLTE template used by Sonata and other admin bundles. The proposed changes neutralize any aliasing set by external CSS styles, so the toolbar is always displayed the same way:

#### Chrome

![after_chrome](https://cloud.githubusercontent.com/assets/73419/13182022/0e15fade-d730-11e5-8e0b-d5a712c7158e.png)

#### Firefox

![after_firefox](https://cloud.githubusercontent.com/assets/73419/13182024/104e3cb2-d730-11e5-83d8-86cb52b87358.png)

Commits
-------

5ad065d Fixed the antialiasing of the toolbar text
2016-02-20 17:32:08 +01:00