Kolab Groupware OBS

roundcubemail.spec Changed

roundcubemail-1.5.tar.gz/composer.lock Changed

@@ -2232,24 +2232,25 @@
         },
         {
             "name": "pear/net_sieve",
-            "version": "1.4.6",
+            "version": "1.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Net_Sieve.git",
-                "reference": "ea79747d73e6d4017716d9bab2e760f7df3249d7"
+                "reference": "31b3ef38d75e681d5589c5ed2267314b79c1dfe8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Net_Sieve/zipball/ea79747d73e6d4017716d9bab2e760f7df3249d7",
-                "reference": "ea79747d73e6d4017716d9bab2e760f7df3249d7",
+                "url": "https://api.github.com/repos/pear/Net_Sieve/zipball/31b3ef38d75e681d5589c5ed2267314b79c1dfe8",
+                "reference": "31b3ef38d75e681d5589c5ed2267314b79c1dfe8",
                 "shasum": ""
             },
             "require": {
                 "pear/net_socket": "~1.2",
-                "pear/pear-core-minimal": "~1.10"
+                "pear/pear-core-minimal": "~1.10",
+                "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7"
+                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^9"
             },
             "suggest": {
                 "pear/auth_sasl": "Install optionally via your project's composer.json"
@@ -2296,7 +2297,7 @@
                 "issues": "https://pear.php.net/bugs/search.php?cmd=display&package_name=Net_Sieve",
                 "source": "https://github.com/pear/Net_Sieve"
             },
-            "time": "2022-12-02T17:19:07+00:00"
+            "time": "2024-04-08T07:54:10+00:00"
         },
         {
             "name": "pear/net_smtp",
@@ -3280,16 +3281,16 @@
         },
         {
             "name": "sabre/xml",
-            "version": "2.2.6",
+            "version": "2.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/xml.git",
-                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b"
+                "reference": "f1d53d55976bbd4cf3e640dda6ebc31120c71a4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/xml/zipball/9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
-                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
+                "url": "https://api.github.com/repos/sabre-io/xml/zipball/f1d53d55976bbd4cf3e640dda6ebc31120c71a4e",
+                "reference": "f1d53d55976bbd4cf3e640dda6ebc31120c71a4e",
                 "shasum": ""
             },
             "require": {
@@ -3345,7 +3346,7 @@
                 "issues": "https://github.com/sabre-io/xml/issues",
                 "source": "https://github.com/fruux/sabre-xml"
             },
-            "time": "2023-06-28T12:56:05+00:00"
+            "time": "2024-04-18T10:15:43+00:00"
         },
         {
             "name": "smarty/smarty",
@@ -4991,16 +4992,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.66",
+            "version": "1.10.67",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd"
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/94779c987e4ebd620025d9e5fdd23323903950bd",
-                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493",
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493",
                 "shasum": ""
             },
             "require": {
@@ -5043,13 +5044,9 @@
                 {
                     "url": "https://github.com/phpstan",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
                 }
             ,
-            "time": "2024-03-28T16:17:31+00:00"
+            "time": "2024-04-16T07:22:02+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -6035,16 +6032,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.9.0",
+            "version": "3.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
+                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480",
+                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480",
                 "shasum": ""
             },
             "require": {
@@ -6111,7 +6108,7 @@
                     "type": "open_collective"
                 }
             ,
-            "time": "2024-02-16T15:06:51+00:00"
+            "time": "2024-04-23T20:25:34+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",

roundcubemail-1.5.tar.gz/plugins/calendar/calendar.php Changed

@@ -23,6 +23,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * Calendar plugin
+ *
+ * @property calendar_driver          $driver
+ * @property libcalendaring_vcalendar $ical
+ * @property libcalendaring_itip      $itip
+ */
 #AllowDynamicProperties
 class calendar extends rcube_plugin
 {
@@ -69,11 +76,6 @@
 
     private $token;
 
-    // These are implemented with __get()
-    //  private $ical;
-    //  private $itip;
-    //  private $driver;
-
 
     /**
      * Plugin initialization.
@@ -187,6 +189,8 @@
             $this->register_action('resources-autocomplete', $this, 'resources_autocomplete');
             $this->register_action('talk-room-create', $this, 'talk_room_create');
 
+            $this->rc->plugins->register_action('plugin.share-invitation', $this->ID, $this, 'share_invitation');
+
             $this->add_hook('refresh', $this, 'refresh');
 
             // remove undo information...
@@ -1030,7 +1034,7 @@
                 $source     = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
 
                 foreach ((array) $this->driver->search_calendars($query, $source) as $id => $prop) {
-                    $editname = $prop'editname';
+                    $editname = $prop'editname' ?? '';
                     unset($prop'editname');  // force full name to be displayed
                     $prop'active' = false;
 
@@ -1624,6 +1628,19 @@
     }
 
     /**
+     * Handle invitations to a shared folder
+     */
+    public function share_invitation()
+    {
+        $id = rcube_utils::get_input_value('id', rcube_utils::INPUT_POST);
+        $invitation = rcube_utils::get_input_value('invitation', rcube_utils::INPUT_POST);
+
+        if ($calendar = $this->driver->accept_share_invitation($invitation)) {
+            $this->rc->output->command('plugin.share-invitation', 'id' => $id, 'source' => $calendar);
+        }
+    }
+
+    /**
      * Handler for keep-alive requests
      * This will check for updated data in active calendars and sync them to the client
      */
@@ -3115,7 +3132,7 @@
                         } elseif ($existing
                             && ($this->event'sequence' >= $existing'sequence'
                                 || $this->event'changed' >= $existing'changed')
-                            && ($calendar = $this->driver->get_calendar($existing'calendar'))
+                            && ($calendar = $this->driver->get_calendar_name($existing'calendar'))
                         ) {
                             $this->event       = $invitation'event';
                             $this->event'id' = $existing'id';
@@ -3135,7 +3152,7 @@
                             }
 
                             if ($this->driver->edit_event($this->event)) {
-                                $msg = $this->gettext('name' => 'updatedsuccessfully', 'vars' => 'calendar' => $calendar->get_name());
+                                $msg = $this->gettext('name' => 'updatedsuccessfully', 'vars' => 'calendar' => $calendar);
                                 $this->rc->output->command('display_message', $msg, 'confirmation');
                             } else {
                                 $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
@@ -3645,7 +3662,7 @@
         }
 
         // send iTip reply
-        if ($event'_method' == 'REQUEST' && !empty($organizer) && !$noreply && !$error_msg && !empty($reply_sender)
+        if (!empty($event) && $event'_method' == 'REQUEST' && !empty($organizer) && !$noreply && !$error_msg && !empty($reply_sender)
             && !in_array(strtolower($organizer'email'), $emails ?? )
         ) {
             $event'comment' = $comment;

roundcubemail-1.5.tar.gz/plugins/calendar/calendar_ui.js Changed

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/caldav/caldav_calendar.php Changed

@@ -30,6 +30,7 @@
     public $alarms        = false;
     public $history       = false;
     public $subscriptions = false;
+    public $share_invitation = null;
     public $categories    = ;
     public $storage;
 
@@ -75,17 +76,15 @@
             $this->alarms     = !isset($this->attributes'alarms') || $this->attributes'alarms';
 
             if ($this->storage->get_namespace() == 'personal') {
-                $this->editable = true;
                 $this->rights = 'lrswikxteav';
             } else {
-                $rights = $this->storage->get_myrights();
-                if ($rights) {
-                    $this->rights = $rights;
-                    if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false) {
-                        $this->editable = strpos($rights, 'i');
-                        ;
-                    }
-                }
+                $this->rights = $this->storage->get_myrights();
+            }
+
+            $this->editable = strpos($this->rights, 'i') !== false;
+
+            if (!empty($this->attributes'invitation')) {
+                $this->share_invitation = $this->attributes'invitation';
             }
         }
     }

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/caldav/caldav_driver.php Changed

@@ -44,9 +44,9 @@
         $cal->require_plugin('libkolab');
 
         // load helper classes *after* libkolab has been loaded (#3248)
-        require_once(__DIR__ . '/caldav_calendar.php');
-        // require_once(__DIR__ . '/kolab_user_calendar.php');
-        // require_once(__DIR__ . '/caldav_invitation_calendar.php');
+        require_once __DIR__ . '/caldav_calendar.php';
+        require_once __DIR__ . '/caldav_invitation_calendar.php';
+        // require_once __DIR__ . '/kolab_user_calendar.php';
 
         $this->cal = $cal;
         $this->rc  = $cal->rc;
@@ -118,6 +118,51 @@
         return $calendar;
     }
 
+    protected function _to_calendar_props($cal, $prefs = )
+    {
+        $is_user = false; // ($cal instanceof caldav_user_calendar);
+
+        $result = 
+            'id'        => $cal->id,
+            'name'      => $cal->get_name(),
+            'listname'  => $cal->get_name(),
+            'editname'  => $cal->get_foldername(),
+            'title'     => null,
+            'color'     => $cal->get_color(),
+            'editable'  => $cal->editable,
+            'group'     => $is_user ? 'other user' : $cal->get_namespace(), // @phpstan-ignore-line
+            'active'    => !isset($prefs$cal->id'active') || !empty($prefs$cal->id'active'),
+            'owner'     => $cal->get_owner(),
+            'removable' => !$cal->default,
+            // extras to hide some elements in the UI
+            'subscriptions' => $cal->subscriptions,
+            'driver' => 'caldav',
+        ;
+
+        // @phpstan-ignore-next-line
+        if (!$is_user) {
+            $result += 
+                'default'    => $cal->default,
+                'rights'     => $cal->rights,
+                'showalarms' => $cal->alarms,
+                'history'    => !empty($this->bonnie_api),
+                'subtype'    => $cal->subtype,
+                'caldavurl'  => '', // $cal->get_caldav_url(),
+            ;
+        }
+
+        if ($cal->subscriptions) {
+            $result'subscribed' = $cal->is_subscribed();
+        }
+
+        if (!empty($cal->share_invitation)) {
+            $result'share_invitation' = $cal->share_invitation;
+            $result'active' = true;
+        }
+
+        return $result;
+    }
+
     /**
      * Get a list of available calendars from this source.
      *
@@ -179,78 +224,46 @@
             $cal = $this->_to_calendar($cal);
             $this->calendars$cal->id = $cal;
 
-            $is_user = false; // ($cal instanceof caldav_user_calendar);
-
-            $calendars$cal->id = 
-                'id'        => $cal->id,
-                'name'      => $cal->get_name(),
-                'listname'  => $cal->get_foldername(),
-                'editname'  => $cal->get_foldername(),
-                'title'     => '', // $cal->get_title(),
-                'color'     => $cal->get_color(),
-                'editable'  => $cal->editable,
-                'group'     => $is_user ? 'other user' : $cal->get_namespace(), // @phpstan-ignore-line
-                'active'    => !isset($prefs$cal->id'active') || !empty($prefs$cal->id'active'),
-                'owner'     => $cal->get_owner(),
-                'removable' => !$cal->default,
-                // extras to hide some elements in the UI
-                'subscriptions' => $cal->subscriptions,
-                'driver' => 'caldav',
-            ;
+            $calendars$cal->id = $this->_to_calendar_props($cal, $prefs);
 
-            // @phpstan-ignore-next-line
-            if (!$is_user) {
-                $calendars$cal->id += 
-                    'default'    => $cal->default,
-                    'rights'     => $cal->rights,
-                    'showalarms' => $cal->alarms,
-                    'history'    => !empty($this->bonnie_api),
-                    'children'   => true,  // TODO: determine if that folder indeed has child folders
-                    'parent'     => $parent_id,
-                    'subtype'    => $cal->subtype,
-                    'caldavurl'  => '', // $cal->get_caldav_url(),
-                ;
-            }
+            $calendars$cal->id'children' = true;  // TODO: determine if that folder indeed has child folders
+            $calendars$cal->id'parent' = $parent_id;
             /*
                         }
             */
-            if ($cal->subscriptions) {
-                $calendars$cal->id'subscribed' = $cal->is_subscribed();
-            }
         }
-        /*
-                // list virtual calendars showing invitations
-                if ($this->rc->config->get('kolab_invitation_calendars') && !($filter & self::FILTER_INSERTABLE)) {
-                    foreach (self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED as $id) {
-                        $cal = new caldav_invitation_calendar($id, $this->cal);
-                        if (!($filter & self::FILTER_ACTIVE) || $cal->is_active()) {
-                            $calendars$id = 
-                                'id'         => $cal->id,
-                                'name'       => $cal->get_name(),
-                                'listname'   => $cal->get_name(),
-                                'editname'   => $cal->get_foldername(),
-                                'title'      => $cal->get_title(),
-                                'color'      => $cal->get_color(),
-                                'editable'   => $cal->editable,
-                                'rights'     => $cal->rights,
-                                'showalarms' => $cal->alarms,
-                                'history'    => !empty($this->bonnie_api),
-                                'group'      => 'x-invitations',
-                                'default'    => false,
-                                'active'     => $cal->is_active(),
-                                'owner'      => $cal->get_owner(),
-                                'children'   => false,
-                                'counts'     => $id == self::INVITATIONS_CALENDAR_PENDING,
-                            ;
-
 
-                            if (is_object($tree)) {
-                                $tree->children = $cal;
-                            }
-                        }
+        // list virtual calendars showing invitations
+        if ($this->rc->config->get('kolab_invitation_calendars') && !($filter & self::FILTER_INSERTABLE)) {
+            foreach (self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED as $id) {
+                $cal = new caldav_invitation_calendar($id, $this->cal);
+                if (!($filter & self::FILTER_ACTIVE) || $cal->is_active()) {
+                    $calendars$id = 
+                        'id'         => $cal->id,
+                        'name'       => $cal->get_name(),
+                        'listname'   => $cal->get_name(),
+                        'editname'   => $cal->get_foldername(),
+                        'title'      => $cal->get_title(),
+                        'color'      => $cal->get_color(),
+                        'editable'   => $cal->editable,
+                        'rights'     => $cal->rights,
+                        'showalarms' => $cal->alarms,
+                        'history'    => !empty($this->bonnie_api),
+                        'group'      => 'x-invitations',
+                        'default'    => false,
+                        'active'     => $cal->is_active(),
+                        'owner'      => $cal->get_owner(),
+                        'children'   => false,
+                        'counts'     => $id == self::INVITATIONS_CALENDAR_PENDING,
+                    ;
+
+                    if (is_object($tree)) {
+                        $tree->children = $cal;
                     }
                 }
-        */
+            }
+        }
+
         // append the virtual birthdays calendar
         if ($this->rc->config->get('calendar_contact_birthdays', false) && !($filter & self::FILTER_INSERTABLE)) {
             $id    = self::BIRTHDAY_CALENDAR_ID;
@@ -281,7 +294,7 @@
      *
      * @param string $id Calendar identifier
      *
-     * @return caldav_calendar|caldav_invitation_calendar|null Object nor null if calendar doesn't exist
+     * @return caldav_calendar|caldav_invitation_calendar|null Object or null if calendar doesn't exist
      */
     public function get_calendar($id)
     {
@@ -306,6 +319,20 @@
     }
 
     /**
+     * Get a calendar name for the given calendar ID
+     *
+     * @param string $id Calendar identifier
+     *
+     * @return string|null Calendar name if found
+     */
+    public function get_calendar_name($id)
+    {
+        $cal = $this->get_calendar($id);
+
+        return $cal ? $cal->get_name() : null;

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/caldav/caldav_invitation_calendar.php Changed

@@ -5,7 +5,7 @@
  *
  * @author Aleksander Machniak <machniak@apheleia-it.ch>
  *
- * Copyright (C) 2014-2022, Apheleia IT AG <contact@apheleia-it.ch>
+ * Copyright (C) 2014-2024, Apheleia IT AG <contact@apheleia-it.ch>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -21,27 +21,150 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-require_once(__DIR__ . '/../kolab/kolab_driver.php');
-require_once(__DIR__ . '/../kolab/kolab_invitation_calendar.php');
+require_once __DIR__ . '/../kolab/kolab_invitation_calendar.php';
 
 class caldav_invitation_calendar extends kolab_invitation_calendar
 {
     public $id = '__caldav_invitation__';
 
     /**
-     * Default constructor
+     * Get attachment body
+     *
+     * @see calendar_driver::get_attachment_body()
      */
-    public function __construct($id, $calendar)
+    public function get_attachment_body($id, $event)
     {
-        $this->cal = $calendar;
-        $this->id  = $id;
+        // find the actual folder this event resides in
+        if (!empty($event'_folder_id')) {
+            $cal = $this->cal->driver->get_calendar($event'_folder_id');
+        } else {
+            $cal = null;
+            foreach ($this->_list_calendars() as $cal_id) {
+                $cal = $this->cal->driver->get_calendar($cal_id);
+
+                if ($cal->get_event($event'id')) {
+                    break;
+                }
+            }
+        }
+
+        if ($cal && $cal->storage) {
+            return $cal->get_attachment_body($id, $event);
+        }
+
+        return false;
     }
 
     /**
-     * Compose an URL for CalDAV access to this calendar (if configured)
+     * @param int    $start   Event's new start (unix timestamp)
+     * @param int    $end     Event's new end (unix timestamp)
+     * @param string $search  Search query (optional)
+     * @param bool   $virtual Include virtual events (optional)
+     * @param array  $query   Additional parameters to query storage
+     *
+     * @return array A list of event records
      */
-    public function get_caldav_url()
+    public function list_events($start, $end, $search = null, $virtual = true, $query = )
     {
-        return false; // TODO
+        // get email addresses of the current user
+        $user_emails = $this->cal->get_user_emails();
+        $subquery    = ;
+
+        foreach ($user_emails as $email) {
+            foreach ($this->partstats as $partstat) {
+                $subquery = 'tags', '=', 'x-partstat:' . $email . ':' . strtolower($partstat);
+            }
+        }
+
+        $events = ;
+
+        // aggregate events from all calendar folders
+        foreach ($this->_list_calendars() as $cal_id) {
+            $cal = $this->cal->driver->get_calendar($cal_id);
+
+            foreach ($cal->list_events($start, $end, $search, 1, $query, $subquery, 'OR') as $event) {
+                $match = false;
+
+                // post-filter events to match out partstats
+                if (!empty($event'attendees')) {
+                    foreach ($event'attendees' as $attendee) {
+                        if (
+                            !empty($attendee'email') && in_array_nocase($attendee'email', $user_emails)
+                            && !empty($attendee'status') && in_array($attendee'status', $this->partstats)
+                        ) {
+                            $match = true;
+                            break;
+                        }
+                    }
+                }
+
+                if ($match) {
+                    $uid = !empty($event'id') ? $event'id' : $event'uid';
+                    $events$uid = $this->_mod_event($event, $cal->id);
+                }
+            }
+
+            // merge list of event categories (really?)
+            $this->categories += $cal->categories;
+        }
+
+        return $events;
+    }
+
+    /**
+     * Get number of events in the given calendar
+     *
+     * @param int   $start  Date range start (unix timestamp)
+     * @param int   $end    Date range end (unix timestamp)
+     * @param array $filter Additional query to filter events
+     *
+     * @return int Count
+     */
+    public function count_events($start, $end = null, $filter = null)
+    {
+        // get email addresses of the current user
+        $user_emails = $this->cal->get_user_emails();
+        $subquery    = ;
+
+        foreach ($user_emails as $email) {
+            foreach ($this->partstats as $partstat) {
+                $subquery = 'tags', '=', 'x-partstat:' . $email . ':' . strtolower($partstat);
+            }
+        }
+
+        $filter = 
+            'tags', '!=', 'x-status:cancelled',
+            $subquery, 'OR',
+        ;
+
+        // aggregate counts from all calendar folders
+        $count = 0;
+        foreach ($this->_list_calendars() as $cal_id) {
+            $cal = $this->cal->driver->get_calendar($cal_id);
+            $count += $cal->count_events($start, $end, $filter);
+        }
+
+        return $count;
+    }
+
+    /**
+     * Get IDs of all personal DAV calendars
+     */
+    private function _list_calendars()
+    {
+        $exceptions = 
+            caldav_driver::INVITATIONS_CALENDAR_PENDING,
+            caldav_driver::INVITATIONS_CALENDAR_DECLINED,
+            caldav_driver::BIRTHDAY_CALENDAR_ID,
+        ;
+
+        $list = array_filter(
+            $this->cal->driver->list_calendars(),
+            function ($prop) use ($exceptions) {
+                return !in_array($prop'id', $exceptions) && strpos($prop'group' ?? '', 'other') === false;
+            }
+        );
+
+        return array_keys($list);
     }
 }

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/calendar_driver.php Changed

@@ -128,10 +128,11 @@
      *
      * @param int $filter Bitmask defining filter criterias.
      *                    See FILTER_* constants for possible values.
+     * @param ?kolab_storage_folder_virtual $tree Reference to hierarchical folder tree object
      *
      * @return array List of calendars
      */
-    abstract public function list_calendars($filter = 0);
+    abstract public function list_calendars($filter = 0, &$tree = null);
 
     /**
      * Create a new calendar assigned to the current user
@@ -159,6 +160,15 @@
     abstract public function edit_calendar($prop);
 
     /**
+     * Get a calendar name for the given calendar ID
+     *
+     * @param string $id Calendar identifier
+     *
+     * @return string|null Calendar name if found
+     */
+    abstract public function get_calendar_name($id);
+
+    /**
      * Set active/subscribed state of a calendar
      *
      * @param array $prop Hash array with calendar properties
@@ -863,6 +873,18 @@
     }
 
     /**
+     * Accept an invitation to a shared folder
+     *
+     * @param string $href Invitation location href
+     *
+     * @return array|false
+     */
+    public function accept_share_invitation($href)
+    {
+        return false;
+    }
+
+    /**
      * Handler for user_delete plugin hook
      *
      * @param array $args Hash array with hook arguments

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/database/database_driver.php Changed

@@ -92,7 +92,7 @@
                 $arr'name'       = html::quote($arr'name');
                 $arr'listname'   = html::quote($arr'name');
                 $arr'rights'     = 'lrswikxteav';
-                $arr'editable'  = true;
+                $arr'editable'   = true;
 
                 $this->calendars$arr'calendar_id' = $arr;
                 $calendar_ids = $db->quote($arr'calendar_id');
@@ -105,11 +105,12 @@
     /**
      * Get a list of available calendars from this source
      *
-     * @param int $filter Bitmask defining filter criterias
+     * @param int                           $filter Bitmask defining filter criterias
+     * @param ?kolab_storage_folder_virtual $tree   Reference to hierarchical folder tree object
      *
      * @return array List of calendars
      */
-    public function list_calendars($filter = 0)
+    public function list_calendars($filter = 0, &$tree = null)
     {
         // attempt to create a default calendar for this user
         if (empty($this->calendars)) {
@@ -157,6 +158,18 @@
     }
 
     /**
+     * Get a calendar name for the given calendar ID
+     *
+     * @param string $id Calendar identifier
+     *
+     * @return string|null Calendar name if found
+     */
+    public function get_calendar_name($id)
+    {
+        return $this->calendars$id'name' ?? null;
+    }
+
+    /**
      * Create a new calendar assigned to the current user
      *
      * @param array $prop Hash array with calendar properties

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php Changed

@@ -352,7 +352,7 @@
      *
      * @param string $id Calendar identifier (encoded imap folder name)
      *
-     * @return kolab_calendar|kolab_invitation_calendar|null Object nor null if calendar doesn't exist
+     * @return kolab_calendar|kolab_invitation_calendar|null Object or null if calendar doesn't exist
      */
     public function get_calendar($id)
     {
@@ -377,6 +377,20 @@
     }
 
     /**
+     * Get a calendar name for the given calendar ID
+     *
+     * @param string $id Calendar identifier
+     *
+     * @return string|null Calendar name if found
+     */
+    public function get_calendar_name($id)
+    {
+        $cal = $this->get_calendar($id);
+
+        return $cal ? $cal->get_name() : null;
+    }
+
+    /**
      * Create a new calendar assigned to the current user
      *
      * @param array $prop Hash array with calendar properties
@@ -394,7 +408,7 @@
         $folder = $this->storage->folder_update($prop);
 
         if ($folder === false) {
-            $this->last_error = $this->cal->gettext($this->storage->last_error);
+            $this->last_error = $this->cal->gettext($this->storage::$last_error);
             return false;
         }

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php Changed

roundcubemail-1.5.tar.gz/plugins/calendar/lib/calendar_ui.php Changed

@@ -227,7 +227,6 @@
         $calendars = $this->cal->driver->list_calendars(0, $tree);
 
         // walk folder tree
-        // @phpstan-ignore-next-line
         if (is_object($tree)) {
             $html = $this->list_tree_html($tree, $calendars, $jsenv, $attrib);
 
@@ -310,18 +309,14 @@
         // enrich calendar properties with settings from the driver
         if (empty($prop'virtual')) {
             unset($prop'user_id');
+            $feed = '_cal' => $this->cal->ical_feed_hash($id) . '.ics', 'action' => 'feed';
 
             $prop'alarms'      = $this->cal->driver->alarms;
             $prop'attendees'   = $this->cal->driver->attendees;
             $prop'freebusy'    = $this->cal->driver->freebusy;
             $prop'attachments' = $this->cal->driver->attachments;
             $prop'undelete'    = $this->cal->driver->undelete;
-            $prop'feedurl'     = $this->cal->get_url(
-                
-                    '_cal'   => $this->cal->ical_feed_hash($id) . '.ics',
-                    'action' => 'feed',
-                
-            );
+            $prop'feedurl'     = $this->cal->get_url($feed);
 
             $jsenv$id = $prop;
         }
@@ -338,7 +333,7 @@
 
         if (!empty($prop'virtual')) {
             $classes = 'virtual';
-        } elseif (empty($prop'editable')) {
+        } elseif (!empty($prop'rights') && strpos($prop'rights', 'i') === false && strpos($prop'rights', 'w') === false) {
             $classes = 'readonly';
         }
         if (!empty($prop'subscribed')) {
@@ -358,7 +353,7 @@
             $label_id = 'cl:' . $id;
             $content = html::a(
                 'class' => 'calname', 'id' => $label_id, 'title' => $title, 'href' => '#',
-                rcube::Q(!empty($prop'editname') ? $prop'editname' : $prop'listname')
+                rcube::Q(!empty($prop'listname') ? $prop'listname' : $prop'name')
             );
 
             if (empty($prop'virtual')) {
@@ -383,8 +378,9 @@
                         'title' => $this->cal->gettext('quickview'),
                         'role'  => 'checkbox',
                         'aria-checked' => 'false',
+                        'style' => !empty($prop'share_invitation') ? 'display:none' : null,
                     ,
-                    ''
+                    ' '
                 );
 
                 if (!isset($prop'subscriptions') || $prop'subscriptions' !== false) {
@@ -406,7 +402,7 @@
                         'type'    => 'checkbox',
                         'name'    => '_cal',
                         'value'   => $id,
-                        'checked' => !empty($prop'active'),
+                        'checked' => !empty($prop'active') && empty($prop'share_invitation'),
                         'aria-labelledby' => $label_id,
                     )
                     . html::span('actions', $actions)
@@ -457,10 +453,7 @@
         $select = new html_select($attrib);
 
         foreach ((array) $this->cal->driver->list_calendars() as $id => $prop) {
-            if (
-                !empty($prop'editable')
-                || (!empty($prop'rights') && strpos($prop'rights', 'i') !== false)
-            ) {
+            if (!empty($prop'rights') && strpos($prop'rights', 'i') !== false) {
                 $select->add($prop'name', $id);
             }
         }

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/Base.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/config.inc.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/config.inc.php.dist Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/kolab_activesync.php Changed

@@ -138,7 +138,7 @@
                     // iterate over folders list and update metadata if necessary
                     // old subscriptions
                     foreach (array_keys($this->folder_meta()) as $folder) {
-                        $err |= !$this->folder_set($folder, $imei, intval($subscriptions$folder));
+                        $err |= !$this->folder_set($folder, $imei, intval($subscriptions$folder ?? 0));
                         unset($subscriptions$folder);
                     }
                     // new subscription
@@ -330,7 +330,7 @@
 
         // get folders activesync config
         $metadata = $this->folder_meta();
-        $metadata = $metadata$name;
+        $metadata = $metadata$name ?? null;
 
         if ($flag) {
             if (empty($metadata)) {
@@ -368,7 +368,7 @@
         }
 
         // Return if nothing's been changed
-        if (!self::data_array_diff($this->folder_meta$name, $metadata)) {
+        if (!self::data_array_diff($this->folder_meta$name ?? null, $metadata)) {
             return true;
         }

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/kolab_activesync_ui.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/drivers/carddav/carddav_contacts.php Changed

@@ -33,6 +33,7 @@
     public $readonly = true;
     public $undelete = false;
     public $groups   = true;
+    public $share_invitation = null;
 
     public $coltypes = 
         'name'         => 'limit' => 1,
@@ -76,9 +77,9 @@
     public $date_cols = 'birthday', 'anniversary';
 
     public $fulltext_cols  = 'name', 'firstname', 'surname', 'middlename', 'email';
+    public $storage;
 
     private $gid;
-    private $storage;
     private $dataset;
     private $sortindex;
     private $contacts;
@@ -122,18 +123,15 @@
 
         // Set readonly and rights flags according to folder permissions
         if ($this->ready) {
-            if ($this->storage->get_owner() == $_SESSION'username') {
+            if ($this->storage->get_namespace() == 'personal') {
                 $this->readonly = false;
                 $this->rights = 'lrswikxtea';
             } else {
-                $rights = $this->storage->get_myrights();
-                if ($rights && !PEAR::isError($rights)) {
-                    $this->rights = $rights;
-                    if (strpos($rights, 'i') !== false && strpos($rights, 't') !== false) {
-                        $this->readonly = false;
-                    }
-                }
+                $this->rights = $this->storage->get_myrights();
+                $this->readonly = strpos($this->rights, 'i') === false;
             }
+
+            $this->share_invitation = $this->storage->attributes'invitation' ?? null;
         }
     }

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/drivers/carddav/carddav_contacts_driver.php Changed

@@ -25,6 +25,8 @@
 
 class carddav_contacts_driver
 {
+    public $search_more_results = false;
+
     protected $plugin;
     protected $rc;
     protected $sources;
@@ -56,6 +58,45 @@
     }
 
     /**
+     * Search for shared or otherwise not listed addressbooks the user has access to
+     *
+     * @param string $query  Search string
+     * @param string $source Section/source to search
+     *
+     * @return array List of addressbooks
+     */
+    public function search_folders($query, $source)
+    {
+        $this->search_more_results = false;
+        $storage = self::get_storage();
+        $result = ;
+
+        // find addressbook folders, except other user's folders
+        if ($source == 'folders') {
+            foreach ((array) $storage->search_folders('event', $query, 'other') as $folder) {
+                $abook = new carddav_contacts($folder);
+                $result = $this->abook_prop($folder->id, $abook);
+            }
+        }
+        // find other user's addressbooks (invitations)
+        elseif ($source == 'users') {
+            // we have slightly more space, so display twice the number
+            $limit = $this->rc->config->get('autocomplete_max', 15) * 2;
+
+            foreach ($storage->get_share_invitations('contact', $query) as $invitation) {
+                $abook = new carddav_contacts($invitation);
+                $result = $this->abook_prop($invitation->id, $abook);
+
+                if (count($result) > $limit) {
+                    $this->search_more_results = true;
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
      * Getter for the rcube_addressbook instance
      *
      * @param string $id Addressbook (folder) ID
@@ -118,7 +159,8 @@
         $name = '';
 
         if ($source && ($book = $this->get_address_book($source))) {
-            $name = $book->get_name();
+            $name = $book->get_foldername();
+            $folder = $book->storage;
         }
 
         $foldername = new html_inputfield('name' => '_name', 'id' => '_name', 'size' => 30);
@@ -140,7 +182,7 @@
 
         $hidden_fields = 'name' => '_source', 'value' => $source;
 
-        return kolab_utils::folder_form($form, '', 'contacts', $hidden_fields, false);
+        return kolab_utils::folder_form($form, $folder ?? null, 'contacts', $hidden_fields);
     }
 
     /**
@@ -175,6 +217,55 @@
     }
 
     /**
+     * Subscribe to a folder
+     *
+     * @param string $id      Folder identifier
+     * @param array  $options Action options
+     *
+     * @return bool
+     */
+    public function folder_subscribe($id, $options = )
+    {
+        /*
+        $success = false;
+        if ($id && ($folder = kolab_storage::get_folder(kolab_storage::id_decode($id)))) {
+            if (isset($options'permanent')) {
+                $success |= $folder->subscribe(intval($options'permanent'));
+            }
+
+            if (isset($options'active')) {
+                $success |= $folder->activate(intval($options'active'));
+            }
+        }
+        return $success;
+        */
+
+        return true;
+    }
+
+    /**
+     * Accept an invitation to a shared folder
+     *
+     * @param string $href Invitation location href
+     *
+     * @return array|false
+     */
+    public function accept_share_invitation($href)
+    {
+        $storage = self::get_storage();
+
+        $folder = $storage->accept_share_invitation('contact', $href);
+
+        if ($folder === false) {
+            return false;
+        }
+
+        $abook = new carddav_contacts($folder);
+
+        return $this->abook_prop($folder->id, $abook);
+    }
+
+    /**
      * Helper method to build a hash array of address book properties
      */
     public function abook_prop($id, $abook)
@@ -197,12 +288,11 @@
         return 
             'id'         => $id,
             'name'       => $abook->get_name(),
-            'listname'   => $abook->get_foldername(),
+            'listname'   => $abook->get_name(),
             'readonly'   => $abook->readonly,
             'rights'     => $abook->rights,
             'groups'     => $abook->groups,
             'undelete'   => $abook->undelete && $this->rc->config->get('undo_timeout'),
-            'realname'   => rcube_charset::convert($abook->get_realname(), 'UTF7-IMAP'), // IMAP folder name
             'group'      => $abook->get_namespace(),
             'subscribed' => $abook->is_subscribed(),
             'carddavurl' => $abook->get_carddav_url(),
@@ -210,6 +300,7 @@
             'kolab'      => true,
             'carddav'    => true,
             'audittrail' => false, // !empty($this->plugin->bonnie_api),
+            'share_invitation' => $abook->share_invitation,
         ;
     }
 }

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/drivers/kolab/kolab_contacts_driver.php Changed

@@ -25,6 +25,8 @@
  */
 class kolab_contacts_driver
 {
+    public $search_more_results = false;
+
     protected $plugin;
     protected $rc;
 
@@ -61,6 +63,87 @@
     }
 
     /**
+     * Search for shared or otherwise not listed addressbooks the user has access to
+     *
+     * @param string $query  Search string
+     * @param string $source Section/source to search
+     *
+     * @return array List of addressbooks
+     */
+    public function search_folders($query, $source)
+    {
+        $this->search_more_results = false;
+        $results = ;
+        $sources = ;
+        $folders = ;
+
+        // find unsubscribed IMAP folders that have "event" type
+        if ($source == 'folders') {
+            foreach ((array) kolab_storage::search_folders('contact', $query, 'other') as $folder) {
+                $folders$folder->id = $folder;
+                $sources$folder->id = new kolab_contacts($folder->name);
+            }
+        }
+        // search other user's namespace via LDAP
+        elseif ($source == 'users') {
+            // We have slightly more space, so display twice the number
+            $limit = $this->rc->config->get('autocomplete_max', 15) * 2;
+
+            foreach (kolab_storage::search_users($query, 0, , $limit * 10) as $user) {
+                $folders = ;
+                // search for contact folders shared by this user
+                foreach (kolab_storage::list_user_folders($user, 'contact', false) as $foldername) {
+                    $folders = new kolab_storage_folder($foldername, 'contact');
+                }
+
+                $count = 0;
+                if (count($folders)) {
+                    $userfolder = new kolab_storage_folder_user($user'kolabtargetfolder', '', $user);
+                    $folders$userfolder->id = $userfolder;
+                    $sources$userfolder->id = $userfolder;
+
+                    foreach ($folders as $folder) {
+                        $folders$folder->id = $folder;
+                        $sources$folder->id = new kolab_contacts($folder->name);
+                        $count++;
+                    }
+                }
+
+                if ($count >= $limit) {
+                    $this->search_more_results = true;
+                    break;
+                }
+            }
+        }
+
+        $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
+
+        // build results list
+        foreach ($sources as $id => $source) {
+            $folder = $folders$id;
+            $imap_path = explode($delim, $folder->name);
+
+            // find parent
+            do {
+                array_pop($imap_path);
+                $parent_id = kolab_storage::folder_id(implode($delim, $imap_path));
+            } while (count($imap_path) > 1 && empty($folders$parent_id));
+
+            // restore "real" parent ID
+            if ($parent_id && empty($folders$parent_id)) {
+                $parent_id = kolab_storage::folder_id($folder->get_parent());
+            }
+
+            $prop = $this->abook_prop($id, $source);
+            $prop'parent' = $parent_id;
+
+            $results = $prop;
+        }
+
+        return $results;
+    }
+
+    /**
      * Getter for the rcube_addressbook instance
      *
      * @param string $id Addressbook (folder) ID
@@ -229,6 +312,31 @@
     }
 
     /**
+     * Subscribe to a folder
+     *
+     * @param string $id      Folder identifier
+     * @param array  $options Action options
+     *
+     * @return bool
+     */
+    public function folder_subscribe($id, $options = )
+    {
+        $success = false;
+
+        if ($id && ($folder = kolab_storage::get_folder(kolab_storage::id_decode($id)))) {
+            if (isset($options'permanent')) {
+                $success |= $folder->subscribe(intval($options'permanent'));
+            }
+
+            if (isset($options'active')) {
+                $success |= $folder->activate(intval($options'active'));
+            }
+        }
+
+        return $success;
+    }
+
+    /**
      * Helper method to build a hash array of address book properties
      */
     public function abook_prop($id, $abook)

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/kolab_addressbook.js Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/kolab_addressbook.php Changed

@@ -34,7 +34,6 @@
     public $driver;
     public $bonnie_api = false;
 
-    private $folders;
     private $sources;
     private $rc;
     private $ui;
@@ -90,6 +89,8 @@
             $this->register_action('plugin.contact-diff', $this, 'contact_diff');
             $this->register_action('plugin.contact-restore', $this, 'contact_restore');
 
+            $this->register_action('plugin.share-invitation', $this, 'share_invitation');
+
             // get configuration for the Bonnie API
             $this->bonnie_api = libkolab::get_bonnie_api();
 
@@ -305,6 +306,7 @@
                     'href' => $this->rc->url('_source' => $id),
                     'rel' => $source'id',
                     'id' => $label_id,
+                    'class' => 'listname',
                     'onclick' => "return " . rcmail_output::JS_OBJECT_NAME . ".command('list','" . rcube::JQ($id) . "',this)",
                 , $name)
         );
@@ -322,7 +324,7 @@
         if ($search_mode) {
             $jsdata$id'group' = implode(' ', $classes);
 
-            if (!$source'virtual') {
+            if (empty($source'virtual')) {
                 $inner .= html::tag('input', 
                     'type' => 'checkbox',
                     'name' => '_source',
@@ -862,7 +864,6 @@
         return $args;
     }
 
-
     /**
      * Handler for plugin actions
      */
@@ -889,88 +890,28 @@
     }
 
     /**
-     *
+     * Search for addressbook folders not subscribed yet
      */
     public function book_search()
     {
-        $results = ;
-        $query   = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
-        $source  = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
-
-        kolab_storage::$encode_ids = true;
-        $search_more_results = false;
-        $this->sources = ;
-        $this->folders = ;
-
-        // find unsubscribed IMAP folders that have "event" type
-        if ($source == 'folders') {
-            foreach ((array)kolab_storage::search_folders('contact', $query, 'other') as $folder) {
-                $this->folders$folder->id = $folder;
-                $this->sources$folder->id = new kolab_contacts($folder->name);
-            }
-        }
-        // search other user's namespace via LDAP
-        elseif ($source == 'users') {
-            $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
-            foreach (kolab_storage::search_users($query, 0, , $limit * 10) as $user) {
-                $folders = ;
-                // search for contact folders shared by this user
-                foreach (kolab_storage::list_user_folders($user, 'contact', false) as $foldername) {
-                    $folders = new kolab_storage_folder($foldername, 'contact');
-                }
-
-                $count = 0;
-                if (count($folders)) {
-                    $userfolder = new kolab_storage_folder_user($user'kolabtargetfolder', '', $user);
-                    $this->folders$userfolder->id = $userfolder;
-                    $this->sources$userfolder->id = $userfolder;
-
-                    foreach ($folders as $folder) {
-                        $this->folders$folder->id = $folder;
-                        $this->sources$folder->id = new kolab_contacts($folder->name);
-                        ;
-                        $count++;
-                    }
-                }
-
-                if ($count >= $limit) {
-                    $search_more_results = true;
-                    break;
-                }
-            }
-        }
+        $query  = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
+        $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
 
-        $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
+        $jsdata = ;
+        $results = ;
 
         // build results list
-        foreach ($this->sources as $id => $source) {
-            $folder = $this->folders$id;
-            $imap_path = explode($delim, $folder->name);
-
-            // find parent
-            do {
-                array_pop($imap_path);
-                $parent_id = kolab_storage::folder_id(implode($delim, $imap_path));
-            } while (count($imap_path) > 1 && empty($this->folders$parent_id));
-
-            // restore "real" parent ID
-            if ($parent_id && empty($this->folders$parent_id)) {
-                $parent_id = kolab_storage::folder_id($folder->get_parent());
-            }
-
-            $prop = $this->driver->abook_prop($id, $source);
-            $prop'parent' = $parent_id;
-
-            $html = $this->addressbook_list_item($id, $prop, $jsdata, true);
+        foreach ($this->driver->search_folders($query, $source) as $prop) {
+            $html = $this->addressbook_list_item($prop'id', $prop, $jsdata, true);
             unset($prop'group');
-            $prop += (array)$jsdata$id;
+            $prop += (array)$jsdata$prop'id';
             $prop'html' = $html;
 
             $results = $prop;
         }
 
         // report more results available
-        if ($search_more_results) {
+        if ($this->driver->search_more_results) {
             $this->rc->output->show_message('autocompletemore', 'notice');
         }
 
@@ -978,25 +919,22 @@
     }
 
     /**
-     *
+     * Handler for address book subscription action
      */
     public function book_subscribe()
     {
-        $success = false;
         $id = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
+        $options = 
+            'permanent' => $_POST'_permanent' ?? null,
+            'active' => $_POST'_active' ?? null,
+            'groups' => !empty($_POST'_groups'),
+        ;
 
-        if ($id && ($folder = kolab_storage::get_folder(kolab_storage::id_decode($id)))) {
-            if (isset($_POST'_permanent')) {
-                $success |= $folder->subscribe(intval($_POST'_permanent'));
-            }
-            if (isset($_POST'_active')) {
-                $success |= $folder->activate(intval($_POST'_active'));
-            }
-
+        if ($success = $this->driver->folder_subscribe($id, $options)) {
             // list groups for this address book
-            if (!empty($_POST'_groups')) {
-                $abook = new kolab_contacts($folder->name);
-                foreach ((array)$abook->list_groups() as $prop) {
+            if ($options'groups') {
+                $abook = $this->driver->get_address_book($id);
+                foreach ((array) $abook->list_groups() as $prop) {
                     $prop'source' = $id;
                     $prop'id' = $prop'ID';
                     unset($prop'ID');
@@ -1014,7 +952,6 @@
         $this->rc->output->send();
     }
 
-
     /**
      * Handler for address book delete action (AJAX)
      */
@@ -1040,6 +977,19 @@
     }
 
     /**
+     * Handle invitations to a shared folder
+     */
+    public function share_invitation()
+    {
+        $id = rcube_utils::get_input_value('id', rcube_utils::INPUT_POST);
+        $invitation = rcube_utils::get_input_value('invitation', rcube_utils::INPUT_POST);
+
+        if ($addressbook = $this->driver->accept_share_invitation($invitation)) {
+            $this->rc->output->command('plugin.share-invitation', 'id' => $id, 'source' => $addressbook);
+        }
+    }
+

roundcubemail-1.5.tar.gz/plugins/kolab_folders/kolab_folders.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_tags/lib/kolab_tags_engine.php Changed

roundcubemail-1.5.tar.gz/plugins/libcalendaring/lib/libcalendaring_itip.php Changed

@@ -110,7 +110,7 @@
         $mailto = rcube_utils::idn_to_ascii($recipient'email');
 
         $headers = $message->headers();
-        $headers'To' = format_email_recipient($mailto, $recipient'name');
+        $headers'To' = format_email_recipient($mailto, $recipient'name' ?? null);
         $headers'Subject' = $this->gettext(
             'name' => $subject,
             'vars' => 
@@ -391,8 +391,8 @@
 
         // check if the given itip object matches the last state
         if ($existing) {
-            $latest = (isset($event'sequence') && intval($existing'sequence') == intval($event'sequence')) ||
-                  (!isset($event'sequence') && $existing'changed' && $existing'changed' >= $event'changed');
+            $latest = intval($existing'sequence' ?? 0) == intval($event'sequence' ?? 0)
+                || (!isset($event'sequence') && !empty($existing'changed') && $existing'changed' >= $event'changed');
         }
 
         // determine action for REQUEST
@@ -421,7 +421,7 @@
             } elseif (in_array($status_lc, $this->rsvp_status)) {
                 $status_text = $this->gettext(($latest ? 'youhave' : 'youhavepreviously') . $status_lc);
 
-                if ($existing && ($existing'sequence' > $event'sequence'
+                if (!empty($existing'sequence') && ($existing'sequence' > $event'sequence'
                     || (!isset($event'sequence') && $existing'changed' && $existing'changed' > $event'changed'))
                 ) {
                     $action = '';  // nothing to do here, outdated invitation

roundcubemail-1.5.tar.gz/plugins/libcalendaring/lib/libcalendaring_recurrence.php Changed

@@ -1,6 +1,7 @@
 <?php
 
 use Sabre\VObject\Recur\EventIterator;
+use Sabre\VObject\Recur\NoInstancesException;
 
 /**
  * Recurrence computation class for shared use.
@@ -82,16 +83,25 @@
 
         $ve = $vcalendar->toSabreComponent($event);
 
-        $this->engine = new EventIterator($ve, null, $this->lib->timezone);
+        try {
+            $this->engine = new EventIterator($ve, null, $this->lib->timezone);
+        } catch (NoInstancesException $e) {
+            // We treat a non-recurring event silently
+            // TODO: What about other exceptions?
+        }
     }
 
     /**
      * Get date/time of the next occurence of this event, and push the iterator.
      *
-     * @return DateTime|false object or False if recurrence ended
+     * @return libcalendaring_datetime|false object or False if recurrence ended
      */
     public function next_start()
     {
+        if (empty($this->engine)) {
+            return false;
+        }
+
         try {
             $this->engine->next();
             $current = $this->engine->getDtStart();
@@ -109,6 +119,10 @@
      */
     public function next_instance()
     {
+        if (empty($this->engine)) {
+            return false;
+        }
+
         // Here's the workaround for an issue for an event with its start date excluded
         // E.g. A daily event starting on 10th which is one of EXDATE dates
         // should return 11th as next_instance() when called for the first time.
@@ -147,10 +161,14 @@
     /**
      * Get the date of the end of the last occurrence of this recurrence cycle
      *
-     * @return DateTime|false End datetime of the last occurrence or False if there's no end date
+     * @return libcalendaring_datetime|false End datetime of the last occurrence or False if there's no end date
      */
     public function end()
     {
+        if (empty($this->engine)) {
+            return $this->toDateTime($this->start);
+        }
+
         // recurrence end date is given
         if (isset($this->recurrence'UNTIL') && $this->recurrence'UNTIL' instanceof DateTimeInterface) {
             return $this->toDateTime($this->recurrence'UNTIL');
@@ -180,10 +198,14 @@
     /**
      * Find date/time of the first occurrence (excluding start date)
      *
-     * @return DateTime|null First occurrence
+     * @return libcalendaring_datetime|null First occurrence
      */
     public function first_occurrence()
     {
+        if (empty($this->engine)) {
+            return $this->toDateTime($this->start);
+        }
+
         $start    = clone $this->start;
         $interval = $this->recurrence'INTERVAL' ?? 1;
         $freq     = $this->recurrence'FREQ' ?? null;

roundcubemail-1.5.tar.gz/plugins/libcalendaring/lib/libcalendaring_vcalendar.php Changed

@@ -1018,12 +1018,12 @@
 
         // encapsulate in VCALENDAR container
         $vcal = new VObject\Component\VCalendar();
-        $vcal->VERSION = '2.0'; // @phpstan-ignore-line
-        $vcal->PRODID = $this->prodid; // @phpstan-ignore-line
-        $vcal->CALSCALE = 'GREGORIAN'; // @phpstan-ignore-line
+        $vcal->VERSION = '2.0';
+        $vcal->PRODID = $this->prodid;
+        $vcal->CALSCALE = 'GREGORIAN';
 
         if (!empty($method)) {
-            $vcal->METHOD = $method; // @phpstan-ignore-line
+            $vcal->METHOD = $method;
         }
 
         // write vcalendar header
@@ -1334,10 +1334,11 @@
             foreach ((array) $event'attachments' as $idx => $attach) {
                 // check available memory and skip attachment export if we can't buffer it
                 // @todo: use rcube_utils::mem_check()
-                if (is_callable($get_attachment) && $memory_limit > 0 && ($memory_used = function_exists('memory_get_usage') ? memory_get_usage() : 16 * 1024 * 1024)
-                    && !empty($attach'size') && $memory_used + $attach'size' * 3 > $memory_limit
-                ) {
-                    continue;
+                if (is_callable($get_attachment) && $memory_limit > 0) {
+                    $memory_used = function_exists('memory_get_usage') ? memory_get_usage() : 16 * 1024 * 1024;
+                    if (!empty($attach'size') && $memory_used + $attach'size' * 3 > $memory_limit) {
+                        continue;
+                    }
                 }
 
                 // embed attachments using the given callback function

roundcubemail-1.5.tar.gz/plugins/libcalendaring/tests/RecurrenceTest.php Changed

@@ -277,8 +277,10 @@
 
         $recurrence = $this->plugin->get_recurrence();
 
+        StderrMock::start();
         $recurrence->init($recurrence_data, $start);
         $first = $recurrence->first_occurrence();
+        StderrMock::stop();
 
         $this->assertEquals($expected, $first ? $first->format('Y-m-d H:i:s') : '');
     }
@@ -299,8 +301,10 @@
 
         $recurrence = $this->plugin->get_recurrence();
 
+        StderrMock::start();
         $recurrence->init($recurrence_data, $start);
         $first = $recurrence->first_occurrence();
+        StderrMock::stop();
 
         $this->assertEquals($expected, $first ? $first->format('Y-m-d H:i:s') : '');
 
@@ -310,6 +314,46 @@
     }
 
     /**
+     * Test for an event with invalid recurrence
+     */
+    public function test_invalid_recurrence_event()
+    {
+        date_default_timezone_set('Europe/Berlin');
+
+        // This is an event with no RRULE, but one RDATE, however the RDATE is cancelled by EXDATE.
+        // This normally causes Sabre\VObject\Recur\NoInstancesException. We make sure it does not happen.
+        // The same will probably happen on any event without recurrence passed to libcalendring_vcalendar.
+
+        $vcal = <<<EOF
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:-//Apple Inc.//iCal 5.0.3//EN
+            CALSCALE:GREGORIAN
+            BEGIN:VEVENT
+            UID:fb1cb690-b963-4ea5-b58f-ac9773e36d9a
+            DTSTART;TZID=Europe/Berlin:20210604T093000
+            DTEND;TZID=Europe/Berlin:20210606T093000
+            RDATE:20210604T073000Z
+            EXDATE;TZID=Europe/Berlin:20210604T093000
+            DTSTAMP:20210528T091628Z
+            LAST-MODIFIED:20210528T091628Z
+            CREATED:20210528T091213Z
+            END:VEVENT
+            END:VCALENDAR
+            EOF;
+
+        $ical = new libcalendaring_vcalendar();
+        $event = $ical->import($vcal)0;
+
+        $recurrence = new libcalendaring_recurrence($this->plugin, $event);
+
+        $this->assertSame($event'start'->format('Y-m-d H:i:s'), $recurrence->end()->format('Y-m-d H:i:s'));
+        $this->assertSame($event'start'->format('Y-m-d H:i:s'), $recurrence->first_occurrence()->format('Y-m-d H:i:s'));
+        $this->assertFalse($recurrence->next_start());
+        $this->assertFalse($recurrence->next_instance());
+    }
+
+    /**
      * Test for libcalendaring_recurrence::next_instance()
      */
     public function test_next_instance()

roundcubemail-1.5.tar.gz/plugins/libcalendaring/tests/VcalendarTest.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/config.inc.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/config.inc.php.dist Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_dav_acl.php Added

@@ -0,0 +1,543 @@
+<?php
+
+/*
+ * DAV Access Control Lists Management
+ *
+ * Copyright (C) Apheleia IT <contact@aphelaia-it.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * A class providing DAV ACL management functionality
+ */
+class kolab_dav_acl
+{
+    public const PRIVILEGE_ALL = 'all';
+    public const PRIVILEGE_READ = 'read';
+    public const PRIVILEGE_FREE_BUSY = 'read-free-busy';
+    public const PRIVILEGE_WRITE = 'write';
+
+    /** @var ?kolab_storage_dav_folder $folder Current folder */
+    private static $folder;
+
+    /** @var array Special principals */
+    private static $specials = 
+        kolab_dav_client::ACL_PRINCIPAL_AUTH,
+        kolab_dav_client::ACL_PRINCIPAL_ALL,
+    ;
+
+
+    /**
+     * Handler for actions from the ACL dialog (AJAX)
+     */
+    public static function actions()
+    {
+        $action = trim(rcube_utils::get_input_string('_act', rcube_utils::INPUT_GPC));
+
+        if ($action == 'save') {
+            self::action_save();
+        } elseif ($action == 'delete') {
+            self::action_delete();
+        }
+
+        rcmail::get_instance()->output->send();
+    }
+
+    /**
+     * Returns folder sharing form (for a Sharing tab)
+     *
+     * @param kolab_storage_dav_folder $folder
+     *
+     * @return null|string Form HTML content
+     */
+    public static function form($folder)
+    {
+        $rcmail = rcmail::get_instance();
+        $myrights = $folder->get_myrights();
+
+        // Any privileges?
+        if (empty($myrights)) {
+            return null;
+        }
+
+        // Return if not folder admin
+        if (strpos($myrights, 'a') === false) {
+            return null;
+        }
+
+        self::$folder = $folder;
+
+        // Add localization labels and include scripts
+        $rcmail->output->add_label(
+            'libkolab.nouser',
+            'libkolab.newuser',
+            'libkolab.editperms',
+            'libkolab.deleteconfirm',
+            'libkolab.delete',
+            'libkolab.norights',
+            'libkolab.saving'
+        );
+
+        $rcmail->output->include_script('list.js');
+        $rcmail->plugins->include_script('libkolab/libkolab.js');
+
+        $rcmail->output->add_handlers(
+            'acltable' => __CLASS__, 'templ_table',
+            'acluser' => __CLASS__, 'templ_user',
+            'aclrights' => __CLASS__, 'templ_rights',
+        );
+
+        $rcmail->output->set_env('acl_target', self::get_folder_id($folder));
+        // $rcmail->output->set_env('acl_users_source', (bool) $this->rc->config->get('acl_users_source'));
+        // $rcmail->output->set_env('autocomplete_max', (int) $rcmail->config->get('autocomplete_max', 15));
+        // $rcmail->output->set_env('autocomplete_min_length', $rcmail->config->get('autocomplete_min_length'));
+        // $rcmail->output->add_label('autocompletechars', 'autocompletemore');
+
+        return $rcmail->output->parse('libkolab.acl', false, false);
+    }
+
+    /**
+     * Creates ACL rights table
+     *
+     * @param array $attrib Template object attributes
+     *
+     * @return string HTML Content
+     */
+    public static function templ_table($attrib)
+    {
+        if (empty($attrib'id')) {
+            $attrib'id' = 'acl-table';
+        }
+
+        $out = self::list_rights($attrib);
+
+        $rcmail = rcmail::get_instance();
+        $rcmail->output->add_gui_object('acltable', $attrib'id');
+
+        return $out;
+    }
+
+    /**
+     * Creates ACL rights form (rights list part)
+     *
+     * @param array $attrib Template object attributes
+     *
+     * @return string HTML Content
+     */
+    public static function templ_rights($attrib)
+    {
+        $rcmail = rcmail::get_instance();
+        $input = new html_checkbox();
+        $ul = '';
+        $attrib'id' = 'rights';
+
+        $rights = 
+            self::PRIVILEGE_READ,
+            self::PRIVILEGE_WRITE,
+            self::PRIVILEGE_ALL,
+        ;
+
+        if (self::$folder->type == 'event' || self::$folder->type == 'task') {
+            array_unshift($rights, self::PRIVILEGE_FREE_BUSY);
+        }
+
+        foreach ($rights as $right) {
+            $id = "acl{$right}";
+            $label = $rcmail->gettext($rcmail->text_exists("libkolab.acllong{$right}") ? "libkolab.acllong{$right}" : "libkolab.acl{$right}");
+            $ul .= html::tag(
+                'li',
+                null,
+                $input->show('', 'name' => "acl{$right}", 'value' => $right, 'id' => $id)
+                . html::label('for' => $id, $label)
+            );
+        }
+
+        return html::tag('ul', $attrib, $ul, html::$common_attrib);
+    }
+
+    /**
+     * Creates ACL rights form (user part)
+     *
+     * @param array $attrib Template object attributes
+     *
+     * @return string HTML Content
+     */
+    public static function templ_user($attrib)
+    {
+        $rcmail = rcmail::get_instance();
+
+        // Create username input
+        $class = !empty($attrib'class') ? $attrib'class' : '';
+        $attrib'name' = 'acluser';
+        $attrib'class' = 'form-control';
+
+        $textfield = new html_inputfield($attrib);
+        $label = html::label('for' => $attrib'id', 'class' => 'input-group-text', $rcmail->gettext('libkolab.username'));
+
+        $fields = 
+            'user' => html::div(
+                'input-group',
+                html::span('input-group-prepend', $label) . ' ' . $textfield->show()
+            ),
+        ;
+
+        foreach (self::$specials as $type) {
+            $fields$type = html::label('for' => 'id' . $type, $rcmail->gettext("libkolab.{$type}"));
+        }
+

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_dav_client.php Changed

@@ -23,6 +23,23 @@
 
 class kolab_dav_client
 {
+    public const ACL_PRINCIPAL_SELF = 'self';
+    public const ACL_PRINCIPAL_ALL = 'all';
+    public const ACL_PRINCIPAL_AUTH = 'authenticated';
+    public const ACL_PRINCIPAL_UNAUTH = 'unauthenticated';
+
+    public const INVITE_ACCEPTED = 'accepted';
+    public const INVITE_DECLINED = 'declined';
+
+    public const NOTIFICATION_SHARE_INVITE = 'share-invite-notification';
+    public const NOTIFICATION_SHARE_REPLY = 'share-reply-notification';
+
+    public const SHARING_READ = 'read';
+    public const SHARING_READ_WRITE = 'read-write';
+    public const SHARING_NO_ACCESS = 'no-access';
+    public const SHARING_OWNER = 'shared-owner';
+    public const SHARING_NOT_SHARED = 'not-shared';
+
     public $url;
 
     protected $user;
@@ -113,19 +130,17 @@
     }
 
     /**
-     * Discover DAV home (root) collection of specified type.
+     * Discover (common) DAV home collections.
      *
-     * @param string $component Component to filter by (VEVENT, VTODO, VCARD)
-     *
-     * @return string|false Home collection location or False on error
+     * @return array|false Homes locations or False on error
      */
-    public function discover($component = 'VEVENT')
+    public function discover()
     {
         if ($cache = $this->get_cache()) {
-            $cache_key = "discover.{$component}." . md5($this->url);
+            $cache_key = "discover." . md5($this->url);
 
-            if ($response = $cache->get($cache_key)) {
-                return $response;
+            if ($homes = $cache->get($cache_key)) {
+                return $homes;
             }
         }
 
@@ -159,22 +174,12 @@
             $principal_href = substr($principal_href, strlen($path));
         }
 
-        $homes = 
-            'VEVENT' => 'calendar-home-set',
-            'VTODO' => 'calendar-home-set',
-            'VCARD' => 'addressbook-home-set',
-        ;
-
-        $ns = 
-            'VEVENT' => 'caldav',
-            'VTODO' => 'caldav',
-            'VCARD' => 'carddav',
-        ;
-
         $body = '<?xml version="1.0" encoding="utf-8"?>'
-            . '<d:propfind xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:' . $ns$component . '">'
+            . '<d:propfind xmlns:d="DAV:" xmlns:cal="urn:ietf:params:xml:ns:caldav" xmlns:card="urn:ietf:params:xml:ns:carddav">'
                 . '<d:prop>'
-                    . '<c:' . $homes$component . ' />'
+                    . '<cal:calendar-home-set/>'
+                    . '<card:addressbook-home-set/>'
+                    . '<d:notification-URL/>'
                 . '</d:prop>'
             . '</d:propfind>';
 
@@ -185,27 +190,54 @@
         }
 
         $elements = $response->getElementsByTagName('response');
+        $homes = ;
 
-        foreach ($elements as $element) {
-            foreach ($element->getElementsByTagName($homes$component) as $prop) {
-                $root_href = $prop->nodeValue;
-                break;
+        if ($element = $response->getElementsByTagName('response')->item(0)) {
+            if ($prop = $element->getElementsByTagName('prop')->item(0)) {
+                foreach ($prop->childNodes as $home) {
+                    if ($home->firstChild && $home->firstChild->localName == 'href') {
+                        $href = $home->firstChild->nodeValue;
+
+                        if ($path && strpos($href, $path) === 0) {
+                            $href = substr($href, strlen($path));
+                        }
+
+                        $homes$home->localName = $href;
+                    }
+                }
             }
         }
 
-        if (empty($root_href)) {
-            return false;
+        if ($cache) {
+            $cache->set($cache_key, $homes);
         }
 
-        if ($path && strpos($root_href, $path) === 0) {
-            $root_href = substr($root_href, strlen($path));
-        }
+        return $homes;
+    }
 
-        if ($cache) {
-            $cache->set($cache_key, $root_href);
+    /**
+     * Get user home folder of specified type
+     *
+     * @param string $type Home type or component name
+     *
+     * @return string|null Folder location href
+     */
+    public function getHome($type)
+    {
+        $options = 
+            'VEVENT' => 'calendar-home-set',
+            'VTODO' => 'calendar-home-set',
+            'VCARD' => 'addressbook-home-set',
+            'NOTIFICATION' => 'notification-URL',
+        ;
+
+        $homes = $this->discover();
+
+        if (is_array($homes) && isset($options$type)) {
+            return $homes$options$type ?? null;
         }
 
-        return $root_href;
+        return null;
     }
 
     /**
@@ -217,9 +249,9 @@
      */
     public function listFolders($component = 'VEVENT')
     {
-        $root_href = $this->discover($component);
+        $root_href = $this->getHome($component);
 
-        if ($root_href === false) {
+        if ($root_href === null) {
             return false;
         }
 
@@ -238,7 +270,8 @@
                 . '<d:prop>'
                     . '<d:resourcetype />'
                     . '<d:displayname />'
-                    // . '<d:sync-token />'
+                    . '<d:share-access/>'   // draft-pot-webdav-resource-sharing-04
+                    . '<d:owner/>'          // RFC 3744 (ACL)
                     . '<cs:getctag />'
                     . $props
                 . '</d:prop>'
@@ -315,7 +348,7 @@
      */
     public function delete($location)
     {
-        $response = $this->request($location, 'DELETE', '', 'Depth' => 1, 'Prefer' => 'return-minimal');
+        $response = $this->request($location, 'DELETE');
 
         return $response !== false;
     }
@@ -346,9 +379,30 @@
      */
     public function folderInfo($location)
     {
+        $ns = implode(' ', 
+            'xmlns:d="DAV:"',
+            'xmlns:cs="http://calendarserver.org/ns/"',
+            'xmlns:c="urn:ietf:params:xml:ns:caldav"',
+            'xmlns:a="http://apple.com/ns/ical/"',
+            'xmlns:k="Kolab:"',
+        );
+
+        // Note: <allprop> does not include some of the properties we're interested in
         $body = '<?xml version="1.0" encoding="utf-8"?>'
-            . '<d:propfind xmlns:d="DAV:">'
-                . '<d:allprop/>'
+            . '<d:propfind ' . $ns . '>'
+                . '<d:prop>'
+                    . '<a:calendar-color/>'
+                    . '<c:supported-calendar-component-set/>'
+                    . '<cs:getctag/>'
+                    . '<d:acl/>'
+                    . '<d:current-user-privilege-set/>'
+                    . '<d:resourcetype/>'
+                    . '<d:displayname/>'

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_dav_sharing.php Added

@@ -0,0 +1,473 @@
+<?php
+
+/*
+ * DAV sharing based on draft-pot-webdav-resource-sharing standard
+ *
+ * Copyright (C) Apheleia IT <contact@aphelaia-it.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * A class providing DAV sharing management functionality
+ */
+class kolab_dav_sharing
+{
+    public const PRIVILEGE_READ = 'read';
+    public const PRIVILEGE_WRITE = 'write';
+
+    /** @var ?kolab_storage_dav_folder $folder Current folder */
+    private static $folder;
+
+    /** @var array Special principals */
+    private static $specials = ;
+
+
+    /**
+     * Handler for actions from the Sharing dialog (AJAX)
+     */
+    public static function actions()
+    {
+        $action = trim(rcube_utils::get_input_string('_act', rcube_utils::INPUT_GPC));
+
+        if ($action == 'save') {
+            self::action_save();
+        } elseif ($action == 'delete') {
+            self::action_delete();
+        }
+
+        rcmail::get_instance()->output->send();
+    }
+
+    /**
+     * Returns folder sharing form (for a Sharing tab)
+     *
+     * @param kolab_storage_dav_folder $folder
+     *
+     * @return null|string Form HTML content
+     */
+    public static function form($folder)
+    {
+        $rcmail = rcmail::get_instance();
+        $myrights = $folder->get_myrights();
+
+        // Any privileges?
+        if (empty($myrights)) {
+            return null;
+        }
+
+        // Return if not folder admin nor can share
+        if (strpos($myrights, 'a') === false && strpos($myrights, '1') === false) {
+            return null;
+        }
+
+        self::$folder = $folder;
+
+        // Add localization labels and include scripts
+        $rcmail->output->add_label(
+            'libkolab.nouser',
+            'libkolab.newuser',
+            'libkolab.editperms',
+            'libkolab.deleteconfirm',
+            'libkolab.delete',
+            'libkolab.norights',
+            'libkolab.saving'
+        );
+
+        $rcmail->output->include_script('list.js');
+        $rcmail->plugins->include_script('libkolab/libkolab.js');
+
+        $rcmail->output->add_handlers(
+            'acltable' => __CLASS__, 'templ_table',
+            'acluser' => __CLASS__, 'templ_user',
+            'aclrights' => __CLASS__, 'templ_rights',
+        );
+
+        $rcmail->output->set_env('acl_target', self::get_folder_id($folder));
+        // $rcmail->output->set_env('acl_users_source', (bool) $this->rc->config->get('acl_users_source'));
+        // $rcmail->output->set_env('autocomplete_max', (int) $rcmail->config->get('autocomplete_max', 15));
+        // $rcmail->output->set_env('autocomplete_min_length', $rcmail->config->get('autocomplete_min_length'));
+        // $rcmail->output->add_label('autocompletechars', 'autocompletemore');
+
+        return $rcmail->output->parse('libkolab.acl', false, false);
+    }
+
+    /**
+     * Creates sharees table
+     *
+     * @param array $attrib Template object attributes
+     *
+     * @return string HTML Content
+     */
+    public static function templ_table($attrib)
+    {
+        if (empty($attrib'id')) {
+            $attrib'id' = 'acl-table';
+        }
+
+        $out = self::list_rights($attrib);
+
+        $rcmail = rcmail::get_instance();
+        $rcmail->output->add_gui_object('acltable', $attrib'id');
+
+        return $out;
+    }
+
+    /**
+     * Creates sharing form (rights list part)
+     *
+     * @param array $attrib Template object attributes
+     *
+     * @return string HTML Content
+     */
+    public static function templ_rights($attrib)
+    {
+        $rcmail = rcmail::get_instance();
+        $input = new html_checkbox();
+        $ul = '';
+        $attrib'id' = 'rights';
+
+        $rights = 
+            self::PRIVILEGE_READ,
+            self::PRIVILEGE_WRITE,
+        ;
+
+        foreach ($rights as $right) {
+            $id = "acl{$right}";
+            $label = $rcmail->gettext($rcmail->text_exists("libkolab.acllong{$right}") ? "libkolab.acllong{$right}" : "libkolab.acl{$right}");
+            $ul .= html::tag(
+                'li',
+                null,
+                $input->show('', 'name' => "acl{$right}", 'value' => $right, 'id' => $id)
+                . html::label('for' => $id, $label)
+            );
+        }
+
+        return html::tag('ul', $attrib, $ul, html::$common_attrib);
+    }
+
+    /**
+     * Creates sharing form (user part)
+     *
+     * @param array $attrib Template object attributes
+     *
+     * @return string HTML Content
+     */
+    public static function templ_user($attrib)
+    {
+        $rcmail = rcmail::get_instance();
+
+        // Create username input
+        $class = !empty($attrib'class') ? $attrib'class' : '';
+        $attrib'name' = 'acluser';
+        $attrib'class' = 'form-control';
+
+        $textfield = new html_inputfield($attrib);
+        $label = html::label('for' => $attrib'id', 'class' => 'input-group-text', $rcmail->gettext('libkolab.username'));
+
+        $fields = 
+            'user' => html::div(
+                'input-group',
+                html::span('input-group-prepend', $label) . ' ' . $textfield->show()
+            ),
+        ;
+
+        foreach (self::$specials as $type) {
+            $fields$type = html::label('for' => 'id' . $type, $rcmail->gettext("libkolab.{$type}"));
+        }
+
+        $ul = '';
+
+        if (count($fields) == 1) {
+            $ul = html::tag('li', null, $fields'user');
+        } else {
+            // Create list with radio buttons
+            foreach ($fields as $key => $val) {
+                $radio = new html_radiobutton('name' => 'usertype');
+                $radio = $radio->show($key == 'user' ? 'user' : '', 'value' => $key, 'id' => 'id' . $key);
+                $ul .= html::tag('li', null, $radio . $val);

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_cache_event.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_dav.php Changed

@@ -247,8 +247,10 @@
 
         // sanity checks
         if (!isset($prop'name') || !is_string($prop'name') || !strlen($prop'name')) {
-            self::$last_error = 'cannotbeempty';
-            return false;
+            if (empty($prop'id')) {
+                self::$last_error = 'cannotbeempty';
+                return false;
+            }
         } elseif (strlen($prop'name') > 256) {
             self::$last_error = 'nametoolong';
             return false;
@@ -269,9 +271,9 @@
         $rcube = rcube::get_instance();
         $uid   = rtrim(chunk_split(md5($prop'name' . $rcube->get_user_name() . uniqid('-', true)), 12, '-'), '-');
         $type  = $this->get_dav_type($prop'type');
-        $home  = $this->dav->discover($type);
+        $home  = $this->dav->getHome($type);
 
-        if ($home === false) {
+        if ($home === null) {
             return false;
         }
 
@@ -560,4 +562,114 @@
 
         return $types$type;
     }
+
+    /**
+     * Accept a share invitation.
+     *
+     * @param string $type     Folder type (contact, event, task)
+     * @param string $location Invitation object location
+     *
+     * @return kolab_storage_dav_folder|false A new folder object, False on error
+     */
+    public function accept_share_invitation($type, $location)
+    {
+        // Note: The 'create-in' property is not supported by Cyrus, and even then we
+        // can't specify the new folder location. The new folder will be created
+        // at implementation-specific location. To find that location we'll compare list of folders
+        // before and after accepting the invitation.
+
+        $old_folders = $this->dav->listFolders($this->get_dav_type($type));
+
+        $result = $this->dav->inviteReply($location);
+
+        if (!$result) {
+            return false;
+        }
+
+        $new_folders = $this->dav->listFolders($this->get_dav_type($type));
+
+        if (is_array($old_folders) && is_array($new_folders)) {
+            foreach ($new_folders as $newfolder) {
+                foreach ($old_folders as $oldfolder) {
+                    if ($oldfolder'href' === $newfolder'href') {
+                        continue 2;
+                    }
+                }
+
+                return new kolab_storage_dav_folder($this->dav, $newfolder, $type);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get a list of share invitations
+     *
+     * @param string $type   Folder type (contact, event, task)
+     * @param string $filter Search string
+     *
+     * @return array List of kolab_storage_dav_folder objects
+     */
+    public function get_share_invitations($type, $filter)
+    {
+        $result = ;
+
+        if (strlen($filter) === 0) {
+            return $result;
+        }
+
+        $notifications = $this->dav->listNotifications(kolab_dav_client::NOTIFICATION_SHARE_INVITE);
+
+        if (is_array($notifications)) {
+            foreach ($notifications as $idx => $note) {
+                // Sanity checks
+                if (empty($note'resource-uri')) {
+                    continue;
+                }
+
+                // Skip accepted invitations
+                if (!empty($note'status') && $note'status' == 'accepted') {
+                    continue;
+                }
+
+                // Filter by folder type
+                if (($type == 'contact' && !empty($note'types'))
+                    || ($type == 'event' && !in_array('VEVENT', $note'types'))
+                    || ($type == 'task' && !in_array('VTODO', $note'types'))
+                ) {
+                    continue;
+                }
+
+                $owner = explode('/', trim($note'organizer' ?? '', '/'));
+                $owner = end($owner);
+                $path = explode('/', trim($note'resource-uri', '/'));
+                $name = end($path);
+                $displayname = $note'displayname' ?? '';
+
+                // Filter by the input text
+                if (stripos($owner . ' ' . $name . ' ' . $displayname, $filter) === false) {
+                    continue;
+                }
+
+                $attrs = 
+                    'owner' => $owner,
+                    'name' => $displayname ?: $name,
+                    'href' => $note'resource-uri',
+                    'invitation' => $note'href',
+                    'alarms' => false,
+                    'myrights' => $note'access' ?? 'read',
+                    'resource_type' => 'shared', 'collection',
+                ;
+
+                $result = new kolab_storage_dav_folder($this->dav, $attrs, $type);
+            }
+
+            usort($result, function ($a, $b) {
+                return strcoll($a->href, $b->href);
+            });
+        }
+
+        return $result;
+    }
 }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_dav_cache_event.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_dav_folder.php Changed

@@ -51,7 +51,45 @@
         $this->subtype = $this->default ? '' : $suffix;
 
         // Init cache
-        $this->cache = kolab_storage_dav_cache::factory($this);
+        if ($type) {
+            $this->cache = kolab_storage_dav_cache::factory($this);
+        }
+    }
+
+    /**
+     * Get the folder ACL
+     *
+     * @return array Folder ACL list
+     */
+    public function get_acl()
+    {
+        if (!isset($this->attributes'acl')) {
+            $this->get_folder_info();
+        }
+
+        $acl = ;
+        foreach ($this->attributes'acl' ??  as $principal => $privileges) {
+            // Convert a principal href into a user identifier
+            if (strpos($principal, '/') !== false) {
+                $tokens = explode('/', trim($principal, '/'));
+                $principal = end($tokens);
+            }
+
+            $acl$principal = $privileges;
+        }
+
+        // Workaround for Cyrus issue https://github.com/cyrusimap/cyrus-imapd/issues/4813
+        // It converts single "authenticated" ACE into two "all" and "unauthenticated"
+        // We'll convert it back into one, as we want to keep UI simplicity
+        if (!empty($acl'all''grant') && !empty($acl'unauthenticated''deny')
+            && $acl'all''grant' == $acl'unauthenticated''deny'
+        ) {
+            $acl'authenticated' = $acl'all';
+            unset($acl'all');
+            unset($acl'unauthenticated');
+        }
+
+        return $acl;
     }
 
     /**
@@ -63,16 +101,20 @@
      */
     public function get_owner($fully_qualified = false)
     {
-        // return cached value
         if (isset($this->owner)) {
             return $this->owner;
         }
 
-        $rcube = rcube::get_instance();
-        $this->owner = $rcube->get_user_name();
-        $this->valid = true;
+        // TODO: Support global shared folders?
 
-        // TODO: Support shared folders
+        if (isset($this->attributes'owner')) {
+            // Assume username/email is the last part of a principal href
+            $path = explode('/', trim($this->attributes'owner', '/'));
+            $this->owner = rawurldecode(end($path));
+        } else {
+            $rcube = rcube::get_instance();
+            $this->owner = $rcube->get_user_name();
+        }
 
         return $this->owner;
     }
@@ -99,7 +141,15 @@
      */
     public function get_namespace()
     {
-        // TODO: Support shared folders
+        // TODO: Support for global shared folders?
+
+        $owner = $this->get_owner();
+        $user = rcube::get_instance()->get_user_name();
+
+        if ($owner != $user) {
+            return 'other';
+        }
+
         return 'personal';
     }
 
@@ -110,7 +160,13 @@
      */
     public function get_name()
     {
-        return kolab_storage_dav::object_name($this->attributes'name');
+        $name = $this->attributes'name';
+
+        if ($this->get_namespace() == 'other') {
+            $name = $this->get_owner() . ': ' . $name;
+        }
+
+        return $name;
     }
 
     /**
@@ -123,9 +179,18 @@
         return $this->attributes'name';
     }
 
+    /**
+     * Get (more) folder properties
+     *
+     * @return array Folder properties
+     */
     public function get_folder_info()
     {
-        return ; // todo ?
+        if ($info = $this->dav->folderInfo($this->href)) {
+            $this->attributes = array_merge($info, $this->attributes);
+        }
+
+        return $this->attributes;
     }
 
     /**
@@ -187,14 +252,98 @@
     }
 
     /**
-     * Get ACL information for this folder
+     * Get current user permissions to this folder
      *
-     * @return string Permissions as string
+     * @return string DAV privileges (comma-separated)
      */
     public function get_myrights()
     {
-        // TODO
-        return '';
+        if (!isset($this->attributes'myrights')) {
+            $this->get_folder_info();
+        }
+
+        $rights = $this->attributes'myrights' ?? ;
+        $types = $this->attributes'resource_type' ?? ;
+        $acl = 'lr';
+
+        // Convert DAV privileges to IMAP-like ACL format
+        foreach ($rights as $right) {
+            switch ($right) {
+                case 'all':
+                    $acl .= 'lrswikxteav';
+                    break;
+                case 'admin':
+                    $acl .= 'a';
+                    break;
+                case 'read':
+                case 'read-free-busy':
+                case 'read-current-user-privilege-set':
+                    $acl .= 'lr';
+                    break;
+                case 'read-write':
+                    $acl .= 'lrwni';
+                    break;
+                case 'write':
+                    //case 'write-properties':
+                    //case 'write-content':
+                    $acl .= 'wni';
+                    break;
+                case 'bind':
+                    $acl .= 'pk';
+                    break;
+                case 'unbind':
+                    $acl .= 'xte';
+                    break;
+                case 'share':
+                    $acl .= '1';
+                    break;
+            }
+        }
+
+        // Shared collection can be deleted even if myrights says otherwise
+        if (in_array('shared', $types)) {
+            $acl .= 'x';
+        }
+
+        if (!empty($this->attributes'share-access')) {
+            if ($this->attributes'share-access' === kolab_dav_client::SHARING_OWNER) {
+                $acl .= 'a';
+            } elseif ($this->attributes'share-access' === kolab_dav_client::SHARING_READ
+                || $this->attributes'share-access' === kolab_dav_client::SHARING_READ_WRITE
+            ) {
+                $acl .= 'x';
+            }
+        }
+
+        // Note: We return a string for compat. with the parent class
+        return implode('', array_unique(str_split($acl)));
+    }
+

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_utils.php Changed

@@ -27,14 +27,17 @@
 {
     public static function folder_form($form, $folder, $domain, $hidden_fields = , $no_acl = false)
     {
-        $rcmail = rcube::get_instance();
+        $rcmail = rcmail::get_instance();
 
         // add folder ACL tab
-        if (!$no_acl && is_string($folder) && strlen($folder)) {
-            $form'sharing' = 
-                'name'    => rcube::Q($rcmail->gettext('libkolab.tabsharing')),
-                'content' => self::folder_acl_form($folder),
-            ;
+        if (!$no_acl && $folder) {
+            if (($folder instanceof kolab_storage_dav_folder) || (is_string($folder) && strlen($folder))) {
+                $sharing_content = self::folder_acl_form($folder);
+                $form'sharing' = 
+                    'name'    => rcube::Q($rcmail->gettext('libkolab.tabsharing')),
+                    'content' => $sharing_content,
+                ;
+            }
         }
 
         $form_html = '';
@@ -71,10 +74,18 @@
 
     /**
      * Handler for ACL form template object
+     *
+     * @param string|kolab_storage_dav_folder $folder DAV folder object or IMAP folder name
+     *
+     * @return ?string HTML content
      */
-    public static function folder_acl_form($folder)
+    private static function folder_acl_form($folder)
     {
-        $rcmail  = rcube::get_instance();
+        if ($folder instanceof kolab_storage_dav_folder) {
+            return self::folder_dav_acl_form($folder);
+        }
+
+        $rcmail  = rcmail::get_instance();
         $storage = $rcmail->get_storage();
         $options = $storage->folder_info($folder);
 
@@ -93,4 +104,29 @@
 
         return html::div('hint', $rcmail->gettext('libkolab.aclnorights'));
     }
+
+    /**
+     * Handler for DAV ACL form template object
+     *
+     * @param kolab_storage_dav_folder $folder DAV folder object
+     *
+     * @return ?string HTML content
+     */
+    private static function folder_dav_acl_form($folder)
+    {
+        $rcmail = rcmail::get_instance();
+        $sharing = $rcmail->config->get('kolab_dav_sharing');
+
+        if (!$sharing) {
+            return null;
+        }
+
+        $class = 'kolab_dav_' . $sharing;
+
+        if ($form = $class::form($folder)) {
+            return $form;
+        }
+
+        return html::div('hint', rcmail::get_instance()->gettext('libkolab.aclnorights'));
+    }
 }

roundcubemail-1.5.tar.gz/plugins/libkolab/libkolab.js Changed

@@ -25,7 +25,7 @@
  * for the JavaScript code in this file.
  */
 
-var libkolab_audittrail = {}, libkolab = {};
+var libkolab_audittrail = {}, libkolab = {}, libkolab_invitations = {};
 
 libkolab_audittrail.quote_html = function(str)
 {
@@ -306,6 +306,8 @@
     // render the results for folderlist search
     function render_search_results(results)
     {
+        libkolab_invitations = {};
+
         if (results.length) {
           // create treelist widget to present the search results
           if (!search_results_widget) {
@@ -340,17 +342,28 @@
                       e.stopPropagation();
                       e.bubbles = false;
 
+                      // Share invitation
+                      if (search_resultsid && 'share_invitation' in search_resultsid && search_resultsid.share_invitation) {
+                          libkolab_invitationsid = { li: li, list: me };
+                          rcmail.http_post(
+                              'plugin.share-invitation',
+                              { id: id, invitation: search_resultsid.share_invitation, status: 'accepted' },
+                              rcmail.set_busy(true, 'libkolab.invitation-accepting')
+                          );
+                          return false;
+                      }
+
                       // activate + subscribe
                       if ($(e.target).hasClass('subscribed')) {
                           search_resultsid.subscribed = true;
                           $(e.target).attr('aria-checked', 'true');
                           li.children().first()
                               .toggleClass('subscribed')
-                              .find('inputtype=checkbox').get(0).checked = true;
+                              .find('inputtype=checkbox').prop('checked', true);
 
                           if (has_children && search_resultsid.group == 'other user') {
                               li.find('ul li > div').addClass('subscribed')
-                                  .find('a.subscribed').attr('aria-checked', 'true');;
+                                  .find('a.subscribed').attr('aria-checked', 'true');
                           }
                       }
                       else if (!this.checked) {
@@ -416,6 +429,15 @@
                   item.find('a.subscribed, span.subscribed').hide();
               }
 
+              // disable click on shared invitations (it will be fixed back in add_result2list)
+              if ('share_invitation' in prop && prop.share_invitation) {
+                  var elem = item.find('a.listname').first();
+                  if (elem.length) {
+                      elem.data('onclick', elem.attr('onclick'))
+                        .attr('onclick', 'return false');
+                  }
+              }
+
               prop.li = item.parent().get(0);
               me.triggerEvent('add-item', prop);
           }
@@ -427,12 +449,15 @@
     // helper method to (recursively) add a search result item to the main list widget
     function add_result2list(id, li, active)
     {
-        var node = search_results_widget.get_node(id),
+        var cl, data,
+            childs = ,
+            node = search_results_widget.get_node(id),
             prop = search_resultsid,
+            classes = prop.group || '',
             parent_id = prop.parent || null,
             has_children = node.children && node.children.length,
             dom_node = has_children ? li.children().first().clone(true, true) : li.children().first(),
-            childs = ;
+            name_node = dom_node.find('a.listname');
 
         // find parent node and insert at the right place
         if (parent_id && me.get_node(parent_id)) {
@@ -447,6 +472,41 @@
             dom_node.children('span,a').first().html(Q(prop.name));
         }
 
+        if (name_node && (data = name_node.data('onclick'))) {
+            name_node.attr('onclick', data).removeData('onclick');
+        }
+
+        // Handle id change (switch IDs for various elements/properties of the list row)
+        if (prop.id && prop.id != id) {
+            if (cl = dom_node.attr('class')) {
+                dom_node.attr('class', cl.replace(id, prop.id));
+            } else {
+                // for addressbook copy 'class' attribute
+                if (cl = dom_node.parent().attr('class')) {
+                    classes += ' ' + cl;
+                }
+                // and remove the checkbox
+                dom_node.children(':not(a)').hide();
+            }
+            dom_node.children('a').each(function() {
+                if (this.id && this.id.includes(id)) {
+                    this.id = this.id.replace(id, prop.id);
+                }
+            });
+            dom_node.find('inputtype=checkbox').each(function() {
+                if (this.value == id) {
+                    this.value = prop.id;
+                }
+            });
+            if (data) {
+                name_node.attr({
+                    onclick: data.replace(id, prop.id),
+                    href: name_node.attr('href').replace(id, prop.id),
+                    rel: name_node.attr('rel').replace(id, prop.id),
+                });
+            }
+        }
+
         // replace virtual node with a real one
         if (me.get_node(id)) {
             $(me.get_item(id, true)).children().first()
@@ -465,8 +525,8 @@
 
             // move this result item to the main list widget
             me.insert({
-                id: id,
-                classes:  prop.group || '' ,
+                id: prop.id || id,
+                classes:  classes ,
                 virtual: prop.virtual,
                 html: dom_node,
                 level: node.level,
@@ -477,7 +537,7 @@
 
         delete prop.html;
         prop.active = active;
-        me.triggerEvent('insert-item', { id: id, data: prop, item: li });
+        me.triggerEvent('insert-item', { id: prop.id || id, data: prop, item: li });
 
         // register childs, too
         if (childs.length) {
@@ -508,6 +568,26 @@
         }
     }
 
+    this.accept_invitation = function (id, prop) {
+        var li = libkolab_invitationsid.li;
+
+        search_resultsid = prop;
+
+        if (prop.active) {
+            li.find('inputtype=checkbox').prop('disabled', false).prop('checked', true);
+        }
+
+        if (prop.listname) {
+            li.find('a.calname').text(prop.listname);
+        }
+
+        li.find('a.quickview').show();
+
+        add_result2list(id, li, prop.active)
+
+        delete libkolab_invitationsid;
+    }
+
     // do some magic when search is performed on the widget
     this.addEventListener('search', function(search) {
         // hide search results
@@ -623,6 +703,312 @@
     kolab_folderlist.prototype = rcube_treelist_widget.prototype;
 }
 
+// =============== ACL UI ===============
+
+// Display new-entry form
+rcube_webmail.prototype.acl_create = function () {
+    this.acl_init_form();
+};
+
+// Display ACL edit form
+rcube_webmail.prototype.acl_edit = function () {
+    var id = this.acl_list.get_single_selection();
+    if (id) {
+        this.acl_init_form(id);
+    }
+};
+
+// ACL entry delete
+rcube_webmail.prototype.acl_delete = function () {
+    var users = this.acl_get_usernames();
+
+    if (users && users.length) {
+        this.confirm_dialog(this.get_label('libkolab.deleteconfirm'), 'delete', function () {
+            rcmail.http_post('plugin.davacl', {
+                _act: 'delete',
+                _user: users.join(','),

roundcubemail-1.5.tar.gz/plugins/libkolab/libkolab.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/localization/en_US.inc Changed

@@ -30,3 +30,35 @@
 $labels'objectchangelognotavailable' = 'History is not available for this object.';
 $labels'tabsharing' = 'Sharing';
 $labels'aclnorights' = 'You do not have administrator rights for this folder.';
+
+// Folder ACL (Sharing tab)
+$labels'add' = 'Add';
+$labels'all' = 'Anyone';
+$labels'authenticated' = 'Authenticated users';
+$labels'identifier' = 'Identifier';
+$labels'newuser' = 'Add entry';
+$labels'actions' = 'Access right actions...';
+$labels'username' = 'User:';
+$labels'myrights' = 'Access Rights';
+$labels'editperms' = 'Edit permissions';
+$labels'aclall' = 'All';
+$labels'aclread' = 'Read';
+$labels'aclwrite' = 'Write';
+$labels'aclread-free-busy' = 'Free-Busy';
+$labels'acllongall' = 'All (administration)';
+
+$labels'ariasummaryacltable' = 'List of access rights';
+$labels'arialabelaclactions' = 'List actions';
+$labels'arialabelaclform' = 'Access rights form';
+
+$messages'deleting' = 'Deleting access rights...';
+$messages'saving' = 'Saving access rights...';
+$messages'updatesuccess' = 'Successfully changed access rights';
+$messages'deletesuccess' = 'Successfully deleted access rights';
+$messages'createsuccess' = 'Successfully added access rights';
+$messages'updateerror' = 'Unable to update access rights';
+$messages'deleteerror' = 'Unable to delete access rights';
+$messages'createerror' = 'Unable to add access rights';
+$messages'deleteconfirm' = 'Are you sure, you want to remove access rights of selected user(s)?';
+$messages'norights' = 'No rights has been specified!';
+$messages'nouser' = 'No username has been specified!';

roundcubemail-1.5.tar.gz/plugins/libkolab/skins/elastic/templates/acl.html Added

@@ -0,0 +1,33 @@
+<div id="acllist-container" class="table-widget">
+	<div id="acllist-content" class="content">
+		<h2 class="voice" id="aria-label-acltable"><roundcube:label name="libkolab.ariasummaryacltable" /></h2>
+		<roundcube:object name="acltable" id="acltable" class="records-table options-table" aria-labelledby="aria-label-acltable" role="listbox" />
+	</div>
+	<div id="acllist-footer" class="footer toolbar menu">
+		<roundcube:button command="acl-create" type="link" class="create disabled" classAct="create"
+			label="libkolab.add" title="libkolab.newuser" innerClass="inner" />
+		<roundcube:button name="aclmenulink" type="link"
+			label="actions" title="libkolab.actions" href="#acl-actions"
+			class="actions" innerClass="inner" data-popup="acl-menu" />
+	</div>
+</div>
+
+<div id="acl-menu" class="popupmenu" aria-hidden="true" data-align="bottom">
+	<h3 id="aria-label-aclactions" class="voice"><roundcube:label name="libkolab.arialabelaclactions" /></h3>
+	<ul class="menu listing iconized" role="menu" aria-labelledby="aria-label-aclactions">
+		<roundcube:button command="acl-edit" label="edit" type="link-menuitem" class="edit disabled" classAct="edit active" />
+		<roundcube:button command="acl-delete" label="delete" type="link-menuitem" class="delete disabled" classAct="delete active" />
+	</ul>
+</div>
+
+<div id="aclform" class="popupmenu formcontent" aria-labelledby="aria-label-aclform" role="form">
+	<h3 id="aria-label-aclform" class="voice"><roundcube:label name="libkolab.arialabelaclform" /></h3>
+	<div class="row form-group">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="libkolab.identifier" /></label>
+		<roundcube:object name="acluser" id="acluser" class="proplist col-sm-8" />
+	</div>
+	<div class="row form-group">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="libkolab.myrights" /></label>
+		<roundcube:object name="aclrights" class="proplist col-sm-8" />
+	</div>
+</div>

roundcubemail-1.5.tar.gz/plugins/libkolab/skins/kolab/templates/acl.html Added

@@ -0,0 +1,33 @@
+<div id="acllist-container" class="table-widget">
+	<div id="acllist-content" class="content">
+		<h2 class="voice" id="aria-label-acltable"><roundcube:label name="libkolab.ariasummaryacltable" /></h2>
+		<roundcube:object name="acltable" id="acltable" class="records-table options-table" aria-labelledby="aria-label-acltable" role="listbox" />
+	</div>
+	<div id="acllist-footer" class="footer toolbar menu">
+		<roundcube:button command="acl-create" type="link" class="create disabled" classAct="create"
+			label="libkolab.add" title="libkolab.newuser" innerClass="inner" />
+		<roundcube:button name="aclmenulink" type="link"
+			label="actions" title="libkolab.actions" href="#acl-actions"
+			class="actions" innerClass="inner" data-popup="acl-menu" />
+	</div>
+</div>
+
+<div id="acl-menu" class="popupmenu" aria-hidden="true" data-align="bottom">
+	<h3 id="aria-label-aclactions" class="voice"><roundcube:label name="libkolab.arialabelaclactions" /></h3>
+	<ul class="menu listing iconized" role="menu" aria-labelledby="aria-label-aclactions">
+		<roundcube:button command="acl-edit" label="edit" type="link-menuitem" class="edit disabled" classAct="edit active" />
+		<roundcube:button command="acl-delete" label="delete" type="link-menuitem" class="delete disabled" classAct="delete active" />
+	</ul>
+</div>
+
+<div id="aclform" class="popupmenu formcontent" aria-labelledby="aria-label-aclform" role="form">
+	<h3 id="aria-label-aclform" class="voice"><roundcube:label name="libkolab.arialabelaclform" /></h3>
+	<div class="row form-group">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="libkolab.identifier" /></label>
+		<roundcube:object name="acluser" id="acluser" class="proplist col-sm-8" />
+	</div>
+	<div class="row form-group">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="libkolab.myrights" /></label>
+		<roundcube:object name="aclrights" class="proplist col-sm-8" />
+	</div>
+</div>

roundcubemail-1.5.tar.gz/plugins/libkolab/skins/larry/images Added

roundcubemail-1.5.tar.gz/plugins/libkolab/skins/larry/images/enabled.png Added

roundcubemail-1.5.tar.gz/plugins/libkolab/skins/larry/images/partial.png Added

roundcubemail-1.5.tar.gz/plugins/libkolab/skins/larry/libkolab.css Changed

@@ -141,3 +141,104 @@
 	width: 60px;
 	padding-right: 0;
 }
+
+#aclcontainer {
+	overflow-x: auto;
+	border: 1px solid #CCDDE4;
+	background-color: #D9ECF4;
+	height: 272px;
+	box-shadow: none;
+}
+
+#acllist-content {
+	position: relative;
+	height: 230px;
+	background-color: white;
+}
+
+#acllist-footer {
+	position: relative;
+}
+
+#acltable {
+	width: 100%;
+	border-collapse: collapse;
+	border: none;
+}
+
+#acltable th,
+#acltable td {
+	white-space: nowrap;
+	text-align: center;
+}
+
+#acltable thead tr th {
+	font-size: 11px;
+	font-weight: bold;
+}
+
+#acltable tbody td {
+	text-align: center;
+	height: 16px;
+	cursor: default;
+}
+
+#acltable thead tr > .user {
+	width: 30%;
+	border-left: none;
+}
+
+#acltable.advanced thead tr > .user {
+	width: 25%;
+}
+
+#acltable tbody td.user {
+	text-align: left;
+}
+
+#acltable tbody td.partial {
+	background-image: url(images/partial.png);
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
+#acltable tbody td.enabled {
+	background-image: url(images/enabled.png);
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
+#acltable tbody tr.selected td.partial {
+	background-color: #019bc6;
+	background-image: url(images/partial.png), -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+	background-image: url(images/partial.png), linear-gradient(top, #019bc6 0%, #017cb4 100%);
+}
+
+#acltable tbody tr.selected td.enabled {
+	background-color: #019bc6;
+	background-image: url(images/enabled.png), linear-gradient(top, #019bc6 0%, #017cb4 100%);
+}
+
+#aclform {
+	display: none;
+}
+
+#aclform div {
+	padding: 0;
+	text-align: center;
+	clear: both;
+}
+
+#aclform ul {
+	list-style: none;
+	margin: 0.2em;
+	padding: 0;
+}
+
+#aclform ul li label {
+	margin-left: 0.5em;
+}
+
+ul.toolbarmenu li span.delete {
+	background-position: 0 -1509px;
+}

roundcubemail-1.5.tar.gz/plugins/libkolab/skins/larry/templates/acl.html Added

@@ -0,0 +1,27 @@
+<div id="aclcontainer" class="uibox listbox">
+<div id="acllist-content" class="scroller withfooter">
+    <h2 class="voice" id="aria-label-acltable"><roundcube:label name="libkolab.ariasummaryacltable" /></h2>
+    <roundcube:object name="acltable" id="acltable" class="records-table" aria-labelledby="aria-label-acltable" role="listbox" />
+</div>
+<div id="acllist-footer" class="boxfooter">
+    <roundcube:button command="acl-create" id="aclcreatelink" type="link" title="libkolab.newuser" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="aclmenulink" id="aclmenulink" type="link" title="libkolab.actions" class="listbutton groupactions" onclick="return UI.toggle_popup('aclmenu', event)" innerClass="inner" content="&#9881;" aria-haspopup="true" aria-expanded="false" aria-owns="aclmenu-menu" />
+</div>
+</div>
+
+<div id="aclmenu" class="popupmenu" aria-hidden="true" data-align="bottom">
+    <h3 id="aria-label-aclactions" class="voice"><roundcube:label name="libkolab.arialabelaclactions" /></h3>
+    <ul id="aclmenu-menu" class="toolbarmenu selectable iconized" role="menu" aria-labelledby="aria-label-aclactions">
+        <li role="menuitem"><roundcube:button command="acl-edit" label="edit" type="link" class="icon" classAct="icon active" innerclass="icon edit" /></li>
+        <li role="menuitem"><roundcube:button command="acl-delete" label="delete" type="link" class="icon" classAct="icon active" innerclass="icon delete" /></li>
+    </ul>
+</div>
+
+<div id="aclform" class="propform" aria-labelledby="aria-label-aclform" role="form">
+    <h3 id="aria-label-aclform" class="voice"><roundcube:label name="libkolab.arialabelaclform" /></h3>
+    <fieldset class="thinbordered"><legend><roundcube:label name="libkolab.identifier" /></legend>
+        <roundcube:object name="acluser" id="acluser" size="35" class="proplist" />
+    </fieldset>
+    <fieldset class="thinbordered"><legend><roundcube:label name="libkolab.myrights" /></legend>
+        <roundcube:object name="aclrights" class="proplist" />
+    </fieldset>
+</div>

roundcubemail-1.5.tar.gz/plugins/libkolab/skins/plesk/templates/acl.html Added

@@ -0,0 +1,33 @@
+<div id="acllist-container" class="table-widget">
+	<div id="acllist-content" class="content">
+		<h2 class="voice" id="aria-label-acltable"><roundcube:label name="libkolab.ariasummaryacltable" /></h2>
+		<roundcube:object name="acltable" id="acltable" class="records-table options-table" aria-labelledby="aria-label-acltable" role="listbox" />
+	</div>
+	<div id="acllist-footer" class="footer toolbar menu">
+		<roundcube:button command="acl-create" type="link" class="create disabled" classAct="create"
+			label="libkolab.add" title="libkolab.newuser" innerClass="inner" />
+		<roundcube:button name="aclmenulink" type="link"
+			label="actions" title="libkolab.actions" href="#acl-actions"
+			class="actions" innerClass="inner" data-popup="acl-menu" />
+	</div>
+</div>
+
+<div id="acl-menu" class="popupmenu" aria-hidden="true" data-align="bottom">
+	<h3 id="aria-label-aclactions" class="voice"><roundcube:label name="libkolab.arialabelaclactions" /></h3>
+	<ul class="menu listing iconized" role="menu" aria-labelledby="aria-label-aclactions">
+		<roundcube:button command="acl-edit" label="edit" type="link-menuitem" class="edit disabled" classAct="edit active" />
+		<roundcube:button command="acl-delete" label="delete" type="link-menuitem" class="delete disabled" classAct="delete active" />
+	</ul>
+</div>
+
+<div id="aclform" class="popupmenu formcontent" aria-labelledby="aria-label-aclform" role="form">
+	<h3 id="aria-label-aclform" class="voice"><roundcube:label name="libkolab.arialabelaclform" /></h3>
+	<div class="row form-group">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="libkolab.identifier" /></label>
+		<roundcube:object name="acluser" id="acluser" class="proplist col-sm-8" />
+	</div>
+	<div class="row form-group">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="libkolab.myrights" /></label>
+		<roundcube:object name="aclrights" class="proplist col-sm-8" />
+	</div>
+</div>

roundcubemail-1.5.tar.gz/plugins/libkolab/tests/LibkolabTest.php Added

@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * libkolab class tests
+ *
+ * @author Aleksander Machniak <machniak@apheleia-it.ch>
+ *
+ * Copyright (C) Apheleia IT <contact@apheleia-it.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class LibkolabTest extends PHPUnit\Framework\TestCase
+{
+    public function test_html_diff_plain()
+    {
+        // Empty input
+        $text1 = '';
+        $text2 = '';
+        $diff = libkolab::html_diff($text1, $text2);
+        $this->assertSame('', $diff);
+
+        $text1 = 'test plain text';
+        $text2 = '';
+        $diff = libkolab::html_diff($text1, $text2);
+        $this->assertSame('<del>test plain text</del>', $diff);
+
+        $text1 = '';
+        $text2 = 'test plain text';
+        $diff = libkolab::html_diff($text1, $text2);
+        $this->assertSame('<ins>test plain text</ins>', $diff);
+
+        $text1 = 'test plain text';
+        $text2 = 'test plain text';
+        $diff = libkolab::html_diff($text1, $text2);
+        $this->assertSame('test plain text', $diff);
+
+        // TODO: more cases e.g. multiline
+    }
+
+    public function test_html_diff_html()
+    {
+        $text1 = '<html><p>test plain text</p></html>';
+        $text2 = '';
+        $diff = libkolab::html_diff($text1, $text2);
+        $this->assertSame('<p class="diffmod"><del class="diffmod">test plain text</del></p><div class="diffmod pre"></div>', $diff);
+
+        $text1 = '';
+        $text2 = '<html><p>test plain text</p></html>';
+        $diff = libkolab::html_diff($text1, $text2);
+        $this->assertSame('<div class="diffmod pre"></div><p class="diffmod"><ins class="diffmod">test plain text</ins></p>', $diff);
+
+        $text1 = '<html><p>test plain text</p></html>';
+        $text2 = 'test plain text';
+        $diff = libkolab::html_diff($text1, $text2);
+        $this->assertSame('<p class="diffmod"><div class="diffmod pre">test plain text</p></div>', $diff);
+
+        $text1 = '<html><p>test plain text</p></html>';
+        $text2 = '<html><p>test</p></html>';
+        $diff = libkolab::html_diff($text1, $text2);
+        $this->assertSame('<p>test<del class="diffdel"> plain text</del></p>', $diff);
+
+        // TODO: more cases e.g. multiline
+    }
+}

roundcubemail-1.5.tar.gz/plugins/tasklist/drivers/caldav/tasklist_caldav_driver.php Changed

@@ -96,16 +96,15 @@
             $alarms = !isset($folder->attributes'alarms') || $folder->attributes'alarms';
         } else {
             $alarms = false;
-            $rights = 'lr';
             $editable = false;
-            if ($myrights = $folder->get_myrights()) {
-                $rights = $myrights;
-                if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false) {
-                    $editable = strpos($rights, 'i') !== false;
-                }
+            $rights = $folder->get_myrights();
+            $editable = strpos($rights, 'i') !== false;
+            $norename = strpos($rights, 'x') === false;
+
+            if (!empty($folder->attributes'invitation')) {
+                $invitation = $folder->attributes'invitation';
+                $active = true;
             }
-            $info = $folder->get_folder_info();
-            $norename = !$editable || $info'norename' || $info'protected';
         }
 
         $list_id = $folder->id;
@@ -113,14 +112,14 @@
         return 
             'id' => $list_id,
             'name' => $folder->get_name(),
-            'listname' => $folder->get_foldername(),
+            'listname' => $folder->get_name(),
             'editname' => $folder->get_foldername(),
             'color' => $folder->get_color('0000CC'),
             'showalarms' => $prefs$list_id'showalarms' ?? $alarms,
             'editable' => $editable,
             'rights'    => $rights,
             'norename' => $norename,
-            'active' => !isset($prefs$list_id'active') || !empty($prefs$list_id'active'),
+            'active' => $active ?? (!isset($prefs$list_id'active') || !empty($prefs$list_id'active')),
             'owner' => $folder->get_owner(),
             'parentfolder' => $folder->get_parent(),
             'default' => $folder->default,
@@ -133,6 +132,7 @@
             'class' => trim($folder->get_namespace() . ($folder->default ? ' default' : '')),
             'caldavuid' => '', // $folder->get_uid(),
             'history' => !empty($this->bonnie_api),
+            'share_invitation' => $invitation ?? null,
         ;
     }
 
@@ -416,49 +416,32 @@
      */
     public function search_lists($query, $source)
     {
-        /*
-                $this->search_more_results = false;
-                $this->lists = $this->folders = array();
-
-                // find unsubscribed IMAP folders that have "event" type
-                if ($source == 'folders') {
-                    foreach ((array)kolab_storage::search_folders('task', $query, array('other')) as $folder) {
-                        $this->folders$folder->id = $folder;
-                        $this->lists$folder->id = $this->folder_props($folder, array());
-                    }
-                }
-                // search other user's namespace via LDAP
-                else if ($source == 'users') {
-                    $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
-                    foreach (kolab_storage::search_users($query, 0, array(), $limit * 10) as $user) {
-                        $folders = array();
-                        // search for tasks folders shared by this user
-                        foreach (kolab_storage::list_user_folders($user, 'task', false) as $foldername) {
-                            $folders = new kolab_storage_folder($foldername, 'task');
-                        }
+        $this->search_more_results = false;
+        $this->lists = $this->folders = ;
 
-                        if (count($folders)) {
-                            $userfolder = new kolab_storage_folder_user($user'kolabtargetfolder', '', $user);
-                            $this->folders$userfolder->id = $userfolder;
-                            $this->lists$userfolder->id = $this->folder_props($userfolder, array());
+        // find unsubscribed IMAP folders that have "event" type
+        if ($source == 'folders') {
+            foreach ((array) $this->storage->search_folders('task', $query, 'other') as $folder) {
+                $this->folders$folder->id = $folder;
+                $this->lists$folder->id = $this->folder_props($folder, );
+            }
+        }
+        // find other user's calendars (invitations)
+        elseif ($source == 'users') {
+            // we have slightly more space, so display twice the number
+            $limit = $this->rc->config->get('autocomplete_max', 15) * 2;
 
-                            foreach ($folders as $folder) {
-                                $this->folders$folder->id = $folder;
-                                $this->lists$folder->id = $this->folder_props($folder, array());
-                                $count++;
-                            }
-                        }
+            foreach ($this->storage->get_share_invitations('task', $query) as $invitation) {
+                $this->folders$invitation->id = $invitation;
+                $this->lists$invitation->id = $this->folder_props($invitation, );
 
-                        if ($count >= $limit) {
-                            $this->search_more_results = true;
-                            break;
-                        }
-                    }
+                if (count($this->lists) > $limit) {
+                    $this->search_more_results = true;
                 }
+            }
+        }
 
-                return $this->get_lists();
-        */
-        return ;
+        return $this->get_lists();
     }
 
     /**
@@ -1434,6 +1417,31 @@
         return false;
     }
 
+    /**
+     * Accept an invitation to a shared folder
+     *
+     * @param string $href Invitation location href
+     *
+     * @return array|false
+     */
+    public function accept_share_invitation($href)
+    {
+        $folder = $this->storage->accept_share_invitation('task', $href);
+
+        if ($folder === false) {
+            return false;
+        }
+
+        // Activate the folder
+        $prefs'kolab_tasklists' = $this->rc->config->get('kolab_tasklists', );
+        $prefs'kolab_tasklists'$folder->id'active' = true;
+
+        $tasklist = $this->folder_props($folder, $prefs'kolab_tasklists');
+
+        $this->rc->user->save_prefs($prefs);
+
+        return $tasklist;
+    }
 
     /**
      * Get attachment properties
@@ -1568,7 +1576,8 @@
         $this->_read_lists();
 
         if (!empty($list'id') && ($list = $this->lists$list'id')) {
-            $folder_name = $this->get_folder($list'id')->name;
+            $folder = $this->get_folder($list'id');
+            $folder_name = $folder->name;
         } else {
             $folder_name = '';
         }
@@ -1591,6 +1600,6 @@
             $form'properties''fields'$f = $fieldprop$f;
         }
 
-        return kolab_utils::folder_form($form, $folder_name, 'tasklist', $hidden_fields, true);
+        return kolab_utils::folder_form($form, $folder ?? null, 'tasklist', $hidden_fields);
     }
 }

roundcubemail-1.5.tar.gz/plugins/tasklist/drivers/tasklist_driver.php Changed

roundcubemail-1.5.tar.gz/plugins/tasklist/tasklist.js Changed

roundcubemail-1.5.tar.gz/plugins/tasklist/tasklist.php Changed

@@ -22,6 +22,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * Tasklist plugin
+ *
+ * @property tasklist_driver          $driver
+ * @property libcalendaring_vcalendar $ical
+ * @property libcalendaring_itip      $itip
+ */
 #AllowDynamicProperties
 class tasklist extends rcube_plugin
 {
@@ -129,6 +136,8 @@
             $this->register_action('itip-delegate', $this, 'mail_itip_delegate');
             $this->add_hook('refresh', $this, 'refresh');
 
+            $this->rc->plugins->register_action('plugin.share-invitation', $this->ID, $this, 'share_invitation');
+
             $this->collapsed_tasks = array_filter(explode(',', $this->rc->config->get('tasklist_collapsed_tasks', '')));
         } elseif ($args'task' == 'mail') {
             if ($args'action' == 'show' || $args'action' == 'preview') {
@@ -1461,6 +1470,18 @@
         return (empty($task'organizer') || in_array(strtolower($task'organizer''email'), $emails));
     }
 
+    /**
+     * Handle invitations to a shared folder
+     */
+    public function share_invitation()
+    {
+        $id = rcube_utils::get_input_value('id', rcube_utils::INPUT_POST);
+        $invitation = rcube_utils::get_input_value('invitation', rcube_utils::INPUT_POST);
+
+        if ($tasklist = $this->driver->accept_share_invitation($invitation)) {
+            $this->rc->output->command('plugin.share-invitation', 'id' => $id, 'source' => $tasklist);
+        }
+    }
 
     /*******  UI functions  ********/
 
@@ -2268,7 +2289,7 @@
                             $existing'free_busy' = 'free';
                         }
 
-                        $success = $this->driver->edit_event($existing);
+                        $success = $this->driver->edit_task($existing);
                     } else {
                         $error_msg = $this->gettext('newerversionexists');
                     }

roundcubemail-1.5.tar.gz/plugins/tasklist/tasklist_ui.php Changed

@@ -273,7 +273,7 @@
 
         if (!empty($prop'virtual')) {
             $classes = 'virtual';
-        } elseif (empty($prop'editable')) {
+        } elseif (strpos($prop'rights', 'i') === false && strpos($prop'rights', 'w') === false) {
             $classes = 'readonly';
         }
         if (!empty($prop'subscribed')) {
@@ -285,30 +285,50 @@
 
         if (!$activeonly || !empty($prop'active')) {
             $label_id = 'tl:' . $id;
+            $listname = !empty($prop'listname') ? $prop'listname' : $prop'name';
+            $actions = '';
+
             $chbox = html::tag('input', 
                     'type'    => 'checkbox',
                     'name'    => '_list',
                     'value'   => $id,
-                    'checked' => !empty($prop'active'),
+                    'checked' => !empty($prop'active') && empty($prop'share_invitation'),
                     'title'   => $this->plugin->gettext('activate'),
                     'aria-labelledby' => $label_id,
             );
 
-            $actions = '';
             if (!empty($prop'removable')) {
                 $actions .= html::a('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist'), ' ');
             }
-            $actions .= html::a('href' => '#', 'class' => 'quickview', 'title' => $this->plugin->gettext('focusview'), 'role' => 'checkbox', 'aria-checked' => 'false', ' ');
+
+            $actions .= html::a(
+                
+                    'href' => '#',
+                    'class' => 'quickview',
+                    'title' => $this->plugin->gettext('focusview'),
+                    'role' => 'checkbox',
+                    'aria-checked' => 'false',
+                    'style' => !empty($prop'share_invitation') ? 'display:none' : null,
+                ,
+                ' '
+            );
+
             if (isset($prop'subscribed')) {
-                $actions .= html::a('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('tasklistsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop'subscribed' ? 'true' : 'false', ' ');
+                $actions .= html::a(
+                    
+                        'href' => '#',
+                        'class' => 'subscribed',
+                        'title' => $this->plugin->gettext('tasklistsubscribe'),
+                        'role' => 'checkbox',
+                        'aria-checked' => $prop'subscribed' ? 'true' : 'false',
+                    ,
+                    ' '
+                );
             }
 
             return html::div(
                 implode(' ', $classes),
-                html::a(
-                    'class' => 'listname', 'title' => $title, 'href' => '#', 'id' => $label_id,
-                    !empty($prop'listname') ? $prop'listname' : $prop'name'
-                )
+                html::a('class' => 'listname', 'title' => $title, 'href' => '#', 'id' => $label_id, $listname)
                     . (!empty($prop'virtual') ? '' : $chbox . html::span('actions', $actions))
             );
         }
@@ -352,7 +372,7 @@
         }
 
         foreach ((array) $this->plugin->driver->get_lists() as $id => $prop) {
-            if (!empty($prop'editable') || strpos($prop'rights', 'i') !== false) {
+            if (!empty($prop'rights') && strpos($prop'rights', 'i') !== false) {
                 $select->add($prop'name', $id);
                 if (!$default || !empty($prop'default')) {
                     $default = $id;

roundcubemail-1.5.tar.gz/program/lib/Roundcube/rcube.php Changed

roundcubemail-1.5.tar.gz/program/lib/Roundcube/rcube_config.php Changed

roundcubemail-1.5.tar.gz/vendor/autoload.php Changed

roundcubemail-1.5.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit47f803f8dcd4752060133e0d43733417
+class ComposerAutoloaderInit9b5a2a6b8cab043cdb9f39005ac65b14
 {
     private static $loader;
 
@@ -24,20 +24,20 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit47f803f8dcd4752060133e0d43733417', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit9b5a2a6b8cab043cdb9f39005ac65b14', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit47f803f8dcd4752060133e0d43733417', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit9b5a2a6b8cab043cdb9f39005ac65b14', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit47f803f8dcd4752060133e0d43733417::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit9b5a2a6b8cab043cdb9f39005ac65b14::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit47f803f8dcd4752060133e0d43733417::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit9b5a2a6b8cab043cdb9f39005ac65b14::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
                 $GLOBALS'__composer_autoload_files'$fileIdentifier = true;

roundcubemail-1.5.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit47f803f8dcd4752060133e0d43733417
+class ComposerStaticInit9b5a2a6b8cab043cdb9f39005ac65b14
 {
     public static $files = array (
         '383eaff206634a77a1be54e64e6459c7' => __DIR__ . '/..' . '/sabre/uri/lib/functions.php',
@@ -1153,10 +1153,10 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit47f803f8dcd4752060133e0d43733417::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit47f803f8dcd4752060133e0d43733417::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit47f803f8dcd4752060133e0d43733417::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit47f803f8dcd4752060133e0d43733417::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit9b5a2a6b8cab043cdb9f39005ac65b14::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit9b5a2a6b8cab043cdb9f39005ac65b14::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit9b5a2a6b8cab043cdb9f39005ac65b14::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit9b5a2a6b8cab043cdb9f39005ac65b14::$classMap;
 
         }, null, ClassLoader::class);
     }

roundcubemail-1.5.tar.gz/vendor/composer/include_paths.php Changed

roundcubemail-1.5.tar.gz/vendor/composer/installed.json Changed

@@ -2493,30 +2493,31 @@
         },
         {
             "name": "pear/net_sieve",
-            "version": "1.4.6",
-            "version_normalized": "1.4.6.0",
+            "version": "1.4.7",
+            "version_normalized": "1.4.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Net_Sieve.git",
-                "reference": "ea79747d73e6d4017716d9bab2e760f7df3249d7"
+                "reference": "31b3ef38d75e681d5589c5ed2267314b79c1dfe8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Net_Sieve/zipball/ea79747d73e6d4017716d9bab2e760f7df3249d7",
-                "reference": "ea79747d73e6d4017716d9bab2e760f7df3249d7",
+                "url": "https://api.github.com/repos/pear/Net_Sieve/zipball/31b3ef38d75e681d5589c5ed2267314b79c1dfe8",
+                "reference": "31b3ef38d75e681d5589c5ed2267314b79c1dfe8",
                 "shasum": ""
             },
             "require": {
                 "pear/net_socket": "~1.2",
-                "pear/pear-core-minimal": "~1.10"
+                "pear/pear-core-minimal": "~1.10",
+                "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7"
+                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^9"
             },
             "suggest": {
                 "pear/auth_sasl": "Install optionally via your project's composer.json"
             },
-            "time": "2022-12-02T17:19:07+00:00",
+            "time": "2024-04-08T07:54:10+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3185,17 +3186,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.66",
-            "version_normalized": "1.10.66.0",
+            "version": "1.10.67",
+            "version_normalized": "1.10.67.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd"
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/94779c987e4ebd620025d9e5fdd23323903950bd",
-                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493",
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493",
                 "shasum": ""
             },
             "require": {
@@ -3204,7 +3205,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2024-03-28T16:17:31+00:00",
+            "time": "2024-04-16T07:22:02+00:00",
             "bin": 
                 "phpstan",
                 "phpstan.phar"
@@ -3240,10 +3241,6 @@
                 {
                     "url": "https://github.com/phpstan",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
                 }
             ,
             "install-path": "../phpstan/phpstan"
@@ -4405,17 +4402,17 @@
         },
         {
             "name": "sabre/xml",
-            "version": "2.2.6",
-            "version_normalized": "2.2.6.0",
+            "version": "2.2.7",
+            "version_normalized": "2.2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/xml.git",
-                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b"
+                "reference": "f1d53d55976bbd4cf3e640dda6ebc31120c71a4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/xml/zipball/9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
-                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
+                "url": "https://api.github.com/repos/sabre-io/xml/zipball/f1d53d55976bbd4cf3e640dda6ebc31120c71a4e",
+                "reference": "f1d53d55976bbd4cf3e640dda6ebc31120c71a4e",
                 "shasum": ""
             },
             "require": {
@@ -4431,7 +4428,7 @@
                 "phpstan/phpstan": "^0.12",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
             },
-            "time": "2023-06-28T12:56:05+00:00",
+            "time": "2024-04-18T10:15:43+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -5210,17 +5207,17 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.9.0",
-            "version_normalized": "3.9.0.0",
+            "version": "3.9.2",
+            "version_normalized": "3.9.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
+                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480",
+                "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480",
                 "shasum": ""
             },
             "require": {
@@ -5232,7 +5229,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
-            "time": "2024-02-16T15:06:51+00:00",
+            "time": "2024-04-23T20:25:34+00:00",
             "bin": 
                 "bin/phpcbf",
                 "bin/phpcs"

roundcubemail-1.5.tar.gz/vendor/composer/installed.php Changed

@@ -3,7 +3,7 @@
         'name' => 'roundcube/roundcubemail',
         'pretty_version' => 'dev-dev/kolab-1.5',
         'version' => 'dev-dev/kolab-1.5',
-        'reference' => '5a11cebc1263c6f15d0db5419e6f99e6f5299208',
+        'reference' => '7c0e89250c0499db3b8724d24186f22872c7f8d1',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -435,9 +435,9 @@
             'dev_requirement' => false,
         ),
         'pear/net_sieve' => array(
-            'pretty_version' => '1.4.6',
-            'version' => '1.4.6.0',
-            'reference' => 'ea79747d73e6d4017716d9bab2e760f7df3249d7',
+            'pretty_version' => '1.4.7',
+            'version' => '1.4.7.0',
+            'reference' => '31b3ef38d75e681d5589c5ed2267314b79c1dfe8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/net_sieve',
             'aliases' => array(),
@@ -534,9 +534,9 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.10.66',
-            'version' => '1.10.66.0',
-            'reference' => '94779c987e4ebd620025d9e5fdd23323903950bd',
+            'pretty_version' => '1.10.67',
+            'version' => '1.10.67.0',
+            'reference' => '16ddbe776f10da6a95ebd25de7c1dbed397dc493',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
@@ -665,7 +665,7 @@
         'roundcube/roundcubemail' => array(
             'pretty_version' => 'dev-dev/kolab-1.5',
             'version' => 'dev-dev/kolab-1.5',
-            'reference' => '5a11cebc1263c6f15d0db5419e6f99e6f5299208',
+            'reference' => '7c0e89250c0499db3b8724d24186f22872c7f8d1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -732,9 +732,9 @@
             'dev_requirement' => false,
         ),
         'sabre/xml' => array(
-            'pretty_version' => '2.2.6',
-            'version' => '2.2.6.0',
-            'reference' => '9cde7cdab1e50893cc83b037b40cd47bfde42a2b',
+            'pretty_version' => '2.2.7',
+            'version' => '2.2.7.0',
+            'reference' => 'f1d53d55976bbd4cf3e640dda6ebc31120c71a4e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/xml',
             'aliases' => array(),
@@ -849,9 +849,9 @@
             'dev_requirement' => false,
         ),
         'squizlabs/php_codesniffer' => array(
-            'pretty_version' => '3.9.0',
-            'version' => '3.9.0.0',
-            'reference' => 'd63cee4890a8afaf86a22e51ad4d97c91dd4579b',
+            'pretty_version' => '3.9.2',
+            'version' => '3.9.2.0',
+            'reference' => 'aac1f6f347a5c5ac6bc98ad395007df00990f480',
             'type' => 'library',
             'install_path' => __DIR__ . '/../squizlabs/php_codesniffer',
             'aliases' => array(),

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/index Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Changed

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@4b1a9e3e78e3.(none)> 1711661961 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@4b1a9e3e78e3.(none)> 1711661961 +0000	checkout: moving from master to master
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@4b1a9e3e78e3.(none)> 1711661961 +0000	reset: moving to 39a754269fe6e5d94b0fe87215e89232876bda01
+0000000000000000000000000000000000000000 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@6b8a02cf809b.(none)> 1715154366 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@6b8a02cf809b.(none)> 1715154366 +0000	checkout: moving from master to master
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@6b8a02cf809b.(none)> 1715154366 +0000	reset: moving to 39a754269fe6e5d94b0fe87215e89232876bda01

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/info/packs Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-1c8f1be85029ad4c3188377c73e0e57739009524.idx Deleted

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-1c8f1be85029ad4c3188377c73e0e57739009524.pack Deleted

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-f701c855ce2611b4b87b2ffaf6af4bd5c0f6fc8c.idx Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-f701c855ce2611b4b87b2ffaf6af4bd5c0f6fc8c.pack Added

roundcubemail-1.5.tar.gz/vendor/pear/net_sieve/.github/workflows/tests.yml Changed

@@ -9,13 +9,13 @@
 
 jobs:
   linux_tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
 
     strategy:
       fail-fast: true
       matrix:
-        php: "5.3", "5.4", "5.5", "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"
+        php: "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"
 
     name: PHP ${{ matrix.php }}/Linux
 
@@ -31,9 +31,11 @@
           tools: composer:v2
           coverage: none
 
-      - name: Fix PHPUnit for PHP 8
-        run: composer config platform.php 7.4
-        if: matrix.php >= 8.0
+      - name: Setup tests for PHP < 7.4
+        if: matrix.php < 7.4
+        run: |
+          composer require --dev 'phpunit/phpunit:^4.8.36 || ^5.7.21 || ^6 || ^7' --no-update
+          sed -i 's/: void//g' tests/*.php
 
       - name: Install dependencies
         run: composer install --prefer-dist --no-interaction --no-progress

roundcubemail-1.5.tar.gz/vendor/pear/net_sieve/Sieve.php Changed

@@ -94,22 +94,23 @@
      *
      * @var array
      */
-    var $supportedAuthMethods = array(
+    var $supportedAuthMethods = 
         'DIGEST-MD5',
         'CRAM-MD5',
         'EXTERNAL',
         'PLAIN' ,
         'LOGIN',
         'GSSAPI',
-        'XOAUTH2'
-    );
+        'XOAUTH2',
+        'OAUTHBEARER'
+    ;
 
     /**
      * SASL authentication methods that require Auth_SASL.
      *
      * @var array
      */
-    var $supportedSASLAuthMethods = array('DIGEST-MD5', 'CRAM-MD5');
+    var $supportedSASLAuthMethods = 'DIGEST-MD5', 'CRAM-MD5';
 
     /**
      * The socket handle.
@@ -130,14 +131,14 @@
      *
      * @var array
      */
-    var $_capability = array();
+    var $_capability = ;
 
     /**
      * Current state of the connection.
      *
      * One of the NET_SIEVE_STATE_* constants.
      *
-     * @var integer
+     * @var int
      */
     var $_state;
 
@@ -158,7 +159,7 @@
     /**
      * Whether to enable debugging.
      *
-     * @var boolean
+     * @var bool
      */
     var $_debug = false;
 
@@ -174,14 +175,14 @@
     /**
      * Whether to pick up an already established connection.
      *
-     * @var boolean
+     * @var bool
      */
     var $_bypassAuth = false;
 
     /**
      * Whether to use TLS if available.
      *
-     * @var boolean
+     * @var bool
      */
     var $_useTLS = true;
 
@@ -225,13 +226,15 @@
      * @param string  $host       Hostname of server.
      * @param string  $port       Port of server.
      * @param string  $logintype  Type of login to perform (see
-     *                            $supportedAuthMethods).
+     *                            $supportedAuthMethods), use `OAUTH` and lib
+     *                            will choose between OAUTHBEARER or XOAUTH2
+     *                            according the server's capabilities.
      * @param string  $euser      Effective user. If authenticating as an
      *                            administrator, login as this user.
-     * @param boolean $debug      Whether to enable debugging (@see setDebug()).
+     * @param bool    $debug      Whether to enable debugging (@see setDebug()).
      * @param string  $bypassAuth Skip the authentication phase. Useful if the
      *                            socket is already open.
-     * @param boolean $useTLS     Use TLS if available.
+     * @param bool    $useTLS     Use TLS if available.
      * @param array   $options    Additional options for
      *                            stream_context_create().
      * @param mixed   $handler    A callback handler for the debug output.
@@ -281,7 +284,7 @@
     /**
      * Returns any error that may have been generated in the constructor.
      *
-     * @return boolean|PEAR_Error  False if no error, PEAR_Error otherwise.
+     * @return bool|PEAR_Error False if no error, PEAR_Error otherwise.
      */
     function getError()
     {
@@ -291,8 +294,8 @@
     /**
      * Sets the debug state and handler function.
      *
-     * @param boolean $debug   Whether to enable debugging.
-     * @param string  $handler A custom debug handler. Must be a valid callback.
+     * @param bool   $debug   Whether to enable debugging.
+     * @param string $handler A custom debug handler. Must be a valid callback.
      *
      * @return void
      */
@@ -331,7 +334,7 @@
     /**
      * Connects to the server and logs in.
      *
-     * @return boolean  True on success, PEAR_Error on failure.
+     * @return bool|PEAR_Error True on success, PEAR_Error on failure.
      */
     function _handleConnectAndLogin()
     {
@@ -357,9 +360,9 @@
      * @param string  $port    Port of server.
      * @param array   $options List of options to pass to
      *                         stream_context_create().
-     * @param boolean $useTLS  Use TLS if available.
+     * @param bool    $useTLS  Use TLS if available.
      *
-     * @return boolean  True on success, PEAR_Error otherwise.
+     * @return bool|PEAR_Error True on success, PEAR_Error otherwise.
      */
     function connect($host, $port, $options = null, $useTLS = true)
     {
@@ -423,10 +426,10 @@
     /**
      * Disconnect from the Sieve server.
      *
-     * @param boolean $sendLogoutCMD Whether to send LOGOUT command before
-     *                               disconnecting.
+     * @param bool $sendLogoutCMD Whether to send LOGOUT command before
+     *                            disconnecting.
      *
-     * @return boolean  True on success, PEAR_Error otherwise.
+     * @return bool|PEAR_Error True on success, PEAR_Error otherwise.
      */
     function disconnect($sendLogoutCMD = true)
     {
@@ -440,9 +443,9 @@
      * @param string  $pass       Login password.
      * @param string  $logintype  Type of login method to use.
      * @param string  $euser      Effective UID (perform on behalf of $euser).
-     * @param boolean $bypassAuth Do not perform authentication.
+     * @param bool    $bypassAuth Do not perform authentication.
      *
-     * @return boolean  True on success, PEAR_Error otherwise.
+     * @return bool|PEAR_Error True on success, PEAR_Error otherwise.
      */
     function login($user, $pass, $logintype = null, $euser = '', $bypassAuth = false)
     {
@@ -456,7 +459,7 @@
             return $this->_pear->raiseError('Not currently in AUTHORISATION state', 1);
         }
 
-        if (!$bypassAuth ) {
+        if (!$bypassAuth) {
             $res = $this->_cmdAuthenticate($user, $pass, $logintype, $euser);
             if (is_a($res, 'PEAR_Error')) {
                 return $res;
@@ -473,7 +476,7 @@
      *
      * @param string $active Will be set to the name of the active script
      *
-     * @return array  Indexed array of scriptnames, PEAR_Error on failure
+     * @return array|PEAR_Error Indexed array of scriptnames, PEAR_Error on failure
      */
     function listScripts(&$active = null)
     {
@@ -491,7 +494,7 @@
     /**
      * Returns the active script.
      *
-     * @return string  The active scriptname.
+     * @return string|null The active scriptname.
      */
     function getActive()
     {
@@ -505,7 +508,7 @@
      *
      * @param string $scriptname The name of the script to be set as active.
      *
-     * @return boolean  True on success, PEAR_Error on failure.
+     * @return bool|PEAR_Error True on success, PEAR_Error on failure.
      */
     function setActive($scriptname)
     {
@@ -517,7 +520,7 @@
      *
      * @param string $scriptname The name of the script to be retrieved.
      *
-     * @return string  The script on success, PEAR_Error on failure.
+     * @return string|PEAR_Error The script on success, PEAR_Error on failure.
      */

roundcubemail-1.5.tar.gz/vendor/pear/net_sieve/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar Changed

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar.asc Changed

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmYFl+cACgkQUcZzBf/C
-5cAS1g//S99FoemVRWTmzdRPtlwFVnYom0MA1cx6Wgz6d3Tjj2AGKl3o/mY6+V5+
-Gqm0LEwuMlBHmHcBG/ZajpcDy0s5eBNY0t7wNCL2juXz9I89z8TJC6ypYVLFqKRR
-iNqCeqR4i23ZTdqNWnvS8w3ZzrLa5z+mY9AEAz+mjK2k2fZjpAYP6YoFsNYYUQ+z
-WaU0YgYloJhdUZqF722KjTW0oP7nJ5cz5r43dPkR54XjO2ieq+HsOXk2JGClMrLh
-XG3yrceo03TQOdi2mp3xiX1vOe/BRApn0mQW94afHpzzgBwoK/GOx8KHbFfpDqhe
-l3xsnLLOl2UoeHF3FQVM4UiCAGWDZnW6kBZr4mfEWg9liRMV57B3CwQaqcPqCtoY
-Ti6tN2jgcBoKfowpiYx6u8NuRg+ZYkG25VEJpVuFOFt9lnlD7PeaEVTRasPsV+4P
-TJaILAttW/HcEk5oS1yVHy9Fi7EcNozzEEnSkGUX2lcOawhdnhNrt9t3foW0zWAz
-405nt/BNMtMcSscgoR/61/u9DbwJasW6VFoT/oup0bPvk2ok3v/xaSlkal8Wy5OY
-K8DF5JGnEIWM/Dwl9ubsI+C+L1JZTHa0eePN8IE3bwoE6IBGgERL81B1kfdgIT+X
-yuqEIQRRe1zdDDAgaxMrjYf3JntMli5Bd66G+ykmM1hfK/C+NPM=
-=LVUD
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmYeJvgACgkQUcZzBf/C
+5cCOqQ/8D0idBljs/5h0aJmBcLdThaoESPRpGUzIVfU860mPAViajDSj9goyGdlD
+OclH2iBakSQv3QoImnWszHfLW7i3Xxmy+/FomyQrrrOZ4tJnEgC/v94AXpFX33lu
+5Ew4sXDrFV2TpT7kgi354aq8m8LXZFSWio4tiOrxqBdGCUVWbap+5dbU7HuxrM4k
+R3suUGSgde9VNnFZaK6qC0Tudtjkrhb/NKuH/rMRxwMtPbdT61r7p37PoP51JJ25
+vjtnGklbzG+Y7NdOkv6c+8RwfSra5oQx2MUxrWRKEVluUKDD7ZhSW3wIZgV7GJih
+REyqHFBiW3V19csTWGyVdKmPXxCbRGhAiawb/qFGoOgxQBXKbF3zZ/5WDQUdwPYX
+6XoFRzJ2Ey4TjiXHXvMlQhIQxSsUEWoeZcLqas5y9wLN6xBVR3PLA/qgpkMK165K
+SGKRUW78FKtNjpYWalbrjBe8HWlQ9Ho9G1hOACjYUxeBTaO8UwfJ7JKjhEOXuzcH
+1/mJ0hKg94lyV0ONp6xqtV3E/sIJOW/h7X9HcftA/J0CSZOWVwAIJJ3tvAoe+4Z3
+pzCs6JWJR8lec+9p+oFaiSSNsPa1xwSDeaWZ2Wf8RTc0gUr0umQz9gyiQr6i6AMR
+7qpCMCss4hTN/4ZAkvunKNEvgcWX9PUy5m4snNCN/D+y44hVRZo=
+=FwC0
 -----END PGP SIGNATURE-----

roundcubemail-1.5.tar.gz/vendor/sabre/xml/.github/workflows/ci.yml Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Deserializer/functions.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/xml/lib/Version.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/CHANGELOG.md Changed

@@ -1,10 +1,105 @@
 # Changelog
+
 The file documents changes to the PHP_CodeSniffer project.
 
 ## Unreleased
 
 _Nothing yet._
 
+## 3.9.2 - 2024-04-24
+
+### Changed
+- The Generic.ControlStructures.DisallowYodaConditions sniff no longer listens for the null coalesce operator. #458
+    - Thanks to Rodrigo Primo@rodrigoprimo for the patch.
+- Various housekeeping, including improvements to the tests and documentation.
+    - Thanks to Dan Wallis@fredden, Rodrigo Primo@rodrigoprimo and Juliette Reinders Folmer@jrfnl for their contributions.
+
+### Fixed
+- Fixed bug #381 : Squiz.Commenting.ClosingDeclarationComment could throw the wrong error when the close brace being examined is at the very end of a file.
+    - Thanks to Rodrigo Primo@rodrigoprimo for the patch.
+- Fixed bug #385 : Generic.CodeAnalysis.JumbledIncrementer improved handling of parse errors/live coding.
+    - Thanks to Rodrigo Primo@rodrigoprimo for the patch.
+- Fixed bug #394 : Generic.Functions.CallTimePassByReference was not flagging call-time pass-by-reference in anonymous class instantiations
+    - Thanks to Rodrigo Primo@rodrigoprimo for the patch.
+- Fixed bug #420 : PEAR.Functions.FunctionDeclaration could run into a blocking PHP notice while fixing code containing a parse error.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #421 : File::getMethodProperties() small performance improvement & more defensive coding.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #423 : PEAR.WhiteSpace.ScopeClosingBrace would have a fixer conflict with itself when a close tag was preceded by non-empty inline HTML.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #424 : PSR2.Classes.ClassDeclaration using namespace relative interface names in the extends/implements part of a class declaration would lead to a fixer conflict.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #427 : Squiz.Operators.OperatorSpacing would have a fixer conflict with itself when an operator was preceeded by a new line and the previous line ended in a comment.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #430 : Squiz.ControlStructures.ForLoopDeclaration: fixed potential undefined array index notice
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #431 : PSR2.Classes.ClassDeclaration will no longer try to auto-fix multi-line interface implements statements if these are interlaced with comments on their own line. This prevents a potential fixer conflict.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #453 : Arrow function tokenization was broken when the return type was a stand-alone `true` or `false`; or contained `true` or `false` as part of a union type.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Other
+- ESLint 9.0 has been released and changes the supported configuration file format.
+    The (deprecated) `Generic.Debug.ESLint` sniff only supports the "old" configuration file formats and when using the sniff to run ESLint, the `ESLINT_USE_FLAT_CONFIG=false` environment variable will need to be set when using ESLint >= 9.0.
+    For more information, see #436.
+
+
+ESLint 9.0: https://eslint.org/blog/2024/04/eslint-v9.0.0-released/#flat-config-is-now-the-default-and-has-some-changes
+
+#381: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/381
+#385: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/385
+#394: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/394
+#420: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/420
+#421: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/421
+#423: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/423
+#424: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/424
+#427: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/427
+#430: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/430
+#431: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/431
+#436: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/436
+#453: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/453
+#458: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/458
+
+## 3.9.1 - 2024-03-31
+
+### Added
+- Documentation for the following sniffs:
+    - Generic.PHP.RequireStrictTypes
+    - Squiz.WhiteSpace.MemberVarSpacing
+    - Squiz.WhiteSpace.ScopeClosingBrace
+    - Squiz.WhiteSpace.SuperfluousWhitespace
+    - Thanks to Jay McPartland@jonmcp and Rodrigo Primo@rodrigoprimo for the patches.
+
+### Changed
+- The following sniffs have received performance related improvements:
+    - Generic.CodeAnalysis.UselessOverridingMethod
+    - Generic.Files.ByteOrderMark
+    - Thanks to Rodrigo Primo@rodrigoprimo for the patches.
+- Performance improvement for the "Diff" report. Should be most notable for Windows users. #355
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch.
+- The test suite has received some performance improvements. Should be most notable contributors using Windows. #351
+    - External standards with sniff tests using the PHP_CodeSniffer native test framework will also benefit from these changes.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch.
+- Various housekeeping, including improvements to the tests and documentation.
+    - Thanks to Jay McPartland@jonmcp, João Pedro Oliveira@jpoliveira08, Rodrigo Primo@rodrigoprimo and Juliette Reinders Folmer@jrfnl for their contributions.
+
+### Fixed
+- Fixed bug #289 : Squiz.WhiteSpace.OperatorSpacing and PSR12.Operators.OperatorSpacing : improved fixer conflict protection by more strenuously avoiding handling operators in declare statements.
+    - Thanks to Dan Wallis@fredden for the patch.
+- Fixed bug #366 : Generic.CodeAnalysis.UselessOverridingMethod : prevent false negative when the declared method name and the called method name do not use the same case.
+    - Thanks to Rodrigo Primo@rodrigoprimo for the patch.
+- Fixed bug #368 : Squiz.Arrays.ArrayDeclaration fixer did not handle static closures correctly when moving array items to their own line.
+    - Thanks to Michał Bundyra@michalbundyra for the patch.
+- Fixed bug #404 : Test framework : fixed PHP 8.4 deprecation notice.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+#289: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/289
+#351: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/351
+#355: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/355
+#366: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/366
+#368: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/368
+#404: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/404
+
 ## 3.9.0 - 2024-02-16
 
 ### Added
@@ -54,7 +149,7 @@
     - Thanks to Dan Wallis@fredden, Joachim Noreiko@joachim-n, Remi Collet@remicollet, Rodrigo Primo@rodrigoprimo and Juliette Reinders Folmer@jrfnl for their contributions
 
 ### Deprecated
-- Support for scanning JavaScript and CSS files. See #2448.
+- Support for scanning JavaScript and CSS files. See #2448sq-2448.
     - This also means that all sniffs which are only aimed at JavaScript or CSS files are now deprecated.
     - The Javascript and CSS Tokenizers, all Javascript and CSS specific sniffs, and support for JS and CSS in select sniffs which support multiple file types, will be removed in version 4.0.0.
 - The abstract `PHP_CodeSniffer\Filters\ExactMatch::getBlacklist()` and `PHP_CodeSniffer\Filters\ExactMatch::getWhitelist()` methods are deprecated and will be removed in the 4.0 release. See #198.
@@ -62,7 +157,7 @@
     - To make Filters extending `ExactMatch` cross-version compatible with both PHP_CodeSniffer 3.9.0+ as well as 4.0+, implement the new `getDisallowedFiles()` and `getAllowedFiles()` methods.
         - When both the `getDisallowedFiles()` and `getAllowedFiles()` methods as well as the `getBlacklist()` and `getWhitelist()` are available, the new methods will take precedence over the old methods.
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- The MySource standard and all sniffs in it. See #2471.
+- The MySource standard and all sniffs in it. See #2471sq-2471.
     - The MySource standard and all sniffs in it will be removed in version 4.0.0.
 - The `Zend.Debug.CodeAnalyzer` sniff. See #277.
     - This sniff will be removed in version 4.0.0.
@@ -97,8 +192,8 @@
     - For anyone who missed the discussion about this and is interested to be on this list, please feel invited to submit a PR to add yourself.
         The list is located in the `.github` folder.
 
-#2448: https://github.com/squizlabs/PHP_CodeSniffer/issues/2448
-#2471: https://github.com/squizlabs/PHP_CodeSniffer/issues/2471
+sq-2448: https://github.com/squizlabs/PHP_CodeSniffer/issues/2448
+sq-2471: https://github.com/squizlabs/PHP_CodeSniffer/issues/2471
 #27: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/27
 #127: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/127
 #196: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/196
@@ -106,7 +201,7 @@
 #198: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/198
 #227: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/227
 #235: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/235
-#277: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/277
+#277: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/277
 #281: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/281
 #288: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/288
 #296: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/296
@@ -162,8 +257,8 @@
     - Thanks to Rodrigo Primo@rodrigoprimo for the patch
 
 #124: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/124
-#150: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/150
-#154: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/154
+#150: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/150
+#154: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/154
 #178: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/178
 #205: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/205
 #211: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/211
@@ -183,7 +278,7 @@
     - PHIVE users may need to clear the PHIVE URL cache.
         - PHIVE users who don't use the package alias, but refer to the package URL, will need to update the URL from `https://squizlabs.github.io/PHP_CodeSniffer/phars/` to `https://phars.phpcodesniffer.com/phars/`.
     - Users who download the PHAR files using curl or wget, will need to update the download URL from `https://squizlabs.github.io/PHP_CodeSniffer/phpcs|phpcbf.phar` or `https://github.com/squizlabs/PHP_CodeSnifffer/releases/latest/download/phpcs|phpcbf.phar` to `https://phars.phpcodesniffer.com/phpcs|phpcbf.phar`.
-    - For users who install PHP_CodeSniffer via the setup-php(https://github.com/shivammathur/setup-php/) action runner for GitHub Actions, nothing changes.
+    - For users who install PHP_CodeSniffer via the Setup-PHP(https://github.com/shivammathur/setup-php/) action runner for GitHub Actions, nothing changes.
     - Users using a git clone will need to update the clone address from `git@github.com:squizlabs/PHP_CodeSniffer.git` to `git@github.com:PHPCSStandards/PHP_CodeSniffer.git`.
         - Contributors will need to fork the new repo and add both the new fork as well as the new repo as remotes to their local git copy of PHP_CodeSniffer.
         - Users who have (valid) open issues or pull requests in the `squizlabs/PHP_CodeSniffer` repository are invited to resubmit these to the `PHPCSStandards/PHP_CodeSniffer` repository.
@@ -231,7 +326,7 @@
     - Thanks to Atsushi Okui@blue32a for the patch
 - Support for PHPUnit 8 and 9 to the test suite
     - Test suites for external standards which run via the PHPCS native test suite can now run on PHPUnit 4-9 (was 4-7)
-    - If any of these tests use the PHPUnit `setUp()`/`tearDown()` methods or overload the `setUp()` in the `AbstractSniffUnitTest` test case, they will need to be adjusted. See the PR details for further information(https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/59/commits/26384ebfcc0b1c1651b0e1e40c9b6c8c22881832)
+    - If any of these tests use the PHPUnit `setUp()`/`tearDown()` methods or overload the `setUp()` in the `AbstractSniffUnitTest` test case, they will need to be adjusted. See the PR details for further information(https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/59/commits/bc302dd977877a22c5e60d42a2f6b7d9e9192dab)
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
 ### Changed
@@ -244,7 +339,7 @@
     - Invalid sniff properties set for sniffs via inline annotations will result in an informative `Internal.PropertyDoesNotExist` errror on line 1 of the scanned file, but will not halt the execution of PHPCS
     - For sniff developers, it is strongly recommended for sniffs to explicitly declare any user-adjustable public properties
         - If dynamic properties need to be supported for a sniff, either declare the magic __set()/__get()/__isset()/__unset() methods on the sniff or let the sniff extend stdClass
-        - Note: The #\AllowDynamicProperties attribute will have no effect for properties which are being set in rulesets
+        - Note: The `#\AllowDynamicProperties` attribute will have no effect for properties which are being set in rulesets
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - The third parameter for the Ruleset::setSniffProperty() method has been changed to expect an array
     - Sniff developers/integrators of PHPCS may need to make some small adjustments to allow for this change
@@ -303,128 +398,129 @@
     - Use composer or the PHAR files instead
 
 ### Fixed
-- Fixed bug #2857 : Squiz/NonExecutableCode: prevent false positives when exit is used in a ternary expression or as default with null coalesce
+- Fixed bug #2857sq-2857 : Squiz/NonExecutableCode: prevent false positives when exit is used in a ternary expression or as default with null coalesce
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3386 : PSR1/SideEffects : improved recognition of disable/enable annotations
+- Fixed bug #3386sq-3386 : PSR1/SideEffects : improved recognition of disable/enable annotations
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3557 : Squiz.Arrays.ArrayDeclaration will now ignore PHP 7.4 array unpacking when determining whether an array is associative
+- Fixed bug #3557sq-3557 : Squiz.Arrays.ArrayDeclaration will now ignore PHP 7.4 array unpacking when determining whether an array is associative
     - Thanks to Volker Dusch@edorian for the patch
-- Fixed bug #3592 : Squiz/NonExecutableCode: prevent false positives when a PHP 8.0+ inline throw expression is encountered
+- Fixed bug #3592sq-3592 : Squiz/NonExecutableCode: prevent false positives when a PHP 8.0+ inline throw expression is encountered
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3715 : Generic/UnusedFunctionParameter: fixed incorrect errorcode for closures/arrow functions nested within extended classes/classes which implement
+- Fixed bug #3715sq-3715 : Generic/UnusedFunctionParameter: fixed incorrect errorcode for closures/arrow functions nested within extended classes/classes which implement

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/README.md Changed

@@ -1,16 +1,17 @@
-PHP_CodeSniffer
-=====================================================
+# PHP_CodeSniffer
 
 <div aria-hidden="true">
 
 !Latest Stable Version(http://poser.pugx.org/phpcsstandards/php_codesniffer/v)(https://github.com/PHPCSStandards/PHP_CodeSniffer/releases)
 !Validate(https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/validate.yml/badge.svg?branch=master)(https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/validate.yml)
-!Test(https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/test.yml/badge.svg?branch=master)(https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/test.yml)
+!Test(https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/test.yml/badge.svg?branch=master)GHA-test
 !Coverage Status(https://coveralls.io/repos/github/PHPCSStandards/PHP_CodeSniffer/badge.svg?branch=master)(https://coveralls.io/github/PHPCSStandards/PHP_CodeSniffer?branch=master)
 !License(http://poser.pugx.org/phpcsstandards/php_codesniffer/license)(https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt)
 
 !Minimum PHP Version(https://img.shields.io/packagist/php-v/squizlabs/php_codesniffer.svg?maxAge=3600)
-!Tested on PHP 5.4 to 8.3(https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4%20|%208.0%20|%208.1%20|%208.2%20|%208.3-brightgreen.svg?maxAge=2419200)(https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/test.yml)
+!Tested on PHP 5.4 to 8.3(https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4%20|%208.0%20|%208.1%20|%208.2%20|%208.3-brightgreen.svg?maxAge=2419200)GHA-test
+
+GHA-test: https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/test.yml
 
 </div>
 
@@ -71,6 +72,7 @@
 ./vendor/bin/phpcs -h
 ./vendor/bin/phpcbf -h
 ```
+
 ### Phive
 If you use Phive, you can install PHP_CodeSniffer as a project tool using the following commands:
 ```bash
@@ -82,6 +84,7 @@
 ./tools/phpcs -h
 ./tools/phpcbf -h
 ```
+
 ### Git Clone
 You can also download the PHP_CodeSniffer source and run the `phpcs` and `phpcbf` commands directly from the Git clone:
 ```bash
@@ -90,6 +93,7 @@
 php bin/phpcs -h
 php bin/phpcbf -h
 ```
+
 ## Getting Started
 
 The default coding standard used by PHP_CodeSniffer is the PEAR coding standard. To check a file against the PEAR coding standard, simply specify the file's location:

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/autoload.php Changed

@@ -16,6 +16,9 @@
 
 namespace PHP_CodeSniffer;
 
+use Composer\Autoload\ClassLoader;
+use Exception;
+
 if (class_exists('PHP_CodeSniffer\Autoload', false) === false) {
     class Autoload
     {
@@ -77,7 +80,7 @@
                     && @file_exists(__DIR__.'/../../autoload.php') === true
                 ) {
                     self::$composerAutoloader = include __DIR__.'/../../autoload.php';
-                    if (self::$composerAutoloader instanceof \Composer\Autoload\ClassLoader) {
+                    if (self::$composerAutoloader instanceof ClassLoader) {
                         self::$composerAutoloader->unregister();
                         self::$composerAutoloader->register();
                     } else {
@@ -282,7 +285,7 @@
         public static function getLoadedClassName($path)
         {
             if (isset(self::$loadedClasses$path) === false) {
-                throw new \Exception("Cannot get class name for $path; file has not been included");
+                throw new Exception("Cannot get class name for $path; file has not been included");
             }
 
             return self::$loadedClasses$path;
@@ -301,7 +304,7 @@
         public static function getLoadedFileName($class)
         {
             if (isset(self::$loadedFiles$class) === false) {
-                throw new \Exception("Cannot get file name for $class; class has not been included");
+                throw new Exception("Cannot get file name for $class; class has not been included");
             }
 
             return self::$loadedFiles$class;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/bin/phpcbf Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/bin/phpcs Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Config.php Changed

@@ -12,9 +12,12 @@
 
 namespace PHP_CodeSniffer;
 
+use Exception;
+use Phar;
 use PHP_CodeSniffer\Exceptions\DeepExitException;
 use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Util\Common;
+use PHP_CodeSniffer\Util\Standards;
 
 /**
  * Stores the configuration used to run PHPCS and PHPCBF.
@@ -81,7 +84,7 @@
      *
      * @var string
      */
-    const VERSION = '3.9.0';
+    const VERSION = '3.9.2';
 
     /**
      * Package stability; either stable, beta or alpha.
@@ -265,7 +268,7 @@
             $cleaned = ;
 
             // Check if the standard name is valid, or if the case is invalid.
-            $installedStandards = Util\Standards::getInstalledStandards();
+            $installedStandards = Standards::getInstalledStandards();
             foreach ($value as $standard) {
                 foreach ($installedStandards as $validStandard) {
                     if (strtolower($standard) === strtolower($validStandard)) {
@@ -420,7 +423,7 @@
 
         // Check for content on STDIN.
         if ($this->stdin === true
-            || (Util\Common::isStdinATTY() === false
+            || (Common::isStdinATTY() === false
             && feof($handle) === false)
         ) {
             $readStreams = $handle;
@@ -649,7 +652,7 @@
             throw new DeepExitException($output, 0);
         case 'i' :
             ob_start();
-            Util\Standards::printInstalledStandards();
+            Standards::printInstalledStandards();
             $output = ob_get_contents();
             ob_end_clean();
             throw new DeepExitException($output, 0);
@@ -812,7 +815,7 @@
 
             try {
                 $this->setConfigData($key, $value);
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 throw new DeepExitException($e->getMessage().PHP_EOL, 3);
             }
 
@@ -840,7 +843,7 @@
             } else {
                 try {
                     $this->setConfigData($key, null);
-                } catch (\Exception $e) {
+                } catch (Exception $e) {
                     throw new DeepExitException($e->getMessage().PHP_EOL, 3);
                 }
 
@@ -922,7 +925,7 @@
                 $this->cache = true;
                 self::$overriddenDefaults'cache' = true;
 
-                $this->cacheFile = Util\Common::realpath(substr($arg, 6));
+                $this->cacheFile = Common::realpath(substr($arg, 6));
 
                 // It may not exist and return false instead.
                 if ($this->cacheFile === false) {
@@ -941,9 +944,9 @@
                     } else {
                         if ($dir0 === '/') {
                             // An absolute path.
-                            $dir = Util\Common::realpath($dir);
+                            $dir = Common::realpath($dir);
                         } else {
-                            $dir = Util\Common::realpath(getcwd().'/'.$dir);
+                            $dir = Common::realpath(getcwd().'/'.$dir);
                         }
 
                         if ($dir !== false) {
@@ -964,7 +967,7 @@
                 $files     = explode(',', substr($arg, 10));
                 $bootstrap = ;
                 foreach ($files as $file) {
-                    $path = Util\Common::realpath($file);
+                    $path = Common::realpath($file);
                     if ($path === false) {
                         $error  = 'ERROR: The specified bootstrap file "'.$file.'" does not exist'.PHP_EOL.PHP_EOL;
                         $error .= $this->printShortUsage(true);
@@ -978,7 +981,7 @@
                 self::$overriddenDefaults'bootstrap' = true;
             } else if (substr($arg, 0, 10) === 'file-list=') {
                 $fileList = substr($arg, 10);
-                $path     = Util\Common::realpath($fileList);
+                $path     = Common::realpath($fileList);
                 if ($path === false) {
                     $error  = 'ERROR: The specified file list "'.$fileList.'" does not exist'.PHP_EOL.PHP_EOL;
                     $error .= $this->printShortUsage(true);
@@ -1001,7 +1004,7 @@
                     break;
                 }
 
-                $this->stdinPath = Util\Common::realpath(substr($arg, 11));
+                $this->stdinPath = Common::realpath(substr($arg, 11));
 
                 // It may not exist and return false instead, so use whatever they gave us.
                 if ($this->stdinPath === false) {
@@ -1014,13 +1017,13 @@
                     break;
                 }
 
-                $this->reportFile = Util\Common::realpath(substr($arg, 12));
+                $this->reportFile = Common::realpath(substr($arg, 12));
 
                 // It may not exist and return false instead.
                 if ($this->reportFile === false) {
                     $this->reportFile = substr($arg, 12);
 
-                    $dir = Util\Common::realpath(dirname($this->reportFile));
+                    $dir = Common::realpath(dirname($this->reportFile));
                     if (is_dir($dir) === false) {
                         $error  = 'ERROR: The specified report file path "'.$this->reportFile.'" points to a non-existent directory'.PHP_EOL.PHP_EOL;
                         $error .= $this->printShortUsage(true);
@@ -1056,7 +1059,7 @@
                     break;
                 }
 
-                $this->basepath = Util\Common::realpath(substr($arg, 9));
+                $this->basepath = Common::realpath(substr($arg, 9));
 
                 // It may not exist and return false instead.
                 if ($this->basepath === false) {
@@ -1083,7 +1086,7 @@
                         if ($output === false) {
                             $output = null;
                         } else {
-                            $dir = Util\Common::realpath(dirname($output));
+                            $dir = Common::realpath(dirname($output));
                             if (is_dir($dir) === false) {
                                 $error  = 'ERROR: The specified '.$report.' report file path "'.$output.'" points to a non-existent directory'.PHP_EOL.PHP_EOL;
                                 $error .= $this->printShortUsage(true);
@@ -1317,7 +1320,7 @@
             return;
         }
 
-        $file = Util\Common::realpath($path);
+        $file = Common::realpath($path);
         if (file_exists($file) === false) {
             if ($this->dieOnUnknownArg === false) {
                 return;
@@ -1608,7 +1611,7 @@
         if ($temp === false) {
             $path = '';
             if (is_callable('\Phar::running') === true) {
-                $path = \Phar::running(false);
+                $path = Phar::running(false);
             }
 
             if ($path !== '') {
@@ -1653,7 +1656,7 @@
         // If the installed paths are being set, make sure all known
         // standards paths are added to the autoloader.
         if ($key === 'installed_paths') {
-            $installedStandards = Util\Standards::getInstalledStandardDetails();
+            $installedStandards = Standards::getInstalledStandardDetails();
             foreach ($installedStandards as $name => $details) {
                 Autoload::addSearchPath($details'path', $details'namespace');
             }
@@ -1679,7 +1682,7 @@
 
         $path = '';
         if (is_callable('\Phar::running') === true) {
-            $path = \Phar::running(false);
+            $path = Phar::running(false);
         }
 
         if ($path !== '') {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Exceptions/DeepExitException.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Exceptions/RuntimeException.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Exceptions/TokenizerException.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Files/DummyFile.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Files/File.php Changed

@@ -9,12 +9,13 @@
 
 namespace PHP_CodeSniffer\Files;
 
-use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Config;
-use PHP_CodeSniffer\Fixer;
-use PHP_CodeSniffer\Util;
 use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Exceptions\TokenizerException;
+use PHP_CodeSniffer\Fixer;
+use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Util\Common;
+use PHP_CodeSniffer\Util\Tokens;
 
 class File
 {
@@ -276,7 +277,7 @@
         $this->tokens  = ;
 
         try {
-            $this->eolChar = Util\Common::detectLineEndings($content);
+            $this->eolChar = Common::detectLineEndings($content);
         } catch (RuntimeException $e) {
             $this->addWarningOnLine($e->getMessage(), 1, 'Internal.DetectLineEndings');
             return;
@@ -430,7 +431,7 @@
 
             if (PHP_CODESNIFFER_VERBOSITY > 2) {
                 $type    = $token'type';
-                $content = Util\Common::prepareForOutput($token'content');
+                $content = Common::prepareForOutput($token'content');
                 echo "\t\tProcess token $stackPtr: $type => $content".PHP_EOL;
             }
 
@@ -872,7 +873,7 @@
         $parts = explode('.', $code);
         if ($parts0 === 'Internal') {
             // An internal message.
-            $listenerCode = Util\Common::getSniffCode($this->activeListener);
+            $listenerCode = Common::getSniffCode($this->activeListener);
             $sniffCode    = $code;
             $checkCodes   = $sniffCode;
         } else {
@@ -881,7 +882,7 @@
                 $sniffCode    = $code;
                 $listenerCode = substr($sniffCode, 0, strrpos($sniffCode, '.'));
             } else {
-                $listenerCode = Util\Common::getSniffCode($this->activeListener);
+                $listenerCode = Common::getSniffCode($this->activeListener);
                 $sniffCode    = $listenerCode.'.'.$code;
                 $parts        = explode('.', $sniffCode);
             }
@@ -1615,7 +1616,7 @@
                 $paramCount++;
                 break;
             case T_EQUAL:
-                $defaultStart = $this->findNext(Util\Tokens::$emptyTokens, ($i + 1), null, true);
+                $defaultStart = $this->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
                 $equalToken   = $i;
                 break;
             }//end switch
@@ -1756,6 +1757,20 @@
                     break;
                 }
 
+                if ($this->tokens$i'code' === T_USE) {
+                    // Skip over closure use statements.
+                    for ($j = ($i + 1); $j < $this->numTokens && isset(Tokens::$emptyTokens$this->tokens$j'code') === true; $j++);
+                    if ($this->tokens$j'code' === T_OPEN_PARENTHESIS) {
+                        if (isset($this->tokens$j'parenthesis_closer') === false) {
+                            // Live coding/parse error, stop parsing.
+                            break;
+                        }
+
+                        $i = $this->tokens$j'parenthesis_closer';
+                        continue;
+                    }
+                }
+
                 if ($this->tokens$i'code' === T_NULLABLE) {
                     $nullableReturnType = true;
                 }
@@ -1885,7 +1900,7 @@
             T_READONLY  => T_READONLY,
         ;
 
-        $valid += Util\Tokens::$emptyTokens;
+        $valid += Tokens::$emptyTokens;
 
         $scope          = 'public';
         $scopeSpecified = false;
@@ -2073,7 +2088,7 @@
         }
 
         $tokenBefore = $this->findPrevious(
-            Util\Tokens::$emptyTokens,
+            Tokens::$emptyTokens,
             ($stackPtr - 1),
             null,
             true
@@ -2097,14 +2112,14 @@
             return true;
         }
 
-        if (isset(Util\Tokens::$assignmentTokens$this->tokens$tokenBefore'code') === true) {
+        if (isset(Tokens::$assignmentTokens$this->tokens$tokenBefore'code') === true) {
             // This is directly after an assignment. It's a reference. Even if
             // it is part of an operation, the other tests will handle it.
             return true;
         }
 
         $tokenAfter = $this->findNext(
-            Util\Tokens::$emptyTokens,
+            Tokens::$emptyTokens,
             ($stackPtr + 1),
             null,
             true
@@ -2155,7 +2170,7 @@
             if ($this->tokens$tokenAfter'code' === T_VARIABLE) {
                 return true;
             } else {
-                $skip   = Util\Tokens::$emptyTokens;
+                $skip   = Tokens::$emptyTokens;
                 $skip = T_NS_SEPARATOR;
                 $skip = T_SELF;
                 $skip = T_PARENT;
@@ -2382,7 +2397,7 @@
      */
     public function findStartOfStatement($start, $ignore=null)
     {
-        $startTokens = Util\Tokens::$blockOpeners;
+        $startTokens = Tokens::$blockOpeners;
         $startTokensT_OPEN_SHORT_ARRAY   = true;
         $startTokensT_OPEN_TAG           = true;
         $startTokensT_OPEN_TAG_WITH_ECHO = true;
@@ -2436,7 +2451,7 @@
 
             if ($prevMatch <= $this->tokens$matchExpression'scope_opener') {
                 // We're before the arrow in the first case.
-                $next = $this->findNext(Util\Tokens::$emptyTokens, ($this->tokens$matchExpression'scope_opener' + 1), null, true);
+                $next = $this->findNext(Tokens::$emptyTokens, ($this->tokens$matchExpression'scope_opener' + 1), null, true);
                 if ($next === false) {
                     return $start;
                 }
@@ -2449,12 +2464,12 @@
                 $prevMatchArrow = $this->findPrevious(T_MATCH_ARROW, ($prevMatch - 1), $this->tokens$matchExpression'scope_opener');
                 if ($prevMatchArrow === false) {
                     // We're before the arrow in the first case.
-                    $next = $this->findNext(Util\Tokens::$emptyTokens, ($this->tokens$matchExpression'scope_opener' + 1), null, true);
+                    $next = $this->findNext(Tokens::$emptyTokens, ($this->tokens$matchExpression'scope_opener' + 1), null, true);
                     return $next;
                 }
 
                 $end  = $this->findEndOfStatement($prevMatchArrow);
-                $next = $this->findNext(Util\Tokens::$emptyTokens, ($end + 1), null, true);
+                $next = $this->findNext(Tokens::$emptyTokens, ($end + 1), null, true);
                 return $next;
             }
         }//end if
@@ -2515,7 +2530,7 @@
                 }
             }//end if
 
-            if (isset(Util\Tokens::$emptyTokens$this->tokens$i'code') === false) {
+            if (isset(Tokens::$emptyTokens$this->tokens$i'code') === false) {
                 $lastNotEmpty = $i;
             }
         }//end for
@@ -2610,7 +2625,7 @@
                     continue;
                 }
 
-                if ($i === $start && isset(Util\Tokens::$scopeOpeners$this->tokens$i'code') === true) {
+                if ($i === $start && isset(Tokens::$scopeOpeners$this->tokens$i'code') === true) {
                     return $this->tokens$i'scope_closer';
                 }
 
@@ -2630,7 +2645,7 @@
                 }
             }//end if
 
-            if (isset(Util\Tokens::$emptyTokens$this->tokens$i'code') === false) {
+            if (isset(Tokens::$emptyTokens$this->tokens$i'code') === false) {
                 $lastNotEmpty = $i;
             }
         }//end for

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Files/FileList.php Changed

@@ -11,14 +11,20 @@
 
 namespace PHP_CodeSniffer\Files;
 
+use Countable;
+use FilesystemIterator;
+use Iterator;
 use PHP_CodeSniffer\Autoload;
-use PHP_CodeSniffer\Util;
-use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Exceptions\DeepExitException;
+use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Util\Common;
+use RecursiveArrayIterator;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 use ReturnTypeWillChange;
 
-class FileList implements \Iterator, \Countable
+class FileList implements Iterator, Countable
 {
 
     /**
@@ -72,7 +78,7 @@
 
         $paths = $config->files;
         foreach ($paths as $path) {
-            $isPharFile = Util\Common::isPharFile($path);
+            $isPharFile = Common::isPharFile($path);
             if (is_dir($path) === true || $isPharFile === true) {
                 if ($isPharFile === true) {
                     $path = 'phar://'.$path;
@@ -80,9 +86,9 @@
 
                 $filterClass = $this->getFilterClass();
 
-                $di       = new \RecursiveDirectoryIterator($path, (\RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS));
+                $di       = new RecursiveDirectoryIterator($path, (RecursiveDirectoryIterator::SKIP_DOTS | FilesystemIterator::FOLLOW_SYMLINKS));
                 $filter   = new $filterClass($di, $path, $config, $ruleset);
-                $iterator = new \RecursiveIteratorIterator($filter);
+                $iterator = new RecursiveIteratorIterator($filter);
 
                 foreach ($iterator as $file) {
                     $this->files$file->getPathname() = null;
@@ -121,9 +127,9 @@
 
         $filterClass = $this->getFilterClass();
 
-        $di       = new \RecursiveArrayIterator($path);
+        $di       = new RecursiveArrayIterator($path);
         $filter   = new $filterClass($di, $path, $this->config, $this->ruleset);
-        $iterator = new \RecursiveIteratorIterator($filter);
+        $iterator = new RecursiveIteratorIterator($filter);
 
         foreach ($iterator as $path) {
             $this->files$path = $file;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Files/LocalFile.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Filters/ExactMatch.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Filters/Filter.php Changed

@@ -9,12 +9,15 @@
 
 namespace PHP_CodeSniffer\Filters;
 
-use PHP_CodeSniffer\Util;
-use PHP_CodeSniffer\Ruleset;
+use FilesystemIterator;
 use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Util\Common;
+use RecursiveDirectoryIterator;
+use RecursiveFilterIterator;
 use ReturnTypeWillChange;
 
-class Filter extends \RecursiveFilterIterator
+class Filter extends RecursiveFilterIterator
 {
 
     /**
@@ -94,7 +97,7 @@
     public function accept()
     {
         $filePath = $this->current();
-        $realPath = Util\Common::realpath($filePath);
+        $realPath = Common::realpath($filePath);
 
         if ($realPath !== false) {
             // It's a real path somewhere, so record it
@@ -137,7 +140,7 @@
     {
         $filterClass = get_called_class();
         $children    = new $filterClass(
-            new \RecursiveDirectoryIterator($this->current(), (\RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS)),
+            new RecursiveDirectoryIterator($this->current(), (RecursiveDirectoryIterator::SKIP_DOTS | FilesystemIterator::FOLLOW_SYMLINKS)),
             $this->basedir,
             $this->config,
             $this->ruleset

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Filters/GitModified.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Filters/GitStaged.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Fixer.php Changed

@@ -12,6 +12,7 @@
 
 namespace PHP_CodeSniffer;
 
+use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Common;
 
@@ -226,6 +227,8 @@
      * @param boolean $colors   Print coloured output or not.
      *
      * @return string
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException when the diff command fails.
      */
     public function generateDiff($filePath=null, $colors=true)
     {
@@ -246,19 +249,56 @@
         $fixedFile = fopen($tempName, 'w');
         fwrite($fixedFile, $contents);
 
-        // We must use something like shell_exec() because whitespace at the end
+        // We must use something like shell_exec() or proc_open() because whitespace at the end
         // of lines is critical to diff files.
+        // Using proc_open() instead of shell_exec improves performance on Windows significantly,
+        // while the results are the same (though more code is needed to get the results).
+        // This is specifically due to proc_open allowing to set the "bypass_shell" option.
         $filename = escapeshellarg($filename);
         $cmd      = "diff -u -L$filename -LPHP_CodeSniffer $filename \"$tempName\"";
 
-        $diff = shell_exec($cmd);
+        // Stream 0 = STDIN, 1 = STDOUT, 2 = STDERR.
+        $descriptorspec = 
+            0 => 
+                'pipe',
+                'r',
+            ,
+            1 => 
+                'pipe',
+                'w',
+            ,
+            2 => 
+                'pipe',
+                'w',
+            ,
+        ;
+
+        $options = null;
+        if (stripos(PHP_OS, 'WIN') === 0) {
+            $options = 'bypass_shell' => true;
+        }
+
+        $process = proc_open($cmd, $descriptorspec, $pipes, $cwd, null, $options);
+        if (is_resource($process) === false) {
+            throw new RuntimeException('Could not obtain a resource to execute the diff command.');
+        }
+
+        // We don't need these.
+        fclose($pipes0);
+        fclose($pipes2);
+
+        // Stdout will contain the actual diff.
+        $diff = stream_get_contents($pipes1);
+        fclose($pipes1);
+
+        proc_close($process);
 
         fclose($fixedFile);
         if (is_file($tempName) === true) {
             unlink($tempName);
         }
 
-        if ($diff === null) {
+        if ($diff === false || $diff === '') {
             return '';
         }
 
@@ -362,7 +402,7 @@
             if ($bt1'class' === __CLASS__) {
                 $sniff = 'Fixer';
             } else {
-                $sniff = Util\Common::getSniffCode($bt1'class');
+                $sniff = Common::getSniffCode($bt1'class');
             }
 
             $line = $bt0'line';
@@ -447,7 +487,7 @@
                     $line  = $bt0'line';
                 }
 
-                $sniff = Util\Common::getSniffCode($sniff);
+                $sniff = Common::getSniffCode($sniff);
 
                 $numChanges = count($this->changeset);
 
@@ -504,7 +544,7 @@
                 $line  = $bt0'line';
             }
 
-            $sniff = Util\Common::getSniffCode($sniff);
+            $sniff = Common::getSniffCode($sniff);
 
             $tokens     = $this->currentFile->getTokens();
             $type       = $tokens$stackPtr'type';
@@ -619,7 +659,7 @@
                 $line  = $bt0'line';
             }
 
-            $sniff = Util\Common::getSniffCode($sniff);
+            $sniff = Common::getSniffCode($sniff);
 
             $tokens     = $this->currentFile->getTokens();
             $type       = $tokens$stackPtr'type';

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Generators/Generator.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Generators/HTML.php Changed

@@ -13,6 +13,8 @@
 
 namespace PHP_CodeSniffer\Generators;
 
+use DOMDocument;
+use DOMNode;
 use PHP_CodeSniffer\Config;
 
 class HTML extends Generator
@@ -32,7 +34,7 @@
         $this->printToc();
 
         foreach ($this->docFiles as $file) {
-            $doc = new \DOMDocument();
+            $doc = new DOMDocument();
             $doc->load($file);
             $documentation = $doc->getElementsByTagName('documentation')->item(0);
             $this->processSniff($documentation);
@@ -145,7 +147,7 @@
         echo '  <ul class="toc">'.PHP_EOL;
 
         foreach ($this->docFiles as $file) {
-            $doc = new \DOMDocument();
+            $doc = new DOMDocument();
             $doc->load($file);
             $documentation = $doc->getElementsByTagName('documentation')->item(0);
             $title         = $this->getTitle($documentation);
@@ -188,7 +190,7 @@
      *
      * @return void
      */
-    public function processSniff(\DOMNode $doc)
+    public function processSniff(DOMNode $doc)
     {
         $title = $this->getTitle($doc);
         echo '  <a name="'.str_replace(' ', '-', $title).'" />'.PHP_EOL;
@@ -212,7 +214,7 @@
      *
      * @return void
      */
-    protected function printTextBlock(\DOMNode $node)
+    protected function printTextBlock(DOMNode $node)
     {
         $content = trim($node->nodeValue);
         $content = htmlspecialchars($content);
@@ -233,7 +235,7 @@
      *
      * @return void
      */
-    protected function printCodeComparisonBlock(\DOMNode $node)
+    protected function printCodeComparisonBlock(DOMNode $node)
     {
         $codeBlocks = $node->getElementsByTagName('code');

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Generators/Markdown.php Changed

@@ -9,6 +9,8 @@
 
 namespace PHP_CodeSniffer\Generators;
 
+use DOMDocument;
+use DOMNode;
 use PHP_CodeSniffer\Config;
 
 class Markdown extends Generator
@@ -27,7 +29,7 @@
         $this->printHeader();
 
         foreach ($this->docFiles as $file) {
-            $doc = new \DOMDocument();
+            $doc = new DOMDocument();
             $doc->load($file);
             $documentation = $doc->getElementsByTagName('documentation')->item(0);
             $this->processSniff($documentation);
@@ -81,7 +83,7 @@
      *
      * @return void
      */
-    protected function processSniff(\DOMNode $doc)
+    protected function processSniff(DOMNode $doc)
     {
         $title = $this->getTitle($doc);
         echo PHP_EOL."## $title".PHP_EOL;
@@ -104,7 +106,7 @@
      *
      * @return void
      */
-    protected function printTextBlock(\DOMNode $node)
+    protected function printTextBlock(DOMNode $node)
     {
         $content = trim($node->nodeValue);
         $content = htmlspecialchars($content);
@@ -124,7 +126,7 @@
      *
      * @return void
      */
-    protected function printCodeComparisonBlock(\DOMNode $node)
+    protected function printCodeComparisonBlock(DOMNode $node)
     {
         $codeBlocks = $node->getElementsByTagName('code');

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Generators/Text.php Changed

@@ -11,6 +11,8 @@
 
 namespace PHP_CodeSniffer\Generators;
 
+use DOMNode;
+
 class Text extends Generator
 {
 
@@ -24,7 +26,7 @@
      *
      * @return void
      */
-    public function processSniff(\DOMNode $doc)
+    public function processSniff(DOMNode $doc)
     {
         $this->printTitle($doc);
 
@@ -48,7 +50,7 @@
      *
      * @return void
      */
-    protected function printTitle(\DOMNode $doc)
+    protected function printTitle(DOMNode $doc)
     {
         $title    = $this->getTitle($doc);
         $standard = $this->ruleset->name;
@@ -69,7 +71,7 @@
      *
      * @return void
      */
-    protected function printTextBlock(\DOMNode $node)
+    protected function printTextBlock(DOMNode $node)
     {
         $text = trim($node->nodeValue);
         $text = str_replace('<em>', '*', $text);
@@ -123,7 +125,7 @@
      *
      * @return void
      */
-    protected function printCodeComparisonBlock(\DOMNode $node)
+    protected function printCodeComparisonBlock(DOMNode $node)
     {
         $codeBlocks = $node->getElementsByTagName('code');
         $first      = trim($codeBlocks->item(0)->nodeValue);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Cbf.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Checkstyle.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Code.php Changed

@@ -9,8 +9,10 @@
 
 namespace PHP_CodeSniffer\Reports;
 
+use Exception;
 use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util;
+use PHP_CodeSniffer\Util\Common;
+use PHP_CodeSniffer\Util\Timing;
 
 class Code implements Report
 {
@@ -52,7 +54,7 @@
 
             try {
                 $phpcsFile->parse();
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 // This is a second parse, so ignore exceptions.
                 // They would have been added to the file's error list already.
             }
@@ -235,7 +237,7 @@
                         $tokenContent = $token'content';
                     }
 
-                    $tokenContent = Util\Common::prepareForOutput($tokenContent, "\r", "\n", "\t");
+                    $tokenContent = Common::prepareForOutput($tokenContent, "\r", "\n", "\t");
                     $tokenContent = str_replace("\000", ' ', $tokenContent);
 
                     $underline = false;
@@ -353,7 +355,7 @@
         echo $cachedData;
 
         if ($toScreen === true && $interactive === false) {
-            Util\Timing::printRunTime();
+            Timing::printRunTime();
         }
 
     }//end generate()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Full.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Junit.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Summary.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Xml.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Ruleset.php Changed

@@ -13,7 +13,11 @@
 
 use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
-use PHP_CodeSniffer\Util;
+use PHP_CodeSniffer\Util\Common;
+use PHP_CodeSniffer\Util\Standards;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use ReflectionClass;
 use stdClass;
 
 class Ruleset
@@ -145,13 +149,13 @@
 
         $standardPaths = ;
         foreach ($config->standards as $standard) {
-            $installed = Util\Standards::getInstalledStandardPath($standard);
+            $installed = Standards::getInstalledStandardPath($standard);
             if ($installed === null) {
-                $standard = Util\Common::realpath($standard);
+                $standard = Common::realpath($standard);
                 if (is_dir($standard) === true
-                    && is_file(Util\Common::realpath($standard.DIRECTORY_SEPARATOR.'ruleset.xml')) === true
+                    && is_file(Common::realpath($standard.DIRECTORY_SEPARATOR.'ruleset.xml')) === true
                 ) {
-                    $standard = Util\Common::realpath($standard.DIRECTORY_SEPARATOR.'ruleset.xml');
+                    $standard = Common::realpath($standard.DIRECTORY_SEPARATOR.'ruleset.xml');
                 }
             } else {
                 $standard = $installed;
@@ -472,10 +476,10 @@
      */
     public function processRuleset($rulesetPath, $depth=0)
     {
-        $rulesetPath = Util\Common::realpath($rulesetPath);
+        $rulesetPath = Common::realpath($rulesetPath);
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo str_repeat("\t", $depth);
-            echo 'Processing ruleset '.Util\Common::stripBasepath($rulesetPath, $this->config->basepath).PHP_EOL;
+            echo 'Processing ruleset '.Common::stripBasepath($rulesetPath, $this->config->basepath).PHP_EOL;
         }
 
         libxml_use_internal_errors(true);
@@ -505,7 +509,7 @@
         if (is_dir($sniffDir) === true) {
             if (PHP_CODESNIFFER_VERBOSITY > 1) {
                 echo str_repeat("\t", $depth);
-                echo "\tAdding sniff files from ".Util\Common::stripBasepath($sniffDir, $this->config->basepath).' directory'.PHP_EOL;
+                echo "\tAdding sniff files from ".Common::stripBasepath($sniffDir, $this->config->basepath).' directory'.PHP_EOL;
             }
 
             $ownSniffs = $this->expandSniffDirectory($sniffDir, $depth);
@@ -520,7 +524,7 @@
             $autoloadPath = (string) $autoload;
 
             // Try relative autoload paths first.
-            $relativePath = Util\Common::realPath(dirname($rulesetPath).DIRECTORY_SEPARATOR.$autoloadPath);
+            $relativePath = Common::realPath(dirname($rulesetPath).DIRECTORY_SEPARATOR.$autoloadPath);
 
             if ($relativePath !== false && is_file($relativePath) === true) {
                 $autoloadPath = $relativePath;
@@ -710,7 +714,7 @@
             // Change the directory so all relative paths are worked
             // out based on the location of the ruleset instead of
             // the location of the user.
-            $inPhar = Util\Common::isPharFile($rulesetDir);
+            $inPhar = Common::isPharFile($rulesetDir);
             if ($inPhar === false) {
                 $currentDir = getcwd();
                 chdir($rulesetDir);
@@ -757,7 +761,7 @@
             if (in_array($sniff, $excludedSniffs, true) === true) {
                 continue;
             } else {
-                $files = Util\Common::realpath($sniff);
+                $files = Common::realpath($sniff);
             }
         }
 
@@ -779,8 +783,8 @@
     {
         $sniffs = ;
 
-        $rdi = new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::FOLLOW_SYMLINKS);
-        $di  = new \RecursiveIteratorIterator($rdi, 0, \RecursiveIteratorIterator::CATCH_GET_CHILD);
+        $rdi = new RecursiveDirectoryIterator($directory, RecursiveDirectoryIterator::FOLLOW_SYMLINKS);
+        $di  = new RecursiveIteratorIterator($rdi, 0, RecursiveIteratorIterator::CATCH_GET_CHILD);
 
         $dirLen = strlen($directory);
 
@@ -815,7 +819,7 @@
 
             if (PHP_CODESNIFFER_VERBOSITY > 1) {
                 echo str_repeat("\t", $depth);
-                echo "\t\t=> ".Util\Common::stripBasepath($path, $this->config->basepath).PHP_EOL;
+                echo "\t\t=> ".Common::stripBasepath($path, $this->config->basepath).PHP_EOL;
             }
 
             $sniffs = $path;
@@ -856,12 +860,12 @@
         // to absolute paths. If this fails, let the reference run through
         // the normal checks and have it fail as normal.
         if (substr($ref, 0, 1) === '.') {
-            $realpath = Util\Common::realpath($rulesetDir.'/'.$ref);
+            $realpath = Common::realpath($rulesetDir.'/'.$ref);
             if ($realpath !== false) {
                 $ref = $realpath;
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
                     echo str_repeat("\t", $depth);
-                    echo "\t\t=> ".Util\Common::stripBasepath($ref, $this->config->basepath).PHP_EOL;
+                    echo "\t\t=> ".Common::stripBasepath($ref, $this->config->basepath).PHP_EOL;
                 }
             }
         }
@@ -869,12 +873,12 @@
         // As sniffs can't begin with a tilde, assume references in
         // this format are relative to the user's home directory.
         if (substr($ref, 0, 2) === '~/') {
-            $realpath = Util\Common::realpath($ref);
+            $realpath = Common::realpath($ref);
             if ($realpath !== false) {
                 $ref = $realpath;
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
                     echo str_repeat("\t", $depth);
-                    echo "\t\t=> ".Util\Common::stripBasepath($ref, $this->config->basepath).PHP_EOL;
+                    echo "\t\t=> ".Common::stripBasepath($ref, $this->config->basepath).PHP_EOL;
                 }
             }
         }
@@ -887,8 +891,8 @@
             }
         } else {
             // See if this is a whole standard being referenced.
-            $path = Util\Standards::getInstalledStandardPath($ref);
-            if ($path !== null && Util\Common::isPharFile($path) === true && strpos($path, 'ruleset.xml') === false) {
+            $path = Standards::getInstalledStandardPath($ref);
+            if ($path !== null && Common::isPharFile($path) === true && strpos($path, 'ruleset.xml') === false) {
                 // If the ruleset exists inside the phar file, use it.
                 if (file_exists($path.DIRECTORY_SEPARATOR.'ruleset.xml') === true) {
                     $path .= DIRECTORY_SEPARATOR.'ruleset.xml';
@@ -901,7 +905,7 @@
                 $ref = $path;
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
                     echo str_repeat("\t", $depth);
-                    echo "\t\t=> ".Util\Common::stripBasepath($ref, $this->config->basepath).PHP_EOL;
+                    echo "\t\t=> ".Common::stripBasepath($ref, $this->config->basepath).PHP_EOL;
                 }
             } else if (is_dir($ref) === false) {
                 // Work out the sniff path.
@@ -925,16 +929,16 @@
                 }
 
                 $newRef  = false;
-                $stdPath = Util\Standards::getInstalledStandardPath($stdName);
+                $stdPath = Standards::getInstalledStandardPath($stdName);
                 if ($stdPath !== null && $path !== '') {
-                    if (Util\Common::isPharFile($stdPath) === true
+                    if (Common::isPharFile($stdPath) === true
                         && strpos($stdPath, 'ruleset.xml') === false
                     ) {
                         // Phar files can only return the directory,
                         // since ruleset can be omitted if building one standard.
-                        $newRef = Util\Common::realpath($stdPath.$path);
+                        $newRef = Common::realpath($stdPath.$path);
                     } else {
-                        $newRef = Util\Common::realpath(dirname($stdPath).$path);
+                        $newRef = Common::realpath(dirname($stdPath).$path);
                     }
                 }
 
@@ -949,7 +953,7 @@
                             continue;
                         }
 
-                        $newRef = Util\Common::realpath($dir.$path);
+                        $newRef = Common::realpath($dir.$path);
 
                         if ($newRef !== false) {
                             $ref = $newRef;
@@ -961,7 +965,7 @@
 
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
                     echo str_repeat("\t", $depth);
-                    echo "\t\t=> ".Util\Common::stripBasepath($ref, $this->config->basepath).PHP_EOL;
+                    echo "\t\t=> ".Common::stripBasepath($ref, $this->config->basepath).PHP_EOL;
                 }
             }//end if
         }//end if
@@ -1330,7 +1334,7 @@
             }
 
             $className   = Autoload::loadFile($file);
-            $compareName = Util\Common::cleanSniffClass($className);
+            $compareName = Common::cleanSniffClass($className);
 
             // If they have specified a list of sniffs to restrict to, check
             // to see if this sniff is allowed.
@@ -1349,7 +1353,7 @@
             }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Runner.php Changed

@@ -12,6 +12,7 @@
 
 namespace PHP_CodeSniffer;
 
+use Exception;
 use PHP_CodeSniffer\Exceptions\DeepExitException;
 use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Files\DummyFile;
@@ -20,6 +21,8 @@
 use PHP_CodeSniffer\Util\Cache;
 use PHP_CodeSniffer\Util\Common;
 use PHP_CodeSniffer\Util\Standards;
+use PHP_CodeSniffer\Util\Timing;
+use PHP_CodeSniffer\Util\Tokens;
 
 class Runner
 {
@@ -56,7 +59,7 @@
         $this->registerOutOfMemoryShutdownMessage('phpcs');
 
         try {
-            Util\Timing::startTiming();
+            Timing::startTiming();
             Runner::checkRequirements();
 
             if (defined('PHP_CODESNIFFER_CBF') === false) {
@@ -127,7 +130,7 @@
                 && ($toScreen === false
                 || (($this->reporter->totalErrors + $this->reporter->totalWarnings) === 0 && $this->config->showProgress === true))
             ) {
-                Util\Timing::printRunTime();
+                Timing::printRunTime();
             }
         } catch (DeepExitException $e) {
             echo $e->getMessage();
@@ -162,7 +165,7 @@
         }
 
         try {
-            Util\Timing::startTiming();
+            Timing::startTiming();
             Runner::checkRequirements();
 
             // Creating the Config object populates it with all required settings
@@ -213,7 +216,7 @@
             $this->reporter->printReports();
 
             echo PHP_EOL;
-            Util\Timing::printRunTime();
+            Timing::printRunTime();
         } catch (DeepExitException $e) {
             echo $e->getMessage();
             return $e->getCode();
@@ -310,12 +313,12 @@
 
         // Check that the standards are valid.
         foreach ($this->config->standards as $standard) {
-            if (Util\Standards::isInstalledStandard($standard) === false) {
+            if (Standards::isInstalledStandard($standard) === false) {
                 // They didn't select a valid coding standard, so help them
                 // out by letting them know which standards are installed.
                 $error = 'ERROR: the "'.$standard.'" coding standard is not installed. ';
                 ob_start();
-                Util\Standards::printInstalledStandards();
+                Standards::printInstalledStandards();
                 $error .= ob_get_contents();
                 ob_end_clean();
                 throw new DeepExitException($error, 3);
@@ -330,7 +333,7 @@
 
         // Create this class so it is autoloaded and sets up a bunch
         // of PHP_CodeSniffer-specific token type constants.
-        $tokens = new Util\Tokens();
+        $tokens = new Tokens();
 
         // Allow autoloading of custom files inside installed standards.
         $installedStandards = Standards::getInstalledStandardDetails();
@@ -662,7 +665,7 @@
                     echo " ($errors errors, $warnings warnings)".PHP_EOL;
                 }
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $error = 'An error occurred during processing; checking has been aborted. The error message was: '.$e->getMessage();
 
             // Determine which sniff caused the error.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/AbstractPatternSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/AbstractScopeSniff.php Changed

@@ -26,8 +26,8 @@
 
 namespace PHP_CodeSniffer\Sniffs;
 
-use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Files\File;
 
 abstract class AbstractScopeSniff implements Sniff
 {
@@ -123,7 +123,7 @@
      *
      * @return void|int Optionally returns a stack pointer. The sniff will not be
      *                  called again on the current file until the returned stack
-     *                  pointer is reached. Return ($phpcsFile->numTokens + 1) to skip
+     *                  pointer is reached. Return `$phpcsFile->numTokens` to skip
      *                  the rest of the file.
      * @see    processTokenWithinScope()
      */
@@ -164,7 +164,7 @@
      *
      * @return void|int Optionally returns a stack pointer. The sniff will not be
      *                  called again on the current file until the returned stack
-     *                  pointer is reached. Return ($phpcsFile->numTokens + 1) to skip
+     *                  pointer is reached. Return `$phpcsFile->numTokens` to skip
      *                  the rest of the file.
      */
     abstract protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope);
@@ -180,7 +180,7 @@
      *
      * @return void|int Optionally returns a stack pointer. The sniff will not be
      *                  called again on the current file until the returned stack
-     *                  pointer is reached. Return (count($tokens) + 1) to skip
+     *                  pointer is reached. Return `$phpcsFile->numTokens` to skip
      *                  the rest of the file.
      */
     abstract protected function processTokenOutsideScope(File $phpcsFile, $stackPtr);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/AbstractVariableSniff.php Changed

@@ -72,7 +72,7 @@
      *
      * @return void|int Optionally returns a stack pointer. The sniff will not be
      *                  called again on the current file until the returned stack
-     *                  pointer is reached. Return ($phpcsFile->numTokens + 1) to skip
+     *                  pointer is reached. Return `$phpcsFile->numTokens` to skip
      *                  the rest of the file.
      */
     final protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
@@ -156,7 +156,7 @@
      *
      * @return void|int Optionally returns a stack pointer. The sniff will not be
      *                  called again on the current file until the returned stack
-     *                  pointer is reached. Return ($phpcsFile->numTokens + 1) to skip
+     *                  pointer is reached. Return `$phpcsFile->numTokens` to skip
      *                  the rest of the file.
      */
     final protected function processTokenOutsideScope(File $phpcsFile, $stackPtr)
@@ -187,7 +187,7 @@
      *
      * @return void|int Optionally returns a stack pointer. The sniff will not be
      *                  called again on the current file until the returned stack
-     *                  pointer is reached. Return ($phpcsFile->numTokens + 1) to skip
+     *                  pointer is reached. Return `$phpcsFile->numTokens` to skip
      *                  the rest of the file.
      */
     abstract protected function processMemberVar(File $phpcsFile, $stackPtr);
@@ -202,7 +202,7 @@
      *
      * @return void|int Optionally returns a stack pointer. The sniff will not be
      *                  called again on the current file until the returned stack
-     *                  pointer is reached. Return ($phpcsFile->numTokens + 1) to skip
+     *                  pointer is reached. Return `$phpcsFile->numTokens` to skip
      *                  the rest of the file.
      */
     abstract protected function processVariable(File $phpcsFile, $stackPtr);
@@ -221,7 +221,7 @@
      *
      * @return void|int Optionally returns a stack pointer. The sniff will not be
      *                  called again on the current file until the returned stack
-     *                  pointer is reached. Return ($phpcsFile->numTokens + 1) to skip
+     *                  pointer is reached. Return `$phpcsFile->numTokens` to skip
      *                  the rest of the file.
      */
     abstract protected function processVariableInString(File $phpcsFile, $stackPtr);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/Sniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/Formatting/NoSpaceAfterCastStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/Formatting/SpaceAfterCastStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/PHP/DisallowRequestSuperglobalStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/PHP/RequireStrictTypesStandard.xml Added

@@ -0,0 +1,38 @@
+<documentation title="Require Strict Types">
+    <standard>
+    <!CDATA
+    The strict_types declaration must be present.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: strict_types declaration is present.">
+        <!CDATA
+declare(<em>strict_types=1</em>);
+
+declare(encoding='UTF-8', <em>strict_types=0</em>);
+        >
+        </code>
+        <code title="Invalid: Missing strict_types declaration.">
+        <!CDATA
+declare(encoding='ISO-8859-1'<em></em>);
+        >
+        </code>
+    </code_comparison>
+    <standard>
+    <!CDATA
+    The strict_types declaration must be enabled.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: strict_types declaration is enabled.">
+        <!CDATA
+declare(strict_types=<em>1</em>);
+        >
+        </code>
+        <code title="Invalid: strict_types declaration is disabled.">
+        <!CDATA
+declare(strict_types=<em>0</em>);
+        >
+        </code>
+    </code_comparison>
+</documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php Changed

@@ -67,7 +67,7 @@
             return;
         }
 
-        // Find incrementors for outer loop.
+        // Find incrementers for outer loop.
         $outer = $this->findIncrementers($tokens, $token);
 
         // Skip if empty.
@@ -88,8 +88,8 @@
             $diff  = array_intersect($outer, $inner);
 
             if (count($diff) !== 0) {
-                $error = 'Loop incrementor (%s) jumbling with inner loop';
-                $data  = join(', ', $diff);
+                $error = 'Loop incrementer (%s) jumbling with inner loop';
+                $data  = implode(', ', $diff);
                 $phpcsFile->addWarning($error, $stackPtr, 'Found', $data);
             }
         }
@@ -108,7 +108,7 @@
     protected function findIncrementers(array $tokens, array $token)
     {
         // Skip invalid statement.
-        if (isset($token'parenthesis_opener') === false) {
+        if (isset($token'parenthesis_opener', $token'parenthesis_closer') === false) {
             return ;
         }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php Changed

@@ -28,6 +28,17 @@
 class UselessOverridingMethodSniff implements Sniff
 {
 
+    /**
+     * Object-Oriented scopes in which a call to parent::method() can exist.
+     *
+     * @var array<int|string, bool> Keys are the token constants, value is irrelevant.
+     */
+    private $validOOScopes = 
+        T_CLASS      => true,
+        T_ANON_CLASS => true,
+        T_TRAIT      => true,
+    ;
+
 
     /**
      * Registers the tokens that this sniff wants to listen for.
@@ -56,7 +67,15 @@
         $token  = $tokens$stackPtr;
 
         // Skip function without body.
-        if (isset($token'scope_opener') === false) {
+        if (isset($token'scope_opener', $token'scope_closer') === false) {
+            return;
+        }
+
+        $conditions    = $token'conditions';
+        $lastCondition = end($conditions);
+
+        // Skip functions that are not a method part of a class, anon class or trait.
+        if (isset($this->validOOScopes$lastCondition) === false) {
             return;
         }
 
@@ -93,15 +112,15 @@
         $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), null, true);
 
         // Skip for invalid code.
-        if ($next === false || $tokens$next'code' !== T_DOUBLE_COLON) {
+        if ($tokens$next'code' !== T_DOUBLE_COLON) {
             return;
         }
 
-        // Find next non empty token index, should be the function name.
+        // Find next non empty token index, should be the name of the method being called.
         $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), null, true);
 
         // Skip for invalid code or other method.
-        if ($next === false || $tokens$next'content' !== $methodName) {
+        if (strcasecmp($tokens$next'content', $methodName) !== 0) {
             return;
         }
 
@@ -109,14 +128,13 @@
         $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), null, true);
 
         // Skip for invalid code.
-        if ($next === false || $tokens$next'code' !== T_OPEN_PARENTHESIS) {
+        if ($tokens$next'code' !== T_OPEN_PARENTHESIS || isset($tokens$next'parenthesis_closer') === false) {
             return;
         }
 
         $parameters       = '';
         $parenthesisCount = 1;
-        $count            = count($tokens);
-        for (++$next; $next < $count; ++$next) {
+        for (++$next; $next < $phpcsFile->numTokens; ++$next) {
             $code = $tokens$next'code';
 
             if ($code === T_OPEN_PARENTHESIS) {
@@ -135,7 +153,7 @@
         }//end for
 
         $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), null, true);
-        if ($next === false || $tokens$next'code' !== T_SEMICOLON) {
+        if ($tokens$next'code' !== T_SEMICOLON) {
             return;
         }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Debug/CSSLintSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Debug/ClosureLinterSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Debug/ESLintSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Debug/JSHintSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php Changed

@@ -49,13 +49,13 @@
      * @param int                         $stackPtr  The position of the current token in
      *                                               the stack passed in $tokens.
      *
-     * @return void
+     * @return int
      */
     public function process(File $phpcsFile, $stackPtr)
     {
         // The BOM will be the very first token in the file.
         if ($stackPtr !== 0) {
-            return;
+            return $phpcsFile->numTokens;
         }
 
         $tokens = $phpcsFile->getTokens();
@@ -68,12 +68,14 @@
                 $error     = 'File contains %s byte order mark, which may corrupt your application';
                 $phpcsFile->addError($error, $stackPtr, 'Found', $errorData);
                 $phpcsFile->recordMetric($stackPtr, 'Using byte order mark', 'yes');
-                return;
+                return $phpcsFile->numTokens;
             }
         }
 
         $phpcsFile->recordMetric($stackPtr, 'Using byte order mark', 'no');
 
+        return $phpcsFile->numTokens;
+
     }//end process()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Functions/CallTimePassByReferenceSniff.php Changed

@@ -27,6 +27,7 @@
         return 
             T_STRING,
             T_VARIABLE,
+            T_ANON_CLASS,
         ;
 
     }//end register()
@@ -50,12 +51,12 @@
 
         $prev = $phpcsFile->findPrevious($findTokens, ($stackPtr - 1), null, true);
 
-        // Skip tokens that are the names of functions or classes
+        // Skip tokens that are the names of functions
         // within their definitions. For example: function myFunction...
         // "myFunction" is T_STRING but we should skip because it is not a
         // function or method *call*.
         $prevCode = $tokens$prev'code';
-        if ($prevCode === T_FUNCTION || $prevCode === T_CLASS) {
+        if ($prevCode === T_FUNCTION) {
             return;
         }
 
@@ -69,7 +70,7 @@
             true
         );
 
-        if ($tokens$openBracket'code' !== T_OPEN_PARENTHESIS) {
+        if ($openBracket === false || $tokens$openBracket'code' !== T_OPEN_PARENTHESIS) {
             return;
         }
 
@@ -86,10 +87,6 @@
         ;
 
         while (($nextSeparator = $phpcsFile->findNext($find, ($nextSeparator + 1), $closeBracket)) !== false) {
-            if (isset($tokens$nextSeparator'nested_parenthesis') === false) {
-                continue;
-            }
-
             if ($tokens$nextSeparator'code' === T_OPEN_SHORT_ARRAY) {
                 $nextSeparator = $tokens$nextSeparator'bracket_closer';
                 continue;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.1.inc Added

@@ -0,0 +1,89 @@
+<?php
+
+for ($same = 0; $same < 20; $same++) {
+    for ($j = 0; $j < 5; $same += 2) {
+        for ($k = 0; $k > 3; $same++) {
+            
+        }
+    }
+}
+
+for ($i = 0; $i < 20; $i++) {
+    for ($j = 0; $j < 5; $j += 2) {
+        for ($k = 0; $k > 3; $k++) {
+            
+        }
+    }
+}
+
+for ($i = 0; $i < 20; $i++) {
+    for ($same = 0; $same < 5; $same += 2) {
+        for ($k = 0; $k > 3; $same++) {
+            
+        }
+    }
+}
+
+for (; $i < 10; $i++) {
+    for ($j = 0;; $j++) {
+        if ($j > 5) {
+            break;
+        }
+        for (;; $k++) {
+            if ($k > 5) {
+                break;
+            }
+        }
+    }
+}
+
+for (; $same < 10; $same++) {
+    for ($j = 0;; $same++) {
+        if ($j > 5) {
+            break;
+        }
+        for (;; $same++) {
+            if ($k > 5) {
+                break;
+            }
+        }
+    }
+}
+
+for ($i = 0; $i < 20; $i++) :
+    for ($j = 0; $j < 5; $j += 2) :
+    endfor;
+endfor;
+
+for ($same = 0; $same < 20; $same++) :
+    for ($j = 0; $j < 5; $same += 2) :
+    endfor;
+endfor;
+
+// Sniff bails early when there is no incrementor in the third expression of the outer for loop.
+for ($same = 0; $same < 10;) {
+    ++$same;
+    for ($j = 0; $j < 5; $same++) {}
+}
+
+for ($i = 1, $same = 0; $i <= 10; $i++, $same++) {
+    for ($same = 0, $k = 0; $k < 5; $same++, $k++) {}
+}
+
+for ($i = 20; $i > 0; $i--) {
+    for ($j = 5; $j > 0; $j -= 2) {
+        for ($k = 3; $k > 0; $k--) {}
+    }
+}
+
+for ($same = 20; $same > 0; $same--) {
+    for ($j = 5; $j > 0; $same -= 2) {
+        for ($k = 3; $k > 0; $same--) {}
+    }
+}
+
+for ($i = 0; $i < 20; $i++);
+
+for ($same = 0; $same < 20; $same++) {
+    for ($j = 0; $j < 20; $same++);
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.4.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.inc Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.1.inc Added

@@ -0,0 +1,150 @@
+<?php
+
+class FooBar {
+    public function __construct($a, $b) {
+        parent::__construct($a, $b);
+    }
+}
+
+class BarFoo {
+    public function __construct($a, $b) {
+        parent::__construct($a, 'XML', $b);
+    }
+}
+
+class Foo {
+    public function export($a, $b = null) {
+        return parent::export($a, $b);
+    }
+}
+
+class Bar {
+    public function export($a, $b = null) {
+        return parent::export($a);
+    }
+
+    public function ignoreNoParent($a, $b) {
+        return $a + $b;
+    }
+
+    public function differentParentMethod($a, $b) {
+        return parent::anotherMethod($a, $b);
+    }
+
+    public function methodCallWithExpression($a, $b) {
+        return parent::methodCallWithExpression(($a + $b), ($b));
+    }
+
+    public function uselessMethodCallWithExpression($a, $b) {
+        return parent::uselessMethodCallWithExpression(($a), ($b));
+    }
+
+    public function contentAfterCallingParent() {
+        parent::contentAfterCallingParent();
+
+        return 1;
+    }
+
+    public function ignoreNoParentVoidMethod($a, $b) {
+        $c = $a + $b;
+    }
+
+    public function modifiesParentReturnValue($a, $b) {
+        return parent::modifiesParentReturnValue($a, $b) + $b;
+    }
+
+    public function uselessMethodCallTrailingComma($a) {
+        return parent::uselessMethodCallTrailingComma($a,);
+    }
+
+    public function differentParameterOrder($a, $b) {
+        return parent::differentParameterOrder($b, $a);
+    }
+
+    public function sameNumberDifferentParameters($a, $b) {
+        return parent::sameNumberDifferentParameters($this->prop$a, $this->{$b});
+    }
+
+    public function differentCase() {
+        return parent::DIFFERENTcase();
+    }
+
+    public function differentCaseSameNonAnsiiCharáctêrs() {
+        // This should be flagged, only ASCII chars have changed case.
+        return parent::DIFFERENTcaseSameNonAnsiiCharáctêrs();
+    }
+
+    public function differentCaseDifferentNonAnsiiCharáctêrs() {
+        // This should not be flagged as non-ASCII chars have changed case, making this a different method name.
+        return parent::DIFFERENTcaseDifferentNonAnsiiCharÁctÊrs();
+    }
+
+    public function nestedFunctionShouldBailEarly() {
+        function nestedFunctionShouldBailEarly() {
+            // Invalid code needed to ensure an error is NOT triggered and the sniff bails early when handling nested function.
+            parent::nestedFunctionShouldBailEarly();
+        }
+    }
+}
+
+abstract class AbstractFoo {
+    abstract public function sniffShouldBailEarly();
+
+    public function uselessMethodInAbstractClass() {
+        parent::uselessMethodInAbstractClass();
+    }
+
+    public function usefulMethodInAbstractClass() {
+        $a = 1;
+        parent::usefulMethodInAbstractClass($a);
+    }
+}
+
+interface InterfaceFoo {
+    public function sniffShouldBailEarly();
+}
+
+trait TraitFoo {
+    abstract public function sniffShouldBailEarly();
+
+    public function usefulMethodInTrait() {
+        parent::usefulMethodInTrait();
+
+        return 1;
+    }
+
+    public function uselessMethodInTrait() {
+        return parent::uselessMethodInTrait();
+    }
+}
+
+enum EnumFoo {
+    public function sniffShouldBailEarly() {
+        // Invalid code needed to ensure an error is NOT triggered and the sniff bails early when handling an enum method.
+        parent::sniffShouldBailEarly();
+    }
+}
+
+function shouldBailEarly() {
+    // Invalid code needed to ensure an error is NOT triggered and the sniff bails early when handling a regular function.
+    parent::shouldBailEarly();
+}
+
+$anon = new class extends ParentClass {
+    public function uselessOverridingMethod() {
+        parent::uselessOverridingMethod();
+    }
+
+    public function usefulOverridingMethod() {
+        $a = 10;
+        parent::usefulOverridingMethod($a);
+    }
+};
+
+function foo() {
+    $anon = new class extends ParentClass {
+        public function uselessOverridingMethod() {
+            parent::uselessOverridingMethod();
+        }
+    };
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.4.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.5.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.6.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.inc Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Debug/ESLintUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.1.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.inc Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.php Changed

@@ -26,18 +26,30 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the test file to process.
+     *
      * @return array<int, int>
      */
-    public function getErrorList()
+    public function getErrorList($testFile='CallTimePassByReferenceUnitTest.1.inc')
     {
-        return 
-            9  => 1,
-            12 => 1,
-            15 => 1,
-            18 => 2,
-            23 => 1,
-            30 => 1,
-        ;
+        switch ($testFile) {
+        case 'CallTimePassByReferenceUnitTest.1.inc':
+            return 
+                9  => 1,
+                12 => 1,
+                15 => 1,
+                18 => 2,
+                23 => 1,
+                30 => 1,
+                41 => 1,
+                50 => 1,
+                51 => 1,
+                54 => 1,
+            ;
+
+        default:
+            return ;
+        }
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php Changed

@@ -122,18 +122,18 @@
 
         if ($tokens$commentStart'code' === T_CLOSE_TAG) {
             // We are only interested if this is the first open tag.
-            return ($phpcsFile->numTokens + 1);
+            return $phpcsFile->numTokens;
         } else if ($tokens$commentStart'code' === T_COMMENT) {
             $error = 'You must use "/**" style comments for a file comment';
             $phpcsFile->addError($error, $errorToken, 'WrongStyle');
             $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'yes');
-            return ($phpcsFile->numTokens + 1);
+            return $phpcsFile->numTokens;
         } else if ($commentStart === false
             || $tokens$commentStart'code' !== T_DOC_COMMENT_OPEN_TAG
         ) {
             $phpcsFile->addError('Missing file doc comment', $errorToken, 'Missing');
             $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
-            return ($phpcsFile->numTokens + 1);
+            return $phpcsFile->numTokens;
         }
 
         $commentEnd = $tokens$commentStart'comment_closer';
@@ -178,7 +178,7 @@
         if (in_array($tokens$nextToken'code', $ignore, true) === true) {
             $phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
             $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
-            return ($phpcsFile->numTokens + 1);
+            return $phpcsFile->numTokens;
         }
 
         $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'yes');
@@ -205,7 +205,7 @@
         $this->processTags($phpcsFile, $stackPtr, $commentStart);
 
         // Ignore the rest of the file.
-        return ($phpcsFile->numTokens + 1);
+        return $phpcsFile->numTokens;
 
     }//end process()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php Changed

@@ -104,8 +104,9 @@
         // and the opening parenthesis.
         // Unfinished closures are tokenized as T_FUNCTION however, and can be excluded
         // by checking for the scope_opener.
+        $methodProps = $phpcsFile->getMethodProperties($stackPtr);
         if ($tokens$stackPtr'code' === T_FUNCTION
-            && (isset($tokens$stackPtr'scope_opener') === true || $phpcsFile->getMethodProperties($stackPtr)'has_body' === false)
+            && (isset($tokens$stackPtr'scope_opener') === true || $methodProps'has_body' === false)
         ) {
             if ($tokens($openBracket - 1)'content' === $phpcsFile->eolChar) {
                 $spaces = 'newline';
@@ -125,25 +126,27 @@
             }
 
             // Must be no space before semicolon in abstract/interface methods.
-            if ($phpcsFile->getMethodProperties($stackPtr)'has_body' === false) {
+            if ($methodProps'has_body' === false) {
                 $end = $phpcsFile->findNext(T_SEMICOLON, $closeBracket);
-                if ($tokens($end - 1)'content' === $phpcsFile->eolChar) {
-                    $spaces = 'newline';
-                } else if ($tokens($end - 1)'code' === T_WHITESPACE) {
-                    $spaces = $tokens($end - 1)'length';
-                } else {
-                    $spaces = 0;
-                }
+                if ($end !== false) {
+                    if ($tokens($end - 1)'content' === $phpcsFile->eolChar) {
+                        $spaces = 'newline';
+                    } else if ($tokens($end - 1)'code' === T_WHITESPACE) {
+                        $spaces = $tokens($end - 1)'length';
+                    } else {
+                        $spaces = 0;
+                    }
 
-                if ($spaces !== 0) {
-                    $error = 'Expected 0 spaces before semicolon; %s found';
-                    $data  = $spaces;
-                    $fix   = $phpcsFile->addFixableError($error, $end, 'SpaceBeforeSemicolon', $data);
-                    if ($fix === true) {
-                        $phpcsFile->fixer->replaceToken(($end - 1), '');
+                    if ($spaces !== 0) {
+                        $error = 'Expected 0 spaces before semicolon; %s found';
+                        $data  = $spaces;
+                        $fix   = $phpcsFile->addFixableError($error, $end, 'SpaceBeforeSemicolon', $data);
+                        if ($fix === true) {
+                            $phpcsFile->fixer->replaceToken(($end - 1), '');
+                        }
                     }
                 }
-            }
+            }//end if
         }//end if
 
         // Must be one space before and after USE keyword for closures.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.1.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.1.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/Functions/NullableTypeDeclarationStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php Changed

@@ -35,6 +35,9 @@
         $targets = T_STRING_CONCAT;
         $targets = T_INSTANCEOF;
 
+        // Also register the contexts we want to specifically skip over.
+        $targets = T_DECLARE;
+
         return $targets;
 
     }//end register()
@@ -47,12 +50,25 @@
      * @param int                         $stackPtr  The position of the current token in
      *                                               the stack passed in $tokens.
      *
-     * @return void
+     * @return void|int Optionally returns a stack pointer. The sniff will not be
+     *                  called again on the current file until the returned stack
+     *                  pointer is reached. Return `$phpcsFile->numTokens` to skip
+     *                  the rest of the file.
      */
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
+        // Skip over declare statements as those should be handled by different sniffs.
+        if ($tokens$stackPtr'code' === T_DECLARE) {
+            if (isset($tokens$stackPtr'parenthesis_closer') === false) {
+                // Parse error / live coding.
+                return $phpcsFile->numTokens;
+            }
+
+            return $tokens$stackPtr'parenthesis_closer';
+        }
+
         if ($this->isOperator($phpcsFile, $stackPtr) === false) {
             return;
         }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.1.inc Added

@@ -0,0 +1,79 @@
+<?php
+if ($a    ===$b) {
+    $foo = $bar ??$a?? $b;
+} elseif ($a> $b) {
+    $variable =$foo ? 'foo' :'bar';
+    $variable.='text'.'text';
+}
+
+$foo+= $a&$b;
+$foo = $a|$b;
+$foo =$a^$b;
+$foo = ~$a;
+$foo   *=$a<<$b;
+$foo = $a>>$b;
+
+function foo(&$a,& $b) {}
+
+$foo = $a   and$b;
+$foo = $a or   $b;
+$foo = $a xor$b;
+$foo = !$a;
+$foo = $a&&$b;
+$foo = $a||$b;
+
+$foo = $a instanceof Foo;
+$foo = $a instanceof$b;
+
+$foo .= 'hi'
+     .= 'there';
+
+$foo .= 'hi'
+.= 'there';
+
+$foo .= 'hi' // comment
+.= 'there';
+
+$foo/*comment*/=/*comment*/$a/*comment*/and/*comment*/$b;
+
+$foo .=//comment
+'string' .=/*comment*/
+'string';
+
+$foo = $foo ?: 'bar';
+$foo = $foo?:'bar';
+
+try {
+} catch (ExceptionType1|ExceptionType2 $e) {
+}
+
+if (strpos($tokenContent, 'b"') === 0 && substr($tokenContent, -1) === '"') {}
+
+$oldConstructorPos = +1;
+return -$content;
+
+function name($a = -1) {}
+
+$a =& $ref;
+$a =  'a' => &$something ;
+
+$fn = fn(array &$one) => 1;
+$fn = fn(array & $one) => 1;
+
+$fn = static fn(DateTime $a, DateTime $b): int => -($a->getTimestamp() <=> $b->getTimestamp());
+
+function issue3267(string|int ...$values) {}
+
+function setDefault(#ImportValue(
+        constraints: 
+            
+                Assert\Type::class,
+                'type' => 'bool',
+            ,
+        
+    ) ?bool $value = null): void
+    {
+        // Do something
+    }
+
+declare(strict_types=1);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.1.inc.fixed Added

@@ -0,0 +1,79 @@
+<?php
+if ($a    === $b) {
+    $foo = $bar ?? $a ?? $b;
+} elseif ($a > $b) {
+    $variable = $foo ? 'foo' : 'bar';
+    $variable .= 'text' . 'text';
+}
+
+$foo += $a & $b;
+$foo = $a | $b;
+$foo = $a ^ $b;
+$foo = ~$a;
+$foo   *= $a << $b;
+$foo = $a >> $b;
+
+function foo(&$a,& $b) {}
+
+$foo = $a   and $b;
+$foo = $a or   $b;
+$foo = $a xor $b;
+$foo = !$a;
+$foo = $a && $b;
+$foo = $a || $b;
+
+$foo = $a instanceof Foo;
+$foo = $a instanceof $b;
+
+$foo .= 'hi'
+     .= 'there';
+
+$foo .= 'hi'
+.= 'there';
+
+$foo .= 'hi' // comment
+.= 'there';
+
+$foo/*comment*/ = /*comment*/$a/*comment*/ and /*comment*/$b;
+
+$foo .= //comment
+'string' .= /*comment*/
+'string';
+
+$foo = $foo ?: 'bar';
+$foo = $foo ?: 'bar';
+
+try {
+} catch (ExceptionType1 | ExceptionType2 $e) {
+}
+
+if (strpos($tokenContent, 'b"') === 0 && substr($tokenContent, -1) === '"') {}
+
+$oldConstructorPos = +1;
+return -$content;
+
+function name($a = -1) {}
+
+$a =& $ref;
+$a =  'a' => &$something ;
+
+$fn = fn(array &$one) => 1;
+$fn = fn(array & $one) => 1;
+
+$fn = static fn(DateTime $a, DateTime $b): int => -($a->getTimestamp() <=> $b->getTimestamp());
+
+function issue3267(string|int ...$values) {}
+
+function setDefault(#ImportValue(
+        constraints: 
+            
+                Assert\Type::class,
+                'type' => 'bool',
+            ,
+        
+    ) ?bool $value = null): void
+    {
+        // Do something
+    }
+
+declare(strict_types=1);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.inc Deleted

@@ -1,77 +0,0 @@
-<?php
-if ($a    ===$b) {
-    $foo = $bar ??$a?? $b;
-} elseif ($a> $b) {
-    $variable =$foo ? 'foo' :'bar';
-    $variable.='text'.'text';
-}
-
-$foo+= $a&$b;
-$foo = $a|$b;
-$foo =$a^$b;
-$foo = ~$a;
-$foo   *=$a<<$b;
-$foo = $a>>$b;
-
-function foo(&$a,& $b) {}
-
-$foo = $a   and$b;
-$foo = $a or   $b;
-$foo = $a xor$b;
-$foo = !$a;
-$foo = $a&&$b;
-$foo = $a||$b;
-
-$foo = $a instanceof Foo;
-$foo = $a instanceof$b;
-
-$foo .= 'hi'
-     .= 'there';
-
-$foo .= 'hi'
-.= 'there';
-
-$foo .= 'hi' // comment
-.= 'there';
-
-$foo/*comment*/=/*comment*/$a/*comment*/and/*comment*/$b;
-
-$foo .=//comment
-'string' .=/*comment*/
-'string';
-
-$foo = $foo ?: 'bar';
-$foo = $foo?:'bar';
-
-try {
-} catch (ExceptionType1|ExceptionType2 $e) {
-}
-
-if (strpos($tokenContent, 'b"') === 0 && substr($tokenContent, -1) === '"') {}
-
-$oldConstructorPos = +1;
-return -$content;
-
-function name($a = -1) {}
-
-$a =& $ref;
-$a =  'a' => &$something ;
-
-$fn = fn(array &$one) => 1;
-$fn = fn(array & $one) => 1;
-
-$fn = static fn(DateTime $a, DateTime $b): int => -($a->getTimestamp() <=> $b->getTimestamp());
-
-function issue3267(string|int ...$values) {}
-
-function setDefault(#ImportValue(
-        constraints: 
-            
-                Assert\Type::class,
-                'type' => 'bool',
-            ,
-        
-    ) ?bool $value = null): void
-    {
-        // Do something
-    }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.inc.fixed Deleted

@@ -1,77 +0,0 @@
-<?php
-if ($a    === $b) {
-    $foo = $bar ?? $a ?? $b;
-} elseif ($a > $b) {
-    $variable = $foo ? 'foo' : 'bar';
-    $variable .= 'text' . 'text';
-}
-
-$foo += $a & $b;
-$foo = $a | $b;
-$foo = $a ^ $b;
-$foo = ~$a;
-$foo   *= $a << $b;
-$foo = $a >> $b;
-
-function foo(&$a,& $b) {}
-
-$foo = $a   and $b;
-$foo = $a or   $b;
-$foo = $a xor $b;
-$foo = !$a;
-$foo = $a && $b;
-$foo = $a || $b;
-
-$foo = $a instanceof Foo;
-$foo = $a instanceof $b;
-
-$foo .= 'hi'
-     .= 'there';
-
-$foo .= 'hi'
-.= 'there';
-
-$foo .= 'hi' // comment
-.= 'there';
-
-$foo/*comment*/ = /*comment*/$a/*comment*/ and /*comment*/$b;
-
-$foo .= //comment
-'string' .= /*comment*/
-'string';
-
-$foo = $foo ?: 'bar';
-$foo = $foo ?: 'bar';
-
-try {
-} catch (ExceptionType1 | ExceptionType2 $e) {
-}
-
-if (strpos($tokenContent, 'b"') === 0 && substr($tokenContent, -1) === '"') {}
-
-$oldConstructorPos = +1;
-return -$content;
-
-function name($a = -1) {}
-
-$a =& $ref;
-$a =  'a' => &$something ;
-
-$fn = fn(array &$one) => 1;
-$fn = fn(array & $one) => 1;
-
-$fn = static fn(DateTime $a, DateTime $b): int => -($a->getTimestamp() <=> $b->getTimestamp());
-
-function issue3267(string|int ...$values) {}
-
-function setDefault(#ImportValue(
-        constraints: 
-            
-                Assert\Type::class,
-                'type' => 'bool',
-            ,
-        
-    ) ?bool $value = null): void
-    {
-        // Do something
-    }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php Changed

@@ -26,32 +26,39 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getErrorList()
+    public function getErrorList($testFile='')
     {
-        return 
-            2  => 1,
-            3  => 2,
-            4  => 1,
-            5  => 2,
-            6  => 4,
-            9  => 3,
-            10 => 2,
-            11 => 3,
-            13 => 3,
-            14 => 2,
-            18 => 1,
-            20 => 1,
-            22 => 2,
-            23 => 2,
-            26 => 1,
-            37 => 4,
-            39 => 1,
-            40 => 1,
-            44 => 2,
-            47 => 2,
-        ;
+        switch ($testFile) {
+        case 'OperatorSpacingUnitTest.1.inc':
+            return 
+                2  => 1,
+                3  => 2,
+                4  => 1,
+                5  => 2,
+                6  => 4,
+                9  => 3,
+                10 => 2,
+                11 => 3,
+                13 => 3,
+                14 => 2,
+                18 => 1,
+                20 => 1,
+                22 => 2,
+                23 => 2,
+                26 => 1,
+                37 => 4,
+                39 => 1,
+                40 => 1,
+                44 => 2,
+                47 => 2,
+            ;
+        default:
+            return ;
+        }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php Changed

@@ -314,7 +314,8 @@
             if ($checkingImplements === true
                 && $multiLineImplements === true
                 && ($tokens($className - 1)'code' !== T_NS_SEPARATOR
-                || $tokens($className - 2)'code' !== T_STRING)
+                || ($tokens($className - 2)'code' !== T_STRING
+                && $tokens($className - 2)'code' !== T_NAMESPACE))
             ) {
                 $prev = $phpcsFile->findPrevious(
                     
@@ -348,7 +349,10 @@
                         $phpcsFile->fixer->addNewline($prev);
                         $phpcsFile->fixer->endChangeset();
                     }
-                } else if ($tokens$prev'line' !== ($tokens$className'line' - 1)) {
+                } else if ((isset(Tokens::$commentTokens$tokens$prev'code') === false
+                    && $tokens$prev'line' !== ($tokens$className'line' - 1))
+                    || $tokens$prev'line' === $tokens$className'line'
+                ) {
                     if ($keywordTokenType === T_EXTENDS) {
                         $error = 'Only one interface may be specified per line in a multi-line extends declaration';
                         $fix   = $phpcsFile->addFixableError($error, $className, 'ExtendsInterfaceSameLine');
@@ -397,9 +401,10 @@
                     }
                 }//end if
             } else if ($tokens($className - 1)'code' !== T_NS_SEPARATOR
-                || $tokens($className - 2)'code' !== T_STRING
+                || ($tokens($className - 2)'code' !== T_STRING
+                && $tokens($className - 2)'code' !== T_NAMESPACE)
             ) {
-                // Not part of a longer fully qualified class name.
+                // Not part of a longer fully qualified or namespace relative class name.
                 if ($tokens($className - 1)'code' === T_COMMA
                     || ($tokens($className - 1)'code' === T_NS_SEPARATOR
                     && $tokens($className - 2)'code' === T_COMMA)

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Arrays/ArrayBracketSpacingStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Classes/LowercaseClassKeywordsStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Commenting/DocCommentAlignmentStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Commenting/FunctionCommentThrowTagStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/ControlStructures/ForEachLoopDeclarationStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/ControlStructures/ForLoopDeclarationStandard.xml Changed

@@ -10,14 +10,14 @@
 for (<em></em>$i = 0; $i < 10; $i++<em></em>) {
     echo $i;
 }
->
+        >
         </code>
         <code title="Invalid: Invalid spacing used inside brackets.">
         <!CDATA
 for (<em> </em>$i = 0; $i < 10; $i++<em> </em>) {
     echo $i;
 }
->
+        >
         </code>
     </code_comparison>
     <code_comparison>
@@ -26,14 +26,14 @@
 for ($i = 0<em></em>; $i < 10<em></em>; $i++) {
     echo $i;
 }
->
+        >
         </code>
         <code title="Invalid: Invalid spacing used before semicolons.">
         <!CDATA
 for ($i = 0<em> </em>; $i < 10<em> </em>; $i++) {
     echo $i;
 }
->
+        >
         </code>
     </code_comparison>
     <code_comparison>
@@ -42,14 +42,14 @@
 for ($i = 0;<em> </em>$i < 10;<em> </em>$i++) {
     echo $i;
 }
->
+        >
         </code>
         <code title="Invalid: Invalid spacing used after semicolons.">
         <!CDATA
 for ($i = 0;<em></em>$i < 10;<em></em>$i++) {
     echo $i;
 }
->
+        >
         </code>
     </code_comparison>
 </documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/ControlStructures/LowercaseDeclarationStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Functions/FunctionDuplicateArgumentStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Functions/LowercaseFunctionKeywordsStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Scope/StaticThisUsageStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/Strings/EchoedStringsStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/WhiteSpace/CastSpacingStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/WhiteSpace/FunctionOpeningBraceStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/WhiteSpace/LanguageConstructSpacingStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml Added

@@ -0,0 +1,91 @@
+<documentation title="Member Var Spacing">
+    <standard>
+    <!CDATA
+    There should be exactly one blank line before the first property (member variable).
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: One blank line before the first property.">
+        <!CDATA
+class MyClass
+{<em>
+
+</em>    protected $var1 = 'value';
+}
+        >
+        </code>
+        <code title="Invalid: Incorrect number of blank lines before the first property.">
+        <!CDATA
+class MyClass
+{<em>
+</em>    protected $var1 = 'value';
+}
+        >
+        </code>
+    </code_comparison>
+    <standard>
+    <!CDATA
+    There should be exactly one blank line between properties.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: One blank line between each property.">
+        <!CDATA
+trait MyTrait {
+
+    public $var1 = 'value';<em>
+
+</em>    public $var2 = 'value2';<em>
+
+</em>    public $var3 = 'value3';
+}
+        >
+        </code>
+        <code title="Invalid: Incorrect number of blank lines between each property.">
+        <!CDATA
+trait MyTrait {
+
+    public $var1 = 'value';<em>
+
+
+</em>    public $var2 = 'value2';<em>
+</em>    public $var3 = 'value3';
+}
+        >
+        </code>
+    </code_comparison>
+    <standard>
+    <!CDATA
+    There should be no blank lines between a property DocBlock and the property declaration the DocBlock applies to.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: No blank lines between DocBlock and its property.">
+        <!CDATA
+$anon = new class {
+
+    /**
+     * The actions that this class can perform.
+     *
+     * @var array
+     */<em>
+</em>    public $actions = array();
+};
+        >
+        </code>
+        <code title="Invalid: Blank line(s) between DocBlock and its property.">
+        <!CDATA
+$anon = new class {
+
+    /**
+     * The actions that this class can perform.
+     *
+     * @var array
+     */<em>
+
+</em>    public $actions = array();
+};
+        >
+        </code>
+    </code_comparison>
+</documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/WhiteSpace/ObjectOperatorSpacingStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/WhiteSpace/ScopeClosingBraceStandard.xml Added

@@ -0,0 +1,59 @@
+<documentation title="Scope Closing Brace">
+    <standard>
+    <!CDATA
+    Indentation of a closing brace must match the indentation of the line containing the opening brace.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: Closing brace aligned with line containing opening brace.">
+        <!CDATA
+function foo()
+{
+<em>}</em>
+
+if (!class_exists('Foo')) {
+    class Foo {
+    <em>}</em>
+<em>}</em>
+
+<?php if ($something) { ?>
+    <span>some output</span>
+<em><?php }</em> ?>
+        >
+        </code>
+        <code title="Invalid: Closing brace misaligned with line containing opening brace.">
+        <!CDATA
+function foo()
+{
+<em> }</em>
+
+if (!class_exists('Foo')) {
+    class Foo {
+<em>}</em>
+<em>    }</em>
+
+<?php if ($something) { ?>
+    <span>some output</span>
+<em> <?php }</em> ?>
+        >
+        </code>
+    </code_comparison>
+    <standard>
+    <!CDATA
+    Closing brace must be on a line by itself.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: Close brace on its own line.">
+        <!CDATA
+enum Foo {
+<em>}</em>
+        >
+        </code>
+        <code title="Invalid: Close brace on a line containing other code.">
+        <!CDATA
+enum Foo {<em>}</em>
+        >
+        </code>
+    </code_comparison>
+</documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/WhiteSpace/ScopeKeywordSpacingStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/WhiteSpace/SemicolonSpacingStandard.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Docs/WhiteSpace/SuperfluousWhitespaceStandard.xml Added

@@ -0,0 +1,98 @@
+<documentation title="Superfluous Whitespace">
+    <standard>
+    <!CDATA
+    There should be no superfluous whitespace at the start of a file.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: No whitespace preceding first content in file.">
+        <!CDATA<?php
+echo 'opening PHP tag at start of file';
+        >
+        </code>
+        <code title="Invalid: Whitespace used before content in file.">
+        <!CDATA
+<em>        </em>
+<?php
+echo 'whitespace before opening PHP tag';
+        >
+        </code>
+    </code_comparison>
+    <standard>
+    <!CDATA
+    There should be no trailing whitespace at the end of lines.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: No whitespace found at end of line.">
+        <!CDATA
+echo 'semicolon followed by new line char';
+        >
+        </code>
+        <code title="Invalid: Whitespace found at end of line.">
+        <!CDATA
+echo 'trailing spaces after semicolon';<em>   </em>
+        >
+        </code>
+    </code_comparison>
+    <standard>
+    <!CDATA
+    There should be no consecutive blank lines in functions.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: Functions do not contain multiple empty lines in a row.">
+        <!CDATA
+function myFunction()
+{
+    echo 'code here';
+
+    echo 'code here';
+}
+        >
+        </code>
+        <code title="Invalid: Functions contain multiple empty lines in a row.">
+        <!CDATA
+function myFunction()
+{
+    echo 'code here';
+    <em>
+
+    </em>echo 'code here';
+}
+        >
+        </code>
+    </code_comparison>
+    <standard>
+    <!CDATA
+    There should be no superfluous whitespace after the final closing PHP tag in a file.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: A single new line appears after the last content in the file.">
+        <!CDATA
+function myFunction()
+{
+    echo 'Closing PHP tag, then';
+    echo 'Single new line char, then EOF';
+}
+
+?><em>
+</em>
+        >
+        </code>
+        <code title="Invalid: Multiple new lines appear after the last content in the file.">
+        <!CDATA
+function myFunction()
+{
+    echo 'Closing PHP tag, then';
+    echo 'Multiple new line chars, then EOF';
+}
+
+?><em>
+
+</em>
+        >
+        </code>
+    </code_comparison>
+</documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php Changed

@@ -55,11 +55,11 @@
         if ($tokens$commentStart'code' === T_COMMENT) {
             $phpcsFile->addError('You must use "/**" style comments for a file comment', $commentStart, 'WrongStyle');
             $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'yes');
-            return ($phpcsFile->numTokens + 1);
+            return $phpcsFile->numTokens;
         } else if ($commentStart === false || $tokens$commentStart'code' !== T_DOC_COMMENT_OPEN_TAG) {
             $phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
             $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
-            return ($phpcsFile->numTokens + 1);
+            return $phpcsFile->numTokens;
         }
 
         if (isset($tokens$commentStart'comment_closer') === false
@@ -67,7 +67,7 @@
             && $tokens$commentStart'comment_closer' === ($phpcsFile->numTokens - 1))
         ) {
             // Don't process an unfinished file comment during live coding.
-            return ($phpcsFile->numTokens + 1);
+            return $phpcsFile->numTokens;
         }
 
         $commentEnd = $tokens$commentStart'comment_closer';
@@ -116,7 +116,7 @@
         if (in_array($tokens$nextToken'code', $ignore, true) === true) {
             $phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
             $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
-            return ($phpcsFile->numTokens + 1);
+            return $phpcsFile->numTokens;
         }
 
         $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'yes');
@@ -220,7 +220,7 @@
         }//end foreach
 
         // Ignore the rest of the file.
-        return ($phpcsFile->numTokens + 1);
+        return $phpcsFile->numTokens;
 
     }//end process()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Debug/JSLintSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Debug/JavaScriptLintSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php Changed

@@ -114,6 +114,9 @@
         $targets = T_INLINE_ELSE;
         $targets = T_INSTANCEOF;
 
+        // Also register the contexts we want to specifically skip over.
+        $targets = T_DECLARE;
+
         return $targets;
 
     }//end register()
@@ -126,12 +129,25 @@
      * @param int                         $stackPtr  The position of the current token in
      *                                               the stack passed in $tokens.
      *
-     * @return void
+     * @return void|int Optionally returns a stack pointer. The sniff will not be
+     *                  called again on the current file until the returned stack
+     *                  pointer is reached. Return `$phpcsFile->numTokens` to skip
+     *                  the rest of the file.
      */
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
+        // Skip over declare statements as those should be handled by different sniffs.
+        if ($tokens$stackPtr'code' === T_DECLARE) {
+            if (isset($tokens$stackPtr'parenthesis_closer') === false) {
+                // Parse error / live coding.
+                return $phpcsFile->numTokens;
+            }
+
+            return $tokens$stackPtr'parenthesis_closer';
+        }
+
         if ($this->isOperator($phpcsFile, $stackPtr) === false) {
             return;
         }
@@ -222,7 +238,8 @@
         ) {
             // Throw an error for assignments only if enabled using the sniff property
             // because other standards allow multiple spaces to align assignments.
-            if ($tokens($stackPtr - 2)'line' !== $tokens$stackPtr'line') {
+            $prevNonWhitespace = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+            if ($tokens$prevNonWhitespace'line' !== $tokens$stackPtr'line') {
                 $found = 'newline';
             } else {
                 $found = $tokens($stackPtr - 1)'length';
@@ -237,20 +254,29 @@
                     $operator,
                     $found,
                 ;
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBefore', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->beginChangeset();
-                    if ($found === 'newline') {
-                        $i = ($stackPtr - 2);
-                        while ($tokens$i'code' === T_WHITESPACE) {
-                            $phpcsFile->fixer->replaceToken($i, '');
-                            $i--;
+
+                if (isset(Tokens::$commentTokens$tokens$prevNonWhitespace'code') === true) {
+                    // Throw a non-fixable error if the token on the previous line is a comment token,
+                    // as in that case it's not for the sniff to decide where the comment should be moved to
+                    // and it would get us into unfixable situations as the new line char is included
+                    // in the contents of the comment token.
+                    $phpcsFile->addError($error, $stackPtr, 'SpacingBefore', $data);
+                } else {
+                    $fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBefore', $data);
+                    if ($fix === true) {
+                        $phpcsFile->fixer->beginChangeset();
+                        if ($found === 'newline') {
+                            $i = ($stackPtr - 2);
+                            while ($tokens$i'code' === T_WHITESPACE) {
+                                $phpcsFile->fixer->replaceToken($i, '');
+                                $i--;
+                            }
                         }
-                    }
 
-                    $phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
-                    $phpcsFile->fixer->endChangeset();
-                }
+                        $phpcsFile->fixer->replaceToken(($stackPtr - 1), ' ');
+                        $phpcsFile->fixer->endChangeset();
+                    }
+                }//end if
             }//end if
         }//end if
 
@@ -327,11 +353,13 @@
     {
         $tokens = $phpcsFile->getTokens();
 
+        if ($tokens$stackPtr'code' === T_DECLARE) {
+            return false;
+        }
+
         // Skip default values in function declarations.
         // Skip declare statements.
-        if ($tokens$stackPtr'code' === T_EQUAL
-            || $tokens$stackPtr'code' === T_MINUS
-        ) {
+        if ($tokens$stackPtr'code' === T_EQUAL) {
             if (isset($tokens$stackPtr'nested_parenthesis') === true) {
                 $parenthesis = array_keys($tokens$stackPtr'nested_parenthesis');
                 $bracket     = array_pop($parenthesis);
@@ -340,7 +368,6 @@
                     if ($tokens$function'code' === T_FUNCTION
                         || $tokens$function'code' === T_CLOSURE
                         || $tokens$function'code' === T_FN
-                        || $tokens$function'code' === T_DECLARE
                     ) {
                         return false;
                     }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.1.inc Added

@@ -0,0 +1,118 @@
+<?php
+
+function __construct()
+{
+}//end __construct()
+
+function myFunction()
+{
+}//end myFunction()
+
+function ourFunction()
+{
+}//end ourFunction
+
+function yourFunction()
+{
+}//end myFunction()
+
+class TestClass
+{
+    function __construct()
+    {
+    }//end __construct()
+
+    function myFunction()
+    {
+    }//end myFunction()
+
+    function yourFunction()
+    {
+    }//end myFunction()
+
+}//end class
+
+abstract class TestClass
+{
+    abstract function myFunction();
+
+    function ourFunction()
+    {
+    }//end myFunction()
+
+    function yourFunction()
+    {
+    }//end yourFunction()
+
+}//end class
+
+interface TestClass
+{
+    function myFunction();
+    function ourFunction();
+    function yourFunction();
+
+}//end interface
+
+class TestClass
+{
+}
+
+abstract class TestClass
+{
+}
+
+interface TestClass
+{
+}
+
+class MyClass
+{
+    public function myFunction();
+}//end class
+
+// Closures don't need end comments.
+echo preg_replace_callback('~-(a-z)~', function ($match) { return strtoupper($match1); }, 'hello-world');
+
+class TestClass
+{
+}
+//end class
+
+enum MissingClosingComment {
+}
+
+enum HasClosingComment {
+}//end enum
+
+function misplacedClosingCommentWhitespace() {
+}       //end misplacedClosingCommentWhitespace()
+
+function misplacedClosingCommentMultipleNewlines() {
+}
+
+
+//end misplacedClosingCommentMultipleNewlines()
+
+function missingClosingComment() {
+}
+
+function commentHasMoreIndentationThanFunction() {
+}
+        //end commentHasMoreIndentationThanFunction()
+
+class Foo {
+    function commentHasLessIndentationThanFunction() {
+    }
+  //end commentHasLessIndentationThanFunction()
+
+    function misplacedClosingCommentWithIndentation() {
+    }
+    //end misplacedClosingCommentWithIndentation()
+}//end class
+
+// Anonymous classes don't need end comments.
+$anon = new class {};
+
+// Arrow functions don't need end comments.
+$arrow = fn($a) => $a;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.1.inc.fixed Added

@@ -0,0 +1,111 @@
+<?php
+
+function __construct()
+{
+}//end __construct()
+
+function myFunction()
+{
+}//end myFunction()
+
+function ourFunction()
+{
+}//end ourFunction()
+
+function yourFunction()
+{
+}//end yourFunction()
+
+class TestClass
+{
+    function __construct()
+    {
+    }//end __construct()
+
+    function myFunction()
+    {
+    }//end myFunction()
+
+    function yourFunction()
+    {
+    }//end yourFunction()
+
+}//end class
+
+abstract class TestClass
+{
+    abstract function myFunction();
+
+    function ourFunction()
+    {
+    }//end ourFunction()
+
+    function yourFunction()
+    {
+    }//end yourFunction()
+
+}//end class
+
+interface TestClass
+{
+    function myFunction();
+    function ourFunction();
+    function yourFunction();
+
+}//end interface
+
+class TestClass
+{
+}//end class
+
+abstract class TestClass
+{
+}//end class
+
+interface TestClass
+{
+}//end interface
+
+class MyClass
+{
+    public function myFunction();
+}//end class
+
+// Closures don't need end comments.
+echo preg_replace_callback('~-(a-z)~', function ($match) { return strtoupper($match1); }, 'hello-world');
+
+class TestClass
+{
+}//end class
+
+enum MissingClosingComment {
+}//end enum
+
+enum HasClosingComment {
+}//end enum
+
+function misplacedClosingCommentWhitespace() {
+}//end misplacedClosingCommentWhitespace()
+
+function misplacedClosingCommentMultipleNewlines() {
+}//end misplacedClosingCommentMultipleNewlines()
+
+function missingClosingComment() {
+}//end missingClosingComment()
+
+function commentHasMoreIndentationThanFunction() {
+}//end commentHasMoreIndentationThanFunction()
+
+class Foo {
+    function commentHasLessIndentationThanFunction() {
+    }//end commentHasLessIndentationThanFunction()
+
+    function misplacedClosingCommentWithIndentation() {
+    }//end misplacedClosingCommentWithIndentation()
+}//end class
+
+// Anonymous classes don't need end comments.
+$anon = new class {};
+
+// Arrow functions don't need end comments.
+$arrow = fn($a) => $a;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.4.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.4.inc.fixed Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.5.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.5.inc.fixed Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.inc Deleted

@@ -1,86 +0,0 @@
-<?php
-
-function __construct()
-{
-}//end __construct()
-
-function myFunction()
-{
-}//end myFunction()
-
-function ourFunction()
-{
-}//end ourFunction
-
-function yourFunction()
-{
-}//end myFunction()
-
-class TestClass
-{
-    function __construct()
-    {
-    }//end __construct()
-
-    function myFunction()
-    {
-    }//end myFunction()
-
-    function yourFunction()
-    {
-    }//end myFunction()
-
-}//end class
-
-abstract class TestClass
-{
-    abstract function myFunction();
-
-    function ourFunction()
-    {
-    }//end myFunction()
-
-    function yourFunction()
-    {
-    }//end yourFunction()
-
-}//end class
-
-interface TestClass
-{
-    function myFunction();
-    function ourFunction();
-    function yourFunction();
-
-}//end interface
-
-class TestClass
-{
-}
-
-abstract class TestClass
-{
-}
-
-interface TestClass
-{
-}
-
-class MyClass
-{
-    public function myFunction();
-}//end class
-
-// Closures don't need end comments.
-echo preg_replace_callback('~-(a-z)~', function ($match) { return strtoupper($match1); }, 'hello-world');
-
-class TestClass
-{
-}
-//end class
-
-enum MissingClosingComment {
-}
-
-enum HasClosingComment {
-}//end enum

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.inc.fixed Deleted

@@ -1,85 +0,0 @@
-<?php
-
-function __construct()
-{
-}//end __construct()
-
-function myFunction()
-{
-}//end myFunction()
-
-function ourFunction()
-{
-}//end ourFunction()
-
-function yourFunction()
-{
-}//end yourFunction()
-
-class TestClass
-{
-    function __construct()
-    {
-    }//end __construct()
-
-    function myFunction()
-    {
-    }//end myFunction()
-
-    function yourFunction()
-    {
-    }//end yourFunction()
-
-}//end class
-
-abstract class TestClass
-{
-    abstract function myFunction();
-
-    function ourFunction()
-    {
-    }//end ourFunction()
-
-    function yourFunction()
-    {
-    }//end yourFunction()
-
-}//end class
-
-interface TestClass
-{
-    function myFunction();
-    function ourFunction();
-    function yourFunction();
-
-}//end interface
-
-class TestClass
-{
-}//end class
-
-abstract class TestClass
-{
-}//end class
-
-interface TestClass
-{
-}//end interface
-
-class MyClass
-{
-    public function myFunction();
-}//end class
-
-// Closures don't need end comments.
-echo preg_replace_callback('~-(a-z)~', function ($match) { return strtoupper($match1); }, 'hello-world');
-
-class TestClass
-{
-}//end class
-
-enum MissingClosingComment {
-}//end enum
-
-enum HasClosingComment {
-}//end enum

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php Changed

@@ -26,21 +26,41 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the test file being tested.
+     *
      * @return array<int, int>
      */
-    public function getErrorList()
+    public function getErrorList($testFile='')
     {
-        return 
-            13 => 1,
-            17 => 1,
-            31 => 1,
-            41 => 1,
-            59 => 1,
-            63 => 1,
-            67 => 1,
-            79 => 1,
-            83 => 1,
-        ;
+        switch ($testFile) {
+        case 'ClosingDeclarationCommentUnitTest.1.inc':
+            return 
+                13  => 1,
+                17  => 1,
+                31  => 1,
+                41  => 1,
+                59  => 1,
+                63  => 1,
+                67  => 1,
+                79  => 1,
+                83  => 1,
+                89  => 1,
+                92  => 1,
+                98  => 1,
+                101 => 1,
+                106 => 1,
+                110 => 1,
+            ;
+
+        case 'ClosingDeclarationCommentUnitTest.4.inc':
+            return 8 => 1;
+
+        case 'ClosingDeclarationCommentUnitTest.5.inc':
+            return 11 => 1;
+
+        default:
+            return ;
+        }//end switch
 
     }//end getErrorList()
 
@@ -51,11 +71,23 @@
      * The key of the array should represent the line number and the value
      * should represent the number of warnings that should occur on that line.
      *
+     * @param string $testFile The name of the test file being tested.
+     *
      * @return array<int, int>
      */
-    public function getWarningList()
+    public function getWarningList($testFile='')
     {
-        return 71 => 1;
+        switch ($testFile) {
+        case 'ClosingDeclarationCommentUnitTest.1.inc':
+            return 71 => 1;
+
+        case 'ClosingDeclarationCommentUnitTest.2.inc':
+        case 'ClosingDeclarationCommentUnitTest.3.inc':
+            return 7 => 1;
+
+        default:
+            return ;
+        }
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.1.inc Added

@@ -0,0 +1,126 @@
+<?php
+
+// Valid.
+for ($i = 0; $i < 10; $i++) {
+}
+
+// Invalid.
+for ( $i = 0; $i < 10; $i++ ) {
+}
+
+for ($i = 0;  $i < 10;  $i++) {
+}
+
+for ($i = 0 ; $i < 10 ; $i++) {
+}
+
+for ($i = 0;$i < 10;$i++) {
+}
+
+// The works.
+for ( $i = 0 ;  $i < 10 ;  $i++ ) {
+}
+
+for ($i = 0; $i < 10;) {
+}
+
+for ($i = 0; $i < 10; ) {
+}
+
+for ($i = 0; ; $i++) {
+}
+for ($i = 0;; $i++) {
+}
+
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
+for ($i = 0; $i < 10; $i++) {}
+for ( $i = 0; $i < 10; $i++ ) {}
+for (  $i = 0; $i < 10; $i++  ) {}
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
+
+for (         ; $i < 10; $i++) {}
+for (; $i < 10; $i++) {}
+
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
+for ( ; $i < 10; $i++ ) {}
+for (         ; $i < 10; $i++ ) {}
+for (; $i < 10; $i++ ) {}
+
+for ( $i = 0; $i < 10; ) {}
+for ( $i = 0; $i < 10;) {}
+for ( $i = 0; $i < 10;     ) {}
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
+
+// Test handling of comments and inline annotations.
+for ( /*phpcs:enable*/ $i = 0 /*start*/ ;    /*end*/$i < 10/*comment*/; $i++ /*comment*/   ) {}
+
+// Test multi-line FOR control structure.
+for (
+    $i = 0;
+    $i < 10;
+    $i++
+) {}
+
+// Test multi-line FOR control structure with comments and annotations.
+for (
+    $i = 0; /* Start */
+    $i < 10; /* phpcs:ignore Standard.Category.SniffName -- for reasons. */
+    $i++ // comment
+
+) {}
+
+// Test fixing each error in one go. Note: lines 78 + 82 contain trailing whitespace on purpose.
+for (
+      
+
+      $i = 0
+
+      ; 
+
+      $i < 10
+
+      ;
+
+      $i++
+
+
+) {}
+
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
+for (
+
+
+
+      $i = 0
+
+      ;
+
+      $i < 10
+
+      ;
+
+      $i++
+
+
+) {}
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
+
+// Test with semi-colon not belonging to for.
+for ($i = function() { return $this->i  ;    }; $i < function() { return $this->max; }; $i++) {}
+for ($i = function() { return $this->i; }; $i < function() { return $this->max; }  ;   $i++) {}
+
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration ignoreNewlines true
+for (
+    $i = 0;
+    $i < 5;
+    $i++
+) {
+    // body here
+}
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration ignoreNewlines false

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.1.inc.fixed Added

@@ -0,0 +1,92 @@
+<?php
+
+// Valid.
+for ($i = 0; $i < 10; $i++) {
+}
+
+// Invalid.
+for ($i = 0; $i < 10; $i++) {
+}
+
+for ($i = 0; $i < 10; $i++) {
+}
+
+for ($i = 0; $i < 10; $i++) {
+}
+
+for ($i = 0; $i < 10; $i++) {
+}
+
+// The works.
+for ($i = 0; $i < 10; $i++) {
+}
+
+for ($i = 0; $i < 10;) {
+}
+
+for ($i = 0; $i < 10;) {
+}
+
+for ($i = 0;; $i++) {
+}
+for ($i = 0;; $i++) {
+}
+
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
+for ( $i = 0; $i < 10; $i++ ) {}
+for ( $i = 0; $i < 10; $i++ ) {}
+for ( $i = 0; $i < 10; $i++ ) {}
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
+
+for (; $i < 10; $i++) {}
+for (; $i < 10; $i++) {}
+
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
+for ( ; $i < 10; $i++ ) {}
+for ( ; $i < 10; $i++ ) {}
+for ( ; $i < 10; $i++ ) {}
+
+for ( $i = 0; $i < 10; ) {}
+for ( $i = 0; $i < 10; ) {}
+for ( $i = 0; $i < 10; ) {}
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
+
+// Test handling of comments and inline annotations.
+for (/*phpcs:enable*/ $i = 0 /*start*/; /*end*/$i < 10/*comment*/; $i++ /*comment*/) {}
+
+// Test multi-line FOR control structure.
+for ($i = 0; $i < 10; $i++) {}
+
+// Test multi-line FOR control structure with comments and annotations.
+for ($i = 0; /* Start */
+    $i < 10; /* phpcs:ignore Standard.Category.SniffName -- for reasons. */
+    $i++ // comment
+
+) {}
+
+// Test fixing each error in one go. Note: lines 78 + 82 contain trailing whitespace on purpose.
+for ($i = 0; $i < 10; $i++) {}
+
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
+for ( $i = 0; $i < 10; $i++ ) {}
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
+
+// Test with semi-colon not belonging to for.
+for ($i = function() { return $this->i  ;    }; $i < function() { return $this->max; }; $i++) {}
+for ($i = function() { return $this->i; }; $i < function() { return $this->max; }; $i++) {}
+
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration ignoreNewlines true
+for (
+    $i = 0;
+    $i < 5;
+    $i++
+) {
+    // body here
+}
+// phpcs:set Squiz.ControlStructures.ForLoopDeclaration ignoreNewlines false

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.inc Deleted

@@ -1,129 +0,0 @@
-<?php
-
-// Valid.
-for ($i = 0; $i < 10; $i++) {
-}
-
-// Invalid.
-for ( $i = 0; $i < 10; $i++ ) {
-}
-
-for ($i = 0;  $i < 10;  $i++) {
-}
-
-for ($i = 0 ; $i < 10 ; $i++) {
-}
-
-for ($i = 0;$i < 10;$i++) {
-}
-
-// The works.
-for ( $i = 0 ;  $i < 10 ;  $i++ ) {
-}
-
-for ($i = 0; $i < 10;) {
-}
-
-for ($i = 0; $i < 10; ) {
-}
-
-for ($i = 0; ; $i++) {
-}
-for ($i = 0;; $i++) {
-}
-
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
-for ($i = 0; $i < 10; $i++) {}
-for ( $i = 0; $i < 10; $i++ ) {}
-for (  $i = 0; $i < 10; $i++  ) {}
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
-
-for (         ; $i < 10; $i++) {}
-for (; $i < 10; $i++) {}
-
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
-for ( ; $i < 10; $i++ ) {}
-for (         ; $i < 10; $i++ ) {}
-for (; $i < 10; $i++ ) {}
-
-for ( $i = 0; $i < 10; ) {}
-for ( $i = 0; $i < 10;) {}
-for ( $i = 0; $i < 10;     ) {}
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
-
-// Test handling of comments and inline annotations.
-for ( /*phpcs:enable*/ $i = 0 /*start*/ ;    /*end*/$i < 10/*comment*/; $i++ /*comment*/   ) {}
-
-// Test multi-line FOR control structure.
-for (
-    $i = 0;
-    $i < 10;
-    $i++
-) {}
-
-// Test multi-line FOR control structure with comments and annotations.
-for (
-    $i = 0; /* Start */
-    $i < 10; /* phpcs:ignore Standard.Category.SniffName -- for reasons. */
-    $i++ // comment
-
-) {}
-
-// Test fixing each error in one go. Note: lines 78 + 82 contain trailing whitespace on purpose.
-for (
-      
-
-      $i = 0
-
-      ; 
-
-      $i < 10
-
-      ;
-
-      $i++
-
-
-) {}
-
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
-for (
-
-
-
-      $i = 0
-
-      ;
-
-      $i < 10
-
-      ;
-
-      $i++
-
-
-) {}
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
-
-// Test with semi-colon not belonging to for.
-for ($i = function() { return $this->i  ;    }; $i < function() { return $this->max; }; $i++) {}
-for ($i = function() { return $this->i; }; $i < function() { return $this->max; }  ;   $i++) {}
-
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration ignoreNewlines true
-for (
-    $i = 0;
-    $i < 5;
-    $i++
-) {
-    // body here
-}
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration ignoreNewlines false
-
-// This test has to be the last one in the file! Intentional parse error check.
-for

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.inc.fixed Deleted

@@ -1,95 +0,0 @@
-<?php
-
-// Valid.
-for ($i = 0; $i < 10; $i++) {
-}
-
-// Invalid.
-for ($i = 0; $i < 10; $i++) {
-}
-
-for ($i = 0; $i < 10; $i++) {
-}
-
-for ($i = 0; $i < 10; $i++) {
-}
-
-for ($i = 0; $i < 10; $i++) {
-}
-
-// The works.
-for ($i = 0; $i < 10; $i++) {
-}
-
-for ($i = 0; $i < 10;) {
-}
-
-for ($i = 0; $i < 10;) {
-}
-
-for ($i = 0;; $i++) {
-}
-for ($i = 0;; $i++) {
-}
-
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
-for ( $i = 0; $i < 10; $i++ ) {}
-for ( $i = 0; $i < 10; $i++ ) {}
-for ( $i = 0; $i < 10; $i++ ) {}
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
-
-for (; $i < 10; $i++) {}
-for (; $i < 10; $i++) {}
-
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
-for ( ; $i < 10; $i++ ) {}
-for ( ; $i < 10; $i++ ) {}
-for ( ; $i < 10; $i++ ) {}
-
-for ( $i = 0; $i < 10; ) {}
-for ( $i = 0; $i < 10; ) {}
-for ( $i = 0; $i < 10; ) {}
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
-
-// Test handling of comments and inline annotations.
-for (/*phpcs:enable*/ $i = 0 /*start*/; /*end*/$i < 10/*comment*/; $i++ /*comment*/) {}
-
-// Test multi-line FOR control structure.
-for ($i = 0; $i < 10; $i++) {}
-
-// Test multi-line FOR control structure with comments and annotations.
-for ($i = 0; /* Start */
-    $i < 10; /* phpcs:ignore Standard.Category.SniffName -- for reasons. */
-    $i++ // comment
-
-) {}
-
-// Test fixing each error in one go. Note: lines 78 + 82 contain trailing whitespace on purpose.
-for ($i = 0; $i < 10; $i++) {}
-
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 1
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 1
-for ( $i = 0; $i < 10; $i++ ) {}
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesAfterOpen 0
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration requiredSpacesBeforeClose 0
-
-// Test with semi-colon not belonging to for.
-for ($i = function() { return $this->i  ;    }; $i < function() { return $this->max; }; $i++) {}
-for ($i = function() { return $this->i; }; $i < function() { return $this->max; }; $i++) {}
-
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration ignoreNewlines true
-for (
-    $i = 0;
-    $i < 5;
-    $i++
-) {
-    // body here
-}
-// phpcs:set Squiz.ControlStructures.ForLoopDeclaration ignoreNewlines false
-
-// This test has to be the last one in the file! Intentional parse error check.
-for

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.1.inc Added

@@ -0,0 +1,510 @@
+<?php
+
+$result = 1 + 2;
+$result = 1  + 2;
+$result = 1  +   2;
+$result = 1 +2;
+$result = 1+ 2;
+$result = 1+2;
+
+$result = 1 - 2;
+$result = 1  - 2;
+$result = 1  -   2;
+$result = 1 -2;
+$result = 1- 2;
+$result = 1-2;
+
+$result = 1 * 2;
+$result = 1  * 2;
+$result = 1  *   2;
+$result = 1 *2;
+$result = 1* 2;
+$result = 1*2;
+
+$result = 1 / 2;
+$result = 1  / 2;
+$result = 1  /   2;
+$result = 1 /2;
+$result = 1/ 2;
+$result = 1/2;
+
+$result = 1 % 2;
+$result = 1  % 2;
+$result = 1  %   2;
+$result = 1 %2;
+$result = 1% 2;
+$result = 1%2;
+$result = '100%';
+
+$result += 4;
+$result+=4;
+$result -= 4;
+$result-=4;
+$result /= 4;
+$result/=4;
+$result *=4;
+$result*=4;
+
+$result =& $thing;
+if ($result & 4) {
+    if ($result | 4) {
+    }
+}
+if ($result&4 && $result  &  4) {
+    if ($result |4 || $result  |  4) {
+    }
+}
+
+$result = ((1 + 2) - (3 * 4 / 5) % 6);
+$result = ((1+  2)  -  (3*4/5)  %  6);
+return -1;
+$file = '...'.substr($file, (($padding * -1) + 3));
+
+$totalErrors   += $errors'errors';
+$totalWarnings +=  $errors'warnings';
+
+if (substr($line, 0, 3) === '/**') {
+    $line = substr($line, 3);
+} else if (substr($line, -2, 2) === '*/') {
+    $line = substr(-2, 0, -2);
+} else if ($line{0} === '*') {
+    $line = substr($line, 1);
+}
+
+if ($pos === -1) {
+}
+
+for ($i=0; $i<=5; $i++) {
+    $j^= $i;
+    $k %=$i;
+    $l&=$i;
+    $m.= 'Hello ';
+}
+
+$z = ($a+ $b- $c* $d/ $e% $f^ $g);
+$z = ($a +$b -$c *$d /$e %$f ^$g);
+
+$a== $b && $c!= $d && $e=== $f && $g!== $h;
+$i> $j && $k< $l && $m>= $n && $o<= $p && $q<> $r;
+
+$a ==$b && $c !=$d && $e ===$f && $g !==$h;
+$i >$j && $k <$l && $m >=$n && $o <=$p && $q <>$r;
+
+function myFunction($variable=0, $var2='string') {}
+
+if (index > -1) {
+}
+
+array_walk_recursive($array, function(&$item) use (&$something) {
+});
+
+$var = saveFile(&$model, &$foo);
+
+// This is all valid.
+$boo = -$foo;
+function foo($boo = -1) {}
+$foo = array('boo' => -1);
+$x = $test ? -1 : 1;
+$y = $test ? 1 : -1;
+$z = $test ?: false;
+
+$closureWithDefaultParameter = function (array $testArray=array()) {};
+
+switch ($foo) {
+	case -1:
+		break;
+}
+
+$y = 1 * -1;
+$y = -1 * 1;
+$y = -1 * $var;
+$y = 10 / -2;
+$y = -10 / 2;
+$y = (-10 / 2);
+$y = (-10 / $var);
+$y = 10 + -2;
+$y = -10 + 2;
+
+$a = $x?$y:$z;
+$a = $x ? $y : $z;
+
+$y = 1
+   + 2  
+   - 3;
+
+$y = 1 + 
+     2 - 
+     3;
+
+$y = 1
++ 2
+- 3;
+
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines true
+$y = 1
+   + 2
+   - 3;
+
+$y = 1 +
+     2 -
+     3;
+
+$y = 1
++ 2
+- 3;
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines false
+
+if (true || -1 == $b) {
+}
+
+$var = array(-1);
+$var = -1;
+$var = 0, -1, -2;
+
+$y = array(&$x);
+$y = &$x;
+$y = array(&$a, &$b, &$c);
+$y = &$a, &$b, &$c;
+$y = array(&$a => 1, 2 => &$b, &$c);
+$y = &$a => 1, 2 => &$b, &$c;
+
+if ($a <=> $b) {
+}
+
+if ($a <=>$b) {
+}
+
+$a |=  $b;
+$a **=  $b;
+$a ??=  $b;
+
+$a = +1;
+
+function bar($boo = +1) {}
+
+$username = $_GET'user'??'nobody';
+
+function foo(string $bar, array $baz, ?MyClass $object) : MyClass {}
+
+declare(strict_types=1);
+
+function foo($c = ((BAR)?10:100)) {}
+
+$res = $a ?: $b;
+$res = $a ?:  $b;
+$res = $a  ?: $b;
+$res = $a  ?:  $b;
+
+$res = $a ? : $b;
+$res = $a ? :  $b;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.1.inc.fixed Added

@@ -0,0 +1,502 @@
+<?php
+
+$result = 1 + 2;
+$result = 1 + 2;
+$result = 1 + 2;
+$result = 1 + 2;
+$result = 1 + 2;
+$result = 1 + 2;
+
+$result = 1 - 2;
+$result = 1 - 2;
+$result = 1 - 2;
+$result = 1 - 2;
+$result = 1 - 2;
+$result = 1 - 2;
+
+$result = 1 * 2;
+$result = 1 * 2;
+$result = 1 * 2;
+$result = 1 * 2;
+$result = 1 * 2;
+$result = 1 * 2;
+
+$result = 1 / 2;
+$result = 1 / 2;
+$result = 1 / 2;
+$result = 1 / 2;
+$result = 1 / 2;
+$result = 1 / 2;
+
+$result = 1 % 2;
+$result = 1 % 2;
+$result = 1 % 2;
+$result = 1 % 2;
+$result = 1 % 2;
+$result = 1 % 2;
+$result = '100%';
+
+$result += 4;
+$result += 4;
+$result -= 4;
+$result -= 4;
+$result /= 4;
+$result /= 4;
+$result *= 4;
+$result *= 4;
+
+$result =& $thing;
+if ($result & 4) {
+    if ($result | 4) {
+    }
+}
+if ($result & 4 && $result & 4) {
+    if ($result | 4 || $result | 4) {
+    }
+}
+
+$result = ((1 + 2) - (3 * 4 / 5) % 6);
+$result = ((1 + 2) - (3 * 4 / 5) % 6);
+return -1;
+$file = '...'.substr($file, (($padding * -1) + 3));
+
+$totalErrors   += $errors'errors';
+$totalWarnings += $errors'warnings';
+
+if (substr($line, 0, 3) === '/**') {
+    $line = substr($line, 3);
+} else if (substr($line, -2, 2) === '*/') {
+    $line = substr(-2, 0, -2);
+} else if ($line{0} === '*') {
+    $line = substr($line, 1);
+}
+
+if ($pos === -1) {
+}
+
+for ($i = 0; $i <= 5; $i++) {
+    $j ^= $i;
+    $k %= $i;
+    $l &= $i;
+    $m .= 'Hello ';
+}
+
+$z = ($a + $b - $c * $d / $e % $f ^ $g);
+$z = ($a + $b - $c * $d / $e % $f ^ $g);
+
+$a == $b && $c != $d && $e === $f && $g !== $h;
+$i > $j && $k < $l && $m >= $n && $o <= $p && $q <> $r;
+
+$a == $b && $c != $d && $e === $f && $g !== $h;
+$i > $j && $k < $l && $m >= $n && $o <= $p && $q <> $r;
+
+function myFunction($variable=0, $var2='string') {}
+
+if (index > -1) {
+}
+
+array_walk_recursive($array, function(&$item) use (&$something) {
+});
+
+$var = saveFile(&$model, &$foo);
+
+// This is all valid.
+$boo = -$foo;
+function foo($boo = -1) {}
+$foo = array('boo' => -1);
+$x = $test ? -1 : 1;
+$y = $test ? 1 : -1;
+$z = $test ?: false;
+
+$closureWithDefaultParameter = function (array $testArray=array()) {};
+
+switch ($foo) {
+	case -1:
+		break;
+}
+
+$y = 1 * -1;
+$y = -1 * 1;
+$y = -1 * $var;
+$y = 10 / -2;
+$y = -10 / 2;
+$y = (-10 / 2);
+$y = (-10 / $var);
+$y = 10 + -2;
+$y = -10 + 2;
+
+$a = $x ? $y : $z;
+$a = $x ? $y : $z;
+
+$y = 1 + 2 - 3;
+
+$y = 1 + 2 - 3;
+
+$y = 1 + 2 - 3;
+
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines true
+$y = 1
+   + 2
+   - 3;
+
+$y = 1 +
+     2 -
+     3;
+
+$y = 1
++ 2
+- 3;
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines false
+
+if (true || -1 == $b) {
+}
+
+$var = array(-1);
+$var = -1;
+$var = 0, -1, -2;
+
+$y = array(&$x);
+$y = &$x;
+$y = array(&$a, &$b, &$c);
+$y = &$a, &$b, &$c;
+$y = array(&$a => 1, 2 => &$b, &$c);
+$y = &$a => 1, 2 => &$b, &$c;
+
+if ($a <=> $b) {
+}
+
+if ($a <=> $b) {
+}
+
+$a |= $b;
+$a **= $b;
+$a ??= $b;
+
+$a = +1;
+
+function bar($boo = +1) {}
+
+$username = $_GET'user' ?? 'nobody';
+
+function foo(string $bar, array $baz, ?MyClass $object) : MyClass {}
+
+declare(strict_types=1);
+
+function foo($c = ((BAR) ? 10 : 100)) {}
+
+$res = $a ?: $b;
+$res = $a ?: $b;
+$res = $a ?: $b;
+$res = $a ?: $b;
+
+$res = $a ? : $b;
+$res = $a ? : $b;
+$res = $a ? : $b;
+$res = $a ? : $b;
+
+function foo(string $a = '', ?string $b = ''): ?string {}
+
+// Issue #1605.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc Deleted

@@ -1,487 +0,0 @@
-<?php
-
-$result = 1 + 2;
-$result = 1  + 2;
-$result = 1  +   2;
-$result = 1 +2;
-$result = 1+ 2;
-$result = 1+2;
-
-$result = 1 - 2;
-$result = 1  - 2;
-$result = 1  -   2;
-$result = 1 -2;
-$result = 1- 2;
-$result = 1-2;
-
-$result = 1 * 2;
-$result = 1  * 2;
-$result = 1  *   2;
-$result = 1 *2;
-$result = 1* 2;
-$result = 1*2;
-
-$result = 1 / 2;
-$result = 1  / 2;
-$result = 1  /   2;
-$result = 1 /2;
-$result = 1/ 2;
-$result = 1/2;
-
-$result = 1 % 2;
-$result = 1  % 2;
-$result = 1  %   2;
-$result = 1 %2;
-$result = 1% 2;
-$result = 1%2;
-$result = '100%';
-
-$result += 4;
-$result+=4;
-$result -= 4;
-$result-=4;
-$result /= 4;
-$result/=4;
-$result *=4;
-$result*=4;
-
-$result =& $thing;
-if ($result & 4) {
-    if ($result | 4) {
-    }
-}
-if ($result&4 && $result  &  4) {
-    if ($result |4 || $result  |  4) {
-    }
-}
-
-$result = ((1 + 2) - (3 * 4 / 5) % 6);
-$result = ((1+  2)  -  (3*4/5)  %  6);
-return -1;
-$file = '...'.substr($file, (($padding * -1) + 3));
-
-$totalErrors   += $errors'errors';
-$totalWarnings +=  $errors'warnings';
-
-if (substr($line, 0, 3) === '/**') {
-    $line = substr($line, 3);
-} else if (substr($line, -2, 2) === '*/') {
-    $line = substr(-2, 0, -2);
-} else if ($line{0} === '*') {
-    $line = substr($line, 1);
-}
-
-if ($pos === -1) {
-}
-
-for ($i=0; $i<=5; $i++) {
-    $j^= $i;
-    $k %=$i;
-    $l&=$i;
-    $m.= 'Hello ';
-}
-
-$z = ($a+ $b- $c* $d/ $e% $f^ $g);
-$z = ($a +$b -$c *$d /$e %$f ^$g);
-
-$a== $b && $c!= $d && $e=== $f && $g!== $h;
-$i> $j && $k< $l && $m>= $n && $o<= $p && $q<> $r;
-
-$a ==$b && $c !=$d && $e ===$f && $g !==$h;
-$i >$j && $k <$l && $m >=$n && $o <=$p && $q <>$r;
-
-function myFunction($variable=0, $var2='string') {}
-
-if (index > -1) {
-}
-
-array_walk_recursive($array, function(&$item) use (&$something) {
-});
-
-$var = saveFile(&$model, &$foo);
-
-// This is all valid.
-$boo = -$foo;
-function foo($boo = -1) {}
-$foo = array('boo' => -1);
-$x = $test ? -1 : 1;
-$y = $test ? 1 : -1;
-$z = $test ?: false;
-
-$closureWithDefaultParameter = function (array $testArray=array()) {};
-
-switch ($foo) {
-	case -1:
-		break;
-}
-
-$y = 1 * -1;
-$y = -1 * 1;
-$y = -1 * $var;
-$y = 10 / -2;
-$y = -10 / 2;
-$y = (-10 / 2);
-$y = (-10 / $var);
-$y = 10 + -2;
-$y = -10 + 2;
-
-$a = $x?$y:$z;
-$a = $x ? $y : $z;
-
-$y = 1
-   + 2  
-   - 3;
-
-$y = 1 + 
-     2 - 
-     3;
-
-$y = 1
-+ 2
-- 3;
-
-// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines true
-$y = 1
-   + 2
-   - 3;
-
-$y = 1 +
-     2 -
-     3;
-
-$y = 1
-+ 2
-- 3;
-// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines false
-
-if (true || -1 == $b) {
-}
-
-$var = array(-1);
-$var = -1;
-$var = 0, -1, -2;
-
-$y = array(&$x);
-$y = &$x;
-$y = array(&$a, &$b, &$c);
-$y = &$a, &$b, &$c;
-$y = array(&$a => 1, 2 => &$b, &$c);
-$y = &$a => 1, 2 => &$b, &$c;
-
-if ($a <=> $b) {
-}
-
-if ($a <=>$b) {
-}
-
-$a |=  $b;
-$a **=  $b;
-$a ??=  $b;
-
-$a = +1;
-
-function bar($boo = +1) {}
-
-$username = $_GET'user'??'nobody';
-
-function foo(string $bar, array $baz, ?MyClass $object) : MyClass {}
-
-declare(strict_types=1);
-
-function foo($c = ((BAR)?10:100)) {}
-
-$res = $a ?: $b;
-$res = $a ?:  $b;
-$res = $a  ?: $b;
-$res = $a  ?:  $b;
-
-$res = $a ? : $b;
-$res = $a ? :  $b;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed Deleted

@@ -1,481 +0,0 @@
-<?php
-
-$result = 1 + 2;
-$result = 1 + 2;
-$result = 1 + 2;
-$result = 1 + 2;
-$result = 1 + 2;
-$result = 1 + 2;
-
-$result = 1 - 2;
-$result = 1 - 2;
-$result = 1 - 2;
-$result = 1 - 2;
-$result = 1 - 2;
-$result = 1 - 2;
-
-$result = 1 * 2;
-$result = 1 * 2;
-$result = 1 * 2;
-$result = 1 * 2;
-$result = 1 * 2;
-$result = 1 * 2;
-
-$result = 1 / 2;
-$result = 1 / 2;
-$result = 1 / 2;
-$result = 1 / 2;
-$result = 1 / 2;
-$result = 1 / 2;
-
-$result = 1 % 2;
-$result = 1 % 2;
-$result = 1 % 2;
-$result = 1 % 2;
-$result = 1 % 2;
-$result = 1 % 2;
-$result = '100%';
-
-$result += 4;
-$result += 4;
-$result -= 4;
-$result -= 4;
-$result /= 4;
-$result /= 4;
-$result *= 4;
-$result *= 4;
-
-$result =& $thing;
-if ($result & 4) {
-    if ($result | 4) {
-    }
-}
-if ($result & 4 && $result & 4) {
-    if ($result | 4 || $result | 4) {
-    }
-}
-
-$result = ((1 + 2) - (3 * 4 / 5) % 6);
-$result = ((1 + 2) - (3 * 4 / 5) % 6);
-return -1;
-$file = '...'.substr($file, (($padding * -1) + 3));
-
-$totalErrors   += $errors'errors';
-$totalWarnings += $errors'warnings';
-
-if (substr($line, 0, 3) === '/**') {
-    $line = substr($line, 3);
-} else if (substr($line, -2, 2) === '*/') {
-    $line = substr(-2, 0, -2);
-} else if ($line{0} === '*') {
-    $line = substr($line, 1);
-}
-
-if ($pos === -1) {
-}
-
-for ($i = 0; $i <= 5; $i++) {
-    $j ^= $i;
-    $k %= $i;
-    $l &= $i;
-    $m .= 'Hello ';
-}
-
-$z = ($a + $b - $c * $d / $e % $f ^ $g);
-$z = ($a + $b - $c * $d / $e % $f ^ $g);
-
-$a == $b && $c != $d && $e === $f && $g !== $h;
-$i > $j && $k < $l && $m >= $n && $o <= $p && $q <> $r;
-
-$a == $b && $c != $d && $e === $f && $g !== $h;
-$i > $j && $k < $l && $m >= $n && $o <= $p && $q <> $r;
-
-function myFunction($variable=0, $var2='string') {}
-
-if (index > -1) {
-}
-
-array_walk_recursive($array, function(&$item) use (&$something) {
-});
-
-$var = saveFile(&$model, &$foo);
-
-// This is all valid.
-$boo = -$foo;
-function foo($boo = -1) {}
-$foo = array('boo' => -1);
-$x = $test ? -1 : 1;
-$y = $test ? 1 : -1;
-$z = $test ?: false;
-
-$closureWithDefaultParameter = function (array $testArray=array()) {};
-
-switch ($foo) {
-	case -1:
-		break;
-}
-
-$y = 1 * -1;
-$y = -1 * 1;
-$y = -1 * $var;
-$y = 10 / -2;
-$y = -10 / 2;
-$y = (-10 / 2);
-$y = (-10 / $var);
-$y = 10 + -2;
-$y = -10 + 2;
-
-$a = $x ? $y : $z;
-$a = $x ? $y : $z;
-
-$y = 1 + 2 - 3;
-
-$y = 1 + 2 - 3;
-
-$y = 1 + 2 - 3;
-
-// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines true
-$y = 1
-   + 2
-   - 3;
-
-$y = 1 +
-     2 -
-     3;
-
-$y = 1
-+ 2
-- 3;
-// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines false
-
-if (true || -1 == $b) {
-}
-
-$var = array(-1);
-$var = -1;
-$var = 0, -1, -2;
-
-$y = array(&$x);
-$y = &$x;
-$y = array(&$a, &$b, &$c);
-$y = &$a, &$b, &$c;
-$y = array(&$a => 1, 2 => &$b, &$c);
-$y = &$a => 1, 2 => &$b, &$c;
-
-if ($a <=> $b) {
-}
-
-if ($a <=> $b) {
-}
-
-$a |= $b;
-$a **= $b;
-$a ??= $b;
-
-$a = +1;
-
-function bar($boo = +1) {}
-
-$username = $_GET'user' ?? 'nobody';
-
-function foo(string $bar, array $baz, ?MyClass $object) : MyClass {}
-
-declare(strict_types=1);
-
-function foo($c = ((BAR) ? 10 : 100)) {}
-
-$res = $a ?: $b;
-$res = $a ?: $b;
-$res = $a ?: $b;
-$res = $a ?: $b;
-
-$res = $a ? : $b;
-$res = $a ? : $b;
-$res = $a ? : $b;
-$res = $a ? : $b;
-
-function foo(string $a = '', ?string $b = ''): ?string {}
-
-// Issue #1605.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Sniffs/Debug/CodeAnalyzerSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/Comment.php Changed

@@ -9,7 +9,7 @@
 
 namespace PHP_CodeSniffer\Tokenizers;
 
-use PHP_CodeSniffer\Util;
+use PHP_CodeSniffer\Util\Common;
 
 class Comment
 {
@@ -56,7 +56,7 @@
         $stackPtr++;
 
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $content = Util\Common::prepareForOutput($openTag);
+            $content = Common::prepareForOutput($openTag);
             echo "\t\tCreate comment token: T_DOC_COMMENT_OPEN_TAG => $content".PHP_EOL;
         }
 
@@ -99,7 +99,7 @@
                 $tokens$stackPtr = $space;
                 $stackPtr++;
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $content = Util\Common::prepareForOutput($space'content');
+                    $content = Common::prepareForOutput($space'content');
                     echo "\t\tCreate comment token: T_DOC_COMMENT_WHITESPACE => $content".PHP_EOL;
                 }
 
@@ -134,7 +134,7 @@
             foreach ($lineTokens as $lineToken) {
                 $tokens$stackPtr = $lineToken;
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $content = Util\Common::prepareForOutput($lineToken'content');
+                    $content = Common::prepareForOutput($lineToken'content');
                     $type    = $lineToken'type';
                     echo "\t\tCreate comment token: $type => $content".PHP_EOL;
                 }
@@ -150,7 +150,7 @@
         $tokens$stackPtr = $closeTag;
         $tokens$openPtr'comment_closer' = $stackPtr;
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $content = Util\Common::prepareForOutput($closeTag'content');
+            $content = Common::prepareForOutput($closeTag'content');
             echo "\t\tCreate comment token: T_DOC_COMMENT_CLOSE_TAG => $content".PHP_EOL;
         }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/PHP.php Changed

@@ -9,7 +9,8 @@
 
 namespace PHP_CodeSniffer\Tokenizers;
 
-use PHP_CodeSniffer\Util;
+use PHP_CodeSniffer\Util\Common;
+use PHP_CodeSniffer\Util\Tokens;
 
 class PHP extends Tokenizer
 {
@@ -543,12 +544,12 @@
 
             if (PHP_CODESNIFFER_VERBOSITY > 1) {
                 if ($tokenIsArray === true) {
-                    $type    = Util\Tokens::tokenName($token0);
-                    $content = Util\Common::prepareForOutput($token1);
+                    $type    = Tokens::tokenName($token0);
+                    $content = Common::prepareForOutput($token1);
                 } else {
                     $newToken = self::resolveSimpleToken($token0);
                     $type     = $newToken'type';
-                    $content  = Util\Common::prepareForOutput($token0);
+                    $content  = Common::prepareForOutput($token0);
                 }
 
                 echo "\tProcess token ";
@@ -562,7 +563,7 @@
             }//end if
 
             if ($newStackPtr > 0
-                && isset(Util\Tokens::$emptyTokens$finalTokens($newStackPtr - 1)'code') === false
+                && isset(Tokens::$emptyTokens$finalTokens($newStackPtr - 1)'code') === false
             ) {
                 $lastNotEmptyToken = ($newStackPtr - 1);
             }
@@ -607,7 +608,7 @@
             */
 
             if ($tokenIsArray === true
-                && isset(Util\Tokens::$contextSensitiveKeywords$token0) === true
+                && isset(Tokens::$contextSensitiveKeywords$token0) === true
                 && (isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === true
                 || $finalTokens$lastNotEmptyToken'content' === '&'
                 || $insideConstDeclaration === true)
@@ -629,7 +630,7 @@
                     ) {
                         for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
                             if (is_array($tokens$i) === false
-                                || isset(Util\Tokens::$emptyTokens$tokens$i0) === false
+                                || isset(Tokens::$emptyTokens$tokens$i0) === false
                             ) {
                                 break;
                             }
@@ -654,7 +655,7 @@
                                 break;
                             }
 
-                            if (isset(Util\Tokens::$emptyTokens$tokens$i0) === true) {
+                            if (isset(Tokens::$emptyTokens$tokens$i0) === true) {
                                 continue;
                             }
 
@@ -677,7 +678,7 @@
                     // Find the next non-empty token.
                     for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
                         if (is_array($tokens$i) === true
-                            && isset(Util\Tokens::$emptyTokens$tokens$i0) === true
+                            && isset(Tokens::$emptyTokens$tokens$i0) === true
                         ) {
                             continue;
                         }
@@ -695,7 +696,7 @@
                     $preserveKeyword = true;
 
                     for ($i = ($lastNotEmptyToken - 1); $i >= 0; $i--) {
-                        if (isset(Util\Tokens::$emptyTokens$finalTokens$i'code') === true) {
+                        if (isset(Tokens::$emptyTokens$finalTokens$i'code') === true) {
                             continue;
                         }
 
@@ -709,7 +710,7 @@
 
                 if ($preserveKeyword === false) {
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = Util\Tokens::tokenName($token0);
+                        $type = Tokens::tokenName($token0);
                         echo "\t\t* token $stackPtr changed from $type to T_STRING".PHP_EOL;
                     }
 
@@ -754,7 +755,7 @@
             ) {
                 for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
                     if (is_array($tokens$i) === true
-                        && isset(Util\Tokens::$emptyTokens$tokens$i0) === true
+                        && isset(Tokens::$emptyTokens$tokens$i0) === true
                     ) {
                         continue;
                     }
@@ -1109,7 +1110,7 @@
                 // Get the next non-empty token.
                 for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
                     if (is_array($tokens$i) === false
-                        || isset(Util\Tokens::$emptyTokens$tokens$i0) === false
+                        || isset(Tokens::$emptyTokens$tokens$i0) === false
                     ) {
                         break;
                     }
@@ -1263,8 +1264,8 @@
                 }
 
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $type    = Util\Tokens::tokenName($token0);
-                    $content = Util\Common::prepareForOutput($token1);
+                    $type    = Tokens::tokenName($token0);
+                    $content = Common::prepareForOutput($token1);
                     echo "\t\t* token $stackPtr split into individual tokens; was: $type => $content".PHP_EOL;
                 }
 
@@ -1327,7 +1328,7 @@
                 // Get the next non-empty token.
                 for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
                     if (is_array($tokens$i) === false
-                        || isset(Util\Tokens::$emptyTokens$tokens$i0) === false
+                        || isset(Tokens::$emptyTokens$tokens$i0) === false
                     ) {
                         break;
                     }
@@ -1340,7 +1341,7 @@
                     // Get the previous non-empty token.
                     for ($j = ($stackPtr - 1); $j > 0; $j--) {
                         if (is_array($tokens$j) === false
-                            || isset(Util\Tokens::$emptyTokens$tokens$j0) === false
+                            || isset(Tokens::$emptyTokens$tokens$j0) === false
                         ) {
                             break;
                         }
@@ -1363,7 +1364,7 @@
                         $tokens$stackPtr0 = T_PARAM_NAME;
 
                         if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type = Util\Tokens::tokenName($token0);
+                            $type = Tokens::tokenName($token0);
                             echo "\t\t* token $stackPtr changed from $type to T_PARAM_NAME".PHP_EOL;
                         }
 
@@ -1384,7 +1385,7 @@
                 // Get the next non-whitespace token.
                 for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
                     if (is_array($tokens$i) === false
-                        || isset(Util\Tokens::$emptyTokens$tokens$i0) === false
+                        || isset(Tokens::$emptyTokens$tokens$i0) === false
                     ) {
                         break;
                     }
@@ -1414,7 +1415,7 @@
                             $tokenType = $tokens$i;
                         }
 
-                        if (isset(Util\Tokens::$emptyTokens$tokenType) === true) {
+                        if (isset(Tokens::$emptyTokens$tokenType) === true) {
                             continue;
                         }
 
@@ -1508,8 +1509,8 @@
 
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
                     for ($i = ($stackPtr + 1); $i <= ($stackPtr + 2); $i++) {
-                        $type    = Util\Tokens::tokenName($tokens$i0);
-                        $content = Util\Common::prepareForOutput($tokens$i1);
+                        $type    = Tokens::tokenName($tokens$i0);
+                        $content = Common::prepareForOutput($tokens$i1);
                         echo "\t\t* token $i merged into T_YIELD_FROM; was: $type => $content".PHP_EOL;
                     }
                 }
@@ -1543,8 +1544,8 @@
 
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                         for ($i = ($stackPtr + 1); $i <= ($stackPtr + 2); $i++) {
-                            $type    = Util\Tokens::tokenName($tokens$i0);
-                            $content = Util\Common::prepareForOutput($tokens$i1);
+                            $type    = Tokens::tokenName($tokens$i0);
+                            $content = Common::prepareForOutput($tokens$i1);
                             echo "\t\t* token $i merged into T_YIELD_FROM; was: $type => $content".PHP_EOL;
                         }
                     }
@@ -1783,7 +1784,7 @@
 
                 $newToken            = ;
                 $newToken'code'    = $newType;
-                $newToken'type'    = Util\Tokens::tokenName($newType);
+                $newToken'type'    = Tokens::tokenName($newType);
                 $newToken'content' = $newContent;
                 $finalTokens$newStackPtr = $newToken;
 
@@ -1807,7 +1808,7 @@
             ) {
                 $isMatch = false;
                 for ($x = ($stackPtr + 1); $x < $numTokens; $x++) {
-                    if (isset($tokens$x0, Util\Tokens::$emptyTokens$tokens$x0) === true) {
+                    if (isset($tokens$x0, Tokens::$emptyTokens$tokens$x0) === true) {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/Tokenizer.php Changed

@@ -10,7 +10,8 @@
 namespace PHP_CodeSniffer\Tokenizers;
 
 use PHP_CodeSniffer\Exceptions\TokenizerException;
-use PHP_CodeSniffer\Util;
+use PHP_CodeSniffer\Util\Common;
+use PHP_CodeSniffer\Util\Tokens;
 
 abstract class Tokenizer
 {
@@ -680,7 +681,7 @@
                 Parenthesis mapping.
             */
 
-            if (isset(Util\Tokens::$parenthesisOpeners$this->tokens$i'code') === true) {
+            if (isset(Tokens::$parenthesisOpeners$this->tokens$i'code') === true) {
                 $this->tokens$i'parenthesis_opener' = null;
                 $this->tokens$i'parenthesis_closer' = null;
                 $this->tokens$i'parenthesis_owner'  = $i;
@@ -896,7 +897,7 @@
             if (isset($this->scopeOpeners$this->tokens$i'code') === true) {
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
                     $type    = $this->tokens$i'type';
-                    $content = Util\Common::prepareForOutput($this->tokens$i'content');
+                    $content = Common::prepareForOutput($this->tokens$i'content');
                     echo "\tStart scope map at $i:$type => $content".PHP_EOL;
                 }
 
@@ -958,7 +959,7 @@
             if (PHP_CODESNIFFER_VERBOSITY > 1) {
                 $type    = $this->tokens$i'type';
                 $line    = $this->tokens$i'line';
-                $content = Util\Common::prepareForOutput($this->tokens$i'content');
+                $content = Common::prepareForOutput($this->tokens$i'content');
 
                 echo str_repeat("\t", $depth);
                 echo "Process token $i on line $line ";
@@ -1314,13 +1315,13 @@
                         // Make sure this is actually an opener and not a
                         // string offset (e.g., $var{0}).
                         for ($x = ($i - 1); $x > 0; $x--) {
-                            if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === true) {
+                            if (isset(Tokens::$emptyTokens$this->tokens$x'code') === true) {
                                 continue;
                             } else {
                                 // If the first non-whitespace/comment token looks like this
                                 // brace is a string offset, or this brace is mid-way through
                                 // a new statement, it isn't a scope opener.
-                                $disallowed  = Util\Tokens::$assignmentTokens;
+                                $disallowed  = Tokens::$assignmentTokens;
                                 $disallowed += 
                                     T_DOLLAR                   => true,
                                     T_VARIABLE                 => true,
@@ -1388,7 +1389,7 @@
             } else if ($tokenType === T_OPEN_PARENTHESIS) {
                 if (isset($this->tokens$i'parenthesis_owner') === true) {
                     $owner = $this->tokens$i'parenthesis_owner';
-                    if (isset(Util\Tokens::$scopeOpeners$this->tokens$owner'code') === true
+                    if (isset(Tokens::$scopeOpeners$this->tokens$owner'code') === true
                         && isset($this->tokens$i'parenthesis_closer') === true
                     ) {
                         // If we get into here, then we opened a parenthesis for
@@ -1427,7 +1428,7 @@
                 // token was empty (in which case we'll just confirm there is
                 // more code in this file and not just a big comment).
                 if ($this->tokens$i'line' >= ($startLine + 30)
-                    && isset(Util\Tokens::$emptyTokens$this->tokens($i - 1)'code') === false
+                    && isset(Tokens::$emptyTokens$this->tokens($i - 1)'code') === false
                 ) {
                     if ($this->scopeOpeners$currType'strict' === true) {
                         if (PHP_CODESNIFFER_VERBOSITY > 1) {
@@ -1516,14 +1517,14 @@
                 $len  = $this->tokens$i'length';
                 $col  = $this->tokens$i'column';
 
-                $content = Util\Common::prepareForOutput($this->tokens$i'content');
+                $content = Common::prepareForOutput($this->tokens$i'content');
 
                 echo str_repeat("\t", ($level + 1));
                 echo "Process token $i on line $line col:$col;len:$len;lvl:$level;";
                 if (empty($conditions) !== true) {
                     $conditionString = 'conds;';
                     foreach ($conditions as $condition) {
-                        $conditionString .= Util\Tokens::tokenName($condition).',';
+                        $conditionString .= Tokens::tokenName($condition).',';
                     }
 
                     echo rtrim($conditionString, ',').';';
@@ -1584,14 +1585,14 @@
                                     $type     = $this->tokens$x'type';
                                     $oldConds = '';
                                     foreach ($oldConditions as $condition) {
-                                        $oldConds .= Util\Tokens::tokenName($condition).',';
+                                        $oldConds .= Tokens::tokenName($condition).',';
                                     }
 
                                     $oldConds = rtrim($oldConds, ',');
 
                                     $newConds = '';
                                     foreach ($this->tokens$x'conditions' as $condition) {
-                                        $newConds .= Util\Tokens::tokenName($condition).',';
+                                        $newConds .= Tokens::tokenName($condition).',';
                                     }
 
                                     $newConds = rtrim($newConds, ',');
@@ -1660,7 +1661,7 @@
                             $oldCondition = array_pop($conditions);
                             if (PHP_CODESNIFFER_VERBOSITY > 1) {
                                 echo str_repeat("\t", ($level + 1));
-                                echo '* token '.Util\Tokens::tokenName($oldCondition).' removed from conditions array *'.PHP_EOL;
+                                echo '* token '.Tokens::tokenName($oldCondition).' removed from conditions array *'.PHP_EOL;
                             }
 
                             // Make sure this closer actually belongs to us.
@@ -1672,7 +1673,7 @@
                                     $badToken = $this->tokens$oldOpener'scope_condition';
 
                                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                        $type = Util\Tokens::tokenName($oldCondition);
+                                        $type = Tokens::tokenName($oldCondition);
                                         echo str_repeat("\t", ($level + 1));
                                         echo "* scope closer was bad, cleaning up $badToken:$type *".PHP_EOL;
                                     }
@@ -1686,14 +1687,14 @@
                                             $type     = $this->tokens$x'type';
                                             $oldConds = '';
                                             foreach ($oldConditions as $condition) {
-                                                $oldConds .= Util\Tokens::tokenName($condition).',';
+                                                $oldConds .= Tokens::tokenName($condition).',';
                                             }
 
                                             $oldConds = rtrim($oldConds, ',');
 
                                             $newConds = '';
                                             foreach ($this->tokens$x'conditions' as $condition) {
-                                                $newConds .= Util\Tokens::tokenName($condition).',';
+                                                $newConds .= Tokens::tokenName($condition).',';
                                             }
 
                                             $newConds = rtrim($newConds, ',');

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Cache.php Changed

@@ -9,9 +9,13 @@
 
 namespace PHP_CodeSniffer\Util;
 
+use FilesystemIterator;
 use PHP_CodeSniffer\Autoload;
 use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Ruleset;
+use RecursiveCallbackFilterIterator;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 
 class Cache
 {
@@ -95,11 +99,11 @@
         // hash. This ensures that core PHPCS changes will also invalidate the cache.
         // Note that we ignore sniffs here, and any files that don't affect
         // the outcome of the run.
-        $di     = new \RecursiveDirectoryIterator(
+        $di     = new RecursiveDirectoryIterator(
             $installDir,
-            (\FilesystemIterator::KEY_AS_PATHNAME | \FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::SKIP_DOTS)
+            (FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS)
         );
-        $filter = new \RecursiveCallbackFilterIterator(
+        $filter = new RecursiveCallbackFilterIterator(
             $di,
             function ($file, $key, $iterator) {
                 // Skip non-php files.
@@ -126,7 +130,7 @@
             }
         );
 
-        $iterator = new \RecursiveIteratorIterator($filter);
+        $iterator = new RecursiveIteratorIterator($filter);
         foreach ($iterator as $file) {
             if (PHP_CODESNIFFER_VERBOSITY > 1) {
                 echo "\t\t=> core file: $file".PHP_EOL;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Common.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Standards.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/AbstractMethodUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/AllTests.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Config/ReportWidthTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/ErrorSuppressionTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodPropertiesTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodPropertiesTest.php Changed

@@ -1298,6 +1298,111 @@
 
 
     /**
+     * Test handling of closure declarations with a use variable import without a return type declaration.
+     *
+     * @return void
+     */
+    public function testClosureWithUseNoReturnType()
+    {
+        // Offsets are relative to the T_CLOSURE token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '',
+            'return_type_token'     => false,
+            'return_type_end_token' => false,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testClosureWithUseNoReturnType()
+
+
+    /**
+     * Test handling of closure declarations with an illegal use variable for a property import (not allowed in PHP)
+     * without a return type declaration.
+     *
+     * @return void
+     */
+    public function testClosureWithUseNoReturnTypeIllegalUseProp()
+    {
+        // Offsets are relative to the T_CLOSURE token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '',
+            'return_type_token'     => false,
+            'return_type_end_token' => false,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testClosureWithUseNoReturnTypeIllegalUseProp()
+
+
+    /**
+     * Test handling of closure declarations with a use variable import with a return type declaration.
+     *
+     * @return void
+     */
+    public function testClosureWithUseWithReturnType()
+    {
+        // Offsets are relative to the T_CLOSURE token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'Type',
+            'return_type_token'     => 14,
+            'return_type_end_token' => 14,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testClosureWithUseWithReturnType()
+
+
+    /**
+     * Test handling of closure declarations with a use variable import with a return type declaration.
+     *
+     * @return void
+     */
+    public function testClosureWithUseMultiParamWithReturnType()
+    {
+        // Offsets are relative to the T_CLOSURE token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '?array',
+            'return_type_token'     => 32,
+            'return_type_end_token' => 32,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testClosureWithUseMultiParamWithReturnType()
+
+
+    /**
      * Test helper.
      *
      * @param string                         $commentString The comment which preceeds the test.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetTokensAsStringTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/IsReferenceTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/IsReferenceTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Filters/AbstractFilterTestCase.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Filters/GitModifiedTest.php Changed

@@ -175,8 +175,8 @@
                     '.yamllint.yml',
                     'autoload.php',
                     'src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php',
-                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc',
-                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.1.inc',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.1.inc.fixed',
                     'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js',
                     'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js.fixed',
                     'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php',
@@ -191,7 +191,7 @@
                     $basedir.'/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php',
                     $basedir.'/src/Standards/Squiz/Tests',
                     $basedir.'/src/Standards/Squiz/Tests/WhiteSpace',
-                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.1.inc',
                     $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js',
                     $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php',
                 ,

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Filters/GitStagedTest.php Changed

@@ -175,8 +175,8 @@
                     '.yamllint.yml',
                     'autoload.php',
                     'src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php',
-                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc',
-                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.1.inc',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.1.inc.fixed',
                     'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js',
                     'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js.fixed',
                     'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php',
@@ -191,7 +191,7 @@
                     $basedir.'/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php',
                     $basedir.'/src/Standards/Squiz/Tests',
                     $basedir.'/src/Standards/Squiz/Tests/WhiteSpace',
-                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.1.inc',
                     $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js',
                     $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php',
                 ,

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-BlankLinesAtEnd.diff Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-BlankLinesAtEnd.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-BlankLinesAtStart.diff Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-BlankLinesAtStart.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-LineAdded.diff Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-LineAdded.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-LineRemoved.diff Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-LineRemoved.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-NoDiff.diff Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-NoDiff.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-NoTrailingWhitespace.diff Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-NoTrailingWhitespace.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-TabsToSpaces.diff Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-TabsToSpaces.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-VarNameChanged.diff Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-VarNameChanged.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-WhiteSpaceAtEnd.diff Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-WhiteSpaceAtEnd.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-WhiteSpaceAtStart.diff Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-WhiteSpaceAtStart.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest-WindowsLineEndings.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/Fixtures/GenerateDiffTest.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Fixer/GenerateDiffTest.php Added

@@ -0,0 +1,226 @@
+<?php
+/**
+ * Tests for diff generation.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2024 Juliette Reinders Folmer. All rights reserved.
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Fixer;
+
+use PHP_CodeSniffer\Files\LocalFile;
+use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Tests\ConfigDouble;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests for diff generation.
+ *
+ * Note: these tests are specifically about the Fixer::generateDiff() method and do not
+ * test running the fixer itself, nor generating a diff based on a fixer run.
+ *
+ * @covers PHP_CodeSniffer\Fixer::generateDiff
+ */
+final class GenerateDiffTest extends TestCase
+{
+
+    /**
+     * A \PHP_CodeSniffer\Files\File object to compare the files against.
+     *
+     * @var \PHP_CodeSniffer\Files\LocalFile
+     */
+    private static $phpcsFile;
+
+
+    /**
+     * Initialize an \PHP_CodeSniffer\Files\File object with code.
+     *
+     * Things to take note of in the code snippet used for these tests:
+     * - Line endings are \n.
+     * - Tab indent.
+     * - Trailing whitespace.
+     *
+     * Also note that the Config object is deliberately created without a `tabWidth` setting to
+     * prevent doing tab replacement when parsing the file. This is to allow for testing a
+     * diff with tabs vs spaces (which wouldn't yield a diff if tabs had already been replaced).
+     *
+     * @beforeClass
+     *
+     * @return void
+     */
+    public static function initializeFile()
+    {
+        $config  = new ConfigDouble();
+        $ruleset = new Ruleset($config);
+
+        self::$phpcsFile = new LocalFile(__DIR__.'/Fixtures/GenerateDiffTest.inc', $ruleset, $config);
+        self::$phpcsFile->parse();
+        self::$phpcsFile->fixer->startFile(self::$phpcsFile);
+
+    }//end initializeFile()
+
+
+    /**
+     * Test generating a diff on the file object itself.
+     *
+     * @return void
+     */
+    public function testGenerateDiffNoFile()
+    {
+        $diff = self::$phpcsFile->fixer->generateDiff(null, false);
+
+        $this->assertSame('', $diff);
+
+    }//end testGenerateDiffNoFile()
+
+
+    /**
+     * Test generating a diff between a PHPCS File object and a file on disk.
+     *
+     * @param string $filePath The path to the file to compare the File object against.
+     *
+     * @dataProvider dataGenerateDiff
+     *
+     * @return void
+     */
+    public function testGenerateDiff($filePath)
+    {
+        $diff = self::$phpcsFile->fixer->generateDiff($filePath, false);
+
+        // Allow for the tests to pass on Windows too.
+        $diff = str_replace('--- tests\Core\Fixer/', '--- tests/Core/Fixer/', $diff);
+
+        $expectedDiffFile = str_replace('.inc', '.diff', $filePath);
+
+        $this->assertStringEqualsFile($expectedDiffFile, $diff);
+
+    }//end testGenerateDiff()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testGenerateDiff()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function dataGenerateDiff()
+    {
+        return 
+            'no difference'                    => 
+                'filePath' => __DIR__.'/Fixtures/GenerateDiffTest-NoDiff.inc',
+            ,
+            'line removed'                     => 
+                'filePath' => __DIR__.'/Fixtures/GenerateDiffTest-LineRemoved.inc',
+            ,
+            'line added'                       => 
+                'filePath' => __DIR__.'/Fixtures/GenerateDiffTest-LineAdded.inc',
+            ,
+            'var name changed'                 => 
+                'filePath' => __DIR__.'/Fixtures/GenerateDiffTest-VarNameChanged.inc',
+            ,
+            'trailing whitespace removed'      => 
+                'filePath' => __DIR__.'/Fixtures/GenerateDiffTest-NoTrailingWhitespace.inc',
+            ,
+            'tab replaced with spaces'         => 
+                'filePath' => __DIR__.'/Fixtures/GenerateDiffTest-TabsToSpaces.inc',
+            ,
+            'blank lines at start of file'     => 
+                'filePath' => __DIR__.'/Fixtures/GenerateDiffTest-BlankLinesAtStart.inc',
+            ,
+            'whitespace diff at start of file' => 
+                'filePath' => __DIR__.'/Fixtures/GenerateDiffTest-WhiteSpaceAtStart.inc',
+            ,
+            'blank lines at end of file'       => 
+                'filePath' => __DIR__.'/Fixtures/GenerateDiffTest-BlankLinesAtEnd.inc',
+            ,
+            'whitespace diff at end of file'   => 
+                'filePath' => __DIR__.'/Fixtures/GenerateDiffTest-WhiteSpaceAtEnd.inc',
+            ,
+        ;
+
+    }//end dataGenerateDiff()
+
+
+    /**
+     * Test generating a diff between a PHPCS File object and a file on disk and colourizing the output.
+     *
+     * @return void
+     */
+    public function testGenerateDiffColoured()
+    {
+        $expected  = "\03331m--- tests/Core/Fixer/Fixtures/GenerateDiffTest-VarNameChanged.inc\0330m".PHP_EOL;
+        $expected .= "\03332m+++ PHP_CodeSniffer\0330m".PHP_EOL;
+        $expected .= '@@ -1,7 +1,7 @@'.PHP_EOL;
+        $expected .= ' <?php'.PHP_EOL;
+        $expected .= ' // Comment with 2 spaces trailing whitespace.  '.PHP_EOL;
+        $expected .= "\03331m".'-$rav = FALSE;'."\0330m".PHP_EOL;
+        $expected .= "\03332m".'+$var = FALSE;'."\0330m".PHP_EOL;
+        $expected .= ' '.PHP_EOL;
+        $expected .= "\03331m".'-if ($rav) {'."\0330m".PHP_EOL;
+        $expected .= "\03332m".'+if ($var) {'."\0330m".PHP_EOL;
+        $expected .= ' 	echo \'This line is tab indented\';'.PHP_EOL;
+        $expected .= ' }';
+
+        $filePath = __DIR__.'/Fixtures/GenerateDiffTest-VarNameChanged.inc';
+        $diff     = self::$phpcsFile->fixer->generateDiff($filePath);
+
+        // Allow for the tests to pass on Windows too.
+        $diff = str_replace('--- tests\Core\Fixer/', '--- tests/Core/Fixer/', $diff);
+
+        $this->assertSame($expected, $diff);
+
+    }//end testGenerateDiffColoured()
+
+
+    /**
+     * Test generating a diff between a PHPCS File object using *nix line endings and a file on disk
+     * using Windows line endings.
+     *
+     * The point of this test is to verify that all lines are marked as having a difference.
+     * The actual lines endings used in the diff shown to the end-user are not relevant for this
+     * test.
+     * As the "diff" command is finicky with what type of line endings are used when the only
+     * difference on a line is the line ending, the test normalizes the line endings of the
+     * received diff before testing it.
+     *
+     * @return void
+     */
+    public function testGenerateDiffDifferentLineEndings()
+    {
+        // By the looks of it, if the only diff between two files is line endings, the
+        // diff generated by the *nix "diff" command will always contain *nix line endings.
+        $expected  = '--- tests/Core/Fixer/Fixtures/GenerateDiffTest-WindowsLineEndings.inc'."\n";
+        $expected .= '+++ PHP_CodeSniffer'."\n";
+        $expected .= '@@ -1,7 +1,7 @@'."\n";
+        $expected .= '-<?php'."\n";
+        $expected .= '-// Comment with 2 spaces trailing whitespace.  '."\n";
+        $expected .= '-$var = FALSE;'."\n";

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/RuleInclusionTest.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/AbstractTokenizerTestCase.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BackfillFnTokenTest.inc Changed

@@ -92,12 +92,33 @@
 /* testStaticReturnType */
 fn(array $a) : static => $a;
 
+/* testFalseReturnType */
+fn(array $a) : false => $a;
+
+/* testTrueReturnType */
+fn(array $a) : True => $a;
+
+/* testNullReturnType */
+fn(array $a) : null => $a;
+
 /* testUnionParamType */
 $arrowWithUnionParam = fn(int|float $param) : SomeClass => new SomeClass($param);
 
 /* testUnionReturnType */
 $arrowWithUnionReturn = fn($param) : int|float => $param | 10;
 
+/* testUnionReturnTypeWithTrue */
+$arrowWithUnionReturn = fn($param) : int|true => $param | 10;
+
+/* testUnionReturnTypeWithFalse */
+$arrowWithUnionReturn = fn($param) : string|FALSE => $param | 10;
+
+/* testIntersectionParamType */
+$arrowWithUnionParam = fn(Traversable&Countable $param) : int => (new SomeClass($param))->getValue();
+
+/* testIntersectionReturnType */
+$arrowWithUnionReturn = fn($param) : \MyFoo&SomeInterface => new SomeClass($param);
+
 /* testTernary */
 $fn = fn($a) => $a ? /* testTernaryThen */ fn() : string => 'a' : /* testTernaryElse */ fn() : string => 'b';

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BackfillFnTokenTest.php Changed

@@ -16,22 +16,44 @@
     /**
      * Test simple arrow functions.
      *
-     * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+     * @param string $testMarker The comment prefacing the target token.
+     *
+     * @dataProvider dataSimple
+     * @covers       PHP_CodeSniffer\Tokenizers\PHP::processAdditional
      *
      * @return void
      */
-    public function testSimple()
+    public function testSimple($testMarker)
     {
-        foreach ('/* testStandard */', '/* testMixedCase */' as $comment) {
-            $token = $this->getTargetToken($comment, T_FN);
-            $this->backfillHelper($token);
-            $this->scopePositionTestHelper($token, 5, 12);
-        }
+        $token = $this->getTargetToken($testMarker, T_FN);
+        $this->backfillHelper($token);
+        $this->scopePositionTestHelper($token, 5, 12);
 
     }//end testSimple()
 
 
     /**
+     * Data provider.
+     *
+     * @see testSimple()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function dataSimple()
+    {
+        return 
+            'standard'   => 
+                'testMarker'  => '/* testStandard */',
+            ,
+            'mixed case' => 
+                'testMarker'  => '/* testMixedCase */',
+            ,
+        ;
+
+    }//end dataSimple()
+
+
+    /**
      * Test whitespace inside arrow function definitions.
      *
      * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
@@ -370,44 +392,63 @@
 
 
     /**
-     * Test arrow functions that use self/parent/callable/array/static return types.
+     * Test arrow functions that use keyword return types.
      *
-     * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+     * @param string $testMarker The comment prefacing the target token.
+     *
+     * @dataProvider dataKeywordReturnTypes
+     * @covers       PHP_CodeSniffer\Tokenizers\PHP::processAdditional
      *
      * @return void
      */
-    public function testKeywordReturnTypes()
+    public function testKeywordReturnTypes($testMarker)
     {
         $tokens = $this->phpcsFile->getTokens();
 
-        $testMarkers = 
-            'Self',
-            'Parent',
-            'Callable',
-            'Array',
-            'Static',
-        ;
-
-        foreach ($testMarkers as $marker) {
-            $token = $this->getTargetToken('/* test'.$marker.'ReturnType */', T_FN);
-            $this->backfillHelper($token);
-
-            $expectedScopeOpener = ($token + 11);
-            $expectedScopeCloser = ($token + 14);
+        $token = $this->getTargetToken($testMarker, T_FN);
+        $this->backfillHelper($token);
+        $this->scopePositionTestHelper($token, 11, 14);
 
-            $this->assertSame($expectedScopeOpener, $tokens$token'scope_opener', "Scope opener is not the arrow token (for $marker)");
-            $this->assertSame($expectedScopeCloser, $tokens$token'scope_closer', "Scope closer is not the semicolon token(for $marker)");
+    }//end testKeywordReturnTypes()
 
-            $opener = $tokens$token'scope_opener';
-            $this->assertSame($expectedScopeOpener, $tokens$opener'scope_opener', "Opener scope opener is not the arrow token(for $marker)");
-            $this->assertSame($expectedScopeCloser, $tokens$opener'scope_closer', "Opener scope closer is not the semicolon token(for $marker)");
 
-            $closer = $tokens$token'scope_closer';
-            $this->assertSame($expectedScopeOpener, $tokens$closer'scope_opener', "Closer scope opener is not the arrow token(for $marker)");
-            $this->assertSame($expectedScopeCloser, $tokens$closer'scope_closer', "Closer scope closer is not the semicolon token(for $marker)");
-        }
+    /**
+     * Data provider.
+     *
+     * @see testKeywordReturnTypes()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function dataKeywordReturnTypes()
+    {
+        return 
+            'self'     => 
+                'testMarker'  => '/* testSelfReturnType */',
+            ,
+            'parent'   => 
+                'testMarker'  => '/* testParentReturnType */',
+            ,
+            'callable' => 
+                'testMarker'  => '/* testCallableReturnType */',
+            ,
+            'array'    => 
+                'testMarker'  => '/* testArrayReturnType */',
+            ,
+            'static'   => 
+                'testMarker'  => '/* testStaticReturnType */',
+            ,
+            'false'    => 
+                'testMarker'  => '/* testFalseReturnType */',
+            ,
+            'true'     => 
+                'testMarker'  => '/* testTrueReturnType */',
+            ,
+            'null'     => 
+                'testMarker'  => '/* testNullReturnType */',
+            ,
+        ;
 
-    }//end testKeywordReturnTypes()
+    }//end dataKeywordReturnTypes()
 
 
     /**
@@ -443,6 +484,70 @@
 
 
     /**
+     * Test arrow function with a union return type.
+     *
+     * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+     *
+     * @return void
+     */
+    public function testUnionReturnTypeWithTrue()
+    {
+        $token = $this->getTargetToken('/* testUnionReturnTypeWithTrue */', T_FN);
+        $this->backfillHelper($token);
+        $this->scopePositionTestHelper($token, 11, 18);
+
+    }//end testUnionReturnTypeWithTrue()
+
+
+    /**
+     * Test arrow function with a union return type.
+     *
+     * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+     *
+     * @return void
+     */
+    public function testUnionReturnTypeWithFalse()
+    {
+        $token = $this->getTargetToken('/* testUnionReturnTypeWithFalse */', T_FN);
+        $this->backfillHelper($token);
+        $this->scopePositionTestHelper($token, 11, 18);
+
+    }//end testUnionReturnTypeWithFalse()
+
+
+    /**
+     * Test arrow function with an intersection parameter type.
+     *
+     * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+     *
+     * @return void
+     */
+    public function testIntersectionParamType()
+    {
+        $token = $this->getTargetToken('/* testIntersectionParamType */', T_FN);
+        $this->backfillHelper($token);
+        $this->scopePositionTestHelper($token, 13, 27);
+
+    }//end testIntersectionParamType()
+
+
+    /**
+     * Test arrow function with an intersection return type.
+     *
+     * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional
+     *
+     * @return void

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/OtherContextSensitiveKeywordsTest.inc Changed

@@ -45,7 +45,7 @@
     /* testFalseIsKeywordAsParamType */ false $paramA,
     /* testTrueIsKeywordAsParamType */ true $paramB,
     /* testNullIsKeywordAsParamType */ null $paramC,
-) /* testFalseIsKeywordAsReturnType */ false | /* testTrueIsKeywordAsReturnType */ true | /* testNullIsKeywordAsReturnType */ null {
+): /* testFalseIsKeywordAsReturnType */ false | /* testTrueIsKeywordAsReturnType */ true | /* testNullIsKeywordAsReturnType */ null {
     if ($a === /* testFalseIsKeywordInComparison */ false
     || $a === /* testTrueIsKeywordInComparison */ true
     || $a === /* testNullIsKeywordInComparison */ null
@@ -65,3 +65,141 @@
     var /* testSelfIsKeywordAsPropertyType */ self $self = new /* testSelfIsKeywordAsPropertyDefault */ self;
     protected /* testParentIsKeywordAsPropertyType */ parent $parent = new /* testParentIsKeywordAsPropertyDefault */ parent;
 }
+
+class UseInUnionTypes {
+    /* testFalseIsKeywordAsConstUnionTypeFirst */
+    const false|Foo UNION_WITH_FALSE_FIRST = SOMETHING;
+    /* testTrueIsKeywordAsConstUnionTypeFirst */
+    const true|string UNION_WITH_TRUE_FIRST = SOMETHING;
+    /* testNullIsKeywordAsConstUnionTypeFirst */
+    const null|int UNION_WITH_NULL_FIRST = SOMETHING;
+    /* testSelfIsKeywordAsConstUnionTypeFirst */
+    const self|Foo UNION_WITH_SELF_FIRST = SOMETHING;
+    /* testParentIsKeywordAsConstUnionTypeFirst */
+    const parent|Bar UNION_WITH_PARENT_FIRST = SOMETHING;
+
+    const int|/* testFalseIsKeywordAsConstUnionTypeMiddle */false|string UNION_WITH_FALSE_MIDDLE = SOMETHING;
+    const bool|/* testTrueIsKeywordAsConstUnionTypeMiddle */ true|Stringable UNION_WITH_TRUE_MIDDLE = SOMETHING;
+    const object|/* testNullIsKeywordAsConstUnionTypeMiddle */null|iterable UNION_WITH_NULL_MIDDLE = SOMETHING;
+    const array | /* testSelfIsKeywordAsConstUnionTypeMiddle */ self | /*comment*/  string UNION_WITH_SELF_MIDDLE = SOMETHING;
+    const Foo|/* testParentIsKeywordAsConstUnionTypeMiddle */parent|float UNION_WITH_PARENT_MIDDLE = SOMETHING;
+
+    const string|/* testFalseIsKeywordAsConstUnionTypeLast */false UNION_WITH_FALSE_LAST = SOMETHING;
+    const float|/* testTrueIsKeywordAsConstUnionTypeLast */true UNION_WITH_TRUE_LAST = SOMETHING;
+    const Something|/* testNullIsKeywordAsConstUnionTypeLast */null UNION_WITH_NULL_LAST = SOMETHING;
+    const Foo|/* testSelfIsKeywordAsConstUnionTypeLast */self UNION_WITH_SELF_LAST = SOMETHING;
+    const Bar|/* testParentIsKeywordAsConstUnionTypeLast */parent UNION_WITH_PARENT_LAST = SOMETHING;
+
+    /* testFalseIsKeywordAsPropertyUnionTypeFirst */
+    public false|string $false = SOMETHING;
+    /* testTrueIsKeywordAsPropertyUnionTypeFirst */
+    protected readonly true|int $true = SOMETHING;
+    /* testNullIsKeywordAsPropertyUnionTypeFirst */
+    static private null|object $null = SOMETHING;
+    /* testSelfIsKeywordAsPropertyUnionTypeFirst */
+    var self|iterable $self = SOMETHING;
+    /* testParentIsKeywordAsPropertyUnionTypeFirst */
+    protected parent|array $parent = SOMETHING;
+
+    public Foo|/* testFalseIsKeywordAsPropertyUnionTypeMiddle */false|Bar $false = SOMETHING;
+    protected readonly Foo|/* testTrueIsKeywordAsPropertyUnionTypeMiddle */true|Bar $true = SOMETHING;
+    static private Foo/* testNullIsKeywordAsPropertyUnionTypeMiddle */|null|Bar $null = SOMETHING;
+    var Foo|/* testSelfIsKeywordAsPropertyUnionTypeMiddle */self|Bar $self = SOMETHING;
+    protected Foo/* testParentIsKeywordAsPropertyUnionTypeMiddle */|parent|Bar $parent = SOMETHING;
+
+    public array|/* testFalseIsKeywordAsPropertyUnionTypeLast */false $false = SOMETHING;
+    protected readonly string /* testTrueIsKeywordAsPropertyUnionTypeLast */| true $true = SOMETHING;
+    static private int|/* testNullIsKeywordAsPropertyUnionTypeLast */null $null = SOMETHING;
+    var object|/* testSelfIsKeywordAsPropertyUnionTypeLast */self $self = SOMETHING;
+    protected Foo/* testParentIsKeywordAsPropertyUnionTypeLast */|parent $parent = SOMETHING;
+
+    function KeywordsInParamUnionTypeFirst(
+        /* testFalseIsKeywordAsParamUnionTypeFirst */ false|Foo $paramA,
+        /* testTrueIsKeywordAsParamUnionTypeFirst */ true|string $paramB,
+        /* testNullIsKeywordAsParamUnionTypeFirst */ null|Bar $paramC,
+        /* testSelfIsKeywordAsParamUnionTypeFirst */ self|float $paramD,
+        /* testParentIsKeywordAsParamUnionTypeFirst */ parent|object $paramE,
+    ) {}
+
+    function KeywordsInParamUnionTypeMiddle(
+        Foo/* testFalseIsKeywordAsParamUnionTypeMiddle */|false|Bar $paramA,
+        Foo|/* testTrueIsKeywordAsParamUnionTypeMiddle */ true|Bar $paramB,
+        Foo/* testNullIsKeywordAsParamUnionTypeMiddle */ |null|Bar $paramC,
+        Foo|/* testSelfIsKeywordAsParamUnionTypeMiddle */ self|Bar $paramD,
+        Foo/* testParentIsKeywordAsParamUnionTypeMiddle */ |parent|Bar $paramE
+    ) {}
+
+    function KeywordsInParamUnionTypeLast (
+        string|/* testFalseIsKeywordAsParamUnionTypeLast */ false $paramA,
+        Something/* testTrueIsKeywordAsParamUnionTypeLast */ |true $paramB,
+        bool|/* testNullIsKeywordAsParamUnionTypeLast */ null $paramC,
+        MeMe/* testSelfIsKeywordAsParamUnionTypeLast */ |self $paramD,
+        int|/* testParentIsKeywordAsParamUnionTypeLast */ parent $paramE,
+    ) {}
+
+    function FalseIsKeywordInReturnTypeFirst(): /* testFalseIsKeywordAsReturnUnionTypeFirst */ false|int {}
+    function TrueIsKeywordInReturnTypeFirst(): /* testTrueIsKeywordAsReturnUnionTypeFirst */ true|bool {}
+    function NullIsKeywordInReturnTypeFirst(): /* testNullIsKeywordAsReturnUnionTypeFirst */ null|float {}
+    function SelfIsKeywordInReturnTypeFirst(): /* testSelfIsKeywordAsReturnUnionTypeFirst */ self|object {}
+    function ParentIsKeywordInReturnTypeFirst(): /* testParentIsKeywordAsReturnUnionTypeFirst */ parent|iterable {}
+
+    function FalseIsKeywordInReturnTypeMiddle(): Foo|/* testFalseIsKeywordAsReturnUnionTypeMiddle */ false|Bar {}
+    function TrueIsKeywordInReturnTypeMiddle(): Foo/* testTrueIsKeywordAsReturnUnionTypeMiddle */ |true|Bar {}
+    function NullIsKeywordInReturnTypeMiddle(): Foo|/* testNullIsKeywordAsReturnUnionTypeMiddle */null|Bar {}
+    function SelfIsKeywordInReturnTypeMiddle(): Foo /* testSelfIsKeywordAsReturnUnionTypeMiddle */ |self|Bar {}
+    function ParentIsKeywordInReturnTypeMiddle(): Foo| /* testParentIsKeywordAsReturnUnionTypeMiddle */ parent|Bar {}
+
+    function FalseIsKeywordInReturnTypeLast(): void|/* testFalseIsKeywordAsReturnUnionTypeLast */false {}
+    function TrueIsKeywordInReturnTypeLast(): Bar|/* testTrueIsKeywordAsReturnUnionTypeLast */true {}
+    function NullIsKeywordInReturnTypeLast(): string/* testNullIsKeywordAsReturnUnionTypeLast */|null {}
+    function SelfIsKeywordInReturnTypeLast(): Foo|/* testSelfIsKeywordAsReturnUnionTypeLast */self {}
+    function ParentIsKeywordInReturnTypeLast(): bool/* testParentIsKeywordAsReturnUnionTypeLast */|parent {}
+}
+
+class UseInIntersectionTypes {
+    /* testSelfIsKeywordAsConstIntersectionTypeFirst */
+    const self&Foo INTERSECTION_SELF_FIRST = SOMETHING;
+    /* testParentIsKeywordAsConstIntersectionTypeFirst */
+    const parent&Bar INTERSECTION_PARENT_FIRST = SOMETHING;
+
+    const Foo&/* testSelfIsKeywordAsConstIntersectionTypeMiddle */self&Bar INTERSECTION_SELF_MIDDLE = SOMETHING;
+    const Foo/* testParentIsKeywordAsConstIntersectionTypeMiddle */&parent&Bar INTERSECTION_PARENT_MIDDLE = SOMETHING;
+
+    const Foo&/* testSelfIsKeywordAsConstIntersectionTypeLast */self INTERSECTION_SELF_LAST = SOMETHING;
+    const Bar/* testParentIsKeywordAsConstIntersectionTypeLast */&parent INTERSECTION_PARENT_LAST = SOMETHING;
+
+    /* testSelfIsKeywordAsPropertyIntersectionTypeFirst */
+    var self&Countable $self = SOMETHING;
+    /* testParentIsKeywordAsPropertyIntersectionTypeFirst */
+    protected parent&DateTime $parent = SOMETHING;
+
+    var Foo/* testSelfIsKeywordAsPropertyIntersectionTypeMiddle */&self&Bar $self = SOMETHING;
+    protected Foo&/* testParentIsKeywordAsPropertyIntersectionTypeMiddle */parent&Bar $parent = SOMETHING;
+
+    var Exception/* testSelfIsKeywordAsPropertyIntersectionTypeLast */&self $self = SOMETHING;
+    protected Foo&/* testParentIsKeywordAsPropertyIntersectionTypeLast */parent $parent = SOMETHING;
+
+    function KeywordsInParamIntersectionTypeFirst(
+        /* testSelfIsKeywordAsParamIntersectionTypeFirst */ self&float $paramD,
+        /* testParentIsKeywordAsParamIntersectionTypeFirst */ parent&object $paramE,
+    ) {}
+
+    function KeywordsInParamIntersectionTypeMiddle(
+        Foo/* testSelfIsKeywordAsParamIntersectionTypeMiddle */ &self&Bar $paramD,
+        Foo&/* testParentIsKeywordAsParamIntersectionTypeMiddle */ parent&Bar $paramE
+    ) {}
+
+    function KeywordsInParamIntersectionTypeLast (
+        MeMe/* testSelfIsKeywordAsParamIntersectionTypeLast */ &self $paramD,
+        int&/* testParentIsKeywordAsParamIntersectionTypeLast */ parent $paramE
+    ) {}
+
+    function SelfIsKeywordInReturnTypeFirst()/* testSelfIsKeywordAsReturnIntersectionTypeFirst */: self&string {}
+    function ParentIsKeywordInReturnTypeFirst():/* testParentIsKeywordAsReturnIntersectionTypeFirst */ parent&iterable {}
+
+    function SelfIsKeywordInReturnTypeMiddle(): Foo/* testSelfIsKeywordAsReturnIntersectionTypeMiddle */&self&Bar {}
+    function ParentIsKeywordInReturnTypeMiddle(): Foo&/* testParentIsKeywordAsReturnIntersectionTypeMiddle */parent&Bar {}
+
+    function SelfIsKeywordInReturnTypeLast(): Foo&/* testSelfIsKeywordAsReturnIntersectionTypeLast */self {}
+    function ParentIsKeywordInReturnTypeLast(): bool&/* testParentIsKeywordAsReturnIntersectionTypeLast */parent {}
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/OtherContextSensitiveKeywordsTest.php Changed

@@ -137,144 +137,496 @@
     public static function dataKeywords()
     {
         return 
-            'self: param type declaration'            => 
+            'self: param type declaration'                                    => 
                 'testMarker'        => '/* testSelfIsKeyword */',
                 'expectedTokenType' => 'T_SELF',
             ,
-            'parent: param type declaration'          => 
+            'parent: param type declaration'                                  => 
                 'testMarker'        => '/* testParentIsKeyword */',
                 'expectedTokenType' => 'T_PARENT',
             ,
 
-            'parent: class instantiation'             => 
+            'parent: class instantiation'                                     => 
                 'testMarker'        => '/* testClassInstantiationParentIsKeyword */',
                 'expectedTokenType' => 'T_PARENT',
             ,
-            'self: class instantiation'               => 
+            'self: class instantiation'                                       => 
                 'testMarker'        => '/* testClassInstantiationSelfIsKeyword */',
                 'expectedTokenType' => 'T_SELF',
             ,
 
-            'false: param type declaration'           => 
+            'false: param type declaration'                                   => 
                 'testMarker'        => '/* testFalseIsKeywordAsParamType */',
                 'expectedTokenType' => 'T_FALSE',
             ,
-            'true: param type declaration'            => 
+            'true: param type declaration'                                    => 
                 'testMarker'        => '/* testTrueIsKeywordAsParamType */',
                 'expectedTokenType' => 'T_TRUE',
             ,
-            'null: param type declaration'            => 
+            'null: param type declaration'                                    => 
                 'testMarker'        => '/* testNullIsKeywordAsParamType */',
                 'expectedTokenType' => 'T_NULL',
             ,
-            'false: return type declaration in union' => 
+            'false: return type declaration in union'                         => 
                 'testMarker'        => '/* testFalseIsKeywordAsReturnType */',
                 'expectedTokenType' => 'T_FALSE',
             ,
-            'true: return type declaration in union'  => 
+            'true: return type declaration in union'                          => 
                 'testMarker'        => '/* testTrueIsKeywordAsReturnType */',
                 'expectedTokenType' => 'T_TRUE',
             ,
-            'null: return type declaration in union'  => 
+            'null: return type declaration in union'                          => 
                 'testMarker'        => '/* testNullIsKeywordAsReturnType */',
                 'expectedTokenType' => 'T_NULL',
             ,
-            'false: in comparison'                    => 
+            'false: in comparison'                                            => 
                 'testMarker'        => '/* testFalseIsKeywordInComparison */',
                 'expectedTokenType' => 'T_FALSE',
             ,
-            'true: in comparison'                     => 
+            'true: in comparison'                                             => 
                 'testMarker'        => '/* testTrueIsKeywordInComparison */',
                 'expectedTokenType' => 'T_TRUE',
             ,
-            'null: in comparison'                     => 
+            'null: in comparison'                                             => 
                 'testMarker'        => '/* testNullIsKeywordInComparison */',
                 'expectedTokenType' => 'T_NULL',
             ,
 
-            'false: type in OO constant declaration'  => 
+            'false: type in OO constant declaration'                          => 
                 'testMarker'        => '/* testFalseIsKeywordAsConstType */',
                 'expectedTokenType' => 'T_FALSE',
             ,
-            'true: type in OO constant declaration'   => 
+            'true: type in OO constant declaration'                           => 
                 'testMarker'        => '/* testTrueIsKeywordAsConstType */',
                 'expectedTokenType' => 'T_TRUE',
             ,
-            'null: type in OO constant declaration'   => 
+            'null: type in OO constant declaration'                           => 
                 'testMarker'        => '/* testNullIsKeywordAsConstType */',
                 'expectedTokenType' => 'T_NULL',
             ,
-            'self: type in OO constant declaration'   => 
+            'self: type in OO constant declaration'                           => 
                 'testMarker'        => '/* testSelfIsKeywordAsConstType */',
                 'expectedTokenType' => 'T_SELF',
             ,
-            'parent: type in OO constant declaration' => 
+            'parent: type in OO constant declaration'                         => 
                 'testMarker'        => '/* testParentIsKeywordAsConstType */',
                 'expectedTokenType' => 'T_PARENT',
             ,
 
-            'false: value in constant declaration'    => 
+            'false: value in constant declaration'                            => 
                 'testMarker'        => '/* testFalseIsKeywordAsConstDefault */',
                 'expectedTokenType' => 'T_FALSE',
             ,
-            'true: value in constant declaration'     => 
+            'true: value in constant declaration'                             => 
                 'testMarker'        => '/* testTrueIsKeywordAsConstDefault */',
                 'expectedTokenType' => 'T_TRUE',
             ,
-            'null: value in constant declaration'     => 
+            'null: value in constant declaration'                             => 
                 'testMarker'        => '/* testNullIsKeywordAsConstDefault */',
                 'expectedTokenType' => 'T_NULL',
             ,
-            'self: value in constant declaration'     => 
+            'self: value in constant declaration'                             => 
                 'testMarker'        => '/* testSelfIsKeywordAsConstDefault */',
                 'expectedTokenType' => 'T_SELF',
             ,
-            'parent: value in constant declaration'   => 
+            'parent: value in constant declaration'                           => 
                 'testMarker'        => '/* testParentIsKeywordAsConstDefault */',
                 'expectedTokenType' => 'T_PARENT',
             ,
 
-            'false: type in property declaration'     => 
+            'false: type in property declaration'                             => 
                 'testMarker'        => '/* testFalseIsKeywordAsPropertyType */',
                 'expectedTokenType' => 'T_FALSE',
             ,
-            'true: type in property declaration'      => 
+            'true: type in property declaration'                              => 
                 'testMarker'        => '/* testTrueIsKeywordAsPropertyType */',
                 'expectedTokenType' => 'T_TRUE',
             ,
-            'null: type in property declaration'      => 
+            'null: type in property declaration'                              => 
                 'testMarker'        => '/* testNullIsKeywordAsPropertyType */',
                 'expectedTokenType' => 'T_NULL',
             ,
-            'self: type in property declaration'      => 
+            'self: type in property declaration'                              => 
                 'testMarker'        => '/* testSelfIsKeywordAsPropertyType */',
                 'expectedTokenType' => 'T_SELF',
             ,
-            'parent: type in property declaration'    => 
+            'parent: type in property declaration'                            => 
                 'testMarker'        => '/* testParentIsKeywordAsPropertyType */',
                 'expectedTokenType' => 'T_PARENT',
             ,
 
-            'false: value in property declaration'    => 
+            'false: value in property declaration'                            => 
                 'testMarker'        => '/* testFalseIsKeywordAsPropertyDefault */',
                 'expectedTokenType' => 'T_FALSE',
             ,
-            'true: value in property declaration'     => 
+            'true: value in property declaration'                             => 
                 'testMarker'        => '/* testTrueIsKeywordAsPropertyDefault */',
                 'expectedTokenType' => 'T_TRUE',
             ,
-            'null: value in property declaration'     => 
+            'null: value in property declaration'                             => 
                 'testMarker'        => '/* testNullIsKeywordAsPropertyDefault */',
                 'expectedTokenType' => 'T_NULL',
             ,
-            'self: value in property declaration'     => 
+            'self: value in property declaration'                             => 
                 'testMarker'        => '/* testSelfIsKeywordAsPropertyDefault */',
                 'expectedTokenType' => 'T_SELF',
             ,
-            'parent: value in property declaration'   => 
+            'parent: value in property declaration'                           => 
                 'testMarker'        => '/* testParentIsKeywordAsPropertyDefault */',
                 'expectedTokenType' => 'T_PARENT',
             ,
+
+            'false: first in union type for OO constant declaration'          => 
+                'testMarker'        => '/* testFalseIsKeywordAsConstUnionTypeFirst */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: first in union type for OO constant declaration'           => 
+                'testMarker'        => '/* testTrueIsKeywordAsConstUnionTypeFirst */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: first in union type for OO constant declaration'           => 
+                'testMarker'        => '/* testNullIsKeywordAsConstUnionTypeFirst */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: first in union type for OO constant declaration'           => 
+                'testMarker'        => '/* testSelfIsKeywordAsConstUnionTypeFirst */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: first in union type for OO constant declaration'         => 
+                'testMarker'        => '/* testParentIsKeywordAsConstUnionTypeFirst */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: middle in union type for OO constant declaration'         => 
+                'testMarker'        => '/* testFalseIsKeywordAsConstUnionTypeMiddle */',
+                'expectedTokenType' => 'T_FALSE',

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/FileList.php Changed

@@ -9,6 +9,10 @@
 
 namespace PHP_CodeSniffer\Tests;
 
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use RegexIterator;
+
 class FileList
 {
 
@@ -52,21 +56,21 @@
     {
         $this->rootPath = $rootPath;
 
-        $directory = new \RecursiveDirectoryIterator(
+        $directory = new RecursiveDirectoryIterator(
             $directory,
-            \RecursiveDirectoryIterator::UNIX_PATHS
+            RecursiveDirectoryIterator::UNIX_PATHS
         );
-        $flattened = new \RecursiveIteratorIterator(
+        $flattened = new RecursiveIteratorIterator(
             $directory,
-            \RecursiveIteratorIterator::LEAVES_ONLY,
-            \RecursiveIteratorIterator::CATCH_GET_CHILD
+            RecursiveIteratorIterator::LEAVES_ONLY,
+            RecursiveIteratorIterator::CATCH_GET_CHILD
         );
 
         if ($filter === '') {
             $filter = sprintf($this->baseRegex, preg_quote($this->rootPath));
         }
 
-        $this->fileIterator = new \RegexIterator($flattened, $filter);
+        $this->fileIterator = new RegexIterator($flattened, $filter);
 
         return $this;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Standards/AbstractSniffUnitTest.php Changed

@@ -13,9 +13,10 @@
 
 namespace PHP_CodeSniffer\Tests\Standards;
 
+use DirectoryIterator;
 use PHP_CodeSniffer\Exceptions\RuntimeException;
-use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Files\LocalFile;
+use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Tests\ConfigDouble;
 use PHP_CodeSniffer\Util\Common;
 use PHPUnit\Framework\TestCase;
@@ -78,7 +79,7 @@
         $testFiles = ;
 
         $dir = substr($testFileBase, 0, strrpos($testFileBase, DIRECTORY_SEPARATOR));
-        $di  = new \DirectoryIterator($dir);
+        $di  = new DirectoryIterator($dir);
 
         foreach ($di as $file) {
             $path = $file->getPathname();
@@ -192,10 +193,13 @@
                 $fixedFile = $testFile.'.fixed';
                 $filename  = basename($testFile);
                 if (file_exists($fixedFile) === true) {
-                    $diff = $phpcsFile->fixer->generateDiff($fixedFile);
-                    if (trim($diff) !== '') {
-                        $fixedFilename     = basename($fixedFile);
-                        $failureMessages = "Fixed version of $filename does not match expected version in $fixedFilename; the diff is\n$diff";
+                    if ($phpcsFile->fixer->getContents() !== file_get_contents($fixedFile)) {
+                        // Only generate the (expensive) diff if a difference is expected.
+                        $diff = $phpcsFile->fixer->generateDiff($fixedFile);
+                        if (trim($diff) !== '') {
+                            $fixedFilename     = basename($fixedFile);
+                            $failureMessages = "Fixed version of $filename does not match expected version in $fixedFilename; the diff is\n$diff";
+                        }
                     }
                 } else if (is_callable($this, 'addWarning') === true) {
                     $this->addWarning("Missing fixed version of $filename to verify the accuracy of fixes, while the sniff is making fixes against the test case file");

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Standards/AllSniffs.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/TestSuite.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/TestSuite7.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/bootstrap.php Changed

roundcubemail.dsc Changed

Changes of Revision 49