Commit Graph

25013 Commits

Author SHA1 Message Date
Nicolas Grekas
aae8c5587f Merge branch '2.8' into 3.0
* 2.8:
  [TwigBridge] forward compatibility with Yaml 3.1
2016-02-05 12:35:50 +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
Christian Flothmann
b34653f9cd feature #17578 [Yaml] dump customization option with dumper flags (xabbuh)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Yaml] dump customization option with dumper flags

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

Commits
-------

286103b [Yaml] dump customization option with dumper flags
2016-02-05 08:58:37 +01:00
Nicolas Grekas
512abd7741 minor #17697 [Serializer] Add missing @requires annotations (nicolas-grekas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Serializer] Add missing `@requires` annotations

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

Commits
-------

6de5b40 [Serializer] Add missing `@requires` annotations
2016-02-05 08:29:09 +01:00
Nicolas Grekas
6de5b403ec [Serializer] Add missing @requires annotations 2016-02-05 08:26:32 +01:00
Nicolas Grekas
4dde7a5e7e Merge branch '3.0'
* 3.0:
  [appveyor] Ignore failures due to STATUS_ACCESS_VIOLATION errors

Conflicts:
	src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
2016-02-04 15:47:41 +01:00
Nicolas Grekas
8385cd6e15 minor #17685 [Serializer] Add missing TZ to tests (nicolas-grekas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Serializer] Add missing TZ to tests

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

Commits
-------

443dc24 [Serializer] Add missing TZ to tests
2016-02-04 15:46:43 +01:00
Nicolas Grekas
db74a25ca1 Merge branch '2.8' into 3.0
* 2.8:
  [appveyor] Ignore failures due to STATUS_ACCESS_VIOLATION errors
2016-02-04 15:44:26 +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
443dc246ea [Serializer] Add missing TZ to tests 2016-02-04 15:07:44 +01:00
Nicolas Grekas
75fa193fbc Merge branch '3.0'
* 3.0:
  add files used in FileResource objects
  add files used in FileResource objects
2016-02-04 14:53:40 +01:00
Nicolas Grekas
6f6915f10f Merge branch '2.8' into 3.0
* 2.8:
  add files used in FileResource objects
  add files used in FileResource objects
