10 files changed, 36 insertions, 34 deletions

diff --git a/app/Core/Ldap/Client.php b/app/Core/Ldap/Client.php
index 5d481cd3..63149ae3 100644
--- a/app/Core/Ldap/Client.php
+++ b/app/Core/Ldap/Client.php
@@ -15,10 +15,10 @@ class Client
     /**
      * LDAP resource
      *
-     * @access private
+     * @access protected
      * @var resource
      */
-    private $ldap;
+    protected $ldap;
 
     /**
      * Establish LDAP connection
diff --git a/app/Core/Ldap/Entries.php b/app/Core/Ldap/Entries.php
index 3487541f..0e779342 100644
--- a/app/Core/Ldap/Entries.php
+++ b/app/Core/Ldap/Entries.php
@@ -13,10 +13,10 @@ class Entries
     /**
      * LDAP entries
      *
-     * @access private
+     * @access protected
      * @var array
      */
-    private $entries = array();
+    protected $entries = array();
 
     /**
      * Constructor
diff --git a/app/Core/Ldap/Entry.php b/app/Core/Ldap/Entry.php
index e67dd625..0b99a58b 100644
--- a/app/Core/Ldap/Entry.php
+++ b/app/Core/Ldap/Entry.php
@@ -13,10 +13,10 @@ class Entry
     /**
      * LDAP entry
      *
-     * @access private
+     * @access protected
      * @var array
      */
-    private $entry = array();
+    protected $entry = array();
 
     /**
      * Constructor
diff --git a/app/Core/Ldap/Group.php b/app/Core/Ldap/Group.php
index e11e8ecd..634d47ee 100644
--- a/app/Core/Ldap/Group.php
+++ b/app/Core/Ldap/Group.php
@@ -16,10 +16,10 @@ class Group
     /**
      * Query
      *
-     * @access private
+     * @access protected
      * @var Query
      */
-    private $query;
+    protected $query;
 
     /**
      * Constructor
@@ -43,7 +43,8 @@ class Group
      */
     public static function getGroups(Client $client, $query)
     {
-        $self = new self(new Query($client));
+        $className = get_called_class();
+        $self = new $className(new Query($client));
         return $self->find($query);
     }
 
diff --git a/app/Core/Ldap/Query.php b/app/Core/Ldap/Query.php
index 6ca4bc96..e03495ec 100644
--- a/app/Core/Ldap/Query.php
+++ b/app/Core/Ldap/Query.php
@@ -13,18 +13,18 @@ class Query
     /**
      * LDAP client
      *
-     * @access private
+     * @access protected
      * @var Client
      */
-    private $client = null;
+    protected $client = null;
 
     /**
      * Query result
      *
-     * @access private
+     * @access protected
      * @var array
      */
-    private $entries = array();
+    protected $entries = array();
 
     /**
      * Constructor
diff --git a/app/Core/Ldap/User.php b/app/Core/Ldap/User.php
index 0c9df63f..04c4cc7e 100644
--- a/app/Core/Ldap/User.php
+++ b/app/Core/Ldap/User.php
@@ -17,10 +17,10 @@ class User
     /**
      * Query
      *
-     * @access private
+     * @access protected
      * @var Query
      */
-    private $query;
+    protected $query;
 
     /**
      * Constructor
@@ -44,7 +44,8 @@ class User
      */
     public static function getUser(Client $client, $username)
     {
-        $self = new self(new Query($client));
+        $className = get_called_class();
+        $self = new $className(new Query($client));
         return $self->find($self->getLdapUserPattern($username));
     }
 
diff --git a/app/User/DatabaseUserProvider.php b/app/User/DatabaseUserProvider.php
index 9a0047b2..fc626610 100644
--- a/app/User/DatabaseUserProvider.php
+++ b/app/User/DatabaseUserProvider.php
@@ -15,10 +15,10 @@ class DatabaseUserProvider implements UserProviderInterface
     /**
      * User properties
      *
-     * @access private
+     * @access protected
      * @var array
      */
-    private $user = array();
+    protected $user = array();
 
     /**
      * Constructor
diff --git a/app/User/LdapUserProvider.php b/app/User/LdapUserProvider.php
index 9dfb2380..3a84bfea 100644
--- a/app/User/LdapUserProvider.php
+++ b/app/User/LdapUserProvider.php
@@ -15,50 +15,50 @@ class LdapUserProvider implements UserProviderInterface
     /**
      * LDAP DN
      *
-     * @access private
+     * @access protected
      * @var string
      */
-    private $dn;
+    protected $dn;
 
     /**
      * LDAP username
      *
-     * @access private
+     * @access protected
      * @var string
      */
-    private $username;
+    protected $username;
 
     /**
      * User name
      *
-     * @access private
+     * @access protected
      * @var string
      */
-    private $name;
+    protected $name;
 
     /**
      * Email
      *
-     * @access private
+     * @access protected
      * @var string
      */
-    private $email;
+    protected $email;
 
     /**
      * User role
      *
-     * @access private
+     * @access protected
      * @var string
      */
-    private $role;
+    protected $role;
 
     /**
      * Group LDAP DNs
      *
-     * @access private
+     * @access protected
      * @var string[]
      */
-    private $groupIds;
+    protected $groupIds;
 
     /**
      * Constructor
diff --git a/app/User/OAuthUserProvider.php b/app/User/OAuthUserProvider.php
index 527fefde..dec26250 100644
--- a/app/User/OAuthUserProvider.php
+++ b/app/User/OAuthUserProvider.php
@@ -23,10 +23,10 @@ abstract class OAuthUserProvider implements UserProviderInterface
     /**
      * User properties
      *
-     * @access private
+     * @access protected
      * @var array
      */
-    private $user = array();
+    protected $user = array();
 
     /**
      * Constructor
diff --git a/app/User/ReverseProxyUserProvider.php b/app/User/ReverseProxyUserProvider.php
index 071330df..723b8155 100644
--- a/app/User/ReverseProxyUserProvider.php
+++ b/app/User/ReverseProxyUserProvider.php
@@ -16,10 +16,10 @@ class ReverseProxyUserProvider implements UserProviderInterface
     /**
      * Username
      *
-     * @access private
+     * @access protected
      * @var string
      */
-    private $username = '';
+    protected $username = '';
 
     /**
      * Constructor