Skip to content

Commit

Permalink
updating the docs to reflect the new version
Browse files Browse the repository at this point in the history
  • Loading branch information
caseysoftware committed Jan 3, 2016
1 parent 4121ea4 commit 3d96588
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea/*
creds.php
credentials.php
composer.lock
vendor/*

8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ The recommended way to install the Marvel library is through [Composer](http://g
curl -sS https://getcomposer.org/installer | php

# Add the library as a dependency
php composer.phar require caseysoftware/marvel-helper ~1.1
php composer.phar require caseysoftware/marvel-helper ~2.0
```

or alternatively, you can add it directly to your `composer.json` file.

```json
{
"require": {
"caseysoftware/marvel-helper": "~1.1"
"caseysoftware/marvel-helper": "~2.0"
}
}
```
Expand All @@ -44,9 +44,7 @@ Finally, require Composer's autoloader in your PHP script:
require __DIR__.'/vendor/autoload.php';
```

## Requirements

This uses Composer and namespaces so PHP 5.3.x is the minimum version. I'd suggest you use something more recent but that's up to you.
To use any of the examples, rename credentials-dist.php to credentials.php and add your API key from here: https://developer.marvel.com/account

## TODO

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "caseysoftware/marvel-helper",
"version": "1.1.2",
"version": "2.0.0",
"type": "library",
"description": "A PHP wrapper for the Marvel Comics API",
"keywords": ["marvel", "comic", "api", "marvel comics", "avengers", "x-men"],
Expand All @@ -13,8 +13,8 @@
}
],
"require": {
"php": ">=5.3.0",
"guzzle/guzzle": "~3.7.0"
"php": ">=5.5.0",
"guzzlehttp/guzzle": "~6.0"
},
"require-dev": {
"mockery/mockery": ">=0.7.2",
Expand Down
2 changes: 1 addition & 1 deletion src/Marvel/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
class Client
{
const USER_AGENT = 'marvel-php/1.1.2';
const USER_AGENT = 'marvel-php/2.0.0';

protected $baseURI = 'http://gateway.marvel.com/';
protected $version = 'v1/public/';
Expand Down

0 comments on commit 3d96588

Please sign in to comment.