Nicolas Grekas
3dd22cb4c8
Merge branch '4.0' into 4.1
...
* 4.0:
[DI] Fix bad exception on uninitialized references to non-shared services
[HttpFoundation] Fix perf issue during MimeTypeGuesser intialization
2018-05-25 13:09:16 +02:00
Nicolas Grekas
2b8932f1cd
Merge branch '3.4' into 4.0
...
* 3.4:
[DI] Fix bad exception on uninitialized references to non-shared services
[HttpFoundation] Fix perf issue during MimeTypeGuesser intialization
2018-05-25 13:08:56 +02:00
Nicolas Grekas
993c028185
Merge branch '2.8' into 3.4
...
* 2.8:
[HttpFoundation] Fix perf issue during MimeTypeGuesser intialization
2018-05-25 13:07:31 +02:00
Nicolas Grekas
46c2d4b3b0
bug #27364 [DI] Fix bad exception on uninitialized references to non-shared services (nicolas-grekas)
...
This PR was merged into the 3.4 branch.
Discussion
----------
[DI] Fix bad exception on uninitialized references to non-shared services
| Q | A
| ------------- | ---
| Branch? | 3.4
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #27360
| License | MIT
| Doc PR | -
This restriction is unneeded complexity that prevents legit use cases (see linked issue #27360 ).
Commits
-------
8bba68f811
[DI] Fix bad exception on uninitialized references to non-shared services
2018-05-25 13:02:29 +02:00
Fabien Potencier
ca6cc78c7e
Merge branch '2.7' into 2.8
...
* 2.7:
[HttpFoundation] Fix perf issue during MimeTypeGuesser intialization
2018-05-25 13:00:14 +02:00
Nicolas Grekas
26f3318dd4
[SecurityBundle] fix test
2018-05-25 12:58:40 +02:00
Fabien Potencier
ab32125187
bug #27359 [HttpFoundation] Fix perf issue during MimeTypeGuesser intialization (nicolas-grekas)
...
This PR was merged into the 2.7 branch.
Discussion
----------
[HttpFoundation] Fix perf issue during MimeTypeGuesser intialization
| Q | A
| ------------- | ---
| Branch? | 2.7
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #27307
| License | MIT
| Doc PR | -
introduced in #26886
![image](https://user-images.githubusercontent.com/243674/40451947-918f5358-5ee0-11e8-9f1a-cf707bf3cefa.png )
Commits
-------
f8e7a18d1b
[HttpFoundation] Fix perf issue during MimeTypeGuesser intialization
2018-05-25 12:53:06 +02:00
Nicolas Grekas
553786edc7
Merge branch '4.1'
...
* 4.1:
[SecurityBundle] update conflict rule
fix class existence
fix tests
fixed constraints
fixed constraints
bumped dep
bumped dep
2018-05-25 11:06:08 +02:00
Nicolas Grekas
bdf2ecb3f3
Merge branch '4.0' into 4.1
...
* 4.0:
[SecurityBundle] update conflict rule
fix class existence
fix tests
fixed constraints
fixed constraints
bumped dep
bumped dep
2018-05-25 11:05:54 +02:00
Nicolas Grekas
34bb84be98
Merge branch '3.4' into 4.0
...
* 3.4:
[SecurityBundle] update conflict rule
2018-05-25 11:05:43 +02:00
Nicolas Grekas
531fcacd5f
[SecurityBundle] update conflict rule
2018-05-25 11:04:35 +02:00
Fabien Potencier
a313a8f8be
Merge branch '3.4' into 4.0
...
* 3.4:
fix class existence
fix tests
fixed constraints
fixed constraints
bumped dep
bumped dep
2018-05-25 10:44:26 +02:00
Christian Flothmann
a1166b5527
fix class existence
2018-05-25 10:40:41 +02:00
Christian Flothmann
e65a122d17
fix tests
2018-05-25 09:52:36 +02:00
Fabien Potencier
5b7d5abb88
Merge branch '2.8' into 3.4
...
* 2.8:
fixed constraints
fixed constraints
bumped dep
bumped dep
2018-05-25 09:50:41 +02:00
Fabien Potencier
97622b2172
Merge branch '4.1'
...
* 4.1:
fix tests
2018-05-25 09:49:09 +02:00
Fabien Potencier
27954581e5
Merge branch '4.0' into 4.1
...
* 4.0:
fix tests
2018-05-25 09:48:58 +02:00
Christian Flothmann
ffd72c8dee
fix tests
2018-05-25 09:48:49 +02:00
Fabien Potencier
2ed0cedb19
fixed constraints
2018-05-25 09:32:23 +02:00
Fabien Potencier
43a0affb8f
Merge branch '2.7' into 2.8
...
* 2.7:
fixed constraints
bumped dep
bumped dep
2018-05-25 08:52:49 +02:00
Fabien Potencier
2f34263a1a
fixed constraints
2018-05-25 08:35:17 +02:00
Fabien Potencier
1151ab28c0
bumped dep
2018-05-25 08:20:37 +02:00
Fabien Potencier
87153549f6
bumped dep
2018-05-25 07:45:02 +02:00
Gabriel Ostrolucký
0e74f73af5
Tweak Argon2 test config
...
Memory cost 8 seems to be lowest value accepted on my machine
```
Testing Symfony\Component\Security\Core\Tests\Encoder\Argon2iPasswordEncoderTest
E.... 5 / 5 (100%)
Time: 114 ms, Memory: 4.00MB
There was 1 error:
1) Symfony\Component\Security\Core\Tests\Encoder\Argon2iPasswordEncoderTest::testValidationWithConfig
password_hash(): Memory cost is outside of allowed memory range
/home/gadelat/PhpstormProjects/symfony/src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php:105
/home/gadelat/PhpstormProjects/symfony/src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php:67
/home/gadelat/PhpstormProjects/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/Argon2iPasswordEncoderTest.php:34
```
2018-05-24 23:41:30 +02:00
Gabriel Ostrolucký
47f0e732d9
[HttpFoundation] Fix cookie test with xdebug
...
Here's the failure without this patch:
```
Testing Symfony\Component\HttpFoundation\Tests\ResponseFunctionalTest
F..... 6 / 6 (100%)
Time: 1.07 seconds, Memory: 4.00MB
There was 1 failure:
1) Symfony\Component\HttpFoundation\Tests\ResponseFunctionalTest::testCookie with data set #0 ('cookie_max_age')
Failed asserting that string matches format description.
--- Expected
+++ Actual
@@ @@
Warning: Expiry date cannot have a year greater than 9999 in /home/gadelat/PhpstormProjects/symfony/src/Symfony/Component/HttpFoundation/Tests/Fixtures/response-functional/cookie_max_age.php on line 10
+Call Stack:
+ 0.0004 390392 1. {main}() /home/gadelat/PhpstormProjects/symfony/src/Symfony/Component/HttpFoundation/Tests/Fixtures/response-functional/cookie_max_age.php:0
+ 0.0178 500960 2. setcookie() /home/gadelat/PhpstormProjects/symfony/src/Symfony/Component/HttpFoundation/Tests/Fixtures/response-functional/cookie_max_age.php:10
+
+
Array
(
[0] => Content-Type: text/plain; charset=utf-8
[1] => Cache-Control: no-cache, private
[2] => Date: Sat, 12 Nov 1955 20:04:00 GMT
- [3] => Set-Cookie: foo=bar; expires=Sat, 01-Jan-10000 02:46:40 GMT; Max-Age=%d; path=/
+ [3] => Set-Cookie: foo=bar; expires=Sat, 01-Jan-10000 02:46:40 GMT; Max-Age=251875115405; path=/
)
shutdown
/home/gadelat/PhpstormProjects/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php:49
```
2018-05-24 22:59:06 +02:00
Fabien Potencier
fee487bba6
Merge branch '4.1'
...
* 4.1:
fixtures config fix
2018-05-24 21:00:51 +02:00
Fabien Potencier
ea5fd1c5aa
Merge branch '4.0' into 4.1
...
* 4.0:
fixtures config fix
2018-05-24 21:00:42 +02:00
Fabien Potencier
aafd35d862
Merge branch '3.4' into 4.0
...
* 3.4:
fixtures config fix
2018-05-24 21:00:32 +02:00
Fabien Potencier
87622765e5
Merge branch '2.8' into 3.4
...
* 2.8:
fixtures config fix
2018-05-24 21:00:05 +02:00
Christian Flothmann
32c73a71a7
fixtures config fix
2018-05-24 20:59:44 +02:00
Fabien Potencier
a762b83514
Merge branch '4.1'
...
* 4.1:
added missing constraint
2018-05-24 20:21:30 +02:00
Fabien Potencier
893e4b1a91
Merge branch '4.0' into 4.1
...
* 4.0:
added missing constraint
2018-05-24 20:21:23 +02:00
Fabien Potencier
74df49db0b
Merge branch '3.4' into 4.0
...
* 3.4:
added missing constraint
2018-05-24 20:21:19 +02:00
Fabien Potencier
777727829d
added missing constraint
2018-05-24 20:20:58 +02:00
Fabien Potencier
2276ada8ea
Merge branch '4.1'
...
* 4.1:
simplified code
2018-05-24 17:52:49 +02:00
Fabien Potencier
ccd5c278db
Merge branch '4.0' into 4.1
...
* 4.0:
simplified code
2018-05-24 17:52:41 +02:00
Fabien Potencier
86f164b6ff
Merge branch '3.4' into 4.0
...
* 3.4:
simplified code
2018-05-24 17:52:33 +02:00
Fabien Potencier
91c25689d2
simplified code
2018-05-24 17:52:07 +02:00
Nicolas Grekas
d8cbec00ad
[FrameworkBundle] cleanup generated test container
2018-05-24 17:31:00 +02:00
Fabien Potencier
a566cfb47c
Merge branch '4.1'
...
* 4.1:
[SecurityBundle] Fail if security.http_utils cannot be configured
2018-05-24 15:24:57 +02:00
Fabien Potencier
37003ec730
Merge branch '4.0' into 4.1
...
* 4.0:
[SecurityBundle] Fail if security.http_utils cannot be configured
2018-05-24 15:24:47 +02:00
Fabien Potencier
f11c24e148
Merge branch '3.4' into 4.0
...
* 3.4:
[SecurityBundle] Fail if security.http_utils cannot be configured
2018-05-24 15:24:39 +02:00
Fabien Potencier
500bede9c8
Merge branch '2.8' into 3.4
...
* 2.8:
[SecurityBundle] Fail if security.http_utils cannot be configured
2018-05-24 15:24:30 +02:00
Fabien Potencier
6d455f224b
Merge branch '2.7' into 2.8
...
* 2.7:
[SecurityBundle] Fail if security.http_utils cannot be configured
2018-05-24 15:22:57 +02:00
Fabien Potencier
b20e83562e
security #cve-2018-11408 [SecurityBundle] Fail if security.http_utils cannot be configured
...
* cve-2018-11408-2.7:
[SecurityBundle] Fail if security.http_utils cannot be configured
2018-05-24 15:22:46 +02:00
Nicolas Grekas
c003b7a247
[SecurityBundle] Fail if security.http_utils cannot be configured
2018-05-24 15:22:37 +02:00
Fabien Potencier
562b1f195f
Merge branch '4.1'
...
* 4.1:
clear CSRF tokens when the user is logged out
2018-05-24 15:20:17 +02:00
Fabien Potencier
3626bd1214
Merge branch '4.0' into 4.1
...
* 4.0:
clear CSRF tokens when the user is logged out
2018-05-24 15:20:06 +02:00
Fabien Potencier
99c9b2d4c0
Merge branch '3.4' into 4.0
...
* 3.4:
clear CSRF tokens when the user is logged out
2018-05-24 15:19:09 +02:00
Fabien Potencier
fd29c8c204
Merge branch '2.8' into 3.4
...
* 2.8:
2018-05-24 15:17:49 +02:00