flack / openpsa

lib/midcom/application.php

Spacing +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
         }
 
         // Sanity check expires
-        if (   !is_int($expires)
+        if (!is_int($expires)
             || $expires < -1) {
             throw new midcom_error("\$expires has to be a positive integer or zero or -1, is now {$expires}.");
         }

lib/compat/environment.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 
     public function __construct()
     {
-        if (   php_sapi_name() != 'cli'
+        if (php_sapi_name() != 'cli'
             || !empty($_SERVER['REMOTE_ADDR'])) {
             $this->_httpd_setup();
         }
@@ -47,12 +47,12 @@ 
          *
          * 2008-09-26: Now also rewrites urls ending in .html to end with trailing slash.
          */
-        $redirect_test_uri = (string)$_SERVER['REQUEST_URI'];
-        if (   !isset($_SERVER['MIDCOM_COMPAT_REDIR'])
-            || (bool)$_SERVER['MIDCOM_COMPAT_REDIR'] !== false) {
+        $redirect_test_uri = (string) $_SERVER['REQUEST_URI'];
+        if (!isset($_SERVER['MIDCOM_COMPAT_REDIR'])
+            || (bool) $_SERVER['MIDCOM_COMPAT_REDIR'] !== false) {
             $redirect_test_uri = preg_replace('/\.html$/', '', $redirect_test_uri);
         }
-        if (   !preg_match('%\?|/$|midcom-.+-|/.*\.[^/]+$%', $redirect_test_uri)
+        if (!preg_match('%\?|/$|midcom-.+-|/.*\.[^/]+$%', $redirect_test_uri)
             && (empty($_POST))) {
             $response = new RedirectResponse($redirect_test_uri . '/', 301);
             $response->send();

lib/midcom/helper/toolbar.php

Spacing +9 added lines, -9 removed lines

@@ -362,11 +362,11 @@ 
             }
         }
 
-        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-';
-            if (   isset($_SERVER['HTTP_USER_AGENT'])
+            if (isset($_SERVER['HTTP_USER_AGENT'])
                 && strstr($_SERVER['HTTP_USER_AGENT'], 'Macintosh')) {
                 // Mac users
                 $prefix = 'Ctrl-Alt-';
@@ -388,7 +388,7 @@ 
     private function set_url(array &$item, $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")
             && substr($url, 0, 1) != '/'
@@ -413,7 +413,7 @@ 
 
         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 - 1),
@@ -543,7 +543,7 @@ 
      */
     public function render()
     {
-        $visible_items = array_filter($this->items, function ($item) {
+        $visible_items = array_filter($this->items, function($item) {
             return !$item[MIDCOM_TOOLBAR_HIDDEN];
         });
 
@@ -568,7 +568,7 @@ 
         foreach ($visible_items as $i => $item) {
             $output .= '<li class="';
             if ($i == 0) {
-                $output .= $first_class .  ' ';
+                $output .= $first_class . ' ';
             } elseif ($i == $last) {
                 $output .= 'last_item ';
             }
@@ -608,7 +608,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);
@@ -669,7 +669,7 @@ 
             $attributes['title'] = $item[MIDCOM_TOOLBAR_HELPTEXT];
         }
 
-        if (   $item[MIDCOM_TOOLBAR_ENABLED]
+        if ($item[MIDCOM_TOOLBAR_ENABLED]
             && !is_null($item[MIDCOM_TOOLBAR_ACCESSKEY])) {
             $attributes['class'] = 'accesskey';
             $attributes['accesskey'] = $item[MIDCOM_TOOLBAR_ACCESSKEY];
@@ -735,7 +735,7 @@ 
     public function get_index_from_url($url)
     {
         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;
             }

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

Braces +2 added lines, -1 removed lines

@@ -123,7 +123,8 @@
                 try {
                     $object = call_user_func([$options['widget_config']['class'], 'get_cached'], $identifier);
                     $preset[$identifier] = autocomplete_helper::create_item_label($object, $options['widget_config']['result_headers'], $options['widget_config']['get_label_for']);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                 }
             }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefault('error_bubbling', false);
-        $resolver->setNormalizer('widget_config', function (Options $options, $value) {
+        $resolver->setNormalizer('widget_config', function(Options $options, $value) {
             $widget_defaults = [
                 'creation_mode_enabled' => false,
                 'class' => null,
@@ -66,7 +66,7 @@ 
 
             return helper::resolve_options($widget_defaults, $value);
         });
-        $resolver->setNormalizer('type_config', function (Options $options, $value) {
+        $resolver->setNormalizer('type_config', function(Options $options, $value) {
             $type_defaults = [
                 'options' => [],
                 'constraints' => [],

lib/midcom/helper/configuration.php

Spacing +4 added lines, -4 removed lines

@@ -144,7 +144,7 @@ 
     private function _update_cache()
     {
         $this->_merged = $this->_global;
-        if (   !empty($this->_local)
+        if (!empty($this->_local)
             && is_array($this->_local)) {
             $this->_merged = array_merge($this->_merged, $this->_local);
         }
@@ -185,7 +185,7 @@ 
      */
     public function store(array $params, $reset = true)
     {
-        if (   !$this->_object_stored
+        if (!$this->_object_stored
             && $this->_object) {
             $this->_store_from_object();
         }
@@ -269,7 +269,7 @@ 
      */
     public function get_all()
     {
-        if (   !$this->_object_stored
+        if (!$this->_object_stored
             && $this->_object) {
             $this->_store_from_object();
         }
@@ -285,7 +285,7 @@ 
      */
     public function exists($key)
     {
-        if (   !$this->_object_stored
+        if (!$this->_object_stored
             && $this->_object) {
             $this->_store_from_object();
         }

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

Spacing +4 added lines, -4 removed lines

@@ -31,21 +31,21 @@ 
         $resolver->setDefaults([
             'error_bubbling' => false
         ]);
-        $resolver->setNormalizer('widget_config', function (Options $options, $value) {
+        $resolver->setNormalizer('widget_config', function(Options $options, $value) {
             $widget_defaults = [
                 'map_action_elements' => false,
                 'show_title' => true
             ];
             return helper::resolve_options($widget_defaults, $value);
         });
-        $resolver->setNormalizer('type_config', function (Options $options, $value) {
+        $resolver->setNormalizer('type_config', function(Options $options, $value) {
             $type_defaults = [
                 'derived_images' => [],
                 'filter_chain' => null
             ];
             return helper::resolve_options($type_defaults, $value);
         });
-        $resolver->setNormalizer('constraints', function (Options $options, $value) {
+        $resolver->setNormalizer('constraints', function(Options $options, $value) {
             if ($options['required']) {
                 return [new constraint()];
             }
@@ -65,7 +65,7 @@ 
         }
         $builder->add('delete', CheckboxType::class, ['attr' => [
             "class" => "midcom_datamanager_photo_checkbox"
-        ], "required" => false ]);
+        ], "required" => false]);
         $builder->add('identifier', HiddenType::class, ['data' => 'file']);
 
         $head = midcom::get()->head;

lib/net/nemein/rss/cron/fetchfeeds.php

Braces +2 added lines, -1 removed lines

@@ -28,7 +28,8 @@
         foreach ($qb->execute() as $feed) {
             try {
                 midcom_db_topic::get_cached($feed->node);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("Node #{$feed->node} does not exist, skipping feed #{$feed->id}", MIDCOM_LOG_ERROR);
                 continue;
             }

lib/net/nehmer/blog/midcom/interfaces.php

Braces +2 added lines, -1 removed lines

@@ -32,7 +32,8 @@
             foreach ($qb->execute() as $article) {
                 try {
                     $dm->set_storage($article);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log(MIDCOM_LOG_WARN);
                     continue;
                 }

lib/net/nehmer/static/handler/autoindex.php

Braces +2 added lines, -1 removed lines

@@ -112,7 +112,8 @@
         foreach ($qb->execute() as $article) {
             try {
                 $datamanager->set_storage($article);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }