Commit Graph

24880 Commits

Author SHA1 Message Date
Christian Flothmann
047c1953d2 [TwigBridge] forward compatibility with Yaml 3.1 2016-02-05 12:33:24 +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
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
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
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
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
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
Nicolas Grekas
3f22dac6fe minor #17655 [travis] Add some comments (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Add some comments

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

Commits
-------

13ae323 [travis] Add some comments
2016-02-03 09:15:53 +01:00
Nicolas Grekas
13ae32376d [travis] Add some comments 2016-02-02 17:51:37 +01:00
Fabien Potencier
415bab9186 Merge branch '2.8' into 3.0
* 2.8:
2016-02-02 15:47:47 +01:00
Fabien Potencier
2f4cdb92c1 Merge branch '2.7' into 2.8
* 2.7:
  backport GlobTest from 2.7 branch
  [FrameworkBundle] Remove unused code in test
  [2.3] Fixed an undefined variable in Glob::toRegex
  simplified a test
  fix container cache key generation
  [Form] fix option name in changelog
  [Translation] Add resources from fallback locale
  [DependencyInjection] enforce tags to have a name
  [YAML] Refine the return value of Yaml::parse()
2016-02-02 15:46:44 +01:00
Fabien Potencier
c71840193c changed operator from and to && 2016-02-02 15:23:07 +01:00
Fabien Potencier
816ecb77ab minor #17652 [DependencyInjection] Remove unused parameter (dunglas)
This PR was squashed before being merged into the 3.0 branch (closes #17652).

Discussion
----------

[DependencyInjection] Remove unused parameter

| 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
-------

1a58639 [DependencyInjection] Remove unused parameter
2016-02-02 14:48:39 +01:00
Kévin Dunglas
1a58639bf8 [DependencyInjection] Remove unused parameter 2016-02-02 14:48:38 +01:00
Nicolas Grekas
1f7a6935f8 Merge branch '2.8' into 3.0
* 2.8:
  [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
  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
  simplified a test
  fix container cache key generation
  [Form] fix option name in upgrade file
  [Form] fix option name in changelog
  [Translation] Add resources from fallback locale
  [DependencyInjection] enforce tags to have a name
  [YAML] Refine the return value of Yaml::parse()

Conflicts:
	UPGRADE-2.8.md
2016-02-02 14:44:19 +01:00
Nicolas Grekas
bad218d44e Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix transient tests for incremental outputs
2016-02-02 14:33:15 +01:00
Nicolas Grekas
114e5d68d2 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix transient tests for incremental outputs

Conflicts:
	src/Symfony/Component/Process/Tests/ProcessTest.php
2016-02-02 14:32:58 +01:00
Nicolas Grekas
60cbf0dce8 minor #17650 [Process] Fix transient tests for incremental outputs (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix transient tests for incremental outputs

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

Commits
-------

90455df [Process] Fix transient tests for incremental outputs
2016-02-02 14:27:33 +01:00
Nicolas Grekas
90455dfe56 [Process] Fix transient tests for incremental outputs 2016-02-02 14:16:45 +01:00
Nicolas Grekas
ab1fab2911 Merge branch '2.7' into 2.8
* 2.7:
  [Console] Add missing `@require` annotation in test
  Fix merge
  [appveyor] Fix failure reporting
  [#17634] move DebugBundle license file
  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
  simplified a test
  fix container cache key generation
  [Form] fix option name in changelog
  [Translation] Add resources from fallback locale
  [DependencyInjection] enforce tags to have a name
  [YAML] Refine the return value of Yaml::parse()

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
2016-02-02 10:49:18 +01:00
Nicolas Grekas
e874754dee [Console] Add missing @require annotation in test 2016-02-02 10:46:12 +01:00
Nicolas Grekas
49031493ef Fix merge 2016-02-01 21:47:29 +01:00
Nicolas Grekas
fc5e80c0cb Merge branch '2.3' into 2.7
* 2.3:
  [appveyor] Fix failure reporting
2016-02-01 21:45:15 +01:00
Nicolas Grekas
de6e3c81d8 minor #17639 [appveyor] Fix failure reporting (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[appveyor] Fix failure reporting

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

Status: needs work

Commits
-------

b58f483 [appveyor] Fix failure reporting
2016-02-01 21:44:24 +01:00
Nicolas Grekas
b58f4833df [appveyor] Fix failure reporting 2016-02-01 21:38:54 +01:00
Christian Flothmann
1a96c40f35 [#17634] move DebugBundle license file 2016-02-01 20:40:12 +01:00
Christian Flothmann
10c17f8589 Merge branch '2.3' into 2.7
* 2.3:
  Move licenses according to new best practices
2016-02-01 20:38:55 +01:00