Fix CS - imports (#9316)

* fix Tests\Browser\TestCase imports * fix remaining imports * fix PHPUnit\Framework\TestCase imports * import GuzzleHttp\Client * fix remaining * "php_unit_method_casing" is not todo * fix "single_line_comment_spacing" * fix 2nd commit done using older fixer
roundcube · Jan 21, 2024 · 54f4aa3 · 54f4aa3
1 parent 60011f1
commit 54f4aa3
Show file tree

Hide file tree

Showing 153 changed files with 511 additions and 255 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -1,13 +1,16 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
     ->in([__DIR__])
     ->exclude(['vendor'])
     ->ignoreDotFiles(false)
     ->name('*.php.dist')
     ->name('*.sh');
 
-return (new PhpCsFixer\Config())
+return (new Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@PhpCsFixer' => true,
@@ -85,6 +88,7 @@
             'prefix' => 'provide_',
             'suffix' => '_cases',
         ],
+        'php_unit_method_casing' => false,
         'php_unit_test_case_static_method_calls' => false,
         'psr_autoloading' => false,
         'strict_comparison' => false,
@@ -93,19 +97,14 @@
         'array_indentation' => false,
         'binary_operator_spaces' => ['default' => 'at_least_single_space'],
         'explicit_string_variable' => false,
-        'fully_qualified_strict_types' => [
-            'import_symbols' => false,
-        ],
         'general_phpdoc_annotation_remove' => false,
         'method_argument_space' => ['on_multiline' => 'ignore'],
         'modernize_types_casting' => false,
         'no_blank_lines_after_phpdoc' => false,
         'no_break_comment' => false,
         'no_useless_else' => false,
-        'php_unit_method_casing' => false,
         'phpdoc_annotation_without_dot' => false,
         'phpdoc_summary' => false,
-        'single_line_comment_spacing' => false,
         'string_length_to_empty' => false,
 
         // TODO - risky

diff --git a/bin/install-jsdeps.sh b/bin/install-jsdeps.sh
@@ -45,7 +45,7 @@ if (($CACHEDIR = getenv('CACHEDIR')) && is_writable($CACHEDIR)) {
     $CACHEDIR = sys_get_temp_dir();
 }
 
-//////////////// License definitions
+// ////////////// License definitions
 
 $LICENSES = [];
 $LICENSES['MIT'] = <<<'EOM'
@@ -98,7 +98,7 @@ $LICENSES['LGPL'] = <<<'EOL'
 
     EOL;
 
-//////////////// Functions
+// ////////////// Functions
 
 /**
  * Fetch package file from source
@@ -309,7 +309,7 @@ function delete_destfile($package)
     }
 }
 
-//////////////// Execution
+// ////////////// Execution
 
 $args = rcube_utils::get_opt([
     'f' => 'force:bool',

diff --git a/bin/msgimport.sh b/bin/msgimport.sh
@@ -46,7 +46,7 @@ if (!isset($_SERVER['argv'][1]) || $_SERVER['argv'][1] == 'help') {
 
 // prompt for username if not set
 if (empty($args['user'])) {
-    //fwrite(STDOUT, "Please enter your name\n");
+    // fwrite(STDOUT, "Please enter your name\n");
     echo 'IMAP user: ';
     $args['user'] = trim(fgets(\STDIN));
 }

diff --git a/config/defaults.inc.php b/config/defaults.inc.php
@@ -158,7 +158,7 @@
 // See http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
 // WARNING: Please note this is currently incompatible with implicit ssl,
 // since the proxy protocol preamble is expected before the ssl handshake.
-//$config['imap_conn_options'] = [
+// $config['imap_conn_options'] = [
 //    'ssl' => [
 //        'verify_peer'  => true,
 //        'verify_depth' => 3,
@@ -171,7 +171,7 @@
 //        'local_addr'    => $_SERVER['SERVER_ADDR'], // optional
 //        'local_port'    => $_SERVER['SERVER_PORT'], // optional
 //    ],
-//];
+// ];
 // Note: These can be also specified as an array of options indexed by hostname
 $config['imap_conn_options'] = null;
 
@@ -413,7 +413,7 @@
     'language' => ['locale'],
 ];
 
-///// Example config for Gmail
+// /// Example config for Gmail
 
 // Register your service at https://console.developers.google.com/
 // - use https://<your-roundcube-url>/index.php/login/oauth as redirect URL
@@ -429,7 +429,7 @@
 // $config['oauth_scope'] = "email profile openid https://mail.google.com/";
 // $config['oauth_auth_parameters'] = ['access_type' => 'offline', 'prompt' => 'consent'];
 
-///// Example config for Outlook.com (Office 365)
+// /// Example config for Outlook.com (Office 365)
 
 // Register your OAuth client at https://portal.azure.com
 // - use https://<your-roundcube-url>/index.php/login/oauth as redirect URL

diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
@@ -556,7 +556,7 @@ private function action_save()
      */
     private function action_delete()
     {
-        $mbox = trim(rcube_utils::get_input_string('_mbox', rcube_utils::INPUT_POST, true)); //UTF7-IMAP
+        $mbox = trim(rcube_utils::get_input_string('_mbox', rcube_utils::INPUT_POST, true)); // UTF7-IMAP
         $user = trim(rcube_utils::get_input_string('_user', rcube_utils::INPUT_POST));
 
         $user = explode(',', $user);

diff --git a/plugins/archive/tests/Archive.php b/plugins/archive/tests/Archive.php
@@ -1,6 +1,8 @@
 <?php
 
-class Archive_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Archive_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/archive/tests/Browser/MailTest.php b/plugins/archive/tests/Browser/MailTest.php
@@ -3,8 +3,9 @@
 namespace Tests\Browser\Plugins\Archive;
 
 use Tests\Browser\Components\Popupmenu;
+use Tests\Browser\TestCase;
 
-class MailTest extends \Tests\Browser\TestCase
+class MailTest extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/archive/tests/Browser/SettingsTest.php b/plugins/archive/tests/Browser/SettingsTest.php
@@ -2,7 +2,9 @@
 
 namespace Tests\Browser\Plugins\Archive;
 
-class SettingsTest extends \Tests\Browser\TestCase
+use Tests\Browser\TestCase;
+
+class SettingsTest extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/attachment_reminder/tests/AttachmentReminder.php b/plugins/attachment_reminder/tests/AttachmentReminder.php
@@ -1,6 +1,8 @@
 <?php
 
-class AttachmentReminder_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class AttachmentReminder_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/attachment_reminder/tests/Browser/PluginTest.php b/plugins/attachment_reminder/tests/Browser/PluginTest.php
@@ -3,8 +3,9 @@
 namespace Tests\Browser\Plugins\AttachmentReminder;
 
 use Tests\Browser\Components\Dialog;
+use Tests\Browser\TestCase;
 
-class PluginTest extends \Tests\Browser\TestCase
+class PluginTest extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/autologon/tests/Autologon.php b/plugins/autologon/tests/Autologon.php
@@ -1,6 +1,8 @@
 <?php
 
-class Autologon_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Autologon_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/autologout/tests/Autologout.php b/plugins/autologout/tests/Autologout.php
@@ -1,6 +1,8 @@
 <?php
 
-class Autologout_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Autologout_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/database_attachments/tests/DatabaseAttachments.php b/plugins/database_attachments/tests/DatabaseAttachments.php
@@ -1,6 +1,8 @@
 <?php
 
-class DatabaseAttachments_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class DatabaseAttachments_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/debug_logger/tests/DebugLogger.php b/plugins/debug_logger/tests/DebugLogger.php
@@ -1,6 +1,8 @@
 <?php
 
-class DebugLogger_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class DebugLogger_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/emoticons/tests/Emoticons.php b/plugins/emoticons/tests/Emoticons.php
@@ -1,6 +1,8 @@
 <?php
 
-class Emoticons_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Emoticons_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/enigma/lib/enigma_driver_phpssl.php b/plugins/enigma/lib/enigma_driver_phpssl.php
@@ -167,7 +167,7 @@ private function parse_sig_cert($file, $validity)
 
         $data = new enigma_signature();
 
-        $data->id          = $cert['hash']; //?
+        $data->id          = $cert['hash']; // ?
         $data->valid       = $validity;
         $data->fingerprint = $cert['serialNumber'];
         $data->created     = $cert['validFrom_time_t'];

diff --git a/plugins/enigma/tests/Enigma.php b/plugins/enigma/tests/Enigma.php
@@ -1,6 +1,8 @@
 <?php
 
-class Enigma_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Enigma_Plugin extends TestCase
 {
     protected function setUp(): void
     {

diff --git a/plugins/enigma/tests/EnigmaDriverGnupg.php b/plugins/enigma/tests/EnigmaDriverGnupg.php
@@ -1,6 +1,8 @@
 <?php
 
-class Enigma_EnigmaDriverGnupg extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Enigma_EnigmaDriverGnupg extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/enigma/tests/EnigmaEngine.php b/plugins/enigma/tests/EnigmaEngine.php
@@ -1,6 +1,8 @@
 <?php
 
-class Enigma_EnigmaEngine extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Enigma_EnigmaEngine extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/enigma/tests/EnigmaError.php b/plugins/enigma/tests/EnigmaError.php
@@ -1,6 +1,8 @@
 <?php
 
-class Enigma_EnigmaError extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Enigma_EnigmaError extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/enigma/tests/EnigmaKey.php b/plugins/enigma/tests/EnigmaKey.php
@@ -1,6 +1,8 @@
 <?php
 
-class Enigma_EnigmaKey extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Enigma_EnigmaKey extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/enigma/tests/EnigmaMimeMessage.php b/plugins/enigma/tests/EnigmaMimeMessage.php
@@ -1,6 +1,8 @@
 <?php
 
-class Enigma_EnigmaMimeMessage extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Enigma_EnigmaMimeMessage extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/enigma/tests/EnigmaSignature.php b/plugins/enigma/tests/EnigmaSignature.php
@@ -1,6 +1,8 @@
 <?php
 
-class Enigma_EnigmaSignature extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Enigma_EnigmaSignature extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/enigma/tests/EnigmaSubkey.php b/plugins/enigma/tests/EnigmaSubkey.php
@@ -1,6 +1,8 @@
 <?php
 
-class Enigma_EnigmaSubkey extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Enigma_EnigmaSubkey extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/enigma/tests/EnigmaUserid.php b/plugins/enigma/tests/EnigmaUserid.php
@@ -1,6 +1,8 @@
 <?php
 
-class Enigma_EnigmaUserid extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Enigma_EnigmaUserid extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/example_addressbook/tests/ExampleAddressbook.php b/plugins/example_addressbook/tests/ExampleAddressbook.php
@@ -1,6 +1,8 @@
 <?php
 
-class ExampleAddressbook_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class ExampleAddressbook_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/filesystem_attachments/tests/FilesystemAttachments.php b/plugins/filesystem_attachments/tests/FilesystemAttachments.php
@@ -1,6 +1,8 @@
 <?php
 
-class FilesystemAttachments_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class FilesystemAttachments_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/help/tests/Help.php b/plugins/help/tests/Help.php
@@ -1,6 +1,8 @@
 <?php
 
-class Help_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Help_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/hide_blockquote/tests/HideBlockquote.php b/plugins/hide_blockquote/tests/HideBlockquote.php
@@ -1,6 +1,8 @@
 <?php
 
-class HideBlockquote_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class HideBlockquote_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/http_authentication/tests/HttpAuthentication.php b/plugins/http_authentication/tests/HttpAuthentication.php
@@ -1,6 +1,8 @@
 <?php
 
-class HttpAuthentication_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class HttpAuthentication_Plugin extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

diff --git a/plugins/identicon/tests/Identicon.php b/plugins/identicon/tests/Identicon.php
@@ -1,6 +1,8 @@
 <?php
 
-class Identicon_Plugin extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Identicon_Plugin extends TestCase
 {
     public static function setUpBeforeCLass(): void
     {

diff --git a/plugins/identicon/tests/IdenticonEngine.php b/plugins/identicon/tests/IdenticonEngine.php
@@ -1,6 +1,8 @@
 <?php
 
-class Identicon_IdenticonEngine extends PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+class Identicon_IdenticonEngine extends TestCase
 {
     public static function setUpBeforeClass(): void
     {