silverstripe / silverstripe-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;
         }
 

tests/php/Services/LDAPServiceTest.php

Spacing +1 added lines, -1 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'
             ]);

src/Tasks/LDAPGroupSyncTask.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
      * @var array
      */
     private static $dependencies = [
-        'LDAPService' => '%$' . LDAPService::class,
+        'LDAPService' => '%$'.LDAPService::class,
     ];
 
     /**
@@ -49,7 +49,7 @@ 
      */
     public function getTitle()
     {
-        return _t(__CLASS__ . '.SYNCTITLE', 'Sync all groups from LDAP');
+        return _t(__CLASS__.'.SYNCTITLE', 'Sync all groups from LDAP');
     }
 
     /**
@@ -158,8 +158,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/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

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

src/Extensions/LDAPMemberExtension.php

Spacing +6 added lines, -6 removed lines

@@ -124,14 +124,14 @@ 
             'IsExpired',
             $ldapMetadata[] = ReadonlyField::create(
                 'IsExpired',
-                _t(__CLASS__ . '.ISEXPIRED', 'Has user\'s LDAP/AD login expired?')
+                _t(__CLASS__.'.ISEXPIRED', 'Has user\'s LDAP/AD login expired?')
             )
         );
         $fields->replaceField(
             'LastSynced',
             $ldapMetadata[] = ReadonlyField::create(
                 'LastSynced',
-                _t(__CLASS__ . '.LASTSYNCED', 'Last synced')
+                _t(__CLASS__.'.LASTSYNCED', 'Last synced')
             )
         );
         $fields->addFieldsToTab('Root.LDAP', $ldapMetadata);
@@ -139,7 +139,7 @@ 
         $message = '';
         if ($this->owner->GUID && $this->owner->config()->update_ldap_from_local) {
             $message = _t(
-                __CLASS__ . '.CHANGEFIELDSUPDATELDAP',
+                __CLASS__.'.CHANGEFIELDSUPDATELDAP',
                 'Changing fields here will update them in LDAP.'
             );
         } elseif ($this->owner->GUID && !$this->owner->config()->update_ldap_from_local) {
@@ -151,12 +151,12 @@ 
                     // Set to readonly, but not disabled so that the data is still sent to the
                     // server and doesn't break Member_Validator
                     $field->setReadonly(true);
-                    $field->setTitle($field->Title() . _t(__CLASS__ . '.IMPORTEDFIELD', ' (imported)'));
+                    $field->setTitle($field->Title()._t(__CLASS__.'.IMPORTEDFIELD', ' (imported)'));
                 }
             }
             $message = _t(
-                __CLASS__ . '.INFOIMPORTED',
-                'This user is automatically imported from LDAP. ' .
+                __CLASS__.'.INFOIMPORTED',
+                'This user is automatically imported from LDAP. '.
                     'Manual changes to imported fields will be removed upon sync.'
             );
         }

src/Model/LDAPUtil.php

Spacing +4 added lines, -4 removed lines

@@ -42,8 +42,8 @@ 
         for ($k = 1; $k <= 2; ++$k) {
             $hex_guid_to_guid_str .= substr($hex_guid, 16 - 2 * $k, 2);
         }
-        $hex_guid_to_guid_str .= '-' . substr($hex_guid, 16, 4);
-        $hex_guid_to_guid_str .= '-' . substr($hex_guid, 20);
+        $hex_guid_to_guid_str .= '-'.substr($hex_guid, 16, 4);
+        $hex_guid_to_guid_str .= '-'.substr($hex_guid, 20);
 
         return strtoupper($hex_guid_to_guid_str);
     }
@@ -95,11 +95,11 @@ 
 
         for ($x = 0; $x < $subcount; $x++) {
             $subauth[$x] = hexdec(self::little_endian(substr($hex_sid, 16 + ($x * 8), 8)));
-            $result .= '-' . $subauth[$x];
+            $result .= '-'.$subauth[$x];
         }
 
         // Cheat by tacking on the S-
-        return 'S-' . $result;
+        return 'S-'.$result;
     }
 
     /**

src/Services/LDAPService.php

Spacing +20 added lines, -20 removed lines

@@ -49,7 +49,7 @@ 
      * @var array
      */
     private static $dependencies = [
-        'gateway' => '%$' . LDAPGateway::class
+        'gateway' => '%$'.LDAPGateway::class
     ];
 
     /**
@@ -125,7 +125,7 @@ 
      */
     public static function get_cache()
     {
-        return Injector::inst()->get(CacheInterface::class . '.ldap');
+        return Injector::inst()->get(CacheInterface::class.'.ldap');
     }
 
     /**
@@ -207,14 +207,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.'
             );
         }
@@ -237,7 +237,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) {
@@ -267,7 +267,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) {
@@ -535,7 +535,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.
@@ -556,7 +556,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'],
@@ -641,7 +641,7 @@ 
         if ($imageClass !== Image::class && !is_subclass_of($imageClass, Image::class)) {
             $this->getLogger()->warning(
                 sprintf(
-                    'Member field %s configured for ' . $attributeName . ' AD attribute, but it isn\'t a valid relation to an '
+                    'Member field %s configured for '.$attributeName.' AD attribute, but it isn\'t a valid relation to an '
                         . 'Image class',
                     $fieldName
                 )
@@ -667,7 +667,7 @@ 
 
         // Setup variables
         $thumbnailFolder = Folder::find_or_make($member->config()->ldap_thumbnail_path);
-        $filename = sprintf($attributeName . '-%s.jpg', $data['objectguid']);
+        $filename = sprintf($attributeName.'-%s.jpg', $data['objectguid']);
         $filePath = File::join_paths($thumbnailFolder->getFilename(), $filename);
         $fileCfg = [
             // if there's a filename conflict we've got new content so overwrite it.
@@ -760,7 +760,7 @@ 
         }
 
         // 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('"Group_Members"."IsImportedFromLDAP" = 1');
@@ -801,7 +801,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.
@@ -864,7 +864,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);
@@ -908,7 +908,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);
@@ -964,7 +964,7 @@ 
                 $dn = $newDn;
             }
         } catch (Exception $e) {
-            throw new ValidationException('LDAP move failure: ' . $e->getMessage());
+            throw new ValidationException('LDAP move failure: '.$e->getMessage());
         }
 
         try {
@@ -988,7 +988,7 @@ 
 
             $this->update($dn, $attributes);
         } catch (Exception $e) {
-            throw new ValidationException('LDAP synchronisation failure: ' . $e->getMessage());
+            throw new ValidationException('LDAP synchronisation failure: '.$e->getMessage());
         }
     }
 
@@ -1073,7 +1073,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());
             }
         }
     }
@@ -1099,7 +1099,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());
         }
     }
 
@@ -1182,7 +1182,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());
         }
     }