silverstripe / silverstripe-ldap

src/Tasks/LDAPMemberSyncTask.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
      * @var array
      */
     private static $dependencies = [
-        'ldapService' => '%$' . LDAPService::class,
+        'ldapService' => '%$'.LDAPService::class,
     ];
 
     /**
@@ -50,7 +50,7 @@ 
      */
     public function getTitle()
     {
-        return _t(__CLASS__ . '.SYNCTITLE', 'Sync all users from Active Directory');
+        return _t(__CLASS__.'.SYNCTITLE', 'Sync all users from Active Directory');
     }
 
     /**
@@ -154,8 +154,8 @@ 
      */
     protected function log($message)
     {
-        $message = sprintf('[%s] ', date('Y-m-d H:i:s')) . $message;
-        echo Director::is_cli() ? ($message . PHP_EOL) : ($message . '<br>');
+        $message = sprintf('[%s] ', date('Y-m-d H:i:s')).$message;
+        echo Director::is_cli() ? ($message.PHP_EOL) : ($message.'<br>');
     }
 
     /**

src/Tasks/LDAPMemberSyncOneTask.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
      * @var array
      */
     private static $dependencies = [
-        'ldapService' => '%$' . LDAPService::class,
+        'ldapService' => '%$'.LDAPService::class,
     ];
 
     /**
@@ -35,7 +35,7 @@ 
      */
     public function getTitle()
     {
-        return _t(__CLASS__ . '.SYNCONETITLE', 'Sync single user from LDAP');
+        return _t(__CLASS__.'.SYNCONETITLE', 'Sync single user from LDAP');
     }
 
     /**

src/Iterators/LDAPIterator.php

Spacing +7 added lines, -7 removed lines

@@ -113,11 +113,11 @@ 
         } else {
             $resultResource = ldap_search($resource, $baseDn, $this->getFilter());
         }
-        if (! is_resource($resultResource)) {
+        if (!is_resource($resultResource)) {
             /*
              * @TODO better exception msg
              */
-            throw new \Exception('ldap_search returned something wrong...' . ldap_error($resource));
+            throw new \Exception('ldap_search returned something wrong...'.ldap_error($resource));
         }
 
         $entries = ldap_get_entries($resource, $resultResource);
@@ -204,7 +204,7 @@ 
         $attributeValue = [];
 
         $limit = $offset + $maxPerRequest - 1;
