Commit Graph

23589 Commits

Author SHA1 Message Date
Fabien Potencier
373dacda40 minor #16362 [HttpKernel] Add @group time-sensitive on some transient tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Add `@group time-sensitive` on some transient tests

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

Commits
-------

6a7d270 [HttpKernel] Add `@group time-sensitive` on some transient tests
2015-10-27 20:50:59 -07:00
Nicolas Grekas
6a7d270820 [HttpKernel] Add @group time-sensitive on some transient tests 2015-10-28 04:01:13 +01:00
Fabien Potencier
dc13a99c7e Merge branch '2.7' into 2.8
* 2.7:
  added missing quotes in YAML files
  bumped Symfony version to 2.7.7
  updated VERSION for 2.7.6
  updated CHANGELOG for 2.7.6
2015-10-27 19:40:41 -07:00
Fabien Potencier
92b6d955ef added missing quotes in YAML files 2015-10-27 19:40:10 -07:00
Fabien Potencier
6557e85faf feature #16317 Rely on iconv and symfony/polyfill-* (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

Rely on iconv and symfony/polyfill-*

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

Status: needs work
symfony/polyfill-* packages are not ready yet. Still, review welcomed.

Commits
-------

303f05b Rely on iconv and symfony/polyfill-*
2015-10-27 19:34:04 -07:00
Fabien Potencier
bca80ae820 bug #16306 [DoctrineBridge] Fix issue which prevent the profiler to explain a query (Baachi)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16306).

Discussion
----------

[DoctrineBridge] Fix issue which prevent the profiler to explain a query

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

We currently develop a application which only use the doctrine/dbal and not the orm. And we run into a issue that the profiler can't explained any query.
This is because the `SQLLogger` will pass `null` instead of an empty array. And the `sanitizeQuery` method will currently transform this to `array(null)` which leads to an error.

I created an fork, so everyone can reproduce this.
https://github.com/Baachi/symfony-standard

Commits
-------

3490e98 [DoctrineBridge] Fix issue which prevent the profiler to explain a query
2015-10-27 19:18:52 -07:00
Baachi
3490e98226 [DoctrineBridge] Fix issue which prevent the profiler to explain a query 2015-10-27 19:18:52 -07:00
Nicolas Grekas
303f05baaf Rely on iconv and symfony/polyfill-* 2015-10-28 03:15:07 +01:00
Fabien Potencier
c7e772c8d8 bug #16359 Use mb_detect_encoding with $strict = true (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Use mb_detect_encoding with $strict = true

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

Otherwise, UTF-8 can be returned for non-UTF8 strings...
See e.g. https://3v4l.org/oMMnX

Commits
-------

e6c89f1 Use mb_detect_encoding with $strict = true
2015-10-27 19:13:23 -07:00
Fabien Potencier
dd9de5be75 bug #16144 [Security] don't allow to install the split Security packages (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] don't allow to install the split Security packages

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

Currently, you would be able to install the Security component fromm
Symfony 2.3 together with one of the split packages from a higher
Symfony vesion like this:

```json
{
    "require": {
        "symfony/symfony": "2.3.*",
        "symfony/security-core": "~2.7"
    }
}
```

However, you will end up with classes being present twice.

This must be reverted after merging up in the `2.7` branch.

Commits
-------

0d14064 don't allow to install the split Security packages
2015-10-27 18:53:37 -07:00
Nicolas Grekas
aa2673b390 Fix merge 2015-10-28 00:47:04 +01:00
Nicolas Grekas
e6c89f15e4 Use mb_detect_encoding with $strict = true 2015-10-28 00:14:24 +01:00
Fabien Potencier
765e06cd1f bug #16350 Fixed Ajax panel loading in the toolbar (javiereguiluz)
This PR was merged into the 2.8 branch.

Discussion
----------

Fixed Ajax panel loading in the toolbar

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

Commits
-------

862daf2 Fixed Ajax panel loading in the toolbar
2015-10-27 15:52:16 -07:00
Christian Flothmann
0d140642e0 don't allow to install the split Security packages
Currently, you would be able to install the Security component fromm
Symfony 2.3 together with one of the split packages from a higher
Symfony vesion like this:

```json
{
    "require": {
        "symfony/symfony": "2.3.*",
        "symfony/security-core": "~2.7"
    }
}
```

However, you will end up with classes being present twice.

