Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8c0199e

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.0'
* 4.0: PhpDoc: There is no attempt to create the directory Avoiding an error when an unused service has a missing base class Add an implementation just for php 7.0 bumped Symfony version to 2.7.47 Fix #27011: Session ini_set bug [Cache] TagAwareAdapterInterface::invalidateTags() should commit deferred items updated VERSION for 2.7.46 update CONTRIBUTORS for 2.7.46 updated CHANGELOG for 2.7.46 bug #25844 [HttpKernel] Catch HttpExceptions when templating is not installed
2 parents 3e320d6 + ca0f0cf commit 8c0199e

File tree

13 files changed

+260
-78
lines changed

13 files changed

+260
-78
lines changed

‎CONTRIBUTORS.md

Lines changed: 43 additions & 25 deletions
Large diffs are not rendered by default.

‎src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV6.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class TestRunnerForV6 extends BaseRunner
2424
/**
2525
* {@inheritdoc}
2626
*/
27-
protected function handleConfiguration(array &$arguments): void
27+
protected function handleConfiguration(array &$arguments)
2828
{
2929
$listener = new SymfonyTestsListener();
3030

‎src/Symfony/Bridge/PhpUnit/Legacy/TestRunnerForV7.php

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\PhpUnit\Legacy;
13+
14+
use PHPUnit\TextUI\TestRunner as BaseRunner;
15+
use Symfony\Bridge\PhpUnit\SymfonyTestsListener;
16+
17+
/**
18+
* {@inheritdoc}
19+
*
20+
* @internal
21+
*/
22+
class TestRunnerForV7 extends BaseRunner
23+
{
24+
/**
25+
* {@inheritdoc}
26+
*/
27+
protected function handleConfiguration(array &$arguments): void
28+
{
29+
$listener = new SymfonyTestsListener();
30+
31+
parent::handleConfiguration($arguments);
32+
33+
$arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
34+
35+
$registeredLocally = false;
36+
37+
foreach ($arguments['listeners'] as $registeredListener) {
38+
if ($registeredListener instanceof SymfonyTestsListener) {
39+
$registeredListener->globalListenerDisabled();
40+
$registeredLocally = true;
41+
break;
42+
}
43+
}
44+
45+
if (!$registeredLocally) {
46+
$arguments['listeners'][] = $listener;
47+
}
48+
}
49+
}

‎src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313

1414
if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
1515
class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunnerForV5', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');
16-
} else {
16+
} elseif (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '7.0.0', '<')) {
1717
class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunnerForV6', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');
18+
} else {
19+
class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunnerForV7', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');
1820
}
1921

