flack / openpsa

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

@@ -165,7 +165,8 @@ 
             $response = $this->handle($this->request);
             $response->send();
             $this->terminate($this->request, $response);
-        } catch (Error $e) {
+        }
+        catch (Error $e) {
             $this->getHttpKernel()->terminateWithException($e);
         }
     }
@@ -222,14 +223,16 @@ 
         $this->skip_page_style = true;
         try {
             $response = $this->handle($request, HttpKernelInterface::SUB_REQUEST, false);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             if ($e instanceof midcom_error_notfound || $e instanceof midcom_error_forbidden) {
                 $e->log();
                 midcom_core_context::leave();
                 return;
             }
             throw $e;
-        } finally {
+        }
+        finally {
             $this->skip_page_style = $backup;
         }
 

lib/midcom/db/style.php

Braces +2 added lines, -1 removed lines

@@ -45,7 +45,8 @@
                     break;
                 }
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
         }
 
         $path_parts = array_reverse($path_parts);

lib/midcom/helper/style.php

Braces +4 added lines, -2 removed lines

@@ -159,7 +159,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());
         }
     }
@@ -180,7 +181,8 @@ 
             if ($root_topic->style) {
                 $db_style = midcom_db_style::id_from_path($root_topic->style);
             }
-        } catch (midcom_error_forbidden $e) {
+        }
+        catch (midcom_error_forbidden $e) {
             $e->log();
         }
 

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 {

lib/midcom/helper/formatter.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
      */
     public static function compile(string $content) : string
     {
-        return preg_replace_callback("%&\(([^)]*)\);%i", function ($variable)
+        return preg_replace_callback("%&\(([^)]*)\);%i", function($variable)
         {
             $variable_parts = explode(':', $variable[1]);
             $variable = '$' . $variable_parts[0];
@@ -62,7 +62,7 @@ 
                 $variable = $parts[0] . '->' . $parts[1];
             }
 
-            if (    isset($variable_parts[1])
+            if (isset($variable_parts[1])
                 && array_key_exists($variable_parts[1], self::$_filters)) {
                     switch ($variable_parts[1]) {
                         case 's':

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/midgard/admin/asgard/handler/object/permissions.php

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
         $tmp = $this->_object;
 
         $i = 0;
-        while (   !empty($tmp->guid)
+        while (!empty($tmp->guid)
                && !is_a($tmp, midcom_db_topic::class)
                && $i < 100) {
             // Get the parent; wishing eventually to get a topic
@@ -137,7 +137,7 @@ 
 
         $assignees = $this->load_assignees();
         $this->process_assignees($assignees, $schemadb);
-        $assignee_field =& $schemadb->get('privileges')->get_field('add_assignee');
+        $assignee_field = & $schemadb->get('privileges')->get_field('add_assignee');
 
         if (!$this->additional_assignee) {
             // Populate additional assignee selector
@@ -236,7 +236,7 @@ 
                 if ($assignee = midcom::get()->auth->get_assignee($privilege->assignee)) {
                     $label = $assignee->name;
                 } else {
-                    $label = $this->_l10n->get('ghost assignee for '. $privilege->assignee);
+                    $label = $this->_l10n->get('ghost assignee for ' . $privilege->assignee);
                 }
             }
 

lib/midcom/services/auth/backend.php

Spacing +3 added lines, -3 removed lines

@@ -81,7 +81,7 @@ 
             return null;
         }
 
-        if (   midcom::get()->config->get('auth_check_client_ip')
+        if (midcom::get()->config->get('auth_check_client_ip')
             && $data['clientip'] != $request->getClientIp()) {
             debug_add("The session had mismatching client IP.", MIDCOM_LOG_INFO);
             debug_add("Expected {$data['clientip']}, got {$request->getClientIp()}.");
@@ -95,7 +95,7 @@ 
             return null;
         }
 
-        if (   !$this->check_timestamp($data['timestamp'], $user)
+        if (!$this->check_timestamp($data['timestamp'], $user)
             || !$this->authenticate($user->username, '', true)) {
             $this->logout($user);
             return null;
@@ -141,7 +141,7 @@ 
         $user = midcom_connection::login($username, $password, $trusted);
 
         if (!$user) {
-            debug_add("Failed to authenticate the given user: ". midcom_connection::get_error_string(),
+            debug_add("Failed to authenticate the given user: " . midcom_connection::get_error_string(),
                     MIDCOM_LOG_INFO);
             return null;
         }

Braces +2 added lines, -1 removed lines

@@ -87,7 +87,8 @@
                     $param = $param->__object;
                 }
                 $this->_user_cache[$id] = new midcom_core_user($param);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 // Keep it silent while missing user object can mess here
                 $this->_user_cache[$id] = null;
             }

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 {