diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-12-27 15:49:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-27 15:49:41 +0100 |
| commit | 72747ed6862282d1d38414ccf9c1ee56d63821a6 (patch) | |
| tree | fe70ddb78489300bc30e982c80704be15f7ca6d7 /phpBB/phpbb/auth | |
| parent | c7898ac3e406a21b73a12d77fdb23dbf6157f566 (diff) | |
| parent | 7cf148ea131c73cc0c08a77e6811a6755658869e (diff) | |
| download | forums-72747ed6862282d1d38414ccf9c1ee56d63821a6.tar forums-72747ed6862282d1d38414ccf9c1ee56d63821a6.tar.gz forums-72747ed6862282d1d38414ccf9c1ee56d63821a6.tar.bz2 forums-72747ed6862282d1d38414ccf9c1ee56d63821a6.tar.xz forums-72747ed6862282d1d38414ccf9c1ee56d63821a6.zip | |
Merge pull request #5793 from marc1706/ticket/16271
[ticket/16271] Add Sami 4.x and update necessary dependencies
Diffstat (limited to 'phpBB/phpbb/auth')
| -rw-r--r-- | phpBB/phpbb/auth/provider/ldap.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/service/service_interface.php | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php index 6a78136e5f..43699f7d6e 100644 --- a/phpBB/phpbb/auth/provider/ldap.php +++ b/phpBB/phpbb/auth/provider/ldap.php @@ -40,8 +40,8 @@ class ldap extends base /** * LDAP Authentication Constructor * - * @param driver_interface $db DBAL driver interface * @param config $config Config object + * @param driver_interface $db DBAL driver interface * @param language $language Language object * @param user $user User object */ diff --git a/phpBB/phpbb/auth/provider/oauth/service/service_interface.php b/phpBB/phpbb/auth/provider/oauth/service/service_interface.php index ea9ef43788..239e661989 100644 --- a/phpBB/phpbb/auth/provider/oauth/service/service_interface.php +++ b/phpBB/phpbb/auth/provider/oauth/service/service_interface.php @@ -73,8 +73,6 @@ interface service_interface /** * Returns the external library service provider once it has been set - * - * @param \OAuth\Common\Service\ServiceInterface|null */ public function get_external_service_provider(); |