Merge pull request #11 from ezsystems/EZP-24648

EZP-24648: Get XMLText to pass on namable tests
ezsystems · Apr 13, 2016 · 8785d62 · 8785d62
2 parents 390ffe6 + 5afb49f
commit 8785d62
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/FieldType/XmlText/Type.php b/lib/FieldType/XmlText/Type.php
@@ -91,7 +91,7 @@ public function getName(SPIValue $value)
             $result = $value->xml->documentElement->textContent;
         }
 
-        return trim($result);
+        return trim(preg_replace(array('/\n/', '/\s\s+/'), ' ', $result));
     }
 
     /**

diff --git a/tests/lib/XmlTextAPIIntegrationTest.php b/tests/lib/XmlTextAPIIntegrationTest.php
@@ -247,6 +247,16 @@ public function getValidCreationFieldData()
         return new XmlTextValue($doc);
     }
 
+    /**
+     * Get name generated by the given field type (either via Nameable or fieldType->getName()).
+     *
+     * @return string
+     */
+    public function getFieldName()
+    {
+        return 'Example link1 link2';
+    }
+
     /**
      * Asserts that the field data was loaded correctly.
      *
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,7 +91,7 @@ public function getName(SPIValue $value) @@
                 $result = $value->xml->documentElement->textContent;
             }
-            return trim($result);
+            return trim(preg_replace(array('/\n/', '/\s\s+/'), ' ', $result));
         }
         /**
@@ Expand Down @@