Merge pull request #87 from pajavyskocil/asserts

Using expression in asserts

Author: vyskocilpavel

CHANGELOG.md

@@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
 - getFacilitiesByEntityId marked as deprecated (getFacilityByEntityId should be used instead)
 - Using of getFacilityByEntityId instead of getFacilitiesByEntityId
 - Filters JoinGroupsAdnEduPersonEntitlement and PerunGroups merged into PerunEntitlement
+- Using expression in asserts (String in assert() is DEPRECATED from PHP 7.2)
 
 #### Fixed
 - Fixed wrong dictionary name in post.php

lib/Auth/Process/ForceAup.php

@@ -102,7 +102,7 @@ public function __construct($config, $reserved)
      */
     public function process(&$request)
     {
-        assert('is_array($request)');
+        assert(is_array($request));
 
         if (isset($request['perun']['user'])) {
             /** allow IDE hint whisperer

lib/Auth/Process/IdPAttribute.php

@@ -20,7 +20,7 @@ public function __construct($config, $reserved)
     {
         parent::__construct($config, $reserved);
 
-        assert('is_array($config)');
+        assert(is_array($config));
 
         if (!isset($config['attrMap'])) {
             throw new Exception(
@@ -33,7 +33,7 @@ public function __construct($config, $reserved)
 
     public function process(&$request)
     {
-        assert('is_array($request)');
+        assert(is_array($request));
 
         $metadataHandler = MetaDataStorageHandler::getMetadataHandler();
         $sourceIdpMeta = $metadataHandler->getMetaData($request['saml:sp:IdP'], 'saml20-idp-remote');

lib/Auth/Process/PerunAttributes.php

@@ -35,7 +35,7 @@ public function __construct($config, $reserved)
     {
         parent::__construct($config, $reserved);
 
-        assert('is_array($config)');
+        assert(is_array($config));
 
         if (!isset($config['attrMap'])) {
             throw new Exception(
@@ -61,7 +61,7 @@ public function __construct($config, $reserved)
 
     public function process(&$request)
     {
-        assert('is_array($request)');
+        assert(is_array($request));
 
         if (isset($request['perun']['user'])) {
             $user = $request['perun']['user'];

lib/Auth/Process/PerunIdentity.php

@@ -175,7 +175,7 @@ public function __construct($config, $reserved)
 
     public function process(&$request)
     {
-        assert('is_array($request)');
+        assert(is_array($request));
 
         # Store all user ids in an array
         $uids = [];

lib/Auth/Process/ProcessTargetedID.php

@@ -24,7 +24,7 @@ public function __construct($config, $reserved)
     {
         parent::__construct($config, $reserved);
 
-        assert('is_array($config)');
+        assert(is_array($config));
 
         if (!isset($config['uidsAttr'])) {
             throw new Exception(
@@ -43,7 +43,7 @@ public function __construct($config, $reserved)
 
     public function process(&$request)
     {
-        assert('is_array($request)');
+        assert(is_array($request));
 
         # Iterate through provided attributes and simply get first value
         $uid = "";

lib/Auth/Process/ProxyFilter.php

@@ -59,7 +59,7 @@ public function __construct($config, $reserved)
 
     public function process(&$request)
     {
-        assert('is_array($request)');
+        assert(is_array($request));
 
         foreach ($this->filterAttributes as $attr => $values) {
             if (!isset($request['Attributes'][$attr]) || !is_array($request['Attributes'][$attr])) {

lib/Auth/Process/RemoveAllAttributes.php

@@ -28,7 +28,7 @@ public function __construct($config, $reserved)
 
     public function process(&$request)
     {
-        assert('is_array($request)');
+        assert(is_array($request));
 
         $attributes = [];
 

lib/Auth/Process/RetainIdPEntityID.php

@@ -34,7 +34,7 @@ public function __construct($config, $reserved)
 
     public function process(&$request)
     {
-        assert('is_array($request)');
+        assert(is_array($request));
 
         if (isset($request['Source']['entityid'])) {
             $entityId = $request['Source']['entityid'];

lib/Auth/Process/StringifyTargetedID.php

@@ -25,7 +25,7 @@ public function __construct($config, $reserved)
     {
         parent::__construct($config, $reserved);
 
-        assert('is_array($config)');
+        assert(is_array($config));
 
         if (!isset($config['uidAttr'])) {
             throw new Exception(
@@ -42,7 +42,7 @@ public function __construct($config, $reserved)
 
     public function process(&$request)
     {
-        assert('is_array($request)');
+        assert(is_array($request));
 
         if (!empty($request['Attributes'][$this->uidAttr])) {
             $stringified = $this->stringify($request['Attributes'][$this->uidAttr][0]);