Merge branch '4.2' into 4.3
* 4.2: [Cache] Pass arg to get callback everywhere Add a missing quote in getValue() DocBlock [HttpFoundation] Fixed case-sensitive handling of cache-control header in RedirectResponse constructor. minor: ChoiceType callable deprecation after/before seems wrong
This commit is contained in:
commit
fa07177838
@ -297,19 +297,17 @@ Form
|
|||||||
`ArrayAccess` in `ResizeFormListener::preSubmit` method has been removed.
|
`ArrayAccess` in `ResizeFormListener::preSubmit` method has been removed.
|
||||||
|
|
||||||
* Using callable strings as choice options in ChoiceType is not supported
|
* Using callable strings as choice options in ChoiceType is not supported
|
||||||
anymore in favor of passing PropertyPath instances.
|
anymore.
|
||||||
|
|
||||||
Before:
|
Before:
|
||||||
|
|
||||||
```php
|
```php
|
||||||
'choice_value' => new PropertyPath('range'),
|
|
||||||
'choice_label' => 'strtoupper',
|
'choice_label' => 'strtoupper',
|
||||||
```
|
```
|
||||||
|
|
||||||
After:
|
After:
|
||||||
|
|
||||||
```php
|
```php
|
||||||
'choice_value' => 'range',
|
|
||||||
'choice_label' => function ($choice) {
|
'choice_label' => function ($choice) {
|
||||||
return strtoupper($choice);
|
return strtoupper($choice);
|
||||||
},
|
},
|
||||||
|
@ -59,7 +59,8 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
|
|||||||
|
|
||||||
// ArrayAdapter works in memory, we don't care about stampede protection
|
// ArrayAdapter works in memory, we don't care about stampede protection
|
||||||
if (INF === $beta || !$item->isHit()) {
|
if (INF === $beta || !$item->isHit()) {
|
||||||
$this->save($item->set($callback($item)));
|
$save = true;
|
||||||
|
$this->save($item->set($callback($item, $save)));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $item->get();
|
return $item->get();
|
||||||
|
@ -42,7 +42,9 @@ class NullAdapter implements AdapterInterface, CacheInterface
|
|||||||
*/
|
*/
|
||||||
public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
|
public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
|
||||||
{
|
{
|
||||||
return $callback(($this->createCacheItem)($key));
|
$save = true;
|
||||||
|
|
||||||
|
return $callback(($this->createCacheItem)($key), $save);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -103,9 +103,9 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
|
|||||||
return $this->doGet($this, $key, $callback, $beta, $metadata);
|
return $this->doGet($this, $key, $callback, $beta, $metadata);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->pool->get($this->getId($key), function ($innerItem) use ($key, $callback) {
|
return $this->pool->get($this->getId($key), function ($innerItem, bool &$save) use ($key, $callback) {
|
||||||
$item = ($this->createCacheItem)($key, $innerItem);
|
$item = ($this->createCacheItem)($key, $innerItem);
|
||||||
$item->set($value = $callback($item));
|
$item->set($value = $callback($item, $save));
|
||||||
($this->setInnerItem)($innerItem, (array) $item);
|
($this->setInnerItem)($innerItem, (array) $item);
|
||||||
|
|
||||||
return $value;
|
return $value;
|
||||||
|
@ -45,10 +45,10 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
|
|||||||
}
|
}
|
||||||
|
|
||||||
$isHit = true;
|
$isHit = true;
|
||||||
$callback = function (CacheItem $item) use ($callback, &$isHit) {
|
$callback = function (CacheItem $item, bool &$save) use ($callback, &$isHit) {
|
||||||
$isHit = $item->isHit();
|
$isHit = $item->isHit();
|
||||||
|
|
||||||
return $callback($item);
|
return $callback($item, $save);
|
||||||
};
|
};
|
||||||
|
|
||||||
$event = $this->start(__FUNCTION__);
|
$event = $this->start(__FUNCTION__);
|
||||||
|
@ -12,9 +12,12 @@
|
|||||||
namespace Symfony\Component\Cache\Tests\Adapter;
|
namespace Symfony\Component\Cache\Tests\Adapter;
|
||||||
|
|
||||||
use Cache\IntegrationTests\CachePoolTest;
|
use Cache\IntegrationTests\CachePoolTest;
|
||||||
|
use PHPUnit\Framework\Assert;
|
||||||
|
use Psr\Cache\CacheItemInterface;
|
||||||
use Psr\Cache\CacheItemPoolInterface;
|
use Psr\Cache\CacheItemPoolInterface;
|
||||||
use Symfony\Component\Cache\CacheItem;
|
use Symfony\Component\Cache\CacheItem;
|
||||||
use Symfony\Component\Cache\PruneableInterface;
|
use Symfony\Component\Cache\PruneableInterface;
|
||||||
|
use Symfony\Contracts\Cache\CallbackInterface;
|
||||||
|
|
||||||
abstract class AdapterTestCase extends CachePoolTest
|
abstract class AdapterTestCase extends CachePoolTest
|
||||||
{
|
{
|
||||||
@ -57,6 +60,22 @@ abstract class AdapterTestCase extends CachePoolTest
|
|||||||
$this->assertSame($value, $item->get());
|
$this->assertSame($value, $item->get());
|
||||||
}, INF));
|
}, INF));
|
||||||
$this->assertFalse($isHit);
|
$this->assertFalse($isHit);
|
||||||
|
|
||||||
|
$this->assertSame($value, $cache->get('bar', new class($value) implements CallbackInterface {
|
||||||
|
private $value;
|
||||||
|
|
||||||
|
public function __construct(int $value)
|
||||||
|
{
|
||||||
|
$this->value = $value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function __invoke(CacheItemInterface $item, bool &$save)
|
||||||
|
{
|
||||||
|
Assert::assertSame('bar', $item->getKey());
|
||||||
|
|
||||||
|
return $this->value;
|
||||||
|
}
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testRecursiveGet()
|
public function testRecursiveGet()
|
||||||
|
@ -42,7 +42,7 @@ class RedirectResponse extends Response
|
|||||||
throw new \InvalidArgumentException(sprintf('The HTTP status code is not a redirect ("%s" given).', $status));
|
throw new \InvalidArgumentException(sprintf('The HTTP status code is not a redirect ("%s" given).', $status));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (301 == $status && !\array_key_exists('cache-control', $headers)) {
|
if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, \CASE_LOWER))) {
|
||||||
$this->headers->remove('cache-control');
|
$this->headers->remove('cache-control');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -91,6 +91,10 @@ class RedirectResponseTest extends TestCase
|
|||||||
$this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
|
$this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
|
||||||
$this->assertTrue($response->headers->hasCacheControlDirective('max-age'));
|
$this->assertTrue($response->headers->hasCacheControlDirective('max-age'));
|
||||||
|
|
||||||
|
$response = new RedirectResponse('foo.bar', 301, ['Cache-Control' => 'max-age=86400']);
|
||||||
|
$this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
|
||||||
|
$this->assertTrue($response->headers->hasCacheControlDirective('max-age'));
|
||||||
|
|
||||||
$response = new RedirectResponse('foo.bar', 302);
|
$response = new RedirectResponse('foo.bar', 302);
|
||||||
$this->assertTrue($response->headers->hasCacheControlDirective('no-cache'));
|
$this->assertTrue($response->headers->hasCacheControlDirective('no-cache'));
|
||||||
}
|
}
|
||||||
|
@ -58,7 +58,7 @@ interface PropertyAccessorInterface
|
|||||||
*
|
*
|
||||||
* $propertyAccessor = PropertyAccess::createPropertyAccessor();
|
* $propertyAccessor = PropertyAccess::createPropertyAccessor();
|
||||||
*
|
*
|
||||||
* echo $propertyAccessor->getValue($object, 'child.name);
|
* echo $propertyAccessor->getValue($object, 'child.name');
|
||||||
* // equals echo $object->getChild()->getName();
|
* // equals echo $object->getChild()->getName();
|
||||||
*
|
*
|
||||||
* This method first tries to find a public getter for each property in the
|
* This method first tries to find a public getter for each property in the
|
||||||
|
Reference in New Issue
Block a user