-        $searchedAttribute = $attrName . ';range=' . $offset . '-' . $limit;
+        $searchedAttribute = $attrName.';range='.$offset.'-'.$limit;
 
         $ldap = $this->getLdap();
         $entry = $ldap->getEntry($dn, [
@@ -234,10 +234,10 @@ 
     }
     public function current()
     {
-        if (! is_array($this->current)) {
+        if (!is_array($this->current)) {
             $this->rewind();
         }
-        if (! is_array($this->current)) {
+        if (!is_array($this->current)) {
             return;
         }
 
@@ -245,10 +245,10 @@ 
     }
     public function key()
     {
-        if (! is_array($this->current)) {
+        if (!is_array($this->current)) {
             $this->rewind();
         }
-        if (! is_array($this->current)) {
+        if (!is_array($this->current)) {
             return;
         }
 

src/Services/LDAPService.php

Spacing +17 added lines, -17 removed lines

@@ -59,7 +59,7 @@ 
      * @var array
      */
     private static $dependencies = [
-        'gateway' => '%$' . LDAPGateway::class
+        'gateway' => '%$'.LDAPGateway::class
     ];
 
     /**
@@ -135,7 +135,7 @@ 
      */
     public static function get_cache()
     {
-        return Injector::inst()->get(CacheInterface::class . '.ldap');
+        return Injector::inst()->get(CacheInterface::class.'.ldap');
     }
 
     /**
@@ -217,14 +217,14 @@ 
         // show better errors than the defaults for various status codes returned by LDAP
         if (!empty($messages[1]) && strpos($messages[1], 'NT_STATUS_ACCOUNT_LOCKED_OUT') !== false) {
             $message = _t(
-                __CLASS__ . '.ACCOUNTLOCKEDOUT',
-                'Your account has been temporarily locked because of too many failed login attempts. ' .
+                __CLASS__.'.ACCOUNTLOCKEDOUT',
+                'Your account has been temporarily locked because of too many failed login attempts. '.
                 'Please try again later.'
             );
         }
         if (!empty($messages[1]) && strpos($messages[1], 'NT_STATUS_LOGON_FAILURE') !== false) {
             $message = _t(
-                __CLASS__ . '.INVALIDCREDENTIALS',
+                __CLASS__.'.INVALIDCREDENTIALS',
                 'The provided details don\'t seem to be correct. Please try again.'
             );
         }
@@ -247,7 +247,7 @@ 
     public function getNodes($cached = true, $attributes = [])
     {
         $cache = self::get_cache();
-        $cacheKey = 'nodes' . md5(implode('', $attributes));
+        $cacheKey = 'nodes'.md5(implode('', $attributes));
         $results = $cache->has($cacheKey);
 
         if (!$results || !$cached) {
@@ -277,7 +277,7 @@ 
     {
         $searchLocations = $this->config()->groups_search_locations ?: [null];
         $cache = self::get_cache();
-        $cacheKey = 'groups' . md5(implode('', array_merge($searchLocations, $attributes)));
+        $cacheKey = 'groups'.md5(implode('', array_merge($searchLocations, $attributes)));
         $results = $cache->has($cacheKey);
 
         if (!$results || !$cached) {
@@ -545,7 +545,7 @@ 
         }
 
         $member->IsExpired = ($data['useraccountcontrol'] & 2) == 2;
-        $member->LastSynced = (string)DBDatetime::now();
+        $member->LastSynced = (string) DBDatetime::now();
 
         foreach ($member->config()->ldap_field_mappings as $attribute => $field) {
             // Special handling required for attributes that don't exist in the response.
@@ -566,7 +566,7 @@ 
                 } else {
                     $this->getLogger()->debug(
                         sprintf(
-                            'Attribute %s configured in Member.ldap_field_mappings, ' .
+                            'Attribute %s configured in Member.ldap_field_mappings, '.
                             'but no available attribute in AD data (GUID: %s, Member ID: %s)',
                             $attribute,
                             $data['objectguid'],
@@ -754,14 +754,14 @@ 
         }
 
         // Lookup the previous mappings and see if there is any mappings no longer present.
-        $unmappedGroups = $member->Groups()->alterDataQuery(function (DataQuery $query) {
+        $unmappedGroups = $member->Groups()->alterDataQuery(function(DataQuery $query) {
             // join with the Group_Members table because we only want those group members assigned by this module.
             $query->leftJoin("Group_Members", "Group_Members.GroupID = Group.ID");
             $query->where("IsImportedFromLDAP = 1");
         });
 
         // Don't remove associations which have just been added and we know are already correct!
-        if(!empty($mappedGroupIDs)){
+        if (!empty($mappedGroupIDs)) {
             $unmappedGroups = $unmappedGroups->filter("GroupID:NOT", $mappedGroupIDs);
         }
 
@@ -795,7 +795,7 @@ 
             $group->Description = $data['description'];
         }
         $group->DN = $data['dn'];
-        $group->LastSynced = (string)DBDatetime::now();
+        $group->LastSynced = (string) DBDatetime::now();
         $group->write();
 
         // Mappings on this group are automatically maintained to contain just the group's DN.
@@ -858,7 +858,7 @@ 
                 ),
             ]);
         } catch (Exception $e) {
-            throw new ValidationException('LDAP synchronisation failure: ' . $e->getMessage());
+            throw new ValidationException('LDAP synchronisation failure: '.$e->getMessage());
         }
 
         $user = $this->getUserByUsername($member->Username);
@@ -902,7 +902,7 @@ 
                 'distinguishedname' => $dn
             ]);
         } catch (Exception $e) {
-            throw new ValidationException('LDAP group creation failure: ' . $e->getMessage());
+            throw new ValidationException('LDAP group creation failure: '.$e->getMessage());
         }
 
         $data = $this->getGroupByDN($dn);
@@ -1067,7 +1067,7 @@ 
             try {
                 $this->update($groupDn, ['member' => $members]);
             } catch (Exception $e) {
-                throw new ValidationException('LDAP group membership remove failure: ' . $e->getMessage());
+                throw new ValidationException('LDAP group membership remove failure: '.$e->getMessage());
             }
         }
     }
@@ -1093,7 +1093,7 @@ 
         try {
             $this->update($groupDn, ['member' => $members]);
         } catch (Exception $e) {
-            throw new ValidationException('LDAP group membership add failure: ' . $e->getMessage());
+            throw new ValidationException('LDAP group membership add failure: '.$e->getMessage());
         }
     }
 
@@ -1176,7 +1176,7 @@ 
         try {
             $this->delete($data['distinguishedname']);
         } catch (Exception $e) {
-            throw new ValidationException('LDAP delete user failed: ' . $e->getMessage());
+            throw new ValidationException('LDAP delete user failed: '.$e->getMessage());
         }
     }
 

tests/php/Model/LDAPFakeMember.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      *
      * @return int|void
      */
-    public function write(){
+    public function write() {
         // Noop
     }
 }

tests/php/Services/LDAPServiceTest.php

Spacing +4 added lines, -4 removed lines

@@ -152,7 +152,7 @@ 
         $member->write();
 
         // Pretend we're the module, and generate some mappings.
-        Group::get()->each(function ($group) use ($member) {
+        Group::get()->each(function($group) use ($member) {
             $group->Members()->add($member, [
                 'IsImportedFromLDAP' => '1'
             ]);
@@ -182,7 +182,7 @@ 
             ]
         );
 
-        Config::modify()->set(LDAPService::class,'reset_missing_attributes', true);
+        Config::modify()->set(LDAPService::class, 'reset_missing_attributes', true);
 
         $member = new Member();
         $member->GUID = '123';
@@ -215,7 +215,7 @@ 
             ]
         );
 
-        Config::modify()->set(LDAPService::class,'reset_missing_attributes', true);
+        Config::modify()->set(LDAPService::class, 'reset_missing_attributes', true);
 
         // Create a test 'image' for this member.
         /** @var File $file */
@@ -254,7 +254,7 @@ 
             ]
         );
 
-        Config::modify()->set(LDAPService::class,'reset_missing_attributes', true);
+        Config::modify()->set(LDAPService::class, 'reset_missing_attributes', true);
 
         // Create a test 'image' for this member.
         /** @var File $file */