Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						7e4317cf54
					 | 
					
						
						
							
							Added branch alias for 4.0.x-dev
						
						
						
						
						
						
						
						Fixes #194 
						
						
					 | 
					
						2014-08-06 18:02:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						522c7478c7
					 | 
					
						
						
							
							Fix #169
						
						
						
						
						
						
					 | 
					
						2014-08-06 09:53:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						130d42c85e
					 | 
					
						
						
							
							Removed some files which shouldn't be there
						
						
						
						
						
						
					 | 
					
						2014-08-06 09:37:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						0433791bc6
					 | 
					
						
						
							
							Accidentally merged wrong version of file
						
						
						
						
						
						
					 | 
					
						2014-08-06 09:29:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						79f15f3855
					 | 
					
						
						
							
							Merge branch 'v4.0.0-WIP' into develop
						
						
						
						
						
						
						
						Conflicts:
	.gitignore
	.travis.yml
	README.md
	composer.json
	phpunit.xml
	sql/mysql.sql
	src/League/OAuth2/Server/Grant/RefreshToken.php
	src/League/OAuth2/Server/Resource.php
	src/League/OAuth2/Server/Storage/SessionInterface.php
	src/League/OAuth2/Server/Util/Request.php
	src/Util/KeyAlgorithm/DefaultAlgorithm.php
	tests/resource/ResourceServerTest.php
	tests/util/RedirectUriTest.php
	tests/util/RequestTest.php
	tests/util/SecureKeyTest.php 
						
						
					 | 
					
						2014-08-06 09:21:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						0754b9ec75
					 | 
					
						
						
							
							Merge branch 'v4.0.0-relational-example' into v4.0.0-WIP
						
						
						
						
						
						
					 | 
					
						2014-08-06 09:02:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						6568ca5790
					 | 
					
						
						
							
							Removing fizzfuzz for now until I can work out what the hell is wrong with it
						
						
						
						
						
						
					 | 
					
						2014-08-06 08:59:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						30abfeefbf
					 | 
					
						
						
							
							Tried removed --prefer-dist
						
						
						
						
						
						
					 | 
					
						2014-08-06 08:56:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						1483ce936b
					 | 
					
						
						
							
							Fizzfuzz is lowercase now
						
						
						
						
						
						
					 | 
					
						2014-08-06 08:51:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						661086d3b8
					 | 
					
						
						
							
							Removed coveralls and phpcs testing
						
						
						
						
						
						
					 | 
					
						2014-08-06 08:47:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						ca1b977786
					 | 
					
						
						
							
							Added another test
						
						
						
						
						
						
					 | 
					
						2014-08-06 08:43:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						7525fc0884
					 | 
					
						
						
							
							Bug fixes
						
						
						
						
						
						
					 | 
					
						2014-08-06 08:43:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						06d5b343d6
					 | 
					
						
						
							
							Fixed incorrect exception status code and error type
						
						
						
						
						
						
					 | 
					
						2014-08-06 08:42:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						07a42f6f43
					 | 
					
						
						
							
							Added setAccessTokenId method
						
						
						
						
						
						
					 | 
					
						2014-08-06 08:42:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						8be92d413d
					 | 
					
						
						
							
							Implemented final storage methods
						
						
						
						
						
						
					 | 
					
						2014-08-06 08:42:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						71ac21b70e
					 | 
					
						
						
							
							Removed unnecessary methods
						
						
						
						
						
						
					 | 
					
						2014-08-06 08:41:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						12ab753f15
					 | 
					
						
						
							
							Updated associateScope method
						
						
						
						
						
						
					 | 
					
						2014-08-04 20:15:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						684a8a269e
					 | 
					
						
						
							
							Updated examples
						
						
						
						
						
						
					 | 
					
						2014-08-04 18:54:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						cd60c2961f
					 | 
					
						
						
							
							Removed session ID
						
						
						
						
						
						
					 | 
					
						2014-08-04 18:53:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						f046a024e4
					 | 
					
						
						
							
							Updated .travis.yml to use FizzFuzz
						
						
						
						
						
						
					 | 
					
						2014-08-04 15:28:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						90e585ba9a
					 | 
					
						
						
							
							Removed codeception file
						
						
						
						
						
						
					 | 
					
						2014-08-04 15:27:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						7e0e337134
					 | 
					
						
						
							
							Fixed grant password fuzz test
						
						
						
						
						
						
					 | 
					
						2014-08-04 15:27:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						324da27ea9
					 | 
					
						
						
							
							Added verify credentials callback
						
						
						
						
						
						
					 | 
					
						2014-08-04 15:26:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						0a260f0c8c
					 | 
					
						
						
							
							Commented out refresh token for now
						
						
						
						
						
						
					 | 
					
						2014-08-04 15:26:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						1a4cc3b750
					 | 
					
						
						
							
							Return password
						
						
						
						
						
						
					 | 
					
						2014-08-04 15:26:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						b3da61822e
					 | 
					
						
						
							
							Updated example code examples
						
						
						
						
						
						
					 | 
					
						2014-08-04 15:19:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						69208fe0ac
					 | 
					
						
						
							
							Added more fizzfuzz tests
						
						
						
						
						
						
					 | 
					
						2014-08-04 15:18:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						806838b8e4
					 | 
					
						
						
							
							So long codeception, you suck
						
						
						
						
						
						
					 | 
					
						2014-08-04 15:18:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						2637af87ec
					 | 
					
						
						
							
							Merge branch 'v4.0.0-relational-example' of github.com:thephpleague/oauth2-server into v4.0.0-relational-example
						
						
						
						
						
						
					 | 
					
						2014-08-04 10:54:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						ac3e787278
					 | 
					
						
						
							
							Updated api.php code
						
						
						
						
						
						
					 | 
					
						2014-08-04 09:12:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						ffe59f5a5f
					 | 
					
						
						
							
							Added Fuzz tests
						
						
						
						
						
						
					 | 
					
						2014-08-04 09:12:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						7b9899c46b
					 | 
					
						
						
							
							Removed line break in error messages
						
						
						
						
						
						
					 | 
					
						2014-08-04 09:11:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						c29340ae27
					 | 
					
						
						
							
							Added FizzFuzz requirement
						
						
						
						
						
						
					 | 
					
						2014-08-04 09:11:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						ad12a088cf
					 | 
					
						
						
							
							Renamed auth to authServer
						
						
						
						
						
						
					 | 
					
						2014-07-28 13:56:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						0810be9ce4
					 | 
					
						
						
							
							Merge branch 'v4.0.0-relational-example' of github.com:thephpleague/oauth2-server into v4.0.0-relational-example
						
						
						
						
						
						
					 | 
					
						2014-07-28 13:54:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						7f75246619
					 | 
					
						
						
							
							Added auth functional tests
						
						
						
						
						
						
					 | 
					
						2014-07-27 22:51:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						5ec1bf8a88
					 | 
					
						
						
							
							Renamed auth.php to authcode_grant.php
						
						
						
						
						
						
					 | 
					
						2014-07-27 22:50:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						443d72ee24
					 | 
					
						
						
							
							Ignore .paw file
						
						
						
						
						
						
					 | 
					
						2014-07-27 17:18:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						861da5fee9
					 | 
					
						
						
							
							Updated .gitignore
						
						
						
						
						
						
					 | 
					
						2014-07-27 17:17:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						f3fc921212
					 | 
					
						
						
							
							Added redirect URI property
						
						
						
						
						
						
					 | 
					
						2014-07-27 17:16:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						54e6bbd4a6
					 | 
					
						
						
							
							expires isn't part of the spec
						
						
						
						
						
						
					 | 
					
						2014-07-27 17:15:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						0d6c4f65b9
					 | 
					
						
						
							
							Store the redirect URI too
						
						
						
						
						
						
					 | 
					
						2014-07-27 17:14:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						cfd1c93a46
					 | 
					
						
						
							
							Updated response code
						
						
						
						
						
						
					 | 
					
						2014-07-27 17:14:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						29b09227ac
					 | 
					
						
						
							
							Implemented more methods
						
						
						
						
						
						
					 | 
					
						2014-07-27 17:12:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						6cb5863b81
					 | 
					
						
						
							
							Added missing column
						
						
						
						
						
						
					 | 
					
						2014-07-27 17:11:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						1890d71838
					 | 
					
						
						
							
							Merge branch 'develop' of github.com:thephpleague/oauth2-server into develop
						
						
						
						
						
						
					 | 
					
						2014-07-23 16:05:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						00d5fb5834
					 | 
					
						
						
							
							Merge pull request #188 from ushahidi/fix-http-headers-util-request
						
						
						
						
						
						
						
						Fix Resource server Request HTTP header access 
						
						
					 | 
					
						2014-07-23 15:58:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robbie Mackay
							
						 
					 | 
					
						
						
							
						
						49b776c495
					 | 
					
						
						
							
							In Resource::getExceptionHttpHeaders() use Request::BuildFromGlobals
						
						
						
						
						
						
					 | 
					
						2014-07-23 07:48:05 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Woody Gilk
							
						 
					 | 
					
						
						
							
						
						31e03c2d36
					 | 
					
						
						
							
							Fix broken http header extraction in Util\Request
						
						
						
						
						
						
					 | 
					
						2014-07-23 07:47:29 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Bilbie
							
						 
					 | 
					
						
						
							
						
						395ee3bf49
					 | 
					
						
						
							
							Moved existing functional tests into resource server folder
						
						
						
						
						
						
					 | 
					
						2014-07-22 12:15:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |