cleaning up

Author: miled

.editorconfig

@@ -1,11 +1,9 @@
 root = true
 
 [*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
+charset                  = utf-8
+end_of_line              = lf
+insert_final_newline     = true
 trim_trailing_whitespace = true
-
-[composer.json]
-indent_style = space
-indent_size = 4
+indent_style             = space
+indent_size              = 4

.scrutinizer.yml

@@ -5,7 +5,6 @@ filter:
         - tests/*
         - examples/*
         - src/Deprecated/*
-        - src/Provider/WIP/*
         - src/Thirdparty/*
 
 tools:
@@ -16,7 +15,7 @@ tools:
 checks:
     php:
         code_rating: true
-        duplication: true    
+        duplication: false    
         avoid_multiple_statements_on_same_line: true
         avoid_fixme_comments: true
         avoid_todo_comments: true

CHANGELOG.md

@@ -3,125 +3,3 @@ Hybridauth Change log
 
 3.1.0 - TBD
 	...
-
-2.3.0 - Nov 16 2014
-        #87 - Make logging level based
-        #102 - Uses Exceptions instead of die() to handle critical problems.
-        #247 - Disable autoloading when doing class_exists()
-        #111 - Add more informative messages and logging
-        #221 - Google Provider: Scopes updated
-        #261 - Check if $params is_array
-        #265 - OAuth multipart support added
-        #266 - Twitter Provider: setUserStatus() message and picture support
-        #267 - fixed adapter undefined indexes and illegal string offsets (issues #200 and #105)
-        #270 - providers setUserStatus() return status info
-        #271 - new: provider::getUserStatus($id) retrieves status info (Facebook and Twitter)
-        #272 - facebook::setUserStatus on a user's Page
-        #273 - better profile image size for Google and Twitter
-        #241 - install.php was deleted
-        #291 - updated links in readmes and removed mentions of install.php.
-        #294 - Correctly break; when looping on $response->placesLived when a primary location is defined
-        #295 - Check for callers URL protocol
-        #289 - Added Facebook language locale (#289)
-        #293 - Global 'force' configuration option to always request login credentials.
-        #298 - Add check for OAuthException class exists
-        #301 - getUserContacts gets paged Facebook friends
-        #305 - Require wrapper class file only if it is specified
-        #306 - fixed E_NOTICE: Undefined index: debug_mode in Logger class
-        #310 - GitHub auth: Undefined property: stdClass::$email
-        #264 - Yahoo login not returning email address
-        #321, #322, #323 - Updated QQ
-        #324 - fixed port issue on openid
-
-2.2.2 - July 11 2014
-	#239 Fixes to Disqus provider, which now works properly (the old one was not working)
-	#234 Error fix for when you don't have friends in G+ and try using getUsersContacts()
-        #226 Fixing fatal error in Yammer Provider
-        #227 + #229 Github: getUserProfile() does not contain email address fix
-        #236 + #237 OAuth1Client: Allow to set a request body and a content type
-	#241 Updates to Install.php
-	#208 Updating and fixing examples
-	#244 OAuth if the class already exists, use the current class
-	#246 Fixing version numbers
-        Few small fixes and updates to the examples
-	
-2.2.1 - May 26 2014
-        #213 - Hotfix for undefined variable 
-        #215 - Hotfix for BYO Storage Mechanism
-
-2.2.0 - May 24 2014
-        New provider: Yammer
-        New provider: freeagent.com
-        New provider: Drupal OAuth 2
-        New provider: PayPal OAuth 2
-        New provider: PayPal OpenID
-        Removed provider: MySpace
-        Fixes and updates to the following providers: Foursquare, Yandex, Disqus, Vkontakte, Steam, Odnoklassniki.ru, LinkedIn, Facebook, Twitter
-        Log curl_exec error for failure tracing
-        If log file does not exists it will be created
-        Typo fixes
-        Many other little changes and fixes
-        Enabled to have your own storage mechanism #164
-
-2.1.1 - 29 dec 2012 
-	#59 - Remove OAuth PECL conflict with OAuth PHP Library
-	#70 - Update Facebook PHP SDK (v.3.2.2)
-	#63 - Minor change to fix getCurrentUrl()
-	#73 - Fix misspellings of "authentication" and "valid"; me english bad ;
-	#48 + #62 + #71 - Minor change to remove PHP Notices
-	#57 - Composer Require CURL
-	#53 - Proper handling of LinkedIn user profiles with no telephone numbers
-	#64 - Allow restricting google provider to specific domain
-	Update Windows Live endpoint URLs (http://msdn.microsoft.com/en-us/library/live/hh243647.aspx) 
-	Update lightopenid library
-
-2.1.0 - 04 aug 2012 
-	Yahoo! provider adapter is now based on OAuth1 protocol (by Lukasz Koprowski)
-	Windows Live provider adapter is now based on OAuth2 protocol (by Lukasz Koprowski)
-	Yahoo! and Google openid based are now part of the "additional providers package"
-	Add proxy config for providers API (by fedetorre)
-	Fix Hybrid_Providers_Google::getUserContacts()
-	Fix Twitter user's profile url
-	Fix the user profile url on Hybrid_Providers_Facebook::getUserActivity() 
-
-2.0.11 - 25 jan 2012 
-	Fix a bug with Twitter update status
-	Add a way to specify adapters and wrappers from config
-	Added emailVerified property to profile object.
-	Added ability to pass display type to Facebook SDK.
-	Refactored endpoint
-	Add user contacts list for Google Hybrid_Providers_Google::getUserContacts()
-	Add Hybrid_Auth::getProviders() to return array listing all enabled providers as well as a flag if you are connected.
-
-2.0.10 - 05 dec 2011 
-	Fix a bug with Facebook update status setUserStatus()
-	Fix a bug with linkedin get contacts list getUserContacts()
-	Fix refresh token issue with oauth2 client
-	Remove https://www.googleapis.com/auth/plus.me from the default Google scope
-	Fix an issue with openid identifier verification
-	Fix an issue where a user cancel the auth it will persist for some providers
-	Another numbers of bug fixes and improvements
-
-2.0.9 - 24 nov 2011 
-	Move Google to work with OAuth 2 protocol.
-	Get back Foursquare and AOL to library core as supported networks
-	Add 2 new examples "Sign-in/Sign-up Users" and "Basic Facebook integration"
-	Fix a bug with linkedin update status setUserStatus()
-
-2.0.8 - 18 nov 2011 
-	Add an auto installer to make life a bit easier.
-	Change the configuration file name from hybridauth.php to config.php
-	Setting facebook scope from the configuration, now override the default requested scope
-	Fix a bug with twitter update status setUserStatus()
-	Fix a bug with logoutAllProviders()
-	Hybrid_Auth_Activity::$date return now a timestamp across supported social networks
-	Introduce the refresh_token as its needed for some providers
-	fixed some minor issues and improved bunch of other stuff
-	Thanks for KVC, RB Lin and danhstevens! 
-
-2.0.7 - 12 oct 2011 
-	Add some generic functions: Hybrid_Provider_Adapter::getUserContacts(), Hybrid_Provider_Adapter::setUserStatus() and Hybrid_Provider_Adapter::getUserActivity() to Facebook, MySpace, Twitter, Identica and LinkedIn.
-	Add a generic function to logout all connected provider at once Hybrid_Auth::logoutAllProviders() 
-	Correct a bug with Hybrid_Auth::getCurrentUrl()
-	Split HybridAuth into 2 packages. i) a core library which come with 8 major providers by default, ii) the others one which containt some additional providers
-	fixed some minors issues and improved some stuff and whatnot

CONTRIBUTING.md

@@ -2,7 +2,7 @@ Except where otherwise noted in the source code (i.e., LightOpenID and OAuth
 Library, which are covered by similar licences but with different Copyright
 notices) all the files are:
 
- Copyright (C) 2009-2014, HybridAuth authors. All Rights Reserved.
+ Copyright (C) 2009-2015, HybridAuth authors. All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

COPYING.md

@@ -1,6 +1,6 @@
-## [Hybridauth](http://hybridauth.sourceforge.net/) 3.0.0-Remake
+## [Hybridauth](http://hybridauth.github.io/) 3.0.0-Remake
 
-[![Build Status](https://travis-ci.org/hybridauth/hybridauth.svg?branch=3.0.0-Remake)](https://travis-ci.org/hybridauth/hybridauth) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/hybridauth/hybridauth/badges/quality-score.png?b=3.0.0-Remake)](https://scrutinizer-ci.com/g/hybridauth/hybridauth/?branch=3.0.0-Remake) [![Latest Stable Version](https://poser.pugx.org/hybridauth/hybridauth/v/stable.png)](https://packagist.org/packages/hybridauth/hybridauth) [![Latest Unstable Version](https://poser.pugx.org/hybridauth/hybridauth/v/unstable.svg)](https://packagist.org/packages/hybridauth/hybridauth) [![Total Downloads](https://poser.pugx.org/hybridauth/hybridauth/downloads.png)](https://packagist.org/packages/hybridauth/hybridauth) [![License](https://poser.pugx.org/hybridauth/hybridauth/license.svg)](https://packagist.org/packages/hybridauth/hybridauth) 
+[![Build Status](https://travis-ci.org/hybridauth/hybridauth.svg?branch=3.0.0-Remake)](https://travis-ci.org/hybridauth/hybridauth) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/hybridauth/hybridauth/badges/quality-score.png?b=3.0.0-Remake)](https://scrutinizer-ci.com/g/hybridauth/hybridauth/?branch=3.0.0-Remake) [![Latest Stable Version](https://poser.pugx.org/hybridauth/hybridauth/v/stable.png)](https://packagist.org/packages/hybridauth/hybridauth) [![Total Downloads](https://poser.pugx.org/hybridauth/hybridauth/downloads.png)](https://packagist.org/packages/hybridauth/hybridauth) [![License](https://poser.pugx.org/hybridauth/hybridauth/license.svg)](https://packagist.org/packages/hybridauth/hybridauth) 
 [![Join the chat at https://gitter.im/hybridauth/hybridauth](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hybridauth/hybridauth?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
@@ -144,13 +144,11 @@ $ php composer.phar install
 
 Hybridauth is a community driven project and accepts contributions of code and documentation from the community. 
 
-For more information, see [CONTRIBUTING.md](https://github.com/hybridauth/hybridauth/blob/master/CONTRIBUTING.md). 
+For more information, see http://hybridauth.github.io/getinvolved.html. 
 
 #### Questions, Help and Support?
 
-For general questions (i.e, "how-to" questions), consider using [StackOverflow](https://stackoverflow.com/questions/tagged/hybridauth). 
-
-We also have a mailing list at [Google Groups](http://groups.google.com/group/hybridauth).
+For general questions (i.e, "how-to" questions), please consider using [StackOverflow](https://stackoverflow.com/questions/tagged/hybridauth) instead of the Github issues tracker. For convenience, we also have a [low-activity] mailing list at [Google Groups](http://groups.google.com/group/hybridauth) and a [Gitter channel](https://gitter.im/hybridauth/hybridauth) if you want to get help directly from the community.
 
 #### Project maintainers
 

README.md

@@ -1,30 +1,82 @@
-#### ToDo
-
-- [ ] Improve this todo list #451 issuecomment-96178499
-- [ ] Fix eventual bugs (priority to stability issues)
-- [x] Make hybridauth PSR-4 compliant
-- [x] Replace hybridauth examples with basic and simple ones.
-- [x] Move additional-providers inside core.
-- [x] Remove static vars and methods.
-- [x] Restructure hybridauth directories and files.
-- [x] normalize configuration files (one set of rules for extra arguments). 
-- [x] Add a HttpClient and eventually support externals libs (i.g., Guzzle)
-- [x] Give more consistent and readable errors when requests fails. 
-- [x] Optimize how hybridauth use php sessions - it store a lot of data
-    - [x] Do not store empty tokens
-    - [x] Remove unused configs and params when initiating auth protocols
-    - [x] No longer serialize exceptions in session.
-- [x] Rework OAuth1 and OAuth2 templates
-    - [x] Merge OAuth1Client with Model_OAuth1
-    - [x] Merge OAuth2Client with Model_OAuth2
-- [x] Rework Exceptions
-- [x] Implement Data parser and Data Collection. 
-- [ ] Upgrading supported providers to 3.0.
-    - [x] Remove introduced methods and users profile fields. 
-    - [x] Drop support for few additional providers, due to either external dependencies
-    - [x] Attempt to create non dependent Facebook adapter (Using Model_OAuth2 instead of SDK).
-    - [ ] Attempt to create non dependent Linkedin adapter (Using Model_OAuth1 instead of simple-linkedinphp. simple-linkedinphp seems to be abandoned). 
-    - [ ] Reduce the supported providers code complexity.
-- [ ] Improve internal code comments. 
-- [ ] Introduce unit testing
-- [ ] ..
+Hybridauth V3.1 TODO list
+=========================
+
+### Required:
+
+[X] **Core**
+
+Hybridauth core has been entirely implemented and while new modification may occur in the future, the design is most likely
+will stay the same.
+
+[ ] **OAuth 1/2 Providers**
+
+For the first releases of Hybridauth V3, we'll focusing on the major providers (i.g, facebook, google, twitter, etc.)
+
+The following IDPs are based on either OAuth 1 or 2 specifications. While most of them are already implemented to work with
+Hybridauth V3, they still need some tweaking and testing.
+
+More information on how to implement IDPs into Hybridauth V3 can be found at 
+http://hybridauth.github.io/developer-ref-extend-hybridauth.html
+
+Provider      | Implemented? | Working?    | Notes
+------------- | ------------ |------------ | ------------------------------------------------------------------------------
+Facebook      |  [X]         | [ ]         | 
+Twitter       |  [X]         | [ ]         | 
+Google        |  [X]         | [ ]         | 
+Yahoo         |  [ ]         | [ ]         | Not implemented yet.
+Windows Live  |  [ ]         | [ ]         | Not implemented yet.
+LinkedIn      |  [ ]         | [ ]         | Not implemented yet.
+Foursquare    |  [X]         | [ ]         | 
+Disqus        |  [X]         | [ ]         | 
+Dribbble      |  [X]         | [ ]         | 
+GitHub        |  [X]         | [ ]         | 
+Instagram     |  [X]         | [ ]         | 
+Reddit        |  [X]         | [X]         | 
+WordPress     |  [X]         | [X]         | 
+Tumblr        |  [X]         | [ ]         | 
+TwitchTV      |  [X]         | [ ]         | 
+Vkontakte     |  [X]         | [ ]         |
+Mailru        |  [X]         | [ ]         |
+Odnoklassniki |  [X]         | [ ]         |
+
+
+[ ] **OpenID Providers**
+
+The following IDPs are based on OpenID specifications. 
+
+Provider      | Implemented? | Working?    | Notes
+------------- | ------------ |------------ | ------------------------------------------------------------------------------
+OpenID        |  [X]         | [X]         | Generic OpenID Adapter. Implemented and Working.
+AOL           |  [X]         | [ ]         | Does the AOL still a thing? We may drop it otherwise.
+PaypalOpenID  |  [X]         | [ ]         | Implemented but needs someone to confirm it's a working as expected.
+Stackoverflow |  [X]         | [X]         | All good.
+YahooOpenID   |  [X]         | [X]         | All good.
+Steam         |  [X]         | [X]         | Steam Adapter is a mix of OpenID and a Proprietary API.
+
+
+### Optional:
+
+The following tasks are not required in order to release Hybridauth 3 but they're nice to have.
+
+[ ] **Peer review**
+
+Hybridauth V3 is a complete rewrite of the current V2, and given the sensitive topic it deals with (i.e, users authentication),
+it would be extremely valuable to have the entire code base examined and reviewed for safety and security purposes.
+
+[ ] **Additional providers**
+
+As mentioned above, for the first releases of Hybridauth 3, we'll focusing on the major providers. If there's a social networks
+that you care for and you wish it to be included sooner, then feel free to port it from the V2 repository.
+
+V2 additional IDPs can be found at: 
+
+https://github.com/hybridauth/hybridauth/tree/master/additional-providers
+
+Documentation on how to upgrade these providers to V3 can be found at:
+
+http://hybridauth.github.io/developer-ref-extend-hybridauth.html
+
+[ ] **Unit tests**
+
+This one has been on the project's wishlist for as long as Hybridauth library existed. If you feel adventurous enough to take
+on this task, then please give it a shot.

TODO.md

@@ -2,7 +2,7 @@
     "name": "hybridauth/hybridauth",
     "description": "Open source social sign on PHP library.",
     "keywords": ["oauth", "openid", "authentication", "authorization", "social", "api", "google", "facebook", "twitter"],
-    "homepage": "http://hybridauth.sourceforge.net",
+    "homepage": "http://hybridauth.github.io",
     "type": "library",
     "license": "MIT",
     "authors": [
@@ -12,7 +12,6 @@
         }
     ],
     "support": {
-        "forum": "https://groups.google.com/d/forum/hybridauth",
         "issues": "https://github.com/hybridauth/hybridauth/issues",
         "gitter": "https://gitter.im/hybridauth/hybridauth"
     },
@@ -21,8 +20,7 @@
         "ext-curl": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.1",
-        "fabpot/php-cs-fixer": "~1.6"
+        "phpunit/phpunit": "~4.1"
     },
     "autoload": {
         "psr-4": {