Skip to content

Commit 8c75ab0

Browse files
Nyholmcolestrode
authored andcommitted
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
1 parent 1bbefef commit 8c75ab0

10 files changed

+1494
-261
lines changed

Diff for: .gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ test/output/
66
examples/example-options.json
77
.idea
88
/composer.phar
9-
test.php
9+
test.php

Diff for: .travis.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
language: php
22
php:
3-
- 5.5
4-
- 5.6
5-
- 7.0
6-
- 7.1
3+
- '5.6'
4+
- '7.0'
5+
- '7.1'
76
install:
8-
- composer install
9-
before_script:
10-
- curl -s http://getcomposer.org/installer | php
11-
- php composer.phar install --dev --no-interaction
7+
- composer install --no-interaction
128
script:
139
- mkdir -p test/output/report
1410
- composer test

Diff for: composer.json

+15-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"name": "sparkpost/sparkpost",
33
"description": "Client library for interfacing with the SparkPost API.",
44
"license": "Apache 2.0",
@@ -9,27 +9,33 @@
99
],
1010
"minimum-stability": "stable",
1111
"scripts": {
12-
"post-install-cmd": "if [ ! -f 'examples/example-options.json' ]; then echo '{\n\t\"key\":\"YOUR_API_KEY\"\n}' >> examples/example-options.json; fi",
13-
"post-update-cmd": "if [ ! -f 'examples/example-options.json' ]; then echo '{\n\t\"key\":\"YOUR_API_KEY\"\n}' >> examples/example-options.json; fi",
14-
"test": "phpunit ./test/unit/",
12+
"post-install-cmd": "./post-install.sh",
13+
"post-update-cmd": "./post-install.sh",
14+
"test": "./vendor/bin/phpunit",
1515
"fix-style": "php-cs-fixer fix ."
1616
},
1717
"require": {
18-
"php": "^5.5 || ^7.0",
18+
"php": "^5.6 || ^7.0",
1919
"php-http/httplug": "^1.0",
20-
"php-http/message": "^1.0",
20+
"php-http/message": "^1.0",
2121
"php-http/client-implementation": "^1.0",
2222
"php-http/discovery": "^1.0"
2323
},
2424
"require-dev": {
25+
"phpunit/phpunit": "^4.8 || ^5.4",
2526
"php-http/guzzle6-adapter": "^1.0",
2627
"mockery/mockery": "^0.9.4",
27-
"fabpot/php-cs-fixer": "^1.11"
28+
"friendsofphp/php-cs-fixer": "^1.11",
29+
"nyholm/nsa": "^1.0"
2830
},
2931
"autoload": {
3032
"psr-4": {
31-
"SparkPost\\": "lib/SparkPost/",
32-
"SparkPost\\Test\\TestUtils\\": "test/unit/TestUtils/"
33+
"SparkPost\\": "lib/SparkPost"
34+
}
35+
},
36+
"autoload-dev": {
37+
"psr-4": {
38+
"SparkPost\\Test\\": "test/unit"
3339
}
3440
}
3541
}

0 commit comments

Comments
 (0)