Commit Graph

24050 Commits

Author SHA1 Message Date
Nicolas Grekas
1d8d43b4e7 Merge branch '2.7' into 2.8
* 2.7:
  [VarDumper] Fix tests on PHP 7
  [DomCrawler] Clarify the value returned by getPhpFiles()
  [DependencyInjection] Fix #16461 Let Container::set() replace existing aliases
  avoid (string) catchable fatal error for instances of __PHP_Incomplete_Class
  remove unnecessary retrieval and setting of data
  avoid (string) catchable fatal error for __PHP_Incomplete_Class instances
  sendContent return as parent.
  [FrameworkBundle] Fix a typo
  Added more exceptions to singularify method
2016-02-13 10:21:29 +01:00
Nicolas Grekas
ec7b3f2053 Merge branch '2.3' into 2.7
* 2.3:
  [DomCrawler] Clarify the value returned by getPhpFiles()
  [DependencyInjection] Fix #16461 Let Container::set() replace existing aliases
  Added more exceptions to singularify method
2016-02-13 10:21:13 +01:00
Fabien Potencier
80e08d33e4 minor #17781 [VarDumper] Fix tests on PHP 7 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fix tests on PHP 7

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

Supersedes #17775

Commits
-------

5d433ca [VarDumper] Fix tests on PHP 7
2016-02-13 06:26:59 +01:00
Nicolas Grekas
5d433cab96 [VarDumper] Fix tests on PHP 7 2016-02-12 18:39:33 +01:00
Fabien Potencier
9e598a464f minor #17767 [2.8] [Validator] Update validators.fr.xlf (raziel057)
This PR was merged into the 2.8 branch.

Discussion
----------

[2.8] [Validator] Update validators.fr.xlf

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

Commits
-------

0a5df6f Update validators.fr.xlf
2016-02-12 17:18:49 +01:00
Fabien Potencier
1be2d34e16 minor #17776 [DomCrawler] Clarify the value returned by getPhpFiles() (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] Clarify the value returned by getPhpFiles()

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

The comment was previously suggesting the returned value is similar to the one stored in $_FILES, while it is more similar to the way PHP stores submitted form values. It is actually more convenient to have it this way, so rather then changing the returned value (which would break BC), it is better to clarify the comment.

Commits
-------

a694401 [DomCrawler] Clarify the value returned by getPhpFiles()
2016-02-12 17:13:24 +01:00
Jakub Zalas
a694401e35 [DomCrawler] Clarify the value returned by getPhpFiles()
The comment was previously suggesting the returned value is similar to the one stored in $_FILES, while it is more similar to the way PHP stores submitted form values. It is actually more convenient to have it this way, so rather then changing the returned value (which would break BC), it is better to clarify the comment.
2016-02-12 10:10:06 +00:00
Fabien Potencier
2799b1cf04 bug #17742 [DependencyInjection] Fix #16461 Container::set() replace aliases (mnapoli)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17742).

Discussion
----------

[DependencyInjection] Fix #16461 Container::set() replace aliases

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

`Container::set()` now overrides any previously alias defined with the same name. Please see #16461 for the background.

Example:

- given `event_dispatcher` is an alias to `debug.event_dispatcher`
- when I run: `$container->set('event_dispatcher', new FakeEventDispatcher)`
- *before this patch*: nothing happens
- *after this patch*: the `event_dispatcher` is now my fake event dispatcher

Commits
-------

be85d16 [DependencyInjection] Fix #16461 Let Container::set() replace existing aliases
2016-02-12 09:48:06 +01:00
Matthieu Napoli
be85d16940 [DependencyInjection] Fix #16461 Let Container::set() replace existing aliases
`Container::set()` now overrides any previously alias defined with the same name.
2016-02-12 09:48:06 +01:00
Fabien Potencier
92d291a17c bug #17745 Added more exceptions to singularify method (javiereguiluz)
This PR was merged into the 2.3 branch.

Discussion
----------

Added more exceptions to singularify method

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

Added exceptions for `series`, `news` and `services`.

Commits
-------

f5daa0d Added more exceptions to singularify method
2016-02-12 07:37:13 +01:00
Fabien Potencier
ca6f1f7428 bug #17691 Fixed (string) catchable fatal error for PHP Incomplete Class instances (yceruto)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #17691).