This must be reverted after merging up in the `2.7` branch.
2015-10-27 21:57:16 +01:00
Fabien Potencier
07439f41c7 bumped Symfony version to 2.7.7 2015-10-27 13:02:17 -07:00
Fabien Potencier
66b2e9662c Merge pull request #16357 from fabpot/release-2.7.6
released v2.7.6
2015-10-27 20:07:24 +01:00
Fabien Potencier
88db7c059e updated VERSION for 2.7.6 2015-10-27 12:07:21 -07:00
Fabien Potencier
71d9fdc1f8 updated CHANGELOG for 2.7.6 2015-10-27 12:07:14 -07:00
Fabien Potencier
acf9d7e65c bumped Symfony version to 2.3.35 2015-10-27 11:54:58 -07:00
Fabien Potencier
d1d97bc91c Merge pull request #16356 from fabpot/release-2.3.34
released v2.3.34
2015-10-27 18:11:03 +01:00
Fabien Potencier
3a8e49d840 updated VERSION for 2.3.34 2015-10-27 09:29:44 -07:00
Fabien Potencier
e94dedb81d update CONTRIBUTORS for 2.3.34 2015-10-27 09:29:43 -07:00
Fabien Potencier
2de47709c1 updated CHANGELOG for 2.3.34 2015-10-27 09:29:35 -07:00
Fabien Potencier
7f48360eda Merge branch '2.7' into 2.8
* 2.7:
  fixed YAML files missing quotes when a string starts with @
  [VarDumper] Fix anonymous class dumping
  [Routing] mark internal classes
  [Translation][Csv file] remove unnecessary statements, for better readability.
  [Form] remove validation of FormRegistry::getType as FormRegistry::hasType does not validate either
2015-10-27 08:40:42 -07:00
Fabien Potencier
ced865deb1 Merge branch '2.3' into 2.7
* 2.3:
  fixed YAML files missing quotes when a string starts with @
  [Routing] mark internal classes
  [Translation][Csv file] remove unnecessary statements, for better readability.
  [Form] remove validation of FormRegistry::getType as FormRegistry::hasType does not validate either
2015-10-27 08:38:06 -07:00
Fabien Potencier
95ff0bc5fd minor #16353 fixed YAML files missing quotes when a string starts with @ (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed YAML files missing quotes when a string starts with @

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

e36fea8 fixed YAML files missing quotes when a string starts with @
2015-10-27 08:33:53 -07:00
Nicolas Grekas
437e268036 [travis] Fail early when an invalid composer.json is found 2015-10-27 16:22:59 +01:00
Fabien Potencier
e8ba93b0d2 minor #16320 [Translation][Csv loader] remove unnecessary statements, for better readability. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translation][Csv loader] remove unnecessary statements, for better readability.

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

Commits
-------

47b8c3e [Translation][Csv file] remove unnecessary statements, for better readability.
2015-10-27 08:09:41 -07:00
Fabien Potencier
f042197e10 bug #16338 [VarDumper] Fix anonymous class dumping (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fix anonymous class dumping

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

Follows a comment from @stof

Commits
-------

