Commit Graph

25950 Commits

Author SHA1 Message Date
Nicolas Grekas
e7d7e1ee38 Merge branch '2.7' into 2.8
* 2.7:
  [travis] Disable hirak/prestissimo for deps=low/high tests
  [HttpFoundation] fix phpdoc of UploadedFile
  Lower complexity of Form:isValid()
  skipped dns-sensitive tests when DnsMock is not found
  [FrameworkBundle] Return the invokable service if its name is the class name
  [ci] Skip dns-sensitive tests when DnsMock is not found
  Exclude Bridge\PhpUnit from composer.json by default
  fixed CS
  Optimize ReplaceAliasByActualDefinitionPass
  [Process] use __METHOD__ where applicable
  [Routing] Don't needlessly execute strtr's as they are fairly expensive
2016-04-02 09:57:47 +02:00
Nicolas Grekas
eb23f056f0 Merge branch '2.3' into 2.7
* 2.3:
  [travis] Disable hirak/prestissimo for deps=low/high tests
  [HttpFoundation] fix phpdoc of UploadedFile
  [ci] Skip dns-sensitive tests when DnsMock is not found
  Optimize ReplaceAliasByActualDefinitionPass
  [Process] use __METHOD__ where applicable

Conflicts:
	.travis.yml
	src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessBuilder.php
2016-04-02 09:48:01 +02:00
Nicolas Grekas
131436525f minor #18404 [HttpFoundation] fix phpdoc of UploadedFile (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] fix phpdoc of UploadedFile

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

Commits
-------

cbcac56 [HttpFoundation] fix phpdoc of UploadedFile
2016-04-02 09:17:49 +02:00
Nicolas Grekas
2ce5d54fbe minor #18410 [travis] Disable hirak/prestissimo for deps=low/high tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Disable hirak/prestissimo for deps=low/high tests

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

Concurrent composer updates + prestissimo for deps=low/high matrix lines make tests transient.
Lets test each component in its own `$HOME`.

Commits
-------

b8205a8 [travis] Disable hirak/prestissimo for deps=low/high tests
2016-04-02 09:17:12 +02:00
Nicolas Grekas
b8205a8330 [travis] Disable hirak/prestissimo for deps=low/high tests 2016-04-02 09:08:03 +02:00
Nicolas Grekas
3d20b6c46b [Process] Add InputStream to seamlessly feed running processes 2016-04-01 20:36:34 +02:00
Charles Sarrazin
579e8d4d6c Update README.md 2016-04-01 19:25:50 +02:00
Fabien Potencier
ca18ddc4fc bug #18407 Fixed the "hover" state of the profiler sidebar menu (javiereguiluz)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #18407).

Discussion
----------

Fixed the "hover" state of the profiler sidebar menu

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

### Before