2016-02-04 14:53:13 +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
1bd125ec4a Merge branch '3.0'
* 3.0: (105 commits)
  [Console] remove readline support
  bumped Symfony version to 3.0.3
  updated VERSION for 3.0.2
  updated CHANGELOG for 3.0.2
  [Routing] added a suggestion to add the HttpFoundation component.
  [FrameworkBundle] fix assets and templating tests
  [ClassLoader] fix ApcClassLoader tests on HHVM
  [travis] Add some comments
  changed operator from and to &&
  [DependencyInjection] Remove unused parameter
  [Process] Fix transient tests for incremental outputs
  [Console] Add missing `@require` annotation in test
  Fix merge
  [appveyor] Fix failure reporting
  [#17634] move DebugBundle license file
  Limit Ldap component version for the 3.0 branch
  backport GlobTest from 2.7 branch
  Move licenses according to new best practices
  [FrameworkBundle] Remove unused code in test
  [2.3] Fixed an undefined variable in Glob::toRegex
  ...

Conflicts:
	.travis.yml
	composer.json
	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/assets.yml
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig
	src/Symfony/Component/Console/CHANGELOG.md
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/PropertyInfo/Tests/PropertyInfoExtractorTest.php
	src/Symfony/Component/Yaml/Tests/ParserTest.php
2016-02-04 13:57:09 +01:00
Nicolas Grekas
9617b77a9c Merge branch '2.8' into 3.0
* 2.8:
  [Console] remove readline support
  [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
2016-02-04 13:12:16 +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
7c30ed4349 minor #17678 [Crawler] Remove a mention of an interface removed before a merge (jakzal)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Crawler] Remove a mention of an interface removed before a merge

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

Missed it while merging #17585.

Commits
-------

79a6a27 [Crawler] Remove a mention of an interface removed before a merge
2016-02-04 10:58:35 +01:00
Jakub Zalas
79a6a27e3f [Crawler] Remove a mention of an interface removed before a merge 2016-02-04 08:56:19 +00:00
Jakub Zalas
1183aca600 feature #17585 [DomCrawler] Abstract URI logic and crawl images (valeriangalliat)
This PR was squashed before being merged into the 3.1-dev branch (closes #17585).

Discussion
----------

 [DomCrawler] Abstract URI logic and crawl images

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

This is a backward-compatible version of #13620, and a rebase of #13649 on current `master`.

Commits
-------

1553b07  [DomCrawler] Abstract URI logic and crawl images
2016-02-04 08:44:00 +00:00
Valérian Galliat
1553b073fa [DomCrawler] Abstract URI logic and crawl images 2016-02-04 08:43:52 +00: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
Fabien Potencier
439303eb24 bumped Symfony version to 3.0.3 2016-02-03 14:57:15 +01:00
Fabien Potencier
18c3d4f356 Merge pull request #17665 from fabpot/release-3.0.2
released v3.0.2
2016-02-03 13:42:23 +01:00
Fabien Potencier
c5e2ece616 updated VERSION for 3.0.2 2016-02-03 13:38:44 +01:00
Fabien Potencier
beea262266 updated CHANGELOG for 3.0.2 2016-02-03 13:38:37 +01:00
Fabien Potencier
ba2552174d minor #17598 Improved FileResource and DirectoryResource (javiereguiluz)
This PR was squashed before being merged into the 3.1-dev branch (closes #17598).

Discussion
----------

Improved FileResource and DirectoryResource

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

Commits
-------

3e762a6 Improved FileResource and DirectoryResource
2016-02-03 13:36:08 +01:00
Javier Eguiluz
3e762a6f15 Improved FileResource and DirectoryResource 2016-02-03 13:36:07 +01:00
Hugo Hamon
a45e8bbc34 [Routing] added a suggestion to add the HttpFoundation component. 2016-02-03 14:12:30 +02:00
Fabien Potencier
b2e2fa9443 minor #17659 [ClassLoader] fix ApcClassLoader tests on HHVM (xabbuh)
This PR was merged into the 3.0 branch.

Discussion
----------

[ClassLoader] fix ApcClassLoader tests on HHVM

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

Commits
-------

db1c635 [ClassLoader] fix ApcClassLoader tests on HHVM
2016-02-03 13:02:15 +01:00
Fabien Potencier
665059b8f1 bug #17658 [FrameworkBundle] fix assets and templating tests (xabbuh)
This PR was merged into the 3.0 branch.

Discussion
----------

[FrameworkBundle] fix assets and templating tests

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

Now that the `assets` section is automatically enabled when `templating`
is enabled (see #17506), the `templating.helper.assets` will also be
present as soon as the `templating` section is activated.

Commits
-------

293df5d [FrameworkBundle] fix assets and templating tests
2016-02-03 13:01:12 +01:00
Christian Flothmann
293df5d610 [FrameworkBundle] fix assets and templating tests
Now that the `assets` section is automatically enabled when `templating`
is enabled (see #17506), the `templating.helper.assets` will also be
present as soon as the `templating` section is activated.
2016-02-03 10:47:50 +01:00
Christian Flothmann
db1c6359d1 [ClassLoader] fix ApcClassLoader tests on HHVM 2016-02-03 10:33:23 +01:00
Nicolas Grekas
b33eb05b7c feature #17654 [Cache] Don't clone, serialize (nicolas-grekas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Cache] Don't clone, serialize

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

Cloning is not required by PSR-6, adds overhead and doesn't prevent any mistake for nested objects. Let's simplify.
ArrayCache in turn should store serialized by default, so that data is deep-cloned. But since this can cause a perf issue for some, I propose to add a constructor flag to disable serializing. WDYT?

Commits
-------

8605417 [Cache] Don't clone, serialize
2016-02-03 09:39:30 +01:00
Nicolas Grekas
8605417b55 [Cache] Don't clone, serialize 2016-02-03 09:37:11 +01:00
Nicolas Grekas
a842eda0ec minor #17653 changed operator from and to && (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

changed operator from and to &&

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

Commits
-------

c718401 changed operator from and to &&
2016-02-03 09:16:49 +01:00