2022
if (false) {

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,15 @@
6767
<argument type="service" id="router" on-invalid="ignore" />
6868
</service>
6969

70+
<service id="http_exception_listener" class="Symfony\Component\HttpKernel\EventListener\ExceptionListener">
71+
<tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" priority="-256"/>
72+
<tag name="monolog.logger" channel="request" />
73+
<argument>null</argument>
74+
<argument type="service" id="logger" on-invalid="null" />
75+
<argument>%kernel.debug%</argument>
76+
<argument>%kernel.charset%</argument>
77+
</service>
78+
7079
<service id="validate_request_listener" class="Symfony\Component\HttpKernel\EventListener\ValidateRequestListener">
7180
<tag name="kernel.event_subscriber" />
7281
</service>

‎src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php

Lines changed: 81 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,14 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
3333
private $getTagsByKey;
3434
private $invalidateTags;
3535
private $tags;
36+
private $knownTagVersions = array();
37+
private $knownTagVersionsTtl;
3638

37-
public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null)
39+
public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null, $knownTagVersionsTtl = 0.15)
3840
{
3941
$this->pool = $itemsPool;
4042
$this->tags = $tagsPool ?: $itemsPool;
43+
$this->knownTagVersionsTtl = $knownTagVersionsTtl;
4144
$this->createCacheItem = \Closure::bind(
4245
function ($key, $value, CacheItem $protoItem) {
4346
$item = new CacheItem();
@@ -87,8 +90,7 @@ function ($deferred) {
8790
);
8891
$this->invalidateTags = \Closure::bind(
8992
function (AdapterInterface $tagsAdapter, array $tags) {
90-
foreach ($tagsAdapter->getItems($tags) as $v) {
91-
$v->set(1 + (int) $v->get());
93+
foreach ($tags as $v) {
9294
$v->defaultLifetime = 0;
9395
$v->expiry = null;
9496
$tagsAdapter->saveDeferred($v);
@@ -106,14 +108,42 @@ function (AdapterInterface $tagsAdapter, array $tags) {
106108
*/
107109
public function invalidateTags(array $tags)
108110
{
109-
foreach ($tags as $k => $tag) {
110-
if ('' !== $tag && \is_string($tag)) {
111-
$tags[$k] = $tag.static::TAGS_PREFIX;
111+
$ok = true;
112+
$tagsByKey = array();
113+
$invalidatedTags = array();
114+
foreach ($tags as $tag) {
115+
CacheItem::validateKey($tag);
116+
$invalidatedTags[$tag] = 0;
117+
}
118+
119+
if ($this->deferred) {
120+
$items = $this->deferred;
121+
foreach ($items as $key => $item) {
122+
if (!$this->pool->saveDeferred($item)) {
123+
unset($this->deferred[$key]);
124+
$ok = false;
125+
}
112126
}
127+
128+
$f = $this->getTagsByKey;
129+
$tagsByKey = $f($items);
130+
$this->deferred = array();
131+
}
132+
133+
$tagVersions = $this->getTagVersions($tagsByKey, $invalidatedTags);
134+
$f = $this->createCacheItem;
135+
136+
foreach ($tagsByKey as $key => $tags) {
137+
$this->pool->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
138+
}
139+
$ok = $this->pool->commit() && $ok;
140+
141+
if ($invalidatedTags) {
142+
$f = $this->invalidateTags;
143+
$ok = $f($this->tags, $invalidatedTags) && $ok;
113144
}
114-
$f = $this->invalidateTags;
115145

116-
return $f($this->tags, $tags);
146+
return $ok;
117147
}
118148

119149
/**
@@ -132,7 +162,7 @@ public function hasItem($key)
132162
}
133163

134164
foreach ($this->getTagVersions(array($itemTags)) as $tag => $version) {
135-
if ($itemTags[$tag] !== $version) {
165+
if ($itemTags[$tag] !== $version && 1 !== $itemTags[$tag] - $version) {
136166
return false;
137167
}
138168
}
@@ -241,29 +271,7 @@ public function saveDeferred(CacheItemInterface $item)
241271
*/
242272
public function commit()
243273
{
244-
$ok = true;
245-
246-
if ($this->deferred) {
247-
$items = $this->deferred;
248-
foreach ($items as $key => $item) {
249-
if (!$this->pool->saveDeferred($item)) {
250-
unset($this->deferred[$key]);
251-
$ok = false;
252-
}
253-
}
254-
255-
$f = $this->getTagsByKey;
256-
$tagsByKey = $f($items);
257-
$this->deferred = array();
258-
$tagVersions = $this->getTagVersions($tagsByKey);
259-
$f = $this->createCacheItem;
260-
261-
foreach ($tagsByKey as $key => $tags) {
262-
$this->pool->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
263-
}
264-
}
265-
266-
return $this->pool->commit() && $ok;
274+
return $this->invalidateTags(array());
267275
}
268276

269277
public function __destruct()
@@ -294,7 +302,7 @@ private function generateItems($items, array $tagKeys)
294302

295303
foreach ($itemTags as $key => $tags) {
296304
foreach ($tags as $tag => $version) {
297-
if ($tagVersions[$tag] !== $version) {
305+
if ($tagVersions[$tag] !== $version && 1 !== $version - $tagVersions[$tag]) {
298306
unset($itemTags[$key]);
299307
continue 2;
300308
}
@@ -310,23 +318,54 @@ private function generateItems($items, array $tagKeys)
310318
}
311319
}
312320

313-
private function getTagVersions(array $tagsByKey)
321+
private function getTagVersions(array $tagsByKey, array &$invalidatedTags = array())
314322
{
315-
$tagVersions = array();
323+
$tagVersions = $invalidatedTags;
316324

317325
foreach ($tagsByKey as $tags) {
318326
$tagVersions += $tags;
319327
}
320328

321-
if ($tagVersions) {
322-
$tags = array();
323-
foreach ($tagVersions as $tag => $version) {
324-
$tagVersions[$tag] = $tag.static::TAGS_PREFIX;
325-
$tags[$tag.static::TAGS_PREFIX] = $tag;
329+
if (!$tagVersions) {
330+
return array();
331+
}
332+
333+
if (!$fetchTagVersions = 1 !== \func_num_args()) {
334+
foreach ($tagsByKey as $tags) {
335+
foreach ($tags as $tag => $version) {
336+
if ($tagVersions[$tag] > $version) {
337+
$tagVersions[$tag] = $version;
338+
}
339+
}
340+
}
341+
}
342+
343+
$now = microtime(true);
344+
$tags = array();
345+
foreach ($tagVersions as $tag => $version) {
346+
$tags[$tag.static::TAGS_PREFIX] = $tag;
347+
if ($fetchTagVersions || !isset($this->knownTagVersions[$tag])) {
348+
continue;
349+
}
350+
$version -= $this->knownTagVersions[$tag][1];
351+
if ((0 !== $version && 1 !== $version) || $this->knownTagVersionsTtl > $now - $this->knownTagVersions[$tag][0]) {
352+
// reuse previously fetched tag versions up to the ttl, unless we are storing items or a potential miss arises
353+
$fetchTagVersions = true;
354+
} else {
355+
$this->knownTagVersions[$tag][1] += $version;
326356
}
327-
foreach ($this->tags->getItems($tagVersions) as $tag => $version) {
328-
$tagVersions[$tags[$tag]] = $version->get() ?: 0;
357+
}
358+
359+
if (!$fetchTagVersions) {
360+
return $tagVersions;
361+
}
362+
363+
foreach ($this->tags->getItems(array_keys($tags)) as $tag => $version) {
364+
$tagVersions[$tag = $tags[$tag]] = $version->get() ?: 0;
365+
if (isset($invalidatedTags[$tag])) {
366+
$invalidatedTags[$tag] = $version->set(++$tagVersions[$tag]);
329367
}
368+
$this->knownTagVersions[$tag] = array($now, $tagVersions[$tag]);
330369
}
331370

332371
return $tagVersions;

‎src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,22 @@ public function testInvalidateTags()
7171
$this->assertTrue($pool->getItem('foo')->isHit());
7272
}
7373

74+
public function testInvalidateCommits()
75+
{
76+
$pool1 = $this->createCachePool();
77+
78+
$foo = $pool1->getItem('foo');
79+
$foo->tag('tag');
80+
81+
$pool1->saveDeferred($foo->set('foo'));
82+
$pool1->invalidateTags(array('tag'));
83+
84+
$pool2 = $this->createCachePool();
85+
$foo = $pool2->getItem('foo');
86+
87+
$this->assertTrue($foo->isHit());
88+
}
89+
7490
public function testTagsAreCleanedOnSave()
7591
{
7692
$pool = $this->createCachePool();

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;
1616
use Symfony\Component\DependencyInjection\Definition;
1717
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
18+
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
1819
use Symfony\Component\DependencyInjection\LazyProxy\ProxyHelper;
1920
use Symfony\Component\DependencyInjection\TypedReference;
2021
use Symfony\Component\DependencyInjection\Reference;
@@ -88,8 +89,14 @@ protected function processValue($value, $isRoot = false)
8889

8990
$calls = $value->getMethodCalls();
9091

91-
if ($constructor = $this->getConstructor($value, false)) {
92-
$calls[] = array($constructor, $value->getArguments());
92+
try {
93+
if ($constructor = $this->getConstructor($value, false)) {
94+
$calls[] = array($constructor, $value->getArguments());
95+
}
96+
} catch (RuntimeException $e) {
97+
$this->container->getDefinition($this->currentId)->addError($e->getMessage());
98+
99+
return parent::processValue($value, $isRoot);
93100
}
94101

95102
foreach ($calls as $i => $call) {

‎src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,20 +346,20 @@ public function setOptions(array $options)
346346
}
347347

348348
$validOptions = array_flip(array(
349-
'cache_limiter', 'cache_expire', 'cookie_domain', 'cookie_httponly',
349+
'cache_expire', 'cache_limiter', 'cookie_domain', 'cookie_httponly',
350350
'cookie_lifetime', 'cookie_path', 'cookie_secure',
351351
'gc_divisor', 'gc_maxlifetime', 'gc_probability',
352352
'lazy_write', 'name', 'referer_check',
353353
'serialize_handler', 'use_strict_mode', 'use_cookies',
354354
'use_only_cookies', 'use_trans_sid', 'upload_progress.enabled',
355355
'upload_progress.cleanup', 'upload_progress.prefix', 'upload_progress.name',
356-
'upload_progress.freq', 'upload_progress.min-freq', 'url_rewriter.tags',
356+
'upload_progress.freq', 'upload_progress.min_freq', 'url_rewriter.tags',
357357
'sid_length', 'sid_bits_per_character', 'trans_sid_hosts', 'trans_sid_tags',
358358
));
359359

360360
foreach ($options as $key => $value) {
361361
if (isset($validOptions[$key])) {
362-
ini_set('session.'.$key, $value);
362+
ini_set('url_rewriter.tags' !== $key ? 'session.'.$key : $key, $value);
363363
}
364364
}
365365
}

‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,23 @@ public function testCookieOptions()
182182
$this->assertEquals($options, $gco);
183183
}
184184

185+
public function testSessionOptions()
186+
{
187+
if (defined('HHVM_VERSION')) {
188+
$this->markTestSkipped('HHVM is not handled in this test case.');
189+
}
190+
191+
$options = array(
192+
'url_rewriter.tags' => 'a=href',
193+
'cache_expire' => '200',
194+
);
195+
196+
$this->getStorage($options);
197+
198+
$this->assertSame('a=href', ini_get('url_rewriter.tags'));
199+
$this->assertSame('200', ini_get('session.cache_expire'));
200+
}
201+
185202
/**
186203
* @expectedException \InvalidArgumentException
187204
*/

0 commit comments

Comments
 (0)