Merge remote-tracking branch 'origin/1.2'

bootstrap.php

@@ -9,7 +9,11 @@
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
 
+use Symfony\Bridge\PhpUnit\ClockMock;
+use Symfony\Component\HttpFoundation\Request;
+
 // Get global config.php settings
+
 if (!file_exists(__DIR__ . '/config.php')) {
     if (!symlink(__DIR__ . '/config.php-DEVELOPMENT', __DIR__ . '/config.php')) {
         throw new \RuntimeException('Could not symlink config.php-DEVELOPMENT to config.php. Copy config.php-DEVELOPMENT to config.php and customize it to your needs.');
@@ -24,4 +28,8 @@
 // Enables old code which still extends non namespaced TestCase to work
 class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
 
+// Register ClockMock for Request class before any tests are run
+// https://github.com/symfony/symfony/issues/28259
+ClockMock::register(Request::class);
+
 require_once __DIR__ . '/vendor/autoload.php';

eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/OriginalRequestListenerTest.php

@@ -8,6 +8,7 @@
 
 use eZ\Bundle\EzPublishCoreBundle\EventListener\OriginalRequestListener;
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ClockMock;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -55,6 +56,8 @@ public function testOnKernelRequestNoOriginalRequest()
 
     public function testOnKernelRequestWithOriginalRequest()
     {
+        ClockMock::withClockMock(true);
+
         $scheme = 'http';
         $host = 'phoenix-rises.fm';
         $port = 1234;
@@ -77,5 +80,7 @@ public function testOnKernelRequestWithOriginalRequest()
         $listener = new OriginalRequestListener();
         $listener->onKernelRequest($event);
         $this->assertEquals($expectedOriginalRequest, $request->attributes->get('_ez_original_request'));
+
+        ClockMock::withClockMock(false);
     }
 }

eZ/Bundle/EzPublishCoreBundle/Tests/EventListener/RequestEventListenerTest.php

@@ -10,6 +10,7 @@
 use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use eZ\Publish\Core\MVC\Symfony\SiteAccess;
 use Psr\Log\LoggerInterface;
+use Symfony\Bridge\PhpUnit\ClockMock;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -90,6 +91,8 @@ public function testOnKernelRequestForwardSubRequest()
 
     public function testOnKernelRequestForward()
     {
+        ClockMock::withClockMock(true);
+
         $queryParameters = ['some' => 'thing'];
         $cookieParameters = ['cookie' => 'value'];
         $request = Request::create('/test_sa/foo/bar', 'GET', $queryParameters, $cookieParameters);
@@ -113,6 +116,8 @@ public function testOnKernelRequestForward()
         $this->requestEventListener->onKernelRequestForward($event);
         $this->assertSame($response, $event->getResponse());
         $this->assertTrue($event->isPropagationStopped());
+
+        ClockMock::withClockMock(false);
     }
 
     public function testOnKernelRequestRedirectSubRequest()

phpunit-integration-legacy-solr.xml

@@ -18,6 +18,7 @@
         <env name="CORES_SETUP" value="dedicated" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
         <ini name="error_reporting" value="-1" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
     </php>
     <testsuites>
         <testsuite name="eZ\Publish\API\Repository">

phpunit-integration-legacy.xml

@@ -16,6 +16,7 @@
         <env name="fixtureDir" value="Legacy" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
         <ini name="error_reporting" value="-1" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
     </php>
     <testsuites>
         <testsuite name="eZ\Publish\API\Repository">