diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-18 21:03:57 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-18 21:04:10 -0400 |
| commit | 4c48da0597c148c58925cdedbd4e79fb63eaf76a (patch) | |
| tree | 848ec990f5c289526d635a642ae05266d06a52db /phpBB/phpbb | |
| parent | f852485513ee4e032cf9c25acb2d72980f783c24 (diff) | |
| download | forums-4c48da0597c148c58925cdedbd4e79fb63eaf76a.tar forums-4c48da0597c148c58925cdedbd4e79fb63eaf76a.tar.gz forums-4c48da0597c148c58925cdedbd4e79fb63eaf76a.tar.bz2 forums-4c48da0597c148c58925cdedbd4e79fb63eaf76a.tar.xz forums-4c48da0597c148c58925cdedbd4e79fb63eaf76a.zip | |
[feature/oauth] Clean up unneeded complexity
PHPBB3-11673
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index 9be404dade..20c82e63d7 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -68,13 +68,6 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base protected $auth_provider_oauth_token_account_assoc; /** - * Cached services once they has been created - * - * @var array Contains \OAuth\Common\Service\ServiceInterface or null - */ - protected $services; - - /** * All OAuth service providers * * @var phpbb_di_service_collection Contains phpbb_auth_provider_oauth_service_interface @@ -108,7 +101,6 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base $this->auth_provider_oauth_token_storage_table = $auth_provider_oauth_token_storage_table; $this->auth_provider_oauth_token_account_assoc = $auth_provider_oauth_token_account_assoc; $this->service_providers = $service_providers; - $this->services = array(); } /** @@ -226,11 +218,6 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base */ protected function get_service($service_name, phpbb_auth_oauth_token_storage $storage, array $service_credentials, array $scopes = array()) { - if ($this->services[$service_name]) - { - return $this->services[$service_name]; - } - $current_uri = $this->get_current_uri(); // Setup the credentials for the requests @@ -241,8 +228,6 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base ); $service_factory = new \OAuth\ServiceFactory(); - $this->service[$service_name] = $service_factory->createService($service_name, $credentials, $storage, $scopes); - - return $this->service[$service_name]; + return $service_factory->createService($service_name, $credentials, $storage, $scopes); } } |