fix content create/update mig gen for ezpl 1 and later

kaliop-uk · Jan 7, 2021 · ff80556 · ff80556
1 parent 5b91b03
commit ff80556
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/Core/FieldHandler/EzBinaryFile.php b/Core/FieldHandler/EzBinaryFile.php
@@ -69,9 +69,9 @@ public function fieldValueToHash($fieldValue, array $context = array())
         if ($fieldValue->uri == null) {
             return null;
         }
-
+        $binaryFile = $this->ioService->loadBinaryFile($fieldValue->id);
         return array(
-            'path' => realpath($this->ioRootDir) . '/' . ($this->ioDecorator ? $this->ioDecorator->undecorate($fieldValue->uri) : $fieldValue->uri),
+            'path' => realpath($this->ioRootDir) . '/' . ($this->ioDecorator ? $this->ioDecorator->undecorate($binaryFile->uri) : $binaryFile->uri),
             'filename'=> $fieldValue->fileName,
             'mimeType' => $fieldValue->mimeType
         );

diff --git a/Core/FieldHandler/EzMedia.php b/Core/FieldHandler/EzMedia.php
@@ -105,9 +105,9 @@ public function fieldValueToHash($fieldValue, array $context = array())
         if ($fieldValue->uri == null) {
             return null;
         }
-
+        $binaryFile = $this->ioService->loadBinaryFile($fieldValue->id);
         return array(
-            'path' => realpath($this->ioRootDir) . '/' . ($this->ioDecorator ? $this->ioDecorator->undecorate($fieldValue->uri) : $fieldValue->uri),
+            'path' => realpath($this->ioRootDir) . '/' . ($this->ioDecorator ? $this->ioDecorator->undecorate($binaryFile->uri) : $fieldValue->uri),
             'filename'=> $fieldValue->fileName,
             'mime_type' => $fieldValue->mimeType,
             'has_controller' => $fieldValue->hasController,

diff --git a/Core/FieldHandler/FileFieldHandler.php b/Core/FieldHandler/FileFieldHandler.php
@@ -8,10 +8,12 @@ class FileFieldHandler extends AbstractFieldHandler
 {
     protected $ioRootDir;
     protected $ioDecorator;
+    protected $ioService;
 
-    public function __construct($ioRootDir, UrlDecorator $ioDecorator=null)
+    public function __construct($ioRootDir, UrlDecorator $ioDecorator=null, $ioService=null)
     {
         $this->ioRootDir = $ioRootDir;
         $this->ioDecorator = $ioDecorator;
+        $this->ioService = $ioService;
     }
 }
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -638,6 +638,7 @@ services:
         arguments:
             - "$io.root_dir$"
             - "@?ezpublish.core.io.prefix_url_decorator"
+            - "@?ezpublish.fieldType.ezbinaryfile.io_service"
         tags:
             - { name: ez_migration_bundle.complex_field, fieldtype: ezbinaryfile, priority: 0 }
 
@@ -693,6 +694,7 @@ services:
         arguments:
             - "$io.root_dir$"
             - "@?ezpublish.core.io.prefix_url_decorator"
+            - "@?ezpublish.fieldType.ezbinaryfile.io_service"
         tags:
             - { name: ez_migration_bundle.complex_field, fieldtype: ezmedia, priority: 0 }
 

diff --git a/WHATSNEW.md b/WHATSNEW.md
@@ -1,11 +1,14 @@
-Version 5.xx (unreleased)
-=========================
+Version 5.15.0
+==============
 
 * New: it is now possible to dump all of a content's languages when generating `content/create` and `content/update`
   migrations. In order to do so, pass `--lang=all` on the command line
 
 * Fixed: allow usage of shorthand notation when setting references in `file` migration steps
 
+* Fixed: generating `content/create` and `content/update` migrations would fail with eZPlatform 1 and later for any
+  contents with non-null ezbinaryfile and ezmedia fields
+
 
 Version 5.14.0
 ==============