Let's see if we can pull the latest changes

README.md

@@ -1,20 +1,25 @@
 # Amazon Alexa PHP Library
 
-This library provides provides a convient interface for developing Amazon Alexa Skills for your PHP app.
+This library provides provides a convenient interface for developing Amazon Alexa Skills for your PHP app.
+
+It represents a breaking change (and is forked) from jakobsuchy/amazon-alexa-php
+
+The most important changes are the addition of XSS purification and some basic Doctrine validation, and making
+ everything stateless, SRP and more testable
 
 ## Usage
 
-Install via composer: `composer require minicodemonkey/amazon-alexa-php`.
+Install via composer: `composer require froodley/amazon-alexa-php`
 
 ### Requests
 When Amazon Alexa triggers your skill, a HTTP request will be sent to the URL you specified for your app.
 
 You can get the `JSON` body of the request like so:
 ```php
 $applicationId = "your-application-id-from-alexa"; // See developer.amazon.com and your Application. Will start with "amzn1.echo-sdk-ams.app."
-$rawRequest = $request->getContent; // This is how you would retrieve this with Laravel or Symfony 2.
-$alexa = new \Alexa\Request\Request($rawRequest, $applicationId);
-$alexaRequest = $alexa->fromData();
+$rawRequest = $request->getContent(); // This is how you would retrieve this with Laravel or Symfony 2.
+$alexaRequestFactory = new \Alexa\Request\RequestFactory();
+$alexaRequest = $alexaRequestFactory->fromRawData($rawRequest, [$applicationId]);
 ```
 
 The library expect raw request data, not parsed JSON as it needs to validate the request signature.

composer.json

@@ -1,8 +1,14 @@
 {
-    "name": "jakubsuchy/amazon-alexa-php",
-    "description": "Amazon Alexa interface for PHP",
+    "name": "froodley/amazon-alexa-php",
+    "description": "Amazon Alexa interface for PHP - XSS Filtering, Improved Testability",
     "license": "MIT",
     "type": "library",
+    "keywords": [
+      "Amazon Echo",
+      "Amazon Alexa",
+      "Alexa",
+      "Echo"
+    ],
     "authors": [
         {
             "name": "Mathias Hansen",
@@ -15,13 +21,21 @@
         {
             "name": "Jakub Suchy",
             "email": "[email protected]"
+        },
+        {
+            "name": "froodley",
+            "email": "[email protected]"
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=5.5.9",
+        "ext-curl": "*",
+        "doctrine/orm": "^2.5.6",
+        "symfony/validator": "^3.2.6",
+        "ezyang/htmlpurifier": "^4.7"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.6"
+        "phpunit/phpunit": "^5.7.15"
     },
     "autoload": {
         "psr-4": {

src/Request/Application.php

@@ -1,40 +1,99 @@
 <?php
-/**
- * @file Application.php
- *
- * The application abstraction layer to provide Application ID validation to
- * Alexa requests. Any implementations might provide their own implementations
- * via the $request->setApplicationAbstraction() function but must provide the
- * validateApplicationId() function.
- */
 
 namespace Alexa\Request;
-use InvalidArgumentException;
 
-class Application {
-	public $applicationId;
-	public $requestApplicationId;
+use Symfony\Component\Validator\Constraints as Assert;
 
-	public function __construct($applicationId) {
-		$this->applicationId = preg_split('/,/', $applicationId);
-	}
-
-	public function setRequestApplicationId($applicationId) {
-		$this->requestApplicationId = $applicationId;
-	}
+use Alexa\Utility\Purifier\HasPurifier;
 
 /**
- * Validate that the request Application ID matches our Application. This is required as per Amazon requirements.
+ * Class Application
+ *
+ * Represents an Alexa application
  *
- * @param $requestApplicationId
-    Application ID from the Request (typically found in $data['session']['application']
+ * @package Alexa\Request
  */
-	public function validateApplicationId($requestApplicationId = "") {
-		if (empty($requestApplicationId)) {
-			$requestApplicationId = $this->requestApplicationId;
-		}
-		if (!in_array($requestApplicationId, $this->applicationId)) {
-			throw new InvalidArgumentException('Application Id not matched');
-		}
-	}
+class Application
+{
+    // Constants
+
+    const ERROR_APPLICATION_ID_NOT_STRING = 'The provided value for the Alexa application ID was not a string';
+    const ERROR_APPLICATION_ID_NOT_MATCHED = 'The application ID \'%s\' found in the request does not match ' .
+        'any of the expected application IDs.';
+
+    // Traits
+
+    use HasPurifier;
+
+    // Fields
+
+    /**
+     * @var string
+     *
+     * @Assert\Type("string")
+     * @Assert\NotBlank
+     */
+    private $applicationId;
+
+
+    // Hooks
+
+    /**
+     * Application constructor.
+     *
+     * @param string $applicationId
+     * @param \HTMLPurifier $purifier
+     */
+    public function __construct($applicationId, \HTMLPurifier $purifier)
+    {
+        // Set purifier
+        $this->setPurifier($purifier);
+
+        // Set application IDs
+        $this->setApplicationId($applicationId);
+    }
+
+    // Public Methods
+
+    /**
+     * validateApplicationId()
+     *
+     * Confirms the application ID from the request is one in the list provided as valid
+     *
+     * @param array[string] $validApplicationIds
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function validateApplicationId(array $validApplicationIds)
+    {
+        if (!in_array($this->getApplicationId(), $validApplicationIds)) {
+            throw new \InvalidArgumentException(
+                sprintf(self::ERROR_APPLICATION_ID_NOT_MATCHED, $this->getApplicationId())
+            );
+        }
+    }
+
+    // Accessors
+
+    /**
+     * @return string
+     */
+    public function getApplicationId()
+    {
+        return $this->applicationId;
+    }
+
+    // Mutators
+
+    /**
+     * @param string $applicationId
+     */
+    protected function setApplicationId($applicationId)
+    {
+        if (!is_string($applicationId)) {
+            throw new \InvalidArgumentException(self::ERROR_APPLICATION_ID_NOT_STRING);
+        }
+
+        $this->applicationId = $applicationId;
+    }
 }