Nicolas Grekas
45f650ebda
Merge branch '4.4'
...
* 4.4:
[Routing] fix static route reordering when a previous dynamic route conflicts
conflict with HttpKernel 5
Return null as Expire header if it was set to null
bug #33370 Fix import statement typo in NullCache (adrienbrault)
[ProxyManager] remove ProxiedMethodReturnExpression polyfill
fix dumping not inlined scalar tag values
Fix import statement typo in NullCache
[DoctrineBridge] Allow configuring class names through methods instead of class parameters
2019-08-30 14:51:40 +02:00
Nicolas Grekas
22ed6247fa
Merge branch '4.3' into 4.4
...
* 4.3:
[Routing] fix static route reordering when a previous dynamic route conflicts
Return null as Expire header if it was set to null
bug #33370 Fix import statement typo in NullCache (adrienbrault)
[ProxyManager] remove ProxiedMethodReturnExpression polyfill
fix dumping not inlined scalar tag values
2019-08-30 14:49:06 +02:00
Nicolas Grekas
247815d21c
Merge branch '3.4' into 4.3
...
* 3.4:
Return null as Expire header if it was set to null
[ProxyManager] remove ProxiedMethodReturnExpression polyfill
fix dumping not inlined scalar tag values
2019-08-30 14:41:22 +02:00
Daniel Rotter
5e3c7ea452
Return null as Expire header if it was set to null
2019-08-29 18:18:03 +02:00
Nicolas Grekas
2cee7f2b17
fix merge
2019-08-26 18:50:55 +02:00
Nicolas Grekas
7f2236f7bf
Add more "object" return types
2019-08-26 18:20:41 +02:00
Nicolas Grekas
7d451144bf
Merge branch '4.4'
...
* 4.4:
[ErrorHandler] make DebugClassLoader turn multi-types declarations to "object"
2019-08-26 18:09:17 +02:00
Nicolas Grekas
0abd2712e9
[ErrorHandler] make DebugClassLoader turn multi-types declarations to "object"
2019-08-26 18:02:12 +02:00
Nicolas Grekas
23fac65a3c
Merge branch '4.4'
...
* 4.4:
Add return-types with help from DebugClassLoader in the CI
do not mock removed getPublicDir() method
[Bridge/Doctrine] fix review
[ErrorHandler] make DebugClassLoader able to add return type declarations
2019-08-26 15:40:31 +02:00
Nicolas Grekas
11149a1fbb
Add return-types with help from DebugClassLoader in the CI
2019-08-26 15:31:28 +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
9e154e7728
fix merge
2019-08-26 10:55:16 +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
ef5ead0005
[HttpFoundation] fix return type declarations
2019-08-26 09:50:50 +02:00
Nicolas Grekas
9ce1f02501
Merge branch '4.4'
...
* 4.4:
Add more return types after fixing a typo in my script
2019-08-23 14:18:57 +02:00
Nicolas Grekas
65d942010c
Add more return types after fixing a typo in my script
2019-08-23 14:16:45 +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
Nicolas Grekas
962dcfeed0
Add return types to internal & magic methods when possible
2019-08-22 15:18:41 +02:00
Nicolas Grekas
f83ebd49b6
minor #33154 Parameter type leftovers (derrabus)
...
This PR was merged into the 5.0-dev branch.
Discussion
----------
Parameter type leftovers
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #32179
| License | MIT
| Doc PR | N/A
Commits
-------
34eda04866
Added more parameter type declarations.
2019-08-21 17:54:28 +02:00
Nicolas Grekas
b390ed7d88
Merge branch '4.4'
...
* 4.4:
Fixed tests on the Security and Form components
Add return types to tests and final|internal|private methods
2019-08-21 17:37:45 +02:00
Alexander M. Turek
34eda04866
Added more parameter type declarations.
2019-08-21 17:16:25 +02:00
Nicolas Grekas
fc186bb78f
Add return types to tests and final|internal|private methods
2019-08-21 17:14:41 +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
32116184d7
Add return types to internal|final|private methods
2019-08-20 17:32:53 +02:00
Nicolas Grekas
b253f25933
feature #33169 [HttpFoundation] Precalculate session expiry timestamp (azjezz)
...
This PR was merged into the 4.4 branch.
Discussion
----------
[HttpFoundation] Precalculate session expiry timestamp
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | yes
| Tests pass? | yes
| Fixed tickets | #13955 , #21423 , #14625
| License | MIT
Continued work from the original PR #21423 / #21857
Commits
-------
066000afa2
[HttpFoundation] Precalculate session expiry timestamp
2019-08-20 16:51:07 +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
azjezz
066000afa2
[HttpFoundation] Precalculate session expiry timestamp
...
Co-authored-by: Benjamin Cremer <b.cremer@shopware.com>
Co-authored-by: Rob Frawley 2nd <rmf@src.run>
2019-08-19 10:02:10 +01: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
Nicolas Grekas
cda8a67df8
Merge branch '3.4' into 4.3
...
* 3.4:
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.
[Intl] Cleanup unused language aliases entry
2019-08-14 13:02:36 +02:00
Martin Auswöger
f4c2ea5b73
Fix getMaxFilesize() returning zero
2019-08-14 08:35:19 +02:00
Michael Lutz
b3928d5ac3
[HttpFoundation] Fix deprecation message in ::isMethodSafe()
2019-08-13 12:17:15 -04:00
Nicolas Grekas
3aca99ded7
Merge branch '4.4'
...
* 4.4:
cs fix
Fix return statements
[TwigBridge] add missing dep
Add type declarations to private DefaultChoiceListFactory methods
Add false type to ChoiceListFactoryInterface::createView $label argument
Update UPGRADE guide of 4.3 for EventDispatcher
[SecurityBundle] display the correct class name on the deprecated notice
2019-08-13 08:58:13 +02:00
Nicolas Grekas
3ec91065f7
Merge branch '4.3' into 4.4
...
* 4.3:
cs fix
Fix return statements
[TwigBridge] add missing dep
Add false type to ChoiceListFactoryInterface::createView $label argument
Update UPGRADE guide of 4.3 for EventDispatcher
[SecurityBundle] display the correct class name on the deprecated notice
2019-08-13 08:48:26 +02:00
Nicolas Grekas
7d0795d0b8
Merge branch '3.4' into 4.3
...
* 3.4:
Fix return statements
[TwigBridge] add missing dep
Add false type to ChoiceListFactoryInterface::createView $label argument
2019-08-13 08:39:03 +02:00
Nicolas Grekas
2bc05c83b4
Fix return statements
2019-08-13 08:33:05 +02:00
julien57
ead419b77b
add type-hints
2019-08-11 11:58:33 +02:00
Nicolas Grekas
9fec71ea34
Merge branch '4.4'
...
* 4.4:
[HttpFoundation] fix typo
2019-08-11 11:51:50 +02:00
Nicolas Grekas
43739dbf53
Merge branch '4.3' into 4.4
...
* 4.3:
[HttpFoundation] fix typo
2019-08-11 11:51:46 +02:00
Nicolas Grekas
f51f7e7b74
[HttpFoundation] fix typo
2019-08-11 11:51:13 +02:00
Nicolas Grekas
5067f209ea
Merge branch '4.4'
...
* 4.4:
[HttpFoundation] some cleanups
2019-08-11 11:30:00 +02:00
azjezz
f62a3c0810
[HttpFoundation] some cleanups
2019-08-11 11:22:42 +02:00
Nicolas Grekas
eb13c92fb9
Merge branch '4.4'
...
* 4.4:
cleanups
Disable PHPUnit result cache on the CI
[Security] Cleanup "Digest nonce has expired." translation
[Translation] Highlight invalid translation status
Added translations in validator for Serbian Cyrillic
Added translations in validator for Serbian Latin
[EventDispatcher] wrong Request class
[DependencyInjection] improved exception message
2019-08-10 22:52:43 +02:00