![before_sidebar](https://cloud.githubusercontent.com/assets/73419/14209368/2cc6e168-f824-11e5-91e7-70fab8d64d12.gif)

### After

![after_sidebar](https://cloud.githubusercontent.com/assets/73419/14209376/3295d7a2-f824-11e5-94b5-254f1fc4e027.gif)

Commits
-------

85deb30 Fixed the "hover" state of the profiler sidebar menu
2016-04-01 17:17:25 +02:00
Javier Eguiluz
85deb30859 Fixed the "hover" state of the profiler sidebar menu 2016-04-01 17:17:24 +02:00
Tobias Schultze
cbcac5632b [HttpFoundation] fix phpdoc of UploadedFile 2016-04-01 13:54:44 +02:00
Jules Pietri
f29bf4cd4a Refactor ArgumentResolverTest 2016-04-01 11:46:27 +02:00
Jules Pietri
cee5106960 cs fixes 2016-04-01 11:46:27 +02:00
Iltar van der Berg
cfcf764d24 Added an ArgumentResolver with clean extension point 2016-04-01 11:46:27 +02:00
Iltar van der Berg
360fc5fc4b Extracting arg resolving from ControllerResolver 2016-04-01 11:46:27 +02:00
Tobias Schultze
c41d377e79 minor #18397 fixed typo (fabpot)
This PR was merged into the 3.0 branch.

Discussion
----------

fixed typo

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

As of Symfony 3.0, we only get the _format from the request attributes. Before, we also looked at the request query string, ... This PR fixes the phpdoc for Symfony 3.x.

Commits
-------

78830a1 fixed typo
2016-04-01 11:30:30 +02:00
Nicolas Grekas
8e1c60af3c Merge branch '3.0'
* 3.0:
  [Intl] Fix int32 min boundary check
  [VarDumper] Relax tests to pass on appveyor
  Fixed the styles of the Symfony icon in the web debug toolbar
2016-04-01 10:39:52 +02:00
Nicolas Grekas
2ca1950893 Merge branch '2.8' into 3.0
* 2.8:
  [VarDumper] Relax tests to pass on appveyor
  Fixed the styles of the Symfony icon in the web debug toolbar
2016-04-01 10:39:25 +02:00
Nicolas Grekas
42dd362aab bug #18399 [Intl] Fix int32 min boundary check (nicolas-grekas)
This PR was merged into the 3.0 branch.

Discussion
----------

[Intl] Fix int32 min boundary check

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

This is the right fix, introduced in a bad merge.

Commits
-------

f29476e [Intl] Fix int32 min boundary check
2016-04-01 10:38:22 +02:00
Fabien Potencier
83bb723dbb minor #18400 Lower complexity of Form:isValid() (krzysiekpiasecki)
This PR was squashed before being merged into the 2.7 branch (closes #18400).

Discussion
----------

Lower complexity of Form:isValid()

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

Replace #18391
- use Yoda condition,
- merge into 2.7 branch

Why?

- lower LOC
- less return expressions
- lower complexity
- more readable comparison

Commits
-------

d583ec3 Lower complexity of Form:isValid()
2016-04-01 09:09:21 +02:00
Krzysztof Piasecki
d583ec3543 Lower complexity of Form:isValid() 2016-04-01 09:09:19 +02:00
Fabien Potencier
35be993861 feature #18167 [DependencyInjection] Fix a limitation of the PhpDumper (Ener-Getick)
This PR was squashed before being merged into the 3.1-dev branch (closes #18167).

Discussion
----------

[DependencyInjection] Fix a limitation of the PhpDumper

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

The ``PhpDumper`` cannot currently dump several services' id containing characters unsupported by php.
This PR tries to solve this issue by removing the unsupported characters and by sufixing their camelized association to avoid conflicts.

Commits
-------

0d147b2 [DependencyInjection] Fix a limitation of the PhpDumper
2016-04-01 08:52:24 +02:00
Ener-Getick
0d147b254b [DependencyInjection] Fix a limitation of the PhpDumper 2016-04-01 08:52:19 +02:00
Fabien Potencier
c5b792c65f minor #18389 Exclude Bridge\PhpUnit from composer.json by default (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Exclude Bridge\PhpUnit from composer.json by default

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #18381, #18272
| License       | MIT
| Doc PR        | -

Commits
-------

4f90495 Exclude Bridge\PhpUnit from composer.json by default
2016-04-01 08:35:52 +02:00
Nicolas Grekas
f29476e514 [Intl] Fix int32 min boundary check 2016-04-01 08:34:33 +02:00
Fabien Potencier
aa459497bd feature #18387 [DX] [LDAP] Added default service name for the Security component's Ldap providers (csarrazi)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[DX] [LDAP] Added default service name for the Security component's Ldap providers

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

This PR adds a default service name (`ldap`) for the Security component's Ldap factories (`LdapFactory`, `FormLoginLdapFactory` and `HttpBasicLdapFactory`.

Commits
-------

29e3d38 Added default service name for the Security component's Ldap providers
2016-04-01 08:33:02 +02:00
Fabien Potencier
4b0b3d95a8 minor #18396 upgrade 3.1/4.0 minor cs fixes (HeahDude)
This PR was merged into the 3.1-dev branch.

Discussion
----------

upgrade 3.1/4.0 minor cs fixes

| Q             | A
| ------------- | ---
| Branch?       | master
| License       | MIT

Commits
-------

b8e2911 upgrade 3.1/4.0 minor fixes
2016-04-01 08:31:30 +02:00
Fabien Potencier
d177747812 feature #18290 [Translation] deprecate the backup feature (xabbuh)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Translation] deprecate the backup feature

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/16912#issuecomment-165753061
| License       | MIT
| Doc PR        |

Commits
-------

6c3ddf1 [Translation] deprecate the backup feature
2016-04-01 08:29:04 +02:00
Jules Pietri
b8e29110ca upgrade 3.1/4.0 minor fixes 2016-04-01 08:28:05 +02:00
Fabien Potencier
b3580ce832 minor #18398 skipped dns-sensitive tests when DnsMock is not found (2.7) (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

skipped dns-sensitive tests when DnsMock is not found (2.7)

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

Commits
-------

efc1de7 skipped dns-sensitive tests when DnsMock is not found
2016-04-01 08:18:52 +02:00
Fabien Potencier
ffb4ff3fec bug #18394 [FrameworkBundle][2.7] Return the invokable service if its name is the class name (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle][2.7] Return the invokable service if its name is the class name

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

Backport #18289 to 2.7 as this is a bug fix.

Commits
-------

5c87d76 [FrameworkBundle] Return the invokable service if its name is the class name
2016-04-01 08:15:08 +02:00
Fabien Potencier
efc1de7786 skipped dns-sensitive tests when DnsMock is not found 2016-04-01 08:10:39 +02:00
Fabien Potencier
9d45acc6a5 minor #18392 [ci] Skip dns-sensitive tests when DnsMock is not found (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Skip dns-sensitive tests when DnsMock is not found

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

Commits
-------

7e01187 [ci] Skip dns-sensitive tests when DnsMock is not found
2016-04-01 08:07:56 +02:00
Fabien Potencier
0756bbe4ed minor #18393 [VarDumper] Relax tests to pass on appveyor (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[VarDumper] Relax tests to pass on appveyor

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

Commits
-------

6dbb117 [VarDumper] Relax tests to pass on appveyor
2016-04-01 08:06:35 +02:00
Fabien Potencier
78830a16fc fixed typo 2016-04-01 08:03:58 +02:00
Kévin Dunglas
5c87d766d5 [FrameworkBundle] Return the invokable service if its name is the class name 2016-03-31 22:45:44 +02:00
Nicolas Grekas
6dbb11719e [VarDumper] Relax tests to pass on appveyor 2016-03-31 22:42:22 +02:00
Nicolas Grekas
7e01187781 [ci] Skip dns-sensitive tests when DnsMock is not found 2016-03-31 22:06:39 +02:00
Nicolas Grekas
4f90495e59 Exclude Bridge\PhpUnit from composer.json by default 2016-03-31 20:43:11 +02:00
Christian Flothmann
6c3ddf1d88 [Translation] deprecate the backup feature 2016-03-31 20:23:24 +02:00
Charles Sarrazin
29e3d389e5 Added default service name for the Security component's Ldap providers 2016-03-31 18:22:22 +02:00
Jules Pietri
7df9ca2aeb [Form] fix "prototype" not required when parent form is not required 2016-03-31 14:29:18 +02:00
Fabien Potencier
b03d370be0 feature #18036 [Serializer] XmlEncoder: Make load flags configurable (dunglas)
This PR was squashed before being merged into the 3.1-dev branch (closes #18036).

Discussion
----------

[Serializer] XmlEncoder: Make load flags configurable

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

Commits
-------

0826068 [Serializer] XmlEncoder: Make load flags configurable
2016-03-31 12:08:54 +02:00
Kévin Dunglas
08260680e4 [Serializer] XmlEncoder: Make load flags configurable 2016-03-31 12:08:49 +02:00
Fabien Potencier
ba1cd26237 fixed CS 2016-03-31 12:00:43 +02:00
Fabien Potencier
f03dc6eec5 minor #18257 [Routing] Don't needlessly execute strtr's as they are fairly expensive (arjenm)
This PR was merged into the 2.7 branch.

Discussion
----------

[Routing] Don't needlessly execute strtr's as they are fairly expensive

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | refactor
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | see discussion in #18230
| License       | MIT
| Doc PR        | see #18230

As requested in #18230 this is a new version of the prevention of using strtr's. I've posted some performance-numbers in that PR as well.

Commits
-------

b3da6a1 [Routing] Don't needlessly execute strtr's as they are fairly expensive
2016-03-31 11:59:59 +02:00
Fabien Potencier
8acc6010ad made test clearer 2016-03-31 11:55:22 +02:00
Fabien Potencier
f76e99b9f4 bug #18320 [FrameworkBundle] Fix Templating Engine autowiring (dunglas)
This PR was squashed before being merged into the 3.1-dev branch (closes #18320).

Discussion
----------

[FrameworkBundle] Fix Templating Engine autowiring

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/18242#discussion_r57471337
| License       | MIT
| Doc PR        | n/a

Commits
-------

c4ccfac [FrameworkBundle] Fix Templating Engine autowiring
2016-03-31 11:54:22 +02:00
Kévin Dunglas
c4ccfac047 [FrameworkBundle] Fix Templating Engine autowiring 2016-03-31 11:54:21 +02:00
Fabien Potencier
e4816def29 bug #18347 Fixed the styles of the Symfony icon in the web debug toolbar (javiereguiluz)
This PR was merged into the 2.8 branch.

Discussion
----------

Fixed the styles of the Symfony icon in the web debug toolbar

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

### Before

![symfony_icon_before](https://cloud.githubusercontent.com/assets/73419/14114615/d63240fc-f5d7-11e5-9cd2-b0a67077dbe7.png)

### After

![symfony_icon_after](https://cloud.githubusercontent.com/assets/73419/14114617/d95e7cc8-f5d7-11e5-8ff3-6e706b8c5de8.png)

---

@WhiteEagle88 the change from `24` to `40` was made in [this commit](d120c08f8b) of yours to fix some problems with Microsoft Edge browser. Could you please check if this pull request breaks anything for you? Thanks!

Commits
-------

ddc8d4e Fixed the styles of the Symfony icon in the web debug toolbar
2016-03-31 11:51:31 +02:00
Fabien Potencier
9945d8a159 bug #18265 Optimize ReplaceAliasByActualDefinitionPass (ajb-in)
This PR was merged into the 2.3 branch.

Discussion
----------

Optimize ReplaceAliasByActualDefinitionPass

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

Previous implementation passed over every definition for every alias (n*m runtime).
New implementation passes once over all aliases and once over all definitions (n+m).
Also removing needless "restart" logic.

Commits
-------

ab8dc0c Optimize ReplaceAliasByActualDefinitionPass
2016-03-31 11:36:43 +02:00