chrmorandi / yii2-ldap

src/Connection.php

Doc Comments +4 added lines

@@ -134,6 +134,10 @@
     protected $userDN;
 
     # Create AD password (Microsoft Active Directory password format)
+
+    /**
+     * @param string $password
+     */
     protected static function encodePassword($password)
     {
         $password   = "\"" . $password . "\"";

Spacing +4 added lines, -4 removed lines

@@ -136,7 +136,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;
     }
@@ -185,7 +185,7 @@ 
      */
     public function open($anonymous = false)
     {
-        $token = 'Opening LDAP connection: ' . LdapHelper::recursive_implode($this->dc, ' or ');
+        $token = 'Opening LDAP connection: '.LdapHelper::recursive_implode($this->dc, ' or ');
         Yii::info($token, __METHOD__);
         Yii::beginProfile($token, __METHOD__);
         // Connect to the LDAP server.
@@ -212,7 +212,7 @@ 
     protected function connect($hostname = [], $port = '389')
     {
         if (is_array($hostname)) {
-            $hostname = self::PROTOCOL . implode(' ' . self::PROTOCOL, $hostname);
+            $hostname = self::PROTOCOL.implode(' '.self::PROTOCOL, $hostname);
         }
 
         $this->close();
@@ -331,7 +331,7 @@ 
         $this->open();
         $results = [];
         $cookie  = '';
-        $token   = $function . ' - params: ' . LdapHelper::recursive_implode($params, ';');
+        $token   = $function.' - params: '.LdapHelper::recursive_implode($params, ';');
 
         Yii::info($token, 'chrmorandi\ldap\Connection::query');
 

src/FilterBuilder.php

Spacing +11 added lines, -11 removed lines

@@ -106,7 +106,7 @@ 
                 }
             }
         }
-        return count($parts) === 1 ? '(' . $parts[0] . ')' : '$(' . implode(') (', $parts) . ')';
+        return count($parts) === 1 ? '('.$parts[0].')' : '$('.implode(') (', $parts).')';
     }
 
     /**
@@ -124,15 +124,15 @@ 
                 $operand = $this->build($operand);
             }
             if ($operand !== '' && !is_numeric($key)) {
-                $parts[] = $key . '=' . $operand;
+                $parts[] = $key.'='.$operand;
             } elseif ($operand !== '') {
                 $other[] = $operand;
             }
         }
         if (!empty($parts)) {
-            return '(' . $this->operator[$operator] . '(' . implode(") (", $parts) . ')' . implode($other) . ')';
+            return '('.$this->operator[$operator].'('.implode(") (", $parts).')'.implode($other).')';
         } else if (!empty($other)) {
-            return '(' . $this->operator[$operator] . implode($other) . ')';
+            return '('.$this->operator[$operator].implode($other).')';
         } else {
             return '';
         }
@@ -160,7 +160,7 @@ 
             return '';
         }
 
-        return '(' . $this->operator['NOT'] . '(' . key($operands) . '=' . $operand . '))';
+        return '('.$this->operator['NOT'].'('.key($operands).'='.$operand.'))';
     }
 
     /**
@@ -214,10 +214,10 @@ 
         }
 
         if (count($sqlValues) > 1) {
-            return "&($column=" . implode(")($column=", $sqlValues) . ')';
+            return "&($column=".implode(")($column=", $sqlValues).')';
         } else {
             $operator = $operator === 'IN' ? '=' : '<>';
-            return $column . $operator . reset($sqlValues);
+            return $column.$operator.reset($sqlValues);
         }
     }
 
@@ -246,7 +246,7 @@ 
             return $operator === 'IN' ? '0=1' : '';
         }
 
-        return '(&' . implode('', $vss) . ')';
+        return '(&'.implode('', $vss).')';
     }
 
     /**
@@ -294,15 +294,15 @@ 
             return $not ? '' : '0=1';
         }
 
-        $not = ($operator == 'NOT LIKE') ? '(' . $this->operator['NOT'] : false;
+        $not = ($operator == 'NOT LIKE') ? '('.$this->operator['NOT'] : false;
 
         $parts = [];
         foreach ($values as $value) {
             $value   = empty($escape) ? $value : strtr($value, $escape);
-            $parts[] = $not . '(' . $column . '=*' . $value . '*)' . ($not ? ')' : '');
+            $parts[] = $not.'('.$column.'=*'.$value.'*)'.($not ? ')' : '');
         }
 
-        return '(' . $this->operator[trim($andor)] . implode($parts) . ')';
+        return '('.$this->operator[trim($andor)].implode($parts).')';
     }
 
     /**

src/LdapHelper.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
             if (count($values) === 1) {
                 throw new InvalidArgumentException(sprintf('Unable to parse DN piece "%s".', $values[0]));
             }
-            $dn[$index] = $values[0] . '=' . $values[1];
+            $dn[$index] = $values[0].'='.$values[1];
         }
 
         return implode(',', $dn);
@@ -63,7 +63,7 @@ 
         $rdn = self::explodeDn($dn, 0)[0];
         $rdn = explode('=', $rdn, 2);
 
-        return $rdn[0] . '=' . $rdn[1];
+        return $rdn[0].'='.$rdn[1];
     }
 
     /**
@@ -84,8 +84,8 @@ 
 
         // Recursively iterates array and adds key/value to glued string
         array_walk_recursive($array, function($value, $key) use ($glue, $include_keys, &$glued_string) {
-            $include_keys and $glued_string .= $key . $glue;
-            $glued_string .= $value . $glue;
+            $include_keys and $glued_string .= $key.$glue;
+            $glued_string .= $value.$glue;
         });
 
         // Removes last $glue from string