Fix "self_accessor" PHP CS Fixer rule (#9269)

plugins/enigma/lib/enigma_key.php

@@ -49,13 +49,13 @@ static function cmp($a, $b)
     function get_type()
     {
         if (!empty($this->subkeys[0]) && $this->subkeys[0]->has_private) {
-            return enigma_key::TYPE_KEYPAIR;
+            return self::TYPE_KEYPAIR;
         }
         else if (!empty($this->subkeys[0])) {
-            return enigma_key::TYPE_PUBLIC;
+            return self::TYPE_PUBLIC;
         }
 
-        return enigma_key::TYPE_UNKNOWN;
+        return self::TYPE_UNKNOWN;
     }
 
     /**

plugins/enigma/lib/enigma_mime_message.php

@@ -57,7 +57,7 @@ function __construct($message, $type)
      */
     public function isMultipart()
     {
-        return $this->message instanceof enigma_mime_message
+        return $this->message instanceof self
             || $this->message->isMultipart() || $this->message->getHTMLBody();
     }
 

plugins/filesystem_attachments/filesystem_attachments.php

@@ -34,7 +34,7 @@ function init()
         // Find filesystem_attachments-based plugins, we can use only one
         foreach ($this->api->loaded_plugins() as $plugin_name) {
             $plugin = $this->api->get_plugin($plugin_name);
-            if (($plugin instanceof filesystem_attachments) && $plugin->initialized) {
+            if (($plugin instanceof self) && $plugin->initialized) {
                 rcube::raise_error([
                         'file' => __FILE__, 'line' => __LINE__,
                         'message' => "Can use only one plugin for attachments/file uploads! Using '$plugin_name', ignoring others.",

program/include/rcmail.php

@@ -90,7 +90,7 @@ static function get_instance($mode = 0, $env = '')
                 $env = 'test';
             }
 
-            self::$instance = new rcmail($env);
+            self::$instance = new self($env);
             // init AFTER object was linked with self::$instance
             self::$instance->startup();
         }
@@ -302,7 +302,7 @@ public function action_handler()
 
         // if we arrive here, something went wrong
         $error = ['code' => 404, 'line' => __LINE__, 'file' => __FILE__, 'message' => "Invalid request"];
-        rcmail::raise_error($error, true, true);
+        self::raise_error($error, true, true);
     }
 
     /**

program/include/rcmail_install.php

@@ -95,7 +95,7 @@ public static function get_instance()
         static $inst;
 
         if (!$inst) {
-            $inst = new rcmail_install();
+            $inst = new self();
         }
 
         return $inst;

program/include/rcmail_oauth.php

@@ -92,7 +92,7 @@ class rcmail_oauth
     static function get_instance($options = [])
     {
         if (!self::$instance) {
-            self::$instance = new rcmail_oauth($options);
+            self::$instance = new self($options);
             self::$instance->init();
         }
 

program/lib/Roundcube/rcube.php

@@ -99,7 +99,7 @@ class rcube
     static function get_instance($mode = 0, $env = '')
     {
         if (!self::$instance) {
-            self::$instance = new rcube($env);
+            self::$instance = new self($env);
             self::$instance->init($mode);
         }
 

program/lib/Roundcube/rcube_charset.php

@@ -411,7 +411,7 @@ public static function check($str, $charsets = [])
         foreach ($charsets as $charset) {
             $ret = self::convert($chunk, $charset);
 
-            if ($ret === rcube_charset::clean($ret)) {
+            if ($ret === self::clean($ret)) {
                 return $charset;
             }
         }

program/lib/Roundcube/rcube_html2text.php

@@ -588,7 +588,7 @@ protected function _handle_link($link, $display)
         if (self::LINKS_NONE === $this->_links_mode) {
             // When not using link list use URL if there's no content (#5795)
             // The content here is HTML, convert it to text first
-            $h2t     = new rcube_html2text($display, false, false, 1024, $this->charset);
+            $h2t     = new self($display, false, false, 1024, $this->charset);
             $display = $h2t->get_text();
 
             if (empty($display) && preg_match('!^([a-z][a-z0-9.+-]+://)!i', $link)) {

program/lib/Roundcube/rcube_message_header.php

@@ -368,7 +368,7 @@ public function set($name, $value)
      */
     public static function from_array($arr)
     {
-        $obj = new rcube_message_header;
+        $obj = new self;
         foreach ($arr as $k => $v) {
             $obj->set($k, $v);
         }

program/lib/Roundcube/rcube_mime_decode.php

@@ -193,7 +193,7 @@ protected function do_decode($headers, $body, $default_ctype = 'text/plain')
                     break;
 
                 case 'message/rfc822':
-                    $obj = new rcube_mime_decode($this->params);
+                    $obj = new self($this->params);
                     $return->parts[] = $obj->decode($body, false);
                     unset($obj);
 

program/lib/Roundcube/rcube_plugin_api.php

@@ -66,7 +66,7 @@ class rcube_plugin_api
     static function get_instance()
     {
         if (!self::$instance) {
-            self::$instance = new rcube_plugin_api();
+            self::$instance = new self();
         }
 
         return self::$instance;

program/lib/Roundcube/rcube_tnef_decoder.php

@@ -404,7 +404,7 @@ protected function _extractMapiAttributes($data, &$result)
 
                 case self::MAPI_ATTACH_DATA:
                     $this->_getx($value, 16);
-                    $att = new rcube_tnef_decoder;
+                    $att = new self;
                     $res = $att->decompress($value);
                     $result = array_merge($result, $res['message']);
                     break;

program/lib/Roundcube/rcube_user.php

@@ -609,7 +609,7 @@ static function query($user, $host)
 
         // user already registered -> overwrite username
         if ($sql_arr) {
-            return new rcube_user($sql_arr['user_id'], $sql_arr);
+            return new self($sql_arr['user_id'], $sql_arr);
         }
     }
 
@@ -660,7 +660,7 @@ static function create($user, $host)
 
         if ($dbh->affected_rows($insert) && ($user_id = $dbh->insert_id('users'))) {
             // create rcube_user instance to make plugin hooks work
-            $user_instance = new rcube_user($user_id, [
+            $user_instance = new self($user_id, [
                     'user_id'     => $user_id,
                     'username'    => $data['user'],
                     'mail_host'   => $data['host'],

program/lib/Roundcube/rcube_utils.php

@@ -603,7 +603,7 @@ public static function file2class($mimetype, $filename)
         $mimetype = strtolower($mimetype);
         $filename = strtolower($filename);
 
-        list($primary, $secondary) = rcube_utils::explode('/', $mimetype);
+        list($primary, $secondary) = self::explode('/', $mimetype);
 
         $classes = [$primary ?: 'unknown'];
 

program/lib/Roundcube/rcube_vcard.php

@@ -575,7 +575,7 @@ public static function import($data)
 
             if (preg_match('/^END:VCARD$/i', $line)) {
                 // parse vcard
-                $obj = new rcube_vcard($vcard_block, $charset, false, self::$fieldmap);
+                $obj = new self($vcard_block, $charset, false, self::$fieldmap);
 
                 // FN and N is required by vCard format (RFC 2426)
                 // on import we can be less restrictive, let's addressbook decide