Merge remote-tracking branch 'origin/7.1' into HEAD

ezecosystem · Mar 29, 2018 · 293be22 · 293be22
2 parents ff2402e + 8ffc0ee
commit 293be22
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/eZ/Publish/API/Repository/Tests/ContentServiceTest.php b/eZ/Publish/API/Repository/Tests/ContentServiceTest.php
@@ -694,6 +694,7 @@ public function testLoadVersionInfoByIdSetsExpectedVersionInfo(VersionInfo $vers
                 'languageCodes' => [
                     'eng-US',
                 ],
+                'status' => ContentInfo::STATUS_PUBLISHED,
             ],
             $versionInfo
         );
@@ -5998,6 +5999,7 @@ private function getExpectedMediaContentInfoProperties()
             'remoteId' => 'a6e35cbcb7cd6ae4b691f3eee30cd262',
             'mainLanguageCode' => 'eng-US',
             'mainLocationId' => 43,
+            'status' => ContentInfo::STATUS_PUBLISHED,
         ];
     }
 }
diff --git a/eZ/Publish/Core/MVC/Symfony/FieldType/Tests/Relation/ParameterProviderTest.php b/eZ/Publish/Core/MVC/Symfony/FieldType/Tests/Relation/ParameterProviderTest.php
@@ -7,15 +7,12 @@
 use eZ\Publish\API\Repository\Values\Content\Field;
 use eZ\Publish\Core\Base\Exceptions\NotFoundException;
 use eZ\Publish\Core\Base\Exceptions\UnauthorizedException;
-use eZ\Publish\Core\Base\Tests\PHPUnit5CompatTrait;
 use eZ\Publish\Core\FieldType\Relation\Value;
 use eZ\Publish\Core\MVC\Symfony\FieldType\Relation\ParameterProvider;
 use PHPUnit\Framework\TestCase;
 
 class ParameterProviderTest extends TestCase
 {
-    use PHPUnit5CompatTrait;
-
     public function providerForTestGetViewParameters()
     {
         return [

diff --git a/eZ/Publish/Core/MVC/Symfony/FieldType/Tests/RelationList/ParameterProviderTest.php b/eZ/Publish/Core/MVC/Symfony/FieldType/Tests/RelationList/ParameterProviderTest.php
@@ -7,15 +7,12 @@
 use eZ\Publish\API\Repository\Values\Content\Field;
 use eZ\Publish\Core\Base\Exceptions\NotFoundException;
 use eZ\Publish\Core\Base\Exceptions\UnauthorizedException;
-use eZ\Publish\Core\Base\Tests\PHPUnit5CompatTrait;
 use eZ\Publish\Core\FieldType\RelationList\Value;
 use eZ\Publish\Core\MVC\Symfony\FieldType\RelationList\ParameterProvider;
 use PHPUnit\Framework\TestCase;
 
 class ParameterProviderTest extends TestCase
 {
-    use PHPUnit5CompatTrait;
-
     public function providerForTestGetViewParameters()
     {
         return [