Merge pull request #59 from BaranekD/arrays

Using of short array syntax

Author: vyskocilpavel

CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 #### Added
 - Added filter JoinGroupsAndEduPersonEntitlement
 
+#### Changed
+- Using of short array syntax (from array() to [])
+
 #### Fixed
 - Fixed the problem that IDP filter on WAYF didn't work correctly
 

config-templates/module_discopower.php

@@ -3,7 +3,7 @@
  * Configuration for the DiscoPower module.
  */
 
-$config = array(
+$config = [
 
     // Which tab should be set as default. 0 is the first tab
     'defaulttab' => 0,
@@ -12,11 +12,11 @@
      * List a set of tags (Tabs) that should be listed in a specific order.
      * All other available tabs will be listed after the ones specified below.
      */
-    'taborder' => array('social, misc'),
+    'taborder' => ['social, misc'],
     /*
      * the 'tab' parameter allows you to limit the tabs to a specific list. (excluding unlisted tags)
      *
-     * 'tabs' => array('norway', 'finland'),
+     * 'tabs' => ['norway', 'finland'],
      */
 
     /*
@@ -42,4 +42,4 @@
      */
     'cdc.lifetime' => null,
 
-);
+];

config-templates/module_perun.php

@@ -7,7 +7,7 @@
  * copy command (from SimpleSAML base dir)
  * cp modules/perun/module_perun.php config/
  */
-$config = array(
+$config = [
 
     /**
      * base url to rpc with slash at the end.
@@ -99,12 +99,12 @@
      * OPTIONAL
      * Default: show all received services
      */
-    'status.shown_services'=> array(
-        'serviceIdentifier' => array(
+    'status.shown_services'=> [
+        'serviceIdentifier' => [
             'name' => 'serviceName',
             'description' => 'serviceDescription'
-        ),
-    ),
+        ],
+    ],
 
     /**
      ****************************************
@@ -155,9 +155,9 @@
     /**
      * Specify list of facility attributes, which will be shown
      */
-    'listOfSps.attributesDefinitions' => array(
+    'listOfSps.attributesDefinitions' => [
         ''
-    ),
+    ],
 
 
-);
+];

config-templates/module_perun_getMetadata.php

@@ -1,6 +1,6 @@
 <?php
 
-$config = array(
+$config = [
     /**
      * Identifier of Proxy
      */
@@ -24,8 +24,8 @@
     /**
      * List of attributes definitions
      */
-    'attributesDefinitions' => array(
+    'attributesDefinitions' => [
         // Name of attribute from perun => key which will be used in generated metadata
         'perunAttrName' => 'metadataName',
-    ),
-);
+    ],
+];

config-templates/module_perun_idpListsServiceDB.php

@@ -5,7 +5,7 @@
  *
  * @author Pavel Vyskočil <[email protected]>
  */
-$config = array(
+$config = [
 
     /*
      * Fill the serverName
@@ -75,4 +75,4 @@
      */
     'ssl_ca_path' => '/etc/ssl',
 
-);
+];

config-templates/processFilterConfigurations-example.md

@@ -2,12 +2,12 @@
 
 Example how to configure PerunIdentity module:
 ```php
-24 => array(
+24 => [
         'class' => 'perun:ProxyFilter',
         'filterSPs' => $perunEntityIds,
-        'config' => array(
+        'config' => [
                 'class' => 'perun:PerunIdentity',
-                'uidsAttr' => array('eduPersonUniqueId', 'eduPersonPrincipalName', 'eduPersonTargetedIDString', 'nameid', 'uid'),
+                'uidsAttr' => ['eduPersonUniqueId', 'eduPersonPrincipalName', 'eduPersonTargetedIDString', 'nameid', 'uid'],
                 'voShortName' => 'einfra',
                 'registerUrlBase' => 'https://perun.cesnet.cz/allfed/registrar',
                 'registerUrl' => 'https://login.cesnet.cz/register',
@@ -17,8 +17,8 @@ Example how to configure PerunIdentity module:
                 'facilityDynamicRegistrationAttr' => 'urn:perun:facility:attribute-def:def:dynamicRegistration',
                 'facilityRegisterUrlAttr' => 'urn:perun:facility:attribute-def:def:registerUrl',
                 'facilityAllowRegistrationToGroups' => 'urn:perun:facility:attribute-def:def:allowRegistration',
-        ),
-),
+        ],
+],
 ```
 
 
@@ -27,12 +27,12 @@ Example how to configure PerunIdentity module:
 Example how to enable filter IdPAttribute:
 
 ```php
-29 => array(
+29 => [
         'class' => 'perun:IdPAttribute',
-        'attrMap' => array(
+        'attrMap' => [
                 'OrganizationName:en' => 'idp_organizationName',
-        ),
-),
+        ],
+],
 ```
 
 'OrganizationName:en' => 'idp_organizationName' means that the $IdPMetadata['Organization']['en'] will be save into 
@@ -77,10 +77,10 @@ $request['Attributes']['idp_organizationName']
 Example how to enable filter ForceAup:
 
 ```php
-40 => array(
+40 => [
     'class' => 'perun:ProxyFilter',
     'filterSPs' => $perunEntityIds,
-    'config' => array(
+    'config' => [
         'class' => 'perun:ForceAup',
         'uidAttr' => 'uid',
         'interface' => 'rpc',
@@ -89,8 +89,8 @@ Example how to enable filter ForceAup:
         'perunVoAupAttr' => 'urn:perun:vo:attribute-def:def:aup',
         'perunFacilityReqAupsAttr' => 'urn:perun:facility:attribute-def:def:reqAups',
         'facilityVoShortNames' => 'urn:perun:facility:attribute-def:virt:voShortNames'
-    ),
-),   
+    ],
+],   
 ``` 
 
 3.Fill the attributes and set list of required Aups (attr reqAups) and voShortNames (optional) for each facility

