fix "no_mixed_echo_print"

roundcube · Dec 10, 2023 · 563d341 · 563d341
1 parent 605d5fc
commit 563d341
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 8 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -81,7 +81,6 @@
         'backtick_to_shell_exec' => false,
         'binary_operator_spaces' => false,
         'blank_line_before_statement' => false,
-        'blank_lines_before_namespace' => false,
         'class_attributes_separation' => false,
         'class_definition' => false,
         'class_reference_name_casing' => false,
@@ -113,7 +112,6 @@
         'no_break_comment' => false,
         'no_empty_statement' => false,
         'no_extra_blank_lines' => false,
-        'no_mixed_echo_print' => false,
         'no_null_property_initialization' => false,
         'no_superfluous_phpdoc_tags' => false,
         'no_unneeded_control_parentheses' => false,

diff --git a/program/actions/mail/get.php b/program/actions/mail/get.php
@@ -43,7 +43,7 @@ public function run($args = [])
             $message = $rcmail->gettext('loadingdata');
 
             header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
-            print "<html>\n<head>\n"
+            echo "<html>\n<head>\n"
                 . '<meta http-equiv="refresh" content="0; url='.rcube::Q($url).'">' . "\n"
                 . '<meta http-equiv="content-type" content="text/html; charset=' . RCUBE_CHARSET . '">' . "\n"
                 . "</head>\n<body>\n$message\n</body>\n</html>";

diff --git a/program/actions/utils/spell.php b/program/actions/utils/spell.php
@@ -75,7 +75,7 @@ public function run($args = [])
 
         // Don't use server's default Content-Type charset (#1486406)
         header("Content-Type: text/xml; charset=" . RCUBE_CHARSET);
-        print $result;
+        echo $result;
         exit;
     }
 }
diff --git a/program/include/rcmail_output.php b/program/include/rcmail_output.php
@@ -144,7 +144,7 @@ public function sendExit($body = '', $headers = [])
             header($header);
         }
 
-        print $body;
+        echo $body;
         exit;
     }
 

diff --git a/program/lib/Roundcube/rcube_html2text.php b/program/lib/Roundcube/rcube_html2text.php
@@ -417,7 +417,7 @@ function get_text()
      */
     function print_text()
     {
-        print $this->get_text();
+        echo $this->get_text();
     }
 
     /**

diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
@@ -276,7 +276,7 @@ public function get_part_body($mime_id, $formatted = false, $max_bytes = 0, $mod
 
             if ($mode === -1) {
                 if ($body !== false) {
-                    print($body);
+                    echo($body);
                 }
 
                 return $body !== false;

diff --git a/program/lib/Roundcube/rcube_text2html.php b/program/lib/Roundcube/rcube_text2html.php
@@ -121,7 +121,7 @@ function get_html()
      */
     function print_html()
     {
-        print $this->get_html();
+        echo $this->get_html();
     }
 
     /**