Skip to content

Commit 839a953

Browse files
authored
Merge pull request #163 from AuthorizeNet/master
syncing future with master
2 parents bb055d2 + e38aa75 commit 839a953

3 files changed

Lines changed: 13 additions & 19 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: php
22

33
php:
4-
- 5.3
4+
- 5.5
55
- 5.6
66
- 7.0
77

README.md

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,30 @@ Proprietary, see the provided `license.md`.
1717
- JSON PHP Extension
1818
- SimpleXML PHP Extension
1919
- An Authorize.Net Merchant Account or Sandbox Account. You can get a
20-
free sandbox account at http://developer.authorize.net/sandbox/
20+
free sandbox account at http://developer.authorize.net/hello_world/sandbox/
2121

2222
## Autoloading
2323

24-
[`Composer`](http://getcomposer.org) currently has a [MITM](https://github.com/composer/composer/issues/1074)
25-
security vulnerability. However, if you wish to use it, require its autoloader in
24+
We recommend using [`Composer`](http://getcomposer.org) *(note we never recommend you override the new secure-http default setting)*, don't forget to require its autoloader in
2625
your script or bootstrap file:
2726
```php
2827
require 'vendor/autoload.php';
2928
```
30-
*Note: you'll need a composer.json file with the following require section and to run
29+
*Update your composer.json file as per the example below and then run
3130
`composer update`.*
3231

3332
```json
3433
{
3534
"require": {
36-
"php": ">=5.2.0",
35+
"php": ">=5.5",
3736
"ext-curl": "*",
38-
"authorizenet/authorizenet": "1.8.8",
39-
"jms/serializer": "xsd2php-dev as 0.18.0"
40-
},
41-
"require-dev": {
42-
"goetas/xsd2php": "2.*@dev",
43-
"goetas/xsd-reader": "2.*@dev"
44-
},
45-
"repositories": [{
46-
"type": "vcs",
47-
"url": "https://github.com/goetas/serializer.git"
48-
}]
49-
37+
"authorizenet/authorizenet": "1.8.9",
38+
"jms/serializer": "serializer-master-dev as 1.0"
39+
},
40+
"repositories": [{
41+
"type": "vcs",
42+
"url": "https://github.com/goetas/serializer.git"
43+
}]
5044
}
5145
```
5246

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "proprietary",
77
"homepage": "http://developer.authorize.net",
88
"require": {
9-
"php": "~5.3 || ~7.0",
9+
"php": ">=5.5",
1010
"ext-curl": "*",
1111
"ext-json": "*",
1212
"ext-simplexml": "*",

0 commit comments

Comments
 (0)