[Cache] fix return type declarations

nicolas-grekas · nicolas-grekas · commit 5f9aaa743ca7 · 2019-08-26T09:52:58.000+02:00
diff --git a/src/Symfony/Component/Cache/DoctrineProvider.php b/src/Symfony/Component/Cache/DoctrineProvider.php
@@ -90,13 +90,14 @@ protected function doDelete($id)
      */
     protected function doFlush()
     {
-        $this->pool->clear();
+        return $this->pool->clear();
     }
 
     /**
      * {@inheritdoc}
      */
     protected function doGetStats()
     {
+        return null;
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php
@@ -40,6 +40,10 @@ public function testLongKeyVersioning()
             ->setConstructorArgs([str_repeat('-', 26)])
             ->getMock();
 
+        $cache
+            ->method('doFetch')
+            ->willReturn(['2:']);
+
         $reflectionClass = new \ReflectionClass(AbstractAdapter::class);
 
         $reflectionMethod = $reflectionClass->getMethod('getId');
@@ -56,7 +60,7 @@ public function testLongKeyVersioning()
         $reflectionProperty->setValue($cache, true);
 
         // Versioning enabled
-        $this->assertEquals('--------------------------:1:------------', $reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)]));
+        $this->assertEquals('--------------------------:2:------------', $reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)]));
         $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)])));
         $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 23)])));
         $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 40)])));

Original file line number	Diff line number	Diff line change
`@@ -90,13 +90,14 @@ protected function doDelete($id)`
`90`	`90`	`*/`
`91`	`91`	`protected function doFlush()`
`92`	`92`	`{`
`93`		`- $this->pool->clear();`
	`93`	`+ return $this->pool->clear();`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`/**`
`97`	`97`	`* {@inheritdoc}`
`98`	`98`	`*/`
`99`	`99`	`protected function doGetStats()`
`100`	`100`	`{`
	`101`	`+ return null;`
`101`	`102`	`}`
`102`	`103`	`}`