Fabien Potencier
21d9320be2
Merge branch '4.4'
...
* 4.4:
Adding .gitattributes to remove Tests directory from "dist"
[Messenger] Don't deep merge routing.senders config option
2019-09-16 10:16:50 +02:00
Nyholm
ac7dc24bcb
Adding .gitattributes to remove Tests directory from "dist"
2019-09-16 10:12:51 +02:00
Nicolas Grekas
28d331bb58
Merge branch '4.3' into 4.4
...
* 4.3:
Fix more bad tests
Fix test fixtures with deprecated method signatures.
Fix 4.3 tests forward compat
[Messenger] fix empty amqp body returned as false
Fix routing cache broken when using generator_class
2019-09-06 12:03:11 +02:00
Nicolas Grekas
cc3e3d54ea
Fix more bad tests
2019-09-06 11:34:03 +02:00
Nicolas Grekas
0f434134d6
fix typo
2019-09-03 22:36:28 +02:00
Nicolas Grekas
d714b1c533
Merge branch '4.4'
...
* 4.4:
[Bridge/PhpUnit] fix looking for composer
cs fix
[Mailer] fixed Mailgun support when a response is not JSON as expected
[4.3] Cleanup tests
Cleanup tests
[Finder] Prevent unintentional file locks in Windows
[FrameworkBundle] Fix about command not showing .env vars
[DomCrawler] Fix FileFormField PHPDoc
[Mailer] Remove the default dispatcher in AbstractTransport
Fix #33395 PHP 5.3 compatibility
2019-09-02 20:41:34 +02:00
Nicolas Grekas
727aa7ed9e
Merge branch '4.3' into 4.4
...
* 4.3:
[4.3] Cleanup tests
Cleanup tests
[Finder] Prevent unintentional file locks in Windows
[FrameworkBundle] Fix about command not showing .env vars
[DomCrawler] Fix FileFormField PHPDoc
[Mailer] Remove the default dispatcher in AbstractTransport
Fix #33395 PHP 5.3 compatibility
2019-09-02 16:51:55 +02:00
Nicolas Grekas
d423b0f473
Merge branch '3.4' into 4.3
...
* 3.4:
Cleanup tests
[Finder] Prevent unintentional file locks in Windows
[DomCrawler] Fix FileFormField PHPDoc
Fix #33395 PHP 5.3 compatibility
2019-09-02 16:41:27 +02:00
Fabien Potencier
71a8ecbfd6
minor #33289 [DomCrawler] Fix FileFormField PHPDoc (dunglas)
...
This PR was squashed before being merged into the 3.4 branch (closes #33289 ).
Discussion
----------
[DomCrawler] Fix FileFormField PHPDoc
| Q | A
| ------------- | ---
| Branch? | 3.4
| Bug fix? | yes
| New feature? | no <!-- please update src/**/CHANGELOG.md files -->
| BC breaks? | no <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass? | yes <!-- please add some, will be required by reviewers -->
| Fixed tickets | n/a
| License | MIT
| Doc PR | n/a
`null` is a valid value, it is used in case of errors. Then the parent class must allow `null` values too. I think it's important regarding the ongoing process of adding typehints everywhere.
Commits
-------
162bfc3cad
[DomCrawler] Fix FileFormField PHPDoc
2019-08-30 19:42:32 +02:00
Kévin Dunglas
162bfc3cad
[DomCrawler] Fix FileFormField PHPDoc
2019-08-30 19:42:23 +02:00
Nicolas Grekas
b38a717d78
Merge branch '4.4'
...
* 4.4: (28 commits)
fix merge
[SecurityBundle] fix return type declarations
[BrowserKit] fix return type declarations
[PropertyInfo] fix return type declarations
[Bridge/Doctrine] fix return type declarations
[Form] fix return type declarations
[Console] fix return type declarations
[Intl] fix return type declarations
[Templating] fix return type declarations
[DomCrawler] fix return type declarations
[Validator] fix return type declarations
[Process] fix return type declarations
[Workflow] fix return type declarations
[Cache] fix return type declarations
[Serializer] fix return type declarations
[Translation] fix return type declarations
[DI] fix return type declarations
[Config] fix return type declarations
[HttpKernel] Fix return type declarations
[Security] Fix return type declarations
...
2019-08-26 11:05:36 +02:00
Nicolas Grekas
089097046b
Merge branch '4.3' into 4.4
...
* 4.3: (23 commits)
fix merge
[SecurityBundle] fix return type declarations
[BrowserKit] fix return type declarations
[PropertyInfo] fix return type declarations
[Bridge/Doctrine] fix return type declarations
[Form] fix return type declarations
[Console] fix return type declarations
[Intl] fix return type declarations
[Templating] fix return type declarations
[DomCrawler] fix return type declarations
[Validator] fix return type declarations
[Process] fix return type declarations
[Workflow] fix return type declarations
[Cache] fix return type declarations
[Serializer] fix return type declarations
[Translation] fix return type declarations
[DI] fix return type declarations
[Config] fix return type declarations
[HttpKernel] Fix return type declarations
[Security] Fix return type declarations
...
2019-08-26 11:00:56 +02:00
Nicolas Grekas
74b2802197
Merge branch '3.4' into 4.3
...
* 3.4: (21 commits)
[SecurityBundle] fix return type declarations
[BrowserKit] fix return type declarations
[PropertyInfo] fix return type declarations
[Bridge/Doctrine] fix return type declarations
[Form] fix return type declarations
[Console] fix return type declarations
[Intl] fix return type declarations
[Templating] fix return type declarations
[DomCrawler] fix return type declarations
[Validator] fix return type declarations
[Process] fix return type declarations
[Workflow] fix return type declarations
[Cache] fix return type declarations
[Serializer] fix return type declarations
[Translation] fix return type declarations
[DI] fix return type declarations
[Config] fix return type declarations
[HttpKernel] Fix return type declarations
[Security] Fix return type declarations
[Routing] Fix return type declarations
...
2019-08-26 10:26:39 +02:00
Nicolas Grekas
2b8ef1d6d7
[DomCrawler] fix return type declarations
2019-08-26 09:52:58 +02:00
Kévin Dunglas
a414c0323a
[DomCrawler] Fix @throws
2019-08-24 00:39:04 +02:00
Nicolas Grekas
d400aeb4f5
Merge branch '4.4'
...
* 4.4:
Add return types to internal & magic methods when possible
fixed CSC
Add Address::fromString
[DomCrawler] Added Crawler::matches(), ::closest(), ::outerHtml()
2019-08-22 15:39:30 +02:00
Grégoire Pineau
9535f9e8d6
[DomCrawler] Added Crawler::matches(), ::closest(), ::outerHtml()
2019-08-22 10:52:44 +02:00
Nicolas Grekas
fc186bb78f
Add return types to tests and final|internal|private methods
2019-08-21 17:14:41 +02:00
Kévin Dunglas
2316dc36fb
[FrameworkBundle] Fix BrowserKit assertions to make them compatible with Panther
2019-08-21 14:46:38 +02:00
Nicolas Grekas
6f303b4fed
[5.0] Add return types on internal|final|private methods
2019-08-20 23:44:01 +02:00
Nicolas Grekas
227286d7c3
Merge branch '4.4'
...
* 4.4:
More docblock fixes
fix test
2019-08-20 23:03:59 +02:00
Nicolas Grekas
af6cf3140d
Merge branch '4.3' into 4.4
...
* 4.3:
More docblock fixes
fix test
2019-08-20 23:03:47 +02:00
Nicolas Grekas
7a0787c8bd
Merge branch '3.4' into 4.3
...
* 3.4:
More docblock fixes
2019-08-20 23:02:25 +02:00
Nicolas Grekas
9b78d53d0d
More docblock fixes
2019-08-20 22:53:36 +02:00
Nicolas Grekas
4036357150
Merge branch '4.4'
...
* 4.4:
some backports from master
Add return types to internal|final|private methods
[HttpFoundation] Precalculate session expiry timestamp
2019-08-20 18:53:57 +02:00
Nicolas Grekas
8073b8abfb
some backports from master
2019-08-20 18:35:28 +02:00
Nicolas Grekas
32116184d7
Add return types to internal|final|private methods
2019-08-20 17:32:53 +02:00
Nicolas Grekas
322da9df6c
Merge branch '4.4'
...
* 4.4:
cs fix
Fix inconsistent return points.
[Config] Add handling for ignored keys in ArrayNode::mergeValues.
Fix inconsistent return points.
[Security/Core] UserInterface::getPassword() can return null
cs fix
cs fix
Fix missing exporter in PHPUnit constraint poylfill
added `Process::getLastOutputTime()` method
[Router] Fix TraceableUrlMatcher behaviour with trailing slash
[HttpKernel] Remove outdated docblock comment
Fix handling for session parameters
Revert "bug #33092 [DependencyInjection] Improve an exception message (fabpot)"
2019-08-20 16:46:00 +02:00
Nicolas Grekas
225bf41e3b
Merge branch '4.3' into 4.4
...
* 4.3:
cs fix
Fix inconsistent return points.
[Config] Add handling for ignored keys in ArrayNode::mergeValues.
Fix inconsistent return points.
[Security/Core] UserInterface::getPassword() can return null
[Router] Fix TraceableUrlMatcher behaviour with trailing slash
Revert "bug #33092 [DependencyInjection] Improve an exception message (fabpot)"
2019-08-20 16:44:19 +02:00
Alexander M. Turek
c26c53596e
Fix inconsistent return points.
2019-08-20 16:27:59 +02:00
Nicolas Grekas
aefbc93a07
Merge branch '3.4' into 4.3
...
* 3.4:
Fix inconsistent return points.
[Security/Core] UserInterface::getPassword() can return null
[Router] Fix TraceableUrlMatcher behaviour with trailing slash
2019-08-20 16:07:54 +02:00
Alexander M. Turek
f5b6ee9de1
Fix inconsistent return points.
2019-08-20 15:31:17 +02:00
Nicolas Grekas
42cad9b76e
Merge branch '4.4'
...
* 4.4:
Remove superfluous phpdoc tags
2019-08-14 14:45:29 +02:00
Nicolas Grekas
507223dc73
Merge branch '4.3' into 4.4
...
* 4.3:
Remove superfluous phpdoc tags
2019-08-14 14:37:46 +02:00
Nicolas Grekas
b3467e641c
Merge branch '3.4' into 4.3
...
* 3.4:
Remove superfluous phpdoc tags
2019-08-14 14:26:46 +02:00
Philippe Segatori
608e23c09a
Remove superfluous phpdoc tags
2019-08-14 13:59:53 +02:00
Nicolas Grekas
203060a9a3
Merge branch '4.4'
...
* 4.4:
cs fix
Partially Revert "Remove trailing space in all markdown files"
[Intl] Explicit check
Fix getMaxFilesize() returning zero
Remove unused import
[DI] fix docblocks in Container*
Fixed markdown file
[HttpFoundation] Fix deprecation message in ::isMethodSafe()
[TwigBridge] Replaced plain doc block copies with inheritdoc.
[DomCrawler] Fixed CHANGELOG markup
[Intl] Cleanup unused language aliases entry
2019-08-14 13:06:01 +02:00
Nicolas Grekas
0bdf10a886
Merge branch '4.3' into 4.4
...
* 4.3:
cs fix
Partially Revert "Remove trailing space in all markdown files"
[Intl] Explicit check
Fix getMaxFilesize() returning zero
[DI] fix docblocks in Container*
Fixed markdown file
[TwigBridge] Replaced plain doc block copies with inheritdoc.
[DomCrawler] Fixed CHANGELOG markup
[Intl] Cleanup unused language aliases entry
2019-08-14 13:04:46 +02:00
Fabien Potencier
b06231fd24
minor #33141 [DomCrawler] Fixed CHANGELOG markup (lyrixx)
...
This PR was merged into the 4.3 branch.
Discussion
----------
[DomCrawler] Fixed CHANGELOG markup
| Q | A
| ------------- | ---
| Branch? | 4.3
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Commits
-------
3c56b12538
[DomCrawler] Fixed CHANGELOG markup
2019-08-13 19:38:16 +02:00
Grégoire Pineau
3c56b12538
[DomCrawler] Fixed CHANGELOG markup
2019-08-13 17:04:37 +02:00
Nicolas Grekas
28ae698af3
Merge branch '4.4'
...
* 4.4:
Fix compatibility with PHPUnit 8
Disable phpunit typehint patch on 4.3 branch
Fix deprecation on 4.3
2019-08-08 14:08:24 +02:00
Nicolas Grekas
32389f8b7f
Merge branch '4.3' into 4.4
...
* 4.3:
Disable phpunit typehint patch on 4.3 branch
Fix deprecation on 4.3
2019-08-08 14:07:40 +02:00
Jérémy Derussé
a5af6c4cd7
Disable phpunit typehint patch on 4.3 branch
2019-08-08 11:29:19 +02:00
Nicolas Grekas
284020d633
Merge branch '4.4'
...
* 4.4:
[Debug] Improve UPGRADE files
remove wrongly added legacy group from test
consistently throw NotSupportException
[HttpKernel] Clarify error handler restoring process again
[HttpClient] Remove CURLOPT_CONNECTTIMEOUT_MS curl opt
add missing conflict rule
[Intl] fix nullable phpdocs and useless method visibility of internal class
remove some more useless phpdocs
Resilience against file_get_contents() race conditions.
Turned return type annotations of private methods into php return types.
2019-08-08 11:20:29 +02:00
Alexander M. Turek
f54ca001fe
Turned return type annotations of private methods into php return types.
2019-08-07 16:19:54 +02:00
Nicolas Grekas
59d3ecf0a9
Merge branch '4.4'
...
* 4.4:
Fix some return type annotations.
2019-08-07 14:32:40 +02:00
Nicolas Grekas
d3a7be81b4
Merge branch '4.3' into 4.4
...
* 4.3:
Fix some return type annotations.
2019-08-07 14:31:40 +02:00
Nicolas Grekas
1aba480c2d
Merge branch '3.4' into 4.3
...
* 3.4:
Fix some return type annotations.
2019-08-07 14:28:41 +02:00
Nicolas Grekas
f8a35176da
minor #33007 Fix some return type annotations (derrabus)
...
This PR was merged into the 3.4 branch.
Discussion
----------
Fix some return type annotations
| Q | A
| ------------- | ---
| Branch? | 3.4
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | N/A
| License | MIT
| Doc PR | N/A
This PR fixed some incorrect return type declarations I discovered while working on #32993 .
Commits
-------
0a78dc0f6f
Fix some return type annotations.
2019-08-07 14:23:50 +02:00
Alexander M. Turek
0a78dc0f6f
Fix some return type annotations.
2019-08-07 14:09:01 +02:00