Merge branch '6.13' into 7.2

ezpublishlegacy · Sep 11, 2018 · afe64eb · afe64eb
2 parents 4d531c8 + 87c44b1
commit afe64eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/eZ/Bundle/EzPublishRestBundle/Tests/Functional/LocationTest.php b/eZ/Bundle/EzPublishRestBundle/Tests/Functional/LocationTest.php
@@ -126,7 +126,7 @@ public function testCopySubtree($locationHref)
             ['Destination' => '/api/ezp/v2/content/locations/1/43']
         );
         $response = $this->sendHttpRequest($request);
-        $this->addCreatedElement($response->getHeader('Location'));
+        $this->addCreatedElement($response->getHeaderLine('Location'));
 
         self::assertHttpResponseCodeEquals($response, 201);
         self::assertHttpResponseHasHeader($response, 'Location');

diff --git a/eZ/Publish/API/Repository/Tests/TrashServiceTest.php b/eZ/Publish/API/Repository/Tests/TrashServiceTest.php
@@ -895,8 +895,14 @@ private function assertAliasNotExists(URLAliasService $urlAliasService, $urlPath
 
     /**
      * Get Test Double for TrashItem for exception testing and similar.
+     *
+     * @param int $trashId
+     * @param int $contentId
+     * @param int $parentLocationId
+     *
+     * @return \eZ\Publish\API\Repository\Values\Content\TrashItem
      */
-    private function getTrashItemDouble(int $trashId, int $contentId = 44, int $parentLocationId = 2): TrashItem
+    private function getTrashItemDouble(int $trashId, int $contentId = 44, int $parentLocationId = 2): APITrashItem
     {
         return new TrashItem([
             'id' => $trashId,