flack / openpsa

lib/org/openpsa/invoices/status.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
     {
         $entries = array_merge($this->get_status_entries(), $this->get_journal_entries());
 
-        usort($entries, function (array $a, array $b) {
+        usort($entries, function(array $a, array $b) {
             if ($a['timestamp'] == $b['timestamp']) {
                 return $b['order'] <=> $a['order'];
             }
@@ -92,8 +92,8 @@ 
                 'order' => 3
             ];
         }
-        if (   $this->invoice->due
-            && (   (   $this->invoice->due < time()
+        if ($this->invoice->due
+            && (($this->invoice->due < time()
                     && $this->invoice->paid == 0)
                 || $this->invoice->due < $this->invoice->paid)) {
             $entries[] = [

lib/org/openpsa/contacts/handler.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
         $prefix = $nap->get_node($this->_topic->id)[MIDCOM_NAV_ABSOLUTEURL];
 
         $tree = new org_openpsa_widgets_tree(org_openpsa_contacts_group_dba::class, 'owner');
-        $tree->link_callback = function (string $guid) use ($prefix) {
+        $tree->link_callback = function(string $guid) use ($prefix) {
             return $prefix . 'group/' . $guid . '/';
         };
         $tree->constraints[] = ['orgOpenpsaObtype', '<', org_openpsa_contacts_group_dba::ORGANIZATION];

lib/org/openpsa/invoices/invoice/pdf.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
             $attachment->update();
         } else {
             $attachment = $this->invoice->create_attachment($filename, $this->invoice->get_label(), "application/pdf");
-            if (   !$attachment
+            if (!$attachment
                 || !$this->invoice->set_parameter("midcom.helper.datamanager2.type.blobs", $name, $attachment->guid . ":" . $attachment->guid)) {
                 throw new midcom_error("Failed to create invoice attachment for pdf: " . midcom_connection::get_error_string());
             }

lib/org/openpsa/invoices/handler/invoice/action.php

Braces +4 added lines, -2 removed lines

@@ -125,7 +125,8 @@ 
         try {
             $pdf_helper->render_and_attach();
             return $this->reply(true, $this->_l10n->get('pdf created'));
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $this->reply(false, $this->_l10n->get('pdf creation failed') . ': ' . $e->getMessage());
         }
     }
@@ -136,7 +137,8 @@ 
         try {
             $pdf_helper->render_and_attach('reminder');
             return $this->reply(true, $this->_l10n->get('reminder pdf created'));
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $this->reply(false, $this->_l10n->get('reminder pdf creation failed') . ': ' . $e->getMessage());
         }
     }    

lib/org/openpsa/user/validator.php

Braces +2 added lines, -2 removed lines

@@ -162,10 +162,10 @@
         $result = [];
 
         $accounthelper = $this->get_accounthelper(new midcom_db_person($fields["person"]));
-        if (!$accounthelper->check_password_reuse($fields['new_password'])){
+        if (!$accounthelper->check_password_reuse($fields['new_password'])) {
             $result['password'] = $this->l10n->get('password was already used');
         }
-        if (!$accounthelper->check_password_strength($fields['new_password'])){
+        if (!$accounthelper->check_password_strength($fields['new_password'])) {
             $result['password'] = $this->l10n->get('password weak');
         }
         return $result ?: true;

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
     {
         $result = $this->is_username_available($fields);
 
-        if (   $fields['password']['switch']
+        if ($fields['password']['switch']
             && !$this->get_accounthelper()->check_password_strength((string) $fields['password']['password'])) {
             $result = ['password' => $this->l10n->get('password weak')];
         }
@@ -162,10 +162,10 @@ 
         $result = [];
 
         $accounthelper = $this->get_accounthelper(new midcom_db_person($fields["person"]));
-        if (!$accounthelper->check_password_reuse($fields['new_password'])){
+        if (!$accounthelper->check_password_reuse($fields['new_password'])) {
             $result['password'] = $this->l10n->get('password was already used');
         }
-        if (!$accounthelper->check_password_strength($fields['new_password'])){
+        if (!$accounthelper->check_password_strength($fields['new_password'])) {
             $result['password'] = $this->l10n->get('password weak');
         }
         return $result ?: true;

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

Braces +4 added lines, -2 removed lines

@@ -50,7 +50,8 @@ 
     {
         try {
             $tmp = midgard_object_class::get_object_by_guid($guid);
-        } catch (mgd_exception $e) {
+        }
+        catch (mgd_exception $e) {
             debug_add('Loading object by GUID ' . $guid . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_INFO);
 
             throw new midcom_error_midgard($e, $guid);
@@ -159,7 +160,8 @@ 
 
         try {
             return $this->get_cached($classname, $parent_guid);
-        } catch (midcom_error) {
+        }
+        catch (midcom_error) {
             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;

Braces +12 added lines, -6 removed lines

@@ -93,7 +93,8 @@ 
         try {
             $this->_backend->index($documents);
             return true;
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             if ($batch) {
                 throw $e;
             }
@@ -122,7 +123,8 @@ 
         try {
             $this->_backend->delete($RIs);
             return true;
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Deleting error: " . $e->getMessage(), MIDCOM_LOG_ERROR);
             return false;
         }
@@ -142,7 +144,8 @@ 
         try {
             $this->_backend->delete_all($constraint);
             return true;
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Deleting error: " . $e->getMessage(), MIDCOM_LOG_ERROR);
             return false;
         }
@@ -175,7 +178,8 @@ 
 
         try {
             $result_raw = $this->_backend->query($query, $filter, $options);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Query error: " . $e->getMessage(), MIDCOM_LOG_ERROR);
             return $result;
         }
@@ -196,7 +200,8 @@ 
             if (!empty($document->topic_guid)) {
                 try {
                     midcom_db_topic::get_cached($document->topic_guid);
-                } catch (midcom_error) {
+                }
+                catch (midcom_error) {
                     // Skip document, the object is hidden.
                     debug_add("Skipping the generic document {$document->title}, its topic seems to be invisible, we cannot proceed.");
                     continue;
@@ -209,7 +214,8 @@ 
                 // Strip language code from end of RI if it looks like "<GUID>_<LANG>"
                 try {
                     midcom::get()->dbfactory->get_object_by_guid(preg_replace('/^([0-9a-f]{32,80})_[a-z]{2}$/', '\\1', $document->RI));
-                } catch (midcom_error) {
+                }
+                catch (midcom_error) {
                     // Skip document, the object is hidden, deleted or otherwise unavailable.
                     //@todo Maybe nonexistent objects should be removed from index?
                     continue;

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);