Merge remote-tracking branch 'origin/master' into more-state-csrf-hashes

Conflicts:
	src/OAuth/OAuth2/Service/Facebook.php

.gitignore

@@ -1,5 +1,6 @@
 .idea
 vendor
 .DS_Store
-composer.lock
-examples/init.php
+examples/init.php
+atlassian-ide-plugin.xml
+nbproject/

.travis.yml

@@ -1,16 +1,21 @@
+sudo: false
 language: php
 
 php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - hhvm
+
+matrix:
+    allow_failures:
+        - php: hhvm
 
 before_script:
   - composer self-update
   - composer install
-  - pyrus install pear/PHP_CodeSniffer
   - phpenv rehash
 
 script:
-  - phpcs --standard=psr2 src/
   - phpunit --coverage-text

README.md

@@ -1,5 +1,7 @@
 PHPoAuthLib
 ===========
+**NOTE: I'm looking for someone who could help to maintain this package alongside me, just because I don't have a ton of time to devote to it. However, I'm still going to keep trying to pay attention to PRs, etc.**
+
 PHPoAuthLib provides oAuth support in PHP 5.3+ and is very easy to integrate with any project which requires an oAuth client.
 
 [![Build Status](https://travis-ci.org/Lusitanian/PHPoAuthLib.png?branch=master)](https://travis-ci.org/Lusitanian/PHPoAuthLib)
@@ -40,15 +42,17 @@ Features
 
 Service support
 ---------------
-The library supports both oAuth 1.x and oAuth 2.0 compliant services. A list of currently implemented services can be found below. 
+The library supports both oAuth 1.x and oAuth 2.0 compliant services. A list of currently implemented services can be found below.
 
 Included service implementations
 --------------------------------
 - OAuth1
+    - 500px
     - BitBucket
     - Etsy
     - FitBit
     - Flickr
+    - QuickBooks
     - Scoop.it!
     - Tumblr
     - Twitter
@@ -57,24 +61,36 @@ Included service implementations
 - OAuth2
     - Amazon
     - BitLy
+    - Bitrix24
     - Box
     - Dailymotion
+    - DeviantArt
     - Dropbox
+    - Eve Online
     - Facebook
     - Foursquare
     - GitHub
     - Google
     - Harvest
     - Heroku
+    - Hubic
     - Instagram
+    - Jawbone UP
     - LinkedIn
     - Mailchimp
     - Microsoft
+    - Nest
+    - Netatmo
+    - Parrot Flower Power
     - PayPal
     - Pocket
     - Reddit
     - RunKeeper
     - SoundCloud
+    - Spotify
+    - Strava
+    - Ustream
+    - Vimeo
     - Vkontakte
     - Yammer
 - more to come!

composer.json

@@ -11,6 +11,10 @@
         {
             "name": "Pieter Hordijk",
             "email": "[email protected]"
+        },
+        {
+            "name": "Elliot Chance",
+            "email": "[email protected]"
         }
     ],
     "require": {
@@ -19,7 +23,8 @@
     "require-dev": {
         "symfony/http-foundation": "~2.1",
         "predis/predis": "0.8.*@dev",
-        "phpunit/phpunit": "3.7.*"
+        "phpunit/phpunit": "3.7.*",
+        "squizlabs/php_codesniffer": "2.*"
     },
     "suggest": {
         "symfony/http-foundation": "Allows using the Symfony Session storage backend.",