flack / openpsa

lib/midcom/helper/toolbar.php

Spacing +16 added lines, -16 removed lines

@@ -223,7 +223,7 @@ 
      * @see midcom_helper_toolbar::_check_index()
      * @see midcom_helper_toolbar::clean_item()
      */
-    public function add_item(array $item, string|int $before = -1)
+    public function add_item(array $item, string | int $before = -1)
     {
         if ($before != -1) {
             $before = $this->_check_index($before, false);
@@ -249,7 +249,7 @@ 
      *     it before a URL, an integer will insert it before a
      *     given index.
      */
-    public function add_items(array $items, string|int $before = -1)
+    public function add_items(array $items, string | int $before = -1)
     {
         foreach ($items as $item) {
             $this->add_item($item, $before);
@@ -279,7 +279,7 @@ 
 
         $item = array_replace($defaults, $item);
 
-        if (   !empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
+        if (!empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
             && !array_key_exists($item[MIDCOM_TOOLBAR_ACCESSKEY], $used_access_keys)) {
             // We have valid access key, add it to help text
             $prefix = 'Alt-';
@@ -304,7 +304,7 @@ 
     private function set_url(array &$item, string $url)
     {
         $item[MIDCOM_TOOLBAR__ORIGINAL_URL] = $url;
-        if (   (   empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
+        if ((empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
                 // Some items may want to keep their links unmutilated
                 || $item[MIDCOM_TOOLBAR_OPTIONS]["rel"] != "directlink")
             && !str_starts_with($url, '/')
@@ -323,13 +323,13 @@ 
      * @see midcom_helper_toolbar::get_index_from_url()
      * @see midcom_helper_toolbar::_check_index()
      */
-    public function remove_item(string|int $index)
+    public function remove_item(string | int $index)
     {
         $index = $this->_check_index($index);
 
         if ($index == 0) {
             array_shift($this->items);
-        } elseif ($index == count($this->items) -1) {
+        } elseif ($index == count($this->items) - 1) {
             array_pop($this->items);
         } else {
             $this->items = array_merge(array_slice($this->items, 0, $index),
@@ -350,7 +350,7 @@ 
      *
      * @param string|int $index The integer index or URL of the item to enable.
      */
-    public function enable_item(string|int $index)
+    public function enable_item(string | int $index)
     {
         $index = $this->_check_index($index);
         $this->items[$index][MIDCOM_TOOLBAR_ENABLED] = true;
@@ -361,7 +361,7 @@ 
      *
      * @param string|int $index The integer index or URL of the item to disable.
      */
-    public function disable_item(string|int $index)
+    public function disable_item(string | int $index)
     {
         $index = $this->_check_index($index, false);
 
@@ -375,7 +375,7 @@ 
      *
      * @param string|int $index The integer index or URL of the item to hide.
      */
-    public function hide_item(string|int $index)
+    public function hide_item(string | int $index)
     {
         $index = $this->_check_index($index, false);
 
@@ -389,7 +389,7 @@ 
      *
      * @param string|int $index The integer index or URL of the item to show.
      */
-    public function show_item(string|int $index)
+    public function show_item(string | int $index)
     {
         $index = $this->_check_index($index);
         $this->items[$index][MIDCOM_TOOLBAR_HIDDEN] = false;
@@ -403,7 +403,7 @@ 
      * @see midcom_helper_toolbar::_check_index()
      * @see midcom_helper_toolbar::add_item()
      */
-    public function update_item_url(string|int $index, string $url)
+    public function update_item_url(string | int $index, string $url)
     {
         $index = $this->_check_index($index);
         $this->set_url($this->items[$index], $url);
@@ -414,7 +414,7 @@ 
      */
     public function render() : string
     {
-        $visible_items = array_filter($this->items, function ($item) {
+        $visible_items = array_filter($this->items, function($item) {
             return !$item[MIDCOM_TOOLBAR_HIDDEN];
         });
         $this->rendered = true;
@@ -480,7 +480,7 @@ 
             // Try finding uppercase version of the accesskey first
             $accesskey = strtoupper($item[MIDCOM_TOOLBAR_ACCESSKEY]);
             $position = strpos($label, $accesskey);
-            if (   $position === false
+            if ($position === false
                 && midcom::get()->i18n->get_current_language() == 'en') {
                 // Try lowercase, too
                 $accesskey = strtolower($accesskey);
@@ -540,7 +540,7 @@ 
             $attributes['title'] = $item[MIDCOM_TOOLBAR_HELPTEXT];
         }
 
-        if (   $item[MIDCOM_TOOLBAR_ENABLED]
+        if ($item[MIDCOM_TOOLBAR_ENABLED]
             && $item[MIDCOM_TOOLBAR_ACCESSKEY] !== null) {
             $attributes['class'] = 'accesskey';
             $attributes['accesskey'] = $item[MIDCOM_TOOLBAR_ACCESSKEY];
@@ -591,7 +591,7 @@ 
     public function get_index_from_url(string $url) : ?int
     {
         foreach ($this->items as $i => $item) {
-            if (   $item[MIDCOM_TOOLBAR_URL] == $url
+            if ($item[MIDCOM_TOOLBAR_URL] == $url
                 || $item[MIDCOM_TOOLBAR__ORIGINAL_URL] == $url) {
                 return $i;
             }
@@ -609,7 +609,7 @@ 
      *
      * @param string|int $index The integer index or URL to check
      */
-    protected function _check_index(string|int $index, bool $raise_error = true) :?int
+    protected function _check_index(string | int $index, bool $raise_error = true) : ?int
     {
         if (is_string($index)) {
             $url = $index;

lib/midcom/helper/reflector/main.php

Spacing +5 added lines, -5 removed lines

@@ -51,7 +51,7 @@ 
      *
      * @return static
      */
-    public static function get(string|object $src) : self
+    public static function get(string | object $src) : self
     {
         $identifier = get_called_class() . (is_object($src) ? get_class($src) : $src);
 
@@ -286,7 +286,7 @@ 
 
         $label_prop = $this->get_label_property();
 
-        if (    $label_prop != 'guid'
+        if ($label_prop != 'guid'
              && $this->property_exists($label_prop)) {
             $search_properties[$label_prop] = true;
         }
@@ -336,7 +336,7 @@ 
                 continue;
             }
 
-            if (   !$this->is_link($property)
+            if (!$this->is_link($property)
                 && $this->get_midgard_type($property) != MGD_TYPE_GUID) {
                 continue;
             }
@@ -370,7 +370,7 @@ 
     protected static function class_rewrite(string $schema_type) : string
     {
         $extends = midcom_baseclasses_components_configuration::get('midcom.helper.reflector', 'config')->get_array('class_extends');
-        if (   isset($extends[$schema_type])
+        if (isset($extends[$schema_type])
             && class_exists($extends[$schema_type])) {
             return $extends[$schema_type];
         }
@@ -390,7 +390,7 @@ 
     /**
      * Get the MgdSchema classname for given class
      */
-    public static function resolve_baseclass(string|object $classname) : string
+    public static function resolve_baseclass(string | object $classname) : string
     {
         static $cached = [];
 

lib/midcom/helper/_dbfactory.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
 
             throw new midcom_error_midgard($e, $guid);
         }
-        if (   get_class($tmp) == 'midgard_person'
+        if (get_class($tmp) == 'midgard_person'
             && $this->person_class != 'midgard_person') {
             $tmp = new $this->person_class($guid);
         }
@@ -67,7 +67,7 @@ 
      *
      * @param string $classname Which DBA are we dealing with
      */
-    public function get_cached(string $classname, string|int $src) : midcom_core_dbaobject
+    public function get_cached(string $classname, string | int $src) : midcom_core_dbaobject
     {
         static $cache = [];
 
@@ -84,7 +84,7 @@ 
         }
         $object = new $classname($src);
         $cache[$classname][$object->guid] = $object;
-        $cache[$classname][$object->id] =& $cache[$classname][$object->guid];
+        $cache[$classname][$object->id] = & $cache[$classname][$object->guid];
         return $cache[$classname][$object->guid];
     }
 
@@ -131,7 +131,7 @@ 
             return true;
         }
 
-        if (   isset($object->__object)
+        if (isset($object->__object)
             && is_object($object->__object)
             && $object->__object instanceof $class) {
             // Decorator whose MgdSchema object matches
@@ -154,7 +154,7 @@ 
             return $this->get_parent_data_uncached($object);
         });
 
-        if (   empty($parent_guid)
+        if (empty($parent_guid)
             || $parent_guid === $object->guid) {
             return null;
         }

lib/midcom/services/indexer/main.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
      *
      * @return boolean Indicating success.
      */
-    public function index(midcom_services_indexer_document|array $documents) : bool
+    public function index(midcom_services_indexer_document | array $documents) : bool
     {
         if ($this->_disabled) {
             return true;

lib/midcom/services/auth/main.php

Spacing +3 added lines, -3 removed lines

@@ -203,7 +203,7 @@ 
             return true;
         }
         if ($user === null) {
-            $user =& $this->user;
+            $user = & $this->user;
         }
 
         if ($user == 'EVERYONE') {
@@ -274,7 +274,7 @@ 
      *
      * It always returns true for administrative users.
      */
-    public function is_group_member(midcom_core_group|string $group, midcom_core_user $user = null) : bool
+    public function is_group_member(midcom_core_group | string $group, midcom_core_user $user = null) : bool
     {
         if ($this->is_admin($user)) {
             // Administrators always have access.
@@ -519,7 +519,7 @@ 
      * (group:...), any valid identifier for the midcom_core_group
      * constructor or a valid object of that type.
      */
-    public function get_group(string|int|midcom_db_group|midgard_group $id) : ?midcom_core_group
+    public function get_group(string | int | midcom_db_group | midgard_group $id) : ?midcom_core_group
     {
         $param = $id;
 

lib/midcom/services/dbclassloader.php

Spacing +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
      * Get a MidCOM DB class name for a MgdSchema Object.
      * We also ensure that the corresponding component has been loaded.
      */
-    public function get_midcom_class_name_for_mgdschema_object(string|object $classname) : ?string
+    public function get_midcom_class_name_for_mgdschema_object(string | object $classname) : ?string
     {
         static $dba_classes_by_mgdschema = [];
 
@@ -157,7 +157,7 @@ 
      * Simple helper to check whether we are dealing with a MidCOM Database object
      * or a subclass thereof.
      */
-    public function is_midcom_db_object(object|string $object) : bool
+    public function is_midcom_db_object(object | string $object) : bool
     {
         return is_subclass_of($object, midcom_core_dbaobject::class)
             || is_a($object, midcom_core_dbaproxy::class, true);

lib/midcom/core/user.php

Spacing +2 added lines, -2 removed lines

@@ -417,7 +417,7 @@ 
      * 2. A group string identifier, matching the regex ^group:
      * 3. A valid midcom group name
      */
-    public function is_in_group(midcom_core_group|string $group) : bool
+    public function is_in_group(midcom_core_group | string $group) : bool
     {
         if ($this->_all_groups === null) {
             $this->_load_all_groups();
@@ -475,7 +475,7 @@ 
 
         $timeout = midcom::get()->config->get('auth_login_session_timeout', 0);
         $last_seen = $person->get_parameter('midcom', 'online');
-        if (   !$last_seen
+        if (!$last_seen
             || ($timeout > 0 && time() - $timeout > $last_seen)) {
             return 'offline';
         }

lib/midcom/core/dbaproxy.php

Spacing +2 added lines, -2 removed lines

@@ -22,11 +22,11 @@
     /**
      * MidCOM DBA object identifier, can be ID or GUID
      */
-    private string|int $__identifier;
+    private string | int $__identifier;
 
     private bool $__tried_to_load = false;
 
-    public function __construct(string|int $identifier, string $classname)
+    public function __construct(string | int $identifier, string $classname)
     {
         $this->__midcom_class_name__ = $classname;
         $this->__identifier = $identifier;

lib/midcom/core/privilege.php

Spacing +5 added lines, -5 removed lines

@@ -75,7 +75,7 @@ 
      * The Default constructor creates an empty privilege, if you specify
      * another privilege object in the constructor, a copy is constructed.
      */
-    public function __construct(midcom_core_privilege_db|array|string $src = null)
+    public function __construct(midcom_core_privilege_db | array | string $src = null)
     {
         if (is_array($src)) {
             // Store given values to our privilege array
@@ -210,7 +210,7 @@ 
      * - Any midcom_core_user or midcom_core_group object or subtype thereof.
      * - Any string identifier which can be resolved using midcom_services_auth::get_assignee().
      */
-    public function set_assignee(midcom_core_group|midcom_core_user|string $assignee) : bool
+    public function set_assignee(midcom_core_group | midcom_core_user | string $assignee) : bool
     {
         if (is_string($assignee)) {
             if ($this->is_magic_assignee($assignee)) {
@@ -266,12 +266,12 @@ 
             }
         }
 
-        if (   !$this->is_magic_assignee()
+        if (!$this->is_magic_assignee()
             && !$this->get_assignee()) {
             debug_add("The assignee identifier '{$this->assignee}' is invalid.", MIDCOM_LOG_INFO);
             return false;
         }
-        if (   $this->assignee == 'OWNER'
+        if ($this->assignee == 'OWNER'
             && $this->privilegename == 'midgard:owner') {
             debug_add("Tried to assign midgard:owner to the OWNER magic assignee, this is invalid.", MIDCOM_LOG_INFO);
             return false;
@@ -283,7 +283,7 @@ 
                 MIDCOM_LOG_INFO);
             return false;
         }
-        if (   !$object->can_do('midgard:update')
+        if (!$object->can_do('midgard:update')
             || !$object->can_do('midgard:privileges')) {
             debug_add("Insufficient privileges on the content object with the GUID '{$this->__guid}', midgard:update and midgard:privileges required.",
                 MIDCOM_LOG_INFO);