Discussion
----------

Fixed (string) catchable fatal error for PHP Incomplete Class instances

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

Commits
-------

4b7ed98 avoid (string) catchable fatal error for instances of __PHP_Incomplete_Class
2016-02-12 07:25:11 +01:00
Yonel Ceruto
4b7ed987dd avoid (string) catchable fatal error for instances of __PHP_Incomplete_Class 2016-02-12 07:25:11 +01:00
Fabien Potencier
4598b74906 Merge branch '2.3' into 2.7
* 2.3:
  remove unnecessary retrieval and setting of data
  avoid (string) catchable fatal error for __PHP_Incomplete_Class instances
  sendContent return as parent.
  [FrameworkBundle] Fix a typo
2016-02-12 07:23:50 +01:00
Fabien Potencier
81d654fb5c bug #17766 Fixed (string) catchable fatal error for PHP Incomplete Class instances (yceruto)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed (string) catchable fatal error for PHP Incomplete Class instances

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

Fixing for 2.3 branch.

Commits
-------

bb29979 avoid (string) catchable fatal error for __PHP_Incomplete_Class instances
2016-02-12 07:16:22 +01:00
Tobias Schultze
d0324e4795 minor #17763 Remove unnecessary retrieval and setting of data (Trent Steel)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #17763).

Discussion
----------

Remove unnecessary retrieval and setting of data

| Q             | A
| ------------- | ---
| Bug fix?      | No
| New feature?  | No - optimisation
| BC breaks?    | No
| Deprecations? | No
| Tests pass?   | Yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | None

Commits
-------

ea52400 remove unnecessary retrieval and setting of data
2016-02-12 00:13:45 +01:00
Trent Steel
ea52400097 remove unnecessary retrieval and setting of data 2016-02-12 00:13:18 +01:00
Thomas Lallement
0a5df6f11a Update validators.fr.xlf 2016-02-11 16:57:09 +01:00
Yonel Ceruto
bb29979218 avoid (string) catchable fatal error for __PHP_Incomplete_Class instances 2016-02-11 09:15:16 -05:00
Fabien Potencier
730a472721 bug #17757 [HttpFoundation] BinaryFileResponse sendContent return as parent. (2.3) (SpacePossum)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] BinaryFileResponse sendContent return as parent. (2.3)

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

`BinaryFileResponse` extends `Response` and overrides the `sendContent`-method. It would be nice if it also returns as the parent does, i.e. itself. This makes it easier to deal with diff. `Response` classes.
The other fixes are to make SCA easier. No BC-breaks AFAIK.

Commits
-------

120dfe4 sendContent return as parent.
2016-02-11 10:27:07 +01:00
possum
120dfe48a6 sendContent return as parent. 2016-02-10 20:09:02 +01:00
Jakub Zalas
b1e5149ec9 bug #17748 [DomCrawler] Remove the overridden getHash() method to prevent problems when cloning the crawler (jakzal)
This PR was merged into the 2.8 branch.

Discussion
----------

[DomCrawler] Remove the overridden getHash() method to prevent problems when cloning the crawler

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

