Commit Graph

21986 Commits

Author SHA1 Message Date
Fabien Potencier 82ed1bed6b Merge branch '2.7' into 2.8
* 2.7:
  [VarDumper] Fix missing support for dumping PHP7 return type
  [travis] disable symfony_debug ext when deps!=no
  Do not normalize the kernel root directory path (see symfony/symfony#15474).
  Don't trigger deprecation on interfaces
  [Debug] Ignore silencing for deprecations
  [ci] Run minimal versions on appveyor only
  Fix appveyor file
  consistently use str_replace to unify directory separators (remaining)
2015-08-31 14:33:08 +02:00
Fabien Potencier a1d0f539ac Merge branch '2.3' into 2.7
* 2.3:
  Do not normalize the kernel root directory path (see symfony/symfony#15474).
  [ci] Run minimal versions on appveyor only
  Fix appveyor file
2015-08-31 14:32:30 +02:00
Fabien Potencier db8ced4d8f bug #15649 [VarDumper] Fix missing support for dumping PHP7 return type (nicolas-grekas)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #15649).

Discussion
----------

[VarDumper] Fix missing support for dumping PHP7 return type

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

Commits
-------

b1bd068 [VarDumper] Fix missing support for dumping PHP7 return type
2015-08-31 14:28:11 +02:00
Nicolas Grekas b1bd06800a [VarDumper] Fix missing support for dumping PHP7 return type 2015-08-31 14:28:11 +02:00
Fabien Potencier 7dc224cdf6 minor #15660 [travis] disable symfony_debug ext when deps!=no (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[travis] disable symfony_debug ext when deps!=no

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

Commits
-------

cd446f5 [travis] disable symfony_debug ext when deps!=no
2015-08-31 14:23:27 +02:00
Fabien Potencier 05b54fe2b1 minor #15639 [ci] Run minimal versions on appveyor only (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Run minimal versions on appveyor only

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

Hopefully the last round of ci optimizations: what do you think about running the minimal supported version on appveyor only? This removes one matrix line on travis, and gives more flexibility in choosing the minimal version because, where travis only supports a limited list of minimal versions, windows.php.net provides a binary for each and every php ever released.

Commits
-------

e564805 [ci] Run minimal versions on appveyor only
2015-08-31 14:20:29 +02:00
Tobias Schultze 6376d281a1 minor #15658 Require security-acl 2.7 for BC (scaytrase)
This PR was squashed before being merged into the 2.8 branch (closes #15658).

Discussion
----------

Require security-acl 2.7 for BC

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

Commits
-------

6117c42 Require security-acl 2.7 for BC
2015-08-31 11:25:20 +02:00
Pavel Batanov 6117c425c1 Require security-acl 2.7 for BC 2015-08-31 11:25:15 +02:00
Nicolas Grekas cd446f5e2f [travis] disable symfony_debug ext when deps!=no 2015-08-31 08:55:10 +02:00
Fabien Potencier d25be883f6 minor #15651 Require actual version of ACL component until ACL/2.8 branch released (scaytrase)
This PR was squashed before being merged into the 2.8 branch (closes #15651).

Discussion
----------

Require actual version of ACL component until ACL/2.8 branch released

symfony/2.8@stable is not released, so version reference is incorrect.

This will allow require 2.8.x-dev version alongside with symfony/symfony:2.8.x-dev

Fix #15648

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | BC fix
| Deprecations? | no
| Tests pass?   | [not sure](https://travis-ci.org/scaytrase/symfony/builds/77840665)
| Fixed tickets | 15648
| License       | MIT
| Doc PR        | none

Commits
-------

2c7caaa Require actual version of ACL component until ACL/2.8 branch released
2015-08-30 21:01:56 +02:00
Pavel Batanov 2c7caaa096 Require actual version of ACL component until ACL/2.8 branch released 2015-08-30 21:01:54 +02:00
Fabien Potencier 43f5b9ea61 bug #15603 [HttpKernel] Do not normalize the kernel root directory path #15567 (leofeyer)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #15603).

Discussion
----------

[HttpKernel] Do not normalize the kernel root directory path #15567

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

Commits
-------

a53489e Do not normalize the kernel root directory path (see symfony/symfony#15474).
2015-08-30 20:55:52 +02:00
Leo Feyer a53489e49a Do not normalize the kernel root directory path (see symfony/symfony#15474). 2015-08-30 20:55:51 +02:00
Fabien Potencier 5368a4287a minor #15652 Don't trigger deprecation on interfaces (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Don't trigger deprecation on interfaces

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

This can trigger false positives when implementing the interface is required for bc reasons. The DebugClassLoader is able to trigger on demand at runtime when required.

Commits
-------

b5b10b3 Don't trigger deprecation on interfaces
2015-08-30 20:53:28 +02:00
Nicolas Grekas b5b10b3d54 Don't trigger deprecation on interfaces 2015-08-30 13:26:29 +02:00
Fabien Potencier 9d6fdc3b50 minor #15624 consistently use str_replace to unify directory separators (2.7) (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

consistently use str_replace to unify directory separators (2.7)

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

Remaining ones from #15614

Commits
-------

17ce649 consistently use str_replace to unify directory separators (remaining)
2015-08-29 21:20:26 +02:00
Fabien Potencier ce0e99300b bug #15647 [Debug] Ignore silencing for deprecations (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Ignore silencing for deprecations

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

Since the best practice is now to always silence deprecations, we should ignore the silencing level. This allows collecting the backtrace of deprecations.

Commits
-------

ccb3f56 [Debug] Ignore silencing for deprecations
2015-08-29 21:19:10 +02:00
Nicolas Grekas ccb3f562c5 [Debug] Ignore silencing for deprecations 2015-08-29 13:12:16 +02:00
Nicolas Grekas e564805b32 [ci] Run minimal versions on appveyor only 2015-08-29 12:34:03 +02:00
Tobias Schultze a1deb42ea6 minor #15609 Deprecated Security ClassUtils in favor of Acl ClassUtils (iltar)
This PR was merged into the 2.8 branch.

Discussion
----------

Deprecated Security ClassUtils in favor of Acl ClassUtils

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | symfony/symfony/issues/14718
| Relates to | symfony/security-acl/pull/3
| License       | MIT
| Doc PR        | ~

Should be removed from the core as it's only used in the Acl component.

Commits
-------

4278fe4 Deprecated Security ClassUtils in favor of Acl ClassUtils
2015-08-28 12:03:25 +02:00
Nicolas Grekas a6f8b7e22d Merge branch '2.7' into 2.8
* 2.7:
  [Console] ProgressBarTest::testAnsiColorsAndEmojis() requires extension mbstring
2015-08-27 23:38:49 +02:00
Nicolas Grekas f42dd21d49 [Console] ProgressBarTest::testAnsiColorsAndEmojis() requires extension mbstring 2015-08-27 23:38:40 +02:00
Nicolas Grekas 6fd4019975 Merge branch '2.7' into 2.8
* 2.7:
  [SecurityBundle] Skip SetAclCommandTest when sqlite is not available
2015-08-27 15:34:10 +02:00
Nicolas Grekas 8ae3dec060 minor #15631 [SecurityBundle] Skip SetAclCommandTest when sqlite is not available (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[SecurityBundle] Skip SetAclCommandTest when sqlite is not available

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

Commits
-------

95961a5 [SecurityBundle] Skip SetAclCommandTest when sqlite is not available
2015-08-27 15:33:52 +02:00
Nicolas Grekas f3b4fb0c3d minor #15632 [VarDumper] Windows compat for SplCasterTest (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[VarDumper] Windows compat for SplCasterTest

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

Commits
-------

d4a5ecb [VarDumper] Windows compat for SplCasterTest
2015-08-27 15:32:59 +02:00
Nicolas Grekas 95961a5aae [SecurityBundle] Skip SetAclCommandTest when sqlite is not available 2015-08-27 15:21:43 +02:00
Nicolas Grekas d4a5ecb843 [VarDumper] Windows compat for SplCasterTest 2015-08-27 15:18:38 +02:00
Iltar van der Berg 4278fe4477 Deprecated Security ClassUtils in favor of Acl ClassUtils 2015-08-27 12:12:18 +02:00
Nicolas Grekas bab9ac542c minor #15629 [Translation][Xliff loader] fixed check target node. (aitboudad)
This PR was merged into the 2.8 branch.

Discussion
----------

[Translation][Xliff loader] fixed check target node.

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

Commits
-------

09e88dc [Translation][Xliff loader] fixed check target node.
2015-08-27 11:20:46 +02:00
Abdellatif Ait boudad 09e88dc676 [Translation][Xliff loader] fixed check target node. 2015-08-27 08:47:02 +00:00
Nicolas Grekas 4353134903 Fix merge 2015-08-27 09:19:36 +02:00
Nicolas Grekas 1eede472cd Merge branch '2.7' into 2.8
* 2.7:
  Fix typo
2015-08-27 09:03:53 +02:00
Nicolas Grekas 283ba52142 Fix typo 2015-08-27 09:03:44 +02:00
Nicolas Grekas fb9838c2d4 Merge branch '2.7' into 2.8
* 2.7:
  Various fixes esp. on Windows
  Fix the validation of form resources to register the default theme
  Fix the retrieval of the value with property path when using a loader
  [appveyor] minor enhancements
  [Process] Disable failing tests on Windows
  [Translation] Fix the string casting in the XliffFileLoader
  Windows and Intl fixes
  Add appveyor.yml for C.I. on Windows
  [VarDumper] fixed HtmlDumper to target specific the head tag
  [travis] merge php: nightly and deps=high test-matrix lines
  consistently use str_replace to unify directory separators
  Support omitting the <target> node in an .xlf file.
  Fix the handling of values for multiple choice types
  moved PHP nightly to PHP 7.0
  [Security] Add missing docblock in PreAuthenticatedToken

Conflicts:
	.travis.yml
2015-08-27 08:53:13 +02:00
Nicolas Grekas 660449da08 bug #15625 Various fixes esp. on Windows (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Various fixes esp. on Windows

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

Commits
-------

464a1b3 Various fixes esp. on Windows
2015-08-27 08:47:33 +02:00
Nicolas Grekas 464a1b3152 Various fixes esp. on Windows 2015-08-27 08:45:45 +02:00
Nicolas Grekas 6dac13bc20 Fix appveyor file 2015-08-26 21:03:05 +02:00
Tobias Schultze 17ce6492d9 consistently use str_replace to unify directory separators (remaining) 2015-08-26 20:02:40 +02:00
Tobias Schultze 755f3c0223 Merge branch '2.3' into 2.7
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Templating/TemplateFilenameParser.php
2015-08-26 19:56:37 +02:00
Tobias Schultze 051cb35c8d bug #15428 Fix the validation of form resources to register the default theme (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix the validation of form resources to register the default theme

| 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

https://github.com/symfony/symfony/pull/14173 made some wrong changes, changing the behavior of the code. This reverts to the right behavior in affected places

Commits
-------

ea92610 Fix the validation of form resources to register the default theme
2015-08-26 19:46:48 +02:00
Tobias Schultze c9927bf277 bug #15623 Fix the retrieval of the value with property path when using a loader (stof)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix the retrieval of the value with property path when using a loader

| 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

the ChoiceType is transforming the form data to its value in case of non-expanded fields.

When creating the choice list from choices, this works fine when using a property path for the choice_value, because it has a safeguard against values which are not object or arrays (a typical case being ``null`` because nothing is selected yet).
However, when loading from a ChoiceLoader, the generated closure was missing the same safeguard, breaking the usage of ChoiceLoader with property path.
This went unnoticed because the only usage of choice_loader in core is for the doctrine type, and this one uses its own logic to get the choice value

I added test on the PropertyAccessDecorator directly, to have fast tests. We could imagine adding tests in the ChoiceTypeTest using a ChoiceLoader too, matching all existing tests for other ways to specify arguments, but I'm not sure it is worth it.

Commits
-------

5df64dc Fix the retrieval of the value with property path when using a loader
2015-08-26 19:45:33 +02:00
Christophe Coevoet ea92610a85 Fix the validation of form resources to register the default theme 2015-08-26 18:52:32 +02:00
Christophe Coevoet 5df64dca52 Fix the retrieval of the value with property path when using a loader 2015-08-26 18:42:09 +02:00
Fabien Potencier bdfc9dc7b3 minor #15614 consistently use str_replace to unify directory separators (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

consistently use str_replace to unify directory separators

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

We used a mix of `str_replace` and `strtr` for the same thing. `str_replace` is faster as [I tested myself](https://3v4l.org/MNrgC) which is logical since strtr adds logic we don't need here.

Commits
-------

b9760ef consistently use str_replace to unify directory separators
2015-08-26 18:41:06 +02:00
Nicolas Grekas fac7f2146e Merge branch '2.3' into 2.7
* 2.3:
  [appveyor] minor enhancements
2015-08-26 16:20:37 +02:00
Nicolas Grekas 0df822d466 minor #15621 [appveyor] minor enhancements (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[appveyor] minor enhancements

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

Commits
-------

ea9780e [appveyor] minor enhancements
2015-08-26 16:13:30 +02:00
Nicolas Grekas ea9780e4ac [appveyor] minor enhancements 2015-08-26 16:04:28 +02:00
Nicolas Grekas c63bcbe3d3 [Process] Disable failing tests on Windows 2015-08-26 13:41:45 +02:00
Nicolas Grekas 7f4f7131dd Merge branch '2.3' into 2.7
* 2.3:
  [Translation] Fix the string casting in the XliffFileLoader

Conflicts:
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
2015-08-26 12:49:32 +02:00
Nicolas Grekas e924d567e9 Merge branch '2.3' into 2.7
* 2.3:
  Windows and Intl fixes
  Add appveyor.yml for C.I. on Windows
  [travis] merge php: nightly and deps=high test-matrix lines
  [Security] Add missing docblock in PreAuthenticatedToken

Conflicts:
	.travis.yml
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/HttpFoundation/JsonResponse.php
	src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
2015-08-26 12:48:03 +02:00