Skip to content

Test cleanup #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 26, 2016
Merged

Test cleanup #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a00377c
Test cleanup
Nyholm Aug 6, 2016
cd4e99e
Make travis run again
Nyholm Aug 9, 2016
e52b5c8
Composer update
Nyholm Aug 9, 2016
a1a5cd6
Install PHPunit
Nyholm Aug 10, 2016
4f6365c
Removed composer.lock
Nyholm Aug 10, 2016
376cf4e
Added composer.lock and drop support for php 5.5
Nyholm Aug 25, 2016
bb96a06
Update .travis.yml
Nyholm Aug 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ test/output/
examples/example-options.json
.idea
/composer.phar
test.php
test.php
12 changes: 4 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
24 changes: 15 additions & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"name": "sparkpost/sparkpost",
"description": "Client library for interfacing with the SparkPost API.",
"license": "Apache 2.0",
Expand All @@ -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",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the same lib, right? just moved under a different org?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that is correct.

"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"
}
}
}
Loading