Overriding the `SplObjectStorage::getHash()` is affected by a [PHP bug](https://bugs.php.net/bug.php?id=67582), which makes the Crawler unusable in Symfony 2.8 for anyone who relied on `SplObjectStorage` methods.

Removing the `getHash()` method means we will no longer trigger the deprecation error. Given this method is unlikely to be used directly and other `SplObjectStorage` methods will trigger the error, it is the simplest thing we can do to maintain BC.

Commits
-------

3d7f6c6 [DomCrawler] Remove the overridden getHash() method to prevent problems when cloning the crawler
2016-02-10 15:16:32 +00:00
Jakub Zalas
3d7f6c69c2 [DomCrawler] Remove the overridden getHash() method to prevent problems when cloning the crawler
Overriding the SplObjectStorage::getHash() is affected by a PHP bug (https://bugs.php.net/bug.php?id=67582),
which makes the Crawler unusable in Symfony 2.8 for anyone who relied on SplObjectStorage methods.
Removing the getHash() method means we will no longer trigger the deprecation error. Given this method
is unlikely to be used directly and other SplObjectStorage methods will trigger the error, it is the simplest
thing we can do to maintain BC.
2016-02-10 13:25:51 +00:00
Christian Flothmann
bb85161de9 minor #17747 [FrameworkBundle] Fix a typo (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix a typo

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

Commits
-------

89133e6 [FrameworkBundle] Fix a typo
2016-02-10 12:08:23 +01:00
Jakub Zalas
89133e6a71 [FrameworkBundle] Fix a typo 2016-02-10 10:18:08 +00:00
Javier Eguiluz
f5daa0dea9 Added more exceptions to singularify method 2016-02-09 22:08:46 +01:00
Fabien Potencier
3c382c54c5 bug #17725 [WebProfilerBundle] Add width attribute on SVG - Fix toolbar profiler on microsoft edge (AlexandrePavy)
This PR was submitted for the 3.0 branch but it was merged into the 2.8 branch instead (closes #17725).

Discussion
----------

[WebProfilerBundle] Add width attribute on SVG - Fix toolbar profiler on microsoft edge

Fix Debug Toolbar on microsoft Edge

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

I found one issue on Microsoft edge with debug toolbar

<img width="1080" alt="issue debug toolbar issue" src="https://cloud.githubusercontent.com/assets/6603411/12887804/fdf4496a-ce76-11e5-8253-9be3861925ec.png">

i fixed the issue add width parameter on all SVG

<img width="1080" alt="fix microsoft edge" src="https://cloud.githubusercontent.com/assets/6603411/12887813/0a1e588e-ce77-11e5-825c-a9a0bb63b526.png">

Reponsive design fixed

<img width="537" alt="fix responsive design toolbar" src="https://cloud.githubusercontent.com/assets/6603411/12887825/180783c6-ce77-11e5-90c3-21e5d7759930.png">

Commits
-------

0ba88c2 Add width attribute on SVG
2016-02-09 21:05:33 +01:00
Alexandre Pavy
0ba88c2a44 Add width attribute on SVG
Fix Debug Toolbar on microsoft Edge
2016-02-09 21:05:23 +01:00
Fabien Potencier
d61ca3d650 bug #17703 [FrameworkBundle] Support autowiring for TranslationInterface (dunglas)
This PR was squashed before being merged into the 2.8 branch (closes #17703).

Discussion
----------

[FrameworkBundle] Support autowiring for TranslationInterface

| 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

Commits
-------

2419725 [FrameworkBundle] Support autowiring for TranslationInterface
2016-02-09 20:51:46 +01:00
Kévin Dunglas
2419725cbb [FrameworkBundle] Support autowiring for TranslationInterface 2016-02-09 20:51:45 +01:00
Fabien Potencier
9d04018350 bug #17613 [WebProfiler] Fixed logo and menu profiler for Microsoft Edge (WhiteEagle88)
This PR was merged into the 2.8 branch.

Discussion
----------

[WebProfiler] Fixed logo and menu profiler for Microsoft Edge

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

Commits
-------

d120c08 [WebProfiler] Fixed styles for search block and menu profiler for IE Edge
2016-02-08 08:35:16 +01:00
Nicolas Grekas
6e755c50f5 Merge branch '2.7' into 2.8
* 2.7:
  [TwigBridge] forward compatibility with Yaml 3.1
2016-02-05 12:35:35 +01:00
Nicolas Grekas
ae0b5fa382 Merge branch '2.3' into 2.7
* 2.3:
  [TwigBridge] forward compatibility with Yaml 3.1
2016-02-05 12:35:20 +01:00
Nicolas Grekas
01b562b2cd bug #17702 [TwigBridge] forward compatibility with Yaml 3.1 (xabbuh)
This PR was submitted for the 3.0 branch but it was merged into the 2.3 branch instead (closes #17702).

Discussion
----------

[TwigBridge] forward compatibility with Yaml 3.1

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

Commits
-------

047c195 [TwigBridge] forward compatibility with Yaml 3.1
2016-02-05 12:33:25 +01:00
Christian Flothmann
047c1953d2 [TwigBridge] forward compatibility with Yaml 3.1 2016-02-05 12:33:24 +01:00
Nicolas Grekas
afe4cbbfae Merge branch '2.7' into 2.8
* 2.7:
  [appveyor] Ignore failures due to STATUS_ACCESS_VIOLATION errors
2016-02-04 15:44:13 +01:00
Nicolas Grekas
927fe13af2 Merge branch '2.3' into 2.7
* 2.3:
  [appveyor] Ignore failures due to STATUS_ACCESS_VIOLATION errors
2016-02-04 15:43:56 +01:00
Nicolas Grekas
2573a380f8 minor #17686 [appveyor] Ignore failures due to STATUS_ACCESS_VIOLATION errors (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[appveyor] Ignore failures due to STATUS_ACCESS_VIOLATION errors

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

E.g. https://ci.appveyor.com/project/fabpot/symfony/build/1.0.5754#L1525

Commits
-------

1d4ea39 [appveyor] Ignore failures due to STATUS_ACCESS_VIOLATION errors
2016-02-04 15:43:31 +01:00
Nicolas Grekas
1d4ea39512 [appveyor] Ignore failures due to STATUS_ACCESS_VIOLATION errors 2016-02-04 15:25:59 +01:00
Nicolas Grekas
1a8ee4fb7a Merge branch '2.7' into 2.8
* 2.7:
  add files used in FileResource objects
2016-02-04 14:53:00 +01:00
Nicolas Grekas
3af65d72ec Merge branch '2.3' into 2.7
* 2.3:
  add files used in FileResource objects
2016-02-04 14:52:46 +01:00
Nicolas Grekas
0114091e02 bug #17673 [Routing] add files used in FileResource objects (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Routing] add files used in FileResource objects

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

Starting with Symfony 3.1, the constructor of the `FileResource` class
will throw an exception when the passed file does not exist.

Commits
-------

73afd0f add files used in FileResource objects
2016-02-04 14:51:25 +01:00
Nicolas Grekas
876bad9730 bug #17672 [DependencyInjection][Routing] add files used in FileResource objects (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection][Routing] add files used in FileResource objects

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

Starting with Symfony 3.1, the constructor of the `FileResource` class
will throw an exception when the passed file does not exist.

Commits
-------

4f865c7 add files used in FileResource objects
2016-02-04 14:49:46 +01:00
Nicolas Grekas
85cad75976 Merge branch '2.7' into 2.8
* 2.7:
  [Routing] added a suggestion to add the HttpFoundation component.
  [travis] Add some comments
  changed operator from and to &&
  Fixed the Bootstrap form theme for inlined checkbox/radio

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
2016-02-04 13:12:02 +01:00
Nicolas Grekas
fc939580ab Merge branch '2.3' into 2.7
* 2.3:
  [travis] Add some comments
  changed operator from and to &&

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
2016-02-04 13:09:54 +01:00
Fabien Potencier
a1e4560cf5 minor #17664 [Routing] added a suggestion to add the HttpFoundation component. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[Routing] added a suggestion to add the HttpFoundation component.

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

Commits
-------

a45e8bb [Routing] added a suggestion to add the HttpFoundation component.
2016-02-04 08:01:18 +01:00
Fabien Potencier
c8678f4de6 bug #17669 [Console] remove readline support (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Console] remove readline support

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

Commits
-------

0e45a4a [Console] remove readline support
2016-02-04 07:59:11 +01:00
Fabien Potencier
9983cfbdc8 bug #17600 Fixed the Bootstrap form theme for inlined checkbox/radio (javiereguiluz)
This PR was merged into the 2.7 branch.

Discussion
----------

Fixed the Bootstrap form theme for inlined checkbox/radio

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

@qferr provided the solution for this bug. I only verified it and created the PR.

@aderuwe @JHGitty @tjaadvd all of you took part in the original discussion. Could you please verify if this change fixes your issues? Thanks.

Commits
-------

cb1a921 Fixed the Bootstrap form theme for inlined checkbox/radio
2016-02-04 07:16:44 +01:00
Christian Flothmann
73afd0f0e7 add files used in FileResource objects
Starting with Symfony 3.1, the constructor of the `FileResource` class
will throw an exception when the passed file does not exist.
2016-02-03 19:56:51 +01:00
Christian Flothmann
4f865c758a add files used in FileResource objects
Starting with Symfony 3.1, the constructor of the `FileResource` class
will throw an exception when the passed file does not exist.
2016-02-03 19:52:07 +01:00
Christian Flothmann
0e45a4a5de [Console] remove readline support 2016-02-03 19:01:35 +01:00