Merge branch '2.1' into master

Author: mnocon

composer.json

@@ -32,7 +32,8 @@
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "phpspec/phpspec": "^6.1",
         "ezsystems/ezplatform-code-style": "^0.1.0",
-        "friendsofphp/php-cs-fixer": "^2.16.0"
+        "friendsofphp/php-cs-fixer": "^2.16.0",
+        "symfony/phpunit-bridge": "^5.1"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -9,8 +9,12 @@
   >
   <php>
     <ini name="error_reporting" value="-1" />
+    <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled=1"/>
   </php>
     <testsuites>
         <testsuite name="default"><directory>tests</directory></testsuite>
     </testsuites>
+  <listeners>
+    <listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+  </listeners>
 </phpunit>

tests/PurgeClient/LocalPurgeClientTest.php

@@ -4,18 +4,6 @@
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
-namespace EzSystems\PlatformHttpCacheBundle\Tests\PurgeClient;
-
-/**
- * Avoid test failure caused by time passing between generating expected & actual object.
- *
- * @return int
- */
-function time()
-{
-    return 1417624982;
-}
-
 namespace eZ\Publish\Core\MVC\Symfony\Cache\Tests;
 
 use EzSystems\PlatformHttpCacheBundle\PurgeClient\LocalPurgeClient;