Merge branch 'hotfix/5644'

Close zendframework/zendframework#5644
Fixes zendframework/zendframework#5624

src/Server/Smd.php

@@ -373,11 +373,12 @@ public function toArray()
             return $this->toDojoArray();
         }
 
+        $description = $this->getDescription();
         $transport   = $this->getTransport();
         $envelope    = $this->getEnvelope();
         $contentType = $this->getContentType();
         $SMDVersion  = static::SMD_VERSION;
-        $service = compact('transport', 'envelope', 'contentType', 'SMDVersion');
+        $service = compact('transport', 'envelope', 'contentType', 'SMDVersion', 'description');
 
         if (null !== ($target = $this->getTarget())) {
             $service['target']     = $target;

src/Server/Smd/Service.php

@@ -395,12 +395,13 @@ public function toArray()
         $transport  = $this->getTransport();
         $parameters = $this->getParams();
         $returns    = $this->getReturn();
+        $name       = $this->getName();
 
         if (empty($target)) {
-            return compact('envelope', 'transport', 'parameters', 'returns');
+            return compact('envelope', 'transport', 'name', 'parameters', 'returns');
         }
 
-        return $paramInfo = compact('envelope', 'target', 'transport', 'parameters', 'returns');
+        return compact('envelope', 'target', 'transport', 'name', 'parameters', 'returns');
     }
 
     /**

test/Server/SmdTest.php

@@ -381,4 +381,42 @@ public function validateServiceArray(array $smd, array $options)
         $this->assertTrue(array_key_exists('foo', $services));
         $this->assertTrue(array_key_exists('bar', $services));
     }
+
+    /**
+     * @group ZF2-5624
+     */
+    public function testSetOptionsShouldAccommodateToArrayOutput()
+    {
+        $smdSource = new Smd();
+        $smdSource->setContentType('application/json');
+        $smdSource->setDescription('description');
+        $smdSource->setEnvelope(Smd::ENV_JSONRPC_1);
+        $smdSource->setId(uniqid());
+        $smdSource->setTarget('http://foo');
+        $smdSource->setTransport('POST');
+        $smdSource->setServices(array(
+            array('name' => 'foo')
+        ));
+
+        $smdDestination = new Smd();
+        // prior to fix the following resulted in:
+        // .. Zend\Json\Server\Exception\InvalidArgumentException
+        // ... : SMD service description requires a name; none provided
+        $smdDestination->setOptions($smdSource->toArray());
+
+        $this->assertEquals($smdSource->getContentType(),
+            $smdDestination->getContentType());
+        $this->assertEquals($smdSource->getDescription(),
+            $smdDestination->getDescription());
+        $this->assertEquals($smdSource->getEnvelope(),
+            $smdDestination->getEnvelope());
+        $this->assertEquals($smdSource->getId(),
+            $smdDestination->getId());
+        $this->assertEquals($smdSource->getTarget(),
+            $smdDestination->getTarget());
+        $this->assertEquals($smdSource->getTransport(),
+            $smdDestination->getTransport());
+        $this->assertEquals($smdSource->getServices(),
+            $smdDestination->getServices());
+    }
 }