Merge branch '4.4' into 5.2

* 4.4:
  [Cache] backport type fixes

Author: nicolas-grekas

Tests/ExpressionLanguageTest.php

@@ -182,15 +182,18 @@ public function testCachingWithDifferentNamesOrder()
             ->expects($this->exactly(1))
             ->method('set')
             ->with($this->isInstanceOf(ParsedExpression::class))
-            ->willReturnCallback(function ($parsedExpression) use (&$savedParsedExpression) {
+            ->willReturnCallback(function ($parsedExpression) use (&$savedParsedExpression, $cacheItemMock) {
                 $savedParsedExpression = $parsedExpression;
+
+                return $cacheItemMock;
             })
         ;
 
         $cacheMock
             ->expects($this->exactly(1))
             ->method('save')
             ->with($cacheItemMock)
+            ->willReturn(true)
         ;
 
         $expression = 'a + b';