Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit bae2782cdb8a · 2020-12-14T11:55:48.000+01:00
* 4.4:
  Fix EncoderInterface::encode() return type
  [Lock] Prevent store exception break combined store
diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php
@@ -158,9 +158,14 @@ public function exists(Key $key)
         $storesCount = \count($this->stores);
 
         foreach ($this->stores as $store) {
-            if ($store->exists($key)) {
-                ++$successCount;
-            } else {
+            try {
+                if ($store->exists($key)) {
+                    ++$successCount;
+                } else {
+                    ++$failureCount;
+                }
+            } catch (\Exception $e) {
+                $this->logger->debug('One store failed to check the "{resource}" lock.', ['resource' => $key, 'store' => $store, 'exception' => $e]);
                 ++$failureCount;
             }
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
@@ -351,4 +351,29 @@ public function testDeleteDontStopOnFailure()
 
         $this->store->delete($key);
     }
+
+    public function testExistsDontStopOnFailure()
+    {
+        $key = new Key(uniqid(__METHOD__, true));
+
+        $this->strategy
+            ->expects($this->any())
+            ->method('canBeMet')
+            ->willReturn(true);
+        $this->strategy
+            ->expects($this->any())
+            ->method('isMet')
+            ->willReturn(false);
+        $this->store1
+            ->expects($this->once())
+            ->method('exists')
+            ->willThrowException(new \Exception());
+        $this->store2
+            ->expects($this->once())
+            ->method('exists')
+            ->with($key)
+            ->willReturn(false);
+
+        $this->assertFalse($this->store->exists($key));
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
@@ -25,7 +25,7 @@ interface EncoderInterface
      * @param string $format  Format name
      * @param array  $context Options that normalizers/encoders have access to
      *
-     * @return string|int|float|bool
+     * @return string
      *
      * @throws UnexpectedValueException
      */
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php
@@ -67,9 +67,9 @@ public function testSupportsEncoding()
     public function testEncode()
     {
         $this->encoder1->expects($this->never())->method('encode');
-        $this->encoder2->expects($this->once())->method('encode');
+        $this->encoder2->expects($this->once())->method('encode')->willReturn('foo:123');
 
-        $this->chainEncoder->encode(['foo' => 123], self::FORMAT_2);
+        $this->assertSame('foo:123', $this->chainEncoder->encode(['foo' => 123], self::FORMAT_2));
     }
 
     public function testEncodeUnsupportedFormat()

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ interface EncoderInterface`
`25`	`25`	`* @param string $format Format name`
`26`	`26`	`* @param array $context Options that normalizers/encoders have access to`
`27`	`27`	`*`
`28`		`- * @return string\|int\|float\|bool`
	`28`	`+ * @return string`
`29`	`29`	`*`
`30`	`30`	`* @throws UnexpectedValueException`
`31`	`31`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,9 @@ public function testSupportsEncoding()`
`67`	`67`	`public function testEncode()`
`68`	`68`	`{`
`69`	`69`	`$this->encoder1->expects($this->never())->method('encode');`
`70`		`- $this->encoder2->expects($this->once())->method('encode');`
	`70`	`+ $this->encoder2->expects($this->once())->method('encode')->willReturn('foo:123');`
`71`	`71`
`72`		`- $this->chainEncoder->encode(['foo' => 123], self::FORMAT_2);`
	`72`	`+ $this->assertSame('foo:123', $this->chainEncoder->encode(['foo' => 123], self::FORMAT_2));`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public function testEncodeUnsupportedFormat()`