Commit Graph

24714 Commits

Author SHA1 Message Date
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
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
Christian Flothmann
445eb03511 minor #17634 Move licenses according to new best practices (dunglas)
This PR was merged into the 2.3 branch.

Discussion
----------

Move licenses according to new best practices

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

Commits
-------

aab5dec Move licenses according to new best practices
2016-02-01 20:32:16 +01:00
Fabien Potencier
36bf3946f2 minor #17588 [Security] [Ldap] [Easy-Pick] Limit ldap component version for branch 3.0 (csarrazi)
This PR was merged into the 3.0 branch.

Discussion
----------

[Security] [Ldap] [Easy-Pick] Limit ldap component version for branch 3.0

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

As the Ldap component will introduce BC changes for version 3.1 of Symfony, this PR limits the version to use in composer dependencies. This way, we can ensure that running composer update won't try to install the 3.1 Ldap component with version 2.8 or 3.0 of the Security component, Security Core component and SecurityBundle.

The required version will be changed in PR #17577, so version 3.1 of Symfony actually uses only version `3.1` onwards of the Ldap component.

Commits
-------

1391311 Limit Ldap component version for the 3.0 branch
2016-02-01 19:06:35 +01:00
Charles Sarrazin
1391311f2e Limit Ldap component version for the 3.0 branch 2016-02-01 13:48:41 +01:00
Fabien Potencier
bb205039f5 Merge branch '2.3' into 2.7
* 2.3:
  backport GlobTest from 2.7 branch
  [2.3] Fixed an undefined variable in Glob::toRegex
2016-02-01 13:39:46 +01:00
Fabien Potencier
f560dc0ded minor #17633 [FrameworkBundle] Remove unused code in test (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Remove unused code in test

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

8780e26 [FrameworkBundle] Remove unused code in test
2016-02-01 13:36:16 +01:00
Fabien Potencier
2ef7489fea minor #17638 [Finder] backport GlobTest from 2.7 branch (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Finder] backport GlobTest from 2.7 branch

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

Commits
-------

ceaeb43 backport GlobTest from 2.7 branch
2016-02-01 13:35:14 +01:00
Fabien Potencier
5a79ac623d minor #17629 [2.3] Fixed an undefined variable in Glob::toRegex (javiereguiluz)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fixed an undefined variable in Glob::toRegex

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

Note: to be merged **only in Symfony 2.3**.  `$delimiter` variable exists in the rest of Symfony versions.

Commits
-------

f0b7c14 [2.3] Fixed an undefined variable in Glob::toRegex
2016-02-01 13:33:51 +01:00
Christian Flothmann
ceaeb43692 backport GlobTest from 2.7 branch 2016-02-01 12:48:21 +01:00
Kévin Dunglas
aab5decc5b Move licenses according to new best practices 2016-01-31 22:16:42 +01:00
Kévin Dunglas
8780e26c9d [FrameworkBundle] Remove unused code in test 2016-01-31 22:09:31 +01:00
Javier Eguiluz
f0b7c14fd2 [2.3] Fixed an undefined variable in Glob::toRegex 2016-01-31 20:27:08 +01:00
Fabien Potencier
ccc6d311b1 simplified a test 2016-01-31 08:57:13 +01:00
Fabien Potencier
9d8232bf25 Merge branch '2.3' into 2.7
* 2.3:
  fix container cache key generation
  [Translation] Add resources from fallback locale
  [DependencyInjection] enforce tags to have a name
  [YAML] Refine the return value of Yaml::parse()
2016-01-31 08:56:20 +01:00