Merge pull request ezsystems#1061 from emodric/fix-url-with-id-0-not-…

…found Fix EZP-23544: UrlStorage::getFieldData logs an error if URL with an empty ID is not found
ezpublishlegacy · Oct 31, 2014 · 7f11bf7 · 7f11bf7
2 parents 58e2a73 + e4314cd
commit 7f11bf7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/eZ/Publish/Core/FieldType/Tests/Url/UrlStorageTest.php b/eZ/Publish/Core/FieldType/Tests/Url/UrlStorageTest.php
@@ -144,6 +144,25 @@ public function testGetFieldDataNotFound()
         $this->assertEquals( "", $field->value->externalData );
     }
 
+    public function testGetFieldDataWithEmptyUrlId()
+    {
+        $versionInfo = new VersionInfo();
+        $fieldValue = new FieldValue( array( "data" => array( "urlId" => null ) ) );
+        $field = new Field( array( "id" => 42, "value" => $fieldValue ) );
+        $gateway = $this->getGatewayMock();
+
+        $gateway
+            ->expects( $this->never() )
+            ->method( "getIdUrlMap" );
+
+        $logger = $this->getLoggerMock();
+        $logger
+            ->expects( $this->never() )
+            ->method( "error" );
+
+        $this->assertEquals( null, $field->value->externalData );
+    }
+
     public function testDeleteFieldData()
     {
         $versionInfo = new VersionInfo( array( "versionNo" => 24 ) );

diff --git a/eZ/Publish/Core/FieldType/Url/UrlStorage.php b/eZ/Publish/Core/FieldType/Url/UrlStorage.php
@@ -78,10 +78,15 @@ public function storeFieldData( VersionInfo $versionInfo, Field $field, array $c
      */
     public function getFieldData( VersionInfo $versionInfo, Field $field, array $context )
     {
-        /** @var \eZ\Publish\Core\FieldType\Url\UrlStorage\Gateway $gateway */
-        $gateway = $this->getGateway( $context );
         $id = $field->value->data["urlId"];
+        if ( empty( $id ) )
+        {
+            $field->value->externalData = null;
+            return;
+        }
 
+        /** @var \eZ\Publish\Core\FieldType\Url\UrlStorage\Gateway $gateway */
+        $gateway = $this->getGateway( $context );
         $map = $gateway->getIdUrlMap( array( $id ) );
 
         // URL id is not in the DB