65da4d5 [VarDumper] Fix anonymous class dumping
2015-10-27 08:06:34 -07:00
Javier Eguiluz
862daf205c Fixed Ajax panel loading in the toolbar 2015-10-27 12:50:35 +01:00
Tobias Schultze
2419000ab5 bug #16334 Updated type guessers to use FQCNs for guessed types (hiddewie)
This PR was squashed before being merged into the 2.8 branch (closes #16334).

Discussion
----------

Updated type guessers to use FQCNs for guessed types

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #16332
| License       | MIT
| Doc PR        | symfony/symfony-docs#5834 (if applicable)

Commits
-------

e871db7 Updated type guessers to use FQCNs for guessed types
2015-10-26 17:06:08 +01:00
Hidde Wieringa
e871db73d6 Updated type guessers to use FQCNs for guessed types 2015-10-26 17:05:27 +01:00
Fabien Potencier
e36fea8a63 fixed YAML files missing quotes when a string starts with @ 2015-10-26 13:58:42 +01:00
Nicolas Grekas
d6c2d75aef [VarDumper] Casters for Generator, ReflectionGenerator and ReflectionType 2015-10-25 18:50:43 +01:00
Tobias Schultze
fa78eac211 minor #16230 [Form] remove deprecated options and type from CollectionType (nicolas-grekas)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Form] remove deprecated `options` and `type` from CollectionType

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

Commits
-------

7177080 [Form] remove deprecated `options` and `type` from CollectionType
2015-10-25 18:35:44 +01:00
Nicolas Grekas
65da4d5104 [VarDumper] Fix anonymous class dumping 2015-10-25 18:17:38 +01:00
Fabien Potencier
2d588710ff minor #16309 [Form] remove type check in FormRegistry::getType (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] remove type check in FormRegistry::getType

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

remove validation of `FormRegistry::getType` as `FormRegistry::hasType` does not validate either. So `hasType` currently triggers a PHP warning with a wrong argument.
also developers do not work with the registry directly anyway but through the factory. and the factory already validates the value. So this validation is useless in reality.

Commits
-------

d37b9e6 [Form] remove validation of FormRegistry::getType as FormRegistry::hasType does not validate either
2015-10-25 17:34:32 +01:00
Fabien Potencier
1054dd7f28 bug #16316 [FrameworkBundle] Fix ClassCacheWarme when classes.php is already warmed (tucksaun)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] Fix ClassCacheWarme when classes.php is already warmed

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

Autoreloading was previously set to `false`, but actually we want to force it.
This could even lead to a fatal error when warming where it was already warmed as the previous `classes.php` is directly required.

Commits
-------

d31350f [FrameworkBundle] Fix ClassCacheWarme when classes.php is already warmed
2015-10-25 17:32:30 +01:00
Fabien Potencier
ef242afedc minor #16329 [Routing] mark internal classes (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] mark internal classes

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

These classes are an implementation detail of the PhpMatcherDumper that should not be relied upon.

Commits
-------

f1d3e87 [Routing] mark internal classes
2015-10-25 17:28:48 +01:00
Fabien Potencier
1bdd127938 fixed Twig deprecation notices 2015-10-24 22:26:02 +02:00
Nicolas Grekas
7177080f22 [Form] remove deprecated options and type from CollectionType 2015-10-24 17:26:49 +02:00
Nicolas Grekas
f863e6af9a Fix merge 2015-10-24 17:25:13 +02:00
Nicolas Grekas
3e923d0726 Merge branch '2.8'
* 2.8:
  remove wrong api tag that was introduced
  [travis] Reduce composer.json merge conflicts on per-components tests
2015-10-24 17:21:06 +02:00
Nicolas Grekas
3e38e64113 Merge branch '2.7' into 2.8
* 2.7:
  [travis] Reduce composer.json merge conflicts on per-components tests
2015-10-24 17:20:42 +02:00
Nicolas Grekas
6227409060 Merge branch '2.3' into 2.7
* 2.3:
  [travis] Reduce composer.json merge conflicts on per-components tests
2015-10-24 17:20:18 +02:00
Nicolas Grekas
7456a8a112 minor #16327 [travis] Reduce composer.json merge conflicts on per-components tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Reduce composer.json merge conflicts on per-components tests

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

json_decoding then re-encoding doesn't preserve the exact structure and leads to merge conflicts when testing deps=2.8. Simpler by-replace injection works better here. This fixes the issue happening on master right now.

Commits
-------

425eb8c [travis] Reduce composer.json merge conflicts on per-components tests
2015-10-24 17:19:59 +02:00
Tobias Schultze
f1d3e87a12 [Routing] mark internal classes 2015-10-24 14:07:54 +02:00
Tobias Schultze
4c824cd481 remove wrong api tag that was introduced 2015-10-23 22:50:51 +02:00
Nicolas Grekas
425eb8c5b7 [travis] Reduce composer.json merge conflicts on per-components tests 2015-10-23 18:38:57 +02:00
Nicolas Grekas
48b25f5251 Merge branch '2.8'
* 2.8:
  Fix the FrameworkBundle dependencies
  [DoctrineBridge] Fix required guess of boolean fields
  [DI] don't use array_map to resolve services
  Remove dead code in the PropertyPath constructor
  [EventDispatcher] fix docblock
  [Process] Inherit env vars by default in PhpProcess
  Changed one console output style to avoid visual issues
  [VarDumper] Fix return type and anonymous classes dumping
  [FrameworkBundle] PropertyInfo support
  [HttpFoundation] Fixes /0 subnet handling in IpUtils
  [Form] Simplify DateTimeToStringTransformer Avoid unneeded catch and re-throw of the same exception.
  [Minor] [Serializer] Removed second license header
  [TwigBundle] added a Twig templates warmer when templating is disabled
  [HttpKernel] Remove a duplicate test for the EsiFragmentRenderer
  [Templating] deprecate low-level RouterHelper::generate method as it's cumbersome to use constants in templates
  [Templating] introduce path and url methods in php templates to be in line with twig templates
  [Routing] deprecate the old url generator reference type values
  [Routing] use constant in a test that is new in 2.7
  [FrameworkBundle] Add a new ClassCache cache warmer
  [Validator] Add expressionLanguage to ExpressionValidator constructor

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/BrowserKit/composer.json
	src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
	src/Symfony/Component/EventDispatcher/EventDispatcher.php
2015-10-23 17:08:51 +02:00