Merge branch '2.3' into 2.4
* 2.3: [HttpFoundation] removed test file not related to 2.3 [HttpKernel] fixed CS Add tests for RequestStack class
This commit is contained in:
commit
29edeeae66
@ -11,8 +11,6 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\HttpKernel\Profiler;
|
namespace Symfony\Component\HttpKernel\Profiler;
|
||||||
|
|
||||||
use Memcache;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Memcache Profiler Storage
|
* Memcache Profiler Storage
|
||||||
*
|
*
|
||||||
@ -21,14 +19,14 @@ use Memcache;
|
|||||||
class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage
|
class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var Memcache
|
* @var \Memcache
|
||||||
*/
|
*/
|
||||||
private $memcache;
|
private $memcache;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Internal convenience method that returns the instance of the Memcache
|
* Internal convenience method that returns the instance of the Memcache
|
||||||
*
|
*
|
||||||
* @return Memcache
|
* @return \Memcache
|
||||||
*
|
*
|
||||||
* @throws \RuntimeException
|
* @throws \RuntimeException
|
||||||
*/
|
*/
|
||||||
@ -42,7 +40,7 @@ class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage
|
|||||||
$host = $matches[1] ?: $matches[2];
|
$host = $matches[1] ?: $matches[2];
|
||||||
$port = $matches[3];
|
$port = $matches[3];
|
||||||
|
|
||||||
$memcache = new Memcache();
|
$memcache = new \Memcache();
|
||||||
$memcache->addServer($host, $port);
|
$memcache->addServer($host, $port);
|
||||||
|
|
||||||
$this->memcache = $memcache;
|
$this->memcache = $memcache;
|
||||||
@ -54,7 +52,7 @@ class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage
|
|||||||
/**
|
/**
|
||||||
* Set instance of the Memcache
|
* Set instance of the Memcache
|
||||||
*
|
*
|
||||||
* @param Memcache $memcache
|
* @param \Memcache $memcache
|
||||||
*/
|
*/
|
||||||
public function setMemcache($memcache)
|
public function setMemcache($memcache)
|
||||||
{
|
{
|
||||||
@ -94,7 +92,7 @@ class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage
|
|||||||
|
|
||||||
if (method_exists($memcache, 'append')) {
|
if (method_exists($memcache, 'append')) {
|
||||||
|
|
||||||
//Memcache v3.0
|
// Memcache v3.0
|
||||||
if (!$result = $memcache->append($key, $value, false, $expiration)) {
|
if (!$result = $memcache->append($key, $value, false, $expiration)) {
|
||||||
return $memcache->set($key, $value, false, $expiration);
|
return $memcache->set($key, $value, false, $expiration);
|
||||||
}
|
}
|
||||||
@ -102,7 +100,7 @@ class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
//simulate append in Memcache <3.0
|
// simulate append in Memcache <3.0
|
||||||
$content = $memcache->get($key);
|
$content = $memcache->get($key);
|
||||||
|
|
||||||
return $memcache->set($key, $content.$value, false, $expiration);
|
return $memcache->set($key, $content.$value, false, $expiration);
|
||||||
|
@ -11,8 +11,6 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\HttpKernel\Profiler;
|
namespace Symfony\Component\HttpKernel\Profiler;
|
||||||
|
|
||||||
use Memcached;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Memcached Profiler Storage
|
* Memcached Profiler Storage
|
||||||
*
|
*
|
||||||
@ -21,14 +19,14 @@ use Memcached;
|
|||||||
class MemcachedProfilerStorage extends BaseMemcacheProfilerStorage
|
class MemcachedProfilerStorage extends BaseMemcacheProfilerStorage
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var Memcached
|
* @var \Memcached
|
||||||
*/
|
*/
|
||||||
private $memcached;
|
private $memcached;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Internal convenience method that returns the instance of the Memcached
|
* Internal convenience method that returns the instance of the Memcached
|
||||||
*
|
*
|
||||||
* @return Memcached
|
* @return \Memcached
|
||||||
*
|
*
|
||||||
* @throws \RuntimeException
|
* @throws \RuntimeException
|
||||||
*/
|
*/
|
||||||
@ -42,10 +40,10 @@ class MemcachedProfilerStorage extends BaseMemcacheProfilerStorage
|
|||||||
$host = $matches[1] ?: $matches[2];
|
$host = $matches[1] ?: $matches[2];
|
||||||
$port = $matches[3];
|
$port = $matches[3];
|
||||||
|
|
||||||
$memcached = new Memcached();
|
$memcached = new \Memcached();
|
||||||
|
|
||||||
//disable compression to allow appending
|
// disable compression to allow appending
|
||||||
$memcached->setOption(Memcached::OPT_COMPRESSION, false);
|
$memcached->setOption(\Memcached::OPT_COMPRESSION, false);
|
||||||
|
|
||||||
$memcached->addServer($host, $port);
|
$memcached->addServer($host, $port);
|
||||||
|
|
||||||
@ -58,7 +56,7 @@ class MemcachedProfilerStorage extends BaseMemcacheProfilerStorage
|
|||||||
/**
|
/**
|
||||||
* Set instance of the Memcached
|
* Set instance of the Memcached
|
||||||
*
|
*
|
||||||
* @param Memcached $memcached
|
* @param \Memcached $memcached
|
||||||
*/
|
*/
|
||||||
public function setMemcached($memcached)
|
public function setMemcached($memcached)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user