Adds support for the Standard card type and cleans up the rendering i…

…n OutputSpeech

src/Response/Card.php

@@ -11,11 +11,50 @@
  */
 class Card
 {
+    // Constants
+
+    const CARD_TYPE_SIMPLE = 'Simple';
+    const CARD_TYPE_STANDARD = 'Standard';
+    const CARD_TYPE_LINK_ACCOUNT = 'LinkAccount';
+
+    const ERROR_INVALID_CARD_TYPE = 'The card type \'%s\' is not one of the valid options';
+
     // Fields
 
-    protected $type = 'Simple';
-    protected $title = '';
-    protected $content = '';
+    /**
+     * @var array
+     */
+    public static $validCardTypes = [
+        self::CARD_TYPE_SIMPLE,
+        self::CARD_TYPE_STANDARD,
+        self::CARD_TYPE_LINK_ACCOUNT
+    ];
+
+    /**
+     * @var string
+     */
+    protected $type;
+    /**
+     * @var string
+     */
+    protected $title;
+    /**
+     * @var string
+     */
+    protected $simpleCardContent;
+    /**
+     * @var string
+     */
+    protected $standardCardText;
+    /**
+     * @var string
+     */
+    protected $smallImageUrl;
+    /**
+     * @var string
+     */
+    protected $largeImageUrl;
+
 
     // Public Methods
 
@@ -24,11 +63,36 @@ class Card
      */
     public function render()
     {
-        return [
-            'type' => $this->type,
-            'title' => $this->title,
-            'content' => $this->content,
-        ];
+        $cardType = $this->getType();
+
+        switch ($cardType) {
+            case self::CARD_TYPE_SIMPLE:
+                return [
+                    'type' => $cardType,
+                    'title' => $this->getTitle(),
+                    'content' => $this->getSimpleCardContent()
+                ];
+            case self::CARD_TYPE_STANDARD:
+                return [
+                    'type' => $cardType,
+                    'title' => $this->getTitle(),
+                    'text' => $this->getStandardCardText(),
+                    'image' => [
+                        'smallImageUrl' => $this->getSmallImageUrl(),
+                        'largeImageUrl' => $this->getLargeImageUrl()
+                    ]
+                ];
+            case self::CARD_TYPE_LINK_ACCOUNT:
+                return [
+                    'type' => $cardType
+                ];
+            default:
+                throw new \InvalidArgumentException(
+                    sprintf(self::ERROR_INVALID_CARD_TYPE, $cardType)
+                );
+        }
+
+
     }
 
     // Accessors
@@ -52,34 +116,90 @@ public function getTitle()
     /**
      * @return string
      */
-    public function getContent()
+    public function getSimpleCardContent()
+    {
+        return $this->simpleCardContent;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStandardCardText()
     {
-        return $this->content;
+        return $this->standardCardText;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSmallImageUrl()
+    {
+        return $this->smallImageUrl;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLargeImageUrl()
+    {
+        return $this->largeImageUrl;
     }
 
     // Mutators
 
     /**
      * @param string $type
+     *
+     * @throws \InvalidArgumentException - If the card type is not in self::$validCardTypes
      */
     public function setType($type)
     {
-        $this->type = $type;
+        if (!in_array($type, self::$validCardTypes)) {
+            throw new \InvalidArgumentException(
+                sprintf(self::ERROR_INVALID_CARD_TYPE, $type)
+            );
+        }
+
+        $this->type = (string)$type;
     }
 
     /**
      * @param string $title
      */
     public function setTitle($title)
     {
-        $this->title = $title;
+        $this->title = (string)$title;
     }
 
     /**
      * @param string $content
      */
-    public function setContent($content)
+    public function setSimpleCardContent($content)
+    {
+        $this->simpleCardContent = (string)$content;
+    }
+
+    /**
+     * @param string $standardCardText
+     */
+    public function setStandardCardText($standardCardText)
+    {
+        $this->standardCardText = (string)$standardCardText;
+    }
+
+    /**
+     * @param string $smallImageUrl
+     */
+    public function setSmallImageUrl($smallImageUrl)
+    {
+        $this->smallImageUrl = (string)$smallImageUrl;
+    }
+
+    /**
+     * @param string $largeImageUrl
+     */
+    public function setLargeImageUrl($largeImageUrl)
     {
-        $this->content = $content;
+        $this->largeImageUrl = (string)$largeImageUrl;
     }
 }

src/Response/OutputSpeech.php

@@ -16,8 +16,18 @@ class OutputSpeech
     const TYPE_TEXT = 'PlainText';
     const TYPE_SSML = 'SSML';
 
+    const ERROR_INVALID_SPEECH_TYPE = 'The provided speech type \'%s\' is not one of the valid options.';
+
     // Fields
 
+    /**
+     * @var array
+     */
+    public static $validSpeechTypes = [
+        self::TYPE_TEXT,
+        self::TYPE_SSML
+    ];
+
     /**
      * @var string
      */
@@ -38,17 +48,23 @@ class OutputSpeech
      */
     public function render()
     {
-        switch($this->type) {
+        $speechType = $this->getType();
+
+        switch($speechType) {
             case self::TYPE_TEXT:
                 return [
-                    'type' => $this->type,
-                    'text' => $this->text
+                    'type' => $this->getType(),
+                    'text' => $this->getText()
                 ];
             case self::TYPE_SSML:
                 return [
-                    'type' => $this->type,
-                    'ssml' => $this->ssml
+                    'type' => $this->getType(),
+                    'ssml' => $this->getSsml()
                 ];
+            default:
+                throw new \InvalidArgumentException(
+                    sprintf(self::ERROR_INVALID_SPEECH_TYPE, $speechType)
+                );
         }
     }
 
@@ -82,25 +98,33 @@ public function getSsml()
 
     /**
      * @param string $type
+     *
+     * @throws \InvalidArgumentException - If the speech type is not in self::$validSpeechTypes
      */
     public function setType($type)
     {
-        $this->type = $type;
+        if (!in_array($type, self::$validSpeechTypes)) {
+            throw new \InvalidArgumentException(
+                sprintf(self::ERROR_INVALID_SPEECH_TYPE, $type)
+            );
+        }
+
+        $this->type = (string)$type;
     }
 
     /**
      * @param string $text
      */
     public function setText($text)
     {
-        $this->text = $text;
+        $this->text = (string)$text;
     }
 
     /**
      * @param string $ssml
      */
     public function setSsml($ssml)
     {
-        $this->ssml = $ssml;
+        $this->ssml = (string)$ssml;
     }
 }

src/Response/Response.php

@@ -96,22 +96,62 @@ public function repromptSSML($ssml)
     }
 
     /**
-     * Add card information
+     * withCard()
+     *
+     * Create a SimpleCard
      *
      * @param string $title
      * @param string $content
      *
      * @return \Alexa\Response\Response
      */
-    public function withCard($title, $content = '')
+    public function withCard($title, $content)
     {
         $this->card = new Card;
         $this->card->setTitle($title);
-        $this->card->setContent($content);
+        $this->card->setSimpleCardContent($content);
 
         return $this;
     }
 
+    /**
+     * withStandardCard()
+     *
+     * Create a StandardCard with image URLs
+     *
+     * @param string $title
+     * @param $cardText
+     * @param $smallImageUrl
+     * @param $largeImageUrl
+     *
+     * @return Response
+     */
+    public function withStandardCard($title, $cardText, $smallImageUrl, $largeImageUrl)
+    {
+        $this->card = new Card;
+        $this->card->setTitle($title);
+        $this->card->setStandardCardText($cardText);
+        $this->card->setSmallImageUrl($smallImageUrl);
+        $this->card->setLargeImageUrl($largeImageUrl);
+
+        return $this;
+    }
+
+    /**
+     * withLinkAccountCard()
+     *
+     * Create a LinkAccount card
+     *
+     * @return Response
+     */
+    public function withLinkAccountCard()
+    {
+        $this->card = new Card;
+        $this->card->setType(Card::CARD_TYPE_LINK_ACCOUNT);
+
+        return $this;
+    }
+
     /**
      * Set if it should end the session
      *