Fix: creating migrations for Content creation or update with contents…

… which have empty Image/File/Media fields would crash; proper fix for warnings introduced with 5.7

Core/FieldHandler/EzImage.php

@@ -60,6 +60,10 @@ public function hashToFieldValue($fieldValue, array $context = array())
      */
     public function fieldValueToHash($fieldValue, array $context = array())
     {
+        if ($fieldValue->uri == null) {
+            return null;
+        }
+
         return array(
             'path' => realpath($this->ioRootDir) . '/' . ($this->ioDecorator ? $this->ioDecorator->undecorate($fieldValue->uri) : $fieldValue->uri),
             'filename'=> $fieldValue->fileName,

Core/FieldHandler/EzMedia.php

@@ -100,6 +100,10 @@ public function hashToFieldValue($fieldValue, array $context = array())
      */
     public function fieldValueToHash($fieldValue, array $context = array())
     {
+        if ($fieldValue->uri == null) {
+            return null;
+        }
+
         return array(
             'path' => realpath($this->ioRootDir) . '/' . ($this->ioDecorator ? $this->ioDecorator->undecorate($fieldValue->uri) : $fieldValue->uri),
             'filename'=> $fieldValue->fileName,

Core/Matcher/AbstractMatcher.php

@@ -61,7 +61,7 @@ protected function matchAnd($conditionsArray)
         return $results;
     }
 
-    protected function matchOr(array $conditionsArray)
+    protected function matchOr($conditionsArray)
     {
         /// @todo introduce proper re-validation of all child conditions
         if (!is_array($conditionsArray) || !count($conditionsArray)) {

WHATSNEW.md

@@ -1,8 +1,22 @@
-Version 5.7.2
+Version 5.7.3
 =============
 
 * Fix: warnings due to ContentVersionMatcher methods signatures
 
+* Fix: creating migrations for Content creation or update with contents which have empty Image/File/Media fields would
+    crash
+
+Version 5.7.2
+=============
+
+* An attempt at fixing php warnings that turned out to be wrong
+
+
+Version 5.7.1
+=============
+
+* An attempt at fixing php warnings that turned out to be wrong
+
 
 Version 5.7.0
 =============