Passed
Push — master ( c790fd...b67c6a )
by Andreas
12:04
created
src/midcom/templating/dbloader.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,8 @@
 block discarded – undo
51 51
                 if ($root_topic->style) {
52 52
                     $scope = midcom_db_style::id_from_path($root_topic->style);
53 53
                 }
54
-            } catch (midcom_error_forbidden $e) {
54
+            }
55
+            catch (midcom_error_forbidden $e) {
55 56
                 $e->log();
56 57
             }
57 58
         }
Please login to merge, or discard this patch.
lib/net/nehmer/blog/handler/view.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
             ]);
49 49
         }
50 50
 
51
-        if (   $this->_article->topic === $this->_topic->id
51
+        if ($this->_article->topic === $this->_topic->id
52 52
             && $this->_article->can_do('midgard:delete')) {
53 53
             $delete = $this->get_workflow('delete', ['object' => $this->_article]);
54 54
             $buttons[] = $delete->get_button("delete/{$this->_article->guid}/");
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
         if ($this->_config->get('comments_enable')) {
84 84
             if ($node = net_nehmer_comments_interface::get_node($this->_topic, $this->_config->get('comments_topic'))) {
85 85
                 $data['comments_url'] = $node[MIDCOM_NAV_RELATIVEURL] . "comment/{$this->_article->guid}";
86
-                if (   $this->_topic->can_do('midgard:update')
86
+                if ($this->_topic->can_do('midgard:update')
87 87
                     && $this->_topic->can_do('net.nehmer.comments:moderation')) {
88 88
                     net_nehmer_comments_viewer::add_head_elements();
89 89
                 }
Please login to merge, or discard this patch.
lib/errors.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@
 block discarded – undo
140 140
             return;
141 141
         }
142 142
 
143
-        if (   !is_writable($config['filename'])
143
+        if (!is_writable($config['filename'])
144 144
             && !is_writable(dirname($config['filename']))) {
145 145
             debug_add("Error logging file {$config['filename']} is not writable", MIDCOM_LOG_WARN);
146 146
             return;
Please login to merge, or discard this patch.
lib/midcom/admin/folder/handler/move.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,8 @@
 block discarded – undo
47 47
                 $target = new midcom_db_topic($request->request->getInt('move_to'));
48 48
                 $this->_move_object($target);
49 49
                 midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('moved %s to %s'), $this->_topic->get_label(), $target->get_label()));
50
-            } catch (midcom_error $e) {
50
+            }
51
+            catch (midcom_error $e) {
51 52
                 midcom::get()->uimessages->add($this->_l10n->get($this->_component), $e->getMessage(), 'error');
52 53
             }
53 54
         }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     {
34 34
         $this->_object = midcom::get()->dbfactory->get_object_by_guid($guid);
35 35
 
36
-        if (   !($this->_object instanceof midcom_db_topic)
36
+        if (!($this->_object instanceof midcom_db_topic)
37 37
             && !($this->_object instanceof midcom_db_article)) {
38 38
             throw new midcom_error_notfound("Moving only topics and articles is supported.");
39 39
         }
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
             $folder = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ROOTTOPIC);
75 75
         }
76 76
 
77
-        if (   $this->_object instanceof midcom_db_topic
77
+        if ($this->_object instanceof midcom_db_topic
78 78
             && $folder->up == $this->_object->id) {
79 79
             $tree_disabled = true;
80 80
         }
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
             $selected = ' checked="checked"';
88 88
         }
89 89
 
90
-        if (   !($this->_object instanceof midcom_db_topic)
90
+        if (!($this->_object instanceof midcom_db_topic)
91 91
             && $folder->component !== $this->current_folder->component) {
92 92
             // Non-topic objects may only be moved under folders of same component
93 93
             $class = 'wrong_component';
Please login to merge, or discard this patch.
lib/org/openpsa/user/validator.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
         $result = $this->is_username_available($fields);
48 48
 
49 49
         $accounthelper = new org_openpsa_user_accounthelper();
50
-        if ($fields['password']['switch'] && !$accounthelper->check_password_strength($fields['password']['password'])){
50
+        if ($fields['password']['switch'] && !$accounthelper->check_password_strength($fields['password']['password'])) {
51 51
             $result = ['password' => midcom::get()->i18n->get_string('password weak', 'org.openpsa.user')];
52 52
         }
53 53
 
@@ -149,10 +149,10 @@  discard block
 block discarded – undo
149 149
         $user = new midcom_db_person($fields["person"]);
150 150
 
151 151
         $accounthelper = new org_openpsa_user_accounthelper($user);
152
-        if (!$accounthelper->check_password_reuse($fields['new_password'])){
152
+        if (!$accounthelper->check_password_reuse($fields['new_password'])) {
153 153
             $result['password'] = midcom::get()->i18n->get_string('password was already used', 'org.openpsa.user');
154 154
         }
155
-        if (!$accounthelper->check_password_strength($fields['new_password'])){
155
+        if (!$accounthelper->check_password_strength($fields['new_password'])) {
156 156
             $result['password'] = midcom::get()->i18n->get_string('password weak', 'org.openpsa.user');
157 157
         }
158 158
         return $result ?: true;
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
         $result = $this->is_username_available($fields);
48 48
 
49 49
         $accounthelper = new org_openpsa_user_accounthelper();
50
-        if ($fields['password']['switch'] && !$accounthelper->check_password_strength($fields['password']['password'])){
50
+        if ($fields['password']['switch'] && !$accounthelper->check_password_strength($fields['password']['password'])) {
51 51
             $result = ['password' => midcom::get()->i18n->get_string('password weak', 'org.openpsa.user')];
52 52
         }
53 53
 
@@ -149,10 +149,10 @@  discard block
 block discarded – undo
149 149
         $user = new midcom_db_person($fields["person"]);
150 150
 
151 151
         $accounthelper = new org_openpsa_user_accounthelper($user);
152
-        if (!$accounthelper->check_password_reuse($fields['new_password'])){
152
+        if (!$accounthelper->check_password_reuse($fields['new_password'])) {
153 153
             $result['password'] = midcom::get()->i18n->get_string('password was already used', 'org.openpsa.user');
154 154
         }
155
-        if (!$accounthelper->check_password_strength($fields['new_password'])){
155
+        if (!$accounthelper->check_password_strength($fields['new_password'])) {
156 156
             $result['password'] = midcom::get()->i18n->get_string('password weak', 'org.openpsa.user');
157 157
         }
158 158
         return $result ?: true;
Please login to merge, or discard this patch.
lib/org/openpsa/products/product/group.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
         }
75 75
 
76 76
         $result_cache[$cache_key] = [];
77
-        $ret =& $result_cache[$cache_key];
77
+        $ret = & $result_cache[$cache_key];
78 78
 
79 79
         if (empty($up)) {
80 80
             // TODO: use reflection to see what kind of property this is ?
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/handler/journal/list.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@
 block discarded – undo
149 149
             }
150 150
 
151 151
             $reflector = midcom_helper_reflector::get($linked_object);
152
-            $link_html = "<a href='" . midcom::get()->permalinks->create_permalink($linked_object->guid) . "'>" . $reflector->get_object_label($linked_object) ."</a>";
152
+            $link_html = "<a href='" . midcom::get()->permalinks->create_permalink($linked_object->guid) . "'>" . $reflector->get_object_label($linked_object) . "</a>";
153 153
             $data['linked_objects'][$entry->linkGuid] = $link_html;
154 154
             $data['linked_raw_objects'][$entry->linkGuid] = $reflector->get_object_label($linked_object);
155 155
         }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -142,7 +142,8 @@
 block discarded – undo
142 142
             //create reflector with linked object to get the right label
143 143
             try {
144 144
                 $linked_object = midcom::get()->dbfactory->get_object_by_guid($entry->linkGuid);
145
-            } catch (midcom_error $e) {
145
+            }
146
+            catch (midcom_error $e) {
146 147
                 unset($data['entries'][$i]);
147 148
                 $e->log();
148 149
                 continue;
Please login to merge, or discard this patch.
lib/org/openpsa/mail/template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -103,7 +103,7 @@
 block discarded – undo
103 103
         foreach ($parameters as $key => $value) {
104 104
             $this->_patterns[] = "/__({$key})__/";
105 105
 
106
-            if (   is_array($value)
106
+            if (is_array($value)
107 107
                 || is_object($value)) {
108 108
                 $this->_patterns[] = "/__({$key})_([^ \.>\"-]*?)__/";
109 109
             }
Please login to merge, or discard this patch.
lib/midcom/helper/imagefilter.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
         $tmpfile = null;
342 342
         $imagesize = getimagesize($this->_filename);
343 343
 
344
-        if (   $imagesize[2] == IMAGETYPE_JPEG
344
+        if ($imagesize[2] == IMAGETYPE_JPEG
345 345
             && $this->_jpegtran_available()) {
346 346
             /* jpegtran */
347 347
             $operations = [
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
         $imagesize = getimagesize($this->_filename);
410 410
 
411 411
         // Try lossless jpegtran rotation if possible
412
-        if (   $imagesize[2] == IMAGETYPE_JPEG
412
+        if ($imagesize[2] == IMAGETYPE_JPEG
413 413
             && ($rotate % 90 == 0)
414 414
             && $this->_jpegtran_available()) {
415 415
             $tmpfile = $this->_get_tempfile();
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
      */
540 540
     public function fill($x = null, $y = null, $color = null, string $gravity = 'center')
541 541
     {
542
-        if (   empty($x)
542
+        if (empty($x)
543 543
             || empty($y)
544 544
             || empty($color)) {
545 545
             //This is a bit silly, but here for backwards compatibility...
Please login to merge, or discard this patch.