Commit Graph

23681 Commits

Author SHA1 Message Date
Fabien Potencier
ebd55fcb38 minor #16397 added the new Composer exclude-from-classmap option (annesosensio)
This PR was merged into the 2.3 branch.

Discussion
----------

added the new Composer exclude-from-classmap option

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

65bef75 added the new Composer exclude-from-classmap option
2015-10-30 13:03:18 -07:00
Anne-Sophie Bachelard
65bef75bef added the new Composer exclude-from-classmap option 2015-10-30 12:48:51 -07:00
Tomas Votruba
358fb2db22 HtmlDumperTest fixed after merge 2015-10-30 20:29:05 +01:00
Fabien Potencier
cd6351f2cd bug #16331 fixed Twig deprecation notices (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed Twig deprecation notices

| 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

To avoid deprecation notices when upgrading to Twig 1.23.

Commits
-------

1bdd127 fixed Twig deprecation notices
2015-10-30 10:50:46 -07:00
Tobias Schultze
1db740efe7 feature #16381 remove polyfills for unsupported php versions (Tobion)
This PR was merged into the 3.0-dev branch.

Discussion
----------

remove polyfills for unsupported php versions

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

Remove obsolete polyfills in master as introduced in #16317

Commits
-------

78512cc remove polyfills for unsupported php versions
2015-10-30 17:48:58 +01:00
Tobias Schultze
8ecbab9310 [Security] remove obsolete test for removed StringUtils 2015-10-30 17:43:39 +01:00
Tobias Schultze
87b62bbb1e feature #16392 [3.0] [Security] remove deprecated SrtingUtils class (TomasVotruba)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[3.0] [Security] remove deprecated SrtingUtils class

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

Commits
-------

cd62d17 [Security] remove deprecated SrtingUtils class
2015-10-30 17:38:07 +01:00
Tobias Schultze
fdd70c9660 feature #16390 [3.0] [Serializer] JsonEncoder: remove deprecated method (TomasVotruba)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[3.0] [Serializer] JsonEncoder: remove deprecated method

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

Commits
-------

87d5589 [Serializer] JsonEncoder: remove deprecated method
2015-10-30 17:30:31 +01:00
Tobias Schultze
b28689054b fix merge. the acl is not automatically included in symfony/symfony in 3.0 2015-10-30 16:05:41 +01:00
Tomas Votruba
cd62d17a19 [Security] remove deprecated SrtingUtils class 2015-10-30 13:45:37 +01:00
Tomas Votruba
87d5589c7f [Serializer] JsonEncoder: remove deprecated method 2015-10-30 13:41:02 +01:00
Fabien Potencier
f59286bbc1 minor #16373 [HttpFoundation] fix expected argument type docblock (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] fix expected argument type docblock

| Q             | A
| ------------- | ---
| Fixed tickets |
| License       | MIT

Commits
-------

1c01ebc fix expected argument type docblock
2015-10-29 15:36:51 -07:00
Christian Flothmann
dd9d076a0b JsonDescriptor - encode container params only once 2015-10-29 22:04:12 +01:00
Fabien Potencier
e2022ce0f2 minor #16374 [Routing] fix docblock description for the build() method (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Routing] fix docblock description for the build() method

| Q             | A
| ------------- | ---
| Fixed tickets | #15778
| License       | MIT

Commits
-------

ca32ed4 fix docblock description for the build() method
2015-10-29 11:52:05 -07:00
Christian Flothmann
ca32ed4c02 fix docblock description for the build() method 2015-10-29 19:49:03 +01:00
Christian Flothmann
1c01ebc48d fix expected argument type docblock 2015-10-29 19:47:17 +01:00
Fabien Potencier
eed6a68f91 minor #16380 Set back libxml settings after testings. (SpacePossum)
This PR was merged into the 2.3 branch.

Discussion
----------

Set back libxml settings after testings.

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

Tests that change the `libxml_use_internal_errors` should set back the flag to the previous setting when done testing.

Commits
-------

29d6969 Set back libxml settings after testings.
2015-10-29 11:36:05 -07:00
Tobias Schultze
78512cc388 remove polyfills for unsupported php versions 2015-10-29 15:17:40 +01:00
Tobias Schultze
fc2eff8475 Merge branch '2.8'
Conflicts:
	src/Symfony/Bridge/PhpUnit/composer.json
	src/Symfony/Component/Serializer/composer.json
2015-10-29 15:13:34 +01:00
Tobias Schultze
5e666e60d9 Merge branch '2.7' into 2.8 2015-10-29 15:11:20 +01:00
Tobias Schultze
7f62133939 fix php requirement in 2.7 2015-10-29 15:10:52 +01:00
Tobias Schultze
62db290453 bug #16382 [Serializer] polyfill for json_last_error_msg is in php 5.5 (Tobion)
This PR was merged into the 2.8 branch.

Discussion
----------

[Serializer] polyfill for json_last_error_msg is in php 5.5

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

We need the polyfill for `json_last_error_msg` which is part of php 5.5, not 5.4.

Commits
-------

fb031f1 [Serializer] polyfill for json_last_error_msg is in php 5.5
2015-10-29 15:05:12 +01:00
Tobias Schultze
fb031f1c9f [Serializer] polyfill for json_last_error_msg is in php 5.5 2015-10-29 13:47:37 +01:00
Tobias Schultze
d0acda84f2 Merge branch '2.8'
Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.7.md
	composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/Form/Tests/FormRegistryTest.php
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
	src/Symfony/Component/Intl/composer.json
	src/Symfony/Component/Ldap/composer.json
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/Csrf/composer.json
	src/Symfony/Component/Security/Http/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/composer.json
	src/Symfony/Component/Templating/PhpEngine.php
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
	src/Symfony/Component/VarDumper/composer.json
2015-10-29 13:12:54 +01:00
Tobias Schultze
de71e26429 Merge branch '2.7' into 2.8 2015-10-29 11:46:19 +01:00
Tobias Schultze
9ea4bce052 Merge branch '2.3' into 2.7 2015-10-29 11:45:39 +01:00
Tobias Schultze
9bb0133f94 bug #16365 Add the PHP 7 polyfill for the random_bytes function (pierredup)
This PR was merged into the 2.8 branch.

Discussion
----------

Add the PHP 7 polyfill for the random_bytes function

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

Some classes (like the `SecureRandom` class) currently depends on the `random_bytes` function, which is only available in the PHP 7 polyfill

Commits
-------

8ab8ca0 Add the PHP 7 polyfill for the random_bytes function
2015-10-29 11:44:29 +01:00
Possum
29d696944c Set back libxml settings after testings. 2015-10-29 11:26:44 +01:00
Tobias Schultze
0c5141f683 minor #16371 [Yaml] escape backtick in markdown changelog (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Yaml] escape backtick in markdown changelog

| Q             | A
| ------------- | ---
| Fixed tickets | #16285
| License       | MIT

Commits
-------

a613b0d [Yaml] escape backtick in markdown changelog
2015-10-28 22:57:49 +01:00
Tobias Schultze
e62d98ef30 minor #16370 [HttpFoundation] don't call constructors on Mongo mock objects (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] don't call constructors on Mongo mock objects

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

Calling the parent constructor of the mocked `Mongo` class tries to
connect to a local MongoDB server which fails in case no local server
was configured.

Similarly, when the parent constructor of the mocked `MongoCollection`
class is called it performs checks on the passed arguments which fails
again when a connection was not established successfully before.

Commits
-------

6541b8b don't call constructors on Mongo mock objects
2015-10-28 22:52:08 +01:00
Christian Flothmann
a613b0d02e [Yaml] escape backtick in markdown changelog 2015-10-28 22:33:57 +01:00
Christian Flothmann
6541b8b726 don't call constructors on Mongo mock objects
Calling the parent constructor of the mocked `Mongo` class tries to
connect to a local MongoDB server which fails in case no local server
was configured.

Similarly, when the parent constructor of the mocked `MongoCollection`
class is called it performs checks on the passed arguments which fails
again when a connection was not established successfully before.
2015-10-28 22:19:48 +01:00
Fabien Potencier
1190fd07ea feature #16344 [WebProfilerBundle] Filter links in search results (Rvanlaak)
This PR was merged into the 2.8 branch.

Discussion
----------

[WebProfilerBundle] Filter links in search results

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

Quite often I find myself copy/pasting the results from the search results in the profiler search form. Adding links for this allows developers to narrow down to the proper profiler result fast.

Commits
-------

4bffacc [WebProfilerBundle] Filter links in search results
2015-10-28 08:50:50 -07:00
Richard
4bffacc942 [WebProfilerBundle] Filter links in search results 2015-10-28 16:47:07 +01:00
Pierre du Plessis
8ab8ca02eb Add the PHP 7 polyfill for the random_bytes function 2015-10-28 12:33:15 +02:00
Fabien Potencier
44b3f63f30 feature #16285 [Yaml] deprecated usage of @ and ` at the beginning of an unquoted string (fabpot)
This PR was merged into the 2.8 branch.

Discussion
----------

[Yaml] deprecated usage of @ and ` at the beginning of an unquoted string

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

Commits
-------

7fee29f [Yaml] deprecated usage of @ and ` at the beginning of an unquoted string
2015-10-27 22:26:40 -07:00
Fabien Potencier
7fee29fe6d [Yaml] deprecated usage of @ and ` at the beginning of an unquoted string 2015-10-27 21:32:32 -07:00
Fabien Potencier
2cdc025ca9 Merge branch '2.7' into 2.8
* 2.7:
  added missing quotes in YAML files
2015-10-27 21:31:18 -07:00
Fabien Potencier
713adb3938 added missing quotes in YAML files 2015-10-27 21:31:00 -07:00
Fabien Potencier
dd61084ecb Merge branch '2.7' into 2.8
* 2.7:
  added missing quotes in YAML files
  [HttpKernel] Add `@group time-sensitive` on some transient tests
  [DoctrineBridge] Fix issue which prevent the profiler to explain a query
  Use mb_detect_encoding with $strict = true
  don't allow to install the split Security packages
  bumped Symfony version to 2.3.35
  updated VERSION for 2.3.34
  update CONTRIBUTORS for 2.3.34
  updated CHANGELOG for 2.3.34
2015-10-27 21:17:44 -07:00
Fabien Potencier
5f707a64d0 Merge branch '2.3' into 2.7
* 2.3:
  added missing quotes in YAML files
  [HttpKernel] Add `@group time-sensitive` on some transient tests
  [DoctrineBridge] Fix issue which prevent the profiler to explain a query
  Use mb_detect_encoding with $strict = true
  don't allow to install the split Security packages
  bumped Symfony version to 2.3.35
  updated VERSION for 2.3.34
  update CONTRIBUTORS for 2.3.34
  updated CHANGELOG for 2.3.34
2015-10-27 21:15:55 -07:00
Fabien Potencier
87c08d5fe5 added missing quotes in YAML files 2015-10-27 21:13:05 -07:00
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