Test cleanup (#137)

* Test cleanup

* Make travis run again

* Composer update

* Install PHPunit

* Removed composer.lock

* Added composer.lock and drop support for php 5.5

* Update .travis.yml

Author: Nyholm

.gitignore

@@ -6,4 +6,4 @@ test/output/
 examples/example-options.json
 .idea
 /composer.phar
-test.php
+test.php

.travis.yml

@@ -1,14 +1,10 @@
 language: php
 php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
+  - '5.6'
+  - '7.0'
+  - '7.1'
 install:
-  - composer install
-before_script:
-  - curl -s http://getcomposer.org/installer | php
-  - php composer.phar install --dev --no-interaction
+  - composer install --no-interaction
 script:
   - mkdir -p test/output/report
   - composer test

composer.json

@@ -1,4 +1,4 @@
- {
+{
   "name": "sparkpost/sparkpost",
   "description": "Client library for interfacing with the SparkPost API.",
   "license": "Apache 2.0",
@@ -9,27 +9,33 @@
   ],
   "minimum-stability": "stable",
   "scripts": {
-    "post-install-cmd": "if [ ! -f 'examples/example-options.json' ]; then echo '{\n\t\"key\":\"YOUR_API_KEY\"\n}' >> examples/example-options.json; fi",
-    "post-update-cmd": "if [ ! -f 'examples/example-options.json' ]; then echo '{\n\t\"key\":\"YOUR_API_KEY\"\n}' >> examples/example-options.json; fi",
-    "test": "phpunit ./test/unit/",
+    "post-install-cmd": "./post-install.sh",
+    "post-update-cmd": "./post-install.sh",
+    "test": "./vendor/bin/phpunit",
     "fix-style": "php-cs-fixer fix ."
   },
   "require": {
-    "php": "^5.5 || ^7.0",
+    "php": "^5.6 || ^7.0",
     "php-http/httplug": "^1.0",
-    "php-http/message": "^1.0", 
+    "php-http/message": "^1.0",
     "php-http/client-implementation": "^1.0",
     "php-http/discovery": "^1.0"
   },
   "require-dev": {
+    "phpunit/phpunit": "^4.8 || ^5.4",
     "php-http/guzzle6-adapter": "^1.0",
     "mockery/mockery": "^0.9.4",
-    "fabpot/php-cs-fixer": "^1.11"
+    "friendsofphp/php-cs-fixer": "^1.11",
+    "nyholm/nsa": "^1.0"
   },
   "autoload": {
     "psr-4": {
-      "SparkPost\\": "lib/SparkPost/",
-      "SparkPost\\Test\\TestUtils\\": "test/unit/TestUtils/"
+      "SparkPost\\": "lib/SparkPost"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "SparkPost\\Test\\": "test/unit"
     }
   }
 }