Skip to content

Commit 87552cc

Browse files
authored
Merged FAD-3148 into 2.x
* FAD-3148 basic non-functioning base class * FAD-3148 a bit more functionality in the base class * FAD-3148 added custom promise class and custom response class. Did good things to SparkPost class * Updated Transmission.php for new refactor, still WIP. Created Resource.php as a parent class for all future resources. * Removed test functions * Cleaned up Transmissions.php according to PSR-2, deleted more test code and comments. * added sync and aysnc, cleaned up code * added support for async/sync option * added support for async/sync option * Added interns to authors * simplified the request function * added comments * added user agent * added comments in SparkPostPromise * added comments in SparkPostException * added comments in SparkPostResponse * cleaning up test * updated composer.json and contributing files for testing * Ran php-cs-fixer * testing for sparkpost response class * updated to newer version of guzzle * updated to newer version of guzzle * Cleaned up getUrl and other functions * cleaned up constructor and overrode getCode with getResponse()->getStatusCode() * fixed up then method * cleaned up getBody * deleted old test * Wrote total coverage tests for SparkPost class * commented out setting up transmissions endpoint until merging with FAD-3146
1 parent a5847be commit 87552cc

25 files changed

+1186
-2762
lines changed

Diff for: .gitignore

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

Diff for: AUTHORS.md

+2
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ php-sparkpost is maintained by Message Systems.
1313
* Chris Wilson, [@yepher](https://github.com/yepher)
1414
* Maxim Dzhuliy, [@max-si-m](https://github.com/max-si-m)
1515
* [@chandon](https://github.com/chandon)
16+
* Avi Goldman, [@avrahamgoldman](https://github.com/avrahamgoldman)
17+
* Vincent Song, [@vwsong](https://github.com/vwsong)

Diff for: CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Add composer install directory to $PATH `~/.composer/vendor/bin/`
2626

2727
#### Install PHPUnit for Testing
2828
```
29-
composer global require "phpunit/phpunit=4.3.*"
29+
composer global require "phpunit/phpunit=4.8.*"
3030
```
3131

3232
We recommend increasing PHP’s memory limit, by default it uses 128MB. We ran into some issues during local development without doing so. You can do this by editing your php.ini file and modifying `memory_limit`. We set ours to `memory_limit = 1024M`.

Diff for: composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
},
1717
"require": {
1818
"php": ">=5.5.0",
19-
"egeloen/http-adapter": "*"
19+
"php-http/client-implementation": "^1.0",
20+
"guzzlehttp/psr7": "1.3.*"
2021
},
2122
"require-dev": {
22-
"phpunit/phpunit": "4.3.*",
2323
"guzzlehttp/guzzle": "6.*",
24+
"php-http/guzzle6-adapter": "*",
25+
"php-http/message": "*",
2426
"mockery/mockery": "^0.9.4",
25-
"satooshi/php-coveralls": "dev-master",
2627
"fabpot/php-cs-fixer": "^1.11"
2728
},
2829
"autoload": {
2930
"psr-4": {
3031
"SparkPost\\": "lib/SparkPost/",
31-
"SparkPost\\SendGridCompatibility\\": "lib/SendGridCompatibility/",
3232
"SparkPost\\Test\\TestUtils\\": "test/unit/TestUtils/"
3333
}
3434
}

0 commit comments

Comments
 (0)