Merge branch 'release/0.1.1'

SparkPost · Nov 14, 2014 · 345d96c · 345d96c
2 parents a916601 + 2ca3b87
commit 345d96c
Show file tree

Hide file tree

Showing 18 changed files with 635 additions and 702 deletions.
diff --git a/README.md b/README.md
@@ -26,14 +26,14 @@ SparkPost::setConfig(["key"=>"YOUR API KEY"]);
 
 try {
 	// Build your email and send it!
-	Transmission::send(['campaign'=>'first-mailing', 
+	Transmission::send(array('campaign'=>'first-mailing', 
 		'from'=>'you@your-company.com',
 	    'subject'=>'First SDK Mailing',
 	    'html'=>'<html><body><h1>Congratulations, {{name}}!</h1><p>You just sent your very first mailing!</p></body></html>',
 	    'text'=>'Congratulations, {{name}}!! You just sent your very first mailing!',
-	    'substitutionData'=>['name'=>'YOUR FIRST NAME'],
-	    'recipients'=>[['address'=>['name'=>'YOUR FULL NAME', 'email'=>'YOUR EMAIL ADDRESS' ]]]
-    ]);
+	    'substitutionData'=>array('name'=>'YOUR FIRST NAME'),
+	    'recipients'=>array(array('address'=>array('name'=>'YOUR FULL NAME', 'email'=>'YOUR EMAIL ADDRESS' )))
+    ));
 
     echo 'Woohoo! You just sent your first mailing!';
 } catch (Exception $err) {
@@ -87,12 +87,12 @@ try {
 ## Development
 
 ### Setup
-We use [Robo](http://robo.li/) for our task runner.
-
-Run `composer install` inside the directory to install dependecies and development tools including Robo.
+Run `composer install` inside the directory to install dependecies and development tools.
 
 ### Testing
-Once all the dependencies are installed, you can execute the unit tests using `vendor\bin\robo test`
+Once all the dependencies are installed, you can execute the unit tests using `vendor/bin/phpunit --bootstrap test/unit/bootstrap.php ./test/unit`.
+
+If you're interested in code coverage, you can add the `--coverage` flag for phpunit like so: ```phpunit --coverage-html test/output/report --bootstrap test/unit/bootstrap.php ./test/unit```
 
 ### Contributing
 Guidelines for adding issues

diff --git a/RoboFile.php b/RoboFile.php
diff --git a/composer.json b/composer.json
@@ -9,16 +9,16 @@
     ],
     "minimum-stability": "stable",
     "require": {
-    	"php": ">=5.6.1",
-        "guzzlehttp/guzzle": "5.0.1"
+    	"php": ">=5.3.0",
+        "guzzlehttp/guzzle": "3.8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.3.*",
-        "codegyre/robo": "0.4.6"
+        "phpunit/phpunit": "4.3.*"
     },
     "autoload": {
     	"psr-4": {
-    		"SparkPost\\": "lib/SparkPost/"
+    		"SparkPost\\": "lib/SparkPost/",
+    		"SparkPost\\SendGridCompatibility\\": "lib/SendGridCompatibility/"
     	}
     }
 }