Merge branch '7.1'

ezecosystem · Apr 5, 2018 · 65ca567 · 65ca567
2 parents a8c737e + 8f3aafb
commit 65ca567
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -41,6 +41,7 @@
         "ezsystems/behatbundle": "^6.1"
     },
     "conflict": {
+        "symfony/symfony": "3.4.7",
         "doctrine/dbal": "2.7.0"
     },
     "replace": {

diff --git a/eZ/Publish/Core/SignalSlot/ContentService.php b/eZ/Publish/Core/SignalSlot/ContentService.php
@@ -325,6 +325,7 @@ public function createContentDraft(ContentInfo $contentInfo, VersionInfo $versio
                 array(
                     'contentId' => $contentInfo->id,
                     'versionNo' => ($versionInfo !== null ? $versionInfo->versionNo : null),
+                    'newVersionNo' => $returnValue->getVersionInfo()->versionNo,
                     'userId' => ($user !== null ? $user->id : null),
                 )
             )

diff --git a/eZ/Publish/Core/SignalSlot/Signal/ContentService/CreateContentDraftSignal.php b/eZ/Publish/Core/SignalSlot/Signal/ContentService/CreateContentDraftSignal.php
@@ -23,7 +23,7 @@ class CreateContentDraftSignal extends Signal
     public $contentId;
 
     /**
-     * Version Number.
+     * Original Version Number.
      *
      * @var int
      */
@@ -35,4 +35,11 @@ class CreateContentDraftSignal extends Signal
      * @var mixed
      */
     public $userId;
+
+    /**
+     * Version number of newly created draft.
+     *
+     * @var int
+     */
+    public $newVersionNo;
 }
diff --git a/eZ/Publish/Core/SignalSlot/Tests/ContentServiceTest.php b/eZ/Publish/Core/SignalSlot/Tests/ContentServiceTest.php
@@ -163,6 +163,7 @@ public function serviceProvider()
                 array(
                     'contentId' => $contentId,
                     'versionNo' => $versionNo,
+                    'newVersionNo' => $content->getVersionInfo()->versionNo,
                     'userId' => $userId,
                 ),
             ),