flack / openpsa

lib/midcom/services/i18n/main.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
         $rawdata = base64_decode($request->cookies->get('midcom_services_i18n'));
         $array = unserialize($rawdata);
 
-        if (   !array_key_exists('language', $array)
+        if (!array_key_exists('language', $array)
             || !array_key_exists('charset', $array)) {
             debug_add("Rejecting cookie, it seems invalid.");
             return false;

Braces +4 added lines, -2 removed lines

@@ -155,7 +155,8 @@ 
     {
         try {
             Locales::getName($lang);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Language {$lang} not found:" . $e->getMessage(), MIDCOM_LOG_ERROR);
             return false;
         }
@@ -236,7 +237,8 @@ 
     {
         try {
             return $this->get_l10n($component)->get($stringid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log(MIDCOM_LOG_WARN);
             return $stringid;
         }

lib/org/openpsa/directmarketing/handler/campaign/rules.php

Braces +2 added lines, -1 removed lines

@@ -99,7 +99,8 @@
         if ($request->request->has('midcom_helper_datamanager2_save')) {
             try {
                 $rules = $this->_load_rules($request);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 midcom::get()->uimessages->add('org.openpsa.directmarketing', $this->_l10n->get($e->getMessage()), 'error');
                 return;
             }

lib/midcom/application.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
             $loader->load($this->getProjectDir() . '/config/services.yml');
         }
         if ($classes = midcom::get_registered_service_classes()) {
-            $loader->load(function (ContainerBuilder $container) use ($classes) {
+            $loader->load(function(ContainerBuilder $container) use ($classes) {
                 foreach ($classes as $id => $class) {
                     $container->findDefinition($id)->setClass($class);
                 }

Braces +6 added lines, -3 removed lines

@@ -161,7 +161,8 @@ 
             $response = $this->handle($request);
             $response->send();
             $this->terminate($request, $response);
-        } catch (Error $e) {
+        }
+        catch (Error $e) {
             $this->getHttpKernel()->terminateWithException($e);
         }
     }
@@ -218,11 +219,13 @@ 
         $this->skip_page_style = true;
         try {
             $response = $this->handle($request, HttpKernelInterface::SUB_REQUEST, false);
-        } catch (midcom_error_notfound | midcom_error_forbidden $e) {
+        }
+        catch (midcom_error_notfound | midcom_error_forbidden $e) {
             $e->log();
             midcom_core_context::leave();
             return;
-        } finally {
+        }
+        finally {
             $this->skip_page_style = $backup;
         }
 

lib/midcom/helper/style.php

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
         $preparsed = midcom_helper_formatter::compile($style);
 
         if (midcom_core_context::get()->has_custom_key('request_data')) {
-            $data =& midcom_core_context::get()->get_custom_key('request_data');
+            $data = & midcom_core_context::get()->get_custom_key('request_data');
         }
 
         try {

Braces +2 added lines, -1 removed lines

@@ -136,7 +136,8 @@
 
         try {
             eval('?>' . $preparsed);
-        } catch (ParseError $e) {
+        }
+        catch (ParseError $e) {
             throw new midcom_error("Failed to parse style element '{$path}': " . $e->getMessage() . ' in line ' . $e->getLine());
         }
     }

src/midcom/templating/loader.php

Spacing +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
 
     private function resolve_includes(string $content) : string
     {
-        return preg_replace_callback("/<\\(([a-zA-Z0-9 _-]+)\\)>/", function (array $matches) {
+        return preg_replace_callback("/<\\(([a-zA-Z0-9 _-]+)\\)>/", function(array $matches) {
             $element = $matches[1];
 
             switch ($element) {

lib/midcom/services/cache/main.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
     {
         if (!isset($this->_modules[$name])) {
             $this->_modules[$name] = $module;
-            $this->$name =& $this->_modules[$name];
+            $this->$name = & $this->_modules[$name];
         }
     }
 

lib/net/nehmer/comments/handler/view.php

Spacing +10 added lines, -10 removed lines

@@ -98,8 +98,8 @@ 
         if (!$this->_schemadb) {
             $this->_schemadb = schemadb::from_path($this->_config->get('schemadb'));
 
-            if (   $this->_config->get('use_captcha')
-                || (   !midcom::get()->auth->user
+            if ($this->_config->get('use_captcha')
+                || (!midcom::get()->auth->user
                     && $this->_config->get('use_captcha_if_anonymous'))) {
                 $fields = $this->_schemadb->get('comment')->get('fields');
                 $fields['captcha'] = [
@@ -112,7 +112,7 @@ 
                 $this->_schemadb->get('comment')->set('fields', $fields);
             }
 
-            if (   $this->_config->get('ratings_enable')
+            if ($this->_config->get('ratings_enable')
                 && $this->_schemadb->get('comment')->has_field('rating')) {
                 $this->_schemadb->get('comment')->get_field('rating')['hidden'] = false;
             }
@@ -191,7 +191,7 @@ 
             $this->_comments = $this->_comments->execute();
         }
 
-        if (   midcom::get()->auth->user
+        if (midcom::get()->auth->user
             || $this->_config->get('allow_anonymous')) {
             $this->_init_post_controller($request);
             if ($response = $this->_process_post($request)) {
@@ -222,7 +222,7 @@ 
      */
     private function _process_post(Request $request)
     {
-        if (   !midcom::get()->auth->user
+        if (!midcom::get()->auth->user
             && !midcom::get()->auth->request_sudo('net.nehmer.comments')) {
             throw new midcom_error('We were anonymous but could not acquire SUDO privileges, aborting');
         }
@@ -235,7 +235,7 @@ 
                 }
 
                 $formdata = $this->_post_controller->get_form_values();
-                if (   $formdata['subscribe']
+                if ($formdata['subscribe']
                     && midcom::get()->auth->user) {
                     // User wants to subscribe to receive notifications about this comments thread
 
@@ -269,7 +269,7 @@ 
      */
     private function _get_last_modified() : int
     {
-        return array_reduce($this->_comments, function ($carry, net_nehmer_comments_comment $item) {
+        return array_reduce($this->_comments, function($carry, net_nehmer_comments_comment $item) {
             return max($item->metadata->revised, $carry);
         }, 0);
     }
@@ -291,8 +291,8 @@ 
                 $data['comment_toolbar'] = $this->populate_post_toolbar($comment);
                 midcom_show_style('comments-item');
 
-                if (   midcom::get()->auth->admin
-                    || (   midcom::get()->auth->user
+                if (midcom::get()->auth->admin
+                    || (midcom::get()->auth->user
                         && $comment->can_do('midgard:delete'))) {
                     midcom_show_style('comments-admintoolbar');
                 }
@@ -302,7 +302,7 @@ 
             midcom_show_style('comments-nonefound');
         }
 
-        if (   midcom::get()->auth->user
+        if (midcom::get()->auth->user
             || $this->_config->get('allow_anonymous')) {
             midcom_show_style('post-comment');
         } else {

lib/net/nehmer/blog/handler/index.php

Braces +2 added lines, -1 removed lines

@@ -409,7 +409,8 @@
             foreach ($this->_articles as $article_counter => $article) {
                 try {
                     $data['datamanager']->set_storage($article);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                     continue;
                 }

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 
     private function _process_category_constraint(org_openpsa_qbpager $qb)
     {
-        if (   !in_array($this->category, $this->_request_data['categories'])
+        if (!in_array($this->category, $this->_request_data['categories'])
             && !$this->_config->get('categories_custom_enable')) {
             throw new midcom_error('Custom categories are not allowed');
             // TODO: Check here if there are actually items in this cat?
@@ -88,7 +88,7 @@ 
         midcom::get()->head->set_pagetitle($this->_request_data['page_title']);
 
         // Activate correct leaf
-        if (   $this->_config->get('show_navigation_pseudo_leaves')
+        if ($this->_config->get('show_navigation_pseudo_leaves')
             && in_array($this->category, $this->_request_data['categories'])) {
             $this->set_active_leaf($this->_topic->id . '_CAT_' . $this->category);
         }

lib/midcom/services/auth/acl.php

Spacing +2 added lines, -2 removed lines

@@ -568,10 +568,10 @@
         }
 
         //owner privileges override everything but person privileges, so we have to cross-check those here
-        if (   $privilegename != 'midgard:owner'
+        if ($privilegename != 'midgard:owner'
             && $last_scope < MIDCOM_PRIVILEGE_SCOPE_OWNER) {
             $owner_privileges = $this->get_owner_default_privileges();
-            if (    array_key_exists($privilegename, $owner_privileges)
+            if (array_key_exists($privilegename, $owner_privileges)
                  && $this->_load_content_privilege('midgard:owner', $guid, $class, $user_id)
                  && self::$_content_privileges_cache[$cache_id]['midgard:owner']) {
                 self::$_content_privileges_cache[$cache_id][$privilegename] = ($owner_privileges[$privilegename] == MIDCOM_PRIVILEGE_ALLOW);

Indentation +9 added lines, -9 removed lines

@@ -253,15 +253,15 @@
     private static array $_default_magic_class_privileges = [];
 
     /**
-    * Internal cache of the content privileges of users on content objects, this is
-    * an associative array using a combination of the user identifier and the object's
-    * guid as index. The privileges for the anonymous user use the magic
-    * EVERYONE as user identifier.
-    *
-    * This must not be merged with the class-wide privileges_cache, because otherwise
-    * class_default_privileges for child objects might be overridden by parent default
-    * privileges
-    */
+     * Internal cache of the content privileges of users on content objects, this is
+     * an associative array using a combination of the user identifier and the object's
+     * guid as index. The privileges for the anonymous user use the magic
+     * EVERYONE as user identifier.
+     *
+     * This must not be merged with the class-wide privileges_cache, because otherwise
+     * class_default_privileges for child objects might be overridden by parent default
+     * privileges
+     */
     private static array $_content_privileges_cache = [];
 
     /**