Merge branch '4.2'

nicolas-grekas · nicolas-grekas · commit a3b45eb03407 · 2019-01-29T11:17:58.000+01:00
* 4.2:
  [Cache] fix connecting using socket with phpredis
  [HttpKernel] fix nested calls to serialize when using DataCollector
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -156,7 +156,7 @@ public static function createConnection($dsn, array $options = [])
 
             $initializer = function ($redis) use ($connect, $params, $dsn, $auth, $hosts) {
                 try {
-                    @$redis->{$connect}($hosts[0]['host'], $hosts[0]['port'], $params['timeout'], (string) $params['persistent_id'], $params['retry_interval']);
+                    @$redis->{$connect}($hosts[0]['host'] ?? $hosts[0]['path'], $hosts[0]['port'] ?? null, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval']);
                 } catch (\RedisException $e) {
                     throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn));
                 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
@@ -36,12 +36,15 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable
 
     public function serialize()
     {
-        return serialize($this->data);
+        $trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 2);
+        $isCalledFromOverridingMethod = isset($trace[1]['function'], $trace[1]['object']) && 'serialize' === $trace[1]['function'] && $this === $trace[1]['object'];
+
+        return $isCalledFromOverridingMethod ? $this->data : serialize($this->data);
     }
 
     public function unserialize($data)
     {
-        $this->data = unserialize($data);
+        $this->data = \is_array($data) ? $data : unserialize($data);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public static function createConnection($dsn, array $options = [])`
`156`	`156`
`157`	`157`	`$initializer = function ($redis) use ($connect, $params, $dsn, $auth, $hosts) {`
`158`	`158`	`try {`
`159`		`- @$redis->{$connect}($hosts[0]['host'], $hosts[0]['port'], $params['timeout'], (string) $params['persistent_id'], $params['retry_interval']);`
	`159`	`+ @$redis->{$connect}($hosts[0]['host'] ?? $hosts[0]['path'], $hosts[0]['port'] ?? null, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval']);`
`160`	`160`	`} catch (\RedisException $e) {`
`161`	`161`	`throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn));`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,15 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable`
`36`	`36`
`37`	`37`	`public function serialize()`
`38`	`38`	`{`
`39`		`- return serialize($this->data);`
	`39`	`+ $trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 2);`
	`40`	`+ $isCalledFromOverridingMethod = isset($trace[1]['function'], $trace[1]['object']) && 'serialize' === $trace[1]['function'] && $this === $trace[1]['object'];`
	`41`	`+`
	`42`	`+ return $isCalledFromOverridingMethod ? $this->data : serialize($this->data);`
`40`	`43`	`}`
`41`	`44`
`42`	`45`	`public function unserialize($data)`
`43`	`46`	`{`
`44`		`- $this->data = unserialize($data);`
	`47`	`+ $this->data = \is_array($data) ? $data : unserialize($data);`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`/**`