Christian Flothmann
7d94b7c086
conflict with HttpKernel 5
2019-08-30 13:37:47 +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
Alexander M. Turek
ca1fad471e
[DI] fix return type declarations
2019-08-26 09:52:58 +02:00
Nicolas Grekas
962dcfeed0
Add return types to internal & magic methods when possible
2019-08-22 15:18:41 +02:00
Nicolas Grekas
1981f06c88
Merge branch '4.3' into 4.4
...
* 4.3:
fix deps=low
[VarExporter] fix support for PHP 7.4
Use PHP 7.4 on deps=low
2019-08-22 10:37:03 +02:00
Nicolas Grekas
3979caf6ab
Merge branch '3.4' into 4.3
...
* 3.4:
Use PHP 7.4 on deps=low
2019-08-22 09:51:06 +02:00
Nicolas Grekas
21b87024f0
Use PHP 7.4 on deps=low
2019-08-22 08:53:14 +02:00
Nicolas Grekas
fc186bb78f
Add return types to tests and final|internal|private methods
2019-08-21 17:14:41 +02:00
Alexander M. Turek
ea9e375b0b
Removed calls to Twig\Environment::loadTemplate().
2019-08-21 13:24:25 +02:00
Alexander M. Turek
f5b6ee9de1
Fix inconsistent return points.
2019-08-20 15:31:17 +02:00
Nicolas Grekas
aa338c8b42
Import return annotations from vendors
2019-08-14 15:27:41 +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
32e0a25200
feature #32845 [HttpKernel][FrameworkBundle] Add alternative convention for bundle directories (yceruto)
...
This PR was squashed before being merged into the 4.4 branch (closes #32845 ).
Discussion
----------
[HttpKernel][FrameworkBundle] Add alternative convention for bundle directories
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/32453
| License | MIT
| Doc PR | TODO
We already know that bundles must be compatible with many Symfony's versions, so it is very likely that current bundles won't be able to use this feature soon, unless they create symbolic links to support both structures.
The point is that this is already happening, so in the future when our bundles stop to support <=4.3 then you'll be sure to change the current directory structure.
We have recently added the `getPublicDir()` method in https://github.com/symfony/symfony/pull/31975 , here I'm removing it in favor of hardcoding a new convention.
I've added some functional tests in which I've changed everything to this structure:
```
-- ModernBundle
|-- config/
|-- public/
|-- src/
|-- ModernBundle.php
|-- templates/
|-- translations/
```
WDYT?
Commits
-------
6996e1cbe2
[HttpKernel][FrameworkBundle] Add alternative convention for bundle directories
2019-08-13 15:29:11 +02:00
Yonel Ceruto
6996e1cbe2
[HttpKernel][FrameworkBundle] Add alternative convention for bundle directories
2019-08-13 15:29:02 +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
Fabien Potencier
692a6e7495
Remove unneeded phpdocs
2019-08-08 11:37:48 +02:00
Jérémy Derussé
a5af6c4cd7
Disable phpunit typehint patch on 4.3 branch
2019-08-08 11:29:19 +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
94a0719bfc
minor #32974 "An instance of X" phpdocs removal (fabpot)
...
This PR was merged into the 4.4 branch.
Discussion
----------
"An instance of X" phpdocs removal
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
That's #32973 on 4.4 :P
Commits
-------
7a44ed6544
removed unneeded phpdocs
2019-08-06 09:13:58 +02:00
Nicolas Grekas
34e86761f4
Merge branch '4.3' into 4.4
...
* 4.3:
bump phpunit-bridge cache-id
Use assertStringContainsString when needed
Use assert assertContainsEquals when needed
Use assertEqualsWithDelta when required
2019-08-06 09:11:23 +02:00
Nicolas Grekas
5f96c0dee4
Merge branch '3.4' into 4.3
...
* 3.4:
bump phpunit-bridge cache-id
Use assertStringContainsString when needed
Use assert assertContainsEquals when needed
Use assertEqualsWithDelta when required
2019-08-06 09:11:09 +02:00
Fabien Potencier
7a44ed6544
removed unneeded phpdocs
2019-08-06 08:19:29 +02:00
Jérémy Derussé
058ef39bae
Use assertStringContainsString when needed
2019-08-06 08:15:37 +02:00
Nicolas Grekas
d588be203a
Merge branch '4.3' into 4.4
...
* 4.3:
Remove use of ForwardCompatTrait
Remove deprecated methods assertArraySubset
2019-08-03 23:59:26 +02:00
Nicolas Grekas
64e3a327bc
Merge branch '3.4' into 4.3
...
* 3.4:
Remove use of ForwardCompatTrait
Remove deprecated methods assertArraySubset
2019-08-03 23:50:52 +02:00
Jérémy Derussé
ac6242f36b
Remove use of ForwardCompatTrait
2019-08-03 23:15:25 +02:00
Nicolas Grekas
daa4e4020f
Merge branch '4.3' into 4.4
...
* 4.3:
Fix tests
Fix deprecated phpunit annotation
2019-08-02 14:28:34 +02:00
Nicolas Grekas
1b56d7f04d
Merge branch '3.4' into 4.3
...
* 3.4:
Fix tests
Fix deprecated phpunit annotation
2019-08-02 14:15:04 +02:00
Jérémy Derussé
3a626e8778
Fix deprecated phpunit annotation
2019-08-02 00:48:42 +02:00
Yonel Ceruto
c11f20006b
Twig's namespaces can be null
2019-08-01 08:50:03 -04:00
Fabien Potencier
f830226271
minor #32786 add parameter type declarations to private methods (xabbuh)
...
This PR was merged into the 4.4 branch.
Discussion
----------
add parameter type declarations to private methods
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
Commits
-------
1b2aaa4a06
add parameter type declarations to private methods
2019-08-01 09:48:49 +02:00
Nicolas Grekas
13f7616afb
Merge branch '4.3' into 4.4
...
* 4.3:
[Cache] fix cs
Make tests support phpunit 8
Allow Travis CI to build on PHP 7.4
2019-08-01 00:33:28 +02:00
Nicolas Grekas
bce1d5bcd0
Merge branch '3.4' into 4.3
...
* 3.4:
[Cache] fix cs
Make tests support phpunit 8
2019-08-01 00:32:32 +02:00
Nicolas Grekas
81af97f398
Make tests support phpunit 8
2019-07-31 23:55:24 +02:00
Christian Flothmann
1b2aaa4a06
add parameter type declarations to private methods
2019-07-31 20:51:46 +02:00
Yonel Ceruto
28a7ab8048
[TwigBundle] Update tests inline with master version
2019-07-25 08:35:38 -04:00
Yonel Ceruto
bf0c24a634
Deprecating error templates for non-html formats and using ErrorRenderer
2019-07-23 22:44:45 -04:00
Nicolas Grekas
f805fe3a16
Merge branch '4.2' into 4.3
...
* 4.2:
fix tests
[Validator] Added support for validation of giga values
Fix Debug component tests
2019-07-19 10:33:28 +02:00
Nicolas Grekas
7964eb816a
Merge branch '3.4' into 4.2
...
* 3.4:
fix tests
[Validator] Added support for validation of giga values
Fix Debug component tests
2019-07-19 10:33:10 +02:00
Christian Flothmann
a616e18b07
fix tests
2019-07-19 10:16:37 +02:00
Alex Pott
88196ef4af
[DI] Move non removing compiler passes to after removing passes
2019-07-18 19:01:22 +02:00
Yonel Ceruto
fb5b0429b2
Rename ErrorCatcher to ErrorRenderer (rendering part only)
2019-07-11 10:46:43 +02:00
Nicolas Grekas
b40f6b5e72
fix merge
2019-06-28 15:25:44 +02:00
Christian Flothmann
61d180e7de
Merge branch '4.3' into 4.4
...
* 4.3:
fix Debug component dependencies
[travis] not all components have a master branch
[HttpKernel] Add @method PHPDoc for getRequest and getResponse back to Client
2019-06-28 14:32:50 +02:00
Christian Flothmann
a1de01c6ff
Merge branch '4.2' into 4.3
...
* 4.2:
fix Debug component dependencies
[travis] not all components have a master branch
2019-06-28 14:12:54 +02:00
Christian Flothmann
5edac837a0
Merge branch '3.4' into 4.2
...
* 3.4:
fix Debug component dependencies
[travis] not all components have a master branch
2019-06-28 14:00:38 +02:00
Christian Flothmann
87fe077a89
fix Debug component dependencies
2019-06-28 11:18:39 +02:00
Fabien Potencier
f511bc5ff6
deprecated FlattenException::create()
2019-06-27 19:51:41 +02:00