chrmorandi / yii2-ldap

FilterBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
             return '('.$this->operator[$operator].'('.implode(") (", $parts).')'.implode($other).')';
         } else if (!empty($other)) {
             return '('.$this->operator[$operator].implode($other).')';
-        }else {
+        } else {
             return '';
         }
     }

Braces +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
             return '('.$this->operator[$operator].'('.implode(") (", $parts).')'.implode($other).')';
         } else if (!empty($other)) {
             return '('.$this->operator[$operator].implode($other).')';
-        }else {
+        } else {
             return '';
         }
     }

Query.php

Spacing +5 added lines, -5 removed lines

@@ -97,10 +97,10 @@ 
         
         $select = (is_array($this->select)) ? $this->select : [];
         
-        if(ctype_digit((string) $this->limit)){
+        if (ctype_digit((string) $this->limit)) {
             $db->pageSize = $this->limit;            
         }        
-        if(ctype_digit((string) $this->offset)){
+        if (ctype_digit((string) $this->offset)) {
             $db->offset = $this->offset == 0 ? 1 : $this->offset;
         }
 
@@ -117,7 +117,7 @@ 
      */
     public function all($db = null)
     {    
-        if(!($this->dataReader instanceof DataReader)) {            
+        if (!($this->dataReader instanceof DataReader)) {            
             /** @var $result DataReader */
             $this->dataReader = $this->execute($db);
         } else {
@@ -125,10 +125,10 @@ 
                 $db = Yii::$app->get('ldap');
             }
             
-            if(ctype_digit((string) $this->limit)){
+            if (ctype_digit((string) $this->limit)) {
                 $db->pageSize = $this->limit;            
             }        
-            if(ctype_digit((string) $this->offset)){
+            if (ctype_digit((string) $this->offset)) {
                 $db->offset = $this->offset == 0 ? 1 : $this->offset;
             }
         }

DataReader.php

Spacing +9 added lines, -9 removed lines

@@ -74,10 +74,10 @@ 
      */
     public function __construct(Connection $conn, $results, $config = [])
     {
-        $this->_conn   = $conn;
+        $this->_conn = $conn;
         $this->_results = $results;
 
-        if(is_array($this->_results)){
+        if (is_array($this->_results)) {
             foreach ($this->_results as $result) {
                 $this->_count += $this->_conn->countEntries($result);
                 //$this->setEntries($result);
@@ -101,7 +101,7 @@ 
      * @param resource|array $result
      * @return void
      */
-    protected function setEntries($result){        
+    protected function setEntries($result) {        
         $identifier = $this->_conn->getFirstEntry($result);
 
         while (false !== $identifier) {
@@ -124,12 +124,12 @@ 
             return [];
         }
         
-        $token = 'Get entries with limit pagination ' . $this->_conn->pageSize;
+        $token = 'Get entries with limit pagination '.$this->_conn->pageSize;
         Yii::beginProfile($token, __METHOD__);
-        if($this->_conn->offset > 0){
-            $this->setEntries($this->_results[intval($this->_conn->offset/$this->_conn->pageSize)]);
+        if ($this->_conn->offset > 0) {
+            $this->setEntries($this->_results[intval($this->_conn->offset / $this->_conn->pageSize)]);
         } else {
-            if(is_array($this->_results)){
+            if (is_array($this->_results)) {
                 foreach ($this->_results as $result) {                
                     $this->setEntries($result);
                 }
@@ -139,7 +139,7 @@ 
         }
         Yii::endProfile($token, __METHOD__);
         
-        $token = 'Get Attributes of entries with limit pagination in ' . $this->_conn->pageSize;
+        $token = 'Get Attributes of entries with limit pagination in '.$this->_conn->pageSize;
         Yii::beginProfile($token, __METHOD__);
         $data = [];
         foreach ($this as $item) {
@@ -157,7 +157,7 @@ 
      */
     public function close()
     {
-        if(is_array($this->_results)){
+        if (is_array($this->_results)) {
             foreach ($this->_results as $result) {
                 $this->_conn->freeResult($result);
             }

schemas/SchemaTrait.php

Indentation +5 added lines, -5 removed lines

@@ -26,11 +26,11 @@
      */
     public $dn;
     
-     /**
-     * Returns the list of attribute names.
-     * By default, this method returns all public properties of the class.
-     * @return array list of attribute names.
-     */
+        /**
+         * Returns the list of attribute names.
+         * By default, this method returns all public properties of the class.
+         * @return array list of attribute names.
+         */
     public function getAttributes() {
         $class = new ReflectionClass(self::class);
         $names = [];

ActiveRecord.php

Spacing +5 added lines, -5 removed lines

@@ -187,7 +187,7 @@ 
             return 0;
         }
 
-        if(($condition = $this->getOldPrimaryKey(true)) !== $this->getPrimaryKey(true)) {
+        if (($condition = $this->getOldPrimaryKey(true)) !== $this->getPrimaryKey(true)) {
             // TODO Change DN
 //            static::getDb()->rename($condition, $newRdn, $newParent, true);
 //            if (!$this->refresh()){
@@ -197,12 +197,12 @@ 
         }
         
         foreach ($values as $key => $value) {
-            if($key == 'dn'){
+            if ($key == 'dn') {
                 continue;
             }
-            if(empty ($this->getOldAttribute($key)) && $value === ''){
+            if (empty ($this->getOldAttribute($key)) && $value === '') {
                 unset($values[$key]);
-            } else if($value === ''){
+            } else if ($value === '') {
                 $attributes[] = ['attrib'  => $key, 'modtype' => LDAP_MODIFY_BATCH_REMOVE];
             } else if (empty ($this->getOldAttribute($key))) {
                 $attributes[] = ['attrib'  => $key, 'modtype' => LDAP_MODIFY_BATCH_ADD, 'values' => is_array($value) ? $value : [$value]];
@@ -245,7 +245,7 @@ 
      */
     public static function updateAll($attributes, $condition = '')
     {
-        if(is_array($condition)){
+        if (is_array($condition)) {
             $condition = $condition['dn'];
         }        
         

Connection.php

Doc Comments +5 added lines, -3 removed lines

@@ -133,6 +133,10 @@ 
     protected $userDN;
     
     # Create AD password (Microsoft Active Directory password format)
+
+    /**
+     * @param string $password
+     */
     protected static function encodePassword($password) {
         $password = "\"" . $password . "\"";
         $adpassword = mb_convert_encoding($password, "UTF-16LE", "UTF-8");
@@ -230,7 +234,7 @@ 
      * Authenticate user
      * @param string $username
      * @param string $password
-     * @return int indicate occurrence of error. 
+     * @return boolean indicate occurrence of error. 
      */
     public function auth($username, $password)
     {
@@ -563,8 +567,6 @@ 
     
     /**
      * Send LDAP pagination control.
-     * @param int    $pageSize
-     * @param bool   $isCritical
      * @param string $cookie
      * @return bool
      */

Spacing +8 added lines, -8 removed lines

@@ -134,7 +134,7 @@ 
     
     # Create AD password (Microsoft Active Directory password format)
     protected static function encodePassword($password) {
-        $password = "\"" . $password . "\"";
+        $password = "\"".$password."\"";
         $adpassword = mb_convert_encoding($password, "UTF-16LE", "UTF-8");
         return $adpassword;
     }
@@ -183,7 +183,7 @@ 
      */
     public function open($anonymous = false)
     {
-        $token = 'Opening LDAP connection: ' . LdapUtils::recursive_implode($this->dc, ' or ');
+        $token = 'Opening LDAP connection: '.LdapUtils::recursive_implode($this->dc, ' or ');
         Yii::info($token, __METHOD__);
         Yii::beginProfile($token, __METHOD__);
         // Connect to the LDAP server.
@@ -240,7 +240,7 @@ 
         # Search for user and get user DN
         $searchResult = ldap_search($this->resource, $this->baseDn, "(&(objectClass=person)($this->loginAttribute=$username))", [$this->loginAttribute]);
         $entry = $this->getFirstEntry($searchResult);
-        if($entry) {
+        if ($entry) {
             $this->userDN = $this->getDn($entry);        
         } else {
             $this->userDN = null;
@@ -269,7 +269,7 @@ 
         }
 
         // Open connection with user
-        if(!$this->auth($username, $oldPassword)){
+        if (!$this->auth($username, $oldPassword)) {
             return false;
         }
         
@@ -326,20 +326,20 @@ 
         $this->open();
         $results = [];
         $cookie = '';        
-        $token = $function . ' - params: ' . LdapUtils::recursive_implode($params, ';');
+        $token = $function.' - params: '.LdapUtils::recursive_implode($params, ';');
 
-        Yii::info($token , 'chrmorandi\ldap\Connection::query');
+        Yii::info($token, 'chrmorandi\ldap\Connection::query');
        
         Yii::beginProfile($token, 'chrmorandi\ldap\Connection::query');
         do {
-            if($this->pageSize > 0) {
+            if ($this->pageSize > 0) {
                 $this->setControlPagedResult($cookie);
             }
             
             // Run the search.
             $result = call_user_func($function, $this->resource, ...$params);
             
-            if($this->pageSize > 0) {
+            if ($this->pageSize > 0) {
                 $this->setControlPagedResultResponse($result, $cookie);
             }