flack / openpsa

lib/midcom/core/querybuilder.php

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 
         $this->_add_visibility_checks();
 
-        if (   empty($this->_limit)
+        if (empty($this->_limit)
             && empty($this->_offset)) {
             // No point to do windowing
             $newresult = $this->_execute_and_check_privileges();
@@ -150,7 +150,7 @@ 
         }
         $this->_query->set_limit($window_size);
 
-        while (    ($resultset = $this->_execute_and_check_privileges())
+        while (($resultset = $this->_execute_and_check_privileges())
                 || $this->denied > $denied) {
             $size = count($resultset);
             $total_size = $size + ($this->denied - $denied);

Braces +2 added lines, -1 removed lines

@@ -57,7 +57,8 @@
             $classname = $this->_real_class;
             try {
                 $result[] = new $classname($object);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 if ($e->getCode() == MIDCOM_ERRFORBIDDEN) {
                     $this->denied++;
                 }

src/midcom/datamanager/extension/type/privilege.php

Braces +2 added lines, -4 removed lines

@@ -65,8 +65,7 @@ 
 
     public function get_effective_value(array $options, $object = null)
     {
-        if (!$object)
-        {
+        if (!$object) {
             $defaults = midcom::get()->auth->acl->get_default_privileges();
             return $defaults[$options['privilege_name']] === MIDCOM_PRIVILEGE_ALLOW;
         }
@@ -99,8 +98,7 @@ 
 
     public function search_for_object($object)
     {
-        while (true)
-        {
+        while (true) {
             if ($object instanceof dbacontainer) {
                 return $object->get_value();
             }

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $map_privilege = function (Options $options) {
+        $map_privilege = function(Options $options) {
             $return_options = $this->defaultChoices;
             return $return_options;
         };
@@ -42,7 +42,7 @@ 
             'expanded' => true,
         ]);
 
-        $resolver->setNormalizer('type_config', function (Options $options, $value) {
+        $resolver->setNormalizer('type_config', function(Options $options, $value) {
             $type_defaults = [
                 'classname' => '',
                 'assignee' => null,

lib/midcom/helper/reflector/nameresolver.php

Spacing +7 added lines, -7 removed lines

@@ -36,13 +36,13 @@ 
         if (is_null($name_property)) {
             $name_property = midcom_helper_reflector::get_name_property($this->_object);
         }
-        if (    empty($name_property)
+        if (empty($name_property)
             || !midcom_helper_reflector::get($this->_object)->property_exists($name_property)) {
             // Could not resolve valid property
             return false;
         }
         // Make copy via typecast, very important or we might accidentally manipulate the given object
-        return (string)$this->_object->{$name_property};
+        return (string) $this->_object->{$name_property};
     }
 
     /**
@@ -129,7 +129,7 @@ 
     public function name_is_unique_or_empty()
     {
         $name_copy = $this->get_object_name();
-        if (   empty($name_copy)
+        if (empty($name_copy)
             && $name_copy !== false) {
             // Allow empty string name
             return true;
@@ -210,7 +210,7 @@ 
 
             $qb->add_constraint($child_name_property, '=', $name_copy);
             if ($qb->count()) {
-                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')" );
+                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')");
                 return false;
             }
         }
@@ -241,7 +241,7 @@ 
 
             $qb->add_constraint($child_name_property, '=', $name_copy);
             if ($qb->count()) {
-                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')" );
+                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')");
                 return false;
             }
         }
@@ -274,7 +274,7 @@ 
         $name_prop = midcom_helper_reflector::get_name_property($this->_object);
 
         if (!empty($original_name)) {
-            $current_name = (string)$original_name;
+            $current_name = (string) $original_name;
         } else {
             // Empty name, try to generate from title
             $title_copy = midcom_helper_reflector::get_object_title($this->_object, $title_property);
@@ -319,7 +319,7 @@ 
         } while (!$this->name_is_unique());
 
         // Get a copy of the current, usable name
-        $ret = (string)$this->_object->{$name_prop};
+        $ret = (string) $this->_object->{$name_prop};
         // Restore the original name
         $this->_object->{$name_prop} = $original_name;
         return $ret;

lib/midcom/helper/reflector/main.php

Spacing +8 added lines, -8 removed lines

@@ -431,7 +431,7 @@ 
 
         $label_prop = $this->get_label_property();
 
-        if (    is_string($label_prop)
+        if (is_string($label_prop)
              && $label_prop != 'guid'
              && $this->_mgd_reflector->property_exists($label_prop)) {
             $search_properties[$label_prop] = true;
@@ -492,7 +492,7 @@ 
                 continue;
             }
 
-            if (   !$ref->is_link($property)
+            if (!$ref->is_link($property)
                 && $ref->get_midgard_type($property) != MGD_TYPE_GUID) {
                 continue;
             }
@@ -556,7 +556,7 @@ 
                 return $schema_type;
             }
         }
-        if (   isset($extends[$schema_type])
+        if (isset($extends[$schema_type])
             && class_exists($extends[$schema_type])) {
             return $extends[$schema_type];
         }
@@ -576,7 +576,7 @@ 
     {
         $one = self::resolve_baseclass($class_one);
         $two = self::resolve_baseclass($class_two);
-        return (   $one == $two
+        return ($one == $two
                 || self::class_rewrite($one) == $two
                 || $one == self::class_rewrite($two));
     }
@@ -635,7 +635,7 @@ 
         // Check for decorators first
         if (!empty($class_instance->__mgdschema_class_name__)) {
             $parent_class = $class_instance->__mgdschema_class_name__;
-            if (   !empty($class_instance->__object)
+            if (!empty($class_instance->__object)
                 && !$class_instance->__object instanceof $class_instance->__mgdschema_class_name__) {
                 $parent_class = get_class($class_instance->__object);
                 debug_add('mgdschema object class ' . $parent_class . ' is not an instance of ' . $class_instance->__mgdschema_class_name__, MIDCOM_LOG_INFO);
@@ -670,7 +670,7 @@ 
         $name_exceptions = $this->_config->get('name_exceptions');
         foreach ($name_exceptions as $class => $property) {
             if (midcom::get()->dbfactory->is_a($object, $class)) {
-                if (   $property !== false
+                if ($property !== false
                     && !$this->_mgd_reflector->property_exists($property)) {
                     debug_add("Matched class '{$key}' to '{$class}' via is_a but property '{$property}' does not exist", MIDCOM_LOG_ERROR);
                     self::$_cache['name'][$key] = false;
@@ -726,7 +726,7 @@ 
         if (is_null($title_property)) {
             $title_property = self::get_title_property($object);
         }
-        if (   empty($title_property)
+        if (empty($title_property)
             || !self::get($object)->property_exists($title_property)) {
             // Could not resolve valid property
             return false;
@@ -773,7 +773,7 @@ 
 
         foreach ($title_exceptions as $class => $property) {
             if (midcom::get()->dbfactory->is_a($object, $class)) {
-                if (   $property !== false
+                if ($property !== false
                     && !$this->_mgd_reflector->property_exists($property)) {
                     debug_add("Matched class '{$key}' to '{$class}' via is_a but property '{$property}' does not exist", MIDCOM_LOG_ERROR);
                     self::$_cache['title'][$key] = false;

Braces +4 added lines, -2 removed lines

@@ -239,7 +239,8 @@ 
             // Not a MidCOM DBA object
             try {
                 $obj = midcom::get()->dbfactory->convert_midgard_to_midcom($object);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return false;
             }
         } else {
@@ -702,7 +703,8 @@ 
         if (!isset(self::$_cache['name'][$key])) {
             try {
                 self::$_cache['name'][$key] = self::get($object)->get_name_property_nonstatic($object);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add('Could not get reflector instance for class ' . $key . ': ' . $e->getMessage(), MIDCOM_LOG_ERROR);
                 self::$_cache['name'][$key] = null;
             }

lib/midcom/services/i18n/formatter.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
     public function number($value, $precision = 2)
     {
-        if (   is_float($value)
+        if (is_float($value)
             && version_compare(Intl::getIcuVersion(), '49', '<')) {
             // workaround for http://bugs.icu-project.org/trac/ticket/8561
             if ($precision == 0) {

lib/net/nemein/wiki/resolver.php

Spacing +3 added lines, -3 removed lines

@@ -129,7 +129,7 @@ 
          that is populated only once, and even then only the
          first time we encounter a namespaced wikilink */
         static $folder_tree = [];
-        if (   count($folder_tree) == 0
+        if (count($folder_tree) == 0
             || $force_resolve_folder_tree) {
             $folder_tree = $this->_resolve_folder_tree($force_as_root);
         }
@@ -159,7 +159,7 @@ 
             $localpath = $path;
             $matches['latest_parent'] = $folder_tree['/'];
             $missing_levels = 0;
-            while (   $localpath
+            while ($localpath
                    && $localpath != '/') {
                 $localpath = dirname($localpath);
                 $missing_levels++;
@@ -186,7 +186,7 @@ 
 
         $root_folder = $folder;
         $max = 100;
-        while (   $folder[MIDCOM_NAV_COMPONENT] == 'net.nemein.wiki'
+        while ($folder[MIDCOM_NAV_COMPONENT] == 'net.nemein.wiki'
                && (($parent = $nap->get_node_uplink($folder[MIDCOM_NAV_ID])) != -1)
                && $max > 0) {
             $root_folder = $folder;

lib/net/nemein/rss/manage.php

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
     {
         try {
             $viewer->register_plugin_namespace('__feeds', ['rss' => ['class' => __CLASS__]]);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
     }

lib/net/nehmer/blog/navigation.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 
         // Hide the articles that have the publish time in the future and if
         // the user is not administrator
-        if (   $this->_config->get('enable_scheduled_publishing')
+        if ($this->_config->get('enable_scheduled_publishing')
             && !midcom::get()->auth->admin) {
             // Show the article only if the publishing time has passed or the viewer
             // is the author
@@ -83,14 +83,14 @@ 
 
     private function _add_pseudo_leaves(array &$leaves)
     {
-        if (   $this->_config->get('archive_enable')
+        if ($this->_config->get('archive_enable')
             && $this->_config->get('archive_in_navigation')) {
             $leaves["{$this->_topic->id}_ARCHIVE"] = [
                 MIDCOM_NAV_URL => "archive/",
                 MIDCOM_NAV_NAME => $this->_l10n->get('archive'),
             ];
         }
-        if (   $this->_config->get('rss_enable')
+        if ($this->_config->get('rss_enable')
             && $this->_config->get('feeds_in_navigation')) {
             $leaves[self::LEAFID_FEEDS] = [
                 MIDCOM_NAV_URL => "feeds/",
@@ -98,7 +98,7 @@ 
             ];
         }
 
-        if (   $this->_config->get('categories_in_navigation')
+        if ($this->_config->get('categories_in_navigation')
             && $this->_config->get('categories') != '') {
             $categories = explode(',', $this->_config->get('categories'));
             foreach ($categories as $category) {
@@ -109,14 +109,14 @@ 
             }
         }
 
-        if (   $this->_config->get('archive_years_in_navigation')
+        if ($this->_config->get('archive_years_in_navigation')
             && $this->_config->get('archive_years_enable')) {
             $qb = midcom_db_article::new_query_builder();
             $qb->add_constraint('topic', '=', $this->_topic->id);
 
             // Hide the articles that have the publish time in the future and if
             // the user is not administrator
-            if (   $this->_config->get('enable_scheduled_publishing')
+            if ($this->_config->get('enable_scheduled_publishing')
                 && !midcom::get()->auth->admin) {
                 // Show the article only if the publishing time has passed or the viewer
                 // is the author

lib/net/nehmer/static/viewer.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
             }
         }
 
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config')) {
             $buttons[] = $workflow->get_button('config/', [
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),