lib/Adapter.php

@@ -182,8 +182,8 @@ abstract public function getMemberStatusByUserAndVo($user, $vo);
      */
     protected function removeDuplicateEntities($entities)
     {
-        $removed = array();
-        $ids = array();
+        $removed = [];
+        $ids = [];
         foreach ($entities as $entity) {
             if (!in_array($entity->getId(), $ids)) {
                 array_push($ids, $entity->getId());

lib/AdapterLdap.php

@@ -68,7 +68,7 @@ public function getPerunUser($idpEntityId, $uids)
         $user = $this->connector->searchForEntity(
             "ou=People," . $this->ldapBase,
             "(|$query)",
-            array("perunUserId", "displayName", "cn", "givenName", "sn", "preferredMail", "mail")
+            ["perunUserId", "displayName", "cn", "givenName", "sn", "preferredMail", "mail"]
         );
         if (is_null($user)) {
             return $user;
@@ -90,10 +90,10 @@ public function getMemberGroups($user, $vo)
         $userWithMembership = $this->connector->searchForEntity(
             "perunUserId=$userId,ou=People," . $this->ldapBase,
             "(objectClass=perunUser)",
-            array("perunUserId", "memberOf")
+            ["perunUserId", "memberOf"]
         );
 
-        $groups = array();
+        $groups = [];
         foreach ($userWithMembership['memberOf'] as $groupDn) {
             $voId = explode('=', explode(',', $groupDn)[1], 2)[1];
             if ($voId != $vo->getId()) {
@@ -103,7 +103,7 @@ public function getMemberGroups($user, $vo)
             $group = $this->connector->searchForEntity(
                 $groupDn,
                 "(objectClass=perunGroup)",
-                array("perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description")
+                ["perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description"]
             );
             array_push(
                 $groups,
@@ -125,17 +125,17 @@ public function getSpGroups($spEntityId)
         $resources = $this->connector->searchForEntities(
             $this->ldapBase,
             "(&(objectClass=perunResource)(entityID=$spEntityId))",
-            array("perunResourceId", "assignedGroupId", "perunVoId")
+            ["perunResourceId", "assignedGroupId", "perunVoId"]
         );
 
-        $groups = array();
+        $groups = [];
         foreach ($resources as $resource) {
             if (isset($resource['assignedGroupId'])) {
                 foreach ($resource['assignedGroupId'] as $groupId) {
                     $group = $this->connector->searchForEntity(
                         "perunGroupId=$groupId,perunVoId=" . $resource['perunVoId'][0] . "," . $this->ldapBase,
                         "(objectClass=perunGroup)",
-                        array("perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description")
+                        ["perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description"]
                     );
                     array_push(
                         $groups,
@@ -161,7 +161,7 @@ public function getGroupByName($vo, $name)
         $group = $this->connector->searchForEntity(
             "perunVoId=$voId," . $this->ldapBase,
             "(&(objectClass=perunGroup)(perunUniqueGroupName=$name))",
-            array("perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description")
+            ["perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description"]
         );
         if (is_null($group)) {
             throw new Exception(
@@ -182,7 +182,7 @@ public function getVoByShortName($voShortName)
         $vo = $this->connector->searchForEntity(
             $this->ldapBase,
             "(&(objectClass=perunVo)(o=$voShortName))",
-            array("perunVoId", "o", "description")
+            ["perunVoId", "o", "description"]
         );
         if (is_null($vo)) {
             throw new Exception("Vo with name: $vo does not exists in Perun LDAP.");
@@ -196,7 +196,7 @@ public function getVoById($id)
         $vo = $this->connector->searchForEntity(
             $this->ldapBase,
             "(&(objectClass=perunVo)(perunVoId=$id))",
-            array("o", "description")
+            ["o", "description"]
         );
         if (is_null($vo)) {
             throw new Exception("Vo with id: $id does not exists in Perun LDAP.");
@@ -277,7 +277,7 @@ public function getUsersGroupsOnFacility($spEntityId, $userId)
         $resources = $this->connector->searchForEntities(
             $this->ldapBase,
             "(&(objectClass=perunResource)(entityID=$spEntityId))",
-            array("perunResourceId")
+            ["perunResourceId"]
         );
         Logger::debug("Resources - " . var_export($resources, true));
 
@@ -292,11 +292,11 @@ public function getUsersGroupsOnFacility($spEntityId, $userId)
         }
         $resourcesString .= ")";
 
-        $resultGroups = array();
+        $resultGroups = [];
         $groups = $this->connector->searchForEntities(
             $this->ldapBase,
             "(&(uniqueMember=perunUserId=" . $userId . ", ou=People," . $this->ldapBase . ")" . $resourcesString . ")",
-            array("perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description")
+            ["perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description"]
         );
 
         foreach ($groups as $group) {
@@ -322,7 +322,7 @@ public function getMemberStatusByUserAndVo($user, $vo)
             $this->ldapBase,
             "(&(objectClass=perunGroup)(cn=members)(perunVoId=" . $vo->getId() .
             ")(uniqueMember=perunUserId=" . $user->getId() . ", ou=People," . $this->ldapBase . "))",
-            array("perunGroupid")
+            ["perunGroupid"]
         );
 
         if ($groupId === null || empty($groupId)) {