Kolab Groupware OBS

Changes of Revision 56

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;
+    }
+
+    /**
      * Create a new calendar assigned to the current user
      *
      * @param array $prop Hash array with calendar properties
@@ -423,44 +450,73 @@
     {
         $this->calendars = ;
         $this->search_more_results = false;
-        /*
-                // find unsubscribed IMAP folders that have "event" type
-                if ($source == 'folders') {
-                    foreach ((array) $this->storage->search_folders('event', $query, 'other') as $folder) {
-                        $calendar = new kolab_calendar($folder->name, $this->cal);
-                        $this->calendars$calendar->id = $calendar;
-                    }
-                }
-                // find other user's virtual calendars
-                else if ($source == 'users') {
-                    // we have slightly more space, so display twice the number
-                    $limit = $this->rc->config->get('autocomplete_max', 15) * 2;
-
-                    foreach ($this->storage->search_users($query, 0, , $limit, $count) as $user) {
-                        $calendar = new caldav_user_calendar($user, $this->cal);
-                        $this->calendars$calendar->id = $calendar;
-
-                        // search for calendar folders shared by this user
-                        foreach ($this->storage->list_user_folders($user, 'event', false) as $foldername) {
-                            $cal = new caldav_calendar($foldername, $this->cal);
-                            $this->calendars$cal->id = $cal;
-                            $calendar->subscriptions = true;
-                        }
-                    }
 
-                    if ($count > $limit) {
-                        $this->search_more_results = true;
-                    }
+        // find calendar folders, except other user's folders
+        if ($source == 'folders') {
+            foreach ((array) $this->storage->search_folders('event', $query, 'other') as $folder) {
+                $calendar = new caldav_calendar($folder, $this->cal);
+                $this->calendars$calendar->id = $calendar;
+            }
+        }
+        // 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 ($this->storage->search_users($query, 0, , $limit, $count) as $user) {
+                $calendar = new caldav_user_calendar($user, $this->cal);
+                $this->calendars$calendar->id = $calendar;
+            }
+            */
+
+            foreach ($this->storage->get_share_invitations('event', $query) as $invitation) {
+                $calendar = new caldav_calendar($invitation, $this->cal);
+                $this->calendars$calendar->id = $calendar;
+
+                if (count($this->calendars) > $limit) {
+                    $this->search_more_results = true;
                 }
+            }
+        }
+
+        // don't list the birthday/invitations calendars
+        $this->rc->config->set('calendar_contact_birthdays', false);
+        $this->rc->config->set('kolab_invitation_calendars', false);
 
-                // don't list the birthday calendar
-                $this->rc->config->set('calendar_contact_birthdays', false);
-                $this->rc->config->set('kolab_invitation_calendars', false);
-        */
         return $this->list_calendars();
     }
 
     /**
+     * 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('event', $href);
+
+        if ($folder === false) {
+            return false;
+        }
+
+        $calendar = $this->_to_calendar($folder);
+
+        $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', );
+
+        $prop = $this->_to_calendar_props($calendar, $prefs'kolab_calendars');
+
+        // Activate the folder
+        $prefs'kolab_calendars'$prop'id''active' = true;
+
+        $this->rc->user->save_prefs($prefs);
+
+        return $prop;
+    }
+
+    /**
      * Get events from source.
      *
      * @param int    $start         Event's new start (unix timestamp)
@@ -676,6 +732,11 @@
             return kolab_utils::folder_form($form, '', 'calendar');
         }
 
+        if ($calendar'id') {
+            $cal = $this->get_calendar($calendar'id');
+            $folder = $cal->storage;
+        }
+
         $form'props' = 
             'name'   => $this->rc->gettext('properties'),
             'fields' => 
@@ -685,6 +746,6 @@
             ,
         ;
 
-        return kolab_utils::folder_form($form, '', 'calendar', , true);
+        return kolab_utils::folder_form($form, $folder ?? null, 'calendar', );
     }
 }

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);
+        }
+    }
+
+    /**
      * Returns value of kolab_addressbook_prio setting
      */
     private function addressbook_prio()

roundcubemail-1.5.tar.gz/plugins/kolab_folders/kolab_folders.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}"));
+        }
+
+        // Create list with radio buttons
+        $ul = '';
+        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);
+        }
+
+        return html::tag('ul', 'id' => 'usertype', 'class' => $class, $ul, html::$common_attrib);
+    }
+
+    /**
+     * Creates ACL rights table
+     *
+     * @param array $attrib Template object attributes
+     *
+     * @return string HTML Content
+     */
+    private static function list_rights($attrib = )
+    {
+        $rcmail = rcmail::get_instance();
+
+        // Get ACL for the folder
+        $acl = self::$folder->get_acl();
+
+        // Remove 'self' entry
+        // TODO: Do it only on folders user == owner
+        unset($aclkolab_dav_client::ACL_PRINCIPAL_SELF);
+
+        // Sort the list by username
+        uksort($acl, 'strnatcasecmp');
+
+        // Move special entries to the top
+        $specials = ;
+        foreach (self::$specials as $key) {
+            if (isset($acl$key)) {
+                $specials$key = $acl$key;
+                unset($acl$key);
+            }
+        }
+
+        if (count($specials) > 0) {
+            $acl = array_merge($specials, $acl);
+        }
+
+        $cols = 
+            self::PRIVILEGE_READ,
+            self::PRIVILEGE_WRITE,
+            self::PRIVILEGE_ALL,
+        ;
+
+        if (self::$folder->type == 'event' || self::$folder->type == 'task') {
+            array_unshift($cols, self::PRIVILEGE_FREE_BUSY);
+        }
+
+        // Create the table
+        $attrib'noheader' = true;
+        $table = new html_table($attrib);
+        $js_table = ;
+
+        // Create table header
+        $table->add_header('user', $rcmail->gettext('libkolab.identifier'));
+        foreach ($cols as $right) {
+            $label = $rcmail->gettext("libkolab.acl{$right}");
+            $table->add_header('class' => "acl{$right}", 'title' => $label, $label);
+        }
+
+        foreach ($acl as $user => $rights) {
+            // We do not support 'deny' privileges
+            if (!empty($rights'deny') || empty($rights'grant')) {
+                continue;
+            }
+
+            $userid = rcube_utils::html_identifier($user);
+            $title = null;
+
+            if (!empty($specials) && isset($specials$user)) {
+                $username = $rcmail->gettext("libkolab.{$user}");
+            } else {
+                $username = $user;
+            }
+
+            $table->add_row('id' => 'rcmrow' . $userid, 'data-userid' => $user);
+            $table->add(
+                'class' => 'user text-nowrap', 'title' => $title,
+                html::a('id' => 'rcmlinkrow' . $userid, rcube::Q($username))
+            );
+
+            $rights = self::from_dav($rights'grant');
+
+            foreach ($cols as $right) {
+                $class = in_array($right, $rights) ? 'enabled' : 'disabled';
+                $table->add('acl' . $right . ' ' . $class, '<span></span>');
+            }
+
+            $js_table$userid = $rights;
+        }
+
+        $rcmail->output->set_env('acl', $js_table);
+        $rcmail->output->set_env('acl_specials', self::$specials);
+
+        return $table->show();
+    }
+
+    /**
+     * Handler for ACL update/create action
+     */
+    private static function action_save()
+    {
+        $rcmail = rcmail::get_instance();
+        $target = trim(rcube_utils::get_input_string('_target', rcube_utils::INPUT_POST, true));
+        $user = trim(rcube_utils::get_input_string('_user', rcube_utils::INPUT_POST));
+        $acl = trim(rcube_utils::get_input_string('_acl', rcube_utils::INPUT_POST));
+        $oldid = trim(rcube_utils::get_input_string('_old', rcube_utils::INPUT_POST));
+
+        $users = $oldid ? $user : explode(',', $user);
+        $self = $rcmail->get_user_name();
+        $updates = ;
+
+        $folder = self::get_folder($target);
+
+        if (!$folder || !$acl) {
+            $rcmail->output->show_message($oldid ? 'libkolab.updateerror' : 'libkolab.createerror', 'error');
+            return;
+        }
+
+        $folder_acl = $folder->get_acl();
+        $acl = explode(',', $acl);
+
+        foreach ($users as $user) {
+            $user = trim($user);
+            $username = '';
+
+            if (in_array($user, self::$specials)) {
+                $username = $rcmail->gettext("libkolab.{$user}");
+            } elseif (!empty($user)) {
+                if (!strpos($user, '@') && ($realm = self::get_realm())) {
+                    $user .= '@' . rcube_utils::idn_to_ascii(preg_replace('/^@/', '', $realm));
+                }
+
+                // Make sure it's valid email address
+                if (strpos($user, '@') && !rcube_utils::check_email($user, false)) {
+                    $user = null;
+                }
+
+                $username = $user;
+            }
+
+            if (!$user) {
+                continue;
+            }
+
+            if ($user != $self && $username != $self) {
+                $folder_acl$user = 'grant' => self::to_dav($acl), 'deny' => ;
+                $updates = 
+                    'id' => rcube_utils::html_identifier($user),
+                    'username' => $user,
+                    'display' => $username,
+                    'acl' => $acl,
+                    'old' => $oldid,
+                ;
+            }
+        }
+
+        if (count($updates) > 0 && $folder->set_acl($folder_acl)) {
+            foreach ($updates as $command) {
+                $rcmail->output->command('acl_update', $command);
+            }
+            $rcmail->output->show_message($oldid ? 'libkolab.updatesuccess' : 'libkolab.createsuccess', 'confirmation');
+        } else {
+            $rcmail->output->show_message($oldid ? 'libkolab.updateerror' : 'libkolab.createerror', 'error');
+        }
+    }
+
+    /**
+     * Handler for ACL delete action
+     */
+    private static function action_delete()
+    {
+        $rcmail = rcmail::get_instance();
+        $target = trim(rcube_utils::get_input_string('_target', rcube_utils::INPUT_POST, true));
+        $user = trim(rcube_utils::get_input_string('_user', rcube_utils::INPUT_POST));
+
+        $folder = self::get_folder($target);
+        $users = explode(',', $user);
+
+        if (!$folder) {
+            $rcmail->output->show_message('libkolab.deleteerror', 'error');
+            return;
+        }
+
+        $folder_acl = $folder->get_acl();
+
+        foreach ($users as $user) {
+            $user = trim($user);
+            unset($folder_acl$user);
+        }
+
+        if ($folder->set_acl($folder_acl)) {
+            foreach ($users as $user) {
+                $rcmail->output->command('acl_remove_row', rcube_utils::html_identifier($user));
+            }
+
+            $rcmail->output->show_message('libkolab.deletesuccess', 'confirmation');
+        } else {
+            $rcmail->output->show_message('libkolab.deleteerror', 'error');
+        }
+    }
+
+    /**
+     * Convert DAV privileges into simplified "groups"
+     *
+     * @param array $list ACL privileges
+     *
+     * @return array
+     */
+    private static function from_dav($list)
+    {
+        /*
+        DAV ACL is a complicated system, we don't really want to implement it in full,
+        we rather keep it simple and similar to what we have for mail folders.
+        Therefore we implement it like this:
+
+        - free-busy:
+            - CALDAV:read-free-busy (not for addressbooks)
+        - read:
+            - DAV:read
+        - write:
+           - DAV:write-content
+           - CYRUS:remove-resource
+        - all (all the above plus administration):
+           - DAV:all
+
+        Reference: https://datatracker.ietf.org/doc/html/rfc3744
+        Reference: https://www.cyrusimap.org/imap/download/installation/http/caldav.html#calendar-acl
+        */
+
+        // TODO: Don't use CYRUS:remove-resource on non-Cyrus servers
+
+        $result = ;
+
+        if ($all = in_array('all', $list)) {
+            $result = self::PRIVILEGE_ALL;
+        }
+
+        if ($all || in_array('read-free-busy', $list) || in_array('read', $list)) {
+            $result = self::PRIVILEGE_FREE_BUSY;
+        }
+
+        if ($all || in_array('read', $list)) {
+            $result = self::PRIVILEGE_READ;
+        }
+
+        if ($all || (in_array('write-content', $list) && in_array('remove-resource', $list)) || in_array('write', $list)) {
+            $result = self::PRIVILEGE_WRITE;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Convert simplified privileges into ACL privileges
+     *
+     * @param array $list ACL privileges
+     *
+     * @return array
+     * @see self::from_dav()
+     */
+    private static function to_dav($list)
+    {
+        $result = ;
+
+        if (in_array(self::PRIVILEGE_ALL, $list)) {
+            return 'all';
+        }
+
+        if (in_array(self::PRIVILEGE_WRITE, $list)) {
+            $result = 'read';
+            $result = 'write-content';
+            // TODO: Don't use CYRUS:remove-resource on non-Cyrus servers
+            $result = 'remove-resource';
+        } elseif (in_array(self::PRIVILEGE_READ, $list)) {
+            $result = 'read';
+        } elseif (in_array(self::PRIVILEGE_FREE_BUSY, $list)) {
+            $result = 'read-free-busy';
+        }
+
+        return $result;
+    }
+
+    /**
+     * Username realm detection.
+     *
+     * @return string Username realm (domain)
+     */
+    private static function get_realm()
+    {
+        // When user enters a username without domain part, realm
+        // allows to add it to the username (and display correct username in the table)
+
+        if (isset($_SESSION'acl_user_realm')) {
+            return $_SESSION'acl_user_realm';
+        }
+
+        $rcmail = rcmail::get_instance();
+        $self = $rcmail->get_user_name();
+
+        // find realm in username of logged user (?)
+        $name, $domain = rcube_utils::explode('@', $self);
+
+        return $_SESSION'acl_username_realm' = $domain;
+    }
+
+    /**
+     * Get DAV folder object by ID
+     */
+    private static function get_folder($id)
+    {
+        if (strpos($id, '?')) {
+            $server_url, $folder_href = explode('?', $id, 2);
+
+            $dav = new kolab_dav_client($server_url);
+            $props = $dav->folderInfo($folder_href);
+
+            if ($props) {
+                return new kolab_storage_dav_folder($dav, $props);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get DAV folder identifier (with the server info)
+     */
+    private static function get_folder_id($folder)
+    {
+        // the folder identifier needs to easily allow for
+        // connecting to the DAV server and getting/setting ACL
+        // TODO: It might be a security issue, consider generating ID and using session
+        // so the server URL is not revealed in the UI.
+        return $folder->dav->url . '?' . $folder->href;
+    }
+}

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/>'
+                    . '<d:share-access/>'   // draft-pot-webdav-resource-sharing-04
+                    . '<d:owner/>'          // RFC 3744 (ACL)
+                    . '<d:invite/>'
+                    . '<k:alarms/>'
+                . '</d:prop>'
             . '</d:propfind>';
 
         // Note: Cyrus CardDAV service requires Depth:1 (CalDAV works without it)
@@ -490,6 +544,134 @@
     }
 
     /**
+     * Fetch DAV notifications
+     *
+     * @param ?array $types Notification types to return
+     *
+     * @return false|array Notification objects on success, False on error
+     */
+    public function listNotifications($types = )
+    {
+        $root_href = $this->getHome('NOTIFICATION');
+
+        if ($root_href === null) {
+            return false;
+        }
+
+        $body = '<?xml version="1.0" encoding="utf-8"?>'
+            . ' <d:propfind xmlns:d="DAV:">'
+                . '<d:prop>'
+                    . '<d:notificationtype/>'
+                . '</d:prop>'
+            . '</d:propfind>';
+
+        $response = $this->request($root_href, 'PROPFIND', $body, 'Depth' => 1, 'Prefer' => 'return-minimal');
+
+        if (empty($response)) {
+            return false;
+        }
+
+        $objects = ;
+
+        foreach ($response->getElementsByTagName('response') as $element) {
+            $type = $element->getElementsByTagName('notificationtype')->item(0);
+
+            if ($type && $type->firstChild) {
+                $type = $type->firstChild->localName;
+
+                if (empty($types) || in_array($type, $types)) {
+                    $href = $element->getElementsByTagName('href')->item(0);
+                    if ($notification = $this->getNotification($href->nodeValue)) {
+                        $objects = $notification;
+                    }
+                }
+            }
+        }
+
+        return $objects;
+    }
+
+    /**
+     * Get a single DAV notification
+     *
+     * @param string $location Notification href
+     *
+     * @return false|array Notification data on success, False on error
+     */
+    public function getNotification($location)
+    {
+        $response = $this->request($location, 'GET', '', 'Content-Type' => 'application/davnotification+xml');
+
+        if (empty($response)) {
+            return false;
+        }
+
+        // Note: Cyrus implements draft-pot-webdav-resource-sharing v02, not the most recent one(s),
+        // and even v02 support is broken in some places
+
+        if ($access = $response->getElementsByTagName('access')->item(0)) {
+            $access = $access->firstChild;
+            $access = $access->localName; // 'read' or 'read-write'
+        }
+
+        foreach ('invite-noresponse', 'invite-accepted', 'invite-declined', 'invite-invalid', 'invite-deleted' as $name) {
+            if ($node = $response->getElementsByTagName($name)->item(0)) {
+                $result'status' = str_replace('invite-', '', $node->localName);
+            }
+        }
+
+        if ($organizer = $response->getElementsByTagName('organizer')->item(0)) {
+            if ($href = $organizer->getElementsByTagName('href')->item(0)) {
+                $organizer = $href->nodeValue;
+            }
+            // There should be also 'displayname', but Cyrus uses 'common-name',
+            // we'll ignore it for now anyway.
+        } elseif ($organizer = $response->getElementsByTagName('principal')->item(0)) {
+            if ($href = $organizer->getElementsByTagName('href')->item(0)) {
+                $organizer = $href->nodeValue;
+            }
+            // There should be also 'displayname', but Cyrus uses 'common-name',
+            // we'll ignore it for now anyway.
+        }
+
+        $components = ;
+        if ($set_element = $response->getElementsByTagName('supported-calendar-component-set')->item(0)) {
+            foreach ($set_element->getElementsByTagName('comp') as $comp_element) {
+                $components = $comp_element->attributes->getNamedItem('name')->nodeValue;
+            }
+        }
+
+        $result = 
+            'href' => $location,
+            'access' => $access,
+            'types' => $components,
+            'organizer' => $organizer,
+        ;
+
+        // Cyrus uses 'summary', but it's 'comment' in more recent standard
+        foreach ('dtstamp', 'summary', 'comment' as $name) {
+            if ($node = $response->getElementsByTagName($name)->item(0)) {
+                $result$name = $node->nodeValue;
+            }
+        }
+
+        // Note: In more recent standard there are 'displayname' and 'resourcetype' props
+
+        // Note: 'hosturl' exists in v2, but starting from v3 'sharer-resource-uri' is used
+        if ($hosturl = $response->getElementsByTagName('hosturl')->item(0)) {
+            if ($href = $hosturl->getElementsByTagName('href')->item(0)) {
+                $result'resource-uri' = $href->nodeValue;
+            }
+        } elseif ($hosturl = $response->getElementsByTagName('sharer-resource-uri')->item(0)) {
+            if ($href = $hosturl->getElementsByTagName('href')->item(0)) {
+                $result'resource-uri' = $href->nodeValue;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
      * Fetch DAV objects metadata (ETag, href) a folder
      *
      * @param string $location  Folder location
@@ -604,6 +786,140 @@
     }
 
     /**
+     * Accept/Deny a share invitation (draft-pot-webdav-resource-sharing)
+     *
+     * @param string $location Notification location
+     * @param string $action   Reply action ('accepted' or 'declined')
+     * @param array  $props    Additional reply properties (slug, comment)
+     *
+     * @return bool True on success, False on error
+     */
+    public function inviteReply($location, $action = self::INVITE_ACCEPTED, $props = )
+    {
+        $reply = '<d:invite-' . $action . '/>';
+
+        // Note: <create-in> and <slug> are ignored by Cyrus
+
+        if (!empty($props'comment')) {
+            $reply .= '<d:comment>' . htmlspecialchars($props'comment', ENT_XML1, 'UTF-8') . '</d:comment>';
+        }
+
+        $headers = 'Content-Type' => 'application/davsharing+xml; charset=utf-8';
+
+        $body = '<?xml version="1.0" encoding="utf-8"?>'
+            . '<d:invite-reply xmlns:d="DAV:">' . $reply . '</d:invite-reply>';
+
+        $response = $this->request($location, 'POST', $body, $headers);
+
+        return $response !== false;
+    }
+
+    /**
+     * Set ACL on a DAV folder
+     *
+     * @param string $location Object location (relative to the user home)
+     * @param array  $acl      ACL definition
+     *
+     * @return bool True on success, False on error
+     */
+    public function setACL($location, $acl)
+    {
+        $ns_privileges = 
+            // CalDAV
+            'read-free-busy' => 'c:read-free-busy',
+            // Cyrus
+            'admin' => 'cy:admin',
+            'add-resource' => 'cy:add-resource',
+            'remove-resource' => 'cy:remove-resource',
+            'make-collection' => 'cy:make-collection',
+            'remove-collection' => 'cy:remove-collection',
+        ;
+
+        foreach ($acl as $idx => $privileges) {
+            if (preg_match('/^a-z+$/', $idx)) {
+                $principal = '<d:' . $idx . '/>';
+            } else {
+                $principal = '<d:href>' . htmlspecialchars($idx, ENT_XML1, 'UTF-8') . '</d:href>';
+            }
+
+            $grant = ;
+            $deny = ;
+
+            foreach ($privileges'grant' ??  as $i => $p) {
+                $p = '<' . ($ns_privileges$p ?? "d:{$p}") . '/>';
+                $grant$i = '<d:privilege>' . $p . '</d:privilege>';
+            }
+            foreach ($privileges'deny' ??  as $i => $p) {
+                $p = '<' . ($ns_privileges$p ?? "d:{$p}") . '/>';
+                $deny$i = '<d:privilege>' . $p . '</d:privilege>';
+            }
+
+            $acl$idx = '<d:ace>'
+                . '<d:principal>' . $principal . '</d:principal>'
+                . (count($grant) > 0 ? '<d:grant>' . implode('', $grant) . '</d:grant>' : '')
+                . (count($deny) > 0 ? '<d:deny>' . implode('', $deny) . '</d:deny>' : '')
+                . '</d:ace>';
+        }
+
+        $acl = implode('', $acl);
+        $ns = 'xmlns:d="DAV:"';
+
+        if (strpos($acl, '<c:')) {
+            $ns .= ' xmlns:c="urn:ietf:params:xml:ns:caldav"';
+        }
+        if (strpos($acl, '<cy:')) {
+            $ns .= ' xmlns:cy="http://cyrusimap.org/ns/"';
+        }
+
+        $body = '<?xml version="1.0" encoding="utf-8"?><d:acl ' . $ns . '>' . $acl . '</d:acl>';
+
+        $response = $this->request($location, 'ACL', $body);
+
+        return $response !== false;
+    }
+
+    /**
+     * Share a reasource (draft-pot-webdav-resource-sharing)
+     *
+     * @param string $location Resource location
+     * @param array  $sharees  Sharees list
+     *
+     * @return bool True on success, False on error
+     */
+    public function shareResource($location, $sharees = )
+    {
+        $props = '';
+
+        foreach ($sharees as $href => $sharee) {
+            $props .= '<d:sharee>'
+                . '<d:href>' . htmlspecialchars($href, ENT_XML1, 'UTF-8') . '</d:href>'
+                . '<d:share-access><d:' . ($sharee'access' ?? self::SHARING_NO_ACCESS) . '/></d:share-access>'
+                . '<d:' . ($sharee'status' ?? 'noresponse') . '/>';
+
+            if (isset($sharee'comment') && strlen($sharee'comment')) {
+                $props .= '<d:comment>' . htmlspecialchars($sharee'comment', ENT_XML1, 'UTF-8') . '</d:comment>';
+            }
+
+            if (isset($sharee'displayname') && strlen($sharee'displayname')) {
+                $props .= '<d:prop><d:displayname>'
+                    . htmlspecialchars($sharee'comment', ENT_XML1, 'UTF-8')
+                    . '</d:displayname></d:prop>';
+            }
+
+            $props .= '</d:sharee>';
+        }
+
+        $headers = 'Content-Type' => 'application/davsharing+xml; charset=utf-8';
+
+        $body = '<?xml version="1.0" encoding="utf-8"?>'
+            . '<d:share-resource xmlns:d="DAV:">' . $props . '</d:share-resource>';
+
+        $response = $this->request($location, 'POST', $body, $headers);
+
+        return $response !== false;
+    }
+
+    /**
      * Parse XML content
      */
     protected function parseXML($xml)
@@ -688,8 +1004,7 @@
         $types = ;
         if ($type_element = $element->getElementsByTagName('resourcetype')->item(0)) {
             foreach ($type_element->childNodes as $node) {
-                $_type = explode(':', $node->nodeName);
-                $types = count($_type) > 1 ? $_type1 : $_type0;
+                $types = $node->localName;
             }
         }
 
@@ -702,6 +1017,122 @@
             'resource_type' => $types,
         ;
 
+        // Note: We're supporting only a subset of RFC 3744, it is:
+        //     - grant, deny
+        //     - principal (all, self, authenticated, href)
+        if ($acl_element = $element->getElementsByTagName('acl')->item(0)) {
+            $acl = ;
+            $special = 
+                self::ACL_PRINCIPAL_SELF,
+                self::ACL_PRINCIPAL_ALL,
+                self::ACL_PRINCIPAL_AUTH,
+                self::ACL_PRINCIPAL_UNAUTH,
+            ;
+
+            foreach ($acl_element->getElementsByTagName('ace') as $ace) {
+                $principal = $ace->getElementsByTagName('principal')->item(0);
+                $grant = ;
+                $deny = ;
+
+                if ($principal->firstChild && $principal->firstChild->localName == 'href') {
+                    $principal = $principal->firstChild->nodeValue;
+                } elseif ($principal->firstChild && in_array($principal->firstChild->localName, $special)) {
+                    $principal = $principal->firstChild->localName;
+                } else {
+                    continue;
+                }
+
+                if ($grant_element = $ace->getElementsByTagName('grant')->item(0)) {
+                    foreach ($grant_element->childNodes as $privilege) {
+                        if (strpos($privilege->nodeName, ':privilege') !== false && $privilege->firstChild) {
+                            $grant = preg_replace('/^^:+:/', '', $privilege->firstChild->nodeName);
+                        }
+                    }
+                }
+
+                if ($deny_element = $ace->getElementsByTagName('deny')->item(0)) {
+                    foreach ($deny_element->childNodes as $privilege) {
+                        if (strpos($privilege->nodeName, ':privilege') !== false && $privilege->firstChild) {
+                            $deny = preg_replace('/^^:+:/', '', $privilege->firstChild->nodeName);
+                        }
+                    }
+                }
+
+                if (count($grant) > 0 || count($deny) > 0) {
+                    $acl$principal = 
+                        'grant' => $grant,
+                        'deny' => $deny,
+                    ;
+                }
+            }
+
+            $result'acl' = $acl;
+        }
+
+        if ($set_element = $element->getElementsByTagName('current-user-privilege-set')->item(0)) {
+            $rights = ;
+
+            foreach ($set_element->childNodes as $privilege) {
+                if (strpos($privilege->nodeName, ':privilege') !== false && $privilege->firstChild) {
+                    $rights = preg_replace('/^^:+:/', '', $privilege->firstChild->nodeName);
+                }
+            }
+
+            $result'myrights' = $rights;
+        }
+
+        if ($owner = $element->getElementsByTagName('owner')->item(0)) {
+            if ($owner->firstChild) {
+                $result'owner' = $owner->firstChild->nodeValue;
+            }
+        }
+
+        // 'share-access' from draft-pot-webdav-resource-sharing
+        if ($share = $element->getElementsByTagName('share-access')->item(0)) {
+            if ($share->firstChild) {
+                $result'share-access' = $share->firstChild->localName;
+            }
+        }
+
+        // 'invite' from draft-pot-webdav-resource-sharing
+        if ($invite_element = $element->getElementsByTagName('invite')->item(0)) {
+            $invites = ;
+            foreach ($invite_element->childNodes as $sharee) {
+                /** @var DOMElement $sharee */
+                $href = $sharee->getElementsByTagName('href')->item(0)->nodeValue;
+                $status = 'noresponse';
+
+                if ($comment = $sharee->getElementsByTagName('comment')->item(0)) {
+                    $comment = $comment->nodeValue;
+                }
+
+                if ($displayname = $sharee->getElementsByTagName('displayname')->item(0)) {
+                    $displayname = $displayname->nodeValue;
+                }
+
+                if ($access = $sharee->getElementsByTagName('share-access')->item(0)) {
+                    $access = $access->firstChild->localName;
+                } else {
+                    $access = self::SHARING_NOT_SHARED;
+                }
+
+                foreach ('invite-noresponse', 'invite-accepted', 'invite-declined', 'invite-invalid', 'invite-deleted' as $name) {
+                    if ($node = $sharee->getElementsByTagName($name)->item(0)) {
+                        $status = str_replace('invite-', '', $node->localName);
+                    }
+                }
+
+                $invites$href = 
+                    'access' => $access,
+                    'status' => $status,
+                    'comment' => $comment,
+                    'displayname' => $displayname,
+                ;
+            }
+
+            $result'invite' = $invites;
+        }
+
         foreach ('alarms' as $tag) {
             if ($el = $element->getElementsByTagName($tag)->item(0)) {
                 if (strlen($el->nodeValue) > 0) {

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);
+            }
+        }
+
+        return html::tag('ul', 'id' => 'usertype', 'class' => $class, $ul, html::$common_attrib);
+    }
+
+    /**
+     * Creates sharees table
+     *
+     * @param array $attrib Template object attributes
+     *
+     * @return string HTML Content
+     */
+    private static function list_rights($attrib = )
+    {
+        $rcmail = rcmail::get_instance();
+
+        // Get ACL for the folder
+        $acl = self::$folder->get_sharees();
+
+        // Sort the list by username
+        uksort($acl, 'strnatcasecmp');
+
+        // Move special entries to the top
+        $specials = ;
+        foreach (self::$specials as $key) {
+            if (isset($acl$key)) {
+                $specials$key = $acl$key;
+                unset($acl$key);
+            }
+        }
+
+        if (count($specials) > 0) {
+            $acl = array_merge($specials, $acl);
+        }
+
+        $cols = 
+            self::PRIVILEGE_READ,
+            self::PRIVILEGE_WRITE,
+        ;
+
+        // Create the table
+        $attrib'noheader' = true;
+        $table = new html_table($attrib);
+        $js_table = ;
+
+        // Create table header
+        $table->add_header('user', $rcmail->gettext('libkolab.identifier'));
+        foreach ($cols as $right) {
+            $label = $rcmail->gettext("libkolab.acl{$right}");
+            $table->add_header('class' => "acl{$right}", 'title' => $label, $label);
+        }
+
+        foreach ($acl as $user => $sharee) {
+            if (!in_array($sharee'access', kolab_dav_client::SHARING_READ, kolab_dav_client::SHARING_READ_WRITE)) {
+                continue;
+            }
+
+            $access = $sharee'access';
+            $userid = rcube_utils::html_identifier($user);
+            $title = null;
+
+            if (!empty($specials) && isset($specials$user)) {
+                $username = $rcmail->gettext("libkolab.{$user}");
+            } else {
+                $username = $user;
+            }
+
+            $table->add_row('id' => 'rcmrow' . $userid, 'data-userid' => $user);
+            $table->add(
+                'class' => 'user text-nowrap', 'title' => $title,
+                html::a('id' => 'rcmlinkrow' . $userid, rcube::Q($username))
+            );
+
+            $rights = ;
+            foreach ($cols as $right) {
+                $enabled = (
+                    $right == self::PRIVILEGE_READ
+                        && ($access == kolab_dav_client::SHARING_READ || $access == kolab_dav_client::SHARING_READ_WRITE)
+                ) || (
+                    $right == self::PRIVILEGE_WRITE
+                    && $access == kolab_dav_client::SHARING_READ_WRITE
+                );
+                $class = $enabled ? 'enabled' : 'disabled';
+                $table->add('acl' . $right . ' ' . $class, '<span></span>');
+
+                if ($enabled) {
+                    $rights = $right;
+                }
+            }
+
+            $js_table$userid = $access;
+        }
+
+        $rcmail->output->set_env('acl', $js_table);
+        $rcmail->output->set_env('acl_specials', self::$specials);
+
+        return $table->show();
+    }
+
+    /**
+     * Handler for sharee update/create action
+     */
+    private static function action_save()
+    {
+        $rcmail = rcmail::get_instance();
+        $target = trim(rcube_utils::get_input_string('_target', rcube_utils::INPUT_POST, true));
+        $user = trim(rcube_utils::get_input_string('_user', rcube_utils::INPUT_POST));
+        $acl = trim(rcube_utils::get_input_string('_acl', rcube_utils::INPUT_POST));
+        $oldid = trim(rcube_utils::get_input_string('_old', rcube_utils::INPUT_POST));
+
+        $users = $oldid ? $user : explode(',', $user);
+        $self = $rcmail->get_user_name();
+        $updates = ;
+
+        $folder = self::get_folder($target);
+
+        if (!$folder || !$acl) {
+            $rcmail->output->show_message($oldid ? 'libkolab.updateerror' : 'libkolab.createerror', 'error');
+            return;
+        }
+
+        $sharees = $folder->get_sharees();
+        $acl = explode(',', $acl);
+
+        foreach ($users as $user) {
+            $user = trim($user);
+            $username = '';
+
+            if (in_array($user, self::$specials)) {
+                $username = $rcmail->gettext("libkolab.{$user}");
+            } elseif (!empty($user)) {
+                if (!strpos($user, '@') && ($realm = self::get_realm())) {
+                    $user .= '@' . rcube_utils::idn_to_ascii(preg_replace('/^@/', '', $realm));
+                }
+
+                // Make sure it's valid email address
+                if (strpos($user, '@') && !rcube_utils::check_email($user, false)) {
+                    $user = null;
+                }
+
+                $username = $user;
+            }
+
+            if (!$user) {
+                continue;
+            }
+
+            if ($user == $self && $username == $self) {
+                continue;
+            }
+
+            if (in_array(self::PRIVILEGE_WRITE, $acl)) {
+                $access = kolab_dav_client::SHARING_READ_WRITE;
+            } elseif (in_array(self::PRIVILEGE_READ, $acl)) {
+                $access = kolab_dav_client::SHARING_READ;
+            } else {
+                $access = kolab_dav_client::SHARING_NO_ACCESS;
+            }
+
+            if (isset($sharees$user)) {
+                $sharees$user'access' = $access;
+            } else {
+                $sharees$user = 'access' => $access;
+            }
+
+            $updates = 
+                'id' => rcube_utils::html_identifier($user),
+                'username' => $user,
+                'display' => $username,
+                'acl' => $acl,
+                'old' => $oldid,
+            ;
+        }
+
+        if (count($updates) > 0 && $folder->set_sharees($sharees)) {
+            foreach ($updates as $command) {
+                $rcmail->output->command('acl_update', $command);
+            }
+            $rcmail->output->show_message($oldid ? 'libkolab.updatesuccess' : 'libkolab.createsuccess', 'confirmation');
+        } else {
+            $rcmail->output->show_message($oldid ? 'libkolab.updateerror' : 'libkolab.createerror', 'error');
+        }
+    }
+
+    /**
+     * Handler for sharee delete action
+     */
+    private static function action_delete()
+    {
+        $rcmail = rcmail::get_instance();
+        $target = trim(rcube_utils::get_input_string('_target', rcube_utils::INPUT_POST, true));
+        $user = trim(rcube_utils::get_input_string('_user', rcube_utils::INPUT_POST));
+
+        $folder = self::get_folder($target);
+        $users = explode(',', $user);
+
+        if (!$folder) {
+            $rcmail->output->show_message('libkolab.deleteerror', 'error');
+            return;
+        }
+
+        $sharees = $folder->get_sharees();
+
+        foreach ($users as $user) {
+            $user = trim($user);
+            $sharees$user'access' = kolab_dav_client::SHARING_NO_ACCESS;
+        }
+
+        if ($folder->set_sharees($sharees)) {
+            foreach ($users as $user) {
+                $rcmail->output->command('acl_remove_row', rcube_utils::html_identifier($user));
+            }
+
+            $rcmail->output->show_message('libkolab.deletesuccess', 'confirmation');
+        } else {
+            $rcmail->output->show_message('libkolab.deleteerror', 'error');
+        }
+    }
+
+    /**
+     * Username realm detection.
+     *
+     * @return string Username realm (domain)
+     */
+    private static function get_realm()
+    {
+        // When user enters a username without domain part, realm
+        // allows to add it to the username (and display correct username in the table)
+
+        if (isset($_SESSION'acl_user_realm')) {
+            return $_SESSION'acl_user_realm';
+        }
+
+        $rcmail = rcmail::get_instance();
+        $self = $rcmail->get_user_name();
+
+        // find realm in username of logged user (?)
+        $name, $domain = rcube_utils::explode('@', $self);
+
+        return $_SESSION'acl_username_realm' = $domain;
+    }
+
+    /**
+     * Get DAV folder object by ID
+     */
+    private static function get_folder($id)
+    {
+        if (strpos($id, '?')) {
+            $server_url, $folder_href = explode('?', $id, 2);
+
+            $dav = new kolab_dav_client($server_url);
+            $props = $dav->folderInfo($folder_href);
+
+            if ($props) {
+                return new kolab_storage_dav_folder($dav, $props);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get DAV folder identifier (with the server info)
+     */
+    private static function get_folder_id($folder)
+    {
+        // the folder identifier needs to easily allow for
+        // connecting to the DAV server and getting/setting ACL
+        // TODO: It might be a security issue, consider generating ID and using session
+        // so the server URL is not revealed in the UI.
+        return $folder->dav->url . '?' . $folder->href;
+    }
+}

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)));
+    }
+
+    /**
+     * Get the invitations' sharees
+     *
+     * @return array Sharees list
+     */
+    public function get_sharees()
+    {
+        if (!isset($this->attributes'invite')) {
+            $this->get_folder_info();
+        }
+
+        $sharees = ;
+        foreach ($this->attributes'invite' ??  as $principal => $sharee) {
+            // Convert a principal href into a user identifier
+            if (stripos($principal, 'mailto:') === 0) {
+                $principal = substr($principal, 7);
+            } elseif (strpos($principal, '/') !== false) {
+                $tokens = explode('/', trim($principal, '/'));
+                $principal = end($tokens);
+            }
+
+            $sharees$principal = $sharee;
+        }
+
+        return $sharees;
     }
 
     /**
@@ -771,6 +920,77 @@
     }
 
     /**
+     * Set ACL for the folder.
+     *
+     * @param array $acl ACL list
+     *
+     * @return bool True if successful, false on error
+     */
+    public function set_acl($acl)
+    {
+        if (!$this->valid) {
+            return false;
+        }
+
+        // In Kolab the users (principals) are under /principals/user/<user>
+        // TODO: This might need to be configurable or discovered somehow
+        $path = '/principals/user/';
+        if ($host_path = parse_url($this->dav->url, PHP_URL_PATH)) {
+            $path = '/' . trim($host_path, '/') . $path;
+        }
+
+        $specials = 'all', 'authenticated', 'self';
+        $request = ;
+
+        foreach ($acl as $principal => $privileges) {
+            // Convert a user identifier into a principal href
+            if (!in_array($principal, $specials)) {
+                $principal = $path . $principal;
+            }
+
+            $request$principal = $privileges;
+        }
+
+        return $this->dav->setACL($this->href, $request);
+    }
+
+    /**
+     * Set folder sharing invites.
+     *
+     * @param array $sharees Sharees list
+     *
+     * @return bool True if successful, false on error
+     */
+    public function set_sharees($sharees)
+    {
+        if (!$this->valid) {
+            return false;
+        }
+
+        // In Kolab the users (principals) are under /principals/user/<user>
+        // TODO: This might need to be configurable or discovered somehow
+        $path = '/principals/user/';
+        if ($host_path = parse_url($this->dav->url, PHP_URL_PATH)) {
+            $path = '/' . trim($host_path, '/') . $path;
+        }
+
+        $request = ;
+
+        foreach ($sharees as $principal => $sharee) {
+            // Convert a user identifier into a principal href or mailto: href
+            if (strpos($principal, '@')) {
+                $principal = 'mailto:' . $principal;
+            } else {
+                $principal = $path . $principal;
+            }
+
+            $request$principal = $sharee;
+        }
+
+        return $this->dav->shareResource($this->href, $request);
+    }
+
+    /**
      * Return folder name as string representation of this object
      *
      * @return string Folder display name

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(','),
+                _target: rcmail.env.acl_target,
+            }, rcmail.set_busy(true, 'libkolab.deleting'));
+        });
+    }
+};
+
+// Save ACL data
+rcube_webmail.prototype.acl_save = function () {
+    var data, type, rights = , user = $('#acluser', this.acl_form).val();
+
+    $('#rights :checkbox', this.acl_form).map(function () {
+        if (this.checked) {
+            rights.push(this.value);
+        }
+    });
+
+    if (type = $('input:checkedname=usertype', this.acl_form).val()) {
+        if (type != 'user') {
+            user = type;
+        }
+    }
+
+    if (!user) {
+        this.alert_dialog(this.get_label('libkolab.nouser'));
+        return;
+    }
+
+    if (!rights.length) {
+        this.alert_dialog(this.get_label('libkolab.norights'));
+        return;
+    }
+
+    data = {
+        _act: 'save',
+        _user: user,
+        _acl: rights.join(','),
+        _target: this.env.acl_target,
+    };
+
+    if (this.acl_id) {
+        data._old = this.acl_id;
+    }
+
+    this.http_post('plugin.davacl', data, this.set_busy(true, 'libkolab.saving'));
+};
+
+// Cancel/Hide the form
+rcube_webmail.prototype.acl_cancel = function () {
+    this.ksearch_blur();
+    this.acl_popup.dialog('close');
+};
+
+// Update data after save (and hide form)
+rcube_webmail.prototype.acl_update = function (o) {
+    // delete old row
+    if (o.old) {
+        this.acl_remove_row(o.old);
+    }
+    // make sure the same ID doesn't exist
+    else if (this.env.aclo.id) {
+        this.acl_remove_row(o.id);
+    }
+
+    // add new row
+    this.acl_add_row(o, true);
+    // hide autocomplete popup
+    this.ksearch_blur();
+    // hide form
+    this.acl_popup.dialog('close');
+};
+
+// ACL table initialization
+rcube_webmail.prototype.acl_list_init = function () {
+    this.acl_list = new rcube_list_widget(this.gui_objects.acltable,
+        { multiselect: true, draggable: false, keyboard: true });
+
+    this.acl_list
+        .addEventListener('select', function (list) {
+            rcmail.enable_command('acl-delete', list.get_selection().length > 0);
+            rcmail.enable_command('acl-edit', list.get_selection().length == 1);
+            list.focus();
+        })
+        .addEventListener('dblclick', function (list) {
+            rcmail.acl_edit();
+        })
+        .addEventListener('keypress', function (list) {
+            if (list.key_pressed == list.ENTER_KEY) {
+                rcmail.command('acl-edit');
+            } else if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY) {
+                if (!rcmail.acl_form || !rcmail.acl_form.is(':visible')) {
+                    rcmail.command('acl-delete');
+                }
+            }
+        })
+        .init();
+};
+
+// Returns names of users in selected rows
+rcube_webmail.prototype.acl_get_usernames = function () {
+    var users = , n, len, id, row,
+        list = this.acl_list,
+        selection = list.get_selection();
+
+    for (n = 0, len = selection.length; n < len; n++) {
+        if ((row = list.rowsselectionn) && (id = $(row.obj).data('userid'))) {
+            users.push(id);
+        }
+    }
+
+    return users;
+};
+
+// Removes ACL table row
+rcube_webmail.prototype.acl_remove_row = function (id) {
+    var list = this.acl_list;
+
+    list.remove_row(id);
+    list.clear_selection();
+
+    // we don't need it anymore (remove id conflict)
+    $('#rcmrow' + id).remove();
+    this.env.aclid = null;
+
+    this.enable_command('acl-delete', list.get_selection().length > 0);
+    this.enable_command('acl-edit', list.get_selection().length == 1);
+};
+
+// Adds ACL table row
+rcube_webmail.prototype.acl_add_row = function (o, sel) {
+    var n, len, ids = , spec = , id = o.id, list = this.acl_list,
+        table = this.gui_objects.acltable,
+        row = $('thead > tr', table).clone();
+
+    // Update new row
+    $('th', row).map(function () {
+        var td = $('<td>'),
+            title = $(this).attr('title'),
+            cl = this.className.replace(/^acl/, '');
+
+        if (title) {
+            td.attr('title', title);
+        }
+
+        if (cl == 'user') {
+            td.addClass(cl).attr('title', o.title).append($('<a>').text(o.display));
+        } else {
+            cl = $.inArray(cl, o.acl) >= 0 ? ' enabled' : ' disabled';
+            td.addClass(this.className + cl).html('<span/>');
+        }
+
+        $(this).replaceWith(td);
+    });
+
+    row = row.attr({ id: 'rcmrow' + id, 'data-userid': o.username }).get(0);
+
+    this.env.aclid = o.acl;
+
+    // sorting... (create an array of user identifiers, then sort it)
+    for (n in this.env.acl) {
+        if (this.env.acln) {
+            if (this.env.acl_specials.length && $.inArray(n, this.env.acl_specials) >= 0) {
+                spec.push(n);
+            } else {
+                ids.push(n);
+            }
+        }
+    }
+
+    ids.sort();
+    // specials on the top
+    ids = spec.concat(ids);
+
+    // find current id
+    for (n = 0, len = ids.length; n < len; n++) {
+        if (idsn == id) {
+            break;
+        }
+    }
+
+    // add row
+    if (!$('tbody > tr', table).length) {
+        list.insert_row(row);
+    } else {
+        if (n) {
+            $('#rcmrow' + idsn - 1).after(row);
+        } else {
+            $('#rcmrow' + idsn + 1).before(row);
+        }
+        list.init_row(row);
+        list.rowcount++;
+    }
+
+    if (sel) {
+        list.select_row(o.id);
+    }
+};
+
+// Initializes and shows ACL create/edit form
+rcube_webmail.prototype.acl_init_form = function (id) {
+    var row, td, val = '', type = 'user',
+        ul = $('#rights'),
+        checkboxes = $(':checkbox', ul),
+        name_input = $('#acluser'),
+        type_list = $('#usertype');
+
+    if (!this.acl_form) {
+        var fn = function () {
+            $(this).closest('li').find('type=radio').prop('checked', true);
+        };
+        name_input.click(fn).keypress(fn);
+
+        checkboxes.on('input', function (event) {
+            if (event.target.checked) {
+                checkboxes.each(function (i, box) {
+                    if (box == event.target) {
+                        return false;
+                    }
+
+                    box.checked = true;
+                });
+            }
+        });
+    }
+
+    this.acl_form = $('#aclform');
+
+    if (id && (row = this.acl_list.rowsid)) {
+        row = row.obj;
+        checkboxes.each(function () {
+            td = $('td.' + this.id, row);
+            this.checked = td.length && td.hasClass('enabled');
+        });
+
+        if (!this.env.acl_specials.length || $.inArray(id, this.env.acl_specials) < 0) {
+            val = $(row).data('userid');
+        } else {
+            type = id;
+        }
+    } else {
+        // mark read rights by default
+        checkboxes.prop('checked', false).filter('#aclread').prop('checked', true).trigger('input');
+    }
+
+    name_input.val(val);
+    $('inputtype=radiovalue=' + type + '').prop('checked', true);
+
+    this.acl_id = id;
+
+    var buttons = {}, me = this, body = document.body;
+
+    buttonsthis.get_label('save') = function (e) {
+        me.command('acl-save');
+    };
+    buttonsthis.get_label('cancel') = function (e) {
+        me.command('acl-cancel');
+    };
+
+    // display it as popup
+    this.acl_popup = this.show_popup_dialog(
+        this.acl_form.show(),
+        id ? this.get_label('libkolab.editperms') : this.get_label('libkolab.newuser'),
+        buttons,
+        {
+            button_classes: 'mainaction submit', 'cancel',
+            modal: true,
+            closeOnEscape: true,
+            close: function (e, ui) {
+                (me.is_framed() ? parent.rcmail : me).ksearch_hide();
+                me.acl_form.appendTo(body).hide();
+                $(this).remove();
+                window.focus(); // focus iframe
+            },
+        }
+    );
+
+    if (type == 'user') {
+        name_input.focus();
+    } else {
+        $('input:checked', type_list).focus();
+    }
+};
+
 
 window.rcmail && rcmail.addEventListener('init', function(e) {
     var loading_lock;
@@ -683,4 +1069,37 @@
             }, true);
         }
     }
+
+    if (rcmail.gui_objects.acltable) {
+        rcmail.acl_list_init();
+
+        rcmail.enable_command('acl-create', 'acl-save', 'acl-cancel', true);
+        rcmail.enable_command('acl-delete', 'acl-edit', false);
+
+        // enable autocomplete on user input
+        if (rcmail.env.kolab_autocomplete) {
+            var inst = rcmail.is_framed() ? parent.rcmail : rcmail;
+            inst.init_address_input_events($('#acluser'), { action: 'settings/plugin.acl-autocomplete' });
+
+            // pass config settings and localized texts to autocomplete context
+            inst.set_env({ autocomplete_max: rcmail.env.autocomplete_max, autocomplete_min_length: rcmail.env.autocomplete_min_length });
+            inst.add_label('autocompletechars', rcmail.labels.autocompletechars);
+            inst.add_label('autocompletemore', rcmail.labels.autocompletemore);
+
+            // fix inserted value
+            inst.addEventListener('autocomplete_insert', function (e) {
+                if (e.field.id != 'acluser') {
+                    return;
+                }
+
+                e.field.value = e.insert.replace(/ ,;+$/, '');
+            });
+        }
+    }
+
+    rcmail.addEventListener('plugin.share-invitation', function(data) {
+        if (data.id in libkolab_invitations) {
+            libkolab_invitationsdata.id.list.accept_invitation(data.id, data.source);
+        }
+    });
 });

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

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

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 ComposerAutoloaderInit3c91efe068d64d9e848a2650accfff9d
 {
     private static $loader;
 
@@ -24,20 +24,20 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit47f803f8dcd4752060133e0d43733417', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit3c91efe068d64d9e848a2650accfff9d', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit47f803f8dcd4752060133e0d43733417', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit3c91efe068d64d9e848a2650accfff9d', '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\ComposerStaticInit3c91efe068d64d9e848a2650accfff9d::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit47f803f8dcd4752060133e0d43733417::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit3c91efe068d64d9e848a2650accfff9d::$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 ComposerStaticInit3c91efe068d64d9e848a2650accfff9d
 {
     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 = ComposerStaticInit3c91efe068d64d9e848a2650accfff9d::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit3c91efe068d64d9e848a2650accfff9d::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit3c91efe068d64d9e848a2650accfff9d::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit3c91efe068d64d9e848a2650accfff9d::$classMap;
 
         }, null, ClassLoader::class);
     }

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@ee9f3f74e58b.(none)> 1714138135 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@ee9f3f74e58b.(none)> 1714138135 +0000	checkout: moving from master to master
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@ee9f3f74e58b.(none)> 1714138135 +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-351c26872c454922c1f91b97e599f4369aa802b9.idx Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-351c26872c454922c1f91b97e599f4369aa802b9.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.
      */
     function getScript($scriptname)
     {
@@ -529,9 +532,9 @@
      *
      * @param string  $scriptname Name of the script.
      * @param string  $script     The script content.
-     * @param boolean $makeactive Whether to make this the active script.
+     * @param bool    $makeactive Whether to make this the active script.
      *
-     * @return boolean  True on success, PEAR_Error on failure.
+     * @return bool|PEAR_Error True on success, PEAR_Error on failure.
      */
     function installScript($scriptname, $script, $makeactive = false)
     {
@@ -552,7 +555,7 @@
      *
      * @param string $scriptname Name of the script.
      *
-     * @return boolean  True on success, PEAR_Error on failure.
+     * @return bool|PEAR_Error True on success, PEAR_Error on failure.
      */
     function removeScript($scriptname)
     {
@@ -562,10 +565,10 @@
     /**
      * Checks if the server has space to store the script by the server.
      *
-     * @param string  $scriptname The name of the script to mark as active.
-     * @param integer $size       The size of the script.
+     * @param string $scriptname The name of the script to mark as active.
+     * @param int    $size       The size of the script.
      *
-     * @return boolean|PEAR_Error  True if there is space, PEAR_Error otherwise.
+     * @return bool|PEAR_Error True if there is space, PEAR_Error otherwise.
      *
      * @todo Rename to hasSpace()
      */
@@ -586,7 +589,7 @@
     /**
      * Returns the list of extensions the server supports.
      *
-     * @return array  List of extensions or PEAR_Error on failure.
+     * @return array|PEAR_Error List of extensions or PEAR_Error on failure.
      */
     function getExtensions()
     {
@@ -602,8 +605,7 @@
      *
      * @param string $extension The extension to check.
      *
-     * @return boolean  Whether the extension is supported or PEAR_Error on
-     *                  failure.
+     * @return bool|PEAR_Error Whether the extension is supported or PEAR_Error on failure.
      */
     function hasExtension($extension)
     {
@@ -626,7 +628,7 @@
     /**
      * Returns the list of authentication methods the server supports.
      *
-     * @return array  List of authentication methods or PEAR_Error on failure.
+     * @return array|PEAR_Error List of authentication methods or PEAR_Error on failure.
      */
     function getAuthMechs()
     {
@@ -642,8 +644,7 @@
      *
      * @param string $method The method to check.
      *
-     * @return boolean  Whether the method is supported or PEAR_Error on
-     *                  failure.
+     * @return bool|PEAR_Error Whether the method is supported or PEAR_Error on failure.
      */
     function hasAuthMech($method)
     {
@@ -703,6 +704,9 @@
         case 'XOAUTH2':
             $result = $this->_authXOAUTH2($uid, $pwd, $euser);
             break;
+        case 'OAUTHBEARER':
+            $result = $this->_authOAUTHBEARER($uid, $pwd, $euser);
+            break;
         default :
             $result = $this->_pear->raiseError(
                 $method . ' is not a supported authentication method'
@@ -930,7 +934,8 @@
      * Authenticates the user using the XOAUTH2 method.
      *
      * @param string $user  The userid to authenticate as.
-     * @param string $token The token to authenticate with.
+     * @param string $token The access token prefixed by it's type
+     *                      example: "Bearer $access_token".
      * @param string $euser The effective uid to authenticate as.
      *
      * @return void
@@ -947,11 +952,35 @@
     }
 
     /**
+     * Authenticates the user using the OAUTHBEARER method.
+     *
+     * @param string $user  The userid to authenticate as.
+     * @param string $token The access token prefixed by it's type
+     *                      example: "Bearer $access_token".
+     * @param string $euser The effective uid to authenticate as.
+     *
+     * @return void
+     *
+     * @see https://www.rfc-editor.org/rfc/rfc7628.html
+     * @since 1.4.7
+     */
+    function _authOAUTHBEARER($user, $token, $euser)
+    {
+        // default to $user if $euser is not set
+        if (! $euser) {
+            $euser = $user;
+        }
+
+        $auth = base64_encode("n,a=$euser\001auth=$token\001\001");
+        return $this->_sendCmd("AUTHENTICATE \"OAUTHBEARER\" \"$auth\"");
+    }
+
+    /**
      * Removes a script from the server.
      *
      * @param string $scriptname Name of the script to delete.
      *
-     * @return boolean  True on success, PEAR_Error otherwise.
+     * @return bool|PEAR_Error True on success, PEAR_Error otherwise.
      */
     function _cmdDeleteScript($scriptname)
     {
@@ -972,7 +1001,7 @@
      *
      * @param string $scriptname Name of the script to retrieve.
      *
-     * @return string  The script if successful, PEAR_Error otherwise.
+     * @return string|PEAR_Error The script if successful, PEAR_Error otherwise.
      */
     function _cmdGetScript($scriptname)
     {
@@ -994,7 +1023,7 @@
      *
      * @param string $scriptname The name of the script to mark as active.
      *
-     * @return boolean  True on success, PEAR_Error otherwise.
+     * @return bool|PEAR_Error True on success, PEAR_Error otherwise.
      */
     function _cmdSetActive($scriptname)
     {
@@ -1028,7 +1057,7 @@
             return $res;
         }
 
-        $scripts = array();
+        $scripts = ;
         $activescript = null;
         $res = explode("\r\n", $res);
         foreach ($res as $value) {
@@ -1041,7 +1070,7 @@
             }
         }
 
-        return array($scripts, $activescript);
+        return $scripts, $activescript;
     }
 
     /**
@@ -1050,7 +1079,7 @@
      * @param string $scriptname Name of the new script.
      * @param string $scriptdata The new script.
      *
-     * @return boolean  True on success, PEAR_Error otherwise.
+     * @return bool|PEAR_Error True on success, PEAR_Error otherwise.
      */
     function _cmdPutScript($scriptname, $scriptdata)
     {
@@ -1077,10 +1106,10 @@
     /**
      * Logs out of the server and terminates the connection.
      *
-     * @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 _cmdLogout($sendLogoutCMD = true)
     {
@@ -1104,7 +1133,7 @@
     /**
      * Sends the CAPABILITY command
      *
-     * @return boolean  True on success, PEAR_Error otherwise.
+     * @return bool|PEAR_Error True on success, PEAR_Error otherwise.
      */
     function _cmdCapability()
     {
@@ -1130,7 +1159,7 @@
     function _parseCapability($data)
     {
         // Clear the cached capabilities.
-        $this->_capability = array('sasl' => array(), 'extensions' => array());
+        $this->_capability = 'sasl' => , 'extensions' => ;
 
         $data = preg_split('/\r?\n/', $this->_toUpper($data), -1, PREG_SPLIT_NO_EMPTY);
 
@@ -1223,7 +1252,7 @@
     /**
      * Receives a number of bytes from the server.
      *
-     * @param integer $length Number of bytes to read.
+     * @param int $length Number of bytes to read.
      *
      * @return string The server response.
      */
@@ -1242,8 +1271,8 @@
     /**
      * Send a command and retrieves a response from the server.
      *
-     * @param string  $cmd  The command to send.
-     * @param boolean $auth Whether this is an authentication command.
+     * @param string $cmd  The command to send.
+     * @param bool   $auth Whether this is an authentication command.
      *
      * @return string|PEAR_Error Reponse string if an OK response, PEAR_Error
      *                           if a NO response.
@@ -1348,20 +1377,28 @@
      *
      * @param string $userMethod Only consider this method as available.
      *
-     * @return string  The name of the best supported authentication method or
-     *                 a PEAR_Error object on failure.
+     * @return string The name of the best supported authentication method or
+     *                a PEAR_Error object on failure.
      */
     function _getBestAuthMethod($userMethod = null)
     {
         if (!isset($this->_capability'sasl')) {
             return $this->_pear->raiseError('This server doesn\'t support any authentication methods. SASL problem?');
         }
+
         if (!$this->_capability'sasl') {
             return $this->_pear->raiseError('This server doesn\'t support any authentication methods.');
         }
 
         if ($userMethod) {
-            if (in_array($userMethod, $this->_capability'sasl')) {
+            // special case of OAUTH, use the supported method
+            if ($userMethod === 'OAUTH') {
+                foreach ('OAUTHBEARER', 'XOAUTH2' as $method) {
+                    if (in_array($method, $this->_capability'sasl')) {
+                        return $method;
+                    }
+                }
+            } elseif (in_array($userMethod, $this->_capability'sasl')) {
                 return $userMethod;
             }
 
@@ -1386,7 +1423,7 @@
     /**
      * Starts a TLS connection.
      *
-     * @return boolean  True on success, PEAR_Error on failure.
+     * @return bool|PEAR_Error True on success, PEAR_Error on failure.
      */
     function _startTLS()
     {
@@ -1444,7 +1481,7 @@
      *
      * @param string $string A string.
      *
-     * @return integer  The length of the string.
+     * @return int The length of the string.
      */
     function _getLineLength($string)
     {
@@ -1460,7 +1497,7 @@
      *
      * @param string $string The string to convert to lowercase.
      *
-     * @return string  The lowercased string, based on ASCII encoding.
+     * @return string The lowercased string, based on ASCII encoding.
      */
     function _toUpper($string)
     {
@@ -1500,7 +1537,7 @@
     {
         if ($this->_debug) {
             if ($this->_debug_handler) {
-                call_user_func_array($this->_debug_handler, array(&$this, $message));
+                call_user_func_array($this->_debug_handler, $this, $message);
             } else {
                 echo "$message\n";
             }

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
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3717 : Squiz.Commenting.FunctionComment: fixed false positive for `InvalidNoReturn` when type is never
+- Fixed bug #3717sq-3717 : Squiz.Commenting.FunctionComment: fixed false positive for `InvalidNoReturn` when type is never
     - Thanks to Choraimy Kroonstuiver@axlon for the patch
-- Fixed bug #3720 : Generic/RequireStrictTypes : will now bow out silently in case of parse errors/live coding instead of throwing false positives/false negatives
+- Fixed bug #3720sq-3720 : Generic/RequireStrictTypes : will now bow out silently in case of parse errors/live coding instead of throwing false positives/false negatives
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3720 : Generic/RequireStrictTypes : did not handle multi-directive declare statements
+- Fixed bug #3720sq-3720 : Generic/RequireStrictTypes : did not handle multi-directive declare statements
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3722 : Potential "Uninitialized string offset 1" in octal notation backfill
+- Fixed bug #3722sq-3722 : Potential "Uninitialized string offset 1" in octal notation backfill
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3736 : PEAR/FunctionDeclaration: prevent fixer removing the close brace (and creating a parse error) when there is no space between the open brace and close brace of a function
+- Fixed bug #3736sq-3736 : PEAR/FunctionDeclaration: prevent fixer removing the close brace (and creating a parse error) when there is no space between the open brace and close brace of a function
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3739 : PEAR/FunctionDeclaration: prevent fixer conflict, and potentially creating a parse error, for unconventionally formatted return types
+- Fixed bug #3739sq-3739 : PEAR/FunctionDeclaration: prevent fixer conflict, and potentially creating a parse error, for unconventionally formatted return types
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3770 : Squiz/NonExecutableCode: prevent false positives for switching between PHP and HTML
+- Fixed bug #3770sq-3770 : Squiz/NonExecutableCode: prevent false positives for switching between PHP and HTML
     - Thanks to Dan Wallis@fredden for the patch
-- Fixed bug #3773 : Tokenizer/PHP: tokenization of the readonly keyword when used in combination with PHP 8.2 disjunctive normal types
+- Fixed bug #3773sq-3773 : Tokenizer/PHP: tokenization of the readonly keyword when used in combination with PHP 8.2 disjunctive normal types
     - Thanks to Dan Wallis@fredden and Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3776 : Generic/JSHint: error when JSHint is not available
+- Fixed bug #3776sq-3776 : Generic/JSHint: error when JSHint is not available
     - Thanks to Dan Wallis@fredden for the patch
-- Fixed bug #3777 : Squiz/NonExecutableCode: slew of bug fixes, mostly related to modern PHP
+- Fixed bug #3777sq-3777 : Squiz/NonExecutableCode: slew of bug fixes, mostly related to modern PHP
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3778 : Squiz/LowercasePHPFunctions: bug fix for class names in attributes
+- Fixed bug #3778sq-3778 : Squiz/LowercasePHPFunctions: bug fix for class names in attributes
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3779 : Generic/ForbiddenFunctions: bug fix for class names in attributes
+- Fixed bug #3779sq-3779 : Generic/ForbiddenFunctions: bug fix for class names in attributes
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3785 : Squiz.Commenting.FunctionComment: potential "Uninitialized string offset 0" when a type contains a duplicate pipe symbol
+- Fixed bug #3785sq-3785 : Squiz.Commenting.FunctionComment: potential "Uninitialized string offset 0" when a type contains a duplicate pipe symbol
     - Thanks to Dan Wallis@fredden for the patch
-- Fixed bug #3787 : PEAR/Squiz/MultiLineFunctionDeclaration: allow for PHP 8.1 new in initializers
+- Fixed bug #3787sq-3787 : `PEAR/Squiz/MultiLineFunctionDeclaration`: allow for PHP 8.1 new in initializers
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3789 : Incorrect tokenization for ternary operator with `match` inside of it
+- Fixed bug #3789sq-3789 : Incorrect tokenization for ternary operator with `match` inside of it
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3790 : PSR12/AnonClassDeclaration: prevent fixer creating parse error when there was no space before the open brace
+- Fixed bug #3790sq-3790 : PSR12/AnonClassDeclaration: prevent fixer creating parse error when there was no space before the open brace
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3797 : Tokenizer/PHP: more context sensitive keyword fixes
+- Fixed bug #3797sq-3797 : Tokenizer/PHP: more context sensitive keyword fixes
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3801 : File::getMethodParameters(): allow for readonly promoted properties without visibility
+- Fixed bug #3801sq-3801 : File::getMethodParameters(): allow for readonly promoted properties without visibility
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3805 : Generic/FunctionCallArgumentSpacing: prevent fixer conflict over PHP 7.3+ trailing comma's in function calls
+- Fixed bug #3805sq-3805 : Generic/FunctionCallArgumentSpacing: prevent fixer conflict over PHP 7.3+ trailing comma's in function calls
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3806 : Squiz.PHP.InnerFunctions sniff now correctly reports inner functions declared within a closure
+- Fixed bug #3806sq-3806 : Squiz.PHP.InnerFunctions sniff now correctly reports inner functions declared within a closure
     - Thanks to @Daimona for the patch
-- Fixed bug #3809 : GitBlame report was broken when passing a basepath
+- Fixed bug #3809sq-3809 : GitBlame report was broken when passing a basepath
     - Thanks to Chris@datengraben for the patch
-- Fixed bug #3813 : Squiz.Commenting.FunctionComment: false positive for parameter name mismatch on parameters annotated as passed by reference
+- Fixed bug #3813sq-3813 : Squiz.Commenting.FunctionComment: false positive for parameter name mismatch on parameters annotated as passed by reference
     - Thanks to Dan Wallis@fredden for the patch
-- Fixed bug #3833 : Generic.PHP.LowerCaseType: fixed potential undefined array index notice
+- Fixed bug #3833sq-3833 : Generic.PHP.LowerCaseType: fixed potential undefined array index notice
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3846 : PSR2.Classes.ClassDeclaration.CloseBraceAfterBody : fixer will no longer remove indentation on the close brace line
+- Fixed bug #3846sq-3846 : PSR2.Classes.ClassDeclaration.CloseBraceAfterBody : fixer will no longer remove indentation on the close brace line
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3854 : Fatal error when using Gitblame report in combination with `--basepath` and running from project subdirectory
+- Fixed bug #3854sq-3854 : Fatal error when using Gitblame report in combination with `--basepath` and running from project subdirectory
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3856 : PSR12.Traits.UseDeclaration was using the wrong error code - SpacingAfterAs - for spacing issues after the `use` keyword
+- Fixed bug #3856sq-3856 : PSR12.Traits.UseDeclaration was using the wrong error code - SpacingAfterAs - for spacing issues after the `use` keyword
     - These will now be reported using the SpacingAfterUse error code
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3856 : PSR12.Traits.UseDeclaration did not check spacing after `use` keyword for multi-line trait use statements
+- Fixed bug #3856sq-3856 : PSR12.Traits.UseDeclaration did not check spacing after `use` keyword for multi-line trait use statements
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3867 : Tokenizer/PHP: union type and intersection type operators were not correctly tokenized for static properties without explicit visibility
+- Fixed bug #3867sq-3867 : Tokenizer/PHP: union type and intersection type operators were not correctly tokenized for static properties without explicit visibility
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3877 : Filter names can be case-sensitive. The -h help text will now display the correct case for the available filters
+- Fixed bug #3877sq-3877 : Filter names can be case-sensitive. The -h help text will now display the correct case for the available filters
     - Thanks to @simonsan for the patch
-- Fixed bug #3893 : Generic/DocComment : the SpacingAfterTagGroup fixer could accidentally remove ignore annotations
+- Fixed bug #3893sq-3893 : Generic/DocComment : the SpacingAfterTagGroup fixer could accidentally remove ignore annotations
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3898 : Squiz/NonExecutableCode : the sniff could get confused over comments in unexpected places
+- Fixed bug #3898sq-3898 : Squiz/NonExecutableCode : the sniff could get confused over comments in unexpected places
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3904 : Squiz/FunctionSpacing : prevent potential fixer conflict
+- Fixed bug #3904sq-3904 : Squiz/FunctionSpacing : prevent potential fixer conflict
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3906 : Tokenizer/CSS: bug fix related to the unsupported slash comment syntax
+- Fixed bug #3906sq-3906 : Tokenizer/CSS: bug fix related to the unsupported slash comment syntax
     - Thanks to Dan Wallis@fredden for the patch
-- Fixed bug #3913 : Config did not always correctly store unknown "long" arguments in the `$unknown` property
+- Fixed bug #3913sq-3913 : Config did not always correctly store unknown "long" arguments in the `$unknown` property
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
 Thanks go to Dan Wallis@fredden and Danny van der Sluijs@DannyvdSluijs for reviewing quite a few of the PRs for this release.
 Additionally, thanks to Alexander Turek@derrabus for consulting on the repo change over.
 
-#2857: https://github.com/squizlabs/PHP_CodeSniffer/issues/2857
-#3386: https://github.com/squizlabs/PHP_CodeSniffer/issues/3386
-#3557: https://github.com/squizlabs/PHP_CodeSniffer/issues/3557
-#3592: https://github.com/squizlabs/PHP_CodeSniffer/issues/3592
-#3715: https://github.com/squizlabs/PHP_CodeSniffer/pull/3715
-#3717: https://github.com/squizlabs/PHP_CodeSniffer/pull/3717
-#3720: https://github.com/squizlabs/PHP_CodeSniffer/pull/3720
-#3722: https://github.com/squizlabs/PHP_CodeSniffer/pull/3722
-#3736: https://github.com/squizlabs/PHP_CodeSniffer/issues/3736
-#3739: https://github.com/squizlabs/PHP_CodeSniffer/pull/3739
-#3770: https://github.com/squizlabs/PHP_CodeSniffer/pull/3770
-#3773: https://github.com/squizlabs/PHP_CodeSniffer/pull/3773
-#3776: https://github.com/squizlabs/PHP_CodeSniffer/pull/3776
-#3777: https://github.com/squizlabs/PHP_CodeSniffer/pull/3777
-#3778: https://github.com/squizlabs/PHP_CodeSniffer/issues/3778
-#3779: https://github.com/squizlabs/PHP_CodeSniffer/pull/3779
-#3785: https://github.com/squizlabs/PHP_CodeSniffer/pull/3785
-#3787: https://github.com/squizlabs/PHP_CodeSniffer/pull/3787
-#3789: https://github.com/squizlabs/PHP_CodeSniffer/issues/3789
-#3790: https://github.com/squizlabs/PHP_CodeSniffer/issues/3790
-#3797: https://github.com/squizlabs/PHP_CodeSniffer/pull/3797
-#3801: https://github.com/squizlabs/PHP_CodeSniffer/pull/3801
-#3805: https://github.com/squizlabs/PHP_CodeSniffer/pull/3805
-#3806: https://github.com/squizlabs/PHP_CodeSniffer/issues/3806
-#3809: https://github.com/squizlabs/PHP_CodeSniffer/pull/3809
-#3813: https://github.com/squizlabs/PHP_CodeSniffer/pull/3813
-#3833: https://github.com/squizlabs/PHP_CodeSniffer/pull/3833
-#3846: https://github.com/squizlabs/PHP_CodeSniffer/pull/3846
-#3854: https://github.com/squizlabs/PHP_CodeSniffer/issues/3854
-#3856: https://github.com/squizlabs/PHP_CodeSniffer/pull/3856
-#3867: https://github.com/squizlabs/PHP_CodeSniffer/pull/3867
-#3877: https://github.com/squizlabs/PHP_CodeSniffer/issues/3877
-#3893: https://github.com/squizlabs/PHP_CodeSniffer/pull/3893
-#3898: https://github.com/squizlabs/PHP_CodeSniffer/pull/3898
-#3904: https://github.com/squizlabs/PHP_CodeSniffer/issues/3904
-#3906: https://github.com/squizlabs/PHP_CodeSniffer/pull/3906
-#3913: https://github.com/squizlabs/PHP_CodeSniffer/pull/3913
+sq-2857: https://github.com/squizlabs/PHP_CodeSniffer/issues/2857
+sq-3386: https://github.com/squizlabs/PHP_CodeSniffer/issues/3386
+sq-3557: https://github.com/squizlabs/PHP_CodeSniffer/issues/3557
+sq-3592: https://github.com/squizlabs/PHP_CodeSniffer/issues/3592
+sq-3715: https://github.com/squizlabs/PHP_CodeSniffer/pull/3715
+sq-3717: https://github.com/squizlabs/PHP_CodeSniffer/pull/3717
+sq-3720: https://github.com/squizlabs/PHP_CodeSniffer/pull/3720
+sq-3722: https://github.com/squizlabs/PHP_CodeSniffer/pull/3722
+sq-3736: https://github.com/squizlabs/PHP_CodeSniffer/issues/3736
+sq-3739: https://github.com/squizlabs/PHP_CodeSniffer/pull/3739
+sq-3770: https://github.com/squizlabs/PHP_CodeSniffer/pull/3770
+sq-3773: https://github.com/squizlabs/PHP_CodeSniffer/pull/3773
+sq-3776: https://github.com/squizlabs/PHP_CodeSniffer/pull/3776
+sq-3777: https://github.com/squizlabs/PHP_CodeSniffer/pull/3777
+sq-3778: https://github.com/squizlabs/PHP_CodeSniffer/issues/3778
+sq-3779: https://github.com/squizlabs/PHP_CodeSniffer/pull/3779
+sq-3785: https://github.com/squizlabs/PHP_CodeSniffer/pull/3785
+sq-3787: https://github.com/squizlabs/PHP_CodeSniffer/pull/3787
+sq-3789: https://github.com/squizlabs/PHP_CodeSniffer/issues/3789
+sq-3790: https://github.com/squizlabs/PHP_CodeSniffer/issues/3790
+sq-3797: https://github.com/squizlabs/PHP_CodeSniffer/pull/3797
+sq-3801: https://github.com/squizlabs/PHP_CodeSniffer/pull/3801
+sq-3805: https://github.com/squizlabs/PHP_CodeSniffer/pull/3805
+sq-3806: https://github.com/squizlabs/PHP_CodeSniffer/issues/3806
+sq-3809: https://github.com/squizlabs/PHP_CodeSniffer/pull/3809
+sq-3813: https://github.com/squizlabs/PHP_CodeSniffer/pull/3813
+sq-3833: https://github.com/squizlabs/PHP_CodeSniffer/pull/3833
+sq-3846: https://github.com/squizlabs/PHP_CodeSniffer/pull/3846
+sq-3854: https://github.com/squizlabs/PHP_CodeSniffer/issues/3854
+sq-3856: https://github.com/squizlabs/PHP_CodeSniffer/pull/3856
+sq-3867: https://github.com/squizlabs/PHP_CodeSniffer/pull/3867
+sq-3877: https://github.com/squizlabs/PHP_CodeSniffer/issues/3877
+sq-3893: https://github.com/squizlabs/PHP_CodeSniffer/pull/3893
+sq-3898: https://github.com/squizlabs/PHP_CodeSniffer/pull/3898
+sq-3904: https://github.com/squizlabs/PHP_CodeSniffer/issues/3904
+sq-3906: https://github.com/squizlabs/PHP_CodeSniffer/pull/3906
+sq-3913: https://github.com/squizlabs/PHP_CodeSniffer/pull/3913
 
 ## 3.7.2 - 2023-02-23
+
 ### Changed
 - Newer versions of Composer will now suggest installing PHPCS using require-dev instead of require
     - Thanks to Gary Jones@GaryJones for the patch
@@ -436,48 +532,50 @@
 - Squiz.Formatting.OperatorBracket no longer reports false positives in match() structures
 
 ### Fixed
-- Fixed bug #3616 : Squiz.PHP.DisallowComparisonAssignment false positive for PHP 8 match expression
+- Fixed bug #3616sq-3616 : Squiz.PHP.DisallowComparisonAssignment false positive for PHP 8 match expression
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3618 : Generic.WhiteSpace.ArbitraryParenthesesSpacing false positive for return new parent()
+- Fixed bug #3618sq-3618 : Generic.WhiteSpace.ArbitraryParenthesesSpacing false positive for return new parent()
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3632 : Short list not tokenized correctly in control structures without braces
+- Fixed bug #3632sq-3632 : Short list not tokenized correctly in control structures without braces
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3639 : Tokenizer not applying tab replacement to heredoc/nowdoc closers
+- Fixed bug #3639sq-3639 : Tokenizer not applying tab replacement to heredoc/nowdoc closers
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3640 : Generic.WhiteSpace.DisallowTabIndent not reporting errors for PHP 7.3 flexible heredoc/nowdoc syntax
+- Fixed bug #3640sq-3640 : Generic.WhiteSpace.DisallowTabIndent not reporting errors for PHP 7.3 flexible heredoc/nowdoc syntax
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3645 : PHPCS can show 0 exit code when running in parallel even if child process has fatal error
+- Fixed bug #3645sq-3645 : PHPCS can show 0 exit code when running in parallel even if child process has fatal error
     - Thanks to Alex Panshin@enl for the patch
-- Fixed bug #3653 : False positives for match() in OperatorSpacingSniff
+- Fixed bug #3653sq-3653 : False positives for match() in OperatorSpacingSniff
     - Thanks to Jaroslav Hanslík@kukulich for the patch
-- Fixed bug #3666 : PEAR.Functions.FunctionCallSignature incorrect indent fix when checking mixed HTML/PHP files
-- Fixed bug #3668 : PSR12.Classes.ClassInstantiation.MissingParentheses false positive when instantiating parent classes
+- Fixed bug #3666sq-3666 : PEAR.Functions.FunctionCallSignature incorrect indent fix when checking mixed HTML/PHP files
+- Fixed bug #3668sq-3668 : PSR12.Classes.ClassInstantiation.MissingParentheses false positive when instantiating parent classes
     - Similar issues also fixed in Generic.Functions.FunctionCallArgumentSpacing and Squiz.Formatting.OperatorBracket
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3672 : Incorrect ScopeIndent.IncorrectExact report for match inside array literal
-- Fixed bug #3694 : Generic.WhiteSpace.SpreadOperatorSpacingAfter does not ignore spread operator in PHP 8.1 first class   callables
+- Fixed bug #3672sq-3672 : Incorrect ScopeIndent.IncorrectExact report for match inside array literal
+- Fixed bug #3694sq-3694 : Generic.WhiteSpace.SpreadOperatorSpacingAfter does not ignore spread operator in PHP 8.1 first class   callables
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
-#3616: https://github.com/squizlabs/PHP_CodeSniffer/issues/3616
-#3618: https://github.com/squizlabs/PHP_CodeSniffer/issues/3618
-#3632: https://github.com/squizlabs/PHP_CodeSniffer/pull/3632
-#3639: https://github.com/squizlabs/PHP_CodeSniffer/pull/3639
-#3640: https://github.com/squizlabs/PHP_CodeSniffer/pull/3640
-#3645: https://github.com/squizlabs/PHP_CodeSniffer/pull/3645
-#3653: https://github.com/squizlabs/PHP_CodeSniffer/pull/3653
-#3666: https://github.com/squizlabs/PHP_CodeSniffer/issues/3666
-#3668: https://github.com/squizlabs/PHP_CodeSniffer/issues/3668
-#3672: https://github.com/squizlabs/PHP_CodeSniffer/issues/3672
-#3694: https://github.com/squizlabs/PHP_CodeSniffer/pull/3694 
+sq-3616: https://github.com/squizlabs/PHP_CodeSniffer/issues/3616
+sq-3618: https://github.com/squizlabs/PHP_CodeSniffer/issues/3618
+sq-3632: https://github.com/squizlabs/PHP_CodeSniffer/pull/3632
+sq-3639: https://github.com/squizlabs/PHP_CodeSniffer/pull/3639
+sq-3640: https://github.com/squizlabs/PHP_CodeSniffer/pull/3640
+sq-3645: https://github.com/squizlabs/PHP_CodeSniffer/pull/3645
+sq-3653: https://github.com/squizlabs/PHP_CodeSniffer/pull/3653
+sq-3666: https://github.com/squizlabs/PHP_CodeSniffer/issues/3666
+sq-3668: https://github.com/squizlabs/PHP_CodeSniffer/issues/3668
+sq-3672: https://github.com/squizlabs/PHP_CodeSniffer/issues/3672
+sq-3694: https://github.com/squizlabs/PHP_CodeSniffer/pull/3694
 
 ## 3.7.1 - 2022-06-18
+
 ### Fixed
-- Fixed bug #3609 : Methods/constants with name empty/isset/unset are always reported as error
+- Fixed bug #3609sq-3609 : Methods/constants with name empty/isset/unset are always reported as error
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
-#3609: https://github.com/squizlabs/PHP_CodeSniffer/issues/3609
+sq-3609: https://github.com/squizlabs/PHP_CodeSniffer/issues/3609
 
 ## 3.7.0 - 2022-06-13
+
 ### Added
 - Added support for PHP 8.1 explicit octal notation
     - This new syntax has been backfilled for PHP versions less than 8.1
@@ -521,74 +619,76 @@
     - Thanks to Jaroslav Hanslík@kukulich for the patch
 
 ### Fixed
-- Fixed bug #3502 : A match statement within an array produces Squiz.Arrays.ArrayDeclaration.NoKeySpecified
-- Fixed bug #3503 : Squiz.Commenting.FunctionComment.ThrowsNoFullStop false positive when one line @throw
-- Fixed bug #3505 : The nullsafe operator is not counted in Generic.Metrics.CyclomaticComplexity
+- Fixed bug #3502sq-3502 : A match statement within an array produces Squiz.Arrays.ArrayDeclaration.NoKeySpecified
+- Fixed bug #3503sq-3503 : Squiz.Commenting.FunctionComment.ThrowsNoFullStop false positive when one line @throw
+- Fixed bug #3505sq-3505 : The nullsafe operator is not counted in Generic.Metrics.CyclomaticComplexity
     - Thanks to Mark Baker@MarkBaker for the patch
-- Fixed bug #3526 : PSR12.Properties.ConstantVisibility false positive when using public final const syntax
+- Fixed bug #3526sq-3526 : PSR12.Properties.ConstantVisibility false positive when using public final const syntax
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3530 : Line indented incorrectly false positive when using match-expression inside switch case
-- Fixed bug #3534 : Name of typed enum tokenized as T_GOTO_LABEL
+- Fixed bug #3530sq-3530 : Line indented incorrectly false positive when using match-expression inside switch case
+- Fixed bug #3534sq-3534 : Name of typed enum tokenized as T_GOTO_LABEL
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3546 : Tokenizer/PHP: bug fix - parent/static keywords in class instantiations
+- Fixed bug #3546sq-3546 : Tokenizer/PHP: bug fix - parent/static keywords in class instantiations
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3550 : False positive from PSR2.ControlStructures.SwitchDeclaration.TerminatingComment when using trailing   comment
+- Fixed bug #3550sq-3550 : False positive from PSR2.ControlStructures.SwitchDeclaration.TerminatingComment when using trailing   comment
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3575: Squiz.Scope.MethodScope misses visibility keyword on previous line
+- Fixed bug #3575sq-3575 :  Squiz.Scope.MethodScope misses visibility keyword on previous line
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3604: Tokenizer/PHP: bug fix for double quoted strings using ${
+- Fixed bug #3604sq-3604 :  Tokenizer/PHP: bug fix for double quoted strings using ${
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
-#3502: https://github.com/squizlabs/PHP_CodeSniffer/issues/3502
-#3503: https://github.com/squizlabs/PHP_CodeSniffer/issues/3503
-#3505: https://github.com/squizlabs/PHP_CodeSniffer/issues/3505
-#3526: https://github.com/squizlabs/PHP_CodeSniffer/issues/3526
-#3530: https://github.com/squizlabs/PHP_CodeSniffer/issues/3530
-#3534: https://github.com/squizlabs/PHP_CodeSniffer/pull/3534
-#3546: https://github.com/squizlabs/PHP_CodeSniffer/pull/3546
-#3550: https://github.com/squizlabs/PHP_CodeSniffer/issues/3550
-#3575: https://github.com/squizlabs/PHP_CodeSniffer/pull/3575
-#3604: https://github.com/squizlabs/PHP_CodeSniffer/pull/3604
+sq-3502: https://github.com/squizlabs/PHP_CodeSniffer/issues/3502
+sq-3503: https://github.com/squizlabs/PHP_CodeSniffer/issues/3503
+sq-3505: https://github.com/squizlabs/PHP_CodeSniffer/issues/3505
+sq-3526: https://github.com/squizlabs/PHP_CodeSniffer/issues/3526
+sq-3530: https://github.com/squizlabs/PHP_CodeSniffer/issues/3530
+sq-3534: https://github.com/squizlabs/PHP_CodeSniffer/pull/3534
+sq-3546: https://github.com/squizlabs/PHP_CodeSniffer/pull/3546
+sq-3550: https://github.com/squizlabs/PHP_CodeSniffer/issues/3550
+sq-3575: https://github.com/squizlabs/PHP_CodeSniffer/pull/3575
+sq-3604: https://github.com/squizlabs/PHP_CodeSniffer/pull/3604
 
 ## 3.6.2 - 2021-12-13
+
 ### Changed
 - Processing large code bases that use tab indenting inside comments and strings will now be faster
     - Thanks to Thiemo Kreuz@thiemowmde for the patch
 
 ### Fixed
-- Fixed bug #3388 : phpcs does not work when run from WSL drives
+- Fixed bug #3388sq-3388 : phpcs does not work when run from WSL drives
     - Thanks to Juliette Reinders Folmer@jrfnl and Graham Wharton@gwharton for the patch
-- Fixed bug #3422 : Squiz.WhiteSpace.ScopeClosingBrace fixer removes HTML content when fixing closing brace alignment
+- Fixed bug #3422sq-3422 : Squiz.WhiteSpace.ScopeClosingBrace fixer removes HTML content when fixing closing brace alignment
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3437 : PSR12 does not forbid blank lines at the start of the class body
+- Fixed bug #3437sq-3437 : PSR12 does not forbid blank lines at the start of the class body
     - Added new PSR12.Classes.OpeningBraceSpace sniff to enforce this
-- Fixed bug #3440 : Squiz.WhiteSpace.MemberVarSpacing false positives when attributes used without docblock
+- Fixed bug #3440sq-3440 : Squiz.WhiteSpace.MemberVarSpacing false positives when attributes used without docblock
     - Thanks to Vadim Borodavko@javer for the patch
-- Fixed bug #3448 : PHP 8.1 deprecation notice while generating running time value
+- Fixed bug #3448sq-3448 : PHP 8.1 deprecation notice while generating running time value
     - Thanks to Juliette Reinders Folmer@jrfnl and Andy Postnikov@andypost for the patch
-- Fixed bug #3456 : PSR12.Classes.ClassInstantiation.MissingParentheses false positive using attributes on anonymous class
+- Fixed bug #3456sq-3456 : PSR12.Classes.ClassInstantiation.MissingParentheses false positive using attributes on anonymous class
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3460 : Generic.Formatting.MultipleStatementAlignment false positive on closure with parameters
+- Fixed bug #3460sq-3460 : Generic.Formatting.MultipleStatementAlignment false positive on closure with parameters
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3468 : do/while loops are double-counted in Generic.Metrics.CyclomaticComplexity
+- Fixed bug #3468sq-3468 : do/while loops are double-counted in Generic.Metrics.CyclomaticComplexity
     - Thanks to Mark Baker@MarkBaker for the patch
-- Fixed bug #3469 : Ternary Operator and Null Coalescing Operator are not counted in Generic.Metrics.CyclomaticComplexity
+- Fixed bug #3469sq-3469 : Ternary Operator and Null Coalescing Operator are not counted in Generic.Metrics.CyclomaticComplexity
     - Thanks to Mark Baker@MarkBaker for the patch
-- Fixed bug #3472 : PHP 8 match() expression is not counted in Generic.Metrics.CyclomaticComplexity
+- Fixed bug #3472sq-3472 : PHP 8 match() expression is not counted in Generic.Metrics.CyclomaticComplexity
     - Thanks to Mark Baker@MarkBaker for the patch
 
-#3388: https://github.com/squizlabs/PHP_CodeSniffer/issues/3388
-#3422: https://github.com/squizlabs/PHP_CodeSniffer/issues/3422
-#3437: https://github.com/squizlabs/PHP_CodeSniffer/issues/3437
-#3440: https://github.com/squizlabs/PHP_CodeSniffer/pull/3440
-#3448: https://github.com/squizlabs/PHP_CodeSniffer/issues/3448
-#3456: https://github.com/squizlabs/PHP_CodeSniffer/issues/3456
-#3460: https://github.com/squizlabs/PHP_CodeSniffer/issues/3460
-#3468: https://github.com/squizlabs/PHP_CodeSniffer/issues/3468
-#3469: https://github.com/squizlabs/PHP_CodeSniffer/issues/3469
-#3472: https://github.com/squizlabs/PHP_CodeSniffer/issues/3472
+sq-3388: https://github.com/squizlabs/PHP_CodeSniffer/issues/3388
+sq-3422: https://github.com/squizlabs/PHP_CodeSniffer/issues/3422
+sq-3437: https://github.com/squizlabs/PHP_CodeSniffer/issues/3437
+sq-3440: https://github.com/squizlabs/PHP_CodeSniffer/pull/3440
+sq-3448: https://github.com/squizlabs/PHP_CodeSniffer/issues/3448
+sq-3456: https://github.com/squizlabs/PHP_CodeSniffer/issues/3456
+sq-3460: https://github.com/squizlabs/PHP_CodeSniffer/issues/3460
+sq-3468: https://github.com/squizlabs/PHP_CodeSniffer/issues/3468
+sq-3469: https://github.com/squizlabs/PHP_CodeSniffer/issues/3469
+sq-3472: https://github.com/squizlabs/PHP_CodeSniffer/issues/3472
 
 ## 3.6.1 - 2021-10-11
+
 ### Changed
 - PHPCS annotations can now be specified using hash-style comments
     - Previously, only slash-style and block-style comments could be used to do things like disable errors
@@ -626,69 +726,70 @@
     - Squiz.Commenting.VariableComment
     - Squiz.WhiteSpace.MemberVarSpacing
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3294 : Bug in attribute tokenization when content contains PHP end token or attribute closer on new line
+- Fixed bug #3294sq-3294 : Bug in attribute tokenization when content contains PHP end token or attribute closer on new line
     - Thanks to Alessandro Chitolina@alekitto for the patch
     - Thanks to Juliette Reinders Folmer@jrfnl for the tests
-- Fixed bug #3296 : PSR2.ControlStructures.SwitchDeclaration takes phpcs:ignore as content of case body
-- Fixed bug #3297 : PSR2.ControlStructures.SwitchDeclaration.TerminatingComment does not handle try/finally blocks
+- Fixed bug #3296sq-3296 : PSR2.ControlStructures.SwitchDeclaration takes phpcs:ignore as content of case body
+- Fixed bug #3297sq-3297 : PSR2.ControlStructures.SwitchDeclaration.TerminatingComment does not handle try/finally blocks
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3302 : PHP 8.0 | Tokenizer/PHP: bugfix for union types using namespace operator
+- Fixed bug #3302sq-3302 : PHP 8.0 | Tokenizer/PHP: bugfix for union types using namespace operator
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3303 : findStartOfStatement() doesn't work with T_OPEN_TAG_WITH_ECHO
-- Fixed bug #3316 : Arrow function not tokenized correctly when using null in union type
-- Fixed bug #3317 : Problem with how phpcs handles ignored files when running in parallel
+- Fixed bug #3303sq-3303 : findStartOfStatement() doesn't work with T_OPEN_TAG_WITH_ECHO
+- Fixed bug #3316sq-3316 : Arrow function not tokenized correctly when using null in union type
+- Fixed bug #3317sq-3317 : Problem with how phpcs handles ignored files when running in parallel
     - Thanks to Emil Andersson@emil-nasso for the patch
-- Fixed bug #3324 : PHPCS hangs processing some nested arrow functions inside a function call
-- Fixed bug #3326 : Generic.Formatting.MultipleStatementAlignment error with const DEFAULT
+- Fixed bug #3324sq-3324 : PHPCS hangs processing some nested arrow functions inside a function call
+- Fixed bug #3326sq-3326 : Generic.Formatting.MultipleStatementAlignment error with const DEFAULT
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3333 : Squiz.Objects.ObjectInstantiation: null coalesce operators are not recognized as assignment
+- Fixed bug #3333sq-3333 : Squiz.Objects.ObjectInstantiation: null coalesce operators are not recognized as assignment
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3340 : Ensure interface and trait names are always tokenized as T_STRING
+- Fixed bug #3340sq-3340 : Ensure interface and trait names are always tokenized as T_STRING
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3342 : PSR12/Squiz/PEAR standards all error on promoted properties with docblocks
+- Fixed bug #3342sq-3342 : PSR12/Squiz/PEAR standards all error on promoted properties with docblocks
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3345 : IF statement with no braces and double catch turned into syntax error by auto-fixer
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3352 : PSR2.ControlStructures.SwitchDeclaration can remove comments on the same line as the case statement while fixing
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3357 : Generic.Functions.OpeningFunctionBraceBsdAllman removes return type when additional lines are present
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3362 : Generic.WhiteSpace.ScopeIndent false positive for arrow functions inside arrays
-- Fixed bug #3384 : Squiz.Commenting.FileComment.SpacingAfterComment false positive on empty file
-- Fixed bug #3394 : Fix PHP 8.1 auto_detect_line_endings deprecation notice
-- Fixed bug #3400 : PHP 8.1: prevent deprecation notices about missing return types
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3424 : PHPCS fails when using PHP 8 Constructor property promotion with attributes
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3425 : PHP 8.1 | Runner::processChildProcs(): fix passing null to non-nullable bug
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3445 : Nullable parameter after attribute incorrectly tokenized as ternary operator
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-
-#3294: https://github.com/squizlabs/PHP_CodeSniffer/issues/3294
-#3296: https://github.com/squizlabs/PHP_CodeSniffer/issues/3296
-#3297: https://github.com/squizlabs/PHP_CodeSniffer/issues/3297
-#3302: https://github.com/squizlabs/PHP_CodeSniffer/pull/3302
-#3303: https://github.com/squizlabs/PHP_CodeSniffer/issues/3303
-#3316: https://github.com/squizlabs/PHP_CodeSniffer/issues/3316
-#3317: https://github.com/squizlabs/PHP_CodeSniffer/issues/3317
-#3324: https://github.com/squizlabs/PHP_CodeSniffer/issues/3324
-#3326: https://github.com/squizlabs/PHP_CodeSniffer/issues/3326
-#3333: https://github.com/squizlabs/PHP_CodeSniffer/issues/3333
-#3340: https://github.com/squizlabs/PHP_CodeSniffer/pull/3340
-#3342: https://github.com/squizlabs/PHP_CodeSniffer/issues/3342
-#3345: https://github.com/squizlabs/PHP_CodeSniffer/issues/3345
-#3352: https://github.com/squizlabs/PHP_CodeSniffer/issues/3352
-#3357: https://github.com/squizlabs/PHP_CodeSniffer/issues/3357
-#3362: https://github.com/squizlabs/PHP_CodeSniffer/issues/3362
-#3384: https://github.com/squizlabs/PHP_CodeSniffer/issues/3384
-#3394: https://github.com/squizlabs/PHP_CodeSniffer/pull/3394
-#3400: https://github.com/squizlabs/PHP_CodeSniffer/pull/3400
-#3424: https://github.com/squizlabs/PHP_CodeSniffer/issues/3424
-#3425: https://github.com/squizlabs/PHP_CodeSniffer/pull/3425
-#3445: https://github.com/squizlabs/PHP_CodeSniffer/issues/3445
+- Fixed bug #3345sq-3345 : IF statement with no braces and double catch turned into syntax error by auto-fixer
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3352sq-3352 : PSR2.ControlStructures.SwitchDeclaration can remove comments on the same line as the case statement while fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3357sq-3357 : Generic.Functions.OpeningFunctionBraceBsdAllman removes return type when additional lines are present
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3362sq-3362 : Generic.WhiteSpace.ScopeIndent false positive for arrow functions inside arrays
+- Fixed bug #3384sq-3384 : Squiz.Commenting.FileComment.SpacingAfterComment false positive on empty file
+- Fixed bug #3394sq-3394 : Fix PHP 8.1 auto_detect_line_endings deprecation notice
+- Fixed bug #3400sq-3400 : PHP 8.1: prevent deprecation notices about missing return types
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3424sq-3424 : PHPCS fails when using PHP 8 Constructor property promotion with attributes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3425sq-3425 : PHP 8.1 | Runner::processChildProcs(): fix passing null to non-nullable bug
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3445sq-3445 : Nullable parameter after attribute incorrectly tokenized as ternary operator
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+sq-3294: https://github.com/squizlabs/PHP_CodeSniffer/issues/3294
+sq-3296: https://github.com/squizlabs/PHP_CodeSniffer/issues/3296
+sq-3297: https://github.com/squizlabs/PHP_CodeSniffer/issues/3297
+sq-3302: https://github.com/squizlabs/PHP_CodeSniffer/pull/3302
+sq-3303: https://github.com/squizlabs/PHP_CodeSniffer/issues/3303
+sq-3316: https://github.com/squizlabs/PHP_CodeSniffer/issues/3316
+sq-3317: https://github.com/squizlabs/PHP_CodeSniffer/issues/3317
+sq-3324: https://github.com/squizlabs/PHP_CodeSniffer/issues/3324
+sq-3326: https://github.com/squizlabs/PHP_CodeSniffer/issues/3326
+sq-3333: https://github.com/squizlabs/PHP_CodeSniffer/issues/3333
+sq-3340: https://github.com/squizlabs/PHP_CodeSniffer/pull/3340
+sq-3342: https://github.com/squizlabs/PHP_CodeSniffer/issues/3342
+sq-3345: https://github.com/squizlabs/PHP_CodeSniffer/issues/3345
+sq-3352: https://github.com/squizlabs/PHP_CodeSniffer/issues/3352
+sq-3357: https://github.com/squizlabs/PHP_CodeSniffer/issues/3357
+sq-3362: https://github.com/squizlabs/PHP_CodeSniffer/issues/3362
+sq-3384: https://github.com/squizlabs/PHP_CodeSniffer/issues/3384
+sq-3394: https://github.com/squizlabs/PHP_CodeSniffer/pull/3394
+sq-3400: https://github.com/squizlabs/PHP_CodeSniffer/pull/3400
+sq-3424: https://github.com/squizlabs/PHP_CodeSniffer/issues/3424
+sq-3425: https://github.com/squizlabs/PHP_CodeSniffer/pull/3425
+sq-3445: https://github.com/squizlabs/PHP_CodeSniffer/issues/3445
 
 ## 3.6.0 - 2021-04-09
+
 ### Added
 - Added support for PHP 8.0 union types
     - A new T_TYPE_UNION token is available to represent the pipe character
@@ -784,7 +885,7 @@
     - The default remains at "private", so all methods are checked
     - Thanks to Vincent Langlet@VincentLanglet for the patch
 - PEAR.Commenting.FunctionComment and Squiz.Commenting.FunctionComment sniffs can now ignore return tags in any method
-    - Previously, only __construct and __destruct were ignored
+    - Previously, only `__construct()` and `__destruct()` were ignored
     - Set the list of method names to ignore in the "specialMethods" sniff property
     - The default remains at "__construct" and "__destruct" only
     - Thanks to Vincent Langlet@VincentLanglet for the patch
@@ -814,61 +915,63 @@
     - Sniff no longer errors for assignments on first line of closure
     - Sniff no longer errors for assignments after a goto label
     - Thanks to Jaroslav Hanslík@kukulich for the patch
-- Fixed bug #2913 : Generic.WhiteSpace.ScopeIndent false positive when opening and closing tag on same line inside conditional
-- Fixed bug #2992 : Enabling caching using a ruleset produces invalid cache files when using --sniffs and --exclude CLI args
-- Fixed bug #3003 : Squiz.Formatting.OperatorBracket autofix incorrect when assignment used with null coalescing operator
-- Fixed bug #3145 : Autoloading of sniff fails when multiple classes declared in same file
-- Fixed bug #3157 : PSR2.ControlStructures.SwitchDeclaration.BreakIndent false positive when case keyword is not indented
-- Fixed bug #3163 : Undefined index error with pre-commit hook using husky on PHP 7.4
+- Fixed bug #2913sq-2913 : Generic.WhiteSpace.ScopeIndent false positive when opening and closing tag on same line inside conditional
+- Fixed bug #2992sq-2992 : Enabling caching using a ruleset produces invalid cache files when using --sniffs and --exclude CLI args
+- Fixed bug #3003sq-3003 : Squiz.Formatting.OperatorBracket autofix incorrect when assignment used with null coalescing operator
+- Fixed bug #3145sq-3145 : Autoloading of sniff fails when multiple classes declared in same file
+- Fixed bug #3157sq-3157 : PSR2.ControlStructures.SwitchDeclaration.BreakIndent false positive when case keyword is not indented
+- Fixed bug #3163sq-3163 : Undefined index error with pre-commit hook using husky on PHP 7.4
     - Thanks to Ismo Vuorinen@ivuorinen for the patch
-- Fixed bug #3165 : Squiz.PHP.DisallowComparisonAssignment false positive when comparison inside closure
-- Fixed bug #3167 : Generic.WhiteSpace.ScopeIndent false positive when using PHP 8.0 constructor property promotion
-- Fixed bug #3170 : Squiz.WhiteSpace.OperatorSpacing false positive when using negation with string concat
+- Fixed bug #3165sq-3165 : Squiz.PHP.DisallowComparisonAssignment false positive when comparison inside closure
+- Fixed bug #3167sq-3167 : Generic.WhiteSpace.ScopeIndent false positive when using PHP 8.0 constructor property promotion
+- Fixed bug #3170sq-3170 : Squiz.WhiteSpace.OperatorSpacing false positive when using negation with string concat
     - This also fixes the same issue in the PSR12.Operators.OperatorSpacing sniff
-- Fixed bug #3177 : Incorrect tokenization of GOTO statements in mixed PHP/HTML files
+- Fixed bug #3177sq-3177 : Incorrect tokenization of GOTO statements in mixed PHP/HTML files
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3184 : PSR2.Namespace.NamespaceDeclaration false positive on namespace operator
+- Fixed bug #3184sq-3184 : PSR2.Namespace.NamespaceDeclaration false positive on namespace operator
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3188 : Squiz.WhiteSpace.ScopeKeywordSpacing false positive for static return type
+- Fixed bug #3188sq-3188 : Squiz.WhiteSpace.ScopeKeywordSpacing false positive for static return type
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3192 : findStartOfStatement doesn't work correctly inside switch
+- Fixed bug #3192sq-3192 : findStartOfStatement doesn't work correctly inside switch
     - Thanks to Vincent Langlet@VincentLanglet for the patch
-- Fixed bug #3195 : Generic.WhiteSpace.ScopeIndent confusing message when combination of tabs and spaces found
-- Fixed bug #3197 : Squiz.NamingConventions.ValidVariableName does not use correct error code for all member vars
-- Fixed bug #3219 : Generic.Formatting.MultipleStatementAlignment false positive for empty anonymous classes and closures
-- Fixed bug #3258 : Squiz.Formatting.OperatorBracket duplicate error messages for unary minus
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3273 : Squiz.Functions.FunctionDeclarationArgumentSpacing reports line break as 0 spaces between parenthesis
-- Fixed bug #3277 : Nullable static return typehint causes whitespace error
-- Fixed bug #3284 : Unused parameter false positive when using array index in arrow function
-
-#2913: https://github.com/squizlabs/PHP_CodeSniffer/issues/2913
-#2992: https://github.com/squizlabs/PHP_CodeSniffer/issues/2992
-#3003: https://github.com/squizlabs/PHP_CodeSniffer/issues/3003
-#3145: https://github.com/squizlabs/PHP_CodeSniffer/issues/3145
-#3157: https://github.com/squizlabs/PHP_CodeSniffer/issues/3157
-#3163: https://github.com/squizlabs/PHP_CodeSniffer/pull/3163
-#3165: https://github.com/squizlabs/PHP_CodeSniffer/issues/3165
-#3167: https://github.com/squizlabs/PHP_CodeSniffer/issues/3167
-#3170: https://github.com/squizlabs/PHP_CodeSniffer/pull/3170
-#3177: https://github.com/squizlabs/PHP_CodeSniffer/pull/3177
-#3184: https://github.com/squizlabs/PHP_CodeSniffer/pull/3184
-#3188: https://github.com/squizlabs/PHP_CodeSniffer/issues/3188
-#3192: https://github.com/squizlabs/PHP_CodeSniffer/issues/3192
-#3195: https://github.com/squizlabs/PHP_CodeSniffer/issues/3195
-#3197: https://github.com/squizlabs/PHP_CodeSniffer/issues/3197
-#3219: https://github.com/squizlabs/PHP_CodeSniffer/issues/3219
-#3258: https://github.com/squizlabs/PHP_CodeSniffer/pull/3258
-#3273: https://github.com/squizlabs/PHP_CodeSniffer/issues/3273
-#3277: https://github.com/squizlabs/PHP_CodeSniffer/issues/3277
-#3284: https://github.com/squizlabs/PHP_CodeSniffer/issues/3284
+- Fixed bug #3195sq-3195 : Generic.WhiteSpace.ScopeIndent confusing message when combination of tabs and spaces found
+- Fixed bug #3197sq-3197 : Squiz.NamingConventions.ValidVariableName does not use correct error code for all member vars
+- Fixed bug #3219sq-3219 : Generic.Formatting.MultipleStatementAlignment false positive for empty anonymous classes and closures
+- Fixed bug #3258sq-3258 : Squiz.Formatting.OperatorBracket duplicate error messages for unary minus
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3273sq-3273 : Squiz.Functions.FunctionDeclarationArgumentSpacing reports line break as 0 spaces between parenthesis
+- Fixed bug #3277sq-3277 : Nullable static return typehint causes whitespace error
+- Fixed bug #3284sq-3284 : Unused parameter false positive when using array index in arrow function
+
+sq-2913: https://github.com/squizlabs/PHP_CodeSniffer/issues/2913
+sq-2992: https://github.com/squizlabs/PHP_CodeSniffer/issues/2992
+sq-3003: https://github.com/squizlabs/PHP_CodeSniffer/issues/3003
+sq-3145: https://github.com/squizlabs/PHP_CodeSniffer/issues/3145
+sq-3157: https://github.com/squizlabs/PHP_CodeSniffer/issues/3157
+sq-3163: https://github.com/squizlabs/PHP_CodeSniffer/pull/3163
+sq-3165: https://github.com/squizlabs/PHP_CodeSniffer/issues/3165
+sq-3167: https://github.com/squizlabs/PHP_CodeSniffer/issues/3167
+sq-3170: https://github.com/squizlabs/PHP_CodeSniffer/pull/3170
+sq-3177: https://github.com/squizlabs/PHP_CodeSniffer/pull/3177
+sq-3184: https://github.com/squizlabs/PHP_CodeSniffer/pull/3184
+sq-3188: https://github.com/squizlabs/PHP_CodeSniffer/issues/3188
+sq-3192: https://github.com/squizlabs/PHP_CodeSniffer/issues/3192
+sq-3195: https://github.com/squizlabs/PHP_CodeSniffer/issues/3195
+sq-3197: https://github.com/squizlabs/PHP_CodeSniffer/issues/3197
+sq-3219: https://github.com/squizlabs/PHP_CodeSniffer/issues/3219
+sq-3258: https://github.com/squizlabs/PHP_CodeSniffer/pull/3258
+sq-3273: https://github.com/squizlabs/PHP_CodeSniffer/issues/3273
+sq-3277: https://github.com/squizlabs/PHP_CodeSniffer/issues/3277
+sq-3284: https://github.com/squizlabs/PHP_CodeSniffer/issues/3284
 
 ## 3.5.8 - 2020-10-23
+
 ### Removed
 - Reverted a change to the way include/exclude patterns are processed for STDIN content
     - This change is not backwards compatible and will be re-introduced in version 3.6.0
 
 ## 3.5.7 - 2020-10-23
+
 ### Added
 - The PHP 8.0 T_NULLSAFE_OBJECT_OPERATOR token has been made available for older versions
     - Existing sniffs that check for T_OBJECT_OPERATOR have been modified to apply the same rules for the nullsafe object operator
@@ -894,59 +997,60 @@
 ### Fixed
 - Fixed Squiz.Formatting.OperatorBracket false positive when exiting with a negative number
 - Fixed Squiz.PHP.DisallowComparisonAssignment false positive for methods called on an object
-- Fixed bug #2882 : Generic.Arrays.ArrayIndent can request close brace indent to be less than the statement indent level
-- Fixed bug #2883 : Generic.WhiteSpace.ScopeIndent.Incorrect issue after NOWDOC
-- Fixed bug #2975 : Undefined offset in PSR12.Functions.ReturnTypeDeclaration when checking function return type inside ternary
-- Fixed bug #2988 : Undefined offset in Squiz.Strings.ConcatenationSpacing during live coding
+- Fixed bug #2882sq-2882 : Generic.Arrays.ArrayIndent can request close brace indent to be less than the statement indent level
+- Fixed bug #2883sq-2883 : Generic.WhiteSpace.ScopeIndent.Incorrect issue after NOWDOC
+- Fixed bug #2975sq-2975 : Undefined offset in PSR12.Functions.ReturnTypeDeclaration when checking function return type inside ternary
+- Fixed bug #2988sq-2988 : Undefined offset in Squiz.Strings.ConcatenationSpacing during live coding
     - Thanks to Thiemo Kreuz@thiemowmde for the patch
-- Fixed bug #2989 : Incorrect auto-fixing in Generic.ControlStructures.InlineControlStructure during live coding
+- Fixed bug #2989sq-2989 : Incorrect auto-fixing in Generic.ControlStructures.InlineControlStructure during live coding
     - Thanks to Thiemo Kreuz@thiemowmde for the patch
-- Fixed bug #3007 : Directory exclude pattern improperly excludes directories with names that start the same
+- Fixed bug #3007sq-3007 : Directory exclude pattern improperly excludes directories with names that start the same
     - Thanks to Steve Talbot@SteveTalbot for the patch
-- Fixed bug #3043 : Squiz.WhiteSpace.OperatorSpacing false positive for negation in arrow function
+- Fixed bug #3043sq-3043 : Squiz.WhiteSpace.OperatorSpacing false positive for negation in arrow function
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3049 : Incorrect error with arrow function and parameter passed as reference
+- Fixed bug #3049sq-3049 : Incorrect error with arrow function and parameter passed as reference
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3053 : PSR2 incorrect fix when multiple use statements on same line do not have whitespace between them
-- Fixed bug #3058 : Progress gets unaligned when 100% happens at the end of the available dots
-- Fixed bug #3059 : Squiz.Arrays.ArrayDeclaration false positive when using type casting
+- Fixed bug #3053sq-3053 : PSR2 incorrect fix when multiple use statements on same line do not have whitespace between them
+- Fixed bug #3058sq-3058 : Progress gets unaligned when 100% happens at the end of the available dots
+- Fixed bug #3059sq-3059 : Squiz.Arrays.ArrayDeclaration false positive when using type casting
     - Thanks to Sergei Morozov@morozov for the patch
-- Fixed bug #3060 : Squiz.Arrays.ArrayDeclaration false positive for static functions
+- Fixed bug #3060sq-3060 : Squiz.Arrays.ArrayDeclaration false positive for static functions
     - Thanks to Sergei Morozov@morozov for the patch
-- Fixed bug #3065 : Should not fix Squiz.Arrays.ArrayDeclaration.SpaceBeforeComma if comment between element and comma
+- Fixed bug #3065sq-3065 : Should not fix Squiz.Arrays.ArrayDeclaration.SpaceBeforeComma if comment between element and comma
     - Thanks to Sergei Morozov@morozov for the patch
-- Fixed bug #3066 : No support for namespace operator used in type declarations
+- Fixed bug #3066sq-3066 : No support for namespace operator used in type declarations
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3075 : PSR12.ControlStructures.BooleanOperatorPlacement false positive when operator is the only content on line
-- Fixed bug #3099 : Squiz.WhiteSpace.OperatorSpacing false positive when exiting with negative number
+- Fixed bug #3075sq-3075 : PSR12.ControlStructures.BooleanOperatorPlacement false positive when operator is the only content on line
+- Fixed bug #3099sq-3099 : Squiz.WhiteSpace.OperatorSpacing false positive when exiting with negative number
     - Thanks to Sergei Morozov@morozov for the patch
-- Fixed bug #3102 : PSR12.Squiz.OperatorSpacing false positive for default values of arrow functions
+- Fixed bug #3102sq-3102 : PSR12.Squiz.OperatorSpacing false positive for default values of arrow functions
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #3124 : PSR-12 not reporting error for empty lines with only whitespace
-- Fixed bug #3135 : Ignore annotations are broken on PHP 8.0
+- Fixed bug #3124sq-3124 : PSR-12 not reporting error for empty lines with only whitespace
+- Fixed bug #3135sq-3135 : Ignore annotations are broken on PHP 8.0
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
-#2882: https://github.com/squizlabs/PHP_CodeSniffer/issues/2882
-#2883: https://github.com/squizlabs/PHP_CodeSniffer/issues/2883
-#2975: https://github.com/squizlabs/PHP_CodeSniffer/issues/2975
-#2988: https://github.com/squizlabs/PHP_CodeSniffer/pull/2988
-#2989: https://github.com/squizlabs/PHP_CodeSniffer/pull/2989
-#3007: https://github.com/squizlabs/PHP_CodeSniffer/issues/3007
-#3043: https://github.com/squizlabs/PHP_CodeSniffer/issues/3043
-#3049: https://github.com/squizlabs/PHP_CodeSniffer/issues/3049
-#3053: https://github.com/squizlabs/PHP_CodeSniffer/issues/3053
-#3058: https://github.com/squizlabs/PHP_CodeSniffer/issues/3058
-#3059: https://github.com/squizlabs/PHP_CodeSniffer/issues/3059
-#3060: https://github.com/squizlabs/PHP_CodeSniffer/issues/3060
-#3065: https://github.com/squizlabs/PHP_CodeSniffer/issues/3065
-#3066: https://github.com/squizlabs/PHP_CodeSniffer/pull/3066
-#3075: https://github.com/squizlabs/PHP_CodeSniffer/issues/3075
-#3099: https://github.com/squizlabs/PHP_CodeSniffer/pull/3099
-#3102: https://github.com/squizlabs/PHP_CodeSniffer/pull/3102
-#3124: https://github.com/squizlabs/PHP_CodeSniffer/issues/3124
-#3135: https://github.com/squizlabs/PHP_CodeSniffer/pull/3135
+sq-2882: https://github.com/squizlabs/PHP_CodeSniffer/issues/2882
+sq-2883: https://github.com/squizlabs/PHP_CodeSniffer/issues/2883
+sq-2975: https://github.com/squizlabs/PHP_CodeSniffer/issues/2975
+sq-2988: https://github.com/squizlabs/PHP_CodeSniffer/pull/2988
+sq-2989: https://github.com/squizlabs/PHP_CodeSniffer/pull/2989
+sq-3007: https://github.com/squizlabs/PHP_CodeSniffer/issues/3007
+sq-3043: https://github.com/squizlabs/PHP_CodeSniffer/issues/3043
+sq-3049: https://github.com/squizlabs/PHP_CodeSniffer/issues/3049
+sq-3053: https://github.com/squizlabs/PHP_CodeSniffer/issues/3053
+sq-3058: https://github.com/squizlabs/PHP_CodeSniffer/issues/3058
+sq-3059: https://github.com/squizlabs/PHP_CodeSniffer/issues/3059
+sq-3060: https://github.com/squizlabs/PHP_CodeSniffer/issues/3060
+sq-3065: https://github.com/squizlabs/PHP_CodeSniffer/issues/3065
+sq-3066: https://github.com/squizlabs/PHP_CodeSniffer/pull/3066
+sq-3075: https://github.com/squizlabs/PHP_CodeSniffer/issues/3075
+sq-3099: https://github.com/squizlabs/PHP_CodeSniffer/pull/3099
+sq-3102: https://github.com/squizlabs/PHP_CodeSniffer/pull/3102
+sq-3124: https://github.com/squizlabs/PHP_CodeSniffer/issues/3124
+sq-3135: https://github.com/squizlabs/PHP_CodeSniffer/pull/3135
 
 ## 3.5.6 - 2020-08-10
+
 ### Added
 - Added support for PHP 8.0 magic constant dereferencing
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
@@ -969,29 +1073,30 @@
     - Thanks to Michał Bundyra@michalbundyra for the patch
 
 ### Fixed
-- Fixed bug #2877 : PEAR.Functions.FunctionCallSignature false positive for array of functions
+- Fixed bug #2877sq-2877 : PEAR.Functions.FunctionCallSignature false positive for array of functions
     - Thanks to Vincent Langlet@VincentLanglet for the patch
-- Fixed bug #2888 : PSR12.Files.FileHeader blank line error with multiple namespaces in one file
-- Fixed bug #2926 : phpcs hangs when using arrow functions that return heredoc
-- Fixed bug #2943 : Redundant semicolon added to a file when fixing PSR2.Files.ClosingTag.NotAllowed
-- Fixed bug #2967 : Markdown generator does not output headings correctly
+- Fixed bug #2888sq-2888 : PSR12.Files.FileHeader blank line error with multiple namespaces in one file
+- Fixed bug #2926sq-2926 : phpcs hangs when using arrow functions that return heredoc
+- Fixed bug #2943sq-2943 : Redundant semicolon added to a file when fixing PSR2.Files.ClosingTag.NotAllowed
+- Fixed bug #2967sq-2967 : Markdown generator does not output headings correctly
     - Thanks to Petr Bugyík@o5 for the patch
-- Fixed bug #2977 : File::isReference() does not detect return by reference for closures
+- Fixed bug #2977sq-2977 : File::isReference() does not detect return by reference for closures
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2994 : Generic.Formatting.DisallowMultipleStatements false positive for FOR loop with no body
-- Fixed bug #3033 : Error generated during tokenizing of goto statements on PHP 8
+- Fixed bug #2994sq-2994 : Generic.Formatting.DisallowMultipleStatements false positive for FOR loop with no body
+- Fixed bug #3033sq-3033 : Error generated during tokenizing of goto statements on PHP 8
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
-#2877: https://github.com/squizlabs/PHP_CodeSniffer/issues/2877
-#2888: https://github.com/squizlabs/PHP_CodeSniffer/issues/2888
-#2926: https://github.com/squizlabs/PHP_CodeSniffer/issues/2926
-#2943: https://github.com/squizlabs/PHP_CodeSniffer/issues/2943
-#2967: https://github.com/squizlabs/PHP_CodeSniffer/pull/2967
-#2977: https://github.com/squizlabs/PHP_CodeSniffer/pull/2977
-#2994: https://github.com/squizlabs/PHP_CodeSniffer/issues/2994
-#3033: https://github.com/squizlabs/PHP_CodeSniffer/pull/3033
+sq-2877: https://github.com/squizlabs/PHP_CodeSniffer/issues/2877
+sq-2888: https://github.com/squizlabs/PHP_CodeSniffer/issues/2888
+sq-2926: https://github.com/squizlabs/PHP_CodeSniffer/issues/2926
+sq-2943: https://github.com/squizlabs/PHP_CodeSniffer/issues/2943
+sq-2967: https://github.com/squizlabs/PHP_CodeSniffer/pull/2967
+sq-2977: https://github.com/squizlabs/PHP_CodeSniffer/pull/2977
+sq-2994: https://github.com/squizlabs/PHP_CodeSniffer/issues/2994
+sq-3033: https://github.com/squizlabs/PHP_CodeSniffer/pull/3033
 
 ## 3.5.5 - 2020-04-17
+
 ### Changed
 - The T_FN backfill now works more reliably so T_FN tokens only ever represent real arrow functions
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
@@ -1001,25 +1106,40 @@
 ### Fixed
 - Error wording in PEAR.Functions.FunctionCallSignature now always uses "parenthesis" instead of sometimes using "bracket"
     - Thanks to Vincent Langlet@VincentLanglet for the patch
-- Fixed bug #2787 : Squiz.PHP.DisallowMultipleAssignments not ignoring typed property declarations
+- Fixed bug #2787sq-2787 : Squiz.PHP.DisallowMultipleAssignments not ignoring typed property declarations
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2810 : PHPCBF fails to fix file with empty statement at start on control structure
-- Fixed bug #2812 : Squiz.Arrays.ArrayDeclaration not detecting some arrays with multiple arguments on the same line
+- Fixed bug #2810sq-2810 : PHPCBF fails to fix file with empty statement at start on control structure
+- Fixed bug #2812sq-2812 : Squiz.Arrays.ArrayDeclaration not detecting some arrays with multiple arguments on the same line
     - Thanks to Jakub Chábek@grongor for the patch
-- Fixed bug #2826 : Generic.WhiteSpace.ArbitraryParenthesesSpacing doesn't detect issues for statements directly after a   control structure
+- Fixed bug #2826sq-2826 : Generic.WhiteSpace.ArbitraryParenthesesSpacing doesn't detect issues for statements directly after a control structure
     - Thanks to Vincent Langlet@VincentLanglet for the patch
-- Fixed bug #2848 : PSR12.Files.FileHeader false positive for file with mixed PHP and HTML and no file header
-- Fixed bug #2849 : Generic.WhiteSpace.ScopeIndent false positive with arrow function inside array
-- Fixed bug #2850 : Generic.PHP.LowerCaseKeyword complains __HALT_COMPILER is uppercase
-- Fixed bug #2853 : Undefined variable error when using Info report
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2865 : Double arrow tokenized as T_STRING when placed after function named "fn"
-- Fixed bug #2867 : Incorrect scope matching when arrow function used inside IF condition
-- Fixed bug #2868 : phpcs:ignore annotation doesnt work inside a docblock
-- Fixed bug #2878 : PSR12.Files.FileHeader conflicts with Generic.Files.LineEndings
-- Fixed bug #2895 : PSR2.Methods.FunctionCallSignature.MultipleArguments false positive with arrow function argument
+- Fixed bug #2848sq-2848 : PSR12.Files.FileHeader false positive for file with mixed PHP and HTML and no file header
+- Fixed bug #2849sq-2849 : Generic.WhiteSpace.ScopeIndent false positive with arrow function inside array
+- Fixed bug #2850sq-2850 : Generic.PHP.LowerCaseKeyword complains __HALT_COMPILER is uppercase
+- Fixed bug #2853sq-2853 : Undefined variable error when using Info report
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2865sq-2865 : Double arrow tokenized as T_STRING when placed after function named "fn"
+- Fixed bug #2867sq-2867 : Incorrect scope matching when arrow function used inside IF condition
+- Fixed bug #2868sq-2868 : phpcs:ignore annotation doesn't work inside a docblock
+- Fixed bug #2878sq-2878 : PSR12.Files.FileHeader conflicts with Generic.Files.LineEndings
+- Fixed bug #2895sq-2895 : PSR2.Methods.FunctionCallSignature.MultipleArguments false positive with arrow function argument
+
+sq-2787: https://github.com/squizlabs/PHP_CodeSniffer/issues/2787
+sq-2810: https://github.com/squizlabs/PHP_CodeSniffer/issues/2810
+sq-2812: https://github.com/squizlabs/PHP_CodeSniffer/pull/2812
+sq-2826: https://github.com/squizlabs/PHP_CodeSniffer/issues/2826
+sq-2848: https://github.com/squizlabs/PHP_CodeSniffer/issues/2848
+sq-2849: https://github.com/squizlabs/PHP_CodeSniffer/issues/2849
+sq-2850: https://github.com/squizlabs/PHP_CodeSniffer/issues/2850
+sq-2853: https://github.com/squizlabs/PHP_CodeSniffer/pull/2853
+sq-2865: https://github.com/squizlabs/PHP_CodeSniffer/issues/2865
+sq-2867: https://github.com/squizlabs/PHP_CodeSniffer/issues/2867
+sq-2868: https://github.com/squizlabs/PHP_CodeSniffer/issues/2868
+sq-2878: https://github.com/squizlabs/PHP_CodeSniffer/issues/2878
+sq-2895: https://github.com/squizlabs/PHP_CodeSniffer/issues/2895
 
 ## 3.5.4 - 2020-01-31
+
 ### Changed
 - The PHP 7.4 numeric separator backfill now works correctly for more float formats
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
@@ -1033,7 +1153,7 @@
     - Previously it required these to have curly braces, but there were no statements to enclose in them
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - PSR12.ControlStructures.BooleanOperatorPlacement can now be configured to enforce a specific operator position
-    - By default, the sniff ensures that operators are all at the begining or end of lines, but not a mix of both
+    - By default, the sniff ensures that operators are all at the beginning or end of lines, but not a mix of both
     - Set the allowOnly property to "first" to enforce all boolean operators to be at the start of a line
     - Set the allowOnly property to "last" to enforce all boolean operators to be at the end of a line
     - Thanks to Vincent Langlet@VincentLanglet for the patch
@@ -1045,46 +1165,66 @@
 - Squiz.PHP.InnerFunctions now handles multiple nested anon classes correctly
 
 ### Fixed
-- Fixed bug #2497 : Sniff properties not set when referencing a sniff using relative paths or non-native slashes
+- Fixed bug #2497sq-2497 : Sniff properties not set when referencing a sniff using relative paths or non-native slashes
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2657 : Squiz.WhiteSpace.FunctionSpacing can remove spaces between comment and first/last method during auto-fixing
+- Fixed bug #2657sq-2657 : Squiz.WhiteSpace.FunctionSpacing can remove spaces between comment and first/last method during auto-fixing
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2688 : Case statements not tokenized correctly when switch is contained within ternary
-- Fixed bug #2698 : PHPCS throws errors determining auto report width when shell_exec is disabled
+- Fixed bug #2688sq-2688 : Case statements not tokenized correctly when switch is contained within ternary
+- Fixed bug #2698sq-2698 : PHPCS throws errors determining auto report width when shell_exec is disabled
     - Thanks to Matthew Peveler@MasterOdin for the patch
-- Fixed bug #2730 : PSR12.ControlStructures.ControlStructureSpacing does not ignore comments between conditions
+- Fixed bug #2730sq-2730 : PSR12.ControlStructures.ControlStructureSpacing does not ignore comments between conditions
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2732 : PSR12.Files.FileHeader misidentifies file header in mixed content file
-- Fixed bug #2745 : AbstractArraySniff wrong indices when mixed coalesce and ternary values
+- Fixed bug #2732sq-2732 : PSR12.Files.FileHeader misidentifies file header in mixed content file
+- Fixed bug #2745sq-2745 : AbstractArraySniff wrong indices when mixed coalesce and ternary values
     - Thanks to Michał Bundyra@michalbundyra for the patch
-- Fixed bug #2748 : Wrong end of statement for fn closures
+- Fixed bug #2748sq-2748 : Wrong end of statement for fn closures
     - Thanks to Michał Bundyra@michalbundyra for the patch
-- Fixed bug #2751 : Autoload relative paths first to avoid confusion with files from the global include path
+- Fixed bug #2751sq-2751 : Autoload relative paths first to avoid confusion with files from the global include path
     - Thanks to Klaus Purer@klausi for the patch
-- Fixed bug #2763 : PSR12 standard reports errors for multi-line FOR definitions
-- Fixed bug #2768 : Generic.Files.LineLength false positive for non-breakable strings at exactly the soft limit
+- Fixed bug #2763sq-2763 : PSR12 standard reports errors for multi-line FOR definitions
+- Fixed bug #2768sq-2768 : Generic.Files.LineLength false positive for non-breakable strings at exactly the soft limit
     - Thanks to Alex Miles@ghostal for the patch
-- Fixed bug #2773 : PSR2.Methods.FunctionCallSignature false positive when arrow function has array return type
-- Fixed bug #2790 : PSR12.Traits.UseDeclaration ignores block comments
+- Fixed bug #2773sq-2773 : PSR2.Methods.FunctionCallSignature false positive when arrow function has array return type
+- Fixed bug #2790sq-2790 : PSR12.Traits.UseDeclaration ignores block comments
     - Thanks to Vincent Langlet@VincentLanglet for the patch
-- Fixed bug #2791 : PSR12.Functions.NullableTypeDeclaration false positive when ternary operator used with instanceof
+- Fixed bug #2791sq-2791 : PSR12.Functions.NullableTypeDeclaration false positive when ternary operator used with instanceof
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2802 : Can't specify a report file path using the tilde shortcut
-- Fixed bug #2804 : PHP4-style typed properties not tokenized correctly
+- Fixed bug #2802sq-2802 : Can't specify a report file path using the tilde shortcut
+- Fixed bug #2804sq-2804 : PHP4-style typed properties not tokenized correctly
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2805 : Undefined Offset notice during live coding of arrow functions
+- Fixed bug #2805sq-2805 : Undefined Offset notice during live coding of arrow functions
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2843 : Tokenizer does not support alternative syntax for declare statements
+- Fixed bug #2843sq-2843 : Tokenizer does not support alternative syntax for declare statements
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
+sq-2497: https://github.com/squizlabs/PHP_CodeSniffer/issues/2497
+sq-2657: https://github.com/squizlabs/PHP_CodeSniffer/pull/2657
+sq-2688: https://github.com/squizlabs/PHP_CodeSniffer/issues/2688
+sq-2698: https://github.com/squizlabs/PHP_CodeSniffer/issues/2698
+sq-2730: https://github.com/squizlabs/PHP_CodeSniffer/pull/2730
+sq-2732: https://github.com/squizlabs/PHP_CodeSniffer/issues/2732
+sq-2745: https://github.com/squizlabs/PHP_CodeSniffer/issues/2745
+sq-2748: https://github.com/squizlabs/PHP_CodeSniffer/issues/2748
+sq-2751: https://github.com/squizlabs/PHP_CodeSniffer/pull/2751
+sq-2763: https://github.com/squizlabs/PHP_CodeSniffer/issues/2763
+sq-2768: https://github.com/squizlabs/PHP_CodeSniffer/issues/2768
+sq-2773: https://github.com/squizlabs/PHP_CodeSniffer/issues/2773
+sq-2790: https://github.com/squizlabs/PHP_CodeSniffer/issues/2790
+sq-2791: https://github.com/squizlabs/PHP_CodeSniffer/issues/2791
+sq-2802: https://github.com/squizlabs/PHP_CodeSniffer/issues/2802
+sq-2804: https://github.com/squizlabs/PHP_CodeSniffer/pull/2804
+sq-2805: https://github.com/squizlabs/PHP_CodeSniffer/pull/2805
+sq-2843: https://github.com/squizlabs/PHP_CodeSniffer/pull/2843
+
 ## 3.5.3 - 2019-12-04
+
 ### Changed
 - The PHP 7.4 T_FN token has been made available for older versions
     - T_FN represents the fn string used for arrow functions
     - The double arrow becomes the scope opener, and uses a new T_FN_ARROW token type
     - The token after the statement (normally a semicolon) becomes the scope closer
     - The token is also associated with the opening and closing parenthesis of the statement
-    - Any functions named "fn" will cause have a T_FN token for the function name, but have no scope information
+    - Any functions named "fn" will have a T_FN token for the function name, but have no scope information
     - Thanks to Michał Bundyra@michalbundyra for the help with this change
 - PHP 7.4 numeric separators are now tokenized in the same way when using older PHP versions
     - Previously, a number like 1_000 would tokenize as T_LNUMBER (1), T_STRING (_000)
@@ -1120,24 +1260,35 @@
     - Thanks to Michał Bundyra@michalbundyra for the patch
 
 ### Fixed
-- Fixed bug #2586 : Generic.WhiteSpace.ScopeIndent false positives when indenting open tags at a non tab-stop
-- Fixed bug #2638 : Squiz.CSS.DuplicateClassDefinitionSniff sees comments as part of the class name
+- Fixed bug #2586sq-2586 : Generic.WhiteSpace.ScopeIndent false positives when indenting open tags at a non tab-stop
+- Fixed bug #2638sq-2638 : Squiz.CSS.DuplicateClassDefinitionSniff sees comments as part of the class name
     - Thanks to Raphael Horber@rhorber for the patch
-- Fixed bug #2640 : Squiz.WhiteSpace.OperatorSpacing false positives for some negation operators
+- Fixed bug #2640sq-2640 : Squiz.WhiteSpace.OperatorSpacing false positives for some negation operators
     - Thanks to Jakub Chábek@grongor and Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2674 : Squiz.Functions.FunctionDeclarationArgumentSpacing prints wrong argument name in error message
-- Fixed bug #2676 : PSR12.Files.FileHeader locks up when file ends with multiple inline comments
-- Fixed bug #2678 : PSR12.Classes.AnonClassDeclaration incorrectly enforcing that closing brace be on a line by itself
-- Fixed bug #2685 : File::getMethodParameters() setting typeHintEndToken for vars with no type hint
+- Fixed bug #2674sq-2674 : Squiz.Functions.FunctionDeclarationArgumentSpacing prints wrong argument name in error message
+- Fixed bug #2676sq-2676 : PSR12.Files.FileHeader locks up when file ends with multiple inline comments
+- Fixed bug #2678sq-2678 : PSR12.Classes.AnonClassDeclaration incorrectly enforcing that closing brace be on a line by itself
+- Fixed bug #2685sq-2685 : File::getMethodParameters() setting typeHintEndToken for vars with no type hint
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2694 : AbstractArraySniff produces invalid indices when using ternary operator
+- Fixed bug #2694sq-2694 : AbstractArraySniff produces invalid indices when using ternary operator
     - Thanks to Michał Bundyra@michalbundyra for the patch
-- Fixed bug #2702 : Generic.WhiteSpace.ScopeIndent false positive when using ternary operator with short arrays
+- Fixed bug #2702sq-2702 : Generic.WhiteSpace.ScopeIndent false positive when using ternary operator with short arrays
+
+sq-2586: https://github.com/squizlabs/PHP_CodeSniffer/issues/2586
+sq-2638: https://github.com/squizlabs/PHP_CodeSniffer/issues/2638
+sq-2640: https://github.com/squizlabs/PHP_CodeSniffer/pull/2640
+sq-2674: https://github.com/squizlabs/PHP_CodeSniffer/issues/2674
+sq-2676: https://github.com/squizlabs/PHP_CodeSniffer/issues/2676
+sq-2678: https://github.com/squizlabs/PHP_CodeSniffer/issues/2678
+sq-2685: https://github.com/squizlabs/PHP_CodeSniffer/pull/2685
+sq-2694: https://github.com/squizlabs/PHP_CodeSniffer/issues/2694
+sq-2702: https://github.com/squizlabs/PHP_CodeSniffer/issues/2702
 
 ## 3.5.2 - 2019-10-28
+
 ### Changed
 - Generic.ControlStructures.DisallowYodaConditions now returns less false positives
-    - False positives were being returned for array comparisions, or when performing some function calls
+    - False positives were being returned for array comparisons, or when performing some function calls
 - Squiz.WhiteSpace.SemicolonSpacing.Incorrect error message now escapes newlines and tabs
     - Provides a clearer error message as whitespace is now visible
     - Also allows for better output for report types such as CSV and XML
@@ -1146,15 +1297,23 @@
     - Thanks to Craig Duncan@duncan3dc for the patch
 
 ### Fixed
-- Fixed bug #2654 : Incorrect indentation for arguments of multiline function calls
-- Fixed bug #2656 : Squiz.WhiteSpace.MemberVarSpacing removes comments before first member var during auto fixing
+- Fixed bug #2654sq-2654 : Incorrect indentation for arguments of multiline function calls
+- Fixed bug #2656sq-2656 : Squiz.WhiteSpace.MemberVarSpacing removes comments before first member var during auto fixing
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2663 : Generic.NamingConventions.ConstructorName complains about old constructor in interfaces
-- Fixed bug #2664 : PSR12.Files.OpenTag incorrectly identifies PHP file with only an opening tag
-- Fixed bug #2665 : PSR12.Files.ImportStatement should not apply to traits
-- Fixed bug #2673 : PSR12.Traits.UseDeclaration does not allow comments or blank lines between use statements
+- Fixed bug #2663sq-2663 : Generic.NamingConventions.ConstructorName complains about old constructor in interfaces
+- Fixed bug #2664sq-2664 : PSR12.Files.OpenTag incorrectly identifies PHP file with only an opening tag
+- Fixed bug #2665sq-2665 : PSR12.Files.ImportStatement should not apply to traits
+- Fixed bug #2673sq-2673 : PSR12.Traits.UseDeclaration does not allow comments or blank lines between use statements
+
+sq-2654: https://github.com/squizlabs/PHP_CodeSniffer/issues/2654
+sq-2656: https://github.com/squizlabs/PHP_CodeSniffer/pull/2656
+sq-2663: https://github.com/squizlabs/PHP_CodeSniffer/issues/2663
+sq-2664: https://github.com/squizlabs/PHP_CodeSniffer/issues/2664
+sq-2665: https://github.com/squizlabs/PHP_CodeSniffer/issues/2665
+sq-2673: https://github.com/squizlabs/PHP_CodeSniffer/issues/2673
 
 ## 3.5.1 - 2019-10-17
+
 ### Changed
 - Very very verbose diff report output has slightly changed to improve readability
     - Output is printed when running PHPCS with the --report=diff and -vvv command line arguments
@@ -1164,28 +1323,42 @@
     - This check has been missing from these standards, but has now been implemented
     - When using the PEAR standard, the error code is PEAR.Functions.FunctionCallSignature.FirstArgumentPosition
     - When using PSR2 or PSR12, the error code is PSR2.Methods.FunctionCallSignature.FirstArgumentPosition
-- PSR12.ControlStructures.BooleanOperatorPlacement no longer complains when multiple expression appears on the same line
-    - Previously, boolean operators were enforce to appear at the start or end of lines only
+- PSR12.ControlStructures.BooleanOperatorPlacement no longer complains when multiple expressions appear on the same line
+    - Previously, boolean operators were enforced to appear at the start or end of lines only
     - Boolean operators can now appear in the middle of the line
 - PSR12.Files.FileHeader no longer ignores comments preceding a use, namespace, or declare statement
 - PSR12.Files.FileHeader now allows a hashbang line at the top of the file
 
 ### Fixed
-- Fixed bug #2506 : PSR2 standard can't auto fix multi-line function call inside a string concat statement
-- Fixed bug #2530 : PEAR.Commenting.FunctionComment does not support intersection types in comments
-- Fixed bug #2615 : Constant visibility false positive on non-class constants
-- Fixed bug #2616 : PSR12.Files.FileHeader false positive when file only contains docblock
-- Fixed bug #2619 : PSR12.Files.FileHeader locks up when inline comment is the last content in a file
-- Fixed bug #2621 : PSR12.Classes.AnonClassDeclaration.CloseBraceSameLine false positive for anon class passed as function argument
+- Fixed bug #2506sq-2506 : PSR2 standard can't auto fix multi-line function call inside a string concat statement
+- Fixed bug #2530sq-2530 : PEAR.Commenting.FunctionComment does not support intersection types in comments
+- Fixed bug #2615sq-2615 : Constant visibility false positive on non-class constants
+- Fixed bug #2616sq-2616 : PSR12.Files.FileHeader false positive when file only contains docblock
+- Fixed bug #2619sq-2619 : PSR12.Files.FileHeader locks up when inline comment is the last content in a file
+- Fixed bug #2621sq-2621 : PSR12.Classes.AnonClassDeclaration.CloseBraceSameLine false positive for anon class passed as function argument
     - Thanks to Martins Sipenko@martinssipenko for the patch
-- Fixed bug #2623 : PSR12.ControlStructures.ControlStructureSpacing not ignoring indentation inside multi-line string arguments
-- Fixed bug #2624 : PSR12.Traits.UseDeclaration doesnt apply the correct indent during auto fixing
-- Fixed bug #2626 : PSR12.Files.FileHeader detects @var annotations as file docblocks
-- Fixed bug #2628 : PSR12.Traits.UseDeclaration does not allow comments above a USE declaration
-- Fixed bug #2632 : Incorrect indentation of lines starting with "static" inside closures
-- Fixed bug #2641 : PSR12.Functions.NullableTypeDeclaration false positive when using new static()
+- Fixed bug #2623sq-2623 : PSR12.ControlStructures.ControlStructureSpacing not ignoring indentation inside multi-line string arguments
+- Fixed bug #2624sq-2624 : PSR12.Traits.UseDeclaration doesnt apply the correct indent during auto fixing
+- Fixed bug #2626sq-2626 : PSR12.Files.FileHeader detects @var annotations as file docblocks
+- Fixed bug #2628sq-2628 : PSR12.Traits.UseDeclaration does not allow comments above a USE declaration
+- Fixed bug #2632sq-2632 : Incorrect indentation of lines starting with "static" inside closures
+- Fixed bug #2641sq-2641 : PSR12.Functions.NullableTypeDeclaration false positive when using new static()
+
+sq-2506: https://github.com/squizlabs/PHP_CodeSniffer/issues/2506
+sq-2530: https://github.com/squizlabs/PHP_CodeSniffer/issues/2530
+sq-2615: https://github.com/squizlabs/PHP_CodeSniffer/issues/2615
+sq-2616: https://github.com/squizlabs/PHP_CodeSniffer/issues/2616
+sq-2619: https://github.com/squizlabs/PHP_CodeSniffer/issues/2619
+sq-2621: https://github.com/squizlabs/PHP_CodeSniffer/issues/2621
+sq-2623: https://github.com/squizlabs/PHP_CodeSniffer/issues/2623
+sq-2624: https://github.com/squizlabs/PHP_CodeSniffer/issues/2624
+sq-2626: https://github.com/squizlabs/PHP_CodeSniffer/issues/2626
+sq-2628: https://github.com/squizlabs/PHP_CodeSniffer/issues/2628
+sq-2632: https://github.com/squizlabs/PHP_CodeSniffer/issues/2632
+sq-2641: https://github.com/squizlabs/PHP_CodeSniffer/issues/2641
 
 ## 3.5.0 - 2019-09-27
+
 ### Changed
 - The included PSR12 standard is now complete and ready to use
     - Check your code using PSR-12 by running PHPCS with --standard=PSR12
@@ -1209,11 +1382,11 @@
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - The tokenizer now correctly identifies inline control structures in more cases
 - All helper methods inside the File class now throw RuntimeException instead of TokenizerException
-    - Some tokenizer methods were also throwing RuntimeExpection but now correctly throw TokenizerException
+    - Some tokenizer methods were also throwing RuntimeException but now correctly throw TokenizerException
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - The File::getMethodParameters() method now returns more information, and supports closure USE groups
     - If a type hint is specified, the position of the last token in the hint will be set in a "type_hint_end_token" array index
-    - If a default is specified, the position of the first token in the default value will be set in a "default_token" array   index
+    - If a default is specified, the position of the first token in the default value will be set in a "default_token" array index
     - If a default is specified, the position of the equals sign will be set in a "default_equal_token" array index
     - If the param is not the last, the position of the comma will be set in a "comma_token" array index
     - If the param is passed by reference, the position of the reference operator will be set in a "reference_token" array index
@@ -1256,7 +1429,7 @@
 - Added PSR12.Files.ImportStatement sniff
     - Enforces the formatting of import statements within a file
 - Added PSR12.Files.OpenTag sniff
-    - Enforces that the open tag is on a line by itself when used at the start of a php-only file
+    - Enforces that the open tag is on a line by itself when used at the start of a PHP-only file
 - Added PSR12.Functions.ReturnTypeDeclaration sniff
     - Enforces the formatting of return type declarations in functions and closures
 - Added PSR12.Properties.ConstantVisibility sniff
@@ -1273,9 +1446,9 @@
     - Use the Squiz.WhiteSpace.OperatorSpacing sniff to enforce spacing around assignment operators
         - Note that this sniff checks spacing around all assignment operators, not just inside function calls
     - The Generic.Functions.FunctionCallArgumentSpacing.NoSpaceBeforeEquals error has been removed
-        - use Squiz.WhiteSpace.OperatorSpacing.NoSpaceBefore instead
+        - Use Squiz.WhiteSpace.OperatorSpacing.NoSpaceBefore instead
     - The Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals error has been removed
-        - use Squiz.WhiteSpace.OperatorSpacing.NoSpaceAfter instead
+        - Use Squiz.WhiteSpace.OperatorSpacing.NoSpaceAfter instead
     - This also changes the PEAR/PSR2/PSR12 standards so they no longer check assignment operators inside function calls
         - They were previously checking these operators when they should not have
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
@@ -1303,7 +1476,7 @@
 - Squiz.Operators.IncrementDecrementUsage now suggests pre-increment of variables instead of post-increment
     - This change does not enforce pre-increment over post-increment; only the suggestion has changed
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Squiz.PHP.DisallowMultipleAssignments now has a second error code for when assignments are found inside control structure   conditions
+- Squiz.PHP.DisallowMultipleAssignments now has a second error code for when assignments are found inside control structure conditions
     - The new error code is Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure
     - All other multiple assignment cases use the existing error code Squiz.PHP.DisallowMultipleAssignments.Found
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
@@ -1321,60 +1494,95 @@
     - Thanks to Jakub Chábek@grongor for the patch
 
 ### Fixed
-- Fixed bug #2391 : Sniff-specific ignore rules inside rulesets are filtering out too many files
+- Fixed bug #2391sq-2391 : Sniff-specific ignore rules inside rulesets are filtering out too many files
     - Thanks to Juliette Reinders Folmer@jrfnl and Willington Vega@wvega for the patch
-- Fixed bug #2478 : FunctionCommentThrowTag.WrongNumber when exception is thrown once but built conditionally
-- Fixed bug #2479 : Generic.WhiteSpace.ScopeIndent error when using array destructing with exact indent checking
-- Fixed bug #2498 : Squiz.Arrays.ArrayDeclaration.MultiLineNotAllowed autofix breaks heredoc
-- Fixed bug #2502 : Generic.WhiteSpace.ScopeIndent false positives with nested switch indentation and case fall-through
-- Fixed bug #2504 : Generic.WhiteSpace.ScopeIndent false positives with nested arrays and nowdoc string
-- Fixed bug #2511 : PSR2 standard not checking if closing paren of single-line function declaration is on new line
-- Fixed bug #2512 : Squiz.PHP.NonExecutableCode does not support alternate SWITCH control structure
+- Fixed bug #2478sq-2478 : FunctionCommentThrowTag.WrongNumber when exception is thrown once but built conditionally
+- Fixed bug #2479sq-2479 : Generic.WhiteSpace.ScopeIndent error when using array destructing with exact indent checking
+- Fixed bug #2498sq-2498 : Squiz.Arrays.ArrayDeclaration.MultiLineNotAllowed autofix breaks heredoc
+- Fixed bug #2502sq-2502 : Generic.WhiteSpace.ScopeIndent false positives with nested switch indentation and case fall-through
+- Fixed bug #2504sq-2504 : Generic.WhiteSpace.ScopeIndent false positives with nested arrays and nowdoc string
+- Fixed bug #2511sq-2511 : PSR2 standard not checking if closing paren of single-line function declaration is on new line
+- Fixed bug #2512sq-2512 : Squiz.PHP.NonExecutableCode does not support alternate SWITCH control structure
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2522 : Text generator throws error when code sample line is too long
+- Fixed bug #2522sq-2522 : Text generator throws error when code sample line is too long
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2526 : XML report format has bad syntax on Windows
+- Fixed bug #2526sq-2526 : XML report format has bad syntax on Windows
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2529 : Generic.Formatting.MultipleStatementAlignment wrong error for assign in string concat
-- Fixed bug #2534 : Unresolvable installed_paths can lead to open_basedir errors
+- Fixed bug #2529sq-2529 : Generic.Formatting.MultipleStatementAlignment wrong error for assign in string concat
+- Fixed bug #2534sq-2534 : Unresolvable installed_paths can lead to open_basedir errors
     - Thanks to Oliver Nowak@ndm2 for the patch
-- Fixed bug #2541 : Text doc generator does not allow for multi-line rule explanations
+- Fixed bug #2541sq-2541 : Text doc generator does not allow for multi-line rule explanations
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2549 : Searching for a phpcs.xml file can throw warnings due to open_basedir restrictions
+- Fixed bug #2549sq-2549 : Searching for a phpcs.xml file can throw warnings due to open_basedir restrictions
     - Thanks to Matthew Peveler@MasterOdin for the patch
-- Fixed bug #2558 : PHP 7.4 throwing offset syntax with curly braces is deprecated message
+- Fixed bug #2558sq-2558 : PHP 7.4 throwing offset syntax with curly braces is deprecated message
     - Thanks to Matthew Peveler@MasterOdin for the patch
-- Fixed bug #2561 : PHP 7.4 compatibility fix / implode argument order
+- Fixed bug #2561sq-2561 : PHP 7.4 compatibility fix / implode argument order
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2562 : Inline WHILE triggers SpaceBeforeSemicolon incorrectly
+- Fixed bug #2562sq-2562 : Inline WHILE triggers SpaceBeforeSemicolon incorrectly
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2565 : Generic.ControlStructures.InlineControlStructure confused by mixed short/long tags
+- Fixed bug #2565sq-2565 : Generic.ControlStructures.InlineControlStructure confused by mixed short/long tags
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2566 : Author tag email validation doesn't support all TLDs
+- Fixed bug #2566sq-2566 : Author tag email validation doesn't support all TLDs
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2575 : Custom error messages don't have data replaced when cache is enabled
-- Fixed bug #2601 : Squiz.WhiteSpace.FunctionSpacing incorrect fix when spacing is 0
-- Fixed bug #2608 : PSR2 throws errors for use statements when multiple namespaces are defined in a file
+- Fixed bug #2575sq-2575 : Custom error messages don't have data replaced when cache is enabled
+- Fixed bug #2601sq-2601 : Squiz.WhiteSpace.FunctionSpacing incorrect fix when spacing is 0
+- Fixed bug #2608sq-2608 : PSR2 throws errors for use statements when multiple namespaces are defined in a file
+
+sq-2391: https://github.com/squizlabs/PHP_CodeSniffer/issues/2391
+sq-2478: https://github.com/squizlabs/PHP_CodeSniffer/issues/2478
+sq-2479: https://github.com/squizlabs/PHP_CodeSniffer/issues/2479
+sq-2498: https://github.com/squizlabs/PHP_CodeSniffer/issues/2498
+sq-2502: https://github.com/squizlabs/PHP_CodeSniffer/pull/2502
+sq-2504: https://github.com/squizlabs/PHP_CodeSniffer/pull/2504
+sq-2511: https://github.com/squizlabs/PHP_CodeSniffer/issues/2511
+sq-2512: https://github.com/squizlabs/PHP_CodeSniffer/issues/2512
+sq-2522: https://github.com/squizlabs/PHP_CodeSniffer/pull/2522
+sq-2526: https://github.com/squizlabs/PHP_CodeSniffer/issues/2526
+sq-2529: https://github.com/squizlabs/PHP_CodeSniffer/issues/2529
+sq-2534: https://github.com/squizlabs/PHP_CodeSniffer/pull/2534
+sq-2541: https://github.com/squizlabs/PHP_CodeSniffer/pull/2541
+sq-2549: https://github.com/squizlabs/PHP_CodeSniffer/issues/2549
+sq-2558: https://github.com/squizlabs/PHP_CodeSniffer/issues/2558
+sq-2561: https://github.com/squizlabs/PHP_CodeSniffer/pull/2561
+sq-2562: https://github.com/squizlabs/PHP_CodeSniffer/issues/2562
+sq-2565: https://github.com/squizlabs/PHP_CodeSniffer/issues/2565
+sq-2566: https://github.com/squizlabs/PHP_CodeSniffer/issues/2566
+sq-2575: https://github.com/squizlabs/PHP_CodeSniffer/issues/2575
+sq-2601: https://github.com/squizlabs/PHP_CodeSniffer/pull/2601
+sq-2608: https://github.com/squizlabs/PHP_CodeSniffer/issues/2608
 
 ## 3.4.2 - 2019-04-11
+
 ### Changed
 - Squiz.Arrays.ArrayDeclaration now has improved handling of syntax errors
 
 ### Fixed
 - Fixed an issue where the PCRE JIT on PHP 7.3 caused PHPCS to die when using the parallel option
     - PHPCS now disables the PCRE JIT before running
-- Fixed bug #2368 : MySource.PHP.AjaxNullComparison throws error when first function has no doc comment
-- Fixed bug #2414 : Indention false positive in switch/case/if combination
-- Fixed bug #2423 : Squiz.Formatting.OperatorBracket.MissingBrackets error with static
-- Fixed bug #2450 : Indentation false positive when closure containing nested IF conditions used as function argument
-- Fixed bug #2452 : LowercasePHPFunctions sniff failing on "new \File()"
-- Fixed bug #2453 : Squiz.CSS.SemicolonSpacingSniff false positive when style name proceeded by an asterisk
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2464 : Fixer conflict between Generic.WhiteSpace.ScopeIndent and Squiz.WhiteSpace.ScopeClosingBrace when class   indented 1 space
-- Fixed bug #2465 : Excluding a sniff by path is not working
-- Fixed bug #2467 : PHP open/close tags inside CSS files are replaced with internal PHPCS token strings when auto fixing
+- Fixed bug #2368sq-2368 : MySource.PHP.AjaxNullComparison throws error when first function has no doc comment
+- Fixed bug #2414sq-2414 : Indention false positive in switch/case/if combination
+- Fixed bug #2423sq-2423 : Squiz.Formatting.OperatorBracket.MissingBrackets error with static
+- Fixed bug #2450sq-2450 : Indentation false positive when closure containing nested IF conditions used as function argument
+- Fixed bug #2452sq-2452 : LowercasePHPFunctions sniff failing on "new \File()"
+- Fixed bug #2453sq-2453 : Squiz.CSS.SemicolonSpacingSniff false positive when style name proceeded by an asterisk
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2464sq-2464 : Fixer conflict between Generic.WhiteSpace.ScopeIndent and Squiz.WhiteSpace.ScopeClosingBrace when class indented 1 space
+- Fixed bug #2465sq-2465 : Excluding a sniff by path is not working
+- Fixed bug #2467sq-2467 : PHP open/close tags inside CSS files are replaced with internal PHPCS token strings when auto fixing
+
+sq-2368: https://github.com/squizlabs/PHP_CodeSniffer/pull/2368
+sq-2414: https://github.com/squizlabs/PHP_CodeSniffer/issues/2414
+sq-2423: https://github.com/squizlabs/PHP_CodeSniffer/issues/2423
+sq-2450: https://github.com/squizlabs/PHP_CodeSniffer/issues/2450
+sq-2452: https://github.com/squizlabs/PHP_CodeSniffer/issues/2452
+sq-2453: https://github.com/squizlabs/PHP_CodeSniffer/issues/2453
+sq-2464: https://github.com/squizlabs/PHP_CodeSniffer/issues/2464
+sq-2465: https://github.com/squizlabs/PHP_CodeSniffer/pull/2465
+sq-2467: https://github.com/squizlabs/PHP_CodeSniffer/issues/2467
 
 ## 3.4.1 - 2019-03-19
+
 ### Changed
 - The PEAR installable version of PHPCS was missing some files, which have been re-included in this release
     - The code report was not previously available for PEAR installs
@@ -1400,16 +1608,16 @@
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Generic.Files.LineEndings no longer adds superfluous new line at the end of JS and CSS files
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Generic.Formatting.DisallowMultipleStatements no longer tries fix lines containing phpcs:ignore statements
+- Generic.Formatting.DisallowMultipleStatements no longer tries to fix lines containing phpcs:ignore statements
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Generic.Functions.FunctionCallArgumentSpacing now has improved performance and anonymous class support
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Generic.WhiteSpace.ScopeIndent now respects changes to the "exact" property using phpcs:set mid-way through a file
-    - This allows you change the "exact" rule for only some parts of a file
+    - This allows you to change the "exact" rule for only some parts of a file
 - Generic.WhiteSpace.ScopeIndent now disables exact indent checking inside all arrays
     - Previously, this was only done when using long array syntax, but it now works for short array syntax as well
 - PEAR.Classes.ClassDeclaration now has improved handling of PHPCS annotations and tab indents
-- PSR12.Classes.ClassInstantiation has changed it's error code from MissingParenthesis to MissingParentheses
+- PSR12.Classes.ClassInstantiation has changed its error code from MissingParenthesis to MissingParentheses
 - PSR12.Keywords.ShortFormTypeKeywords now ignores all spacing inside type casts during both checking and fixing
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Squiz.Classes.LowercaseClassKeywords now examines the class keyword for anonymous classes
@@ -1449,18 +1657,27 @@
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
 ### Fixed
-- Fixed bug #2298 : PSR2.Classes.ClassDeclaration allows extended class on new line
+- Fixed bug #2298sq-2298 : PSR2.Classes.ClassDeclaration allows extended class on new line
     - Thanks to Michał Bundyra@michalbundyra for the patch
-- Fixed bug #2337 : Generic.WhiteSpace.ScopeIndent incorrect error when multi-line function call starts on same line as open   tag
-- Fixed bug #2348 : Cache not invalidated when changing a ruleset included by another
-- Fixed bug #2376 : Using __halt_compiler() breaks Generic.PHP.ForbiddenFunctions unless it's last in the function list
+- Fixed bug #2337sq-2337 : Generic.WhiteSpace.ScopeIndent incorrect error when multi-line function call starts on same line as open tag
+- Fixed bug #2348sq-2348 : Cache not invalidated when changing a ruleset included by another
+- Fixed bug #2376sq-2376 : Using __halt_compiler() breaks Generic.PHP.ForbiddenFunctions unless it's last in the function list
     - Thanks to Sijun Zhu@Billz95 for the patch
-- Fixed bug #2393 : The gitmodified filter will infinitely loop when encountering deleted file paths
+- Fixed bug #2393sq-2393 : The gitmodified filter will infinitely loop when encountering deleted file paths
     - Thanks to Lucas Manzke@lmanzke for the patch
-- Fixed bug #2396 : Generic.WhiteSpace.ScopeIndent incorrect error when multi-line IF condition mixed with HTML
-- Fixed bug #2431 : Use function/const not tokenized as T_STRING when preceded by comment
+- Fixed bug #2396sq-2396 : Generic.WhiteSpace.ScopeIndent incorrect error when multi-line IF condition mixed with HTML
+- Fixed bug #2431sq-2431 : Use function/const not tokenized as T_STRING when preceded by comment
+
+sq-2298: https://github.com/squizlabs/PHP_CodeSniffer/issues/2298
+sq-2337: https://github.com/squizlabs/PHP_CodeSniffer/issues/2337
+sq-2348: https://github.com/squizlabs/PHP_CodeSniffer/issues/2348
+sq-2376: https://github.com/squizlabs/PHP_CodeSniffer/issues/2376
+sq-2393: https://github.com/squizlabs/PHP_CodeSniffer/pull/2393
+sq-2396: https://github.com/squizlabs/PHP_CodeSniffer/issues/2396
+sq-2431: https://github.com/squizlabs/PHP_CodeSniffer/issues/2431
 
 ## 3.4.0 - 2018-12-20
+
 ### Deprecated
 - The Generic.Formatting.NoSpaceAfterCast sniff has been deprecated and will be removed in version 4
     - The functionality of this sniff is now available in the Generic.Formatting.SpaceAfterCast sniff
@@ -1483,7 +1700,7 @@
     - This change also converts '(binary)' from T_STRING_CAST to T_BINARY_CAST
     - Thanks to Juliette Reinders Folmer@jrfnl for the help with this patch
 - Array properties set inside a ruleset.xml file can now extend a previous value instead of always overwriting it
-    - e.g., if you include a ruleset that defines forbidden functions, can you now add to that list instead of having to   redefine it
+    - e.g., if you include a ruleset that defines forbidden functions, can you now add to that list instead of having to redefine it
     - To use this feature, add extends="true" to the property tag
         - e.g., property name="forbiddenFunctionNames" type="array" extend="true"
     - Thanks to Michael Moravec@Majkl578 for the patch
@@ -1527,7 +1744,7 @@
         - Squiz.Scope.MethodScope
         - Squiz.Scope.StaticThisUsage
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Generic.CodeAnalysis.UnusedFunctionParameter now only skips functions with empty bodies when the class implements an   interface
+- Generic.CodeAnalysis.UnusedFunctionParameter now only skips functions with empty bodies when the class implements an interface
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Generic.CodeAnalysis.UnusedFunctionParameter now has additional error codes to indicate where unused params were found
     - The new error code prefixes are:
@@ -1600,49 +1817,68 @@
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
 ### Fixed
-- Fixed bug #2109 : Generic.Functions.CallTimePassByReference false positive for bitwise and used in function argument
-- Fixed bug #2165 : Conflict between Squiz.Arrays.ArrayDeclaration and ScopeIndent sniffs when heredoc used in array
-- Fixed bug #2167 : Generic.WhiteSpace.ScopeIndent shows invalid error when scope opener indented inside inline HTML
-- Fixed bug #2178 : Generic.NamingConventions.ConstructorName matches methods in anon classes with same name as containing   class
+- Fixed bug #2109sq-2109 : Generic.Functions.CallTimePassByReference false positive for bitwise and used in function argument
+- Fixed bug #2165sq-2165 : Conflict between Squiz.Arrays.ArrayDeclaration and ScopeIndent sniffs when heredoc used in array
+- Fixed bug #2167sq-2167 : Generic.WhiteSpace.ScopeIndent shows invalid error when scope opener indented inside inline HTML
+- Fixed bug #2178sq-2178 : Generic.NamingConventions.ConstructorName matches methods in anon classes with same name as containing class
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2190 : PEAR.Functions.FunctionCallSignature incorrect error when encountering trailing PHPCS annotation
+- Fixed bug #2190sq-2190 : PEAR.Functions.FunctionCallSignature incorrect error when encountering trailing PHPCS annotation
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2194 : Generic.Whitespace.LanguageConstructSpacing should not be checking namespace operators
+- Fixed bug #2194sq-2194 : Generic.Whitespace.LanguageConstructSpacing should not be checking namespace operators
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2202 : Squiz.WhiteSpace.OperatorSpacing throws error for negative index when using curly braces for string   access
+- Fixed bug #2202sq-2202 : Squiz.WhiteSpace.OperatorSpacing throws error for negative index when using curly braces for string access
     - Same issue fixed in Squiz.Formatting.OperatorBracket
     - Thanks to Andreas Buchenrieder@anbuc for the patch
-- Fixed bug #2210 : Generic.NamingConventions.CamelCapsFunctionName not ignoring SoapClient __getCookies() method
+- Fixed bug #2210sq-2210 : Generic.NamingConventions.CamelCapsFunctionName not ignoring SoapClient __getCookies() method
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2211 : PSR2.Methods.MethodDeclaration gets confused over comments between modifier keywords
+- Fixed bug #2211sq-2211 : PSR2.Methods.MethodDeclaration gets confused over comments between modifier keywords
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2212 : FUNCTION and CONST in use groups being tokenised as T_FUNCTION and T_CONST
+- Fixed bug #2212sq-2212 : FUNCTION and CONST in use groups being tokenized as T_FUNCTION and T_CONST
     - Thanks to Chris Wilkinson@thewilkybarkid for the patch
-- Fixed bug #2214 : File::getMemberProperties() is recognizing method params as properties
+- Fixed bug #2214sq-2214 : File::getMemberProperties() is recognizing method params as properties
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2236 : Memory info measurement unit is Mb but probably should be MB
-- Fixed bug #2246 : CSS tokenizer does not tokenize class names correctly when they contain the string NEW
+- Fixed bug #2236sq-2236 : Memory info measurement unit is Mb but probably should be MB
+- Fixed bug #2246sq-2246 : CSS tokenizer does not tokenize class names correctly when they contain the string NEW
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2278 : Squiz.Operators.ComparisonOperatorUsage false positive when inline IF contained in parentheses
+- Fixed bug #2278sq-2278 : Squiz.Operators.ComparisonOperatorUsage false positive when inline IF contained in parentheses
     - Thanks to Arnout Boks@aboks for the patch
-- Fixed bug #2284 : Squiz.Functions.FunctionDeclarationArgumentSpacing removing type hint during fixing
+- Fixed bug #2284sq-2284 : Squiz.Functions.FunctionDeclarationArgumentSpacing removing type hint during fixing
     - Thanks to Michał Bundyra@michalbundyra for the patch
-- Fixed bug #2297 : Anonymous class not tokenized correctly when used as argument to another anon class
+- Fixed bug #2297sq-2297 : Anonymous class not tokenized correctly when used as argument to another anon class
     - Thanks to Michał Bundyra@michalbundyra for the patch
 
+sq-2109: https://github.com/squizlabs/PHP_CodeSniffer/pull/2109
+sq-2165: https://github.com/squizlabs/PHP_CodeSniffer/issues/2165
+sq-2167: https://github.com/squizlabs/PHP_CodeSniffer/issues/2167
+sq-2178: https://github.com/squizlabs/PHP_CodeSniffer/issues/2178
+sq-2190: https://github.com/squizlabs/PHP_CodeSniffer/pull/2190
+sq-2194: https://github.com/squizlabs/PHP_CodeSniffer/issues/2194
+sq-2202: https://github.com/squizlabs/PHP_CodeSniffer/pull/2202
+sq-2210: https://github.com/squizlabs/PHP_CodeSniffer/pull/2210
+sq-2211: https://github.com/squizlabs/PHP_CodeSniffer/pull/2211
+sq-2212: https://github.com/squizlabs/PHP_CodeSniffer/pull/2212
+sq-2214: https://github.com/squizlabs/PHP_CodeSniffer/pull/2214
+sq-2236: https://github.com/squizlabs/PHP_CodeSniffer/issues/2236
+sq-2246: https://github.com/squizlabs/PHP_CodeSniffer/pull/2246
+sq-2278: https://github.com/squizlabs/PHP_CodeSniffer/pull/2278
+sq-2284: https://github.com/squizlabs/PHP_CodeSniffer/issues/2284
+sq-2297: https://github.com/squizlabs/PHP_CodeSniffer/issues/2297
+
 ## 2.9.2 - 2018-11-08
+
 ### Changed
 - PHPCS should now run under PHP 7.3 without deprecation warnings
     - Thanks to Nick Wilde@NickDickinsonWilde for the patch
 
 ### Fixed
-- Fixed bug #1496 : Squiz.Strings.DoubleQuoteUsage not unescaping dollar sign when fixing
+- Fixed bug #1496sq-1496 : Squiz.Strings.DoubleQuoteUsage not unescaping dollar sign when fixing
     - Thanks to Michał Bundyra@michalbundyra for the patch
-- Fixed bug #1549 : Squiz.PHP.EmbeddedPhp fixer conflict with // comment before PHP close tag
+- Fixed bug #1549sq-1549 : Squiz.PHP.EmbeddedPhp fixer conflict with // comment before PHP close tag
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1890 : Incorrect Squiz.WhiteSpace.ControlStructureSpacing.NoLineAfterClose error between catch and finally statements
+- Fixed bug #1890sq-1890 : Incorrect Squiz.WhiteSpace.ControlStructureSpacing.NoLineAfterClose error between catch and finally statements
 
 ## 3.3.2 - 2018-09-24
+
 ### Changed
 - Fixed a problem where the report cache was not being cleared when the sniffs inside a standard were updated
 - The info report (--report=info) now has improved formatting for metrics that span multiple lines
@@ -1664,22 +1900,34 @@
 ### Fixed
 - Fixed a problem where referencing a relative file path in a ruleset XML file could add unnecessary sniff exclusions
     - This didn't actually exclude anything, but caused verbose output to list strange exclusion rules
-- Fixed bug #2110 : Squiz.WhiteSpace.FunctionSpacing is removing indents from the start of functions when fixing
+- Fixed bug #2110sq-2110 : Squiz.WhiteSpace.FunctionSpacing is removing indents from the start of functions when fixing
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2115 : Squiz.Commenting.VariableComment not checking var types when the @var line contains a comment
-- Fixed bug #2120 : Tokenizer fails to match T_INLINE_ELSE when used after function call containing closure
-- Fixed bug #2121 : Squiz.PHP.DisallowMultipleAssignments false positive in while loop conditions
+- Fixed bug #2115sq-2115 : Squiz.Commenting.VariableComment not checking var types when the @var line contains a comment
+- Fixed bug #2120sq-2120 : Tokenizer fails to match T_INLINE_ELSE when used after function call containing closure
+- Fixed bug #2121sq-2121 : Squiz.PHP.DisallowMultipleAssignments false positive in while loop conditions
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2127 : File::findExtendedClassName() doesn't support nested classes
+- Fixed bug #2127sq-2127 : File::findExtendedClassName() doesn't support nested classes
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2138 : Tokenizer detects wrong token for php ::class feature with spaces
-- Fixed bug #2143 : PSR2.Namespaces.UseDeclaration does not properly fix "use function" and "use const" statements
+- Fixed bug #2138sq-2138 : Tokenizer detects wrong token for PHP ::class feature with spaces
+- Fixed bug #2143sq-2143 : PSR2.Namespaces.UseDeclaration does not properly fix "use function" and "use const" statements
     - Thanks to Chris Wilkinson@thewilkybarkid for the patch
-- Fixed bug #2144 : Squiz.Arrays.ArrayDeclaration does incorrect align calculation in array with cyrillic keys
-- Fixed bug #2146 : Zend.Files.ClosingTag removes closing tag from end of file without inserting a semicolon
-- Fixed bug #2151 : XML schema not updated with the new array property syntax
+- Fixed bug #2144sq-2144 : Squiz.Arrays.ArrayDeclaration does incorrect align calculation in array with cyrillic keys
+- Fixed bug #2146sq-2146 : Zend.Files.ClosingTag removes closing tag from end of file without inserting a semicolon
+- Fixed bug #2151sq-2151 : XML schema not updated with the new array property syntax
+
+sq-2110: https://github.com/squizlabs/PHP_CodeSniffer/pull/2110
+sq-2115: https://github.com/squizlabs/PHP_CodeSniffer/issues/2115
+sq-2120: https://github.com/squizlabs/PHP_CodeSniffer/issues/2120
+sq-2121: https://github.com/squizlabs/PHP_CodeSniffer/pull/2121
+sq-2127: https://github.com/squizlabs/PHP_CodeSniffer/pull/2127
+sq-2138: https://github.com/squizlabs/PHP_CodeSniffer/issues/2138
+sq-2143: https://github.com/squizlabs/PHP_CodeSniffer/pull/2143
+sq-2144: https://github.com/squizlabs/PHP_CodeSniffer/issues/2144
+sq-2146: https://github.com/squizlabs/PHP_CodeSniffer/issues/2146
+sq-2151: https://github.com/squizlabs/PHP_CodeSniffer/issues/2151
 
 ## 3.3.1 - 2018-07-27
+
 ### Removed
 - Support for HHVM has been dropped due to recent unfixed bugs and HHVM refocus on Hack only
     - Thanks to Walt Sorensen@photodude and Juliette Reinders Folmer@jrfnl for helping to remove all HHVM exceptions from the core
@@ -1701,7 +1949,7 @@
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Generic.PHP.Syntax will now use PHP_BINARY instead of trying to discover the executable path
     - This ensures that the sniff will always syntax check files using the PHP version that PHPCS is running under
-    - Setting the php_path config var will still override this value as normal
+    - Setting the `php_path` config var will still override this value as normal
     - Thanks to Willem Stuursma-Ruwen@willemstuursma for the patch
 - PSR2.Namespaces.UseDeclaration now supports commas at the end of group use declarations
     - Also improves checking and fixing for use statements containing parse errors
@@ -1732,17 +1980,27 @@
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
 ### Fixed
-- Fixed bug #2029 : Squiz.Scope.MemberVarScope throws fatal error when a property is found in an interface
+- Fixed bug #2029sq-2029 : Squiz.Scope.MemberVarScope throws fatal error when a property is found in an interface
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2047 : PSR12.Classes.ClassInstantiation false positive when instantiating class from array index
-- Fixed bug #2048 : GenericFormatting.MultipleStatementAlignment false positive when assigning values inside an array
-- Fixed bug #2053 : PSR12.Classes.ClassInstantiation incorrectly fix when using member vars and some variable formats
-- Fixed bug #2065 : Generic.ControlStructures.InlineControlStructure fixing fails when inline control structure contains closure
-- Fixed bug #2072 : Squiz.Arrays.ArrayDeclaration throws NoComma error when array value is a shorthand IF statement
-- Fixed bug #2082 : File with "defined() or define()" syntax triggers PSR1.Files.SideEffects.FoundWithSymbols
-- Fixed bug #2095 : PSR2.Namespaces.NamespaceDeclaration does not handle namespaces defined over multiple lines
+- Fixed bug #2047sq-2047 : PSR12.Classes.ClassInstantiation false positive when instantiating class from array index
+- Fixed bug #2048sq-2048 : GenericFormatting.MultipleStatementAlignment false positive when assigning values inside an array
+- Fixed bug #2053sq-2053 : PSR12.Classes.ClassInstantiation incorrectly fix when using member vars and some variable formats
+- Fixed bug #2065sq-2065 : Generic.ControlStructures.InlineControlStructure fixing fails when inline control structure contains closure
+- Fixed bug #2072sq-2072 : Squiz.Arrays.ArrayDeclaration throws NoComma error when array value is a shorthand IF statement
+- Fixed bug #2082sq-2082 : File with "defined() or define()" syntax triggers PSR1.Files.SideEffects.FoundWithSymbols
+- Fixed bug #2095sq-2095 : PSR2.Namespaces.NamespaceDeclaration does not handle namespaces defined over multiple lines
+
+sq-2029: https://github.com/squizlabs/PHP_CodeSniffer/pull/2029
+sq-2047: https://github.com/squizlabs/PHP_CodeSniffer/issues/2047
+sq-2048: https://github.com/squizlabs/PHP_CodeSniffer/issues/2048
+sq-2053: https://github.com/squizlabs/PHP_CodeSniffer/issues/2053
+sq-2065: https://github.com/squizlabs/PHP_CodeSniffer/issues/2065
+sq-2072: https://github.com/squizlabs/PHP_CodeSniffer/issues/2072
+sq-2082: https://github.com/squizlabs/PHP_CodeSniffer/issues/2082
+sq-2095: https://github.com/squizlabs/PHP_CodeSniffer/issues/2095
 
 ## 3.3.0 - 2018-06-07
+
 ### Deprecated
 - The Squiz.WhiteSpace.LanguageConstructSpacing sniff has been deprecated and will be removed in version 4
     - The sniff has been moved to the Generic standard, with a new code of Generic.WhiteSpace.LanguageConstructSpacing
@@ -1809,8 +2067,8 @@
     - A new "Closure opening brace placement" metric now shows information for closures
 - Multi-line T_YIELD_FROM statements are now replicated properly for older PHP versions
 - The PSR2 standard no longer produces 2 error messages when the AS keyword in a foreach loop is not lowercase
-- Specifying a path to a non-existent dir when using the --report-reportType=/path/to/report CLI option no longer throws an exception
-    - This now prints a readable error message, as it does when using --report-file
+- Specifying a path to a non-existent dir when using the `--report-reportType=/path/to/report` CLI option no longer throws an exception
+    - This now prints a readable error message, as it does when using `--report-file`
 - The File::getMethodParamaters() method now includes a type_hint_token array index in the return value
     - Provides the position in the token stack of the first token in the type hint
 - The File::getMethodProperties() method now includes a return_type_token array index in the return value
@@ -1914,44 +2172,69 @@
     - If not set, the sniff will use whatever value is set for the existing 'spacing' property
 
 ### Fixed
-- Fixed bug #1863 : File::findEndOfStatement() not working when passed a scope opener
-- Fixed bug #1876 : PSR2.Namespaces.UseDeclaration not giving error for use statements before the namespace declaration
+- Fixed bug #1863sq-1863 : File::findEndOfStatement() not working when passed a scope opener
+- Fixed bug #1876sq-1876 : PSR2.Namespaces.UseDeclaration not giving error for use statements before the namespace declaration
     - Adds a new PSR2.Namespaces.UseDeclaration.UseBeforeNamespace error message
-- Fixed bug #1881 : Generic.Arrays.ArrayIndent is indenting sub-arrays incorrectly when comma not used after the last value
-- Fixed bug #1882 : Conditional with missing braces confused by indirect variables
-- Fixed bug #1915 : JS tokenizer fails to tokenize regular expression proceeded by boolean not operator
-- Fixed bug #1920 : Directory exclude pattern improperly excludes files with names that start the same
+- Fixed bug #1881sq-1881 : Generic.Arrays.ArrayIndent is indenting sub-arrays incorrectly when comma not used after the last value
+- Fixed bug #1882sq-1882 : Conditional with missing braces confused by indirect variables
+- Fixed bug #1915sq-1915 : JS tokenizer fails to tokenize regular expression proceeded by boolean not operator
+- Fixed bug #1920sq-1920 : Directory exclude pattern improperly excludes files with names that start the same
     - Thanks to Jeff Puckett@jpuck for the patch
-- Fixed bug #1922 : Equal sign alignment check broken when list syntax used before assignment operator
-- Fixed bug #1925 : Generic.Formatting.MultipleStatementAlignment skipping assignments within closures
-- Fixed bug #1931 : Generic opening brace placement sniffs do not correctly support function return types
-- Fixed bug #1932 : Generic.ControlStructures.InlineControlStructure fixer moves new PHPCS annotations
-- Fixed bug #1938 : Generic opening brace placement sniffs incorrectly move PHPCS annotations
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1939 : phpcs:set annotations do not cause the line they are on to be ignored
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1949 : Squiz.PHP.DisallowMultipleAssignments false positive when using namespaces with static assignments
-- Fixed bug #1959 : SquizMultiLineFunctionDeclaration error when param has trailing comment
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1963 : Squiz.Scope.MemberVarScope does not work for multiline member declaration
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1971 : Short array list syntax not correctly tokenized if short array is the first content in a file
-- Fixed bug #1979 : Tokenizer does not change heredoc to nowdoc token if the start tag contains spaces
-- Fixed bug #1982 : Squiz.Arrays.ArrayDeclaration fixer sometimes puts a comma in front of the last array value
-- Fixed bug #1993 : PSR1/PSR2 not reporting or fixing short open tags
-- Fixed bug #1996 : Custom report paths don't work on case-sensitive filesystems
-- Fixed bug #2006 : Squiz.Functions.FunctionDeclarationArgumentSpacing fixer removes comment between parens when no args
+- Fixed bug #1922sq-1922 : Equal sign alignment check broken when list syntax used before assignment operator
+- Fixed bug #1925sq-1925 : Generic.Formatting.MultipleStatementAlignment skipping assignments within closures
+- Fixed bug #1931sq-1931 : Generic opening brace placement sniffs do not correctly support function return types
+- Fixed bug #1932sq-1932 : Generic.ControlStructures.InlineControlStructure fixer moves new PHPCS annotations
+- Fixed bug #1938sq-1938 : Generic opening brace placement sniffs incorrectly move PHPCS annotations
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1939sq-1939 : phpcs:set annotations do not cause the line they are on to be ignored
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1949sq-1949 : Squiz.PHP.DisallowMultipleAssignments false positive when using namespaces with static assignments
+- Fixed bug #1959sq-1959 : SquizMultiLineFunctionDeclaration error when param has trailing comment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1963sq-1963 : Squiz.Scope.MemberVarScope does not work for multiline member declaration
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1971sq-1971 : Short array list syntax not correctly tokenized if short array is the first content in a file
+- Fixed bug #1979sq-1979 : Tokenizer does not change heredoc to nowdoc token if the start tag contains spaces
+- Fixed bug #1982sq-1982 : Squiz.Arrays.ArrayDeclaration fixer sometimes puts a comma in front of the last array value
+- Fixed bug #1993sq-1993 : PSR1/PSR2 not reporting or fixing short open tags
+- Fixed bug #1996sq-1996 : Custom report paths don't work on case-sensitive filesystems
+- Fixed bug #2006sq-2006 : Squiz.Functions.FunctionDeclarationArgumentSpacing fixer removes comment between parens when no args
     - The SpacingAfterOpenHint error message has been removed
-        - It is replaced by the the existing SpacingAfterOpen message
+        - It is replaced by the existing SpacingAfterOpen message
     - The error message format for the SpacingAfterOpen and SpacingBeforeClose messages has been changed
         - These used to contain 3 pieces of data, but now only contain 2
     - If you have customised the error messages of this sniff, please review your ruleset after upgrading
-- Fixed bug #2018 : Generic.Formatting.MultipleStatementAlignment does see PHP close tag as end of statement block
+- Fixed bug #2018sq-2018 : Generic.Formatting.MultipleStatementAlignment does see PHP close tag as end of statement block
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #2027 : PEAR.NamingConventions.ValidFunctionName error when function name includes double underscore
+- Fixed bug #2027sq-2027 : PEAR.NamingConventions.ValidFunctionName error when function name includes double underscore
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
+sq-1863: https://github.com/squizlabs/PHP_CodeSniffer/issues/1863
+sq-1876: https://github.com/squizlabs/PHP_CodeSniffer/issues/1876
+sq-1881: https://github.com/squizlabs/PHP_CodeSniffer/issues/1881
+sq-1882: https://github.com/squizlabs/PHP_CodeSniffer/issues/1882
+sq-1915: https://github.com/squizlabs/PHP_CodeSniffer/issues/1915
+sq-1920: https://github.com/squizlabs/PHP_CodeSniffer/issues/1920
+sq-1922: https://github.com/squizlabs/PHP_CodeSniffer/issues/1922
+sq-1925: https://github.com/squizlabs/PHP_CodeSniffer/issues/1925
+sq-1931: https://github.com/squizlabs/PHP_CodeSniffer/issues/1931
+sq-1932: https://github.com/squizlabs/PHP_CodeSniffer/issues/1932
+sq-1938: https://github.com/squizlabs/PHP_CodeSniffer/pull/1938
+sq-1939: https://github.com/squizlabs/PHP_CodeSniffer/pull/1939
+sq-1949: https://github.com/squizlabs/PHP_CodeSniffer/issues/1949
+sq-1959: https://github.com/squizlabs/PHP_CodeSniffer/issues/1959
+sq-1963: https://github.com/squizlabs/PHP_CodeSniffer/issues/1963
+sq-1971: https://github.com/squizlabs/PHP_CodeSniffer/issues/1971
+sq-1979: https://github.com/squizlabs/PHP_CodeSniffer/pull/1979
+sq-1982: https://github.com/squizlabs/PHP_CodeSniffer/issues/1982
+sq-1993: https://github.com/squizlabs/PHP_CodeSniffer/issues/1993
+sq-1996: https://github.com/squizlabs/PHP_CodeSniffer/issues/1996
+sq-2006: https://github.com/squizlabs/PHP_CodeSniffer/issues/2006
+sq-2018: https://github.com/squizlabs/PHP_CodeSniffer/pull/2018
+sq-2027: https://github.com/squizlabs/PHP_CodeSniffer/issues/2027
+
 ## 3.2.3 - 2018-02-21
+
 ### Changed
 - The new phpcs: comment syntax can now be prefixed with an at symbol ( @phpcs: )
     - This restores the behaviour of the previous syntax where these comments are ignored by doc generators
@@ -1989,30 +2272,44 @@
 
 ### Fixed
 - Fixed test suite compatibility with PHPUnit 7
-- Fixed bug #1793 : PSR2 forcing exact indent for function call opening statements
-- Fixed bug #1803 : Squiz.WhiteSpace.ScopeKeywordSpacing removes member var name while fixing if no space after scope keyword
-- Fixed bug #1817 : Blank line not enforced after control structure if comment on same line as closing brace
-- Fixed bug #1827 : A phpcs:enable comment is not tokenized correctly if it is outside a phpcs:disable block
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1828 : Squiz.WhiteSpace.SuperfluousWhiteSpace ignoreBlankLines property ignores whitespace after single line comments
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1840 : When a comment has too many asterisks, phpcbf gives FAILED TO FIX error
-- Fixed bug #1867 : Cant use phpcs:ignore where the next line is HTML
-- Fixed bug #1870 : Invalid warning in multiple assignments alignment with closure or anon class
-- Fixed bug #1890 : Incorrect Squiz.WhiteSpace.ControlStructureSpacing.NoLineAfterClose error between catch and finally statements
-- Fixed bug #1891 : Comment on last USE statement causes false positive for PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse
+- Fixed bug #1793sq-1793 : PSR2 forcing exact indent for function call opening statements
+- Fixed bug #1803sq-1803 : Squiz.WhiteSpace.ScopeKeywordSpacing removes member var name while fixing if no space after scope keyword
+- Fixed bug #1817sq-1817 : Blank line not enforced after control structure if comment on same line as closing brace
+- Fixed bug #1827sq-1827 : A phpcs:enable comment is not tokenized correctly if it is outside a phpcs:disable block
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1828sq-1828 : Squiz.WhiteSpace.SuperfluousWhiteSpace ignoreBlankLines property ignores whitespace after single line comments
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1840sq-1840 : When a comment has too many asterisks, phpcbf gives FAILED TO FIX error
+- Fixed bug #1867sq-1867 : Can't use phpcs:ignore where the next line is HTML
+- Fixed bug #1870sq-1870 : Invalid warning in multiple assignments alignment with closure or anon class
+- Fixed bug #1890sq-1890 : Incorrect Squiz.WhiteSpace.ControlStructureSpacing.NoLineAfterClose error between catch and finally statements
+- Fixed bug #1891sq-1891 : Comment on last USE statement causes false positive for PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse
     - Thanks to Matt Coleman@iammattcoleman, Daniel Hensby@dhensby, and Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1901 : Fixed PHPCS annotations in multi-line tab-indented comments + not ignoring whole line for phpcs:set
+- Fixed bug #1901sq-1901 : Fixed PHPCS annotations in multi-line tab-indented comments + not ignoring whole line for phpcs:set
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
+sq-1793: https://github.com/squizlabs/PHP_CodeSniffer/issues/1793
+sq-1803: https://github.com/squizlabs/PHP_CodeSniffer/issues/1803
+sq-1817: https://github.com/squizlabs/PHP_CodeSniffer/issues/1817
+sq-1827: https://github.com/squizlabs/PHP_CodeSniffer/pull/1827
+sq-1828: https://github.com/squizlabs/PHP_CodeSniffer/pull/1828
+sq-1840: https://github.com/squizlabs/PHP_CodeSniffer/issues/1840
+sq-1867: https://github.com/squizlabs/PHP_CodeSniffer/issues/1867
+sq-1870: https://github.com/squizlabs/PHP_CodeSniffer/issues/1870
+sq-1890: https://github.com/squizlabs/PHP_CodeSniffer/issues/1890
+sq-1891: https://github.com/squizlabs/PHP_CodeSniffer/issues/1891
+sq-1901: https://github.com/squizlabs/PHP_CodeSniffer/pull/1901
+
 ## 3.2.2 - 2017-12-20
+
 ### Changed
 - Disabled STDIN detection on Windows
     - This fixes a problem with IDE plugins (e.g., PHPStorm) hanging on Windows
 
 ## 3.2.1 - 2017-12-18
+
 ### Changed
-- Empty diffs are no longer followed by a newline character (request #1781)
+- Empty diffs are no longer followed by a newline character (request #1781sq-1781)
 - Generic.Functions.OpeningFunctionBraceKernighanRitchie no longer complains when the open brace is followed by a close tag
     - This makes the sniff more useful when used in templates
     - Thanks to Joseph Zidell@josephzidell for the patch
@@ -2020,9 +2317,13 @@
 ### Fixed
 - Fixed problems with some scripts and plugins waiting for STDIN
     - This was a notable problem with IDE plugins (e.g., PHPStorm) and build systems
-- Fixed bug #1782 : Incorrect detection of operator in ternary + anonymous function
+- Fixed bug #1782sq-1782 : Incorrect detection of operator in ternary + anonymous function
+
+sq-1781: https://github.com/squizlabs/PHP_CodeSniffer/issues/1781
+sq-1782: https://github.com/squizlabs/PHP_CodeSniffer/issues/1782
 
 ## 3.2.0 - 2017-12-13
+
 ### Deprecated
 - This release deprecates the @codingStandards comment syntax used for sending commands to PHP_CodeSniffer
     - The existing syntax will continue to work in all version 3 releases, but will be removed in version 4
@@ -2043,7 +2344,7 @@
         - phpcs:set has the token T_PHPCS_SET
 
 ### Changed
-- The phpcs:disable and phpcs:ignore comments can now selectively ignore specific sniffs (request #604)
+- The phpcs:disable and phpcs:ignore comments can now selectively ignore specific sniffs (request #604sq-604)
     - E.g., phpcs:disable Generic.Commenting.Todo.Found for a specific message
     - E.g., phpcs:disable Generic.Commenting.Todo for a whole sniff
     - E.g., phpcs:disable Generic.Commenting for a whole category of sniffs
@@ -2065,7 +2366,7 @@
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Added phpcs.xsd to allow validation of ruleset XML files
     - Thanks to Renaat De Muynck@renaatdemuynck for the contribution
-- File paths specified using --stdin-path can now point to fake file locations (request #1488)
+- File paths specified using --stdin-path can now point to fake file locations (request #1488sq-1488)
     - Previously, STDIN files using fake file paths were excluded from checking
 - Setting an empty basepath (--basepath=) on the CLI will now clear a basepath set directly in a ruleset
     - Thanks to Xaver Loppenstedt@xalopp for the patch
@@ -2126,65 +2427,98 @@
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
 ### Fixed
-- Fixed bug #1462 : Error processing cyrillic strings in Tokenizer
-- Fixed bug #1573 : Squiz.WhiteSpace.LanguageConstructSpacing does not properly check for tabs and newlines
+- Fixed bug #1462sq-1462 : Error processing cyrillic strings in Tokenizer
+- Fixed bug #1573sq-1573 : Squiz.WhiteSpace.LanguageConstructSpacing does not properly check for tabs and newlines
     - Thanks to Michał Bundyra@michalbundyra for the patch
-- Fixed bug #1590 : InlineControlStructure CBF issue while adding braces to an if thats returning a nested function
-- Fixed bug #1718 : Unclosed strings at EOF sometimes tokenized as T_WHITESPACE by the JS tokenizer
-- Fixed bug #1731 : Directory exclusions do not work as expected when a single file name is passed to phpcs
-- Fixed bug #1737 : Squiz.CSS.EmptyStyleDefinition sees comment as style definition and fails to report error
-- Fixed bug #1746 : Very large reports can sometimes become garbled when using the parallel option
-- Fixed bug #1747 : Squiz.Scope.StaticThisUsage incorrectly looking inside closures
-- Fixed bug #1757 : Unknown type hint "object" in Squiz.Commenting.FunctionComment
-- Fixed bug #1758 : PHPCS gets stuck creating file list when processing circular symlinks
-- Fixed bug #1761 : Generic.WhiteSpace.ScopeIndent error on multi-line function call with static closure argument
-- Fixed bug #1762 : Generic.WhiteSpace.DisallowSpace/TabIndent not inspecting content before open tag
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1769 : Custom "define" function triggers a warning about declaring new symbols
-- Fixed bug #1776 : Squiz.Scope.StaticThisUsage incorrectly looking inside anon classes
-- Fixed bug #1777 : Generic.WhiteSpace.ScopeIndent incorrect indent errors when self called function proceeded by comment
+- Fixed bug #1590sq-1590 : InlineControlStructure CBF issue while adding braces to an if that's returning a nested function
+- Fixed bug #1718sq-1718 : Unclosed strings at EOF sometimes tokenized as T_WHITESPACE by the JS tokenizer
+- Fixed bug #1731sq-1731 : Directory exclusions do not work as expected when a single file name is passed to phpcs
+- Fixed bug #1737sq-1737 : Squiz.CSS.EmptyStyleDefinition sees comment as style definition and fails to report error
+- Fixed bug #1746sq-1746 : Very large reports can sometimes become garbled when using the parallel option
+- Fixed bug #1747sq-1747 : Squiz.Scope.StaticThisUsage incorrectly looking inside closures
+- Fixed bug #1757sq-1757 : Unknown type hint "object" in Squiz.Commenting.FunctionComment
+- Fixed bug #1758sq-1758 : PHPCS gets stuck creating file list when processing circular symlinks
+- Fixed bug #1761sq-1761 : Generic.WhiteSpace.ScopeIndent error on multi-line function call with static closure argument
+- Fixed bug #1762sq-1762 : `Generic.WhiteSpace.DisallowSpace/TabIndent` not inspecting content before open tag
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1769sq-1769 : Custom "define" function triggers a warning about declaring new symbols
+- Fixed bug #1776sq-1776 : Squiz.Scope.StaticThisUsage incorrectly looking inside anon classes
+- Fixed bug #1777sq-1777 : Generic.WhiteSpace.ScopeIndent incorrect indent errors when self called function proceeded by comment
+
+sq-604: https://github.com/squizlabs/PHP_CodeSniffer/issues/604
+sq-1462: https://github.com/squizlabs/PHP_CodeSniffer/issues/1462
+sq-1488: https://github.com/squizlabs/PHP_CodeSniffer/issues/1488
+sq-1573: https://github.com/squizlabs/PHP_CodeSniffer/pull/1573
+sq-1590: https://github.com/squizlabs/PHP_CodeSniffer/issues/1590
+sq-1718: https://github.com/squizlabs/PHP_CodeSniffer/issues/1718
+sq-1731: https://github.com/squizlabs/PHP_CodeSniffer/issues/1731
+sq-1737: https://github.com/squizlabs/PHP_CodeSniffer/pull/1737
+sq-1746: https://github.com/squizlabs/PHP_CodeSniffer/issues/1746
+sq-1747: https://github.com/squizlabs/PHP_CodeSniffer/issues/1747
+sq-1757: https://github.com/squizlabs/PHP_CodeSniffer/issues/1757
+sq-1758: https://github.com/squizlabs/PHP_CodeSniffer/issues/1758
+sq-1761: https://github.com/squizlabs/PHP_CodeSniffer/issues/1761
+sq-1762: https://github.com/squizlabs/PHP_CodeSniffer/pull/1762
+sq-1769: https://github.com/squizlabs/PHP_CodeSniffer/issues/1769
+sq-1776: https://github.com/squizlabs/PHP_CodeSniffer/issues/1776
+sq-1777: https://github.com/squizlabs/PHP_CodeSniffer/issues/1777
 
 ## 3.1.1 - 2017-10-17
+
 ### Changed
 - Restored preference of non-dist files over dist files for phpcs.xml and phpcs.xml.dist
     - The order that the files are searched is now: .phpcs.xml, phpcs.xml, .phpcs.xml.dist, phpcs.xml.dist
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Progress output now correctly shows skipped files
-- Progress output now shows 100% when the file list has finished processing (request #1697)
+- Progress output now shows 100% when the file list has finished processing (request #1697sq-1697)
 - Stopped some IDEs complaining about testing class aliases
     - Thanks to Vytautas Stankus@svycka for the patch
 - Squiz.Commenting.InlineComment incorrectly identified comment blocks in some cases, muting some errors
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
 ### Fixed
-- Fixed bug #1512 : PEAR.Functions.FunctionCallSignature enforces spaces when no arguments if required spaces is not 0
-- Fixed bug #1522 : Squiz Arrays.ArrayDeclaration and Strings.ConcatenationSpacing fixers causing parse errors with here/  nowdocs
-- Fixed bug #1570 : Squiz.Arrays.ArrayDeclaration fixer removes comments between array keyword and open parentheses
-- Fixed bug #1604 : File::isReference has problems with some bitwise operators and class property references
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1645 : Squiz.Commenting.InlineComment will fail to fix comments at the end of the file
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1656 : Using the --sniffs argument has a problem with case sensitivity
-- Fixed bug #1657 : Uninitialized string offset: 0 when sniffing CSS
-- Fixed bug #1669 : Temporary expression proceeded by curly brace is detected as function call
-- Fixed bug #1681 : Huge arrays are super slow to scan with Squiz.Arrays.ArrayDeclaration sniff
-- Fixed bug #1694 : Squiz.Arrays.ArrayBracketSpacing is removing some comments during fixing
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1702 : Generic.WhiteSpaceDisallowSpaceIndent fixer bug when line only contains superfluous whitespace
+- Fixed bug #1512sq-1512 : PEAR.Functions.FunctionCallSignature enforces spaces when no arguments if required spaces is not 0
+- Fixed bug #1522sq-1522 : Squiz Arrays.ArrayDeclaration and Strings.ConcatenationSpacing fixers causing parse errors with here/nowdocs
+- Fixed bug #1570sq-1570 : Squiz.Arrays.ArrayDeclaration fixer removes comments between array keyword and open parentheses
+- Fixed bug #1604sq-1604 : File::isReference has problems with some bitwise operators and class property references
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1645sq-1645 : Squiz.Commenting.InlineComment will fail to fix comments at the end of the file
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1656sq-1656 : Using the --sniffs argument has a problem with case sensitivity
+- Fixed bug #1657sq-1657 : Uninitialized string offset: 0 when sniffing CSS
+- Fixed bug #1669sq-1669 : Temporary expression proceeded by curly brace is detected as function call
+- Fixed bug #1681sq-1681 : Huge arrays are super slow to scan with Squiz.Arrays.ArrayDeclaration sniff
+- Fixed bug #1694sq-1694 : Squiz.Arrays.ArrayBracketSpacing is removing some comments during fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1702sq-1702 : Generic.WhiteSpaceDisallowSpaceIndent fixer bug when line only contains superfluous whitespace
+
+sq-1512: https://github.com/squizlabs/PHP_CodeSniffer/issues/1512
+sq-1522: https://github.com/squizlabs/PHP_CodeSniffer/issues/1522
+sq-1570: https://github.com/squizlabs/PHP_CodeSniffer/issues/1570
+sq-1604: https://github.com/squizlabs/PHP_CodeSniffer/issues/1604
+sq-1645: https://github.com/squizlabs/PHP_CodeSniffer/pull/1645
+sq-1656: https://github.com/squizlabs/PHP_CodeSniffer/pull/1656
+sq-1657: https://github.com/squizlabs/PHP_CodeSniffer/issues/1657
+sq-1669: https://github.com/squizlabs/PHP_CodeSniffer/issues/1669
+sq-1681: https://github.com/squizlabs/PHP_CodeSniffer/issues/1681
+sq-1694: https://github.com/squizlabs/PHP_CodeSniffer/pull/1694
+sq-1697: https://github.com/squizlabs/PHP_CodeSniffer/issues/1697
+sq-1702: https://github.com/squizlabs/PHP_CodeSniffer/pull/1702
 
 ## 3.1.0 - 2017-09-20
+
 ### Changed
 - This release includes a change to support newer versions of PHPUnit (versions 4, 5, and 6 are now supported)
     - The custom PHP_CodeSniffer test runner now requires a bootstrap file
     - Developers with custom standards using the PHP_CodeSniffer test runner will need to do one of the following:
-      - run your unit tests from the PHP_CodeSniffer root dir so the bootstrap file is included
-      - specify the PHP_CodeSniffer bootstrap file on the command line: phpunit --bootstrap=/path/to/phpcs/tests/bootstrap.php
-      - require the PHP_CodeSniffer bootstrap file from your own bootstrap file
+        - run your unit tests from the PHP_CodeSniffer root dir so the bootstrap file is included
+        - specify the PHP_CodeSniffer bootstrap file on the command line: `phpunit --bootstrap=/path/to/phpcs/tests/bootstrap.php`
+        - require the PHP_CodeSniffer bootstrap file from your own bootstrap file
     - If you don't run PHP_CodeSniffer unit tests, this change will not affect you
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - A phpcs.xml or phpcs.xml.dist file now takes precedence over the default_standard config setting
     - Thanks to Björn Fischer@Fischer-Bjoern for the patch
-- Both phpcs.xml and phpcs.xml.dist files can now be prefixed with a dot (request #1566)
+- Both phpcs.xml and phpcs.xml.dist files can now be prefixed with a dot (request #1566sq-1566)
     - The order that the files are searched is: .phpcs.xml, .phpcs.xml.dist, phpcs.xml, phpcs.xml.dist
 - The autoloader will now search for files during unit tests runs from the same locations as during normal phpcs runs
     - Allows for easier unit testing of custom standards that use helper classes or custom namespaces
@@ -2206,7 +2540,7 @@
 - Added Generic.Files.OneObjectStructurePerFile sniff to ensure there is a single class/interface/trait per file
     - Thanks to Mponos George@gmponos for the contribution
 - Function call sniffs now check variable function names and self/static object creation
-    - Specific sniffs are Generic.Functions.FunctionCallArgumentSpacing, PEAR.Functions.FunctionCallSignature, and   PSR2.Methods.FunctionCallSignature
+    - Specific sniffs are Generic.Functions.FunctionCallArgumentSpacing, PEAR.Functions.FunctionCallSignature, and PSR2.Methods.FunctionCallSignature
     - Thanks to Michał Bundyra@michalbundyra for the patch
 - Generic.Files.LineLength can now be configured to ignore all comment lines, no matter their length
     - Set the ignoreComments property to TRUE (default is FALSE) in your ruleset.xml file to enable this
@@ -2235,22 +2569,34 @@
     - Thanks to Martin Hujer@mhujer for the patch
 
 ### Fixed
-- Fixed bug #1550 : Squiz.Commenting.FunctionComment false positive when function contains closure
-- Fixed bug #1577 : Generic.InlineControlStructureSniff breaks with a comment between body and condition in do while loops
-- Fixed bug #1581 : Sniffs not loaded when one-standard directories are being registered in installed_paths
-- Fixed bug #1591 : Autoloader failing to load arbitrary files when installed_paths only set via a custom ruleset
-- Fixed bug #1605 : Squiz.WhiteSpace.OperatorSpacing false positive on unary minus after comment
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1615 : Uncaught RuntimeException when phpcbf fails to fix files
-- Fixed bug #1637 : Generic.WhiteSpaceScopeIndent closure argument indenting incorrect with multi-line strings
-- Fixed bug #1638 : Squiz.WhiteSpace.ScopeClosingBrace closure argument indenting incorrect with multi-line strings
-- Fixed bug #1640 : Squiz.Strings.DoubleQuoteUsage replaces tabs with spaces when fixing
-    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1550sq-1550 : Squiz.Commenting.FunctionComment false positive when function contains closure
+- Fixed bug #1577sq-1577 : Generic.InlineControlStructureSniff breaks with a comment between body and condition in do while loops
+- Fixed bug #1581sq-1581 : Sniffs not loaded when one-standard directories are being registered in installed_paths
+- Fixed bug #1591sq-1591 : Autoloader failing to load arbitrary files when installed_paths only set via a custom ruleset
+- Fixed bug #1605sq-1605 : Squiz.WhiteSpace.OperatorSpacing false positive on unary minus after comment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1615sq-1615 : Uncaught RuntimeException when phpcbf fails to fix files
+- Fixed bug #1637sq-1637 : Generic.WhiteSpaceScopeIndent closure argument indenting incorrect with multi-line strings
+- Fixed bug #1638sq-1638 : Squiz.WhiteSpace.ScopeClosingBrace closure argument indenting incorrect with multi-line strings
+- Fixed bug #1640sq-1640 : Squiz.Strings.DoubleQuoteUsage replaces tabs with spaces when fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+sq-1550: https://github.com/squizlabs/PHP_CodeSniffer/issues/1550
+sq-1566: https://github.com/squizlabs/PHP_CodeSniffer/issues/1566
+sq-1577: https://github.com/squizlabs/PHP_CodeSniffer/issues/1577
+sq-1581: https://github.com/squizlabs/PHP_CodeSniffer/pull/1581
+sq-1591: https://github.com/squizlabs/PHP_CodeSniffer/issues/1591
+sq-1605: https://github.com/squizlabs/PHP_CodeSniffer/issues/1605
+sq-1615: https://github.com/squizlabs/PHP_CodeSniffer/issues/1615
+sq-1637: https://github.com/squizlabs/PHP_CodeSniffer/issues/1637
+sq-1638: https://github.com/squizlabs/PHP_CodeSniffer/issues/1638
+sq-1640: https://github.com/squizlabs/PHP_CodeSniffer/pull/1640
 
 ## 3.0.2 - 2017-07-18
+
 ### Changed
 - The code report now gracefully handles tokenizer exceptions
-- The phpcs and phpcbf scripts and now the only places that exit() in the code
+- The phpcs and phpcbf scripts are now the only places that exit() in the code
     - This allows for easier usage of core PHPCS functions from external scripts
     - If you are calling Runner::runPHPCS() or Runner::runPHPCBF() directly, you will get back the full range of exit codes
     - If not, catch the new DeepExitException to get the error message ($e->getMessage()) and exit code ($e->getCode());
@@ -2265,22 +2611,34 @@
 ### Fixed
 - Fixed a problem where the source report was not printing the correct number of errors found
 - Fixed a problem where the --cache=/path/to/cachefile CLI argument was not working
-- Fixed bug #1465 : Generic.WhiteSpace.ScopeIndent reports incorrect errors when indenting double arrows in short arrays
-- Fixed bug #1478 : Indentation in fallthrough CASE that contains a closure
-- Fixed bug #1497 : Fatal error if composer prepend-autoloader is set to false
+- Fixed bug #1465sq-1465 : Generic.WhiteSpace.ScopeIndent reports incorrect errors when indenting double arrows in short arrays
+- Fixed bug #1478sq-1478 : Indentation in fallthrough CASE that contains a closure
+- Fixed bug #1497sq-1497 : Fatal error if composer prepend-autoloader is set to false
     - Thanks to Kunal Mehta@legoktm for the patch
-- Fixed bug #1503 : Alternative control structure syntax not always recognized as scoped
-- Fixed bug #1523 : Fatal error when using the --suffix argument
+- Fixed bug #1503sq-1503 : Alternative control structure syntax not always recognized as scoped
+- Fixed bug #1523sq-1523 : Fatal error when using the --suffix argument
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1526 : Use of basepath setting can stop PHPCBF being able to write fixed files
-- Fixed bug #1530 : Generic.WhiteSpace.ScopeIndent can increase indent too much for lines within code blocks
-- Fixed bug #1547 : Wrong token type for backslash in use function
+- Fixed bug #1526sq-1526 : Use of basepath setting can stop PHPCBF being able to write fixed files
+- Fixed bug #1530sq-1530 : Generic.WhiteSpace.ScopeIndent can increase indent too much for lines within code blocks
+- Fixed bug #1547sq-1547 : Wrong token type for backslash in use function
     - Thanks to Michał Bundyra@michalbundyra for the patch
-- Fixed bug #1549 : Squiz.PHP.EmbeddedPhp fixer conflict with // comment before PHP close tag
+- Fixed bug #1549sq-1549 : Squiz.PHP.EmbeddedPhp fixer conflict with // comment before PHP close tag
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1560 : Squiz.Commenting.FunctionComment fatal error when fixing additional param comment lines that have no indent
+- Fixed bug #1560sq-1560 : Squiz.Commenting.FunctionComment fatal error when fixing additional param comment lines that have no indent
+
+sq-1465: https://github.com/squizlabs/PHP_CodeSniffer/issues/1465
+sq-1478: https://github.com/squizlabs/PHP_CodeSniffer/issues/1478
+sq-1497: https://github.com/squizlabs/PHP_CodeSniffer/issues/1497
+sq-1503: https://github.com/squizlabs/PHP_CodeSniffer/issues/1503
+sq-1523: https://github.com/squizlabs/PHP_CodeSniffer/pull/1523
+sq-1526: https://github.com/squizlabs/PHP_CodeSniffer/issues/1526
+sq-1530: https://github.com/squizlabs/PHP_CodeSniffer/issues/1530
+sq-1547: https://github.com/squizlabs/PHP_CodeSniffer/issues/1547
+sq-1549: https://github.com/squizlabs/PHP_CodeSniffer/issues/1549
+sq-1560: https://github.com/squizlabs/PHP_CodeSniffer/issues/1560
 
 ## 3.0.1 - 2017-06-14
+
 ### Security
 - This release contains a fix for a security advisory related to the improper handling of a shell command
     - A properly crafted filename would allow for arbitrary code execution when using the --filter=gitmodified command line option
@@ -2297,7 +2655,7 @@
 - PHPCS now stops looking for a phpcs.xml file as soon as one is found, favoring the closest one to the current dir
 - Added missing help text for the --stdin-path CLI option to --help
 - Re-added missing help text for the --file-list and --bootstrap CLI options to --help
-- Runner::runPHPCS() and Runner::runPHPCBF() now return an exit code instead of exiting directly (request #1484)
+- Runner::runPHPCS() and Runner::runPHPCBF() now return an exit code instead of exiting directly (request #1484sq-1484)
 - The Squiz standard now enforces short array syntax by default
 - The autoloader is now working correctly with classes created with class_alias()
 - The autoloader will now search for files inside all directories in the installed_paths config var
@@ -2318,34 +2676,50 @@
 ### Fixed
 - Fixed a problem where excluding a message from a custom standard's own sniff would exclude the whole sniff
     - This caused some PSR2 errors to be under-reported
-- Fixed bug #1442 : T_NULLABLE detection not working for nullable parameters and return type hints in some cases
-- Fixed bug #1447 : Running the unit tests with a phpunit config file breaks the test suite
+- Fixed bug #1442sq-1442 : T_NULLABLE detection not working for nullable parameters and return type hints in some cases
+- Fixed bug #1447sq-1447 : Running the unit tests with a PHPUnit config file breaks the test suite
     - Unknown arguments were not being handled correctly, but are now stored in $config->unknown
-- Fixed bug #1449 : Generic.Classes.OpeningBraceSameLine doesn't detect comment before opening brace
+- Fixed bug #1449sq-1449 : Generic.Classes.OpeningBraceSameLine doesn't detect comment before opening brace
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1450 : Coding standard located under an installed_path with the same directory name throws an error
+- Fixed bug #1450sq-1450 : Coding standard located under an installed_path with the same directory name throws an error
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1451 : Sniff exclusions/restrictions dont work with custom sniffs unless they use the PHP_CodeSniffer NS
-- Fixed bug #1454 : Squiz.WhiteSpace.OperatorSpacing is not checking spacing on either side of a short ternary operator
+- Fixed bug #1451sq-1451 : Sniff exclusions/restrictions don't work with custom sniffs unless they use the PHP_CodeSniffer NS
+- Fixed bug #1454sq-1454 : Squiz.WhiteSpace.OperatorSpacing is not checking spacing on either side of a short ternary operator
     - Thanks to Mponos George@gmponos for the patch
-- Fixed bug #1495 : Setting an invalid installed path breaks all commands
-- Fixed bug #1496 : Squiz.Strings.DoubleQuoteUsage not unescaping dollar sign when fixing
+- Fixed bug #1495sq-1495 : Setting an invalid installed path breaks all commands
+- Fixed bug #1496sq-1496 : Squiz.Strings.DoubleQuoteUsage not unescaping dollar sign when fixing
     - Thanks to Michał Bundyra@michalbundyra for the patch
-- Fixed bug #1501 : Interactive mode is broken
-- Fixed bug #1504 : PSR2.Namespaces.UseDeclaration hangs fixing use statement with no trailing code
+- Fixed bug #1501sq-1501 : Interactive mode is broken
+- Fixed bug #1504sq-1504 : PSR2.Namespaces.UseDeclaration hangs fixing use statement with no trailing code
+
+sq-1447: https://github.com/squizlabs/PHP_CodeSniffer/issues/1447
+sq-1449: https://github.com/squizlabs/PHP_CodeSniffer/pull/1449
+sq-1450: https://github.com/squizlabs/PHP_CodeSniffer/pull/1450
+sq-1451: https://github.com/squizlabs/PHP_CodeSniffer/pull/1451
+sq-1454: https://github.com/squizlabs/PHP_CodeSniffer/pull/1454
+sq-1484: https://github.com/squizlabs/PHP_CodeSniffer/issues/1484
+sq-1495: https://github.com/squizlabs/PHP_CodeSniffer/issues/1495
+sq-1496: https://github.com/squizlabs/PHP_CodeSniffer/pull/1496
+sq-1501: https://github.com/squizlabs/PHP_CodeSniffer/issues/1501
+sq-1504: https://github.com/squizlabs/PHP_CodeSniffer/issues/1504
 
 ## 2.9.1 - 2017-05-22
+
 ### Fixed
-- Fixed bug #1442 : T_NULLABLE detection not working for nullable parameters and return type hints in some cases
-- Fixed bug #1448 : Generic.Classes.OpeningBraceSameLine doesn't detect comment before opening brace
+- Fixed bug #1442sq-1442 : T_NULLABLE detection not working for nullable parameters and return type hints in some cases
+- Fixed bug #1448sq-1448 : Generic.Classes.OpeningBraceSameLine doesn't detect comment before opening brace
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 
+sq-1442: https://github.com/squizlabs/PHP_CodeSniffer/pull/1442
+sq-1448: https://github.com/squizlabs/PHP_CodeSniffer/pull/1448
+
 ## 3.0.0 - 2017-05-04
+
 ### Changed
-- Added an --ignore-annotations command line argument to ignore all @codingStandards annotations in code comments (request #811)
+- Added an --ignore-annotations command line argument to ignore all @codingStandards annotations in code comments (request #811sq-811)
 - This allows you to force errors to be shown that would otherwise be ignored by code comments
-    - Also stop files being able to change sniff properties mid way through processing
-- An error is now reported if no sniffs were registered to be run (request #1129)
+    - Also stop files being able to change sniff properties midway through processing
+- An error is now reported if no sniffs were registered to be run (request #1129sq-1129)
 - The autoloader will now search for files inside the directory of any loaded coding standard
     - This allows autoloading of any file inside a custom coding standard without manually requiring them
     - Ensure your namespace begins with your coding standard's directory name and follows PSR-4
@@ -2360,10 +2734,15 @@
 - Includes all changes from the 2.9.0 release
 
 ### Fixed
-- Fixed bug #834 : PSR2.ControlStructures.SwitchDeclaration does not handle if branches with returns
+- Fixed bug #834sq-834 : PSR2.ControlStructures.SwitchDeclaration does not handle if branches with returns
     - Thanks to Fabian Wiget@fabacino for the patch
 
+sq-811: https://github.com/squizlabs/PHP_CodeSniffer/issues/811
+sq-834: https://github.com/squizlabs/PHP_CodeSniffer/issues/834
+sq-1129: https://github.com/squizlabs/PHP_CodeSniffer/issues/1129
+
 ## 3.0.0RC4 - 2017-03-02
+
 ### Security
 - This release contains a fix for a security advisory related to the improper handling of shell commands
     - Uses of shell_exec() and exec() were not escaping filenames and configuration settings in most cases
@@ -2393,20 +2772,24 @@
 - Includes all changes from the 2.8.1 release
 
 ### Fixed
-- Fixed bug #1333 : The new autoloader breaks some frameworks with custom autoloaders
-- Fixed bug #1334 : Undefined offset when explaining standard with custom sniffs
+- Fixed bug #1333sq-1333 : The new autoloader breaks some frameworks with custom autoloaders
+- Fixed bug #1334sq-1334 : Undefined offset when explaining standard with custom sniffs
+
+sq-1333: https://github.com/squizlabs/PHP_CodeSniffer/issues/1333
+sq-1334: https://github.com/squizlabs/PHP_CodeSniffer/issues/1334
 
 ## 3.0.0RC3 - 2017-02-02
+
 ### Changed
 - Added support for ES6 class declarations
     - Previously, these class were tokenized as JS objects but are now tokenized as normal T_CLASS structures
 - Added support for ES6 method declarations, where the "function" keyword is not used
-    - Previously, these methods were tokenized as JS objects (fixes bug #1251)
+    - Previously, these methods were tokenized as JS objects (fixes bug #1251sq-1251)
     - The name of the ES6 method is now assigned the T_FUNCTION keyword and treated like a normal function
-    - Custom sniffs that support JS and listen for T_FUNCTION tokens can't assume the token represents the word   "function"
+    - Custom sniffs that support JS and listen for T_FUNCTION tokens can't assume the token represents the word "function"
     - Check the contents of the token first, or use $phpcsFile->getDeclarationName($stackPtr) if you just want its name
     - There is no change for custom sniffs that only check PHP code
-- PHPCBF exit codes have been changed so they are now more useful (request #1270)
+- PHPCBF exit codes have been changed so they are now more useful (request #1270sq-1270)
     - Exit code 0 is now used to indicate that no fixable errors were found, and so nothing was fixed
     - Exit code 1 is now used to indicate that all fixable errors were fixed correctly
     - Exit code 2 is now used to indicate that PHPCBF failed to fix some of the fixable errors it found
@@ -2418,26 +2801,37 @@
 - Fixed an issue where excluding a file using a @codingStandardsIgnoreFile comment would produce errors
     - For PHPCS, it would show empty files being processed
     - For PHPCBF, it would produce a PHP error
-- Fixed bug #1233 : Can't set config data inside ruleset.xml file
-- Fixed bug #1241 : CodeSniffer.conf not working with 3.x PHAR file
+- Fixed bug #1233sq-1233 : Can't set config data inside ruleset.xml file
+- Fixed bug #1241sq-1241 : CodeSniffer.conf not working with 3.x PHAR file
+
+sq-1233: https://github.com/squizlabs/PHP_CodeSniffer/issues/1233
+sq-1241: https://github.com/squizlabs/PHP_CodeSniffer/issues/1241
+sq-1251: https://github.com/squizlabs/PHP_CodeSniffer/issues/1251
+sq-1270: https://github.com/squizlabs/PHP_CodeSniffer/issues/1270
 
 ## 3.0.0RC2 - 2016-11-30
+
 ### Changed
 - Made the Runner class easier to use with wrapper scripts
-- Full usage information is no longer printed when a usage error is encountered (request #1186)
+- Full usage information is no longer printed when a usage error is encountered (request #1186sq-1186)
     - Makes it a lot easier to find and read the error message that was printed
 - Includes all changes from the 2.7.1 release
 
 ### Fixed
 - Fixed an undefined var name error that could be produced while running PHPCBF
-- Fixed bug #1167 : 3.0.0RC1 PHAR does not work with PEAR standard
-- Fixed bug #1208 : Excluding files doesn't work when using STDIN with a filename specified
+- Fixed bug #1167sq-1167 : 3.0.0RC1 PHAR does not work with PEAR standard
+- Fixed bug #1208sq-1208 : Excluding files doesn't work when using STDIN with a filename specified
+
+sq-1167: https://github.com/squizlabs/PHP_CodeSniffer/issues/1167
+sq-1186: https://github.com/squizlabs/PHP_CodeSniffer/issues/1186
+sq-1208: https://github.com/squizlabs/PHP_CodeSniffer/issues/1208
 
 ## 3.0.0RC1 - 2016-09-02
+
 ### Changed
 - Progress output now shows E and W in green when a file has fixable errors or warnings
     - Only supported if colors are enabled
-- PHPCBF no longer produces verbose output by default (request #699)
+- PHPCBF no longer produces verbose output by default (request #699sq-699)
     - Use the -v command line argument to show verbose fixing output
     - Use the -q command line argument to disable verbose information if enabled by default
 - PHPBF now prints a summary report after fixing files
@@ -2452,37 +2846,40 @@
 ### Fixed
 - Fixed shell error appearing on some systems when trying to find executable paths
 
+sq-699: https://github.com/squizlabs/PHP_CodeSniffer/issues/699
+
 ## 3.0.0a1 - 2016-07-20
+
 ### Changed
 - Min PHP version increased from 5.1.2 to 5.4.0
-- Added optional caching of results between runs (request #530)
+- Added optional caching of results between runs (request #530sq-530)
     - Enable the cache by using the --cache command line argument
     - If you want the cache file written somewhere specific, use --cache=/path/to/cacheFile
     - Use the command "phpcs --config-set cache true" to turn caching on by default
     - Use the --no-cache command line argument to disable caching if it is being turned on automatically
-- Add support for checking file in parallel (request #421)
+- Add support for checking file in parallel (request #421sq-421)
     - Tell PHPCS how many files to check at once using the --parallel command line argument
     - To check 100 files at once, using --parallel=100
     - To disable parallel checking if it is being turned on automatically, use --parallel=1
     - Requires PHP to be compiled with the PCNTL package
-- The default encoding has been changed from iso-8859-1 to utf-8 (request #760)
+- The default encoding has been changed from iso-8859-1 to utf-8 (request #760sq-760)
     - The --encoding command line argument still works, but you no longer have to set it to process files as utf-8
     - If encoding is being set to utf-8 in a ruleset or on the CLI, it can be safely removed
     - If the iconv PHP extension is not installed, standard non-multibyte aware functions will be used
-- Added a new "code" report type to show a code snippet for each error (request #419)
+- Added a new "code" report type to show a code snippet for each error (request #419sq-419)
     - The line containing the error is printed, along with 2 lines above and below it to show context
     - The location of the errors is underlined in the code snippet if you also use --colors
     - Use --report=code to generate this report
 - Added support for custom filtering of the file list
     - Developers can write their own filter classes to perform custom filtering of the list before the run starts
-    - Use the command line arg --filter=/path/to/filter.php to specify a filter to use
+    - Use the command line arg `--filter=/path/to/filter.php` to specify a filter to use
     - Extend \PHP_CodeSniffer\Filters\Filter to also support the core PHPCS extension and path filtering
     - Extend \PHP_CodeSniffer\Filters\ExactMatch to get the core filtering and the ability to use blacklists and whitelists
     - The included \PHP_CodeSniffer\Filters\GitModified filter is a good example of an ExactMatch filter
 - Added support for only checking files that have been locally modified or added in a git repo
     - Use --filter=gitmodified to check these files
     - You still need to give PHPCS a list of files or directories in which to check
-- Added automatic discovery of executable paths (request #571)
+- Added automatic discovery of executable paths (request #571sq-571)
     - Thanks to Sergei Morozov@morozov for the patch
 - You must now pass "-" on the command line to have PHPCS wait for STDIN
     - E.g., phpcs --standard=PSR2 -
@@ -2492,14 +2889,14 @@
     - This should stop bugs inside sniffs causing infinite loops
     - Also stops invalid reports being produced as errors don't print to the screen directly
 - Sniff codes are no longer optional
-    - If a sniff throws and error or a warning, it must specify an internal code for that message
+    - If a sniff throws an error or a warning, it must specify an internal code for that message
 - The installed_paths config setting can now point directly to a standard
     - Previously, it had to always point to the directory in which the standard lives
 - Multiple reports can now be specified using the --report command line argument
     - Report types are separated by commas
     - E.g., --report=full,summary,info
     - Previously, you had to use one argument for each report such as --report=full --report=summary --report=info
-- You can now set the severity, message type, and exclude patterns for and entire sniff, category, or standard
+- You can now set the severity, message type, and exclude patterns for an entire sniff, category, or standard
     - Previously, this was only available for a single message
 - You can now include a single sniff code in a ruleset instead of having to include an entire sniff
     - Including a sniff code will automatically exclude all other messages from that sniff
@@ -2507,17 +2904,17 @@
 - PHPCBF no longer uses patch
     - Files are now always overwritten
     - The --no-patch option has been removed
-- Added a --basepath option to strip a directory from the front of file paths in output (request #470)
+- Added a --basepath option to strip a directory from the front of file paths in output (request #470sq-470)
     - The basepath is absolute or relative to the current directory
     - E.g., to output paths relative to current dir in reports, use --basepath=.
-- Ignore rules are now checked when using STDIN (request #733)
-- Added an include-pattern tag to rulesets to include a sniff for specific files and folders only (request #656)
+- Ignore rules are now checked when using STDIN (request #733sq-733)
+- Added an include-pattern tag to rulesets to include a sniff for specific files and folders only (request #656sq-656)
     - This is the exact opposite of the exclude-pattern tag
     - This option is only usable within sniffs, not globally like exclude-patterns are
 - Added a new -m option to stop error messages from being recorded, which saves a lot of memory
     - PHPCBF always uses this setting to reduce memory as it never outputs error messages
     - Setting the $recordErrors member var inside custom report classes is no longer supported (use -m instead)
-- Exit code 2 is now used to indicate fixable errors were found (request #930)
+- Exit code 2 is now used to indicate fixable errors were found (request #930sq-930)
     - Exit code 3 is now used for general script execution errors
     - Exit code 1 is used to indicate that coding standard errors were found, but none are fixable
     - Exit code 0 is unchanged and continues to mean no coding standard errors found
@@ -2529,7 +2926,18 @@
 - The included SVN pre-commit hook has been removed
     - Hooks for version control systems will no longer be maintained within the PHPCS project
 
+sq-419: https://github.com/squizlabs/PHP_CodeSniffer/issues/419
+sq-421: https://github.com/squizlabs/PHP_CodeSniffer/issues/421
+sq-470: https://github.com/squizlabs/PHP_CodeSniffer/issues/470
+sq-530: https://github.com/squizlabs/PHP_CodeSniffer/issues/530
+sq-571: https://github.com/squizlabs/PHP_CodeSniffer/pull/571
+sq-656: https://github.com/squizlabs/PHP_CodeSniffer/issues/656
+sq-733: https://github.com/squizlabs/PHP_CodeSniffer/issues/733
+sq-760: https://github.com/squizlabs/PHP_CodeSniffer/issues/760
+sq-930: https://github.com/squizlabs/PHP_CodeSniffer/issues/930
+
 ## 2.9.0 - 2017-05-04
+
 ### Changed
 - Added Generic.Debug.ESLint sniff to run ESLint over JS files and report errors
     - Set eslint path using: phpcs --config-set eslint_path /path/to/eslint
@@ -2545,7 +2953,7 @@
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - PEAR.Commenting.ClassComment now supports checking of traits as well as classes and interfaces
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Squiz.Commenting.FunctionCommentThrowTag now supports re-throwing exceptions (request #946)
+- Squiz.Commenting.FunctionCommentThrowTag now supports re-throwing exceptions (request #946sq-946)
     - Thanks to Samuel Levy@samlev for the patch
 - Squiz.PHP.DisallowMultipleAssignments now ignores PHP4-style member var assignments
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
@@ -2556,22 +2964,36 @@
 - Added missing error codes for a couple of sniffs so they can now be customised as normal
 
 ### Fixed
-- Fixed bug #1266 : PEAR.WhiteSpace.ScopeClosingBrace can throw an error while fixing mixed PHP/HTML
-- Fixed bug #1364 : Yield From values are not recognised as returned values in Squiz FunctionComment sniff
-- Fixed bug #1373 : Error in tab expansion results in white-space of incorrect size
+- Fixed bug #1266sq-1266 : PEAR.WhiteSpace.ScopeClosingBrace can throw an error while fixing mixed PHP/HTML
+- Fixed bug #1364sq-1364 : Yield From values are not recognised as returned values in Squiz FunctionComment sniff
+- Fixed bug #1373sq-1373 : Error in tab expansion results in white-space of incorrect size
     - Thanks to Mark Clements@MarkMaldaba for the patch
-- Fixed bug #1381 : Tokenizer: dereferencing incorrectly identified as short array
-- Fixed bug #1387 : Squiz.ControlStructures.ControlSignature does not handle alt syntax when checking space after closing   brace
-- Fixed bug #1392 : Scope indent calculated incorrectly when using array destructuring
-- Fixed bug #1394 : integer type hints appearing as TypeHintMissing instead of ScalarTypeHintMissing
+- Fixed bug #1381sq-1381 : Tokenizer: dereferencing incorrectly identified as short array
+- Fixed bug #1387sq-1387 : Squiz.ControlStructures.ControlSignature does not handle alt syntax when checking space after closing brace
+- Fixed bug #1392sq-1392 : Scope indent calculated incorrectly when using array destructuring
+- Fixed bug #1394sq-1394 : integer type hints appearing as TypeHintMissing instead of ScalarTypeHintMissing
     - PHP 7 type hints were also being shown when run under PHP 5 in some cases
-- Fixed bug #1405 : Squiz.WhiteSpace.ScopeClosingBrace fails to fix closing brace within indented PHP tags
-- Fixed bug #1421 : Ternaries used in constant scalar expression for param default misidentified by tokenizer
-- Fixed bug #1431 : PHPCBF can't fix short open tags when they are not followed by a space
+- Fixed bug #1405sq-1405 : Squiz.WhiteSpace.ScopeClosingBrace fails to fix closing brace within indented PHP tags
+- Fixed bug #1421sq-1421 : Ternaries used in constant scalar expression for param default misidentified by tokenizer
+- Fixed bug #1431sq-1431 : PHPCBF can't fix short open tags when they are not followed by a space
     - Thanks to Gonçalo Queirós@ghunti for the patch
-- Fixed bug #1432 : PHPCBF can make invalid fixes to inline JS control structures that make use of JS objects
+- Fixed bug #1432sq-1432 : PHPCBF can make invalid fixes to inline JS control structures that make use of JS objects
+
+sq-946: https://github.com/squizlabs/PHP_CodeSniffer/pull/946
+sq-1266: https://github.com/squizlabs/PHP_CodeSniffer/issues/1266
+sq-1364: https://github.com/squizlabs/PHP_CodeSniffer/issues/1364
+sq-1373: https://github.com/squizlabs/PHP_CodeSniffer/issues/1373
+sq-1381: https://github.com/squizlabs/PHP_CodeSniffer/issues/1381
+sq-1387: https://github.com/squizlabs/PHP_CodeSniffer/issues/1387
+sq-1392: https://github.com/squizlabs/PHP_CodeSniffer/issues/1392
+sq-1394: https://github.com/squizlabs/PHP_CodeSniffer/issues/1394
+sq-1405: https://github.com/squizlabs/PHP_CodeSniffer/issues/1405
+sq-1421: https://github.com/squizlabs/PHP_CodeSniffer/issues/1421
+sq-1431: https://github.com/squizlabs/PHP_CodeSniffer/pull/1431
+sq-1432: https://github.com/squizlabs/PHP_CodeSniffer/issues/1432
 
 ## 2.8.1 - 2017-03-02
+
 ### Security
 - This release contains a fix for a security advisory related to the improper handling of shell commands
     - Uses of shell_exec() and exec() were not escaping filenames and configuration settings in most cases
@@ -2607,17 +3029,25 @@
 - Squiz.ControlStructures.InlineIfDeclaration is now able to fix the spacing errors it reports
 
 ### Fixed
-- Fixed bug #1340 : STDIN file contents not being populated in some cases
+- Fixed bug #1340sq-1340 : STDIN file contents not being populated in some cases
     - Thanks to David Biňovec@david-binda for the patch
-- Fixed bug #1344 : PEAR.Functions.FunctionCallSignatureSniff throws error for blank comment lines
-- Fixed bug #1347 : PSR2.Methods.FunctionCallSignature strips some comments during fixing
+- Fixed bug #1344sq-1344 : PEAR.Functions.FunctionCallSignatureSniff throws error for blank comment lines
+- Fixed bug #1347sq-1347 : PSR2.Methods.FunctionCallSignature strips some comments during fixing
     - Thanks to Algirdas Gurevicius@uniquexor for the patch
-- Fixed bug #1349 : Squiz.Strings.DoubleQuoteUsage.NotRequired message is badly formatted when string contains a CR newline char
+- Fixed bug #1349sq-1349 : Squiz.Strings.DoubleQuoteUsage.NotRequired message is badly formatted when string contains a CR newline char
     - Thanks to Algirdas Gurevicius@uniquexor for the patch
-- Fixed bug #1350 : Invalid Squiz.Formatting.OperatorBracket error when using namespaces
-- Fixed bug #1369 : Empty line in multi-line function declaration cause infinite loop
+- Fixed bug #1350sq-1350 : Invalid Squiz.Formatting.OperatorBracket error when using namespaces
+- Fixed bug #1369sq-1369 : Empty line in multi-line function declaration cause infinite loop
+
+sq-1340: https://github.com/squizlabs/PHP_CodeSniffer/issues/1340
+sq-1344: https://github.com/squizlabs/PHP_CodeSniffer/issues/1344
+sq-1347: https://github.com/squizlabs/PHP_CodeSniffer/pull/1347
+sq-1349: https://github.com/squizlabs/PHP_CodeSniffer/pull/1349
+sq-1350: https://github.com/squizlabs/PHP_CodeSniffer/issues/1350
+sq-1369: https://github.com/squizlabs/PHP_CodeSniffer/issues/1369
 
 ## 2.8.0 - 2017-02-02
+
 ### Changed
 - The Internal.NoCodeFound error is no longer generated for content sourced from STDIN
     - This should stop some Git hooks generating errors because PHPCS is trying to process the refs passed on STDIN
@@ -2631,13 +3061,13 @@
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - The getMethodParameters() method now supports closures
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Added more guard code for JS files with syntax errors (request #1271 and request #1272)
-- Added more guard code for CSS files with syntax errors (request #1304)
+- Added more guard code for JS files with syntax errors (request #1271sq-1271 and request #1272sq-1272)
+- Added more guard code for CSS files with syntax errors (request #1304sq-1304)
 - PEAR.Commenting.FunctionComment fixers now correctly handle multi-line param comments
 - AbstractVariableSniff now supports anonymous classes
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Generic.NamingConventions.ConstructorName and PEAR.NamingConventions.ValidVariable now support anonymous classes
-- Generic.NamingConventions.CamelCapsFunctionName and PEAR.NamingConventions.ValidFunctionName now support anonymous   classes
+- Generic.NamingConventions.CamelCapsFunctionName and PEAR.NamingConventions.ValidFunctionName now support anonymous classes
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Generic.CodeAnalysis.UnusedFunctionParameter and PEAR.Functions.ValidDefaultValue now support closures
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
@@ -2652,32 +3082,55 @@
     - Thanks to Algirdas Gurevicius@uniquexor for the patch
 
 ### Fixed
-- Fixed bug #1230 : JS tokeniser incorrectly tokenises bitwise shifts as comparison
+- Fixed bug #1230sq-1230 : JS tokeniser incorrectly tokenises bitwise shifts as comparison
     - Thanks to Ryan McCue@rmccue for the patch
-- Fixed bug #1237 : Uninitialized string offset in PHP Tokenizer on PHP 5.2
-- Fixed bug #1239 : Warning when static method name is 'default'
-- Fixed bug #1240 : False positive for function names starting with triple underscore
+- Fixed bug #1237sq-1237 : Uninitialized string offset in PHP Tokenizer on PHP 5.2
+- Fixed bug #1239sq-1239 : Warning when static method name is 'default'
+- Fixed bug #1240sq-1240 : False positive for function names starting with triple underscore
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1245 : SELF is not recognised as T_SELF token in: return new self
-- Fixed bug #1246 : A mix of USE statements with and without braces can cause the tokenizer to mismatch brace tokens
+- Fixed bug #1245sq-1245 : SELF is not recognised as T_SELF token in: return new self
+- Fixed bug #1246sq-1246 : A mix of USE statements with and without braces can cause the tokenizer to mismatch brace tokens
     - Thanks to Michał Bundyra@michalbundyra for the patch
-- Fixed bug #1249 : GitBlame report requires a .git directory
-- Fixed bug #1252 : Squiz.Strings.ConcatenationSpacing fix creates syntax error when joining a number to a string
-- Fixed bug #1253 : Generic.ControlStructures.InlineControlStructure fix creates syntax error fixing if-try/catch
-- Fixed bug #1255 : Inconsistent indentation check results when ELSE on new line
-- Fixed bug #1257 : Double dash in CSS class name can lead to "Named colours are forbidden" false positives
-- Fixed bug #1260 : Syntax errors not being shown when error_prepend_string is set
+- Fixed bug #1249sq-1249 : GitBlame report requires a .git directory
+- Fixed bug #1252sq-1252 : Squiz.Strings.ConcatenationSpacing fix creates syntax error when joining a number to a string
+- Fixed bug #1253sq-1253 : Generic.ControlStructures.InlineControlStructure fix creates syntax error fixing if-try/catch
+- Fixed bug #1255sq-1255 : Inconsistent indentation check results when ELSE on new line
+- Fixed bug #1257sq-1257 : Double dash in CSS class name can lead to "Named colours are forbidden" false positives
+- Fixed bug #1260sq-1260 : Syntax errors not being shown when error_prepend_string is set
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Fixed bug #1264 : Array return type hint is sometimes detected as T_ARRAY_HINT instead of T_RETURN_TYPE
+- Fixed bug #1264sq-1264 : Array return type hint is sometimes detected as T_ARRAY_HINT instead of T_RETURN_TYPE
     - Thanks to Jaroslav Hanslík@kukulich for the patch
-- Fixed bug #1265 : ES6 arrow function raises unexpected operator spacing errors
-- Fixed bug #1267 : Fixer incorrectly handles filepaths with repeated dir names
+- Fixed bug #1265sq-1265 : ES6 arrow function raises unexpected operator spacing errors
+- Fixed bug #1267sq-1267 : Fixer incorrectly handles filepaths with repeated dir names
     - Thanks to Sergey Ovchinnikov@orx0r for the patch
-- Fixed bug #1276 : Commenting.FunctionComment.InvalidReturnVoid conditional issue with anonymous classes
-- Fixed bug #1277 : Squiz.PHP.DisallowMultipleAssignments.Found error when var assignment is on the same line as an   open tag
-- Fixed bug #1284 : Squiz.Arrays.ArrayBracketSpacing.SpaceBeforeBracket false positive match for short list syntax
+- Fixed bug #1276sq-1276 : Commenting.FunctionComment.InvalidReturnVoid conditional issue with anonymous classes
+- Fixed bug #1277sq-1277 : Squiz.PHP.DisallowMultipleAssignments.Found error when var assignment is on the same line as an open tag
+- Fixed bug #1284sq-1284 : Squiz.Arrays.ArrayBracketSpacing.SpaceBeforeBracket false positive match for short list syntax
+
+sq-1230: https://github.com/squizlabs/PHP_CodeSniffer/issues/1230
+sq-1237: https://github.com/squizlabs/PHP_CodeSniffer/issues/1237
+sq-1239: https://github.com/squizlabs/PHP_CodeSniffer/issues/1239
+sq-1240: https://github.com/squizlabs/PHP_CodeSniffer/pull/1240
+sq-1245: https://github.com/squizlabs/PHP_CodeSniffer/issues/1245
+sq-1246: https://github.com/squizlabs/PHP_CodeSniffer/pull/1246
+sq-1249: https://github.com/squizlabs/PHP_CodeSniffer/issues/1249
+sq-1252: https://github.com/squizlabs/PHP_CodeSniffer/issues/1252
+sq-1253: https://github.com/squizlabs/PHP_CodeSniffer/issues/1253
+sq-1255: https://github.com/squizlabs/PHP_CodeSniffer/issues/1255
+sq-1257: https://github.com/squizlabs/PHP_CodeSniffer/issues/1257
+sq-1260: https://github.com/squizlabs/PHP_CodeSniffer/pull/1260
+sq-1264: https://github.com/squizlabs/PHP_CodeSniffer/pull/1264
+sq-1265: https://github.com/squizlabs/PHP_CodeSniffer/issues/1265
+sq-1267: https://github.com/squizlabs/PHP_CodeSniffer/issues/1267
+sq-1271: https://github.com/squizlabs/PHP_CodeSniffer/issues/1271
+sq-1272: https://github.com/squizlabs/PHP_CodeSniffer/issues/1272
+sq-1276: https://github.com/squizlabs/PHP_CodeSniffer/issues/1276
+sq-1277: https://github.com/squizlabs/PHP_CodeSniffer/issues/1277
+sq-1284: https://github.com/squizlabs/PHP_CodeSniffer/issues/1284
+sq-1304: https://github.com/squizlabs/PHP_CodeSniffer/issues/1304
 
 ## 2.7.1 - 2016-11-30
+
 ### Changed
 - Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis fix now removes unnecessary whitespace
 - Squiz.Formatting.OperatorBracket no longer errors for negative array indexes used within a function call
@@ -2693,34 +3146,52 @@
     - Thanks to Sergey@sserbin for the patch
 
 ### Fixed
-- Fixed bug #1135 : PEAR.ControlStructures.MultiLineCondition.CloseBracketNewLine not detected if preceded by multiline function call
-- Fixed bug #1138 : PEAR.ControlStructures.MultiLineCondition.Alignment not detected if closing brace is first token on line
-- Fixed bug #1141 : Sniffs that check EOF newlines don't detect newlines properly when the last token is a doc block
-- Fixed bug #1150 : Squiz.Strings.EchoedStrings does not properly fix bracketed statements
-- Fixed bug #1156 : Generic.Formatting.DisallowMultipleStatements errors when multiple short echo tags are used on the same line
+- Fixed bug #1135sq-1135 : PEAR.ControlStructures.MultiLineCondition.CloseBracketNewLine not detected if preceded by multiline function call
+- Fixed bug #1138sq-1138 : PEAR.ControlStructures.MultiLineCondition.Alignment not detected if closing brace is first token on line
+- Fixed bug #1141sq-1141 : Sniffs that check EOF newlines don't detect newlines properly when the last token is a doc block
+- Fixed bug #1150sq-1150 : Squiz.Strings.EchoedStrings does not properly fix bracketed statements
+- Fixed bug #1156sq-1156 : Generic.Formatting.DisallowMultipleStatements errors when multiple short echo tags are used on the same line
     - Thanks to Nikola Kovacs@nkovacs for the patch
-- Fixed bug #1161 : Absolute report path is treated like a relative path if it also exists within the current directory
-- Fixed bug #1170 : Javascript regular expression literal not recognized after comparison operator
-- Fixed bug #1180 : Class constant named FUNCTION is incorrectly tokenized
-- Fixed bug #1181 : Squiz.Operators.IncrementDecrementUsage.NoBrackets false positive when incrementing properties
+- Fixed bug #1161sq-1161 : Absolute report path is treated like a relative path if it also exists within the current directory
+- Fixed bug #1170sq-1170 : Javascript regular expression literal not recognized after comparison operator
+- Fixed bug #1180sq-1180 : Class constant named FUNCTION is incorrectly tokenized
+- Fixed bug #1181sq-1181 : Squiz.Operators.IncrementDecrementUsage.NoBrackets false positive when incrementing properties
     - Thanks to Jürgen Henge-Ernst@hernst42 for the patch
-- Fixed bug #1188 : Generic.WhiteSpace.ScopeIndent issues with inline HTML and multi-line function signatures
-- Fixed bug #1190 : phpcbf on if/else with trailing comment generates erroneous code
-- Fixed bug #1191 : Javascript sniffer fails with function called "Function"
-- Fixed bug #1203 : Inconsistent behavior of PHP_CodeSniffer_File::findEndOfStatement
-- Fixed bug #1218 : CASE conditions using class constants named NAMESPACE/INTERFACE/TRAIT etc are incorrectly tokenized
-- Fixed bug #1221 : Indented function call with multiple closure arguments can cause scope indent error
-- Fixed bug #1224 : PHPCBF fails to fix code with heredoc/nowdoc as first argument to a function
+- Fixed bug #1188sq-1188 : Generic.WhiteSpace.ScopeIndent issues with inline HTML and multi-line function signatures
+- Fixed bug #1190sq-1190 : phpcbf on if/else with trailing comment generates erroneous code
+- Fixed bug #1191sq-1191 : Javascript sniffer fails with function called "Function"
+- Fixed bug #1203sq-1203 : Inconsistent behavior of PHP_CodeSniffer_File::findEndOfStatement
+- Fixed bug #1218sq-1218 : CASE conditions using class constants named NAMESPACE/INTERFACE/TRAIT etc are incorrectly tokenized
+- Fixed bug #1221sq-1221 : Indented function call with multiple closure arguments can cause scope indent error
+- Fixed bug #1224sq-1224 : PHPCBF fails to fix code with heredoc/nowdoc as first argument to a function
+
+sq-1135: https://github.com/squizlabs/PHP_CodeSniffer/issues/1135
+sq-1138: https://github.com/squizlabs/PHP_CodeSniffer/issues/1138
+sq-1141: https://github.com/squizlabs/PHP_CodeSniffer/issues/1141
+sq-1150: https://github.com/squizlabs/PHP_CodeSniffer/issues/1150
+sq-1156: https://github.com/squizlabs/PHP_CodeSniffer/issues/1156
+sq-1161: https://github.com/squizlabs/PHP_CodeSniffer/issues/1161
+sq-1170: https://github.com/squizlabs/PHP_CodeSniffer/issues/1170
+sq-1180: https://github.com/squizlabs/PHP_CodeSniffer/issues/1180
+sq-1181: https://github.com/squizlabs/PHP_CodeSniffer/issues/1181
+sq-1188: https://github.com/squizlabs/PHP_CodeSniffer/issues/1188
+sq-1190: https://github.com/squizlabs/PHP_CodeSniffer/issues/1190
+sq-1191: https://github.com/squizlabs/PHP_CodeSniffer/issues/1191
+sq-1203: https://github.com/squizlabs/PHP_CodeSniffer/issues/1203
+sq-1218: https://github.com/squizlabs/PHP_CodeSniffer/issues/1218
+sq-1221: https://github.com/squizlabs/PHP_CodeSniffer/issues/1221
+sq-1224: https://github.com/squizlabs/PHP_CodeSniffer/issues/1224
 
 ## 2.7.0 - 2016-09-02
+
 ### Changed
 - Added --file-list command line argument to allow a list of files and directories to be specified in an external file
-    - Useful is you have a generated list of files to check that would be too long for the command line
+    - Useful if you have a generated list of files to check that would be too long for the command line
     - File and directory paths are listed one per line
     - Usage is: phpcs --file-list=/path/to/file-list ...
     - Thanks to Blotzu@andrei-propertyguru for the patch
 - Values set using @codingStandardsChangeSetting comments can now contain spaces
-- Sniff unit tests can now specify a list of test files instead of letting the runner pick them (request #1078)
+- Sniff unit tests can now specify a list of test files instead of letting the runner pick them (request #1078sq-1078)
     - Useful if a sniff needs to exclude files based on the environment, or is checking filenames
     - Override the new getTestFiles() method to specify your own list of test files
 - Generic.Functions.OpeningFunctionBraceKernighanRitchie now ignores spacing for function return types
@@ -2745,7 +3216,7 @@
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
 - Added Generic.PHP.DisallowAlternativePHPTags to ban the use of alternate PHP tags
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Squiz.WhiteSpace.LanguageConstructSpacing no longer checks for spaces if parenthesis are being used (request #1062)
+- Squiz.WhiteSpace.LanguageConstructSpacing no longer checks for spaces if parenthesis are being used (request #1062sq-1062)
     - Makes this sniff more compatible with those that check parenthesis spacing of function calls
 - Squiz.WhiteSpace.ObjectOperatorSpacing now has a setting to ignore newline characters around object operators
     - Default remains FALSE, so newlines are not allowed
@@ -2759,115 +3230,175 @@
     - Thanks to Walt Sorensen@photodude for the patch
 - PHPCBF is now able to fix Generic.PHP.DisallowShortOpenTag
     - Thanks to Juliette Reinders Folmer@jrfnl for the patch
-- Improved the formatting of the end brace when auto fixing InlineControlStructure errors (request #1121)
-- Generic.Functions.OpeningFunctionBraceKernighanRitchie.BraceOnNewLine fix no longer leaves blank line after brace (request #1085)
+- Improved the formatting of the end brace when auto fixing InlineControlStructure errors (request #1121sq-1121)
+- Generic.Functions.OpeningFunctionBraceKernighanRitchie.BraceOnNewLine fix no longer leaves blank line after brace (request #1085sq-1085)
 - Generic UpperCaseConstantNameSniff now allows lowercase namespaces in constant definitions
-  - Thanks to Daniel Schniepp@dschniepp for the patch
+    - Thanks to Daniel Schniepp@dschniepp for the patch
 - Squiz DoubleQuoteUsageSniff is now more tolerant of syntax errors caused by mismatched string tokens
 - A few sniffs that produce errors based on the current PHP version can now be told to run using a specific PHP version
-    - Set the php_version config var using --config-set, --runtime-set, or in a ruleset to specify a specific PHP version
-    - The format of the PHP version is the same as the PHP_VERSION_ID constant (e.g., 50403 for version 5.4.3)
+    - Set the `php_version` config var using `--config-set`, `--runtime-set`, or in a ruleset to specify a specific PHP version
+    - The format of the PHP version is the same as the `PHP_VERSION_ID` constant (e.g., 50403 for version 5.4.3)
     - Supported sniffs are Generic.PHP.DisallowAlternativePHPTags, PSR1.Classes.ClassDeclaration, Squiz.Commenting.FunctionComment
     - Thanks to Finlay Beaton@ofbeaton for the patch
 
 ### Fixed
-- Fixed bug #985  : Duplicate class definition detection generates false-positives in media queries
+- Fixed bug #985sq-985 : Duplicate class definition detection generates false-positives in media queries
     - Thanks to Raphael Horber@rhorber for the patch
-- Fixed bug #1014 : Squiz VariableCommentSniff doesn't always detect a missing comment
-- Fixed bug #1066 : Undefined index: quiet in CLI.php during unit test run with -v command line arg
-- Fixed bug #1072 : Squiz.SelfMemberReference.NotUsed not detected if leading namespace separator is used
-- Fixed bug #1089 : Rulesets cannot be loaded if the path contains urlencoded characters
-- Fixed bug #1091 : PEAR and Squiz FunctionComment sniffs throw errors for some invalid @param line formats
-- Fixed bug #1092 : PEAR.Functions.ValidDefaultValue should not flag type hinted methods with a NULL default argument
-- Fixed bug #1095 : Generic LineEndings sniff replaces tabs with spaces with --tab-width is set
-- Fixed bug #1096 : Squiz FunctionDeclarationArgumentSpacing gives incorrect error/fix when variadic operator is followed by a space
-- Fixed bug #1099 : Group use declarations are incorrectly fixed by the PSR2 standard
+- Fixed bug #1014sq-1014 : Squiz VariableCommentSniff doesn't always detect a missing comment
+- Fixed bug #1066sq-1066 : Undefined index: quiet in `CLI.php` during unit test run with `-v` command line arg
+- Fixed bug #1072sq-1072 : Squiz.SelfMemberReference.NotUsed not detected if leading namespace separator is used
+- Fixed bug #1089sq-1089 : Rulesets cannot be loaded if the path contains urlencoded characters
+- Fixed bug #1091sq-1091 : PEAR and Squiz FunctionComment sniffs throw errors for some invalid @param line formats
+- Fixed bug #1092sq-1092 : PEAR.Functions.ValidDefaultValue should not flag type hinted methods with a NULL default argument
+- Fixed bug #1095sq-1095 : Generic LineEndings sniff replaces tabs with spaces with --tab-width is set
+- Fixed bug #1096sq-1096 : Squiz FunctionDeclarationArgumentSpacing gives incorrect error/fix when variadic operator is followed by a space
+- Fixed bug #1099sq-1099 : Group use declarations are incorrectly fixed by the PSR2 standard
     - Thanks to Jason McCreary@jasonmccreary for the patch
-- Fixed bug #1101 : Incorrect indent errors when breaking out of PHP inside an IF statement
-- Fixed bug #1102 : Squiz.Formatting.OperatorBracket.MissingBrackets faulty bracketing fix
-- Fixed bug #1109 : Wrong scope indent reported in anonymous class
-- Fixed bug #1112 : File docblock not recognized when require_once follows it
-- Fixed bug #1120 : InlineControlStructureSniff does not handle auto-fixing for control structures that make function calls
-- Fixed bug #1124 : Squiz.Operators.ComparisonOperatorUsage does not detect bracketed conditions for inline IF statements
+- Fixed bug #1101sq-1101 : Incorrect indent errors when breaking out of PHP inside an IF statement
+- Fixed bug #1102sq-1102 : Squiz.Formatting.OperatorBracket.MissingBrackets faulty bracketing fix
+- Fixed bug #1109sq-1109 : Wrong scope indent reported in anonymous class
+- Fixed bug #1112sq-1112 : File docblock not recognized when require_once follows it
+- Fixed bug #1120sq-1120 : InlineControlStructureSniff does not handle auto-fixing for control structures that make function calls
+- Fixed bug #1124sq-1124 : Squiz.Operators.ComparisonOperatorUsage does not detect bracketed conditions for inline IF statements
     - Thanks to Raphael Horber@rhorber for the patch
 
+sq-985: https://github.com/squizlabs/PHP_CodeSniffer/issues/985
+sq-1014: https://github.com/squizlabs/PHP_CodeSniffer/issues/1014
+sq-1062: https://github.com/squizlabs/PHP_CodeSniffer/issues/1062
+sq-1066: https://github.com/squizlabs/PHP_CodeSniffer/issues/1066
+sq-1072: https://github.com/squizlabs/PHP_CodeSniffer/issues/1072
+sq-1078: https://github.com/squizlabs/PHP_CodeSniffer/issues/1078
+sq-1085: https://github.com/squizlabs/PHP_CodeSniffer/issues/1085
+sq-1089: https://github.com/squizlabs/PHP_CodeSniffer/pull/1089
+sq-1091: https://github.com/squizlabs/PHP_CodeSniffer/issues/1091
+sq-1092: https://github.com/squizlabs/PHP_CodeSniffer/issues/1092
+sq-1095: https://github.com/squizlabs/PHP_CodeSniffer/issues/1095
+sq-1096: https://github.com/squizlabs/PHP_CodeSniffer/pull/1096
+sq-1099: https://github.com/squizlabs/PHP_CodeSniffer/pull/1099
+sq-1101: https://github.com/squizlabs/PHP_CodeSniffer/issues/1101
+sq-1102: https://github.com/squizlabs/PHP_CodeSniffer/issues/1102
+sq-1109: https://github.com/squizlabs/PHP_CodeSniffer/issues/1109
+sq-1112: https://github.com/squizlabs/PHP_CodeSniffer/issues/1112
+sq-1120: https://github.com/squizlabs/PHP_CodeSniffer/issues/1120
+sq-1121: https://github.com/squizlabs/PHP_CodeSniffer/issues/1121
+sq-1124: https://github.com/squizlabs/PHP_CodeSniffer/issues/1124
+
 ## 2.6.2 - 2016-07-14
+
 ### Changed
-- Added a new --exclude CLI argument to exclude a list of sniffs from checking and fixing (request #904)
+- Added a new --exclude CLI argument to exclude a list of sniffs from checking and fixing (request #904sq-904)
     - Accepts the same sniff codes as the --sniffs command line argument, but provides the opposite functionality
-- Added a new -q command line argument to disable progress and verbose information from being printed (request #969)
+- Added a new -q command line argument to disable progress and verbose information from being printed (request #969sq-969)
     - Useful if a coding standard hard-codes progress or verbose output but you want PHPCS to be quiet
     - Use the command "phpcs --config-set quiet true" to turn quiet mode on by default
-- Generic LineLength sniff no longer errors for comments that cannot be broken out onto a new line (request #766)
+- Generic LineLength sniff no longer errors for comments that cannot be broken out onto a new line (request #766sq-766)
     - A typical case is a comment that contains a very long URL
-    - The comment is ignored if putting the URL on a indented new comment line would be longer than the allowed length
+    - The comment is ignored if putting the URL on an indented new comment line would be longer than the allowed length
 - Settings extensions in a ruleset no longer causes PHP notices during unit testing
     - Thanks to Klaus Purer@klausi for the patch
 - Version control reports now show which errors are fixable if you are showing sources
-- Added a new sniff to enforce a single space after a NOT operator (request #1051)
+- Added a new sniff to enforce a single space after a NOT operator (request #1051sq-1051)
     - Include in a ruleset using the code Generic.Formatting.SpaceAfterNot
-- The Squiz.Commenting.BlockComment sniff now supports tabs for indenting comment lines (request #1056)
+- The Squiz.Commenting.BlockComment sniff now supports tabs for indenting comment lines (request #1056sq-1056)
 
 ### Fixed
-- Fixed bug #790 : Incorrect missing @throws error in methods that use closures
-- Fixed bug #908 : PSR2 standard is not checking that closing brace is on line following the body
-- Fixed bug #945 : Incorrect indent behavior using deep-nested function and arrays
-- Fixed bug #961 : Two anonymous functions passed as function/method arguments cause indentation false positive
-- Fixed bug #1005 : Using global composer vendor autoload breaks PHP lowercase built-in function sniff
+- Fixed bug #790sq-790 : Incorrect missing @throws error in methods that use closures
+- Fixed bug #908sq-908 : PSR2 standard is not checking that closing brace is on line following the body
+- Fixed bug #945sq-945 : Incorrect indent behavior using deep-nested function and arrays
+- Fixed bug #961sq-961 : Two anonymous functions passed as function/method arguments cause indentation false positive
+- Fixed bug #1005sq-1005 : Using global composer vendor autoload breaks PHP lowercase built-in function sniff
     - Thanks to Michael Butler@michaelbutler for the patch
-- Fixed bug #1007 : Squiz Unreachable code detection is not working properly with a closure inside a case
-- Fixed bug #1023 : PSR2.Classes.ClassDeclaration fails if class extends base class and "implements" is on trailing line
-- Fixed bug #1026 : Arrays in comma delimited class properties cause ScopeIndent to increase indent
-- Fixed bug #1028 : Squiz ArrayDeclaration incorrectly fixes multi-line array where end bracket is not on a new line
-- Fixed bug #1034 : Squiz FunctionDeclarationArgumentSpacing gives incorrect error when first arg is a variadic
-- Fixed bug #1036 : Adjacent assignments aligned analysis statement wrong
-- Fixed bug #1049 : Version control reports can show notices when the report width is very small
-- Fixed bug #21050 : PEAR MultiLineCondition sniff suppresses errors on last condition line
+- Fixed bug #1007sq-1007 : Squiz Unreachable code detection is not working properly with a closure inside a case
+- Fixed bug #1023sq-1023 : PSR2.Classes.ClassDeclaration fails if class extends base class and "implements" is on trailing line
+- Fixed bug #1026sq-1026 : Arrays in comma delimited class properties cause ScopeIndent to increase indent
+- Fixed bug #1028sq-1028 : Squiz ArrayDeclaration incorrectly fixes multi-line array where end bracket is not on a new line
+- Fixed bug #1034sq-1034 : Squiz FunctionDeclarationArgumentSpacing gives incorrect error when first arg is a variadic
+- Fixed bug #1036sq-1036 : Adjacent assignments aligned analysis statement wrong
+- Fixed bug #1049sq-1049 : Version control reports can show notices when the report width is very small
+- Fixed bug #21050pear-21050 : PEAR MultiLineCondition sniff suppresses errors on last condition line
+
+sq-766: https://github.com/squizlabs/PHP_CodeSniffer/issues/766
+sq-790: https://github.com/squizlabs/PHP_CodeSniffer/issues/790
+sq-904: https://github.com/squizlabs/PHP_CodeSniffer/issues/904
+sq-908: https://github.com/squizlabs/PHP_CodeSniffer/issues/908
+sq-945: https://github.com/squizlabs/PHP_CodeSniffer/issues/945
+sq-961: https://github.com/squizlabs/PHP_CodeSniffer/issues/961
+sq-969: https://github.com/squizlabs/PHP_CodeSniffer/issues/969
+sq-1005: https://github.com/squizlabs/PHP_CodeSniffer/issues/1005
+sq-1007: https://github.com/squizlabs/PHP_CodeSniffer/issues/1007
+sq-1023: https://github.com/squizlabs/PHP_CodeSniffer/issues/1023
+sq-1026: https://github.com/squizlabs/PHP_CodeSniffer/issues/1026
+sq-1028: https://github.com/squizlabs/PHP_CodeSniffer/issues/1028
+sq-1034: https://github.com/squizlabs/PHP_CodeSniffer/issues/1034
+sq-1036: https://github.com/squizlabs/PHP_CodeSniffer/issues/1036
+sq-1049: https://github.com/squizlabs/PHP_CodeSniffer/pull/1049
+sq-1051: https://github.com/squizlabs/PHP_CodeSniffer/issues/1051
+sq-1056: https://github.com/squizlabs/PHP_CodeSniffer/issues/1056
+pear-21050: https://pear.php.net/bugs/bug.php?id=21050
 
 ## 2.6.1 - 2016-05-31
+
 ### Changed
 - The PHP-supplied T_COALESCE token has been replicated for PHP versions before 7.0
 - Function return types of self, parent and callable are now tokenized as T_RETURN_TYPE
     - Thanks to Jaroslav Hanslík@kukulich for the patch
 - The default_standard config setting now allows multiple standards to be listed, like on the command line
     - Thanks to Michael Mayer@schnittstabil for the patch
-- Installations done via composer now only include the composer autoloader for PHP 5.3.2+ (request #942)
+- Installations done via composer now only include the composer autoloader for PHP 5.3.2+ (request #942sq-942)
 - Added a rollbackChangeset() method to the Fixer class to purposely rollback the active changeset
 
 ### Fixed
-- Fixed bug #940 : Auto-fixing issue encountered with inconsistent use of braces
-- Fixed bug #943 : Squiz.PHP.InnerFunctions.NotAllowed reported in anonymous classes
-- Fixed bug #944 : PHP warning when running the latest phar
-- Fixed bug #951 : InlineIfDeclaration: invalid error produced with UTF-8 string
-- Fixed bug #957 : Operator spacing sniff errors when plus is used as part of a number
+- Fixed bug #940sq-940 : Auto-fixing issue encountered with inconsistent use of braces
+- Fixed bug #943sq-943 : Squiz.PHP.InnerFunctions.NotAllowed reported in anonymous classes
+- Fixed bug #944sq-944 : PHP warning when running the latest phar
+- Fixed bug #951sq-951 : InlineIfDeclaration: invalid error produced with UTF-8 string
+- Fixed bug #957sq-957 : Operator spacing sniff errors when plus is used as part of a number
     - Thanks to Klaus Purer@klausi for the patch
-- Fixed bug #959 : Call-time pass-by-reference false positive if there is a square bracket before the ampersand
+- Fixed bug #959sq-959 : Call-time pass-by-reference false positive if there is a square bracket before the ampersand
     - Thanks to Konstantin Leboev@realmfoo for the patch
-- Fixed bug #962 : Null coalescing operator (??) not detected as a token
+- Fixed bug #962sq-962 : Null coalescing operator (??) not detected as a token
     - Thanks to Joel Posti@joelposti for the patch
-- Fixed bug #973 : Anonymous class declaration and PSR1.Files.SideEffects.FoundWithSymbols
-- Fixed bug #974 : Error when file ends with "function"
-- Fixed bug #979 : Anonymous function with return type hint is not refactored as expected
-- Fixed bug #983 : Squiz.WhiteSpace.MemberVarSpacing.AfterComment fails to fix error when comment is not a docblock
-- Fixed bug #1010 : Squiz NonExecutableCode sniff does not detect boolean OR
+- Fixed bug #973sq-973 : Anonymous class declaration and PSR1.Files.SideEffects.FoundWithSymbols
+- Fixed bug #974sq-974 : Error when file ends with "function"
+- Fixed bug #979sq-979 : Anonymous function with return type hint is not refactored as expected
+- Fixed bug #983sq-983 : Squiz.WhiteSpace.MemberVarSpacing.AfterComment fails to fix error when comment is not a docblock
+- Fixed bug #1010sq-1010 : Squiz NonExecutableCode sniff does not detect boolean OR
     - Thanks to Derek Henderson@2shediac for the patch
-- Fixed bug #1015 : The Squiz.Commenting.FunctionComment sniff doesn't allow description in @return tag
+- Fixed bug #1015sq-1015 : The Squiz.Commenting.FunctionComment sniff doesn't allow description in @return tag
     - Thanks to Alexander Obuhovich@aik099 for the patch
-- Fixed bug #1022 : Duplicate spaces after opening bracket error with PSR2 standard
-- Fixed bug #1025 : Syntax error in JS file can cause undefined index for parenthesis_closer
+- Fixed bug #1022sq-1022 : Duplicate spaces after opening bracket error with PSR2 standard
+- Fixed bug #1025sq-1025 : Syntax error in JS file can cause undefined index for parenthesis_closer
+
+sq-940: https://github.com/squizlabs/PHP_CodeSniffer/issues/940
+sq-942: https://github.com/squizlabs/PHP_CodeSniffer/issues/942
+sq-943: https://github.com/squizlabs/PHP_CodeSniffer/issues/943
+sq-944: https://github.com/squizlabs/PHP_CodeSniffer/issues/944
+sq-951: https://github.com/squizlabs/PHP_CodeSniffer/issues/951
+sq-957: https://github.com/squizlabs/PHP_CodeSniffer/pull/957
+sq-959: https://github.com/squizlabs/PHP_CodeSniffer/issues/959
+sq-962: https://github.com/squizlabs/PHP_CodeSniffer/issues/962
+sq-973: https://github.com/squizlabs/PHP_CodeSniffer/issues/973
+sq-974: https://github.com/squizlabs/PHP_CodeSniffer/issues/974
+sq-979: https://github.com/squizlabs/PHP_CodeSniffer/issues/979
+sq-983: https://github.com/squizlabs/PHP_CodeSniffer/issues/983
+sq-1010: https://github.com/squizlabs/PHP_CodeSniffer/issues/1010
+sq-1015: https://github.com/squizlabs/PHP_CodeSniffer/issues/1015
+sq-1022: https://github.com/squizlabs/PHP_CodeSniffer/issues/1022
+sq-1025: https://github.com/squizlabs/PHP_CodeSniffer/issues/1025
 
 ## 2.6.0 - 2016-04-04
+
 ### Changed
-- Paths used when setting CLI arguments inside ruleset.xml files are now relative to the ruleset location (request #847)
+- Paths used when setting CLI arguments inside ruleset.xml files are now relative to the ruleset location (request #847sq-847)
     - This change only applies to paths within ARG tags, used to set CLI arguments
     - Previously, the paths were relative to the directory PHPCS was being run from
     - Absolute paths are still allowed and work the same way they always have
     - This change allows ruleset.xml files to be more portable
 - Content passed via STDIN will now be processed even if files are specified on the command line or in a ruleset
-- When passing content via STDIN, you can now specify the file path to use on the command line (request #934)
+- When passing content via STDIN, you can now specify the file path to use on the command line (request #934sq-934)
     - This allows sniffs that check file paths to work correctly
     - This is the same functionality provided by the phpcs_input_file line, except it is available on the command line
-- Files processed with custom tokenizers will no longer be skipped if they appear minified (request #877)
+- Files processed with custom tokenizers will no longer be skipped if they appear minified (request #877sq-877)
     - If the custom tokenizer wants minified files skipped, it can set a $skipMinified member var to TRUE
     - See the included JS and CSS tokenizers for an example
 - Config vars set in ruleset.xml files are now processed earlier, allowing them to be used during sniff registration
@@ -2875,15 +3406,15 @@
     - Thanks to Pieter Frenssen@pfrenssen for the patch
 - Improved detection of regular expressions in the JS tokenizer
 - Generic PHP Syntax sniff now uses PHP_BINARY (if available) to determine the path to PHP if no other path is available
-    - You can still manually set php_path to use a specific binary for testing
+    - You can still manually set `php_path` to use a specific binary for testing
     - Thanks to Andrew Berry@deviantintegral for the patch
 - The PHP-supplied T_POW_EQUAL token has been replicated for PHP versions before 5.6
-- Added support for PHP7 use group declarations (request #878)
+- Added support for PHP7 use group declarations (request #878sq-878)
     - New tokens T_OPEN_USE_GROUP and T_CLOSE_USE_GROUP are assigned to the open and close curly braces
-- Generic ScopeIndent sniff now reports errors for every line that needs the indent changed (request #903)
+- Generic ScopeIndent sniff now reports errors for every line that needs the indent changed (request #903sq-903)
     - Previously, it ignored lines that were indented correctly in the context of their block
     - This change produces more technically accurate error messages, but is much more verbose
-- The PSR2 and Squiz standards now allow multi-line default values in function declarations (request #542)
+- The PSR2 and Squiz standards now allow multi-line default values in function declarations (request #542sq-542)
     - Previously, these would automatically make the function a multi-line declaration
 - Squiz InlineCommentSniff now allows docblocks on require(_once) and include(_once) statements
     - Thanks to Gary Jones@GaryJones for the patch
@@ -2895,33 +3426,58 @@
 - Renamed Squiz.CSS.Opacity.SpacingAfterPoint to Squiz.CSS.Opacity.DecimalPrecision
     - Please update your ruleset if you are referencing this error code directly
 - Fixed PHP tokenizer problem that caused an infinite loop when checking a comment with specific content
-- Generic Disallow Space and Tab indent sniffs now detect and fix indents inside embedded HTML chunks (request #882)
+- Generic Disallow Space and Tab indent sniffs now detect and fix indents inside embedded HTML chunks (request #882sq-882)
 - Squiz CSS IndentationSniff no longer assumes the class opening brace is at the end of a line
 - Squiz FunctionCommentThrowTagSniff now ignores non-docblock comments
 - Squiz ComparisonOperatorUsageSniff now allows conditions like while(true)
 - PEAR FunctionCallSignatureSniff (and the Squiz and PSR2 sniffs that use it) now correctly check the first argument
-    - Further fix for bug #698
+    - Further fix for bug #698sq-698
 
 ### Fixed
-- Fixed bug #791 : codingStandardsChangeSetting settings not working with namespaces
-- Fixed bug #872 : Incorrect detection of blank lines between CSS class names
-- Fixed bug #879 : Generic InlineControlStructureSniff can create parse error when case/if/elseif/else have mixed brace and braceless definitions
-- Fixed bug #883 : PSR2 is not checking for blank lines at the start and end of control structures
-- Fixed bug #884 : Incorrect indentation notice for anonymous classes
-- Fixed bug #887 : Using curly braces for a shared CASE/DEFAULT statement can generate an error in PSR2 SwitchDeclaration
-- Fixed bug #889 : Closure inside catch/else/elseif causes indentation error
-- Fixed bug #890 : Function call inside returned short array value can cause indentation error inside CASE statements
-- Fixed bug #897 : Generic.Functions.CallTimePassByReference.NotAllowed false positive when short array syntax
-- Fixed bug #900 : Squiz.Functions.FunctionDeclarationArgumentSpacing bug when no space between type hint and argument
-- Fixed bug #902 : T_OR_EQUAL and T_POW_EQUAL are not seen as assignment tokens
-- Fixed bug #910 : Unrecognized "extends" and indentation on anonymous classes
-- Fixed bug #915 : JS Tokenizer generates errors when processing some decimals
-- Fixed bug #928 : Endless loop when sniffing a PHP file with a git merge conflict inside a function
-- Fixed bug #937 : Shebang can cause PSR1 SideEffects warning
+- Fixed bug #791sq-791 : codingStandardsChangeSetting settings not working with namespaces
+- Fixed bug #872sq-872 : Incorrect detection of blank lines between CSS class names
+- Fixed bug #879sq-879 : Generic InlineControlStructureSniff can create parse error when case/if/elseif/else have mixed brace and braceless definitions
+- Fixed bug #883sq-883 : PSR2 is not checking for blank lines at the start and end of control structures
+- Fixed bug #884sq-884 : Incorrect indentation notice for anonymous classes
+- Fixed bug #887sq-887 : Using curly braces for a shared CASE/DEFAULT statement can generate an error in PSR2 SwitchDeclaration
+- Fixed bug #889sq-889 : Closure inside catch/else/elseif causes indentation error
+- Fixed bug #890sq-890 : Function call inside returned short array value can cause indentation error inside CASE statements
+- Fixed bug #897sq-897 : Generic.Functions.CallTimePassByReference.NotAllowed false positive when short array syntax
+- Fixed bug #900sq-900 : Squiz.Functions.FunctionDeclarationArgumentSpacing bug when no space between type hint and argument
+- Fixed bug #902sq-902 : T_OR_EQUAL and T_POW_EQUAL are not seen as assignment tokens
+- Fixed bug #910sq-910 : Unrecognized "extends" and indentation on anonymous classes
+- Fixed bug #915sq-915 : JS Tokenizer generates errors when processing some decimals
+- Fixed bug #928sq-928 : Endless loop when sniffing a PHP file with a git merge conflict inside a function
+- Fixed bug #937sq-937 : Shebang can cause PSR1 SideEffects warning
     - Thanks to Clay Loveless@claylo for the patch
-- Fixed bug #938 : CallTimePassByReferenceSniff ignores functions with return value
+- Fixed bug #938sq-938 : CallTimePassByReferenceSniff ignores functions with return value
+
+sq-542: https://github.com/squizlabs/PHP_CodeSniffer/issues/542
+sq-791: https://github.com/squizlabs/PHP_CodeSniffer/issues/791
+sq-847: https://github.com/squizlabs/PHP_CodeSniffer/issues/847
+sq-872: https://github.com/squizlabs/PHP_CodeSniffer/issues/872
+sq-877: https://github.com/squizlabs/PHP_CodeSniffer/issues/877
+sq-878: https://github.com/squizlabs/PHP_CodeSniffer/issues/878
+sq-879: https://github.com/squizlabs/PHP_CodeSniffer/issues/879
+sq-882: https://github.com/squizlabs/PHP_CodeSniffer/issues/882
+sq-883: https://github.com/squizlabs/PHP_CodeSniffer/issues/883
+sq-884: https://github.com/squizlabs/PHP_CodeSniffer/issues/884
+sq-887: https://github.com/squizlabs/PHP_CodeSniffer/issues/887
+sq-889: https://github.com/squizlabs/PHP_CodeSniffer/issues/889
+sq-890: https://github.com/squizlabs/PHP_CodeSniffer/issues/890
+sq-897: https://github.com/squizlabs/PHP_CodeSniffer/issues/897
+sq-900: https://github.com/squizlabs/PHP_CodeSniffer/issues/900
+sq-902: https://github.com/squizlabs/PHP_CodeSniffer/issues/902
+sq-903: https://github.com/squizlabs/PHP_CodeSniffer/issues/903
+sq-910: https://github.com/squizlabs/PHP_CodeSniffer/issues/910
+sq-915: https://github.com/squizlabs/PHP_CodeSniffer/issues/915
+sq-928: https://github.com/squizlabs/PHP_CodeSniffer/issues/928
+sq-934: https://github.com/squizlabs/PHP_CodeSniffer/issues/934
+sq-937: https://github.com/squizlabs/PHP_CodeSniffer/pull/937
+sq-938: https://github.com/squizlabs/PHP_CodeSniffer/issues/938
 
 ## 2.5.1 - 2016-01-20
+
 ### Changed
 - The PHP-supplied T_SPACESHIP token has been replicated for PHP versions before 7.0
 - T_SPACESHIP is now correctly identified as an operator
@@ -2929,53 +3485,80 @@
 - Generic LowerCaseKeyword now ensures array type hints are lowercase as well
     - Thanks to Mathieu Rochette@mathroc for the patch
 - Squiz ComparisonOperatorUsageSniff no longer hangs on JS FOR loops that don't use semicolons
-- PHP_CodesSniffer now includes the composer autoload.php file, if there is one
+- PHP_CodesSniffer now includes the composer `autoload.php` file, if there is one
     - Thanks to Klaus Purer@klausi for the patch
-- Added error Squiz.Commenting.FunctionComment.ScalarTypeHintMissing for PHP7 only (request #858)
+- Added error Squiz.Commenting.FunctionComment.ScalarTypeHintMissing for PHP7 only (request #858sq-858)
     - These errors were previously reported as Squiz.Commenting.FunctionComment.TypeHintMissing on PHP7
     - Disable this error message in a ruleset.xml file if your code needs to run on both PHP5 and PHP7
 - The PHP 5.6 __debugInfo magic method no longer produces naming convention errors
     - Thanks to Michael Nowack@syranez for the patch
-- PEAR and Squiz FunctionComment sniffs now support variadic functions (request #841)
+- PEAR and Squiz FunctionComment sniffs now support variadic functions (request #841sq-841)
 
 ### Fixed
-- Fixed bug #622 : Wrong detection of Squiz.CSS.DuplicateStyleDefinition with media queries
-- Fixed bug #752 : The missing exception error is reported in first found DocBlock
-- Fixed bug #794 : PSR2 MultiLineFunctionDeclaration forbids comments after opening parenthesis of a multiline call
-- Fixed bug #820 : PEAR/PSR2 FunctionCallSignature sniffs suggest wrong indent when there are multiple arguments on a line
-- Fixed bug #822 : Ruleset hard-coded file paths are not used if not running from the same directory as the ruleset
-- Fixed bug #825 : FunctionCallArgumentSpacing sniff complains about more than one space before comment in multi-line function call
-- Fixed bug #828 : Null classname is tokenized as T_NULL instead of T_STRING
-- Fixed bug #829 : Short array argument not fixed correctly when multiple function arguments are on the same line
-- Fixed bug #831 : PHPCS freezes in an infinite loop under Windows if no standard is passed
-- Fixed bug #832 : Tokenizer does not support context sensitive parsing
+- Fixed bug #622sq-622 : Wrong detection of Squiz.CSS.DuplicateStyleDefinition with media queries
+- Fixed bug #752sq-752 : The missing exception error is reported in first found DocBlock
+- Fixed bug #794sq-794 : PSR2 MultiLineFunctionDeclaration forbids comments after opening parenthesis of a multiline call
+- Fixed bug #820sq-820 : PEAR/PSR2 FunctionCallSignature sniffs suggest wrong indent when there are multiple arguments on a line
+- Fixed bug #822sq-822 : Ruleset hard-coded file paths are not used if not running from the same directory as the ruleset
+- Fixed bug #825sq-825 : FunctionCallArgumentSpacing sniff complains about more than one space before comment in multi-line function call
+- Fixed bug #828sq-828 : Null classname is tokenized as T_NULL instead of T_STRING
+- Fixed bug #829sq-829 : Short array argument not fixed correctly when multiple function arguments are on the same line
+- Fixed bug #831sq-831 : PHPCS freezes in an infinite loop under Windows if no standard is passed
+- Fixed bug #832sq-832 : Tokenizer does not support context sensitive parsing
     - Thanks to Jaroslav Hanslík@kukulich for the patch
-- Fixed bug #835 : PEAR.Functions.FunctionCallSignature broken when closure uses return types
-- Fixed bug #838 : CSS indentation fixer changes color codes
+- Fixed bug #835sq-835 : PEAR.Functions.FunctionCallSignature broken when closure uses return types
+- Fixed bug #838sq-838 : CSS indentation fixer changes color codes
     - Thanks to Klaus Purer@klausi for the patch
-- Fixed bug #839 : "__()" method is marked as not camel caps
+- Fixed bug #839sq-839 : "__()" method is marked as not camel caps
     - Thanks to Tim Bezhashvyly@tim-bezhashvyly for the patch
-- Fixed bug #852 : Generic.Commenting.DocComment not finding errors when long description is omitted
-- Fixed bug #854 : Return typehints in interfaces are not reported as T_RETURN_TYPE
+- Fixed bug #852sq-852 : Generic.Commenting.DocComment not finding errors when long description is omitted
+- Fixed bug #854sq-854 : Return typehints in interfaces are not reported as T_RETURN_TYPE
     - Thanks to Jaroslav Hanslík@kukulich for the patch
-- Fixed bug #855 : Capital letter detection for multibyte strings doesn't work correctly
-- Fixed bug #857 : PSR2.ControlStructure.SwitchDeclaration shouldn't check indent of curly brace closers
-- Fixed bug #859 : Switch statement indention issue when returning function call with closure
-- Fixed bug #861 : Single-line arrays and function calls can generate incorrect indentation errors
-- Fixed bug #867 : Squiz.Strings.DoubleQuoteUsage broken for some escape codes
+- Fixed bug #855sq-855 : Capital letter detection for multibyte strings doesn't work correctly
+- Fixed bug #857sq-857 : PSR2.ControlStructure.SwitchDeclaration shouldn't check indent of curly brace closers
+- Fixed bug #859sq-859 : Switch statement indention issue when returning function call with closure
+- Fixed bug #861sq-861 : Single-line arrays and function calls can generate incorrect indentation errors
+- Fixed bug #867sq-867 : Squiz.Strings.DoubleQuoteUsage broken for some escape codes
     - Thanks to Jack Blower@ElvenSpellmaker for the help with the fix
-- Fixed bug #21005 : Incorrect indent detection when multiple properties are initialized to arrays
-- Fixed bug #21010 : Incorrect missing colon detection in CSS when first style is not on new line
-- Fixed bug #21011 : Incorrect error message text when newline found after opening brace
+- Fixed bug #21005pear-21005 : Incorrect indent detection when multiple properties are initialized to arrays
+- Fixed bug #21010pear-21010 : Incorrect missing colon detection in CSS when first style is not on new line
+- Fixed bug #21011pear-21011 : Incorrect error message text when newline found after opening brace
+
+sq-622: https://github.com/squizlabs/PHP_CodeSniffer/issues/622
+sq-752: https://github.com/squizlabs/PHP_CodeSniffer/issues/752
+sq-794: https://github.com/squizlabs/PHP_CodeSniffer/issues/794
+sq-820: https://github.com/squizlabs/PHP_CodeSniffer/issues/820
+sq-822: https://github.com/squizlabs/PHP_CodeSniffer/issues/822
+sq-825: https://github.com/squizlabs/PHP_CodeSniffer/issues/825
+sq-828: https://github.com/squizlabs/PHP_CodeSniffer/issues/828
+sq-829: https://github.com/squizlabs/PHP_CodeSniffer/issues/829
+sq-831: https://github.com/squizlabs/PHP_CodeSniffer/issues/831
+sq-832: https://github.com/squizlabs/PHP_CodeSniffer/issues/832
+sq-835: https://github.com/squizlabs/PHP_CodeSniffer/issues/835
+sq-838: https://github.com/squizlabs/PHP_CodeSniffer/pull/838
+sq-839: https://github.com/squizlabs/PHP_CodeSniffer/issues/839
+sq-841: https://github.com/squizlabs/PHP_CodeSniffer/issues/841
+sq-852: https://github.com/squizlabs/PHP_CodeSniffer/issues/852
+sq-854: https://github.com/squizlabs/PHP_CodeSniffer/issues/854
+sq-855: https://github.com/squizlabs/PHP_CodeSniffer/pull/855
+sq-857: https://github.com/squizlabs/PHP_CodeSniffer/issues/857
+sq-858: https://github.com/squizlabs/PHP_CodeSniffer/issues/858
+sq-859: https://github.com/squizlabs/PHP_CodeSniffer/issues/859
+sq-861: https://github.com/squizlabs/PHP_CodeSniffer/issues/861
+sq-867: https://github.com/squizlabs/PHP_CodeSniffer/issues/867
+pear-21005: https://pear.php.net/bugs/bug.php?id=21005
+pear-21010: https://pear.php.net/bugs/bug.php?id=21010
+pear-21011: https://pear.php.net/bugs/bug.php?id=21011
 
 ## 2.5.0 - 2015-12-11
+
 ### Changed
-- PHPCS will now look for a phpcs.xml file in parent directories as well as the current directory (request #626)
+- PHPCS will now look for a phpcs.xml file in parent directories as well as the current directory (request #626sq-626)
 - PHPCS will now use a phpcs.xml file even if files are specified on the command line
     - This file is still only used if no standard is specified on the command line
-- Added support for a phpcs.xml.dist file (request #583)
+- Added support for a phpcs.xml.dist file (request #583sq-583)
     - If both a phpcs.xml and phpcs.xml.dist file are present, the phpcs.xml file will be used
-- Added support for setting PHP ini values in ruleset.xml files (request #560)
+- Added support for setting PHP ini values in ruleset.xml files (request #560sq-560)
     - Setting the value of the new ini tags to name="memory_limit" value="32M" is the same as -d memory_limit=32M
 - Added support for one or more bootstrap files to be run before processing begins
     - Use the --bootstrap=file,file,file command line argument to include bootstrap files
@@ -2986,24 +3569,39 @@
     - Thanks to Arnout Boks@aboks for the patch
 
 ### Fixed
-- Fixed bug #660 : Syntax checks can fail on Windows with PHP5.6
-- Fixed bug #784 : $this->trait is seen as a T_TRAIT token
-- Fixed bug #786 : Switch indent issue with short array notation
-- Fixed bug #787 : SpacingAfterDefaultBreak confused by multi-line statements
-- Fixed bug #797 : Parsing CSS url() value breaks further parsing
-- Fixed bug #805 : Squiz.Commenting.FunctionComment.InvalidTypeHint on Scalar types on PHP7
-- Fixed bug #807 : Cannot fix line endings when open PHP tag is not on the first line
-- Fixed bug #808 : JS tokeniser incorrectly setting some function and class names to control structure tokens
-- Fixed bug #809 : PHPCBF can break a require_once statement with a space before the open parenthesis
-- Fixed bug #813 : PEAR FunctionCallSignature checks wrong indent when first token on line is part of a multi-line string
+- Fixed bug #660sq-660 : Syntax checks can fail on Windows with PHP5.6
+- Fixed bug #784sq-784 : $this->trait is seen as a T_TRAIT token
+- Fixed bug #786sq-786 : Switch indent issue with short array notation
+- Fixed bug #787sq-787 : SpacingAfterDefaultBreak confused by multi-line statements
+- Fixed bug #797sq-797 : Parsing CSS url() value breaks further parsing
+- Fixed bug #805sq-805 : Squiz.Commenting.FunctionComment.InvalidTypeHint on Scalar types on PHP7
+- Fixed bug #807sq-807 : Cannot fix line endings when open PHP tag is not on the first line
+- Fixed bug #808sq-808 : JS tokenizer incorrectly setting some function and class names to control structure tokens
+- Fixed bug #809sq-809 : PHPCBF can break a require_once statement with a space before the open parenthesis
+- Fixed bug #813sq-813 : PEAR FunctionCallSignature checks wrong indent when first token on line is part of a multi-line string
+
+sq-560: https://github.com/squizlabs/PHP_CodeSniffer/issues/560
+sq-583: https://github.com/squizlabs/PHP_CodeSniffer/issues/583
+sq-626: https://github.com/squizlabs/PHP_CodeSniffer/issues/626
+sq-660: https://github.com/squizlabs/PHP_CodeSniffer/pull/660
+sq-784: https://github.com/squizlabs/PHP_CodeSniffer/issues/784
+sq-786: https://github.com/squizlabs/PHP_CodeSniffer/issues/786
+sq-787: https://github.com/squizlabs/PHP_CodeSniffer/issues/787
+sq-797: https://github.com/squizlabs/PHP_CodeSniffer/issues/797
+sq-805: https://github.com/squizlabs/PHP_CodeSniffer/issues/805
+sq-807: https://github.com/squizlabs/PHP_CodeSniffer/issues/807
+sq-808: https://github.com/squizlabs/PHP_CodeSniffer/issues/808
+sq-809: https://github.com/squizlabs/PHP_CodeSniffer/issues/809
+sq-813: https://github.com/squizlabs/PHP_CodeSniffer/issues/813
 
 ## 2.4.0 - 2015-11-24
+
 ### Changed
 - Added support for PHP 7 anonymous classes
     - Anonymous classes are now tokenized as T_ANON_CLASS and ignored by normal class sniffs
 - Added support for PHP 7 function return type declarations
     - Return types are now tokenized as T_RETURN_TYPE
-- Fixed tokenizing of the XOR operator, which was incorrectly identified as a power operator (bug #765)
+- Fixed tokenizing of the XOR operator, which was incorrectly identified as a power operator (bug #765sq-765)
     - The T_POWER token has been removed and replaced by the T_BITWISE_XOR token
     - The PHP-supplied T_POW token has been replicated for PHP versions before 5.6
 - Traits are now tokenized in PHP versions before 5.4 to make testing easier
@@ -3023,40 +3621,66 @@
 - Generic InlineControlStructureSniff now correctly fixes ELSEIF statements
 
 ### Fixed
-- Fixed bug #601 : Expected type hint int; found array in Squiz FunctionCommentSniff
+- Fixed bug #601sq-601 : Expected type hint int; found array in Squiz FunctionCommentSniff
     - Thanks to Scato Eggen@scato for the patch
-- Fixed bug #625 : Consider working around T_HASHBANG in HHVM 3.5.x and 3.6.x
+- Fixed bug #625sq-625 : Consider working around T_HASHBANG in HHVM 3.5.x and 3.6.x
     - Thanks to Kunal Mehta@legoktm for the patch
-- Fixed bug #692 : Comment tokenizer can break when using mbstring function overloading
-- Fixed bug #694 : Long sniff codes can cause PHP warnings in source report when showing error codes
-- Fixed bug #698 : PSR2.Methods.FunctionCallSignature.Indent forces exact indent of ternary operator parameters
-- Fixed bug #704 : ScopeIndent can fail when an opening parenthesis is on a line by itself
-- Fixed bug #707 : Squiz MethodScopeSniff doesn't handle nested functions
-- Fixed bug #709 : Squiz.Sniffs.Whitespace.ScopeClosingBraceSniff marking indented endif in mixed inline HTML blocks
-- Fixed bug #711 : Sniffing from STDIN shows Generic.Files.LowercasedFilename.NotFound error
-- Fixed bug #714 : Fixes suppression of errors using docblocks
+- Fixed bug #692sq-692 : Comment tokenizer can break when using mbstring function overloading
+- Fixed bug #694sq-694 : Long sniff codes can cause PHP warnings in source report when showing error codes
+- Fixed bug #698sq-698 : PSR2.Methods.FunctionCallSignature.Indent forces exact indent of ternary operator parameters
+- Fixed bug #704sq-704 : ScopeIndent can fail when an opening parenthesis is on a line by itself
+- Fixed bug #707sq-707 : Squiz MethodScopeSniff doesn't handle nested functions
+- Fixed bug #709sq-709 : Squiz.Sniffs.Whitespace.ScopeClosingBraceSniff marking indented endif in mixed inline HTML blocks
+- Fixed bug #711sq-711 : Sniffing from STDIN shows Generic.Files.LowercasedFilename.NotFound error
+- Fixed bug #714sq-714 : Fixes suppression of errors using docblocks
     - Thanks to Andrzej Karmazyn@akarmazyn for the patch
-- Fixed bug #716 : JSON report is invalid when messages contain newlines or tabs
+- Fixed bug #716sq-716 : JSON report is invalid when messages contain newlines or tabs
     - Thanks to Pieter Frenssen@pfrenssen for the patch
-- Fixed bug #723 : ScopeIndent can fail when multiple array closers are on the same line
-- Fixed bug #730 : ScopeIndent can fail when a short array opening square bracket is on a line by itself
-- Fixed bug #732 : PHP Notice if @package name is made up of all invalid characters
+- Fixed bug #723sq-723 : ScopeIndent can fail when multiple array closers are on the same line
+- Fixed bug #730sq-730 : ScopeIndent can fail when a short array opening square bracket is on a line by itself
+- Fixed bug #732sq-732 : PHP Notice if @package name is made up of all invalid characters
     - Adds new error code PEAR.Commenting.FileComment.InvalidPackageValue
-- Fixed bug #748 : Auto fix for Squiz.Commenting.BlockComment.WrongEnd is incorrect
+- Fixed bug #748sq-748 : Auto fix for Squiz.Commenting.BlockComment.WrongEnd is incorrect
     - Thanks to J.D. Grimes@JDGrimes for the patch
-- Fixed bug #753 : PSR2 standard shouldn't require space after USE block when next code is a closing tag
-- Fixed bug #768 : PEAR FunctionCallSignature sniff forbids comments after opening parenthesis of a multiline call
-- Fixed bug #769 : Incorrect detection of variable reference operator when used with short array syntax
+- Fixed bug #753sq-753 : PSR2 standard shouldn't require space after USE block when next code is a closing tag
+- Fixed bug #768sq-768 : PEAR FunctionCallSignature sniff forbids comments after opening parenthesis of a multiline call
+- Fixed bug #769sq-769 : Incorrect detection of variable reference operator when used with short array syntax
     - Thanks to Klaus Purer@klausi for the patch
-- Fixed bug #772 : Syntax error when using PHPCBF on alternative style foreach loops
-- Fixed bug #773 : Syntax error when stripping trailing PHP close tag and previous statement has no semicolon
-- Fixed bug #778 : PHPCBF creates invalid PHP for inline FOREACH containing multiple control structures
-- Fixed bug #781 : Incorrect checking for PHP7 return types on multi-line function declarations
-- Fixed bug #782 : Conditional function declarations cause fixing conflicts in Squiz standard
+- Fixed bug #772sq-772 : Syntax error when using PHPCBF on alternative style foreach loops
+- Fixed bug #773sq-773 : Syntax error when stripping trailing PHP close tag and previous statement has no semicolon
+- Fixed bug #778sq-778 : PHPCBF creates invalid PHP for inline FOREACH containing multiple control structures
+- Fixed bug #781sq-781 : Incorrect checking for PHP7 return types on multi-line function declarations
+- Fixed bug #782sq-782 : Conditional function declarations cause fixing conflicts in Squiz standard
     - Squiz.ControlStructures.ControlSignature no longer enforces a single newline after open brace
     - Squiz.WhiteSpace.ControlStructureSpacing can be used to check spacing at the start/end of control structures
 
+sq-601: https://github.com/squizlabs/PHP_CodeSniffer/issues/601
+sq-625: https://github.com/squizlabs/PHP_CodeSniffer/issues/625
+sq-692: https://github.com/squizlabs/PHP_CodeSniffer/pull/692
+sq-694: https://github.com/squizlabs/PHP_CodeSniffer/issues/694
+sq-698: https://github.com/squizlabs/PHP_CodeSniffer/issues/698
+sq-704: https://github.com/squizlabs/PHP_CodeSniffer/issues/704
+sq-707: https://github.com/squizlabs/PHP_CodeSniffer/pull/707
+sq-709: https://github.com/squizlabs/PHP_CodeSniffer/issues/709
+sq-711: https://github.com/squizlabs/PHP_CodeSniffer/issues/711
+sq-714: https://github.com/squizlabs/PHP_CodeSniffer/pull/714
+sq-716: https://github.com/squizlabs/PHP_CodeSniffer/pull/716
+sq-723: https://github.com/squizlabs/PHP_CodeSniffer/issues/723
+sq-730: https://github.com/squizlabs/PHP_CodeSniffer/pull/730
+sq-732: https://github.com/squizlabs/PHP_CodeSniffer/pull/732
+sq-748: https://github.com/squizlabs/PHP_CodeSniffer/pull/748
+sq-753: https://github.com/squizlabs/PHP_CodeSniffer/issues/753
+sq-765: https://github.com/squizlabs/PHP_CodeSniffer/issues/765
+sq-768: https://github.com/squizlabs/PHP_CodeSniffer/issues/768
+sq-769: https://github.com/squizlabs/PHP_CodeSniffer/pull/769
+sq-772: https://github.com/squizlabs/PHP_CodeSniffer/issues/772
+sq-773: https://github.com/squizlabs/PHP_CodeSniffer/issues/773
+sq-778: https://github.com/squizlabs/PHP_CodeSniffer/issues/778
+sq-781: https://github.com/squizlabs/PHP_CodeSniffer/issues/781
+sq-782: https://github.com/squizlabs/PHP_CodeSniffer/issues/782
+
 ## 2.3.4 - 2015-09-09
+
 ### Changed
 - JSON report format now includes the fixable status for each error message and the total number of fixable errors
 - Added more guard code for function declarations with syntax errors
@@ -3066,33 +3690,51 @@
     - Set the allowMultiline property to TRUE (default is FALSE) in your ruleset.xml file to enable this
     - By default, concat used only for getting around line length limits still generates an error
     - Thanks to Stefan Lenselink@stefanlenselink for the contribution
-- Invalid byte sequences no longer throw iconv_strlen() errors (request #639)
+- Invalid byte sequences no longer throw iconv_strlen() errors (request #639sq-639)
     - Thanks to Willem Stuursma@willemstuursma for the patch
 - Generic TodoSniff and FixmeSniff are now better at processing strings with invalid characters
 - PEAR FunctionCallSignatureSniff now ignores indentation of inline HTML content
 - Squiz ControlSignatureSniff now supports control structures with only inline HTML content
 
 ### Fixed
-- Fixed bug #636 : Some class names cause CSS tokenizer to hang
-- Fixed bug #638 : VCS blame reports output error content from the blame commands for files not under VC
-- Fixed bug #642 : Method params incorrectly detected when default value uses short array syntax
+- Fixed bug #636sq-636 : Some class names cause CSS tokenizer to hang
+- Fixed bug #638sq-638 : VCS blame reports output error content from the blame commands for files not under VC
+- Fixed bug #642sq-642 : Method params incorrectly detected when default value uses short array syntax
     - Thanks to Josh Davis@joshdavis11 for the patch
-- Fixed bug #644 : PEAR ScopeClosingBrace sniff does not work with mixed HTML/PHP
-- Fixed bug #645 : FunctionSignature and ScopeIndent sniffs don't detect indents correctly when PHP open tag is not on a line by itself
-- Fixed bug #648 : Namespace not tokenized correctly when followed by multiple use statements
-- Fixed bug #654 : Comments affect indent check for BSDAllman brace style
-- Fixed bug #658 : Squiz.Functions.FunctionDeclarationSpacing error for multi-line declarations with required spaces greater than zero
+- Fixed bug #644sq-644 : PEAR ScopeClosingBrace sniff does not work with mixed HTML/PHP
+- Fixed bug #645sq-645 : FunctionSignature and ScopeIndent sniffs don't detect indents correctly when PHP open tag is not on a line by itself
+- Fixed bug #648sq-648 : Namespace not tokenized correctly when followed by multiple use statements
+- Fixed bug #654sq-654 : Comments affect indent check for BSDAllman brace style
+- Fixed bug #658sq-658 : Squiz.Functions.FunctionDeclarationSpacing error for multi-line declarations with required spaces greater than zero
     - Thanks to J.D. Grimes@JDGrimes for the patch
-- Fixed bug #663 : No space after class name generates: Class name "" is not in camel caps format
-- Fixed bug #667 : Scope indent check can go into infinite loop due to some parse errors
-- Fixed bug #670 : Endless loop in PSR1 SideEffects sniffer if no semicolon after last statement
+- Fixed bug #663sq-663 : No space after class name generates: Class name "" is not in camel caps format
+- Fixed bug #667sq-667 : Scope indent check can go into infinite loop due to some parse errors
+- Fixed bug #670sq-670 : Endless loop in PSR1 SideEffects sniffer if no semicolon after last statement
     - Thanks to Thomas Jarosch@thomasjfox for the patch
-- Fixed bug #672 : Call-time pass-by-reference false positive
-- Fixed bug #683 : Comments are incorrectly reported by PSR2.ControlStructures.SwitchDeclaration sniff
-- Fixed bug #687 : ScopeIndent does not check indent correctly for method prefixes like public and abstract
-- Fixed bug #689 : False error on some comments after class closing brace
+- Fixed bug #672sq-672 : Call-time pass-by-reference false positive
+- Fixed bug #683sq-683 : Comments are incorrectly reported by PSR2.ControlStructures.SwitchDeclaration sniff
+- Fixed bug #687sq-687 : ScopeIndent does not check indent correctly for method prefixes like public and abstract
+- Fixed bug #689sq-689 : False error on some comments after class closing brace
+
+sq-636: https://github.com/squizlabs/PHP_CodeSniffer/issues/636
+sq-638: https://github.com/squizlabs/PHP_CodeSniffer/issues/638
+sq-639: https://github.com/squizlabs/PHP_CodeSniffer/pull/639
+sq-642: https://github.com/squizlabs/PHP_CodeSniffer/pull/642
+sq-644: https://github.com/squizlabs/PHP_CodeSniffer/issues/644
+sq-645: https://github.com/squizlabs/PHP_CodeSniffer/issues/645
+sq-648: https://github.com/squizlabs/PHP_CodeSniffer/issues/648
+sq-654: https://github.com/squizlabs/PHP_CodeSniffer/issues/654
+sq-658: https://github.com/squizlabs/PHP_CodeSniffer/pull/658
+sq-663: https://github.com/squizlabs/PHP_CodeSniffer/issues/663
+sq-667: https://github.com/squizlabs/PHP_CodeSniffer/issues/667
+sq-670: https://github.com/squizlabs/PHP_CodeSniffer/pull/670
+sq-672: https://github.com/squizlabs/PHP_CodeSniffer/issues/672
+sq-683: https://github.com/squizlabs/PHP_CodeSniffer/issues/683
+sq-687: https://github.com/squizlabs/PHP_CodeSniffer/issues/687
+sq-689: https://github.com/squizlabs/PHP_CodeSniffer/issues/689
 
 ## 2.3.3 - 2015-06-24
+
 ### Changed
 - Improved the performance of the CSS tokenizer, especially on very large CSS files (thousands of lines)
     - Thanks to Klaus Purer@klausi for the patch
@@ -3101,82 +3743,124 @@
 - Added more guard code for syntax errors to various sniffs
 - Improved support for older HHVM versions
     - Thanks to Kunal Mehta@legoktm for the patch
-- Squiz ValidLogicalOperatorsSniff now ignores XOR as type casting is different when using the ^ operator (request #567)
+- Squiz ValidLogicalOperatorsSniff now ignores XOR as type casting is different when using the ^ operator (request #567sq-567)
 - Squiz CommentedOutCodeSniff is now better at ignoring URLs inside comments
 - Squiz ControlSignatureSniff is now better at checking embedded PHP code
 - Squiz ScopeClosingBraceSniff is now better at checking embedded PHP code
 
 ### Fixed
-- Fixed bug #584 : Squiz.Arrays.ArrayDeclaration sniff gives incorrect NoComma error for multiline string values
-- Fixed bug #589 : PEAR.Functions.FunctionCallSignature sniff not checking all function calls
-- Fixed bug #592 : USE statement tokenising can sometimes result in mismatched scopes
-- Fixed bug #594 : Tokenizer issue on closure that returns by reference
-- Fixed bug #595 : Colons in CSS selectors within media queries throw false positives
+- Fixed bug #584sq-584 : Squiz.Arrays.ArrayDeclaration sniff gives incorrect NoComma error for multiline string values
+- Fixed bug #589sq-589 : PEAR.Functions.FunctionCallSignature sniff not checking all function calls
+- Fixed bug #592sq-592 : USE statement tokenizing can sometimes result in mismatched scopes
+- Fixed bug #594sq-594 : Tokenizer issue on closure that returns by reference
+- Fixed bug #595sq-595 : Colons in CSS selectors within media queries throw false positives
     - Thanks to Klaus Purer@klausi for the patch
-- Fixed bug #598 : PHPCBF can break function/use closure brace placement
-- Fixed bug #603 : Squiz ControlSignatureSniff hard-codes opener type while fixing
-- Fixed bug #605 : Auto report-width specified in ruleset.xml ignored
-- Fixed bug #611 : Invalid numeric literal on CSS files under PHP7
-- Fixed bug #612 : Multi-file diff generating incorrectly if files do not end with EOL char
-- Fixed bug #615 : Squiz OperatorBracketSniff incorrectly reports and fixes operations using self::
-- Fixed bug #616 : Squiz DisallowComparisonAssignmentSniff inconsistent errors with inline IF statements
-- Fixed bug #617 : Space after switch keyword in PSR-2 is not being enforced
-- Fixed bug #621 : PSR2 SwitchDeclaration sniff doesn't detect, or correctly fix, case body on same line as statement
+- Fixed bug #598sq-598 : PHPCBF can break function/use closure brace placement
+- Fixed bug #603sq-603 : Squiz ControlSignatureSniff hard-codes opener type while fixing
+- Fixed bug #605sq-605 : Auto report-width specified in ruleset.xml ignored
+- Fixed bug #611sq-611 : Invalid numeric literal on CSS files under PHP7
+- Fixed bug #612sq-612 : Multi-file diff generating incorrectly if files do not end with EOL char
+- Fixed bug #615sq-615 : Squiz OperatorBracketSniff incorrectly reports and fixes operations using self::
+- Fixed bug #616sq-616 : Squiz DisallowComparisonAssignmentSniff inconsistent errors with inline IF statements
+- Fixed bug #617sq-617 : Space after switch keyword in PSR-2 is not being enforced
+- Fixed bug #621sq-621 : PSR2 SwitchDeclaration sniff doesn't detect, or correctly fix, case body on same line as statement
+
+sq-567: https://github.com/squizlabs/PHP_CodeSniffer/issues/567
+sq-584: https://github.com/squizlabs/PHP_CodeSniffer/issues/584
+sq-589: https://github.com/squizlabs/PHP_CodeSniffer/issues/589
+sq-592: https://github.com/squizlabs/PHP_CodeSniffer/issues/592
+sq-594: https://github.com/squizlabs/PHP_CodeSniffer/issues/594
+sq-595: https://github.com/squizlabs/PHP_CodeSniffer/pull/595
+sq-598: https://github.com/squizlabs/PHP_CodeSniffer/issues/598
+sq-603: https://github.com/squizlabs/PHP_CodeSniffer/issues/603
+sq-605: https://github.com/squizlabs/PHP_CodeSniffer/issues/605
+sq-611: https://github.com/squizlabs/PHP_CodeSniffer/issues/611
+sq-612: https://github.com/squizlabs/PHP_CodeSniffer/issues/612
+sq-615: https://github.com/squizlabs/PHP_CodeSniffer/issues/615
+sq-616: https://github.com/squizlabs/PHP_CodeSniffer/issues/616
+sq-617: https://github.com/squizlabs/PHP_CodeSniffer/issues/617
+sq-621: https://github.com/squizlabs/PHP_CodeSniffer/issues/621
 
 ## 2.3.2 - 2015-04-29
+
 ### Changed
-- The error message for PSR2.ControlStructures.SwitchDeclaration.WrongOpenercase is now clearer (request #579)
+- The error message for PSR2.ControlStructures.SwitchDeclaration.WrongOpenercase is now clearer (request #579sq-579)
 
 ### Fixed
-- Fixed bug #545 : Long list of CASE statements can cause tokenizer to reach a depth limit
-- Fixed bug #565 : Squiz.WhiteSpace.OperatorSpacing reports negative number in short array
+- Fixed bug #545sq-545 : Long list of CASE statements can cause tokenizer to reach a depth limit
+- Fixed bug #565sq-565 : Squiz.WhiteSpace.OperatorSpacing reports negative number in short array
     - Thanks to Vašek Purchart@VasekPurchart for the patch
     - Same fix also applied to Squiz.Formatting.OperatorBracket
-- Fixed bug #569 : Generic ScopeIndentSniff throws PHP notices in JS files
-- Fixed bug #570 : Phar class fatals in PHP less than 5.3
+- Fixed bug #569sq-569 : Generic ScopeIndentSniff throws PHP notices in JS files
+- Fixed bug #570sq-570 : Phar class fatals in PHP less than 5.3
+
+sq-545: https://github.com/squizlabs/PHP_CodeSniffer/issues/545
+sq-565: https://github.com/squizlabs/PHP_CodeSniffer/pull/565
+sq-569: https://github.com/squizlabs/PHP_CodeSniffer/pull/569
+sq-570: https://github.com/squizlabs/PHP_CodeSniffer/issues/570
+sq-579: https://github.com/squizlabs/PHP_CodeSniffer/issues/579
 
 ## 2.3.1 - 2015-04-23
+
 ### Changed
 - PHPCS can now exit with 0 even if errors are found
     - Set the ignore_errors_on_exit config variable to 1 to set this behaviour
     - Use with the ignore_warnings_on_exit config variable to never return a non-zero exit code
-- Added Generic DisallowLongArraySyntaxSniff to enforce the use of the PHP short array syntax (request #483)
+- Added Generic DisallowLongArraySyntaxSniff to enforce the use of the PHP short array syntax (request #483sq-483)
     - Thanks to Xaver Loppenstedt@xalopp for helping with tests
-- Added Generic DisallowShortArraySyntaxSniff to ban the use of the PHP short array syntax (request #483)
+- Added Generic DisallowShortArraySyntaxSniff to ban the use of the PHP short array syntax (request #483sq-483)
     - Thanks to Xaver Loppenstedt@xalopp for helping with tests
-- Generic ScopeIndentSniff no longer does exact checking for content inside parenthesis (request #528)
+- Generic ScopeIndentSniff no longer does exact checking for content inside parenthesis (request #528sq-528)
     - Only applies to custom coding standards that set the "exact" flag to TRUE
-- Squiz ConcatenationSpacingSniff now has a setting to ignore newline characters around operators (request #511)
+- Squiz ConcatenationSpacingSniff now has a setting to ignore newline characters around operators (request #511sq-511)
     - Default remains FALSE, so newlines are not allowed
     - Override the "ignoreNewlines" setting in a ruleset.xml file to change
-- Squiz InlineCommentSniff no longer checks the last char of a comment if the first char is not a letter (request #505)
+- Squiz InlineCommentSniff no longer checks the last char of a comment if the first char is not a letter (request #505sq-505)
 - The Squiz standard has increased the max padding for statement alignment from 12 to 20
 
 ### Fixed
-- Fixed bug #479 : Yielded values are not recognised as returned values in Squiz FunctionComment sniff
-- Fixed bug #512 : Endless loop whilst parsing mixture of control structure styles
-- Fixed bug #515 : Spaces in JS block incorrectly flagged as indentation error
-- Fixed bug #523 : Generic ScopeIndent errors for IF in FINALLY
-- Fixed bug #527 : Closure inside IF statement is not tokenized correctly
-- Fixed bug #529 : Squiz.Strings.EchoedStrings gives false positive when echo'ing using an inline condition
-- Fixed bug #537 : Using --config-set is breaking phpcs.phar
-- Fixed bug #543 : SWITCH with closure in condition generates inline control structure error
-- Fixed bug #551 : Multiple catch blocks not checked in Squiz.ControlStructures.ControlSignature sniff
-- Fixed bug #554 : ScopeIndentSniff causes errors when encountering an unmatched parenthesis
-- Fixed bug #558 : PHPCBF adds brace for ELSE IF split over multiple lines
-- Fixed bug #564 : Generic MultipleStatementAlignment sniff reports incorrect errors for multiple assignments on a single line
+- Fixed bug #479sq-479 : Yielded values are not recognised as returned values in Squiz FunctionComment sniff
+- Fixed bug #512sq-512 : Endless loop whilst parsing mixture of control structure styles
+- Fixed bug #515sq-515 : Spaces in JS block incorrectly flagged as indentation error
+- Fixed bug #523sq-523 : Generic ScopeIndent errors for IF in FINALLY
+- Fixed bug #527sq-527 : Closure inside IF statement is not tokenized correctly
+- Fixed bug #529sq-529 : Squiz.Strings.EchoedStrings gives false positive when echoing using an inline condition
+- Fixed bug #537sq-537 : Using --config-set is breaking phpcs.phar
+- Fixed bug #543sq-543 : SWITCH with closure in condition generates inline control structure error
+- Fixed bug #551sq-551 : Multiple catch blocks not checked in Squiz.ControlStructures.ControlSignature sniff
+- Fixed bug #554sq-554 : ScopeIndentSniff causes errors when encountering an unmatched parenthesis
+- Fixed bug #558sq-558 : PHPCBF adds brace for ELSE IF split over multiple lines
+- Fixed bug #564sq-564 : Generic MultipleStatementAlignment sniff reports incorrect errors for multiple assignments on a single line
+
+sq-479: https://github.com/squizlabs/PHP_CodeSniffer/issues/479
+sq-483: https://github.com/squizlabs/PHP_CodeSniffer/issues/483
+sq-505: https://github.com/squizlabs/PHP_CodeSniffer/issues/505
+sq-511: https://github.com/squizlabs/PHP_CodeSniffer/issues/511
+sq-512: https://github.com/squizlabs/PHP_CodeSniffer/issues/512
+sq-515: https://github.com/squizlabs/PHP_CodeSniffer/issues/515
+sq-523: https://github.com/squizlabs/PHP_CodeSniffer/issues/523
+sq-527: https://github.com/squizlabs/PHP_CodeSniffer/issues/527
+sq-528: https://github.com/squizlabs/PHP_CodeSniffer/issues/528
+sq-529: https://github.com/squizlabs/PHP_CodeSniffer/issues/529
+sq-537: https://github.com/squizlabs/PHP_CodeSniffer/issues/537
+sq-543: https://github.com/squizlabs/PHP_CodeSniffer/issues/543
+sq-551: https://github.com/squizlabs/PHP_CodeSniffer/issues/551
+sq-554: https://github.com/squizlabs/PHP_CodeSniffer/issues/554
+sq-558: https://github.com/squizlabs/PHP_CodeSniffer/issues/558
+sq-564: https://github.com/squizlabs/PHP_CodeSniffer/issues/564
 
 ## 2.3.0 - 2015-03-04
+
 ### Changed
-- The existence of the main config file is now cached to reduce is_file() calls when it doesn't exist (request #486)
-- Abstract classes inside the Sniffs directory are now ignored even if they are named NameSniff.php (request #476)
+- The existence of the main config file is now cached to reduce is_file() calls when it doesn't exist (request #486sq-486)
+- Abstract classes inside the Sniffs directory are now ignored even if they are named `NameSniff.php` (request #476sq-476)
     - Thanks to David Vernet@Decave for the patch
 - PEAR and Squiz FileComment sniffs no longer have @ in their error codes
     - e.g., PEAR.Commenting.FileComment.Duplicate@categoryTag becomes PEAR.Commenting.FileComment.DuplicateCategoryTag
     - e.g., Squiz.Commenting.FileComment.Missing@categoryTag becomes Squiz.Commenting.FileComment.MissingCategoryTag
 - PEAR MultiLineConditionSniff now allows comment lines inside multi-line IF statement conditions
     - Thanks to Klaus Purer@klausi for the patch
-- Generic ForbiddenFunctionsSniff now supports setting null replacements in ruleset files (request #263)
+- Generic ForbiddenFunctionsSniff now supports setting null replacements in ruleset files (request #263sq-263)
 - Generic opening function brace sniffs now support checking of closures
     - Set the checkClosures property to TRUE (default is FALSE) in your ruleset.xml file to enable this
     - Can also set the checkFunctions property to FALSE (default is TRUE) in your ruleset.xml file to only check closures
@@ -3187,7 +3871,7 @@
 - Improved auto report width for the "full" report
 - Improved conflict detection during auto fixing
 - Generic ScopeIndentSniff is no longer confused by empty closures
-- Squiz ControlSignatureSniff now always ignores comments (fixes bug #490)
+- Squiz ControlSignatureSniff now always ignores comments (fixes bug #490sq-490)
     - Include the Squiz.Commenting.PostStatementComment sniff in your ruleset.xml to ban these comments again
 - Squiz OperatorSpacingSniff no longer throws errors for code in the form ($foo || -1 === $bar)
 - Fixed errors tokenizing T_ELSEIF tokens on HHVM 3.5
@@ -3195,26 +3879,46 @@
 - PEAR IncludingFileSniff no longer produces invalid code when removing parenthesis from require/include statements
 
 ### Fixed
-- Fixed bug #415 : The @codingStandardsIgnoreStart has no effect during fixing
-- Fixed bug #432 : Properties of custom sniffs cannot be configured
-- Fixed bug #453 : PSR2 standard does not allow closing tag for mixed PHP/HTML files
-- Fixed bug #457 : FunctionCallSignature sniffs do not support here/nowdoc syntax and can cause syntax error when fixing
-- Fixed bug #466 : PropertyLabelSpacing JS fixer issue when there is no space after colon
-- Fixed bug #473 : Writing a report for an empty folder to existing file includes the existing contents
-- Fixed bug #485 : PHP notice in Squiz.Commenting.FunctionComment when checking malformed @throws comment
-- Fixed bug #491 : Generic InlineControlStructureSniff can correct with missing semicolon
+- Fixed bug #415sq-415 : The @codingStandardsIgnoreStart has no effect during fixing
+- Fixed bug #432sq-432 : Properties of custom sniffs cannot be configured
+- Fixed bug #453sq-453 : PSR2 standard does not allow closing tag for mixed PHP/HTML files
+- Fixed bug #457sq-457 : FunctionCallSignature sniffs do not support here/nowdoc syntax and can cause syntax error when fixing
+- Fixed bug #466sq-466 : PropertyLabelSpacing JS fixer issue when there is no space after colon
+- Fixed bug #473sq-473 : Writing a report for an empty folder to existing file includes the existing contents
+- Fixed bug #485sq-485 : PHP notice in Squiz.Commenting.FunctionComment when checking malformed @throws comment
+- Fixed bug #491sq-491 : Generic InlineControlStructureSniff can correct with missing semicolon
     - Thanks to Jesse Donat@donatj for the patch
-- Fixed bug #492 : Use statements don't increase the scope indent
-- Fixed bug #493 : PSR1_Sniffs_Methods_CamelCapsMethodNameSniff false positives for some magic method detection
+- Fixed bug #492sq-492 : Use statements don't increase the scope indent
+- Fixed bug #493sq-493 : PSR1_Sniffs_Methods_CamelCapsMethodNameSniff false positives for some magic method detection
     - Thanks to Andreas Möller@localheinz for the patch
-- Fixed bug #496 : Closures in PSR2 are not checked for a space after the function keyword
-- Fixed bug #497 : Generic InlineControlStructureSniff does not support alternative SWITCH syntax
-- Fixed bug #500 : Functions not supported as values in Squiz ArrayDeclaration sniff
-- Fixed bug #501 : ScopeClosingBrace and ScopeIndent conflict with closures used as array values
+- Fixed bug #496sq-496 : Closures in PSR2 are not checked for a space after the function keyword
+- Fixed bug #497sq-497 : Generic InlineControlStructureSniff does not support alternative SWITCH syntax
+- Fixed bug #500sq-500 : Functions not supported as values in Squiz ArrayDeclaration sniff
+- Fixed bug #501sq-501 : ScopeClosingBrace and ScopeIndent conflict with closures used as array values
     - Generic ScopeIndentSniff may now report fewer errors for closures, but perform the same fixes
-- Fixed bug #502 : PSR1 SideEffectsSniff sees declare() statements as side effects
+- Fixed bug #502sq-502 : PSR1 SideEffectsSniff sees declare() statements as side effects
+
+sq-415: https://github.com/squizlabs/PHP_CodeSniffer/issues/415
+sq-432: https://github.com/squizlabs/PHP_CodeSniffer/issues/432
+sq-453: https://github.com/squizlabs/PHP_CodeSniffer/issues/453
+sq-457: https://github.com/squizlabs/PHP_CodeSniffer/issues/457
+sq-466: https://github.com/squizlabs/PHP_CodeSniffer/issues/466
+sq-473: https://github.com/squizlabs/PHP_CodeSniffer/issues/473
+sq-476: https://github.com/squizlabs/PHP_CodeSniffer/issues/476
+sq-485: https://github.com/squizlabs/PHP_CodeSniffer/issues/485
+sq-486: https://github.com/squizlabs/PHP_CodeSniffer/issues/486
+sq-490: https://github.com/squizlabs/PHP_CodeSniffer/issues/490
+sq-491: https://github.com/squizlabs/PHP_CodeSniffer/pull/491
+sq-492: https://github.com/squizlabs/PHP_CodeSniffer/pull/492
+sq-493: https://github.com/squizlabs/PHP_CodeSniffer/pull/493
+sq-496: https://github.com/squizlabs/PHP_CodeSniffer/issues/496
+sq-497: https://github.com/squizlabs/PHP_CodeSniffer/issues/497
+sq-500: https://github.com/squizlabs/PHP_CodeSniffer/issues/500
+sq-501: https://github.com/squizlabs/PHP_CodeSniffer/issues/501
+sq-502: https://github.com/squizlabs/PHP_CodeSniffer/issues/502
 
 ## 2.2.0 - 2015-01-22
+
 ### Changed
 - Added (hopefully) tastefully used colors to report and progress output for the phpcs command
     - Use the --colors command line argument to use colors in output
@@ -3238,24 +3942,24 @@
     - PHP and JS functions and closures are now treated the same way
 - Squiz MultiLineFunctionDeclarationSniff now supports JS files
 - Interactive mode no longer breaks if you also specify a report type on the command line
-- PEAR InlineCommentSniff now fixes the Perl-style comments that it finds (request #375)
+- PEAR InlineCommentSniff now fixes the Perl-style comments that it finds (request #375sq-375)
 - PSR2 standard no longer fixes the placement of docblock open tags as comments are excluded from this standard
 - PSR2 standard now sets a default tab width of 4 spaces
-- Generic DocCommentSniff now only disallows lowercase letters at the start of a long/short comment (request #377)
+- Generic DocCommentSniff now only disallows lowercase letters at the start of a long/short comment (request #377sq-377)
     - All non-letter characters are now allowed, including markdown special characters and numbers
-- Generic DisallowMultipleStatementsSniff now allows multiple open/close tags on the same line (request #423)
-- Generic CharacterBeforePHPOpeningTagSniff now only checks the first PHP tag it finds (request #423)
-- Generic CharacterBeforePHPOpeningTagSniff now allows a shebang line at the start of the file (request #20481)
-- Generic InlineHTMLUnitTest now allows a shebang line at the start of the file (request #20481)
+- Generic DisallowMultipleStatementsSniff now allows multiple open/close tags on the same line (request #423sq-423)
+- Generic CharacterBeforePHPOpeningTagSniff now only checks the first PHP tag it finds (request #423sq-423)
+- Generic CharacterBeforePHPOpeningTagSniff now allows a shebang line at the start of the file (request #20481pear-20481)
+- Generic InlineHTMLUnitTest now allows a shebang line at the start of the file (request #20481pear-20481)
 - PEAR ObjectOperatorIndentSniff now only checks object operators at the start of a line
 - PEAR FileComment and ClassComment sniffs no longer have @ in their error codes
     - E.g., PEAR.Commenting.FileComment.Missing@categoryTag becomes PEAR.Commenting.FileComment.MissingCategoryTag
     - Thanks to Grzegorz Rygielski@grzr for the patch
 - Squiz ControlStructureSpacingSniff no longer enforces a blank line before CATCH statements
-- Squiz FunctionCommentSniff now fixes the return type in the @return tag (request #392)
+- Squiz FunctionCommentSniff now fixes the return type in the @return tag (request #392sq-392)
 - Squiz BlockCommentSniff now only disallows lowercase letters at the start of the comment
 - Squiz InlineCommentSniff now only disallows lowercase letters at the start of the comment
-- Squiz OperatorSpacingSniff now has a setting to ignore newline characters around operators (request #348)
+- Squiz OperatorSpacingSniff now has a setting to ignore newline characters around operators (request #348sq-348)
     - Default remains FALSE, so newlines are not allowed
     - Override the "ignoreNewlines" setting in a ruleset.xml file to change
 - PSR2 ControlStructureSpacingSniff now checks for, and fixes, newlines after the opening parenthesis
@@ -3263,28 +3967,53 @@
     - Thanks to Stefano Kowalke@Konafets for the contribution
 
 ### Fixed
-- Fixed bug #379 : Squiz.Arrays.ArrayDeclaration.NoCommaAfterLast incorrectly detects comments
-- Fixed bug #382 : JS tokenizer incorrect for inline conditionally created immediately invoked anon function
-- Fixed bug #383 : Squiz.Arrays.ArrayDeclaration.ValueNoNewline incorrectly detects nested arrays
-- Fixed bug #386 : Undefined offset in Squiz.FunctionComment sniff when param has no comment
-- Fixed bug #390 : Indentation of non-control structures isn't adjusted when containing structure is fixed
-- Fixed bug #400 : InlineControlStructureSniff fails to fix when statement has no semicolon
-- Fixed bug #401 : PHPCBF no-patch option shows an error when there are no fixable violations in a file
-- Fixed bug #405 : The "Squiz.WhiteSpace.FunctionSpacing" sniff removes class "}" during fixing
-- Fixed bug #407 : PEAR.ControlStructures.MultiLineCondition doesn't account for comments at the end of lines
-- Fixed bug #410 : The "Squiz.WhiteSpace.MemberVarSpacing" not respecting "var"
-- Fixed bug #411 : Generic.WhiteSpace.ScopeIndent.Incorrect - false positive with multiple arrays in argument list
-- Fixed bug #412 : PSR2 multi-line detection doesn't work for inline IF and string concats
-- Fixed bug #414 : Squiz.WhiteSpace.MemberVarSpacing - inconsistent checking of member vars with comment
-- Fixed bug #433 : Wrong detection of Squiz.Arrays.ArrayDeclaration.KeyNotAligned when key contains space
-- Fixed bug #434 : False positive for spacing around "=>" in inline array within foreach
-- Fixed bug #452 : Ruleset exclude-pattern for specific sniff code ignored when using CLI --ignore option
-- Fixed bug #20482 : Scope indent sniff can get into infinite loop when processing a parse error
+- Fixed bug #379sq-379 : Squiz.Arrays.ArrayDeclaration.NoCommaAfterLast incorrectly detects comments
+- Fixed bug #382sq-382 : JS tokenizer incorrect for inline conditionally created immediately invoked anon function
+- Fixed bug #383sq-383 : Squiz.Arrays.ArrayDeclaration.ValueNoNewline incorrectly detects nested arrays
+- Fixed bug #386sq-386 : Undefined offset in Squiz.FunctionComment sniff when param has no comment
+- Fixed bug #390sq-390 : Indentation of non-control structures isn't adjusted when containing structure is fixed
+- Fixed bug #400sq-400 : InlineControlStructureSniff fails to fix when statement has no semicolon
+- Fixed bug #401sq-401 : PHPCBF no-patch option shows an error when there are no fixable violations in a file
+- Fixed bug #405sq-405 : The "Squiz.WhiteSpace.FunctionSpacing" sniff removes class "}" during fixing
+- Fixed bug #407sq-407 : PEAR.ControlStructures.MultiLineCondition doesn't account for comments at the end of lines
+- Fixed bug #410sq-410 : The "Squiz.WhiteSpace.MemberVarSpacing" not respecting "var"
+- Fixed bug #411sq-411 : Generic.WhiteSpace.ScopeIndent.Incorrect - false positive with multiple arrays in argument list
+- Fixed bug #412sq-412 : PSR2 multi-line detection doesn't work for inline IF and string concats
+- Fixed bug #414sq-414 : Squiz.WhiteSpace.MemberVarSpacing - inconsistent checking of member vars with comment
+- Fixed bug #433sq-433 : Wrong detection of Squiz.Arrays.ArrayDeclaration.KeyNotAligned when key contains space
+- Fixed bug #434sq-434 : False positive for spacing around "=>" in inline array within foreach
+- Fixed bug #452sq-452 : Ruleset exclude-pattern for specific sniff code ignored when using CLI --ignore option
+- Fixed bug #20482pear-20482 : Scope indent sniff can get into infinite loop when processing a parse error
+
+sq-348: https://github.com/squizlabs/PHP_CodeSniffer/issues/348
+sq-375: https://github.com/squizlabs/PHP_CodeSniffer/issues/375
+sq-377: https://github.com/squizlabs/PHP_CodeSniffer/issues/377
+sq-379: https://github.com/squizlabs/PHP_CodeSniffer/issues/379
+sq-382: https://github.com/squizlabs/PHP_CodeSniffer/issues/382
+sq-383: https://github.com/squizlabs/PHP_CodeSniffer/issues/383
+sq-386: https://github.com/squizlabs/PHP_CodeSniffer/issues/386
+sq-390: https://github.com/squizlabs/PHP_CodeSniffer/issues/390
+sq-392: https://github.com/squizlabs/PHP_CodeSniffer/issues/392
+sq-400: https://github.com/squizlabs/PHP_CodeSniffer/issues/400
+sq-401: https://github.com/squizlabs/PHP_CodeSniffer/issues/401
+sq-405: https://github.com/squizlabs/PHP_CodeSniffer/issues/405
+sq-407: https://github.com/squizlabs/PHP_CodeSniffer/issues/407
+sq-410: https://github.com/squizlabs/PHP_CodeSniffer/issues/410
+sq-411: https://github.com/squizlabs/PHP_CodeSniffer/issues/411
+sq-412: https://github.com/squizlabs/PHP_CodeSniffer/issues/412
+sq-414: https://github.com/squizlabs/PHP_CodeSniffer/issues/414
+sq-423: https://github.com/squizlabs/PHP_CodeSniffer/issues/423
+sq-433: https://github.com/squizlabs/PHP_CodeSniffer/issues/433
+sq-434: https://github.com/squizlabs/PHP_CodeSniffer/issues/434
+sq-452: https://github.com/squizlabs/PHP_CodeSniffer/issues/452
+pear-20481: https://pear.php.net/bugs/bug.php?id=20481
+pear-20482: https://pear.php.net/bugs/bug.php?id=20482
 
 ## 2.1.0 - 2014-12-18
+
 ### Changed
-- Time and memory output is now shown if progress information is also shown (request #335)
-- A tilde can now be used to reference a user's home directory in a path to a standard (request #353)
+- Time and memory output is now shown if progress information is also shown (request #335sq-335)
+- A tilde can now be used to reference a user's home directory in a path to a standard (request #353sq-353)
 - Added PHP_CodeSniffer_File::findStartOfStatement() to find the first non-whitespace token in a statement
     - Possible alternative for code using PHP_CodeSniffer_File::findPrevious() with the local flag set
 - Added PHP_CodeSniffer_File::findEndOfStatement() to find the last non-whitespace token in a statement
@@ -3293,17 +4022,17 @@
     - Affects OpeningFunctionBraceBsdAllmanSniff and OpeningFunctionBraceKernighanRitchieSniff
     - Also enforced in PEAR FunctionDeclarationSniff and Squiz MultiLineFunctionDeclarationSniff
 - Generic DisallowTabIndentSniff now replaces tabs everywhere it finds them, except in strings and here/now docs
-- Generic EmptyStatementSniff error codes now contain the type of empty statement detected (request #314)
+- Generic EmptyStatementSniff error codes now contain the type of empty statement detected (request #314sq-314)
     - All messages generated by this sniff are now errors (empty CATCH was previously a warning)
-    - Message code Generic.CodeAnalysis.EmptyStatement.NotAllowed has been removed
-    - Message code Generic.CodeAnalysis.EmptyStatement.NotAllowedWarning has been removed
-    - New message codes have the format Generic.CodeAnalysis.EmptyStatement.DetectedTYPE
-    - Example code is Generic.CodeAnalysis.EmptyStatement.DetectedCATCH
+    - Message code `Generic.CodeAnalysis.EmptyStatement.NotAllowed` has been removed
+    - Message code `Generic.CodeAnalysis.EmptyStatement.NotAllowedWarning` has been removed
+    - New message codes have the format `Generic.CodeAnalysis.EmptyStatement.DetectedTYPE`
+    - Example code is `Generic.CodeAnalysis.EmptyStatement.DetectedCATCH`
     - You can now use a custom ruleset to change messages to warnings and to exclude them
-- PEAR and Squiz FunctionCommentSniffs no longer ban @return tags for constructors and destructors
+- PEAR and Squiz FunctionCommentSniffs no longer ban `@return` tags for constructors and destructors
     - Removed message PEAR.Commenting.FunctionComment.ReturnNotRequired
     - Removed message Squiz.Commenting.FunctionComment.ReturnNotRequired
-    - Change initiated by request #324 and request #369
+    - Change initiated by request #324sq-324 and request #369sq-369
 - Squiz EmptyStatementSniff has been removed
     - Squiz standard now includes Generic EmptyStatementSniff and turns off the empty CATCH error
 - Squiz ControlSignatureSniff fixes now retain comments between the closing parenthesis and open brace
@@ -3312,23 +4041,44 @@
 - Squiz ArrayDeclarationSniff now skips function calls while checking multi-line arrays
 
 ### Fixed
-- Fixed bug #337 : False positive with anonymous functions in Generic_Sniffs_WhiteSpace_ScopeIndentSniff
-- Fixed bug #339 : reformatting brace location can result in broken code
-- Fixed bug #342 : Nested ternary operators not tokenized correctly
-- Fixed bug #345 : Javascript regex not tokenized when inside array
-- Fixed bug #346 : PHP path can't be determined in some cases in "phpcs.bat" (on Windows XP)
-- Fixed bug #358 : False positives for Generic_Sniffs_WhiteSpace_ScopeIndentSniff
-- Fixed bug #361 : Sniff-specific exclude patterns don't work for Windows
-- Fixed bug #364 : Don't interpret "use function" as declaration
-- Fixed bug #366 : phpcbf with PSR2 errors on control structure alternative syntax
-- Fixed bug #367 : Nested Anonymous Functions Causing False Negative
-- Fixed bug #371 : Shorthand binary cast causes tokenizer errors
+- Fixed bug #337sq-337 : False positive with anonymous functions in Generic_Sniffs_WhiteSpace_ScopeIndentSniff
+- Fixed bug #339sq-339 : reformatting brace location can result in broken code
+- Fixed bug #342sq-342 : Nested ternary operators not tokenized correctly
+- Fixed bug #345sq-345 : Javascript regex not tokenized when inside array
+- Fixed bug #346sq-346 : PHP path can't be determined in some cases in "phpcs.bat" (on Windows XP)
+- Fixed bug #358sq-358 : False positives for Generic_Sniffs_WhiteSpace_ScopeIndentSniff
+- Fixed bug #361sq-361 : Sniff-specific exclude patterns don't work for Windows
+- Fixed bug #364sq-364 : Don't interpret "use function" as declaration
+- Fixed bug #366sq-366 : phpcbf with PSR2 errors on control structure alternative syntax
+- Fixed bug #367sq-367 : Nested Anonymous Functions Causing False Negative
+- Fixed bug #371sq-371 : Shorthand binary cast causes tokenizer errors
     - New token T_BINARY_CAST added for the b"string" cast format (the 'b' is the T_BINARY_CAST token)
-- Fixed bug #372 : phpcbf parse problem, wrong brace placement for inline IF
-- Fixed bug #373 : Double quote usage fix removing too many double quotes
-- Fixed bug #20196 : 1.5.2 breaks scope_closer position
+- Fixed bug #372sq-372 : phpcbf parse problem, wrong brace placement for inline IF
+- Fixed bug #373sq-373 : Double quote usage fix removing too many double quotes
+- Fixed bug #20196pear-20196 : 1.5.2 breaks scope_closer position
+
+sq-314: https://github.com/squizlabs/PHP_CodeSniffer/issues/314
+sq-324: https://github.com/squizlabs/PHP_CodeSniffer/issues/324
+sq-335: https://github.com/squizlabs/PHP_CodeSniffer/issues/335
+sq-337: https://github.com/squizlabs/PHP_CodeSniffer/issues/337
+sq-339: https://github.com/squizlabs/PHP_CodeSniffer/issues/339
+sq-342: https://github.com/squizlabs/PHP_CodeSniffer/issues/342
+sq-345: https://github.com/squizlabs/PHP_CodeSniffer/issues/345
+sq-346: https://github.com/squizlabs/PHP_CodeSniffer/issues/346
+sq-353: https://github.com/squizlabs/PHP_CodeSniffer/issues/353
+sq-358: https://github.com/squizlabs/PHP_CodeSniffer/issues/358
+sq-361: https://github.com/squizlabs/PHP_CodeSniffer/issues/361
+sq-364: https://github.com/squizlabs/PHP_CodeSniffer/pull/364
+sq-366: https://github.com/squizlabs/PHP_CodeSniffer/issues/366
+sq-367: https://github.com/squizlabs/PHP_CodeSniffer/issues/367
+sq-369: https://github.com/squizlabs/PHP_CodeSniffer/issues/369
+sq-371: https://github.com/squizlabs/PHP_CodeSniffer/issues/371
+sq-372: https://github.com/squizlabs/PHP_CodeSniffer/issues/372
+sq-373: https://github.com/squizlabs/PHP_CodeSniffer/issues/373
+pear-20196: https://pear.php.net/bugs/bug.php?id=20196
 
 ## 2.0.0 - 2014-12-05
+
 ### Changed
 - JS tokenizer now sets functions as T_CLOSUREs if the function is anonymous
 - JS tokenizer now sets all objects to T_OBJECT
@@ -3358,11 +4108,15 @@
 - Improved fixing of lines after cases statements in Squiz SwitchDeclarationSniff
 
 ### Fixed
-- Fixed bug #311 : Suppression of function prototype breaks checking of lines within function
-- Fixed bug #320 : Code sniffer indentation issue
-- Fixed bug #333 : Nested ternary operators causing problems
+- Fixed bug #311sq-311 : Suppression of function prototype breaks checking of lines within function
+- Fixed bug #320sq-320 : Code sniffer indentation issue
+- Fixed bug #333sq-333 : Nested ternary operators causing problems
+
+sq-320: https://github.com/squizlabs/PHP_CodeSniffer/issues/320
+sq-333: https://github.com/squizlabs/PHP_CodeSniffer/issues/333
 
 ## 1.5.6 - 2014-12-05
+
 ### Changed
 - JS tokenizer now detects xor statements correctly
 - The --config-show command now pretty-prints the config values
@@ -3377,13 +4131,16 @@
     - Thanks to Thibaud Fabre@fabre-thibaud for the patch
 
 ### Fixed
-- Fixed bug #280 : The --config-show option generates error when there is no config file
-- Fixed bug #306 : File containing only a namespace declaration raises undefined index notice
-- Fixed bug #308 : Squiz InlineIfDeclarationSniff fails on ternary operators inside closure
-- Fixed bug #310 : Variadics not recognized by tokenizer
-- Fixed bug #311 : Suppression of function prototype breaks checking of lines within function
+- Fixed bug #280sq-280 : The --config-show option generates error when there is no config file
+- Fixed bug #306sq-306 : File containing only a namespace declaration raises undefined index notice
+- Fixed bug #308sq-308 : Squiz InlineIfDeclarationSniff fails on ternary operators inside closure
+- Fixed bug #310sq-310 : Variadics not recognized by tokenizer
+- Fixed bug #311sq-311 : Suppression of function prototype breaks checking of lines within function
+
+sq-311: https://github.com/squizlabs/PHP_CodeSniffer/issues/311
 
 ## 2.0.0RC4 - 2014-11-07
+
 ### Changed
 - JS tokenizer now detects xor statements correctly
 - Improved detection of properties and objects in the JS tokenizer
@@ -3407,16 +4164,26 @@
 - Running unit tests with the -v CLI argument no longer generates PHP errors
 
 ### Fixed
-- Fixed bug #295 : ScopeIndentSniff hangs when processing nested closures
-- Fixed bug #298 : False positive in ScopeIndentSniff when anonymous functions are used with method chaining
-- Fixed bug #302 : Fixing code in Squiz InlineComment sniff can remove some comment text
-- Fixed bug #303 : Open and close tag on same line can cause a PHP notice checking scope indent
-- Fixed bug #306 : File containing only a namespace declaration raises undefined index notice
-- Fixed bug #307 : Conditional breaks in case statements get incorrect indentations
-- Fixed bug #308 : Squiz InlineIfDeclarationSniff fails on ternary operators inside closure
-- Fixed bug #310 : Variadics not recognized by tokenizer
+- Fixed bug #295sq-295 : ScopeIndentSniff hangs when processing nested closures
+- Fixed bug #298sq-298 : False positive in ScopeIndentSniff when anonymous functions are used with method chaining
+- Fixed bug #302sq-302 : Fixing code in Squiz InlineComment sniff can remove some comment text
+- Fixed bug #303sq-303 : Open and close tag on same line can cause a PHP notice checking scope indent
+- Fixed bug #306sq-306 : File containing only a namespace declaration raises undefined index notice
+- Fixed bug #307sq-307 : Conditional breaks in case statements get incorrect indentations
+- Fixed bug #308sq-308 : Squiz InlineIfDeclarationSniff fails on ternary operators inside closure
+- Fixed bug #310sq-310 : Variadics not recognized by tokenizer
+
+sq-295: https://github.com/squizlabs/PHP_CodeSniffer/issues/295
+sq-298: https://github.com/squizlabs/PHP_CodeSniffer/issues/298
+sq-302: https://github.com/squizlabs/PHP_CodeSniffer/issues/302
+sq-303: https://github.com/squizlabs/PHP_CodeSniffer/issues/303
+sq-306: https://github.com/squizlabs/PHP_CodeSniffer/issues/306
+sq-307: https://github.com/squizlabs/PHP_CodeSniffer/issues/307
+sq-308: https://github.com/squizlabs/PHP_CodeSniffer/issues/308
+sq-310: https://github.com/squizlabs/PHP_CodeSniffer/issues/310
 
 ## 2.0.0RC3 - 2014-10-16
+
 ### Changed
 - Improved default output for PHPCBF and removed the options to print verbose and progress output
 - If a .fixed file is supplied for a unit test file, the auto fixes will be checked against it during testing
@@ -3435,26 +4202,30 @@
 - Squiz EmbeddedPhpSniff now checks open and close tag indents and fixes some errors
 - Squiz FileCommentSniff no longer throws incorrect blank line before comment errors in JS files
 - Squiz ClassDeclarationSniff now has better checking for blank lines after a closing brace
-- Removed error Squiz.Classes.ClassDeclaration.NoNewlineAfterCloseBrace (request #285)
+- Removed error Squiz.Classes.ClassDeclaration.NoNewlineAfterCloseBrace (request #285sq-285)
     - Already handled by Squiz.Classes.ClassDeclaration.CloseBraceSameLine
 
 ### Fixed
-- Fixed bug #280 : The --config-show option generates error when there is no config file
+- Fixed bug #280sq-280 : The --config-show option generates error when there is no config file
+
+sq-280: https://github.com/squizlabs/PHP_CodeSniffer/issues/280
+sq-285: https://github.com/squizlabs/PHP_CodeSniffer/issues/285
 
 ## 2.0.0RC2 - 2014-09-26
+
 ### Changed
-- Minified JS and CSS files are now detected and skipped (fixes bug #252 and bug #19899)
+- Minified JS and CSS files are now detected and skipped (fixes bug #252sq-252 and bug #19899pear-19899)
     - A warning will be added to the file so it can be found in the report and ignored in the future
 - Fixed incorrect length of JS object operator tokens
 - PHP tokenizer no longer converts class/function names to special tokens types
     - Class/function names such as parent and true would become special tokens such as T_PARENT and T_TRUE
-- PHPCS can now exit with 0 if only warnings were found (request #262)
+- PHPCS can now exit with 0 if only warnings were found (request #262sq-262)
     - Set the ignore_warnings_on_exit config variable to 1 to set this behaviour
     - Default remains at exiting with 0 only if no errors and no warnings were found
     - Also changes return value of PHP_CodeSniffer_Reporting::printReport()
 - Rulesets can now set associative array properties
-    - property name="property" type="array" value="foo=>bar,baz=>qux"
-- Generic ForbiddenFunctionsSniff now has a public property called forbiddenFunctions (request #263)
+    - property `name="property" type="array" value="foo=>bar,baz=>qux"`
+- Generic ForbiddenFunctionsSniff now has a public property called forbiddenFunctions (request #263sq-263)
     - Override the property in a ruleset.xml file to define forbidden functions and their replacements
     - A replacement of NULL indicates that no replacement is available
     - e.g., value="delete=>unset,print=>echo,create_function=>null"
@@ -3466,14 +4237,14 @@
     - If 2 sniffs look to be conflicting, one change will be ignored to allow a fix to occur
 - Generic CamelCapsFunctionNameSniff now ignores a single leading underscore
     - Thanks to Alex Slobodiskiy@xt99 for the patch
-- Standards can now be located within hidden directories (further fix for bug #20323)
+- Standards can now be located within hidden directories (further fix for bug #20323pear-20323)
     - Thanks to Klaus Purer@klausi for the patch
 - Sniff ignore patterns now replace Win dir separators like file ignore patterns already did
 - Exclude patterns now use backtick delimiters, allowing all special characters to work correctly again
     - Thanks to Jeremy Edgell@jedgell for the patch
 - Errors converted to warnings in a ruleset (and vice versa) now retain their fixable status
     - Thanks to Alexander Obuhovich@aik099 for the patch
-- Squiz ConcatenationSpacingSniff now has a setting to specify how many spaces there should around concat operators
+- Squiz ConcatenationSpacingSniff now has a setting to specify how many spaces there should be around concat operators
     - Default remains at 0
     - Override the "spacing" setting in a ruleset.xml file to change
 - Added auto-fixes for Squiz InlineCommentSniff
@@ -3491,17 +4262,26 @@
 - Generic UpperCaseConstantSniff and LowerCaseConstantSniff now ignore function names
 
 ### Fixed
-- Fixed bug #243 : Missing DocBlock not detected
-- Fixed bug #248 : FunctionCommentSniff expects ampersand on param name
-- Fixed bug #265 : False positives with type hints in ForbiddenFunctionsSniff
-- Fixed bug #20373 : Inline comment sniff tab handling way
-- Fixed bug #20377 : Error when trying to execute phpcs with report=json
-- Fixed bug #20378 : Report appended to existing file if no errors found in run
-- Fixed bug #20381 : Invalid "Comment closer must be on a new line"
+- Fixed bug #243sq-243 : Missing DocBlock not detected
+- Fixed bug #248sq-248 : FunctionCommentSniff expects ampersand on param name
+- Fixed bug #265sq-265 : False positives with type hints in ForbiddenFunctionsSniff
+- Fixed bug #20373pear-20373 : Inline comment sniff tab handling way
+- Fixed bug #20377pear-20377 : Error when trying to execute phpcs with report=json
+- Fixed bug #20378pear-20378 : Report appended to existing file if no errors found in run
+- Fixed bug #20381pear-20381 : Invalid "Comment closer must be on a new line"
     - Thanks to Brad Kent@bkdotcom for the patch
-- Fixed bug #20402 : SVN pre-commit hook fails due to unknown argument error
+- Fixed bug #20402pear-20402 : SVN pre-commit hook fails due to unknown argument error
+
+sq-243: https://github.com/squizlabs/PHP_CodeSniffer/issues/243
+sq-252: https://github.com/squizlabs/PHP_CodeSniffer/issues/252
+sq-262: https://github.com/squizlabs/PHP_CodeSniffer/issues/262
+sq-263: https://github.com/squizlabs/PHP_CodeSniffer/issues/263
+pear-19899: https://pear.php.net/bugs/bug.php?id=19899
+pear-20377: https://pear.php.net/bugs/bug.php?id=20377
+pear-20402: https://pear.php.net/bugs/bug.php?id=20402
 
 ## 1.5.5 - 2014-09-25
+
 ### Changed
 - PHP tokenizer no longer converts class/function names to special tokens types
     - Class/function names such as parent and true would become special tokens such as T_PARENT and T_TRUE
@@ -3509,7 +4289,7 @@
 - Improved indented PHP tag support in Generic ScopeIndentSniff
 - Generic CamelCapsFunctionNameSniff now ignores a single leading underscore
     - Thanks to Alex Slobodiskiy@xt99 for the patch
-- Standards can now be located within hidden directories (further fix for bug #20323)
+- Standards can now be located within hidden directories (further fix for bug #20323pear-20323)
     - Thanks to Klaus Purer@klausi for the patch
 - Added Generic SyntaxSniff to check for syntax errors in PHP files
     - Thanks to Blaine Schmeisser@bayleedev for the contribution
@@ -3519,18 +4299,26 @@
 - Generic UpperCaseConstantSniff and LowerCaseConstantSniff now ignore function names
 
 ### Fixed
-- Fixed bug #248 : FunctionCommentSniff expects ampersand on param name
-- Fixed bug #265 : False positives with type hints in ForbiddenFunctionsSniff
-- Fixed bug #20373 : Inline comment sniff tab handling way
-- Fixed bug #20378 : Report appended to existing file if no errors found in run
-- Fixed bug #20381 : Invalid "Comment closer must be on a new line"
+- Fixed bug #248sq-248 : FunctionCommentSniff expects ampersand on param name
+- Fixed bug #265sq-265 : False positives with type hints in ForbiddenFunctionsSniff
+- Fixed bug #20373pear-20373 : Inline comment sniff tab handling way
+- Fixed bug #20378pear-20378 : Report appended to existing file if no errors found in run
+- Fixed bug #20381pear-20381 : Invalid "Comment closer must be on a new line"
     - Thanks to Brad Kent@bkdotcom for the patch
-- Fixed bug #20386 : Squiz.Commenting.ClassComment.SpacingBefore thrown if first block comment
+- Fixed bug #20386pear-20386 : Squiz.Commenting.ClassComment.SpacingBefore thrown if first block comment
+
+sq-248: https://github.com/squizlabs/PHP_CodeSniffer/issues/248
+sq-265: https://github.com/squizlabs/PHP_CodeSniffer/pull/265
+pear-20373: https://pear.php.net/bugs/bug.php?id=20373
+pear-20378: https://pear.php.net/bugs/bug.php?id=20378
+pear-20381: https://pear.php.net/bugs/bug.php?id=20381
+pear-20386: https://pear.php.net/bugs/bug.php?id=20386
 
 ## 2.0.0RC1 - 2014-08-06
+
 ### Changed
 - PHPCBF will now fix incorrect newline characters in a file
-- PHPCBF now exists cleanly when there are no errors to fix
+- PHPCBF now exits cleanly when there are no errors to fix
 - Added phpcbf.bat file for Windows
 - Verbose option no longer errors when using a phar file with a space in the path
 - Fixed a reporting error when using HHVM
@@ -3548,7 +4336,7 @@
 - The filtering component of the --extensions argument is now ignored again when passing filenames
     - Can still be used to specify a custom tokenizer for each extension when passing filenames
     - If no tokenizer is specified, default values will be used for common file extensions
-- Diff report now produces relative paths on Windows, where possible (further fix for bug #20234)
+- Diff report now produces relative paths on Windows, where possible (further fix for bug #20234pear-20234)
 - If a token's content has been modified by the tab-width setting, it will now have an orig_content in the tokens array
 - Generic DisallowSpaceIndent and DisallowTabIndent sniffs now check original indent content even when tab-width is set
     - Previously, setting --tab-width would force both to check the indent as spaces
@@ -3572,31 +4360,37 @@
     - Thanks to Ole Martin Handeland@olemartinorg for the patch
 - Generic LowerCaseConstantSniff and UpperCaseConstantSniff now ignore namespaces beginning with TRUE/FALSE/NULL
     - Thanks to Renan Gonçalves@renan for the patch
-- Squiz InlineCommentSniff no longer requires a blank line after post-statement comments (request #20299)
+- Squiz InlineCommentSniff no longer requires a blank line after post-statement comments (request #20299pear-20299)
 - Squiz SelfMemberReferenceSniff now works correctly with namespaces
 - Squiz FunctionCommentSniff is now more relaxed when checking namespaced type hints
-- Tab characters are now encoded in abstract pattern errors messages
+- Tab characters are now encoded in abstract pattern error messages
     - Thanks to Blaine Schmeisser@bayleedev for the patch
-- Invalid sniff codes passed to --sniffs now show a friendly error message (request #20313)
-- Generic LineLengthSniff now shows a warning if the iconv module is disabled (request #20314)
+- Invalid sniff codes passed to --sniffs now show a friendly error message (request #20313pear-20313)
+- Generic LineLengthSniff now shows a warning if the iconv module is disabled (request #20314pear-20314)
 - Source report no longer shows errors if category or sniff names ends in an uppercase error
     - Thanks to Jonathan Marcil@jmarcil for the patch
 
 ### Fixed
-- Fixed bug #20261 : phpcbf has an endless fixing loop
-- Fixed bug #20268 : Incorrect documentation titles in PEAR documentation
-- Fixed bug #20296 : new array notion in function comma check fails
-- Fixed bug #20297 : phar does not work when renamed it to phpcs
-- Fixed bug #20307 : PHP_CodeSniffer_Standards_AbstractVariableSniff analyze traits
-- Fixed bug #20308 : Squiz.ValidVariableNameSniff - wrong variable usage
-- Fixed bug #20309 : Use "member variable" term in sniff "processMemberVar" method
-- Fixed bug #20310 : PSR2 does not check for space after function name
-- Fixed bug #20322 : Display rules set to type=error even when suppressing warnings
-- Fixed bug #20323 : PHPCS tries to load sniffs from hidden directories
-- Fixed bug #20346 : Fixer endless loop with Squiz.CSS sniffs
-- Fixed bug #20355 : No sniffs are registered with PHAR on Windows
+- Fixed bug #20261pear-20261 : phpcbf has an endless fixing loop
+- Fixed bug #20268pear-20268 : Incorrect documentation titles in PEAR documentation
+- Fixed bug #20296pear-20296 : new array notion in function comma check fails
+- Fixed bug #20297pear-20297 : phar does not work when renamed it to phpcs
+- Fixed bug #20307pear-20307 : PHP_CodeSniffer_Standards_AbstractVariableSniff analyze traits
+- Fixed bug #20308pear-20308 : Squiz.ValidVariableNameSniff - wrong variable usage
+- Fixed bug #20309pear-20309 : Use "member variable" term in sniff "processMemberVar" method
+- Fixed bug #20310pear-20310 : PSR2 does not check for space after function name
+- Fixed bug #20322pear-20322 : Display rules set to type=error even when suppressing warnings
+- Fixed bug #20323pear-20323 : PHPCS tries to load sniffs from hidden directories
+- Fixed bug #20346pear-20346 : Fixer endless loop with Squiz.CSS sniffs
+- Fixed bug #20355pear-20355 : No sniffs are registered with PHAR on Windows
+
+pear-20261: https://pear.php.net/bugs/bug.php?id=20261
+pear-20297: https://pear.php.net/bugs/bug.php?id=20297
+pear-20346: https://pear.php.net/bugs/bug.php?id=20346
+pear-20355: https://pear.php.net/bugs/bug.php?id=20355
 
 ## 1.5.4 - 2014-08-06
+
 ### Changed
 - Removed use of sys_get_temp_dir() as this is not supported by the min PHP version
 - The installed_paths config var now accepts relative paths
@@ -3611,26 +4405,39 @@
     - Thanks to Ole Martin Handeland@olemartinorg for the patch
 - Generic LowerCaseConstantSniff and UpperCaseConstantSniff now ignore namespaces beginning with TRUE/FALSE/NULL
     - Thanks to Renan Gonçalves@renan for the patch
-- Squiz InlineCommentSniff no longer requires a blank line after post-statement comments (request #20299)
+- Squiz InlineCommentSniff no longer requires a blank line after post-statement comments (request #20299pear-20299)
 - Squiz SelfMemberReferenceSniff now works correctly with namespaces
-- Tab characters are now encoded in abstract pattern errors messages
+- Tab characters are now encoded in abstract pattern error messages
     - Thanks to Blaine Schmeisser@bayleedev for the patch
-- Invalid sniff codes passed to --sniffs now show a friendly error message (request #20313)
-- Generic LineLengthSniff now shows a warning if the iconv module is disabled (request #20314)
+- Invalid sniff codes passed to --sniffs now show a friendly error message (request #20313pear-20313)
+- Generic LineLengthSniff now shows a warning if the iconv module is disabled (request #20314pear-20314)
 - Source report no longer shows errors if category or sniff names ends in an uppercase error
     - Thanks to Jonathan Marcil@jmarcil for the patch
 
 ### Fixed
-- Fixed bug #20268 : Incorrect documentation titles in PEAR documentation
-- Fixed bug #20296 : new array notion in function comma check fails
-- Fixed bug #20307 : PHP_CodeSniffer_Standards_AbstractVariableSniff analyze traits
-- Fixed bug #20308 : Squiz.ValidVariableNameSniff - wrong variable usage
-- Fixed bug #20309 : Use "member variable" term in sniff "processMemberVar" method
-- Fixed bug #20310 : PSR2 does not check for space after function name
-- Fixed bug #20322 : Display rules set to type=error even when suppressing warnings
-- Fixed bug #20323 : PHPCS tries to load sniffs from hidden directories
+- Fixed bug #20268pear-20268 : Incorrect documentation titles in PEAR documentation
+- Fixed bug #20296pear-20296 : new array notion in function comma check fails
+- Fixed bug #20307pear-20307 : PHP_CodeSniffer_Standards_AbstractVariableSniff analyze traits
+- Fixed bug #20308pear-20308 : Squiz.ValidVariableNameSniff - wrong variable usage
+- Fixed bug #20309pear-20309 : Use "member variable" term in sniff "processMemberVar" method
+- Fixed bug #20310pear-20310 : PSR2 does not check for space after function name
+- Fixed bug #20322pear-20322 : Display rules set to type=error even when suppressing warnings
+- Fixed bug #20323pear-20323 : PHPCS tries to load sniffs from hidden directories
+
+pear-20268: https://pear.php.net/bugs/bug.php?id=20268
+pear-20296: https://pear.php.net/bugs/bug.php?id=20296
+pear-20299: https://pear.php.net/bugs/bug.php?id=20299
+pear-20307: https://pear.php.net/bugs/bug.php?id=20307
+pear-20308: https://pear.php.net/bugs/bug.php?id=20308
+pear-20309: https://pear.php.net/bugs/bug.php?id=20309
+pear-20310: https://pear.php.net/bugs/bug.php?id=20310
+pear-20313: https://pear.php.net/bugs/bug.php?id=20313
+pear-20314: https://pear.php.net/bugs/bug.php?id=20314
+pear-20322: https://pear.php.net/bugs/bug.php?id=20322
+pear-20323: https://pear.php.net/bugs/bug.php?id=20323
 
 ## 2.0.0a2 - 2014-05-01
+
 ### Changed
 - Added report type --report=info to show information about the checked code to make building a standard easier
     - Checks a number of things, such as what line length you use, and spacing are brackets, but not everything
@@ -3654,7 +4461,7 @@
 - PSR1 CamelCapsMethodNameSniff now ignores magic methods
     - Thanks to Eser Ozvataf@eser for the patch
 - PSR1 SideEffectsSniff now ignores methods named define()
-- PSR1 and PEAR ClassDeclarationSniffs now support traits (request #20208)
+- PSR1 and PEAR ClassDeclarationSniffs now support traits (request #20208pear-20208)
 - PSR2 ControlStructureSpacingSniff now allows newlines before/after parentheses
     - Thanks to Maurus Cuelenaere@mcuelenaere for the patch
 - PSR2 ControlStructureSpacingSniff now checks TRY and CATCH statements
@@ -3665,29 +4472,32 @@
 - Squiz SwitchDeclarationSniff now allows exit() as a breaking statement for case/default
 - Squiz ValidVariableNameSniff and Zend ValidVariableNameSniff now ignore additional PHP reserved vars
     - Thanks to Mikuláš Dítě and Adrian Crepaz for the patch
-- Sniff code Squiz.WhiteSpace.MemberVarSpacing.After changed to Squiz.WhiteSpace.MemberVarSpacing.Incorrect (request #20241)
+- Sniff code Squiz.WhiteSpace.MemberVarSpacing.After changed to Squiz.WhiteSpace.MemberVarSpacing.Incorrect (request #20241pear-20241)
 
 ### Fixed
-- Fixed bug #20200 : Invalid JSON produced with specific error message
-- Fixed bug #20204 : Ruleset exclude checks are case sensitive
-- Fixed bug #20213 : Invalid error, Inline IF must be declared on single line
-- Fixed bug #20225 : array_merge() that takes more than one line generates error
-- Fixed bug #20230 : Squiz ControlStructureSpacing sniff assumes specific condition formatting
-- Fixed bug #20234 : phpcbf patch command absolute paths
-- Fixed bug #20240 : Squiz block comment sniff fails when newline present
-- Fixed bug #20247 : The Squiz.WhiteSpace.ControlStructureSpacing sniff and do-while
+- Fixed bug #20200pear-20200 : Invalid JSON produced with specific error message
+- Fixed bug #20204pear-20204 : Ruleset exclude checks are case sensitive
+- Fixed bug #20213pear-20213 : Invalid error, Inline IF must be declared on single line
+- Fixed bug #20225pear-20225 : array_merge() that takes more than one line generates error
+- Fixed bug #20230pear-20230 : Squiz ControlStructureSpacing sniff assumes specific condition formatting
+- Fixed bug #20234pear-20234 : phpcbf patch command absolute paths
+- Fixed bug #20240pear-20240 : Squiz block comment sniff fails when newline present
+- Fixed bug #20247pear-20247 : The Squiz.WhiteSpace.ControlStructureSpacing sniff and do-while
     - Thanks to Alexander Obuhovich@aik099 for the patch
-- Fixed bug #20248 : The Squiz_Sniffs_WhiteSpace_ControlStructureSpacingSniff sniff and empty scope
-- Fixed bug #20252 : Unitialized string offset when package name starts with underscore
+- Fixed bug #20248pear-20248 : The Squiz_Sniffs_WhiteSpace_ControlStructureSpacingSniff sniff and empty scope
+- Fixed bug #20252pear-20252 : Unitialized string offset when package name starts with underscore
+
+pear-20234: https://pear.php.net/bugs/bug.php?id=20234
 
 ## 1.5.3 - 2014-05-01
+
 ### Changed
 - Improved detection of nested IF statements that use the alternate IF/ENDIF syntax
 - PHP tokenizer now supports DEFAULT statements opened with a T_SEMICOLON
 - PSR1 CamelCapsMethodNameSniff now ignores magic methods
     - Thanks to Eser Ozvataf@eser for the patch
 - PSR1 SideEffectsSniff now ignores methods named define()
-- PSR1 and PEAR ClassDeclarationSniffs now support traits (request #20208)
+- PSR1 and PEAR ClassDeclarationSniffs now support traits (request #20208pear-20208)
 - PSR2 ControlStructureSpacingSniff now allows newlines before/after parentheses
     - Thanks to Maurus Cuelenaere@mcuelenaere for the patch
 - Squiz LowercasePHPFunctionsSniff no longer reports errors for namespaced functions
@@ -3695,21 +4505,34 @@
 - Squiz SwitchDeclarationSniff now allows exit() as a breaking statement for case/default
 - Squiz ValidVariableNameSniff and Zend ValidVariableNameSniff now ignore additional PHP reserved vars
     - Thanks to Mikuláš Dítě and Adrian Crepaz for the patch
-- Sniff code Squiz.WhiteSpace.MemberVarSpacing.After changed to Squiz.WhiteSpace.MemberVarSpacing.Incorrect (request #20241)
+- Sniff code Squiz.WhiteSpace.MemberVarSpacing.After changed to Squiz.WhiteSpace.MemberVarSpacing.Incorrect (request #20241pear-20241)
 
 ### Fixed
-- Fixed bug #20200 : Invalid JSON produced with specific error message
-- Fixed bug #20204 : Ruleset exclude checks are case sensitive
-- Fixed bug #20213 : Invalid error, Inline IF must be declared on single line
-- Fixed bug #20225 : array_merge() that takes more than one line generates error
-- Fixed bug #20230 : Squiz ControlStructureSpacing sniff assumes specific condition formatting
-- Fixed bug #20240 : Squiz block comment sniff fails when newline present
-- Fixed bug #20247 : The Squiz.WhiteSpace.ControlStructureSpacing sniff and do-while
+- Fixed bug #20200pear-20200 : Invalid JSON produced with specific error message
+- Fixed bug #20204pear-20204 : Ruleset exclude checks are case sensitive
+- Fixed bug #20213pear-20213 : Invalid error, Inline IF must be declared on single line
+- Fixed bug #20225pear-20225 : array_merge() that takes more than one line generates error
+- Fixed bug #20230pear-20230 : Squiz ControlStructureSpacing sniff assumes specific condition formatting
+- Fixed bug #20240pear-20240 : Squiz block comment sniff fails when newline present
+- Fixed bug #20247pear-20247 : The Squiz.WhiteSpace.ControlStructureSpacing sniff and do-while
     - Thanks to Alexander Obuhovich@aik099 for the patch
-- Fixed bug #20248 : The Squiz_Sniffs_WhiteSpace_ControlStructureSpacingSniff sniff and empty scope
-- Fixed bug #20252 : Uninitialized string offset when package name starts with underscore
+- Fixed bug #20248pear-20248 : The Squiz_Sniffs_WhiteSpace_ControlStructureSpacingSniff sniff and empty scope
+- Fixed bug #20252pear-20252 : Uninitialized string offset when package name starts with underscore
+
+pear-20200: https://pear.php.net/bugs/bug.php?id=20200
+pear-20204: https://pear.php.net/bugs/bug.php?id=20204
+pear-20208: https://pear.php.net/bugs/bug.php?id=20208
+pear-20213: https://pear.php.net/bugs/bug.php?id=20213
+pear-20225: https://pear.php.net/bugs/bug.php?id=20225
+pear-20230: https://pear.php.net/bugs/bug.php?id=20230
+pear-20240: https://pear.php.net/bugs/bug.php?id=20240
+pear-20241: https://pear.php.net/bugs/bug.php?id=20241
+pear-20247: https://pear.php.net/bugs/bug.php?id=20247
+pear-20248: https://pear.php.net/bugs/bug.php?id=20248
+pear-20252: https://pear.php.net/bugs/bug.php?id=20252
 
 ## 2.0.0a1 - 2014-02-05
+
 ### Changed
 - Added the phpcbf script to automatically fix many errors found by the phpcs script
 - Added report type --report=diff to show suggested changes to fix coding standard violations
@@ -3717,12 +4540,12 @@
     - Use the full path to your custom report class as the report name
 - The --extensions argument is now respected when passing filenames; not just with directories
 - The --extensions argument now allows you to specify the tokenizer for each extension
-    - e.g., --extensions=module/php,es/js
+    - e.g., `--extensions=module/php,es/js`
 - Command line arguments can now be set in ruleset files
-    - e.g., arg name="report" value="summary" (print summary report; same as --report=summary)
-    - e.g., arg value="sp" (print source and progress information; same as -sp)
-    - The -vvv, --sniffs, --standard and -l command line arguments cannot be set in this way
-- Sniff process() methods can not optionally return a token to ignore up to
+    - e.g., `arg name="report" value="summary"` (print summary report; same as `--report=summary`)
+    - e.g., `arg value="sp"` (print source and progress information; same as `-sp`)
+    - The `-vvv`, `--sniffs`, `--standard` and `-l` command line arguments cannot be set in this way
+- Sniff process() methods can now optionally return a token to ignore up to
     - If returned, the sniff will not be executed again until the passed token is reached in the file
     - Useful if you are looking for tokens like T_OPEN_TAG but only want to process the first one
 - Removed the comment parser classes and replaced it with a simple comment tokenizer
@@ -3761,6 +4584,7 @@
 - Removed MySource ChannelExceptionSniff
 
 ## 1.5.2 - 2014-02-05
+
 ### Changed
 - Improved support for the PHP 5.5. classname::class syntax
     - PSR2 SwitchDeclarationSniff no longer throws errors when this syntax is used in CASE conditions
@@ -3794,14 +4618,20 @@
 - Generic FixmeSniff and TodoSniff now work correctly with accented characters
 
 ### Fixed
-- Fixed bug #20145 : Custom ruleset preferences directory over installed standard
-- Fixed bug #20147 : phpcs-svn-pre-commit - no more default error report
-- Fixed bug #20151 : Problem handling "if(): ... else: ... endif;" syntax
-- Fixed bug #20190 : Invalid regex in Squiz_Sniffs_WhiteSpace_SuperfluousWhitespaceSniff
+- Fixed bug #20145pear-20145 : Custom ruleset preferences directory over installed standard
+- Fixed bug #20147pear-20147 : phpcs-svn-pre-commit - no more default error report
+- Fixed bug #20151pear-20151 : Problem handling "if(): ... else: ... endif;" syntax
+- Fixed bug #20190pear-20190 : Invalid regex in Squiz_Sniffs_WhiteSpace_SuperfluousWhitespaceSniff
+
+pear-20145: https://pear.php.net/bugs/bug.php?id=20145
+pear-20147: https://pear.php.net/bugs/bug.php?id=20147
+pear-20151: https://pear.php.net/bugs/bug.php?id=20151
+pear-20190: https://pear.php.net/bugs/bug.php?id=20190
 
 ## 1.5.1 - 2013-12-12
+
 ### Changed
-- Config values can now be set at runtime using the command line argument --runtime-set key value
+- Config values can now be set at runtime using the command line argument `--runtime-set key value`
     - Runtime values are the same as config values, but are not written to the main config file
     - Thanks to Wim Godden@wimg for the patch
 - Config values can now be set in ruleset files
@@ -3816,15 +4646,20 @@
 - PSR2 ClassDeclarationSniff now allows a list of extended interfaces to be split across multiple lines
 - Squiz DoubleQuoteUsageSniff now allows \b in double quoted strings
 - Generic ForbiddenFunctionsSniff now ignores object creation
-    - This is a further fix for bug #20100 : incorrect Function mysql() has been deprecated report
+    - This is a further fix for bug #20100pear-20100 : incorrect Function mysql() has been deprecated report
 
 ### Fixed
-- Fixed bug #20136 : Squiz_Sniffs_WhiteSpace_ScopeKeywordSpacingSniff and Traits
-- Fixed bug #20138 : Protected property underscore and camel caps issue (in trait with Zend)
+- Fixed bug #20136pear-20136 : Squiz_Sniffs_WhiteSpace_ScopeKeywordSpacingSniff and Traits
+- Fixed bug #20138pear-20138 : Protected property underscore and camel caps issue (in trait with Zend)
     - Thanks to Gaetan Rousseau@Naelyth for the patch
-- Fixed bug #20139 : No report file generated on success
+- Fixed bug #20139pear-20139 : No report file generated on success
+
+pear-20136: https://pear.php.net/bugs/bug.php?id=20136
+pear-20138: https://pear.php.net/bugs/bug.php?id=20138
+pear-20139: https://pear.php.net/bugs/bug.php?id=20139
 
 ## 1.5.0 - 2013-11-28
+
 ### Changed
 - Doc generation is now working again for installed standards
     - Includes a fix for limiting the docs to specific sniffs
@@ -3832,9 +4667,9 @@
     - E.g., to ignore comments, override a property using:
     - name="ignoreIndentationTokens" type="array" value="T_COMMENT,T_DOC_COMMENT"
 - PSR2 standard now ignores comments when checking indentation rules
-- Generic UpperCaseConstantNameSniff no longer reports errors where constants are used (request #20090)
+- Generic UpperCaseConstantNameSniff no longer reports errors where constants are used (request #20090pear-20090)
     - It still reports errors where constants are defined
-- Individual messages can now be excluded in ruleset.xml files using the exclude tag (request #20091)
+- Individual messages can now be excluded in ruleset.xml files using the exclude tag (request #20091pear-20091)
     - Setting message severity to 0 continues to be supported
 - Squiz OperatorSpacingSniff no longer throws errors for the ?: short ternary operator
     - Thanks to Antoine Musso@hashar for the patch
@@ -3847,15 +4682,20 @@
     - Thanks to Maksim Kochkin@ksimka for the patch
 
 ### Fixed
-- Fixed bug #20093 : Bug with ternary operator token
-- Fixed bug #20097 : CLI.php throws error in php 5.2
-- Fixed bug #20100 : incorrect Function mysql() has been deprecated report
-- Fixed bug #20119 : PHP warning: invalid argument to str_repeat() in SVN blame report with -s
-- Fixed bug #20123 : PSR2 complains about an empty second statement in for-loop
-- Fixed bug #20131 : PHP errors in svnblame report, if there are files not under version control
-- Fixed bug #20133 : Allow "HG: hg_id" as value for @version tag
+- Fixed bug #20093pear-20093 : Bug with ternary operator token
+- Fixed bug #20097pear-20097 : `CLI.php` throws error in PHP 5.2
+- Fixed bug #20100pear-20100 : incorrect Function mysql() has been deprecated report
+- Fixed bug #20119pear-20119 : PHP warning: invalid argument to str_repeat() in SVN blame report with -s
+- Fixed bug #20123pear-20123 : PSR2 complains about an empty second statement in for-loop
+- Fixed bug #20131pear-20131 : PHP errors in svnblame report, if there are files not under version control
+- Fixed bug #20133pear-20133 : Allow "HG: hg_id" as value for @version tag
+
+pear-20090: https://pear.php.net/bugs/bug.php?id=20090
+pear-20091: https://pear.php.net/bugs/bug.php?id=20091
+pear-20093: https://pear.php.net/bugs/bug.php?id=20093
 
 ## 1.4.8 - 2013-11-26
+
 ### Changed
 - Generic ScopeIndentSniff now allows for ignored tokens to be set via ruleset.xml files
     - E.g., to ignore comments, override a property using:
@@ -3872,14 +4712,22 @@
     - Thanks to Maksim Kochkin@ksimka for the patch
 
 ### Fixed
-- Fixed bug #20097 : CLI.php throws error in php 5.2
-- Fixed bug #20100 : incorrect Function mysql() has been deprecated report
-- Fixed bug #20119 : PHP warning: invalid argument to str_repeat() in SVN blame report with -s
-- Fixed bug #20123 : PSR2 complains about an empty second statement in for-loop
-- Fixed bug #20131 : PHP errors in svnblame report, if there are files not under version control
-- Fixed bug #20133 : Allow "HG: hg_id" as value for @version tag
+- Fixed bug #20097pear-20097 : `CLI.php` throws error in PHP 5.2
+- Fixed bug #20100pear-20100 : incorrect Function mysql() has been deprecated report
+- Fixed bug #20119pear-20119 : PHP warning: invalid argument to str_repeat() in SVN blame report with -s
+- Fixed bug #20123pear-20123 : PSR2 complains about an empty second statement in for-loop
+- Fixed bug #20131pear-20131 : PHP errors in svnblame report, if there are files not under version control
+- Fixed bug #20133pear-20133 : Allow "HG: hg_id" as value for @version tag
+
+pear-20097: https://pear.php.net/bugs/bug.php?id=20097
+pear-20100: https://pear.php.net/bugs/bug.php?id=20100
+pear-20119: https://pear.php.net/bugs/bug.php?id=20119
+pear-20123: https://pear.php.net/bugs/bug.php?id=20123
+pear-20131: https://pear.php.net/bugs/bug.php?id=20131
+pear-20133: https://pear.php.net/bugs/bug.php?id=20133
 
 ## 1.5.0RC4 - 2013-09-26
+
 ### Changed
 - You can now restrict violations to individual sniff codes using the --sniffs command line argument
     - Previously, this only restricted violations to an entire sniff and not individual messages
@@ -3892,7 +4740,7 @@
     - Thanks to Oleg Lobach@bladeofsteel for the contribution
 - Added support for the PHP 5.4 callable type hint
 - Fixed problem where some file content could be ignored when checking STDIN
-- Version information is now printed when installed via composer or run from a Git clone (request #20050)
+- Version information is now printed when installed via composer or run from a Git clone (request #20050pear-20050)
 - Added Squiz DisallowBooleanStatementSniff to ban boolean operators outside of control structure conditions
 - The CSS tokenizer is now more reliable when encountering 'list' and 'break' strings
 - Coding standard ignore comments can now appear instead doc blocks as well as inline comments
@@ -3929,22 +4777,25 @@
 
 ### Fixed
 - Fixed cases where code was incorrectly assigned the T_GOTO_LABEL token when used in a complex CASE condition
-- Fixed bug #20026 : Check for multi-line arrays that should be single-line is slightly wrong
+- Fixed bug #20026pear-20026 : Check for multi-line arrays that should be single-line is slightly wrong
     - Adds new error message for single-line arrays that end with a comma
-- Fixed bug #20029 : ForbiddenFunction sniff incorrectly recognizes methods in USE clauses
-- Fixed bug #20043 : Mis-interpretation of Foo::class
-- Fixed bug #20044 : PSR1 camelCase check does not ignore leading underscores
-- Fixed bug #20045 : Errors about indentation for closures with multi-line 'use' in functions
-- Fixed bug #20051 : Undefined index: scope_opener / scope_closer
+- Fixed bug #20029pear-20029 : ForbiddenFunction sniff incorrectly recognizes methods in USE clauses
+- Fixed bug #20043pear-20043 : Mis-interpretation of Foo::class
+- Fixed bug #20044pear-20044 : PSR1 camelCase check does not ignore leading underscores
+- Fixed bug #20045pear-20045 : Errors about indentation for closures with multi-line 'use' in functions
+- Fixed bug #20051pear-20051 : Undefined index: scope_opener / scope_closer
     - Thanks to Anthon Pang@robocoder for the patch
 
+pear-20051: https://pear.php.net/bugs/bug.php?id=20051
+
 ## 1.4.7 - 2013-09-26
+
 ### Changed
 - Added report type --report=junit to show the error list in a JUnit compatible format
     - Thanks to Oleg Lobach@bladeofsteel for the contribution
 - Added support for the PHP 5.4 callable type hint
 - Fixed problem where some file content could be ignored when checking STDIN
-- Version information is now printed when installed via composer or run from a Git clone (request #20050)
+- Version information is now printed when installed via composer or run from a Git clone (request #20050pear-20050)
 - The CSS tokenizer is now more reliable when encountering 'list' and 'break' strings
 - Coding standard ignore comments can now appear instead doc blocks as well as inline comments
     - Thanks to Stuart Langley@sjlangley for the patch
@@ -3978,14 +4829,22 @@
 - PSR UseDeclarationSniff no longer throws errors for USE statements inside TRAITs
 
 ### Fixed
-- Fixed bug #20026 : Check for multi-line arrays that should be single-line is slightly wrong
+- Fixed bug #20026pear-20026 : Check for multi-line arrays that should be single-line is slightly wrong
     - Adds new error message for single-line arrays that end with a comma
-- Fixed bug #20029 : ForbiddenFunction sniff incorrectly recognizes methods in USE clauses
-- Fixed bug #20043 : Mis-interpretation of Foo::class
-- Fixed bug #20044 : PSR1 camelCase check does not ignore leading underscores
-- Fixed bug #20045 : Errors about indentation for closures with multi-line 'use' in functions
+- Fixed bug #20029pear-20029 : ForbiddenFunction sniff incorrectly recognizes methods in USE clauses
+- Fixed bug #20043pear-20043 : Mis-interpretation of Foo::class
+- Fixed bug #20044pear-20044 : PSR1 camelCase check does not ignore leading underscores
+- Fixed bug #20045pear-20045 : Errors about indentation for closures with multi-line 'use' in functions
+
+pear-20026: https://pear.php.net/bugs/bug.php?id=20026
+pear-20029: https://pear.php.net/bugs/bug.php?id=20029
+pear-20043: https://pear.php.net/bugs/bug.php?id=20043
+pear-20044: https://pear.php.net/bugs/bug.php?id=20044
+pear-20045: https://pear.php.net/bugs/bug.php?id=20045
+pear-20050: https://pear.php.net/bugs/bug.php?id=20050
 
 ## 1.5.0RC3 - 2013-07-25
+
 ### Changed
 - Added report type --report=json to show the error list and total counts for all checked files
     - Thanks to Jeffrey Fisher@jeffslofish for the contribution
@@ -4034,23 +4893,26 @@
     - Thanks to Arnout Boks@aboks for the patch
 
 ### Fixed
-- Fixed bug #19811 : Comments not ignored in all cases in AbstractPatternSniff
+- Fixed bug #19811pear-19811 : Comments not ignored in all cases in AbstractPatternSniff
     - Thanks to Erik Wiffin@erikwiffin for the patch
-- Fixed bug #19892 : ELSE with no braces causes incorrect SWITCH break statement indentation error
-- Fixed bug #19897 : Indenting warnings in templates not consistent
-- Fixed bug #19908 : PEAR MultiLineCondition Does Not Apply elseif
-- Fixed bug #19930 : option --report-file generate an empty file
-- Fixed bug #19935 : notify-send reports do not vanish in gnome-shell
+- Fixed bug #19892pear-19892 : ELSE with no braces causes incorrect SWITCH break statement indentation error
+- Fixed bug #19897pear-19897 : Indenting warnings in templates not consistent
+- Fixed bug #19908pear-19908 : PEAR MultiLineCondition Does Not Apply elseif
+- Fixed bug #19930pear-19930 : option --report-file generate an empty file
+- Fixed bug #19935pear-19935 : notify-send reports do not vanish in gnome-shell
     - Thanks to Christian Weiske@cweiske for the patch
-- Fixed bug #19944 : docblock squiz sniff "return void" trips over return in lambda function
-- Fixed bug #19953 : PSR2 - Spaces before interface name for abstract class
-- Fixed bug #19956 : phpcs warns for Type Hint missing Resource
-- Fixed bug #19957 : Does not understand trait method aliasing
-- Fixed bug #19968 : Permission denied on excluded directory
-- Fixed bug #19969 : Sniffs with namespace not recognized in reports
-- Fixed bug #19997 : Class names incorrectly detected as constants
+- Fixed bug #19944pear-19944 : docblock squiz sniff "return void" trips over return in lambda function
+- Fixed bug #19953pear-19953 : PSR2 - Spaces before interface name for abstract class
+- Fixed bug #19956pear-19956 : phpcs warns for Type Hint missing Resource
+- Fixed bug #19957pear-19957 : Does not understand trait method aliasing
+- Fixed bug #19968pear-19968 : Permission denied on excluded directory
+- Fixed bug #19969pear-19969 : Sniffs with namespace not recognized in reports
+- Fixed bug #19997pear-19997 : Class names incorrectly detected as constants
+
+pear-19930: https://pear.php.net/bugs/bug.php?id=19930
 
 ## 1.4.6 - 2013-07-25
+
 ### Changed
 - Added report type --report=json to show the error list and total counts for all checked files
     - Thanks to Jeffrey Fisher@jeffslofish for the contribution
@@ -4095,39 +4957,54 @@
     - Thanks to Arnout Boks@aboks for the patch
 
 ### Fixed
-- Fixed bug #19811 : Comments not ignored in all cases in AbstractPatternSniff
+- Fixed bug #19811pear-19811 : Comments not ignored in all cases in AbstractPatternSniff
     - Thanks to Erik Wiffin@erikwiffin for the patch
-- Fixed bug #19892 : ELSE with no braces causes incorrect SWITCH break statement indentation error
-- Fixed bug #19897 : Indenting warnings in templates not consistent
-- Fixed bug #19908 : PEAR MultiLineCondition Does Not Apply elseif
-- Fixed bug #19913 : Running phpcs in interactive mode causes warnings
+- Fixed bug #19892pear-19892 : ELSE with no braces causes incorrect SWITCH break statement indentation error
+- Fixed bug #19897pear-19897 : Indenting warnings in templates not consistent
+- Fixed bug #19908pear-19908 : PEAR MultiLineCondition Does Not Apply elseif
+- Fixed bug #19913pear-19913 : Running phpcs in interactive mode causes warnings
     - Thanks to Harald Franndorferpear-gemineye for the patch
-- Fixed bug #19935 : notify-send reports do not vanish in gnome-shell
+- Fixed bug #19935pear-19935 : notify-send reports do not vanish in gnome-shell
     - Thanks to Christian Weiske@cweiske for the patch
-- Fixed bug #19944 : docblock squiz sniff "return void" trips over return in lambda function
-- Fixed bug #19953 : PSR2 - Spaces before interface name for abstract class
-- Fixed bug #19956 : phpcs warns for Type Hint missing Resource
-- Fixed bug #19957 : Does not understand trait method aliasing
-- Fixed bug #19968 : Permission denied on excluded directory
-- Fixed bug #19969 : Sniffs with namespace not recognized in reports
-- Fixed bug #19997 : Class names incorrectly detected as constants
+- Fixed bug #19944pear-19944 : docblock squiz sniff "return void" trips over return in lambda function
+- Fixed bug #19953pear-19953 : PSR2 - Spaces before interface name for abstract class
+- Fixed bug #19956pear-19956 : phpcs warns for Type Hint missing Resource
+- Fixed bug #19957pear-19957 : Does not understand trait method aliasing
+- Fixed bug #19968pear-19968 : Permission denied on excluded directory
+- Fixed bug #19969pear-19969 : Sniffs with namespace not recognized in reports
+- Fixed bug #19997pear-19997 : Class names incorrectly detected as constants
+
+pear-19811: https://pear.php.net/bugs/bug.php?id=19811
+pear-19892: https://pear.php.net/bugs/bug.php?id=19892
+pear-19897: https://pear.php.net/bugs/bug.php?id=19897
+pear-19908: https://pear.php.net/bugs/bug.php?id=19908
+pear-19913: https://pear.php.net/bugs/bug.php?id=19913
+pear-19935: https://pear.php.net/bugs/bug.php?id=19935
+pear-19944: https://pear.php.net/bugs/bug.php?id=19944
+pear-19953: https://pear.php.net/bugs/bug.php?id=19953
+pear-19956: https://pear.php.net/bugs/bug.php?id=19956
+pear-19957: https://pear.php.net/bugs/bug.php?id=19957
+pear-19968: https://pear.php.net/bugs/bug.php?id=19968
+pear-19969: https://pear.php.net/bugs/bug.php?id=19969
+pear-19997: https://pear.php.net/bugs/bug.php?id=19997
 
 ## 1.5.0RC2 - 2013-04-04
+
 ### Changed
 - Ruleset processing has been rewritten to be more predictable
     - Provides much better support for relative paths inside ruleset files
     - May mean that sniffs that were previously ignored are now being included when importing external rulesets
     - Ruleset processing output can be seen by using the -vv command line argument
     - Internal sniff registering functions have all changed, so please review custom scripts
-- You can now pass multiple coding standards on the command line, comma separated (request #19144)
+- You can now pass multiple coding standards on the command line, comma separated (request #19144pear-19144)
     - Works with built-in or custom standards and rulesets, or a mix of both
-- You can now exclude directories or whole standards in a ruleset XML file (request #19731)
+- You can now exclude directories or whole standards in a ruleset XML file (request #19731pear-19731)
     - e.g., exclude "Generic.Commenting" or just "Generic"
     - You can also pass in a path to a directory instead, if you know it
 - Added Generic LowerCaseKeywordSniff to ensure all PHP keywords are defined in lowercase
     - The PSR2 and Squiz standards now use this sniff
-- Added Generic SAPIUsageSniff to ensure the PHP_SAPI constant is used instead of php_sapi_name() (request #19863)
-- Squiz FunctionSpacingSniff now has a setting to specify how many lines there should between functions (request #19843)
+- Added Generic SAPIUsageSniff to ensure the `PHP_SAPI` constant is used instead of `php_sapi_name()` (request #19863pear-19863)
+- Squiz FunctionSpacingSniff now has a setting to specify how many lines there should between functions (request #19843pear-19843)
     - Default remains at 2
     - Override the "spacing" setting in a ruleset.xml file to change
 - Squiz LowercasePHPFunctionSniff no longer throws errors for the limited set of PHP keywords it was checking
@@ -4151,18 +5028,22 @@
 - Generic DuplicateClassNameSniff no longer reports duplicate errors if multiple PHP open tags exist in a file
 
 ### Fixed
-- Fixed bug #19819 : Freeze with syntax error in use statement
-- Fixed bug #19820 : Wrong message level in Generic_Sniffs_CodeAnalysis_EmptyStatementSniff
-- Fixed bug #19859 : CodeSniffer::setIgnorePatterns API changed
-- Fixed bug #19871 : findExtendedClassName doesn't return FQCN on namespaced classes
-- Fixed bug #19879 : bitwise and operator interpreted as reference by value
+- Fixed bug #19819pear-19819 : Freeze with syntax error in use statement
+- Fixed bug #19820pear-19820 : Wrong message level in Generic_Sniffs_CodeAnalysis_EmptyStatementSniff
+- Fixed bug #19859pear-19859 : CodeSniffer::setIgnorePatterns API changed
+- Fixed bug #19871pear-19871 : findExtendedClassName doesn't return FQCN on namespaced classes
+- Fixed bug #19879pear-19879 : bitwise and operator interpreted as reference by value
+
+pear-19144: https://pear.php.net/bugs/bug.php?id=19144
+pear-19731: https://pear.php.net/bugs/bug.php?id=19731
 
 ## 1.4.5 - 2013-04-04
+
 ### Changed
 - Added Generic LowerCaseKeywordSniff to ensure all PHP keywords are defined in lowercase
     - The PSR2 and Squiz standards now use this sniff
-- Added Generic SAPIUsageSniff to ensure the PHP_SAPI constant is used instead of php_sapi_name() (request #19863)
-- Squiz FunctionSpacingSniff now has a setting to specify how many lines there should between functions (request #19843)
+- Added Generic SAPIUsageSniff to ensure the `PHP_SAPI` constant is used instead of `php_sapi_name()` (request #19863pear-19863)
+- Squiz FunctionSpacingSniff now has a setting to specify how many lines there should between functions (request #19843pear-19843)
     - Default remains at 2
     - Override the "spacing" setting in a ruleset.xml file to change
 - Squiz LowercasePHPFunctionSniff no longer throws errors for the limited set of PHP keywords it was checking
@@ -4186,22 +5067,32 @@
 - Generic DuplicateClassNameSniff no longer reports duplicate errors if multiple PHP open tags exist in a file
 
 ### Fixed
-- Fixed bug #19819 : Freeze with syntax error in use statement
-- Fixed bug #19820 : Wrong message level in Generic_Sniffs_CodeAnalysis_EmptyStatementSniff
-- Fixed bug #19859 : CodeSniffer::setIgnorePatterns API changed
-- Fixed bug #19871 : findExtendedClassName doesn't return FQCN on namespaced classes
-- Fixed bug #19879 : bitwise and operator interpreted as reference by value
+- Fixed bug #19819pear-19819 : Freeze with syntax error in use statement
+- Fixed bug #19820pear-19820 : Wrong message level in Generic_Sniffs_CodeAnalysis_EmptyStatementSniff
+- Fixed bug #19859pear-19859 : CodeSniffer::setIgnorePatterns API changed
+- Fixed bug #19871pear-19871 : findExtendedClassName doesn't return FQCN on namespaced classes
+- Fixed bug #19879pear-19879 : bitwise and operator interpreted as reference by value
+
+pear-19819: https://pear.php.net/bugs/bug.php?id=19819
+pear-19820: https://pear.php.net/bugs/bug.php?id=19820
+pear-19843: https://pear.php.net/bugs/bug.php?id=19843
+pear-19859: https://pear.php.net/bugs/bug.php?id=19859
+pear-19863: https://pear.php.net/bugs/bug.php?id=19863
+pear-19871: https://pear.php.net/bugs/bug.php?id=19871
+pear-19879: https://pear.php.net/bugs/bug.php?id=19879
 
 ## 1.5.0RC1 - 2013-02-08
+
 ### Changed
 - Reports have been completely rewritten to consume far less memory
     - Each report is incrementally written to the file system during a run and then printed out when the run ends
     - There is no longer a need to keep the list of errors and warnings in memory during a run
 - Multi-file sniff support has been removed because they are too memory intensive
     - If you have a custom multi-file sniff, you can convert it into a standard sniff quite easily
-    - See CodeSniffer/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php for an example
+    - See `CodeSniffer/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php` for an example
 
 ## 1.4.4 - 2013-02-07
+
 ### Changed
 - Ignored lines no longer cause the summary report to show incorrect error and warning counts
     - Thanks to Bert Van Hauwaert@becoded for the patch
@@ -4209,7 +5100,7 @@
     - Set full command to run CSSLint using phpcs --config-set csslint_path /path/to/csslint
     - Thanks to Roman Levishchenko@index0h for the contribution
 - Added PSR2 ControlStructureSpacingSniff to ensure there are no spaces before and after parenthesis in control structures
-    - Fixes bug #19732 : PSR2: some control structures errors not reported
+    - Fixes bug #19732pear-19732 : PSR2: some control structures errors not reported
 - Squiz commenting sniffs now support non-English characters when checking for capital letters
     - Thanks to Roman Levishchenko@index0h for the patch
 - Generic EndFileNewlineSniff now supports JS and CSS files
@@ -4225,17 +5116,29 @@
 - Squiz SuperfluousWhitespaceSniff now allows a single newline at the end of JS and CSS files
 
 ### Fixed
-- Fixed bug #19755 : Token of T_CLASS type has no scope_opener and scope_closer keys
-- Fixed bug #19759 : Squiz.PHP.NonExecutableCode fails for return function()...
-- Fixed bug #19763 : Use statements for traits not recognised correctly for PSR2 code style
-- Fixed bug #19764 : Instead of for traits throws uppercase constant name errors
-- Fixed bug #19772 : PSR2_Sniffs_Namespaces_UseDeclarationSniff does not properly recognize last use
-- Fixed bug #19775 : False positive in NonExecutableCode sniff when not using curly braces
-- Fixed bug #19782 : Invalid found size functions in loop when using object operator
-- Fixed bug #19799 : config folder is not created automatically
-- Fixed bug #19804 : JS Tokenizer wrong /**/ parsing
+- Fixed bug #19755pear-19755 : Token of T_CLASS type has no scope_opener and scope_closer keys
+- Fixed bug #19759pear-19759 : Squiz.PHP.NonExecutableCode fails for return function()...
+- Fixed bug #19763pear-19763 : Use statements for traits not recognised correctly for PSR2 code style
+- Fixed bug #19764pear-19764 : Instead of for traits throws uppercase constant name errors
+- Fixed bug #19772pear-19772 : PSR2_Sniffs_Namespaces_UseDeclarationSniff does not properly recognize last use
+- Fixed bug #19775pear-19775 : False positive in NonExecutableCode sniff when not using curly braces
+- Fixed bug #19782pear-19782 : Invalid found size functions in loop when using object operator
+- Fixed bug #19799pear-19799 : config folder is not created automatically
+- Fixed bug #19804pear-19804 : JS Tokenizer wrong /**/ parsing
+
+pear-19732: https://pear.php.net/bugs/bug.php?id=19732
+pear-19755: https://pear.php.net/bugs/bug.php?id=19755
+pear-19759: https://pear.php.net/bugs/bug.php?id=19759
+pear-19763: https://pear.php.net/bugs/bug.php?id=19763
+pear-19764: https://pear.php.net/bugs/bug.php?id=19764
+pear-19772: https://pear.php.net/bugs/bug.php?id=19772
+pear-19775: https://pear.php.net/bugs/bug.php?id=19775
+pear-19782: https://pear.php.net/bugs/bug.php?id=19782
+pear-19799: https://pear.php.net/bugs/bug.php?id=19799
+pear-19804: https://pear.php.net/bugs/bug.php?id=19804
 
 ## 1.4.3 - 2012-12-04
+
 ### Changed
 - Added support for the PHP 5.5 T_FINALLY token to detect try/catch/finally statements
 - Added empty CodeSniffer.conf to enable config settings for Composer installs
@@ -4251,14 +5154,19 @@
     - Thanks to Andy Grunwald@andygrunwald for the patch
 
 ### Fixed
-- Fixed bug #19699 : Generic.Files.LineLength giving false positives when tab-width is used
-- Fixed bug #19726 : Wrong number of spaces expected after instanceof static
-- Fixed bug #19727 : PSR2: no error reported when using } elseif {
+- Fixed bug #19699pear-19699 : Generic.Files.LineLength giving false positives when tab-width is used
+- Fixed bug #19726pear-19726 : Wrong number of spaces expected after instanceof static
+- Fixed bug #19727pear-19727 : PSR2: no error reported when using } elseif {
+
+pear-19699: https://pear.php.net/bugs/bug.php?id=19699
+pear-19726: https://pear.php.net/bugs/bug.php?id=19726
+pear-19727: https://pear.php.net/bugs/bug.php?id=19727
 
 ## 1.4.2 - 2012-11-09
+
 ### Changed
 - PHP_CodeSniffer can now be installed using Composer
-    - Require squizlabs/php_codesniffer in your composer.json file
+    - Require `squizlabs/php_codesniffer` in your `composer.json` file
     - Thanks to Rob Bast@alcohol, Stephen Rees-Carter@valorin, Stefano Kowalke@Konafets and Ivan Habunek@ihabunek for help with this
 - Squiz BlockCommentSniff and InlineCommentSniff no longer report errors for trait block comments
 - Squiz SelfMemberReferenceSniff now supports namespaces
@@ -4274,20 +5182,26 @@
 - Fixed gitblame report not working on Windows
     - Thanks to Rogerio Prado de Jesus@rogeriopradoj
 - Fixed an incorrect error in Squiz OperatorSpacingSniff for default values inside a closure definition
-- Fixed bug #19691 : SubversionPropertiesSniff fails to find missing properties
+- Fixed bug #19691pear-19691 : SubversionPropertiesSniff fails to find missing properties
     - Thanks to Kevin Winahradskypear-kwinahradsky for the patch
-- Fixed bug #19692 : DisallowMultipleAssignments is triggered by a closure
-- Fixed bug #19693 : exclude-patterns no longer work on specific messages
-- Fixed bug #19694 : Squiz.PHP.LowercasePHPFunctions incorrectly matches return by ref functions
+- Fixed bug #19692pear-19692 : DisallowMultipleAssignments is triggered by a closure
+- Fixed bug #19693pear-19693 : exclude-patterns no longer work on specific messages
+- Fixed bug #19694pear-19694 : Squiz.PHP.LowercasePHPFunctions incorrectly matches return by ref functions
+
+pear-19691: https://pear.php.net/bugs/bug.php?id=19691
+pear-19692: https://pear.php.net/bugs/bug.php?id=19692
+pear-19693: https://pear.php.net/bugs/bug.php?id=19693
+pear-19694: https://pear.php.net/bugs/bug.php?id=19694
 
 ## 1.4.1 - 2012-11-02
+
 ### Changed
 - All ignore patterns have been reverted to being checked against the absolute path of a file
     - Patterns can be specified to be relative in a ruleset.xml file, but nowhere else
-    - e.g., exclude-pattern type="relative"^tests/*/exclude-pattern (with angle brackets, not square brackets)
+    - e.g., `<exclude-pattern type="relative">^tests/*</exclude-pattern>`
 - Added support for PHP tokenizing of T_INLINE_ELSE colons, so this token type is now available
     - Custom sniffs that rely on looking for T_COLON tokens inside inline if statements must be changed to use the new token
-    - Fixes bug #19666 : PSR1.Files.SideEffects throws a notice Undefined index: scope_closer
+    - Fixes bug #19666pear-19666 : PSR1.Files.SideEffects throws a notice Undefined index: scope_closer
 - Messages can now be changed from errors to warnings (and vice versa) inside ruleset.xml files
     - As you would with "message" and "severity", specify a "type" tag under a "rule" tag and set the value to "error" or "warning"
 - PHP_CodeSniffer will now generate a warning on files that it detects have mixed line endings
@@ -4318,23 +5232,33 @@
 - PSR1 ClassDeclarationSniff no longer throws an error for non-namespaced code if PHP version is less than 5.3.0
 
 ### Fixed
-- Fixed bug #19616 : Nested switches cause false error in PSR2
-- Fixed bug #19629 : PSR2 error for inline comments on multi-line argument lists
-- Fixed bug #19644 : Alternative syntax, e.g. if/endif triggers Inline Control Structure error
-- Fixed bug #19655 : Closures reporting as multi-line when they are not
-- Fixed bug #19675 : Improper indent of nested anonymous function bodies in a call
-- Fixed bug #19685 : PSR2 catch-22 with empty third statement in for loop
-- Fixed bug #19687 : Anonymous functions inside arrays marked as indented incorrectly in PSR2
+- Fixed bug #19616pear-19616 : Nested switches cause false error in PSR2
+- Fixed bug #19629pear-19629 : PSR2 error for inline comments on multi-line argument lists
+- Fixed bug #19644pear-19644 : Alternative syntax, e.g. if/endif triggers Inline Control Structure error
+- Fixed bug #19655pear-19655 : Closures reporting as multi-line when they are not
+- Fixed bug #19675pear-19675 : Improper indent of nested anonymous function bodies in a call
+- Fixed bug #19685pear-19685 : PSR2 catch-22 with empty third statement in for loop
+- Fixed bug #19687pear-19687 : Anonymous functions inside arrays marked as indented incorrectly in PSR2
+
+pear-19616: https://pear.php.net/bugs/bug.php?id=19616
+pear-19629: https://pear.php.net/bugs/bug.php?id=19629
+pear-19644: https://pear.php.net/bugs/bug.php?id=19644
+pear-19655: https://pear.php.net/bugs/bug.php?id=19655
+pear-19666: https://pear.php.net/bugs/bug.php?id=19666
+pear-19675: https://pear.php.net/bugs/bug.php?id=19675
+pear-19685: https://pear.php.net/bugs/bug.php?id=19685
+pear-19687: https://pear.php.net/bugs/bug.php?id=19687
 
 ## 1.4.0 - 2012-09-26
+
 ### Changed
 - Added PSR1 and PSR2 coding standards that can be used to check your code against these guidelines
 - PHP 5.4 short array syntax is now detected and tokens are assigned to the open and close characters
     - New tokens are T_OPEN_SHORT_ARRAY and T_CLOSE_SHORT_ARRAY as PHP does not define its own
 - Added the ability to explain a coding standard by listing the sniffs that it includes
     - The sniff list includes all imported and native sniffs
-    - Explain a standard by using the -e and --standard=standard command line arguments
-    - E.g., phpcs -e --standard=Squiz
+    - Explain a standard by using the `-e` and `--standard=standard` command line arguments
+    - E.g., `phpcs -e --standard=Squiz`
     - Thanks to Ben Selby@benmatselby for the idea
 - Added report to show results using notify-send
     - Use --report=notifysend to generate the report
@@ -4350,13 +5274,19 @@
 
 ### Fixed
 - Fixed a PHP notice generated when loading custom array settings from a ruleset.xml file
-- Fixed bug #17908 : CodeSniffer does not recognise optional @params
+- Fixed bug #17908pear-17908 : CodeSniffer does not recognise optional @params
     - Thanks to Pete Walkerpear-pete for the patch
-- Fixed bug #19538 : Function indentation code sniffer checks inside short arrays
-- Fixed bug #19565 : Non-Executable Code Sniff Broken for Case Statements with both return and break
-- Fixed bug #19612 : Invalid @package suggestion
+- Fixed bug #19538pear-19538 : Function indentation code sniffer checks inside short arrays
+- Fixed bug #19565pear-19565 : Non-Executable Code Sniff Broken for Case Statements with both return and break
+- Fixed bug #19612pear-19612 : Invalid @package suggestion
+
+pear-17908: https://pear.php.net/bugs/bug.php?id=17908
+pear-19538: https://pear.php.net/bugs/bug.php?id=19538
+pear-19565: https://pear.php.net/bugs/bug.php?id=19565
+pear-19612: https://pear.php.net/bugs/bug.php?id=19612
 
 ## 1.3.6 - 2012-08-08
+
 ### Changed
 - Memory usage has been dramatically reduced when using the summary report
     - Reduced memory is only available when displaying a single summary report to the screen
@@ -4382,12 +5312,18 @@
 
 ### Fixed
 - Fixed undefined variable error in PEAR FunctionCallSignatureSniff for lines with no indent
-- Fixed bug #19502 : Generic.Files.LineEndingsSniff fails if no new-lines in file
-- Fixed bug #19508 : switch+return: Closing brace indented incorrectly
-- Fixed bug #19532 : The PSR-2 standard don't recognize Null in class names
-- Fixed bug #19546 : Error thrown for __call() method in traits
+- Fixed bug #19502pear-19502 : Generic.Files.LineEndingsSniff fails if no new-lines in file
+- Fixed bug #19508pear-19508 : switch+return: Closing brace indented incorrectly
+- Fixed bug #19532pear-19532 : The PSR-2 standard don't recognize Null in class names
+- Fixed bug #19546pear-19546 : Error thrown for __call() method in traits
+
+pear-19502: https://pear.php.net/bugs/bug.php?id=19502
+pear-19508: https://pear.php.net/bugs/bug.php?id=19508
+pear-19532: https://pear.php.net/bugs/bug.php?id=19532
+pear-19546: https://pear.php.net/bugs/bug.php?id=19546
 
 ## 1.3.5 - 2012-07-12
+
 ### Changed
 - Added Generic CamelCapsFunctionNameSniff to just check if function and method names use camel caps
     - Does not allow underscore prefixes for private/protected methods
@@ -4407,21 +5343,33 @@
 
 ### Fixed
 - Fixed duplicate message codes in Generic OpeningFunctionBraceKernighanRitchieSniff
-- Fixed bug #18651 : PHPunit Test cases for custom standards are not working on Windows
-- Fixed bug #19416 : Shorthand arrays cause bracket spacing errors
-- Fixed bug #19421 : phpcs doesn't recognize ${x} as equivalent to $x
-- Fixed bug #19428 : PHPCS Report "hgblame" doesn't support windows paths
+- Fixed bug #18651pear-18651 : PHPUnit Test cases for custom standards are not working on Windows
+- Fixed bug #19416pear-19416 : Shorthand arrays cause bracket spacing errors
+- Fixed bug #19421pear-19421 : phpcs doesn't recognize ${x} as equivalent to $x
+- Fixed bug #19428pear-19428 : PHPCS Report "hgblame" doesn't support windows paths
     - Thanks to Justin Rovang@rovangju for the patch
-- Fixed bug #19448 : Problem with detecting remote standards
-- Fixed bug #19463 : Anonymous functions incorrectly being flagged by NonExecutableCodeSniff
-- Fixed bug #19469 : PHP_CodeSniffer_File::getMemberProperties() sets wrong scope
-- Fixed bug #19471 : phpcs on Windows, when using Zend standard, doesn't catch problems
+- Fixed bug #19448pear-19448 : Problem with detecting remote standards
+- Fixed bug #19463pear-19463 : Anonymous functions incorrectly being flagged by NonExecutableCodeSniff
+- Fixed bug #19469pear-19469 : PHP_CodeSniffer_File::getMemberProperties() sets wrong scope
+- Fixed bug #19471pear-19471 : phpcs on Windows, when using Zend standard, doesn't catch problems
     - Thanks to Ivan Habunek@ihabunek for the patch
-- Fixed bug #19478 : Incorrect indent detection in PEAR standard
+- Fixed bug #19478pear-19478 : Incorrect indent detection in PEAR standard
     - Thanks to Shane Auckland@shanethehat for the patch
-- Fixed bug #19483 : Blame Reports fail with space in directory name
+- Fixed bug #19483pear-19483 : Blame Reports fail with space in directory name
+
+pear-18651: https://pear.php.net/bugs/bug.php?id=18651
+pear-19416: https://pear.php.net/bugs/bug.php?id=19416
+pear-19421: https://pear.php.net/bugs/bug.php?id=19421
+pear-19428: https://pear.php.net/bugs/bug.php?id=19428
+pear-19448: https://pear.php.net/bugs/bug.php?id=19448
+pear-19463: https://pear.php.net/bugs/bug.php?id=19463
+pear-19469: https://pear.php.net/bugs/bug.php?id=19469
+pear-19471: https://pear.php.net/bugs/bug.php?id=19471
+pear-19478: https://pear.php.net/bugs/bug.php?id=19478
+pear-19483: https://pear.php.net/bugs/bug.php?id=19483
 
 ## 1.3.4 - 2012-05-17
+
 ### Changed
 - Added missing package.xml entries for new Generic FixmeSniff
     - Thanks to Jaroslav Hanslík@kukulich for the patch
@@ -4432,8 +5380,8 @@
     - In particular, allows the Drupal CS to work without needing to symlink it into the PHPCS install
     - Thanks to Peter Philipp@das-peter for the patch
 - Rule references for standards, directories and specific sniffs can now be relative in ruleset.xml files
-    - For example: ref="../MyStandard/Sniffs/Commenting/DisallowHashCommentsSniff.php"
-- Symlinked standards now work correctly, allowing aliasing of installed standards (request #19417)
+    - For example: `ref="../MyStandard/Sniffs/Commenting/DisallowHashCommentsSniff.php"`
+- Symlinked standards now work correctly, allowing aliasing of installed standards (request #19417pear-19417)
     - Thanks to Tom Klingenberg@ktomk for the patch
 - Squiz ObjectInstantiationSniff now allows objects to be returned without assigning them to a variable
 - Added Squiz.Commenting.FileComment.MissingShort error message for file comments that only contains tags
@@ -4450,26 +5398,41 @@
 - Fixed an issue in Generic UpperCaseConstantNameSniff where errors were incorrectly reported on goto statements
     - Thanks to Tom Klingenberg@ktomk for the patch
 - PEAR FileCommentSniff and ClassCommentSniff now support author emails with a single character in the local part
-    - E.g., a@me.com
+    - E.g., `a@me.com`
     - Thanks to Denis Shapkin for the patch
 
 ### Fixed
-- Fixed bug #19290 : Generic indent sniffer fails for anonymous functions
-- Fixed bug #19324 : Setting show_warnings configuration option does not work
-- Fixed bug #19354 : Not recognizing references passed to method
-- Fixed bug #19361 : CSS tokenizer generates errors when PHP embedded in CSS file
-- Fixed bug #19374 : HEREDOC/NOWDOC Indentation problems
-- Fixed bug #19381 : traits and indentations in traits are not handled properly
-- Fixed bug #19394 : Notice in NonExecutableCodeSniff
-- Fixed bug #19402 : Syntax error when executing phpcs on Windows with parens in PHP path
+- Fixed bug #19290pear-19290 : Generic indent sniffer fails for anonymous functions
+- Fixed bug #19324pear-19324 : Setting show_warnings configuration option does not work
+- Fixed bug #19354pear-19354 : Not recognizing references passed to method
+- Fixed bug #19361pear-19361 : CSS tokenizer generates errors when PHP embedded in CSS file
+- Fixed bug #19374pear-19374 : HEREDOC/NOWDOC Indentation problems
+- Fixed bug #19381pear-19381 : traits and indentations in traits are not handled properly
+- Fixed bug #19394pear-19394 : Notice in NonExecutableCodeSniff
+- Fixed bug #19402pear-19402 : Syntax error when executing phpcs on Windows with parens in PHP path
     - Thanks to Tom Klingenberg@ktomk for the patch
-- Fixed bug #19411 : magic method error on __construct()
+- Fixed bug #19411pear-19411 : magic method error on __construct()
     - The fix required a rewrite of AbstractScopeSniff, so please test any sniffs that extend this class
-- Fixed bug #19412 : Incorrect error about assigning objects to variables when inside inline IF
-- Fixed bug #19413 : php_cs thinks I haven't used a parameter when I have
-- Fixed bug #19414 : php_cs seems to not track variables correctly in heredocs
+- Fixed bug #19412pear-19412 : Incorrect error about assigning objects to variables when inside inline IF
+- Fixed bug #19413pear-19413 : PHP_CodeSniffer thinks I haven't used a parameter when I have
+- Fixed bug #19414pear-19414 : PHP_CodeSniffer seems to not track variables correctly in heredocs
+
+pear-19290: https://pear.php.net/bugs/bug.php?id=19290
+pear-19324: https://pear.php.net/bugs/bug.php?id=19324
+pear-19354: https://pear.php.net/bugs/bug.php?id=19354
+pear-19361: https://pear.php.net/bugs/bug.php?id=19361
+pear-19374: https://pear.php.net/bugs/bug.php?id=19374
+pear-19381: https://pear.php.net/bugs/bug.php?id=19381
+pear-19394: https://pear.php.net/bugs/bug.php?id=19394
+pear-19402: https://pear.php.net/bugs/bug.php?id=19402
+pear-19411: https://pear.php.net/bugs/bug.php?id=19411
+pear-19412: https://pear.php.net/bugs/bug.php?id=19412
+pear-19413: https://pear.php.net/bugs/bug.php?id=19413
+pear-19414: https://pear.php.net/bugs/bug.php?id=19414
+pear-19417: https://pear.php.net/bugs/bug.php?id=19417
 
 ## 1.3.3 - 2012-02-07
+
 ### Changed
 - Added new Generic FixmeSniff that shows error messages for all FIXME comments left in your code
     - Thanks to Sam Graham@illusori for the contribution
@@ -4480,25 +5443,37 @@
     - Thanks to Sebastian Bergmann@sebastianbergmann for the patch
 - Added PHP_CodeSniffer_Tokens::$bracketTokens to give sniff writers fast access to open and close bracket tokens
 - Fixed an issue in AbstractPatternSniff where EOL tokens were not being correctly checked in some cases
-- PHP_CodeSniffer_File::getTokensAsString() now detects incorrect length value (request #19313)
+- PHP_CodeSniffer_File::getTokensAsString() now detects incorrect length value (request #19313pear-19313)
 
 ### Fixed
-- Fixed bug #19114 : CodeSniffer checks extension even for single file
-- Fixed bug #19171 : Show sniff codes option is ignored by some report types
+- Fixed bug #19114pear-19114 : CodeSniffer checks extension even for single file
+- Fixed bug #19171pear-19171 : Show sniff codes option is ignored by some report types
     - Thanks to Dominic Scheirlinck@dominics for the patch
-- Fixed bug #19188 : Lots of PHP Notices when analyzing the Symfony framework
+- Fixed bug #19188pear-19188 : Lots of PHP Notices when analyzing the Symfony framework
     - First issue was list-style.. lines in CSS files not properly adjusting open/close bracket positions
-    - Second issue was notices caused by bug #19137
-- Fixed bug #19208 : UpperCaseConstantName reports class members
+    - Second issue was notices caused by bug #19137pear-19137
+- Fixed bug #19208pear-19208 : UpperCaseConstantName reports class members
     - Was also a problem with LowerCaseConstantName as well
-- Fixed bug #19256 : T_DOC_COMMENT in CSS files breaks ClassDefinitionNameSpacingSniff
+- Fixed bug #19256pear-19256 : T_DOC_COMMENT in CSS files breaks ClassDefinitionNameSpacingSniff
     - Thanks to Klaus Purer@klausi for the patch
-- Fixed bug #19264 : Squiz.PHP.NonExecutableCode does not handle RETURN in CASE without BREAK
-- Fixed bug #19270 : DuplicateClassName does not handle namespaces correctly
-- Fixed bug #19283 : CSS @media rules cause false positives
+- Fixed bug #19264pear-19264 : Squiz.PHP.NonExecutableCode does not handle RETURN in CASE without BREAK
+- Fixed bug #19270pear-19270 : DuplicateClassName does not handle namespaces correctly
+- Fixed bug #19283pear-19283 : CSS @media rules cause false positives
     - Thanks to Klaus Purer@klausi for the patch
 
+pear-19114: https://pear.php.net/bugs/bug.php?id=19114
+pear-19137: https://pear.php.net/bugs/bug.php?id=19137
+pear-19171: https://pear.php.net/bugs/bug.php?id=19171
+pear-19188: https://pear.php.net/bugs/bug.php?id=19188
+pear-19208: https://pear.php.net/bugs/bug.php?id=19208
+pear-19256: https://pear.php.net/bugs/bug.php?id=19256
+pear-19264: https://pear.php.net/bugs/bug.php?id=19264
+pear-19270: https://pear.php.net/bugs/bug.php?id=19270
+pear-19283: https://pear.php.net/bugs/bug.php?id=19283
+pear-19313: https://pear.php.net/bugs/bug.php?id=19313
+
 ## 1.3.2 - 2011-12-01
+
 ### Changed
 - Added Generic JSHintSniff to run jshint.js over a JS file and report warnings
     - Set jshint path using phpcs --config-set jshint_path /path/to/jshint-rhino.js
@@ -4517,36 +5492,42 @@
 ### Fixed
 - Fixed unit tests not running under Windows
     - Thanks to Jaroslav Hanslík@kukulich for the patch
-- Fixed bug #18964 : "$stackPtr must be of type T_VARIABLE" on heredocs and nowdocs
-- Fixed bug #18973 : phpcs is looking for variables in a nowdoc
-- Fixed bug #18974 : Blank line causes "Multi-line function call not indented correctly"
+- Fixed bug #18964pear-18964 : "$stackPtr must be of type T_VARIABLE" on heredocs and nowdocs
+- Fixed bug #18973pear-18973 : phpcs is looking for variables in a nowdoc
+- Fixed bug #18974pear-18974 : Blank line causes "Multi-line function call not indented correctly"
     - Adds new error message to ban empty lines in multi-line function calls
-- Fixed bug #18975 : "Closing parenthesis must be on a line by itself" also causes indentation error
+- Fixed bug #18975pear-18975 : "Closing parenthesis must be on a line by itself" also causes indentation error
+
+pear-18964: https://pear.php.net/bugs/bug.php?id=18964
+pear-18973: https://pear.php.net/bugs/bug.php?id=18973
+pear-18974: https://pear.php.net/bugs/bug.php?id=18974
+pear-18975: https://pear.php.net/bugs/bug.php?id=18975
 
 ## 1.3.1 - 2011-11-03
+
 ### Changed
-- All report file command line arguments now work with relative paths (request #17240)
-- The extensions command line argument now supports multi-part file extensions (request #17227)
+- All report file command line arguments now work with relative paths (request #17240pear-17240)
+- The extensions command line argument now supports multi-part file extensions (request #17227pear-17227)
 - Added report type --report=hgblame to show number of errors/warnings committed by authors in a Mercurial repository
     - Has the same functionality as the svnblame report
     - Thanks to Ben Selby@benmatselby for the patch
-- Added T_BACKTICK token type to make detection of backticks easier (request #18799)
+- Added T_BACKTICK token type to make detection of backticks easier (request #18799pear-18799)
 - Added pattern matching support to Generic ForbiddenFunctionsSniff
     - If you are extending it and overriding register() or addError() you will need to review your sniff
-- Namespaces are now recognised as scope openers, although they do not require braces (request #18043)
-- Added new ByteOrderMarkSniff to Generic standard (request #18194)
+- Namespaces are now recognised as scope openers, although they do not require braces (request #18043pear-18043)
+- Added new ByteOrderMarkSniff to Generic standard (request #18194pear-18194)
     - Throws an error if a byte order mark is found in any PHP file
     - Thanks to Piotr Karaspear-ryba for the contribution
-- PHP_Timer output is no longer included in reports when being written to a file (request #18252)
+- PHP_Timer output is no longer included in reports when being written to a file (request #18252pear-18252)
     - Also now shown for all report types if nothing is being printed to the screen
-- Generic DeprecatedFunctionSniff now reports functions as deprecated and not simply forbidden (request #18288)
-- PHPCS now accepts file contents from STDIN (request #18447)
-    - Example usage: cat temp.php | phpcs options  -OR-  phpcs options &lt; temp.php
+- Generic DeprecatedFunctionSniff now reports functions as deprecated and not simply forbidden (request #18288pear-18288)
+- PHPCS now accepts file contents from STDIN (request #18447pear-18447)
+    - Example usage: `cat temp.php | phpcs options`  -OR-  `phpcs options &lt; temp.php`
     - Not every sniff will work correctly due to the lack of a valid file path
-- PHP_CodeSniffer_Exception no longer extends PEAR_Exception (request #18483)
+- PHP_CodeSniffer_Exception no longer extends PEAR_Exception (request #18483pear-18483)
     - PEAR_Exception added a requirement that PEAR had to be installed
     - PHP_CodeSniffer is not used as a library, so unlikely to have any impact
-- PEAR FileCommentSniff now allows GIT IDs in the version tag (request #14874)
+- PEAR FileCommentSniff now allows GIT IDs in the version tag (request #14874pear-14874)
 - AbstractVariableSniff now supports heredocs
     - Also includes some variable detection fixes
     - Thanks to Sam Graham@illusori for the patch
@@ -4555,42 +5536,73 @@
 - PEAR ClassDeclaration sniff now supports indentation checks when using the alternate namespace syntax
     - PEAR.Classes.ClassDeclaration.SpaceBeforeBrace message now contains 2 variables instead of 1
     - Sniff allows overriding of the default indent level, which is set to 4
-    - Fixes bug #18933 : Alternative namespace declaration syntax confuses scope sniffs
+    - Fixes bug #18933pear-18933 : Alternative namespace declaration syntax confuses scope sniffs
 
 ### Fixed
 - Fixed issue in Squiz FileCommentSniff where suggested package name was the same as the incorrect package name
 - Fixed some issues with Squiz ArrayDeclarationSniff when using function calls in array values
 - Fixed doc generation so it actually works again
     - Also now works when being run from an SVN checkout as well as when installed as a PEAR package
-    - Should fix bug #18949 : Call to private method from static
-- Fixed bug #18465 : "self::" does not work in lambda functions
+    - Should fix bug #18949pear-18949 : Call to private method from static
+- Fixed bug #18465pear-18465 : "self::" does not work in lambda functions
     - Also corrects conversion of T_FUNCTION tokens to T_CLOSURE, which was not fixing token condition arrays
-- Fixed bug #18543 : CSS Tokenizer deletes too many #
-- Fixed bug #18624 : @throws namespace problem
+- Fixed bug #18543pear-18543 : CSS Tokenizer deletes too many #
+- Fixed bug #18624pear-18624 : @throws namespace problem
     - Thanks to Gavin Daviespear-boxgav for the patch
-- Fixed bug #18628 : Generic.Files.LineLength gives incorrect results with Windows line-endings
-- Fixed bug #18633 : CSS Tokenizer doesn't replace T_LIST tokens inside some styles
-- Fixed bug #18657 : anonymous functions wrongly indented
-- Fixed bug #18670 : UpperCaseConstantNameSniff fails on dynamic retrieval of class constant
-- Fixed bug #18709 : Code sniffer sniffs file if even if it's in --ignore
+- Fixed bug #18628pear-18628 : Generic.Files.LineLength gives incorrect results with Windows line-endings
+- Fixed bug #18633pear-18633 : CSS Tokenizer doesn't replace T_LIST tokens inside some styles
+- Fixed bug #18657pear-18657 : anonymous functions wrongly indented
+- Fixed bug #18670pear-18670 : UpperCaseConstantNameSniff fails on dynamic retrieval of class constant
+- Fixed bug #18709pear-18709 : Code sniffer sniffs file even if it's in --ignore
     - Thanks to Artem Lopata@biozshock for the patch
-- Fixed bug #18762 : Incorrect handling of define and constant in UpperCaseConstantNameSniff
+- Fixed bug #18762pear-18762 : Incorrect handling of define and constant in UpperCaseConstantNameSniff
     - Thanks to Thomas Bakerpear-bakert for the patch
-- Fixed bug #18769 : CSS Tokenizer doesn't replace T_BREAK tokens inside some styles
-- Fixed bug #18835 : Unreachable errors of inline returns of closure functions
+- Fixed bug #18769pear-18769 : CSS Tokenizer doesn't replace T_BREAK tokens inside some styles
+- Fixed bug #18835pear-18835 : Unreachable errors of inline returns of closure functions
     - Thanks to Patrick Schmidtpear-woellchen for the patch
-- Fixed bug #18839 : Fix miscount of warnings in AbstractSniffUnitTest.php
+- Fixed bug #18839pear-18839 : Fix miscount of warnings in `AbstractSniffUnitTest.php`
     - Thanks to Sam Graham@illusori for the patch
-- Fixed bug #18844 : Generic_Sniffs_CodeAnalysis_UnusedFunctionParameterSniff with empty body
+- Fixed bug #18844pear-18844 : Generic_Sniffs_CodeAnalysis_UnusedFunctionParameterSniff with empty body
     - Thanks to Dmitri Medvedevpear-dvino for the patch
-- Fixed bug #18847 : Running Squiz_Sniffs_Classes_ClassDeclarationSniff results in PHP notice
-- Fixed bug #18868 : jslint+rhino: errors/warnings not detected
+- Fixed bug #18847pear-18847 : Running Squiz_Sniffs_Classes_ClassDeclarationSniff results in PHP notice
+- Fixed bug #18868pear-18868 : jslint+rhino: errors/warnings not detected
     - Thanks to Christian Weiske@cweiske for the patch
-- Fixed bug #18879 : phpcs-svn-pre-commit requires escapeshellarg
+- Fixed bug #18879pear-18879 : phpcs-svn-pre-commit requires escapeshellarg
     - Thanks to Bjorn Katuinpear-bjorn for the patch
-- Fixed bug #18951 : weird behaviour with closures and multi-line use () params
+- Fixed bug #18951pear-18951 : weird behaviour with closures and multi-line use () params
+
+pear-14874: https://pear.php.net/bugs/bug.php?id=14874
+pear-17227: https://pear.php.net/bugs/bug.php?id=17227
+pear-17240: https://pear.php.net/bugs/bug.php?id=17240
+pear-18043: https://pear.php.net/bugs/bug.php?id=18043
+pear-18194: https://pear.php.net/bugs/bug.php?id=18194
+pear-18252: https://pear.php.net/bugs/bug.php?id=18252
+pear-18288: https://pear.php.net/bugs/bug.php?id=18288
+pear-18447: https://pear.php.net/bugs/bug.php?id=18447
+pear-18465: https://pear.php.net/bugs/bug.php?id=18465
+pear-18483: https://pear.php.net/bugs/bug.php?id=18483
+pear-18543: https://pear.php.net/bugs/bug.php?id=18543
+pear-18624: https://pear.php.net/bugs/bug.php?id=18624
+pear-18628: https://pear.php.net/bugs/bug.php?id=18628
+pear-18633: https://pear.php.net/bugs/bug.php?id=18633
+pear-18657: https://pear.php.net/bugs/bug.php?id=18657
+pear-18670: https://pear.php.net/bugs/bug.php?id=18670
+pear-18709: https://pear.php.net/bugs/bug.php?id=18709
+pear-18762: https://pear.php.net/bugs/bug.php?id=18762
+pear-18769: https://pear.php.net/bugs/bug.php?id=18769
+pear-18799: https://pear.php.net/bugs/bug.php?id=18799
+pear-18835: https://pear.php.net/bugs/bug.php?id=18835
+pear-18839: https://pear.php.net/bugs/bug.php?id=18839
+pear-18844: https://pear.php.net/bugs/bug.php?id=18844
+pear-18847: https://pear.php.net/bugs/bug.php?id=18847
+pear-18868: https://pear.php.net/bugs/bug.php?id=18868
+pear-18879: https://pear.php.net/bugs/bug.php?id=18879
+pear-18933: https://pear.php.net/bugs/bug.php?id=18933
+pear-18949: https://pear.php.net/bugs/bug.php?id=18949
+pear-18951: https://pear.php.net/bugs/bug.php?id=18951
 
 ## 1.3.0 - 2011-03-17
+
 ### Changed
 - Add a new token T_CLOSURE that replaces T_FUNCTION if the function keyword is anonymous
 - Many Squiz sniffs no longer report errors when checking closures; they are now ignored
@@ -4599,26 +5611,37 @@
 - PEAR FunctionDeclarationSniff now ignores arrays in argument default values when checking multi-line declarations
 
 ### Fixed
-- Fixed bug #18200 : Using custom named ruleset file as standard no longer works
-- Fixed bug #18196 : PEAR MultiLineCondition.SpaceBeforeOpenBrace not consistent with newline chars
-- Fixed bug #18204 : FunctionCommentThrowTag picks wrong exception type when throwing function call
-- Fixed bug #18222 : Add __invoke method to PEAR standard
-- Fixed bug #18235 : Invalid error generation in Squiz.Commenting.FunctionCommentThrowTag
-- Fixed bug #18250 : --standard with relative path skips Standards' "implicit" sniffs
-- Fixed bug #18274 : Multi-line IF and function call indent rules conflict
-- Fixed bug #18282 : Squiz doesn't handle final keyword before function comments
+- Fixed bug #18200pear-18200 : Using custom named ruleset file as standard no longer works
+- Fixed bug #18196pear-18196 : PEAR MultiLineCondition.SpaceBeforeOpenBrace not consistent with newline chars
+- Fixed bug #18204pear-18204 : FunctionCommentThrowTag picks wrong exception type when throwing function call
+- Fixed bug #18222pear-18222 : Add __invoke method to PEAR standard
+- Fixed bug #18235pear-18235 : Invalid error generation in Squiz.Commenting.FunctionCommentThrowTag
+- Fixed bug #18250pear-18250 : --standard with relative path skips Standards' "implicit" sniffs
+- Fixed bug #18274pear-18274 : Multi-line IF and function call indent rules conflict
+- Fixed bug #18282pear-18282 : Squiz doesn't handle final keyword before function comments
     - Thanks to Dave Perrettpear-recurser for the patch
-- Fixed bug #18336 : Function isUnderscoreName gives php notices
+- Fixed bug #18336pear-18336 : Function isUnderscoreName gives PHP notices
+
+pear-18196: https://pear.php.net/bugs/bug.php?id=18196
+pear-18200: https://pear.php.net/bugs/bug.php?id=18200
+pear-18204: https://pear.php.net/bugs/bug.php?id=18204
+pear-18222: https://pear.php.net/bugs/bug.php?id=18222
+pear-18235: https://pear.php.net/bugs/bug.php?id=18235
+pear-18250: https://pear.php.net/bugs/bug.php?id=18250
+pear-18274: https://pear.php.net/bugs/bug.php?id=18274
+pear-18282: https://pear.php.net/bugs/bug.php?id=18282
+pear-18336: https://pear.php.net/bugs/bug.php?id=18336
 
 ## 1.3.0RC2 - 2011-01-14
+
 ### Changed
-- You can now print multiple reports for each run and print each to the screen or a file (request #12434)
-    - Format is --report-report=file (e.g., --report-xml=out.xml)
-    - Printing to screen is done by leaving file empty (e.g., --report-xml)
-    - Multiple reports can be specified in this way (e.g., --report-summary --report-xml=out.xml)
-    - The standard --report and --report-file command line arguments are unchanged
-- Added -d command line argument to set php.ini settings while running (request #17244)
-    - Usage is: phpcs -d memory_limit=32M -d ...
+- You can now print multiple reports for each run and print each to the screen or a file (request #12434pear-12434)
+    - Format is `--report-report=file` (e.g., `--report-xml=out.xml`)
+    - Printing to screen is done by leaving `file` empty (e.g., `--report-xml`)
+    - Multiple reports can be specified in this way (e.g., `--report-summary --report-xml=out.xml`)
+    - The standard `--report` and `--report-file` command line arguments are unchanged
+- Added `-d` command line argument to set `php.ini` settings while running (request #17244pear-17244)
+    - Usage is: `phpcs -d memory_limit=32M -d ...`
     - Thanks to Ben Selby@benmatselby for the patch
 - Added -p command line argument to show progress during a run
     - Dot means pass, E means errors found, W means only warnings found and S means skipped file
@@ -4626,22 +5649,22 @@
     - Enable by default with --config-set show_progress 1
     - Will not print anything if you are already printing verbose output
     - This has caused a big change in the way PHP_CodeSniffer processes files (API changes around processing)
-- You can now add exclude rules for individual sniffs or error messages (request #17903)
+- You can now add exclude rules for individual sniffs or error messages (request #17903pear-17903)
     - Only available when using a ruleset.xml file to specify rules
     - Uses the same exclude-pattern tags as normal but allows them inside rule tags
 - Using the -vvv option will now print a list of sniffs executed for each file and how long they took to process
 - Added Generic ClosureLinterSniff to run Google's gjslint over your JS files
-- The XML and CSV reports now include the severity of the error (request #18165)
+- The XML and CSV reports now include the severity of the error (request #18165pear-18165)
     - The Severity column in the CSV report has been renamed to Type, and a new Severity column added for this
 - Fixed issue with Squiz FunctionCommentSniff reporting incorrect type hint when default value uses namespace
     - Thanks to Anti Veeranna for the patch
-- Generic FileLengthSniff now uses iconv_strlen to check line length if an encoding is specified (request #14237)
+- Generic FileLengthSniff now uses iconv_strlen to check line length if an encoding is specified (request #14237pear-14237)
 - Generic UnnecessaryStringConcatSniff now allows strings to be combined to form a PHP open or close tag
 - Squiz SwitchDeclarationSniff no longer reports indentation errors for BREAK statements inside IF conditions
 - Interactive mode now always prints the full error report (ignores command line)
 - Improved regular expression detection in JavaScript files
     - Added new T_TYPEOF token that can be used to target the typeof JS operator
-    - Fixes bug #17611 : Regular expression tokens not recognised
+    - Fixes bug #17611pear-17611 : Regular expression tokens not recognised
 - Squiz ScopeIndentSniff removed
     - Squiz standard no longer requires additional indents between ob_* methods
     - Also removed Squiz OutputBufferingIndentSniff that was checking the same thing
@@ -4657,74 +5680,111 @@
     - Can override the warnings using the code Internal.DetectLineEndings
 
 ### Fixed
-- Fixed bug #17693 : issue with pre-commit hook script with filenames that start with v
-- Fixed bug #17860 : isReference function fails with references in array
+- Fixed bug #17693pear-17693 : issue with pre-commit hook script with filenames that start with v
+- Fixed bug #17860pear-17860 : isReference function fails with references in array
     - Thanks to Lincoln Maskeypear-ljmaskey for the patch
-- Fixed bug #17902 : Cannot run tests when tests are symlinked into tests dir
+- Fixed bug #17902pear-17902 : Cannot run tests when tests are symlinked into tests dir
     - Thanks to Matt Button@BRMatt for the patch
-- Fixed bug #17928 : Improve error message for Generic_Sniffs_PHP_UpperCaseConstantSniff
+- Fixed bug #17928pear-17928 : Improve error message for Generic_Sniffs_PHP_UpperCaseConstantSniff
     - Thanks to Stefano Kowalke@Konafets for the patch
-- Fixed bug #18039 : JS Tokenizer crash when  is last character in file
-- Fixed bug #18047 : Incorrect handling of namespace aliases as constants
+- Fixed bug #18039pear-18039 : JS Tokenizer crash when  is last character in file
+- Fixed bug #18047pear-18047 : Incorrect handling of namespace aliases as constants
     - Thanks to Dmitri Medvedevpear-dvino for the patch
-- Fixed bug #18072 : Impossible to exclude path from processing when symlinked
-- Fixed bug #18073 : Squiz.PHP.NonExecutableCode fault
-- Fixed bug #18117 : PEAR coding standard: Method constructor not sniffed as a function
-- Fixed bug #18135 : Generic FunctionCallArgumentSpacingSniff reports function declaration errors
-- Fixed bug #18140 : Generic scope indent in exact mode: strange expected/found values for switch
-- Fixed bug #18145 : Sniffs are not loaded for custom ruleset file
+- Fixed bug #18072pear-18072 : Impossible to exclude path from processing when symlinked
+- Fixed bug #18073pear-18073 : Squiz.PHP.NonExecutableCode fault
+- Fixed bug #18117pear-18117 : PEAR coding standard: Method constructor not sniffed as a function
+- Fixed bug #18135pear-18135 : Generic FunctionCallArgumentSpacingSniff reports function declaration errors
+- Fixed bug #18140pear-18140 : Generic scope indent in exact mode: strange expected/found values for switch
+- Fixed bug #18145pear-18145 : Sniffs are not loaded for custom ruleset file
     - Thanks to Scott McCammonpear-mccammos for the patch
-- Fixed bug #18152 : While and do-while with AbstractPatternSniff
-- Fixed bug #18191 : Squiz.PHP.LowercasePHPFunctions does not work with new Date()
-- Fixed bug #18193 : CodeSniffer doesn't reconize CR (\r) line endings
+- Fixed bug #18152pear-18152 : While and do-while with AbstractPatternSniff
+- Fixed bug #18191pear-18191 : Squiz.PHP.LowercasePHPFunctions does not work with new Date()
+- Fixed bug #18193pear-18193 : CodeSniffer doesn't reconize CR (\r) line endings
+
+pear-12434: https://pear.php.net/bugs/bug.php?id=12434
+pear-14237: https://pear.php.net/bugs/bug.php?id=14237
+pear-17244: https://pear.php.net/bugs/bug.php?id=17244
+pear-17611: https://pear.php.net/bugs/bug.php?id=17611
+pear-17693: https://pear.php.net/bugs/bug.php?id=17693
+pear-17860: https://pear.php.net/bugs/bug.php?id=17860
+pear-17902: https://pear.php.net/bugs/bug.php?id=17902
+pear-17903: https://pear.php.net/bugs/bug.php?id=17903
+pear-17928: https://pear.php.net/bugs/bug.php?id=17928
+pear-18039: https://pear.php.net/bugs/bug.php?id=18039
+pear-18047: https://pear.php.net/bugs/bug.php?id=18047
+pear-18072: https://pear.php.net/bugs/bug.php?id=18072
+pear-18073: https://pear.php.net/bugs/bug.php?id=18073
+pear-18117: https://pear.php.net/bugs/bug.php?id=18117
+pear-18135: https://pear.php.net/bugs/bug.php?id=18135
+pear-18140: https://pear.php.net/bugs/bug.php?id=18140
+pear-18145: https://pear.php.net/bugs/bug.php?id=18145
+pear-18152: https://pear.php.net/bugs/bug.php?id=18152
+pear-18165: https://pear.php.net/bugs/bug.php?id=18165
+pear-18191: https://pear.php.net/bugs/bug.php?id=18191
+pear-18193: https://pear.php.net/bugs/bug.php?id=18193
 
 ## 1.3.0RC1 - 2010-09-03
+
 ### Changed
-- Added exclude pattern support to ruleset.xml file so you can specify ignore patterns in a standard (request #17683)
+- Added exclude pattern support to ruleset.xml file so you can specify ignore patterns in a standard (request #17683pear-17683)
     - Use new exclude-pattern tags to include the ignore rules into your ruleset.xml file
     - See CodeSniffer/Standards/PHPCS/ruleset.xml for an example
 - Added new --encoding command line argument to specify the encoding of the files being checked
     - When set to utf-8, stops the XML-based reports from double-encoding
     - When set to something else, helps the XML-based reports encode to utf-8
-    - Default value is iso-8859-1 but can be changed with --config-set encoding value
-- The report is no longer printed to screen when using the --report-file command line option (request #17467)
+    - Default value is iso-8859-1 but can be changed with `--config-set encoding value`
+- The report is no longer printed to screen when using the --report-file command line option (request #17467pear-17467)
     - If you want to print it to screen as well, use the -v command line argument
-- The SVN and GIT blame reports now also show percentage of reported errors per author (request #17606)
+- The SVN and GIT blame reports now also show percentage of reported errors per author (request #17606pear-17606)
     - Thanks to Ben Selby@benmatselby for the patch
 - Updated the SVN pre-commit hook to work with the new severity levels feature
-- Generic SubversionPropertiesSniff now allows properties to have NULL values (request #17682)
+- Generic SubversionPropertiesSniff now allows properties to have NULL values (request #17682pear-17682)
     - A null value indicates that the property should exist but the value should not be checked
-- Generic UpperCaseConstantName Sniff now longer complains about the PHPUnit_MAIN_METHOD constant (request #17798)
+- Generic UpperCaseConstantName Sniff now longer complains about the PHPUnit_MAIN_METHOD constant (request #17798pear-17798)
 - Squiz FileComment sniff now checks JS files as well as PHP files
 - Squiz FunctionCommentSniff now supports namespaces in type hints
 
 ### Fixed
 - Fixed a problem in Squiz OutputBufferingIndentSniff where block comments were reported as not indented
-- Fixed bug #17092 : Problems with utf8_encode and htmlspecialchars with non-ascii chars
+- Fixed bug #17092pear-17092 : Problems with utf8_encode and htmlspecialchars with non-ascii chars
     - Use the new --encoding=utf-8 command line argument if your files are utf-8 encoded
-- Fixed bug #17629 : PHP_CodeSniffer_Tokens::$booleanOperators missing T_LOGICAL_XOR
+- Fixed bug #17629pear-17629 : PHP_CodeSniffer_Tokens::$booleanOperators missing T_LOGICAL_XOR
     - Thanks to Matthew Turland@elazar for the patch
-- Fixed bug #17699 : Fatal error generating code coverage with PHPUnit 5.3.0RC1
-- Fixed bug #17718 : Namespace 'use' statement: used global class name is recognized as constant
-- Fixed bug #17734 : Generic SubversionPropertiesSniff complains on non SVN files
-- Fixed bug #17742 : EmbeddedPhpSniff reacts negatively to file without closing php tag
-- Fixed bug #17823 : Notice: Please no longer include PHPUnit/Framework.php
+- Fixed bug #17699pear-17699 : Fatal error generating code coverage with PHPUnit 5.3.0RC1
+- Fixed bug #17718pear-17718 : Namespace 'use' statement: used global class name is recognized as constant
+- Fixed bug #17734pear-17734 : Generic SubversionPropertiesSniff complains on non SVN files
+- Fixed bug #17742pear-17742 : EmbeddedPhpSniff reacts negatively to file without closing PHP tag
+- Fixed bug #17823pear-17823 : Notice: Please no longer include `PHPUnit/Framework.php`
+
+pear-17092: https://pear.php.net/bugs/bug.php?id=17092
+pear-17467: https://pear.php.net/bugs/bug.php?id=17467
+pear-17606: https://pear.php.net/bugs/bug.php?id=17606
+pear-17629: https://pear.php.net/bugs/bug.php?id=17629
+pear-17682: https://pear.php.net/bugs/bug.php?id=17682
+pear-17683: https://pear.php.net/bugs/bug.php?id=17683
+pear-17699: https://pear.php.net/bugs/bug.php?id=17699
+pear-17718: https://pear.php.net/bugs/bug.php?id=17718
+pear-17734: https://pear.php.net/bugs/bug.php?id=17734
+pear-17742: https://pear.php.net/bugs/bug.php?id=17742
+pear-17798: https://pear.php.net/bugs/bug.php?id=17798
+pear-17823: https://pear.php.net/bugs/bug.php?id=17823
 
 ## 1.3.0a1 - 2010-07-15
+
 ### Changed
-- All CodingStandard.php files have been replaced by ruleset.xml files
+- All `CodingStandard.php` files have been replaced by `ruleset.xml` files
     - Custom standards will need to be converted over to this new format to continue working
 - You can specify a path to your own custom ruleset.xml file by using the --standard command line arg
     - e.g., phpcs --standard=/path/to/my/ruleset.xml
 - Added a new report type --report=gitblame to show how many errors and warnings were committed by each author
     - Has the same functionality as the svnblame report
     - Thanks to Ben Selby@benmatselby for the patch
-- A new token type T_DOLLAR has been added to allow you to sniff for variable variables (feature request #17095)
+- A new token type T_DOLLAR has been added to allow you to sniff for variable variables (feature request #17095pear-17095)
     - Thanks to Ian Youngpear-youngian for the patch
-- JS tokenizer now supports T_POWER (^) and T_MOD_EQUAL (%=) tokens (feature request #17441)
+- JS tokenizer now supports T_POWER (^) and T_MOD_EQUAL (%=) tokens (feature request #17441pear-17441)
 - If you have PHP_Timer installed, you'll now get a time/memory summary at the end of a script run
     - Only happens when printing reports that are designed to be read on the command line
-- Added Generic DeprecatedFunctionsSniff to warn about the use of deprecated functions (feature request #16694)
+- Added Generic DeprecatedFunctionsSniff to warn about the use of deprecated functions (feature request #16694pear-16694)
     - Thanks to Sebastian Bergmann@sebastianbergmann for the patch
 - Added Squiz LogicalOperatorSniff to ensure that logical operators are surrounded by single spaces
 - Added MySource ChannelExceptionSniff to ensure action files only throw ChannelException
@@ -4742,22 +5802,38 @@
 ### Fixed
 - Fixed a problem where Generic CodeAnalysisSniff could show warnings if checking multi-line strings
 - Fixed error messages in Squiz ArrayDeclarationSniff reporting incorrect number of found and expected spaces
-- Fixed bug #17048 : False positive in Squiz_WhiteSpace_ScopeKeywordSpacingSniff
-- Fixed bug #17054 : phpcs more strict than PEAR CS regarding function parameter spacing
-- Fixed bug #17096 : Notice: Undefined index: scope_condition in ScopeClosingBraceSniff.php
+- Fixed bug #17048pear-17048 : False positive in Squiz_WhiteSpace_ScopeKeywordSpacingSniff
+- Fixed bug #17054pear-17054 : phpcs more strict than PEAR CS regarding function parameter spacing
+- Fixed bug #17096pear-17096 : Notice: Undefined index: `scope_condition` in `ScopeClosingBraceSniff.php`
     - Moved PEAR.Functions.FunctionCallArgumentSpacing to Generic.Functions.FunctionCallArgumentSpacing
-- Fixed bug #17144 : Deprecated: Function eregi() is deprecated
-- Fixed bug #17236 : PHP Warning due to token_get_all() in DoubleQuoteUsageSniff
-- Fixed bug #17243 : Alternate Switch Syntax causes endless loop of Notices in SwitchDeclaration
-- Fixed bug #17313 : Bug with switch case structure
-- Fixed bug #17331 : Possible parse error: interfaces may not include member vars
-- Fixed bug #17337 : CSS tokenizer fails on quotes urls
-- Fixed bug #17420 : Uncaught exception when comment before function brace
-- Fixed bug #17503 : closures formatting is not supported
+- Fixed bug #17144pear-17144 : Deprecated: Function eregi() is deprecated
+- Fixed bug #17236pear-17236 : PHP Warning due to token_get_all() in DoubleQuoteUsageSniff
+- Fixed bug #17243pear-17243 : Alternate Switch Syntax causes endless loop of Notices in SwitchDeclaration
+- Fixed bug #17313pear-17313 : Bug with switch case structure
+- Fixed bug #17331pear-17331 : Possible parse error: interfaces may not include member vars
+- Fixed bug #17337pear-17337 : CSS tokenizer fails on quotes urls
+- Fixed bug #17420pear-17420 : Uncaught exception when comment before function brace
+- Fixed bug #17503pear-17503 : closures formatting is not supported
+
+pear-16694: https://pear.php.net/bugs/bug.php?id=16694
+pear-17048: https://pear.php.net/bugs/bug.php?id=17048
+pear-17054: https://pear.php.net/bugs/bug.php?id=17054
+pear-17095: https://pear.php.net/bugs/bug.php?id=17095
+pear-17096: https://pear.php.net/bugs/bug.php?id=17096
+pear-17144: https://pear.php.net/bugs/bug.php?id=17144
+pear-17236: https://pear.php.net/bugs/bug.php?id=17236
+pear-17243: https://pear.php.net/bugs/bug.php?id=17243
+pear-17313: https://pear.php.net/bugs/bug.php?id=17313
+pear-17331: https://pear.php.net/bugs/bug.php?id=17331
+pear-17337: https://pear.php.net/bugs/bug.php?id=17337
+pear-17420: https://pear.php.net/bugs/bug.php?id=17420
+pear-17441: https://pear.php.net/bugs/bug.php?id=17441
+pear-17503: https://pear.php.net/bugs/bug.php?id=17503
 
 ## 1.2.2 - 2010-01-27
+
 ### Changed
-- The core PHP_CodeSniffer_File methods now understand the concept of closures (feature request #16866)
+- The core PHP_CodeSniffer_File methods now understand the concept of closures (feature request #16866pear-16866)
     - Thanks to Christian Kaps@akkie for the sample code
 - Sniffs can now specify violation codes for each error and warning they add
     - Future versions will allow you to override messages and severities using these codes
@@ -4796,7 +5872,7 @@
 - Squiz VariableCommentSniff now ensures the open comment tag is the only content on the first line
 - Squiz NonExecutableCodeSniff now warns about empty return statements that are not required
 - Removed ForbiddenStylesSniff from Squiz standard
-    - It is now in in the MySource standard as BrowserSpecificStylesSniff
+    - It is now in the MySource standard as BrowserSpecificStylesSniff
     - New BrowserSpecificStylesSniff ignores files with browser-specific suffixes
 - MySource IncludeSystemSniff no longer throws errors when extending the Exception class
 - MySource IncludeSystemSniff no longer throws errors for the abstract widget class
@@ -4808,22 +5884,36 @@
 
 ### Fixed
 - Fixed a problem with the SVN pre-commit hook for PHP versions without vertical whitespace regex support
-- Fixed bug #16740 : False positives for heredoc strings and unused parameter sniff
-- Fixed bug #16794 : ValidLogicalOperatorsSniff doesn't report operators not in lowercase
-- Fixed bug #16804 : Report filename is shortened too much
-- Fixed bug #16821 : Bug in Squiz_Sniffs_WhiteSpace_OperatorSpacingSniff
+- Fixed bug #16740pear-16740 : False positives for heredoc strings and unused parameter sniff
+- Fixed bug #16794pear-16794 : ValidLogicalOperatorsSniff doesn't report operators not in lowercase
+- Fixed bug #16804pear-16804 : Report filename is shortened too much
+- Fixed bug #16821pear-16821 : Bug in Squiz_Sniffs_WhiteSpace_OperatorSpacingSniff
     - Thanks to Jaroslav Hanslík@kukulich for the patch
-- Fixed bug #16836 : Notice raised when using semicolon to open case
-- Fixed bug #16855 : Generic standard sniffs incorrectly for define() method
-- Fixed bug #16865 : Two bugs in Squiz_Sniffs_WhiteSpace_OperatorSpacingSniff
+- Fixed bug #16836pear-16836 : Notice raised when using semicolon to open case
+- Fixed bug #16855pear-16855 : Generic standard sniffs incorrectly for define() method
+- Fixed bug #16865pear-16865 : Two bugs in Squiz_Sniffs_WhiteSpace_OperatorSpacingSniff
     - Thanks to Jaroslav Hanslík@kukulich for the patch
-- Fixed bug #16902 : Inline If Declaration bug
-- Fixed bug #16960 : False positive for late static binding in Squiz/ScopeKeywordSpacingSniff
+- Fixed bug #16902pear-16902 : Inline If Declaration bug
+- Fixed bug #16960pear-16960 : False positive for late static binding in Squiz/ScopeKeywordSpacingSniff
     - Thanks to Jakub Tománekpear-thezero for the patch
-- Fixed bug #16976 : The phpcs attempts to process symbolic links that don't resolve to files
-- Fixed bug #17017 : Including one file in the files sniffed alters errors reported for another file
+- Fixed bug #16976pear-16976 : The phpcs attempts to process symbolic links that don't resolve to files
+- Fixed bug #17017pear-17017 : Including one file in the files sniffed alters errors reported for another file
+
+pear-16740: https://pear.php.net/bugs/bug.php?id=16740
+pear-16794: https://pear.php.net/bugs/bug.php?id=16794
+pear-16804: https://pear.php.net/bugs/bug.php?id=16804
+pear-16821: https://pear.php.net/bugs/bug.php?id=16821
+pear-16836: https://pear.php.net/bugs/bug.php?id=16836
+pear-16855: https://pear.php.net/bugs/bug.php?id=16855
+pear-16865: https://pear.php.net/bugs/bug.php?id=16865
+pear-16866: https://pear.php.net/bugs/bug.php?id=16866
+pear-16902: https://pear.php.net/bugs/bug.php?id=16902
+pear-16960: https://pear.php.net/bugs/bug.php?id=16960
+pear-16976: https://pear.php.net/bugs/bug.php?id=16976
+pear-17017: https://pear.php.net/bugs/bug.php?id=17017
 
 ## 1.2.1 - 2009-11-17
+
 ### Changed
 - Added a new report type --report=svnblame to show how many errors and warnings were committed by each author
     - Also shows the percentage of their code that are errors and warnings
@@ -4832,10 +5922,10 @@
     - You can also use the -s command line argument to see the different types of errors authors are committing
     - You can use the -v command line argument to see all authors, even if they have no errors or warnings
 - Added a new command line argument --report-width to allow you to set the column width of screen reports
-    - Reports wont accept values less than 70 or else they get too small
+    - Reports won't accept values less than 70 or else they get too small
     - Can also be set via a config var: phpcs --config-set report_width 100
 - You can now get PHP_CodeSniffer to ignore a whole file by adding @codingStandardsIgnoreFile in the content
-    - If you put it in the first two lines the file wont even be tokenized, so it will be much quicker
+    - If you put it in the first two lines the file won't even be tokenized, so it will be much quicker
 - Reports now print their file lists in alphabetical order
 - PEAR FunctionDeclarationSniff now reports error for incorrect closing bracket placement in multi-line definitions
 - Added Generic CallTimePassByReferenceSniff to prohibit the passing of variables into functions by reference
@@ -4860,25 +5950,41 @@
 
 ### Fixed
 - Fixed an issue with Generic UnnecessaryStringConcatSniff where it incorrectly suggested removing a concat
-- Fixed bug #16530 : ScopeIndentSniff reports false positive
-- Fixed bug #16533 : Duplicate errors and warnings
-- Fixed bug #16563 : Check file extensions problem in phpcs-svn-pre-commit
+- Fixed bug #16530pear-16530 : ScopeIndentSniff reports false positive
+- Fixed bug #16533pear-16533 : Duplicate errors and warnings
+- Fixed bug #16563pear-16563 : Check file extensions problem in phpcs-svn-pre-commit
     - Thanks to Kaijung Chenpear-et3w503 for the patch
-- Fixed bug #16592 : Object operator indentation incorrect when first operator is on a new line
-- Fixed bug #16641 : Notice output
-- Fixed bug #16682 : Squiz_Sniffs_Strings_DoubleQuoteUsageSniff reports string "\0" as invalid
-- Fixed bug #16683 : Typing error in PHP_CodeSniffer_CommentParser_AbstractParser
-- Fixed bug #16684 : Bug in Squiz_Sniffs_PHP_NonExecutableCodeSniff
-- Fixed bug #16692 : Spaces in paths in Squiz_Sniffs_Debug_JavaScriptLintSniff
+- Fixed bug #16592pear-16592 : Object operator indentation incorrect when first operator is on a new line
+- Fixed bug #16641pear-16641 : Notice output
+- Fixed bug #16682pear-16682 : Squiz_Sniffs_Strings_DoubleQuoteUsageSniff reports string "\0" as invalid
+- Fixed bug #16683pear-16683 : Typing error in PHP_CodeSniffer_CommentParser_AbstractParser
+- Fixed bug #16684pear-16684 : Bug in Squiz_Sniffs_PHP_NonExecutableCodeSniff
+- Fixed bug #16692pear-16692 : Spaces in paths in Squiz_Sniffs_Debug_JavaScriptLintSniff
     - Thanks to Jaroslav Hanslík@kukulich for the patch
-- Fixed bug #16696 : Spelling error in MultiLineConditionSniff
-- Fixed bug #16697 : MultiLineConditionSniff incorrect result with inline IF
-- Fixed bug #16698 : Notice in JavaScript Tokenizer
-- Fixed bug #16736 : Multi-files sniffs aren't processed when FILE is a single directory
+- Fixed bug #16696pear-16696 : Spelling error in MultiLineConditionSniff
+- Fixed bug #16697pear-16697 : MultiLineConditionSniff incorrect result with inline IF
+- Fixed bug #16698pear-16698 : Notice in JavaScript Tokenizer
+- Fixed bug #16736pear-16736 : Multi-files sniffs aren't processed when FILE is a single directory
     - Thanks to Alexey Sheinpear-conf for the patch
-- Fixed bug #16792 : Bug in Generic_Sniffs_PHP_ForbiddenFunctionsSniff
+- Fixed bug #16792pear-16792 : Bug in Generic_Sniffs_PHP_ForbiddenFunctionsSniff
+
+pear-16530: https://pear.php.net/bugs/bug.php?id=16530
+pear-16533: https://pear.php.net/bugs/bug.php?id=16533
+pear-16563: https://pear.php.net/bugs/bug.php?id=16563
+pear-16592: https://pear.php.net/bugs/bug.php?id=16592
+pear-16641: https://pear.php.net/bugs/bug.php?id=16641
+pear-16682: https://pear.php.net/bugs/bug.php?id=16682
+pear-16683: https://pear.php.net/bugs/bug.php?id=16683
+pear-16684: https://pear.php.net/bugs/bug.php?id=16684
+pear-16692: https://pear.php.net/bugs/bug.php?id=16692
+pear-16696: https://pear.php.net/bugs/bug.php?id=16696
+pear-16697: https://pear.php.net/bugs/bug.php?id=16697
+pear-16698: https://pear.php.net/bugs/bug.php?id=16698
+pear-16736: https://pear.php.net/bugs/bug.php?id=16736
+pear-16792: https://pear.php.net/bugs/bug.php?id=16792
 
 ## 1.2.0 - 2009-08-17
+
 ### Changed
 - Installed standards are now favoured over custom standards when using the cmd line arg with relative paths
 - Unit tests now use a lot less memory while running
@@ -4887,34 +5993,55 @@
 - Removed unused ValidArrayIndexNameSniff from the Squiz standard
 
 ### Fixed
-- Fixed bug #16424 : SubversionPropertiesSniff print PHP Warning
-- Fixed bug #16450 : Constant PHP_CODESNIFFER_VERBOSITY already defined (unit tests)
-- Fixed bug #16453 : function declaration long line splitted error
-- Fixed bug #16482 : phpcs-svn-pre-commit ignores extensions parameter
+- Fixed bug #16424pear-16424 : SubversionPropertiesSniff print PHP Warning
+- Fixed bug #16450pear-16450 : Constant `PHP_CODESNIFFER_VERBOSITY` already defined (unit tests)
+- Fixed bug #16453pear-16453 : function declaration long line splitted error
+- Fixed bug #16482pear-16482 : phpcs-svn-pre-commit ignores extensions parameter
+
+pear-16424: https://pear.php.net/bugs/bug.php?id=16424
+pear-16450: https://pear.php.net/bugs/bug.php?id=16450
+pear-16453: https://pear.php.net/bugs/bug.php?id=16453
+pear-16482: https://pear.php.net/bugs/bug.php?id=16482
 
 ## 1.2.0RC3 - 2009-07-07
+
 ### Changed
-- You can now use @codingStandardsIgnoreStart and @...End comments to suppress messages (feature request #14002)
-- A warning is now included for files without any code when short_open_tag is set to Off (feature request #12952)
-- You can now use relative paths to your custom standards with the --standard cmd line arg (feature request #14967)
-- You can now override magic methods and functions in PEAR ValidFunctionNameSniff (feature request #15830)
+- You can now use @codingStandardsIgnoreStart and @...End comments to suppress messages (feature request #14002pear-14002)
+- A warning is now included for files without any code when short_open_tag is set to Off (feature request #12952pear-12952)
+- You can now use relative paths to your custom standards with the --standard cmd line arg (feature request #14967pear-14967)
+- You can now override magic methods and functions in PEAR ValidFunctionNameSniff (feature request #15830pear-15830)
 - MySource IncludeSystemSniff now recognises widget action classes
 - MySource IncludeSystemSniff now knows about unit test classes and changes rules accordingly
 
+pear-12952: https://pear.php.net/bugs/bug.php?id=12952
+pear-14002: https://pear.php.net/bugs/bug.php?id=14002
+pear-14967: https://pear.php.net/bugs/bug.php?id=14967
+pear-15830: https://pear.php.net/bugs/bug.php?id=15830
+
 ## 1.2.0RC2 - 2009-05-25
+
 ### Changed
-- Test suite can now be run using the full path to AllTests.php (feature request #16179)
+- Test suite can now be run using the full path to `AllTests.php` (feature request #16179pear-16179)
 
 ### Fixed
-- Fixed bug #15980 : PHP_CodeSniffer change php current directory
+- Fixed bug #15980pear-15980 : PHP_CodeSniffer change PHP current directory
     - Thanks to Dolly Aswin Harahappear-dollyaswin for the patch
-- Fixed bug #16001 : Notice triggered
-- Fixed bug #16054 : phpcs-svn-pre-commit not showing any errors
-- Fixed bug #16071 : Fatal error: Uncaught PHP_CodeSniffer_Exception
-- Fixed bug #16170 : Undefined Offset -1 in MultiLineConditionSniff.php on line 68
-- Fixed bug #16175 : Bug in Squiz-IncrementDecrementUsageSniff
+- Fixed bug #16001pear-16001 : Notice triggered
+- Fixed bug #16054pear-16054 : phpcs-svn-pre-commit not showing any errors
+- Fixed bug #16071pear-16071 : Fatal error: Uncaught PHP_CodeSniffer_Exception
+- Fixed bug #16170pear-16170 : Undefined Offset -1 in `MultiLineConditionSniff.php` on line 68
+- Fixed bug #16175pear-16175 : Bug in Squiz-IncrementDecrementUsageSniff
+
+pear-15980: https://pear.php.net/bugs/bug.php?id=15980
+pear-16001: https://pear.php.net/bugs/bug.php?id=16001
+pear-16054: https://pear.php.net/bugs/bug.php?id=16054
+pear-16071: https://pear.php.net/bugs/bug.php?id=16071
+pear-16170: https://pear.php.net/bugs/bug.php?id=16170
+pear-16175: https://pear.php.net/bugs/bug.php?id=16175
+pear-16179: https://pear.php.net/bugs/bug.php?id=16179
 
 ## 1.2.0RC1 - 2009-03-09
+
 ### Changed
 - Reports that are output to a file now include a trailing newline at the end of the file
 - Fixed sniff names not shown in -vvv token processing output
@@ -4931,23 +6058,32 @@
 
 ### Fixed
 - Fixed the incorrect tokenizing of multi-line block comments in CSS files
-- Fixed bug #15383 : Uncaught PHP_CodeSniffer_Exception
-- Fixed bug #15408 : An unexpected exception has been caught: Undefined offset: 2
-- Fixed bug #15519 : Uncaught PHP_CodeSniffer_Exception
-- Fixed bug #15624 : Pre-commit hook fails with PHP errors
-- Fixed bug #15661 : Uncaught PHP_CodeSniffer_Exception
-- Fixed bug #15722 : "declare(encoding = 'utf-8');" leads to "Missing file doc comment"
-- Fixed bug #15910 : Object operator indention not calculated correctly
+- Fixed bug #15383pear-15383 : Uncaught PHP_CodeSniffer_Exception
+- Fixed bug #15408pear-15408 : An unexpected exception has been caught: Undefined offset: 2
+- Fixed bug #15519pear-15519 : Uncaught PHP_CodeSniffer_Exception
+- Fixed bug #15624pear-15624 : Pre-commit hook fails with PHP errors
+- Fixed bug #15661pear-15661 : Uncaught PHP_CodeSniffer_Exception
+- Fixed bug #15722pear-15722 : "declare(encoding = 'utf-8');" leads to "Missing file doc comment"
+- Fixed bug #15910pear-15910 : Object operator indention not calculated correctly
+
+pear-15383: https://pear.php.net/bugs/bug.php?id=15383
+pear-15408: https://pear.php.net/bugs/bug.php?id=15408
+pear-15519: https://pear.php.net/bugs/bug.php?id=15519
+pear-15624: https://pear.php.net/bugs/bug.php?id=15624
+pear-15661: https://pear.php.net/bugs/bug.php?id=15661
+pear-15722: https://pear.php.net/bugs/bug.php?id=15722
+pear-15910: https://pear.php.net/bugs/bug.php?id=15910
 
 ## 1.2.0a1 - 2008-12-18
+
 ### Changed
 - PHP_CodeSniffer now has a CSS tokenizer for checking CSS files
 - Added support for a new multi-file sniff that sniffs all processed files at once
 - Added new output format --report=emacs to output errors using the emacs standard compile output format
     - Thanks to Len Trigg for the contribution
-- Reports can now be written to a file using the --report-file command line argument (feature request #14953)
+- Reports can now be written to a file using the --report-file command line argument (feature request #14953pear-14953)
     - The report is also written to screen when using this argument
-- The CheckStyle, CSV and XML reports now include a source for each error and warning (feature request #13242)
+- The CheckStyle, CSV and XML reports now include a source for each error and warning (feature request #13242pear-13242)
     - A new report type --report=source can be used to show you the most common errors in your files
 - Added new command line argument -s to show error sources in all reports
 - Added new command line argument --sniffs to specify a list of sniffs to restrict checking to
@@ -5022,7 +6158,7 @@
 - Squiz standard now uses Generic UnnecessaryStringConcatSniff
 - Squiz standard now uses PEAR MultiLineAssignmentSniff
 - Squiz standard now uses PEAR MultiLineConditionSniff
-- Zend standard now uses OpeningFunctionBraceBsdAllmanSniff (feature request #14647)
+- Zend standard now uses OpeningFunctionBraceBsdAllmanSniff (feature request #14647pear-14647)
 - MySource JoinStringsSniff now bans the use of inline array joins and suggests the + operator
 - Fixed incorrect errors that can be generated from abstract scope sniffs when moving to a new file
 - Core tokenizer now matches orphaned curly braces in the same way as square brackets
@@ -5035,21 +6171,36 @@
 
 ### Fixed
 - Fixed Squiz DoubleQuoteUsageSniff so it works correctly with short_open_tag=Off
-- Fixed bug #14409 : Output of warnings to log file
-- Fixed bug #14520 : Notice: Undefined offset: 1 in /usr/share/php/PHP/CodeSniffer/File.php on line
-- Fixed bug #14637 : Call to processUnknownArguments() misses second parameter $pos
+- Fixed bug #14409pear-14409 : Output of warnings to log file
+- Fixed bug #14520pear-14520 : Notice: Undefined offset: 1 in `CodeSniffer/File.php` on line
+- Fixed bug #14637pear-14637 : Call to processUnknownArguments() misses second parameter $pos
     - Thanks to Peter Buripear-burci for the patch
-- Fixed bug #14889 : Lack of clarity: licence or license
-- Fixed bug #15008 : Nested Parentheses in Control Structure Sniffs
-- Fixed bug #15091 : pre-commit hook attempts to sniff folders
+- Fixed bug #14889pear-14889 : Lack of clarity: licence or license
+- Fixed bug #15008pear-15008 : Nested Parentheses in Control Structure Sniffs
+- Fixed bug #15091pear-15091 : pre-commit hook attempts to sniff folders
     - Thanks to Bruce Weirdanpear-weirdan for the patch
-- Fixed bug #15124 : AbstractParser.php uses deprecated split() function
+- Fixed bug #15124pear-15124 : `AbstractParser.php` uses deprecated `split()` function
     - Thanks to Sebastian Bergmann@sebastianbergmann for the patch
-- Fixed bug #15188 : PHPCS vs HEREDOC strings
-- Fixed bug #15231 : Notice: Uninitialized string offset: 0 in FileCommentSniff.php on line 555
-- Fixed bug #15336 : Notice: Undefined offset: 2 in /usr/share/php/PHP/CodeSniffer/File.php on line
+- Fixed bug #15188pear-15188 : PHPCS vs HEREDOC strings
+- Fixed bug #15231pear-15231 : Notice: Uninitialized string offset: 0 in `FileCommentSniff.php` on line 555
+- Fixed bug #15336pear-15336 : Notice: Undefined offset: 2 in `CodeSniffer/File.php` on line
+
+pear-13242: https://pear.php.net/bugs/bug.php?id=13242
+pear-14409: https://pear.php.net/bugs/bug.php?id=14409
+pear-14520: https://pear.php.net/bugs/bug.php?id=14520
+pear-14637: https://pear.php.net/bugs/bug.php?id=14637
+pear-14647: https://pear.php.net/bugs/bug.php?id=14647
+pear-14889: https://pear.php.net/bugs/bug.php?id=14889
+pear-14953: https://pear.php.net/bugs/bug.php?id=14953
+pear-15008: https://pear.php.net/bugs/bug.php?id=15008
+pear-15091: https://pear.php.net/bugs/bug.php?id=15091
+pear-15124: https://pear.php.net/bugs/bug.php?id=15124
+pear-15188: https://pear.php.net/bugs/bug.php?id=15188
+pear-15231: https://pear.php.net/bugs/bug.php?id=15231
+pear-15336: https://pear.php.net/bugs/bug.php?id=15336
 
 ## 1.1.0 - 2008-07-14
+
 ### Changed
 - PEAR FileCommentSniff now allows tag orders to be overridden in child classes
     - Thanks to Jeff Hodsdon for the patch
@@ -5058,14 +6209,15 @@
 
 ### Fixed
 - Fixed error in Zend ValidVariableNameSniff when checking vars in form: $class->{$var}
-- Fixed bug #14077 : Fatal error: Uncaught PHP_CodeSniffer_Exception: $stackPtr is not a class member
-- Fixed bug #14168 : Global Function -> Static Method and __autoload()
-- Fixed bug #14238 : Line length not checked at last line of a file
-- Fixed bug #14249 : wrong detection of scope_opener
-- Fixed bug #14250 : ArrayDeclarationSniff emit warnings at malformed array
-- Fixed bug #14251 : --extensions option doesn't work
+- Fixed bug #14077pear-14077 : Fatal error: Uncaught PHP_CodeSniffer_Exception: $stackPtr is not a class member
+- Fixed bug #14168pear-14168 : Global Function -> Static Method and __autoload()
+- Fixed bug #14238pear-14238 : Line length not checked at last line of a file
+- Fixed bug #14249pear-14249 : wrong detection of scope_opener
+- Fixed bug #14250pear-14250 : ArrayDeclarationSniff emit warnings at malformed array
+- Fixed bug #14251pear-14251 : --extensions option doesn't work
 
 ## 1.1.0RC3 - 2008-07-03
+
 ### Changed
 - PEAR FileCommentSniff now allows tag orders to be overridden in child classes
     - Thanks to Jeff Hodsdon for the patch
@@ -5074,33 +6226,46 @@
 
 ### Fixed
 - Fixed error in Zend ValidVariableNameSniff when checking vars in form: $class->{$var}
-- Fixed bug #14077 : Fatal error: Uncaught PHP_CodeSniffer_Exception: $stackPtr is not a class member
-- Fixed bug #14168 : Global Function -> Static Method and __autoload()
-- Fixed bug #14238 : Line length not checked at last line of a file
-- Fixed bug #14249 : wrong detection of scope_opener
-- Fixed bug #14250 : ArrayDeclarationSniff emit warnings at malformed array
-- Fixed bug #14251 : --extensions option doesn't work
+- Fixed bug #14077pear-14077 : Fatal error: Uncaught PHP_CodeSniffer_Exception: $stackPtr is not a class member
+- Fixed bug #14168pear-14168 : Global Function -> Static Method and __autoload()
+- Fixed bug #14238pear-14238 : Line length not checked at last line of a file
+- Fixed bug #14249pear-14249 : wrong detection of scope_opener
+- Fixed bug #14250pear-14250 : ArrayDeclarationSniff emit warnings at malformed array
+- Fixed bug #14251pear-14251 : --extensions option doesn't work
+
+pear-14077: https://pear.php.net/bugs/bug.php?id=14077
+pear-14168: https://pear.php.net/bugs/bug.php?id=14168
+pear-14238: https://pear.php.net/bugs/bug.php?id=14238
+pear-14249: https://pear.php.net/bugs/bug.php?id=14249
+pear-14250: https://pear.php.net/bugs/bug.php?id=14250
+pear-14251: https://pear.php.net/bugs/bug.php?id=14251
 
 ## 1.1.0RC2 - 2008-06-13
+
 ### Changed
-- Permission denied errors now stop script execution but still display current errors (feature request #14076)
+- Permission denied errors now stop script execution but still display current errors (feature request #14076pear-14076)
 - Added Squiz ValidArrayIndexNameSniff to ensure array indexes do not use camel case
 - Squiz ArrayDeclarationSniff now ensures arrays are not declared with camel case index values
 - PEAR ValidVariableNameSniff now alerts about a possible parse error for member vars inside an interface
 
 ### Fixed
-- Fixed bug #13921 : js parsing fails for comments on last line of file
-- Fixed bug #13922 : crash in case of malformed (but tokenized) php file
+- Fixed bug #13921pear-13921 : js parsing fails for comments on last line of file
+- Fixed bug #13922pear-13922 : crash in case of malformed (but tokenized) PHP file
     - PEAR and Squiz ClassDeclarationSniff now throw warnings for possible parse errors
     - Squiz ValidClassNameSniff now throws warning for possible parse errors
     - Squiz ClosingDeclarationCommentSniff now throws additional warnings for parse errors
 
+pear-13921: https://pear.php.net/bugs/bug.php?id=13921
+pear-13922: https://pear.php.net/bugs/bug.php?id=13922
+pear-14076: https://pear.php.net/bugs/bug.php?id=14076
+
 ## 1.1.0RC1 - 2008-05-13
+
 ### Changed
 - Added support for multiple tokenizers so PHP_CodeSniffer can check more than just PHP files
     - PHP_CodeSniffer now has a JS tokenizer for checking JavaScript files
     - Sniffs need to be updated to work with additional tokenizers, or new sniffs written for them
-- phpcs now exits with status 2 if the tokenizer extension has been disabled (feature request #13269)
+- phpcs now exits with status 2 if the tokenizer extension has been disabled (feature request #13269pear-13269)
 - Added scripts/phpcs-svn-pre-commit that can be used as an SVN pre-commit hook
     - Also reworked the way the phpcs script works to make it easier to wrap it with other functionality
     - Thanks to Jack Bates for the contribution
@@ -5122,7 +6287,7 @@
 - Squiz IncrementDecrementUsageSniff now ensures inc/dec ops are not used in arithmetic operations
 - Squiz FunctionCommentSniff no longer throws errors if return value is mixed but function returns void somewhere
 - Squiz OperatorBracketSniff no allows function call brackets to count as operator brackets
-- Squiz DoubleQuoteUsageSniff now supports \x \f and \v (feature request #13365)
+- Squiz DoubleQuoteUsageSniff now supports \x \f and \v (feature request #13365pear-13365)
 - Squiz ComparisonOperatorUsageSniff now supports JS files
 - Squiz ControlSignatureSniff now supports JS files
 - Squiz ForLoopDeclarationSniff now supports JS files
@@ -5148,35 +6313,53 @@
 - Fixed error in Squiz BlockCommentSniff where comments for class constants were not ignored
 - Fixed error in Squiz OperatorBracketSniff where negative numbers were ignored during comparisons
 - Fixed error in Squiz FunctionSpacingSniff where functions after member vars reported incorrect spacing
-- Fixed bug #13062 : Interface comments aren't handled in PEAR standard
+- Fixed bug #13062pear-13062 : Interface comments aren't handled in PEAR standard
     - Thanks to Manuel Pichler@manuelpichler for the path
-- Fixed bug #13119 : php minimum requirement need to be fix
-- Fixed bug #13156 : Bug in Squiz_Sniffs_PHP_NonExecutableCodeSniff
-- Fixed bug #13158 : Strange behaviour in AbstractPatternSniff
-- Fixed bug #13169 : Undefined variables
-- Fixed bug #13178 : Catch exception in File.php
-- Fixed bug #13254 : Notices output in checkstyle report causes XML issues
-- Fixed bug #13446 : crash with src of phpMyAdmin
+- Fixed bug #13119pear-13119 : PHP minimum requirement need to be fix
+- Fixed bug #13156pear-13156 : Bug in Squiz_Sniffs_PHP_NonExecutableCodeSniff
+- Fixed bug #13158pear-13158 : Strange behaviour in AbstractPatternSniff
+- Fixed bug #13169pear-13169 : Undefined variables
+- Fixed bug #13178pear-13178 : Catch exception in `File.php`
+- Fixed bug #13254pear-13254 : Notices output in checkstyle report causes XML issues
+- Fixed bug #13446pear-13446 : crash with src of phpMyAdmin
     - Thanks to Manuel Pichler@manuelpichler for the path
 
+pear-13062: https://pear.php.net/bugs/bug.php?id=13062
+pear-13119: https://pear.php.net/bugs/bug.php?id=13119
+pear-13156: https://pear.php.net/bugs/bug.php?id=13156
+pear-13158: https://pear.php.net/bugs/bug.php?id=13158
+pear-13169: https://pear.php.net/bugs/bug.php?id=13169
+pear-13178: https://pear.php.net/bugs/bug.php?id=13178
+pear-13254: https://pear.php.net/bugs/bug.php?id=13254
+pear-13269: https://pear.php.net/bugs/bug.php?id=13269
+pear-13365: https://pear.php.net/bugs/bug.php?id=13365
+pear-13446: https://pear.php.net/bugs/bug.php?id=13446
+
 ## 1.0.1a1 - 2008-04-21
+
 ### Changed
 - Fixed error in PEAR ValidClassNameSniff when checking class names with double underscores
 - Moved Squiz InlineControlStructureSniff into Generic standard
 - PEAR standard now throws warnings for inline control structures
 - Squiz OutputBufferingIndentSniff now ignores the indentation of inline HTML
 - MySource IncludeSystemSniff now ignores usage of ZipArchive
-- Removed "function" from error messages for Generic function brace sniffs (feature request #13820)
+- Removed "function" from error messages for Generic function brace sniffs (feature request #13820pear-13820)
 - Generic UpperCaseConstantSniff no longer throws errors for declare(ticks = ...)
     - Thanks to Josh Snyder for the patch
 - Squiz ClosingDeclarationCommentSniff and AbstractVariableSniff now throw warnings for possible parse errors
 
 ### Fixed
-- Fixed bug #13827 : AbstractVariableSniff throws "undefined index"
-- Fixed bug #13846 : Bug in Squiz.NonExecutableCodeSniff
-- Fixed bug #13849 : infinite loop in PHP_CodeSniffer_File::findNext()
+- Fixed bug #13827pear-13827 : AbstractVariableSniff throws "undefined index"
+- Fixed bug #13846pear-13846 : Bug in Squiz.NonExecutableCodeSniff
+- Fixed bug #13849pear-13849 : infinite loop in PHP_CodeSniffer_File::findNext()
+
+pear-13820: https://pear.php.net/bugs/bug.php?id=13820
+pear-13827: https://pear.php.net/bugs/bug.php?id=13827
+pear-13846: https://pear.php.net/bugs/bug.php?id=13846
+pear-13849: https://pear.php.net/bugs/bug.php?id=13849
 
 ## 1.0.1 - 2008-02-04
+
 ### Changed
 - Squiz ArrayDeclarationSniff now throws error if the array keyword is followed by a space
 - Squiz ArrayDeclarationSniff now throws error for empty multi-line arrays
@@ -5195,24 +6378,32 @@
 
 ### Fixed
 - Fixed a problem that caused the parentheses map to sometimes contain incorrect values
-- Fixed bug #12767 : Cant run phpcs from dir with PEAR subdir
-- Fixed bug #12773 : Reserved variables are not detected in strings
+- Fixed bug #12767pear-12767 : Cant run phpcs from dir with PEAR subdir
+- Fixed bug #12773pear-12773 : Reserved variables are not detected in strings
     - Thanks to Wilfried Lochepear-wloche for the patch
-- Fixed bug #12832 : Tab to space conversion does not work
-- Fixed bug #12888 : extra space indentation = Notice: Uninitialized string offset...
-- Fixed bug #12909 : Default generateDocs function does not work under linux
+- Fixed bug #12832pear-12832 : Tab to space conversion does not work
+- Fixed bug #12888pear-12888 : extra space indentation = Notice: Uninitialized string offset...
+- Fixed bug #12909pear-12909 : Default generateDocs function does not work under linux
     - Thanks to Paul Smithpear-thing2b for the patch
-- Fixed bug #12957 : PHP 5.3 magic method __callStatic
+- Fixed bug #12957pear-12957 : PHP 5.3 magic method __callStatic
     - Thanks to Manuel Pichler@manuelpichler for the patch
 
+pear-12767: https://pear.php.net/bugs/bug.php?id=12767
+pear-12773: https://pear.php.net/bugs/bug.php?id=12773
+pear-12832: https://pear.php.net/bugs/bug.php?id=12832
+pear-12888: https://pear.php.net/bugs/bug.php?id=12888
+pear-12909: https://pear.php.net/bugs/bug.php?id=12909
+pear-12957: https://pear.php.net/bugs/bug.php?id=12957
+
 ## 1.0.0 - 2007-12-21
+
 ### Changed
-- You can now specify the full path to a coding standard on the command line (feature request #11886)
+- You can now specify the full path to a coding standard on the command line (feature request #11886pear-11886)
     - This allows you to use standards that are stored outside of PHP_CodeSniffer's own Standard dir
-    - You can also specify full paths in the CodingStandard.php include and exclude methods
+    - You can also specify full paths in the `CodingStandard.php` include and exclude methods
     - Classes, dirs and files need to be names as if the standard was part of PHP_CodeSniffer
     - Thanks to Dirk Thomas for the doc generator patch and testing
-- Modified the scope map to keep checking after 3 lines for some tokens (feature request #12561)
+- Modified the scope map to keep checking after 3 lines for some tokens (feature request #12561pear-12561)
     - Those tokens that must have an opener (like T_CLASS) now keep looking until EOF
     - Other tokens (like T_FUNCTION) still stop after 3 lines for performance
 - You can now escape commas in ignore patterns so they can be matched in file names
@@ -5229,21 +6420,28 @@
 - MySource IncludeSystemSniff no longer throws errors for the Util package
 
 ### Fixed
-- Fixed bug #12621 : "space after AS" check is wrong
+- Fixed bug #12621pear-12621 : "space after AS" check is wrong
     - Thanks to Satoshi Oikawapear-renoiv for the patch
-- Fixed bug #12645 : error message is wrong
+- Fixed bug #12645pear-12645 : error message is wrong
     - Thanks to Satoshi Oikawapear-renoiv for the patch
-- Fixed bug #12651 : Increment/Decrement Operators Usage at -1
+- Fixed bug #12651pear-12651 : Increment/Decrement Operators Usage at -1
+
+pear-11886: https://pear.php.net/bugs/bug.php?id=11886
+pear-12561: https://pear.php.net/bugs/bug.php?id=12561
+pear-12621: https://pear.php.net/bugs/bug.php?id=12621
+pear-12645: https://pear.php.net/bugs/bug.php?id=12645
+pear-12651: https://pear.php.net/bugs/bug.php?id=12651
 
 ## 1.0.0RC3 - 2007-11-30
+
 ### Changed
 - Added new command line argument --tab-width that will convert tabs to spaces before testing
     - This allows you to use the existing sniffs that check for spaces even when you use tabs
     - Can also be set via a config var: phpcs --config-set tab_width 4
     - A value of zero (the default) tells PHP_CodeSniffer not to replace tabs with spaces
 - You can now change the default report format from "full" to something else
-    - Run: phpcs --config-set report_format format
-- Improved performance by optimising the way the scope map is created during tokenising
+    - Run: phpcs `--config-set report_format format`
+- Improved performance by optimising the way the scope map is created during tokenizing
 - Added new Squiz DisallowInlineIfSniff to disallow the usage of inline IF statements
 - Fixed incorrect errors being thrown for nested switches in Squiz SwitchDeclarationSniff
 - PEAR FunctionCommentSniff no longer complains about missing comments for @throws tags
@@ -5256,14 +6454,21 @@
 - Squiz DisallowMultipleAssignmentsSniff no longer throws errors for assignments in inline IF statements
 
 ### Fixed
-- Fixed bug #12455 : CodeSniffer treats content inside heredoc as PHP code
-- Fixed bug #12471 : Checkstyle report is broken
-- Fixed bug #12476 : PHP4 destructors are reported as error
-- Fixed bug #12513 : Checkstyle XML messages need to be utf8_encode()d
+- Fixed bug #12455pear-12455 : CodeSniffer treats content inside heredoc as PHP code
+- Fixed bug #12471pear-12471 : Checkstyle report is broken
+- Fixed bug #12476pear-12476 : PHP4 destructors are reported as error
+- Fixed bug #12513pear-12513 : Checkstyle XML messages need to be utf8_encode()d
     - Thanks to Sebastian Bergmann@sebastianbergmann for the patch.
-- Fixed bug #12517 : getNewlineAfter() and dos files
+- Fixed bug #12517pear-12517 : getNewlineAfter() and dos files
+
+pear-12455: https://pear.php.net/bugs/bug.php?id=12455
+pear-12471: https://pear.php.net/bugs/bug.php?id=12471
+pear-12476: https://pear.php.net/bugs/bug.php?id=12476
+pear-12513: https://pear.php.net/bugs/bug.php?id=12513
+pear-12517: https://pear.php.net/bugs/bug.php?id=12517
 
 ## 1.0.0RC2 - 2007-11-14
+
 ### Changed
 - Added a new Checkstyle report format
     - Like the current XML format but modified to look like Checkstyle output
@@ -5272,14 +6477,14 @@
     - Run: phpcs --config-set show_warnings 0
     - If warnings are hidden by default, use the new -w command line argument to override
 - Added new command line argument --config-delete to delete a config value and revert to the default
-- Improved overall performance by optimising tokenising and next/prev methods (feature request #12421)
+- Improved overall performance by optimising tokenizing and next/prev methods (feature request #12421pear-12421)
     - Thanks to Christian Weiske@cweiske for the patch
 - Added FunctionCallSignatureSniff to Squiz standard
-- Added @subpackage support to file and class comment sniffs in PEAR standard (feature request #12382)
+- Added @subpackage support to file and class comment sniffs in PEAR standard (feature request #12382pear-12382)
     - Thanks to Carsten Wiedmannpear-cwiedmann for the patch
-- An error is now displayed if you use a PHP version less than 5.1.0 (feature request #12380)
+- An error is now displayed if you use a PHP version less than 5.1.0 (feature request #12380pear-12380)
     - Thanks to Carsten Wiedmannpear-cwiedmann for the patch
-- phpcs now exits with status 2 if it receives invalid input (feature request #12380)
+- phpcs now exits with status 2 if it receives invalid input (feature request #12380pear-12380)
     - This is distinct from status 1, which indicates errors or warnings were found
 - Added new Squiz LanguageConstructSpacingSniff to throw errors for additional whitespace after echo etc.
 - Removed Squiz ValidInterfaceNameSniff
@@ -5290,11 +6495,18 @@
 - Fixed incorrect function docblock detection in Squiz FunctionCommentSniff
 - Fixed incorrect errors for list() in Squiz DisallowMultipleAssignmentsSniff
 - Errors no longer thrown if control structure is followed by a CASE's BREAK in Squiz ControlStructureSpacingSniff
-- Fixed bug #12368 : Autoloader cannot be found due to include_path override
+- Fixed bug #12368pear-12368 : Autoloader cannot be found due to include_path override
     - Thanks to Richard Quadlingpear-rquadling for the patch
-- Fixed bug #12378 : equal sign alignments problem with while()
+- Fixed bug #12378pear-12378 : equal sign alignments problem with while()
+
+pear-12368: https://pear.php.net/bugs/bug.php?id=12368
+pear-12378: https://pear.php.net/bugs/bug.php?id=12378
+pear-12380: https://pear.php.net/bugs/bug.php?id=12380
+pear-12382: https://pear.php.net/bugs/bug.php?id=12382
+pear-12421: https://pear.php.net/bugs/bug.php?id=12421
 
 ## 1.0.0RC1 - 2007-11-01
+
 ### Changed
 - Main phpcs script can now be run from a CVS checkout without installing the package
 - Added a new CSV report format
@@ -5340,14 +6552,18 @@
 - Fixed error with multi-token array indexes in Squiz ArrayDeclarationSniff
 - Fixed error with checking shorthand IF statements without a semicolon in Squiz InlineIfDeclarationSniff
 - Fixed error where constants used as default values in function declarations were seen as type hints
-- Fixed bug #12316 : PEAR is no longer the default standard
-- Fixed bug #12321 : wrong detection of missing function docblock
+- Fixed bug #12316pear-12316 : PEAR is no longer the default standard
+- Fixed bug #12321pear-12321 : wrong detection of missing function docblock
+
+pear-12316: https://pear.php.net/bugs/bug.php?id=12316
+pear-12321: https://pear.php.net/bugs/bug.php?id=12321
 
 ## 0.9.0 - 2007-09-24
+
 ### Changed
 - Added a config system for setting config data across phpcs runs
 - You can now change the default coding standard from PEAR to something else
-    - Run: phpcs --config-set default_standard standard
+    - Run: phpcs `--config-set default_standard standard`
 - Added new Zend coding standard to check code against the Zend Framework standards
     - The complete standard is not yet implemented
     - Specify --standard=Zend to use
@@ -5355,46 +6571,55 @@
     - Thanks to Holger Kral for the Code Analyzer sniff
 
 ## 0.8.0 - 2007-08-08
+
 ### Changed
-- Added new XML report format; --report=xml (feature request #11535)
+- Added new XML report format; --report=xml (feature request #11535pear-11535)
     - Thanks to Brett Bieber@saltybeagle for the patch
-- Added new command line argument --ignore to specify a list of files to skip (feature request #11556)
+- Added new command line argument --ignore to specify a list of files to skip (feature request #11556pear-11556)
 - Added PHPCS and MySource coding standards into the core install
 - Scope map no longer gets confused by curly braces that act as string offsets
-- Removed CodeSniffer/SniffException.php as it is no longer used
+- Removed `CodeSniffer/SniffException.php` as it is no longer used
 - Unit tests can now be run directly from a CVS checkout
 - Made private vars and functions protected in PHP_CodeSniffer class so this package can be overridden
 - Added new Metrics category to Generic coding standard
     - Contains Cyclomatic Complexity and Nesting Level sniffs
     - Thanks to Johann-Peter Hartmann for the contribution
-- Added new Generic DisallowTabIndentSniff to throw errors if tabs are used for indentation (feature request #11738)
+- Added new Generic DisallowTabIndentSniff to throw errors if tabs are used for indentation (feature request #11738pear-11738)
     - PEAR and Squiz standards use this new sniff to throw more specific indentation errors
-- Generic MultipleStatementAlignmentSniff has new private var to set a padding size limit (feature request #11555)
-- Generic MultipleStatementAlignmentSniff can now handle assignments that span multiple lines (feature request #11561)
+- Generic MultipleStatementAlignmentSniff has new private var to set a padding size limit (feature request #11555pear-11555)
+- Generic MultipleStatementAlignmentSniff can now handle assignments that span multiple lines (feature request #11561pear-11561)
 - Generic LineLengthSniff now has a max line length after which errors are thrown instead of warnings
     - BC BREAK: Override the protected member var absoluteLineLimit and set it to zero in custom LineLength sniffs
     - Thanks to Johann-Peter Hartmann for the contribution
-- Comment sniff errors about incorrect tag orders are now more descriptive (feature request #11693)
+- Comment sniff errors about incorrect tag orders are now more descriptive (feature request #11693pear-11693)
 
 ### Fixed
-- Fixed bug #11473 : Invalid CamelCaps name when numbers used in names
+- Fixed bug #11473pear-11473 : Invalid CamelCaps name when numbers used in names
+
+pear-11473: https://pear.php.net/bugs/bug.php?id=11473
+pear-11535: https://pear.php.net/bugs/bug.php?id=11535
+pear-11555: https://pear.php.net/bugs/bug.php?id=11555
+pear-11556: https://pear.php.net/bugs/bug.php?id=11556
+pear-11561: https://pear.php.net/bugs/bug.php?id=11561
+pear-11693: https://pear.php.net/bugs/bug.php?id=11693
+pear-11738: https://pear.php.net/bugs/bug.php?id=11738
 
 ## 0.7.0 - 2007-07-02
+
 ### Changed
 - BC BREAK: EOL character is now auto-detected and used instead of hard-coded \n
     - Pattern sniffs must now specify "EOL" instead of "\n" or "\r\n" to use auto-detection
     - Please use $phpcsFile->eolChar to check for newlines instead of hard-coding "\n" or "\r\n"
     - Comment parser classes now require you to pass $phpcsFile as an additional argument
-- BC BREAK: Included and excluded sniffs now require .php extension
-    - Please update your coding standard classes and add ".php" to all sniff entries
-    - See CodeSniffer/Standards/PEAR/PEARCodingStandard.php for an example
-
+- BC BREAK: Included and excluded sniffs now require `.php` extension
+    - Please update your coding standard classes and add `.php` to all sniff entries
+    - See `CodeSniffer/Standards/PEAR/PEARCodingStandard.php` for an example
 - Fixed error where including a directory of sniffs in a coding standard class did not work
-- Coding standard classes can now specify a list of sniffs to exclude as well as include (feature request #11056)
+- Coding standard classes can now specify a list of sniffs to exclude as well as include (feature request #11056pear-11056)
 - Two uppercase characters can now be placed side-by-side in class names in Squiz ValidClassNameSniff
-- SVN tags now allowed in PEAR file doc blocks (feature request #11038)
+- SVN tags now allowed in PEAR file doc blocks (feature request #11038pear-11038)
     - Thanks to Torsten Roehrpear-troehr for the patch
-- Private methods in commenting sniffs and comment parser are now protected (feature request #11087)
+- Private methods in commenting sniffs and comment parser are now protected (feature request #11087pear-11087)
 - Added Generic LineEndingsSniff to check the EOL character of a file
 - PEAR standard now only throws one error per file for incorrect line endings (eg. /r/n)
 - Command line arg -v now shows number of registered sniffs
@@ -5418,36 +6643,53 @@
 - Added Squiz LowercaseClassKeywordsSniff to ensure all class declaration keywords are lowercase
 - Added Squiz LowercaseFunctionKeywordsSniff to ensure all function declaration keywords are lowercase
 - Added Squiz LowercasePHPFunctionsSniff to ensure all calls to inbuilt PHP functions are lowercase
-- Added Squiz CastSpacingSniff to ensure cast statements dont contain whitespace
+- Added Squiz CastSpacingSniff to ensure cast statements don't contain whitespace
 - Errors no longer thrown when checking 0 length files with verbosity on
 
 ### Fixed
-- Fixed bug #11105 : getIncludedSniffs() not working anymore
+- Fixed bug #11105pear-11105 : getIncludedSniffs() not working anymore
     - Thanks to Blair Robertsonpear-adviva for the patch
-- Fixed bug #11120 : Uninitialized string offset in AbstractParser.php on line 200
+- Fixed bug #11120pear-11120 : Uninitialized string offset in `AbstractParser.php` on line 200
+
+pear-11038: https://pear.php.net/bugs/bug.php?id=11038
+pear-11056: https://pear.php.net/bugs/bug.php?id=11056
+pear-11087: https://pear.php.net/bugs/bug.php?id=11087
+pear-11105: https://pear.php.net/bugs/bug.php?id=11105
+pear-11120: https://pear.php.net/bugs/bug.php?id=11120
 
 ## 0.6.0 - 2007-05-15
+
 ### Changed
 - The number of errors and warnings found is now shown for each file while checking the file if verbosity is enabled
-- Now using PHP_EOL instead of hard-coded \n so output looks good on Windows (feature request #10761)
+- Now using PHP_EOL instead of hard-coded \n so output looks good on Windows (feature request #10761pear-10761)
     - Thanks to Carsten Wiedmannpear-cwiedmann for the patch.
-- phpcs now exits with status 0 (no errors) or 1 (errors found) (feature request #10348)
-- Added new -l command line argument to stop recursion into directories (feature request #10979)
+- phpcs now exits with status 0 (no errors) or 1 (errors found) (feature request #10348pear-10348)
+- Added new -l command line argument to stop recursion into directories (feature request #10979pear-10979)
 
 ### Fixed
 - Fixed variable name error causing incorrect error message in Squiz ValidVariableNameSniff
-- Fixed bug #10757 : Error in ControlSignatureSniff
-- Fixed bugs #10751, #10777 : Sniffer class paths handled incorrectly in Windows
+- Fixed bug #10757pear-10757 : Error in ControlSignatureSniff
+- Fixed bugs #10751pear-10751, #10777pear-10777 : Sniffer class paths handled incorrectly in Windows
     - Thanks to Carsten Wiedmannpear-cwiedmann for the patch.
-- Fixed bug #10961 : Error "Last parameter comment requires a blank newline after it" thrown
-- Fixed bug #10983 : phpcs outputs notices when checking invalid PHP
-- Fixed bug #10980 : Incorrect warnings for equals sign
+- Fixed bug #10961pear-10961 : Error "Last parameter comment requires a blank newline after it" thrown
+- Fixed bug #10983pear-10983 : phpcs outputs notices when checking invalid PHP
+- Fixed bug #10980pear-10980 : Incorrect warnings for equals sign
+
+pear-10348: https://pear.php.net/bugs/bug.php?id=10348
+pear-10751: https://pear.php.net/bugs/bug.php?id=10751
+pear-10757: https://pear.php.net/bugs/bug.php?id=10757
+pear-10761: https://pear.php.net/bugs/bug.php?id=10761
+pear-10777: https://pear.php.net/bugs/bug.php?id=10777
+pear-10961: https://pear.php.net/bugs/bug.php?id=10961
+pear-10979: https://pear.php.net/bugs/bug.php?id=10979
+pear-10980: https://pear.php.net/bugs/bug.php?id=10980
+pear-10983: https://pear.php.net/bugs/bug.php?id=10983
 
 ## 0.5.0 - 2007-04-17
+
 ### Changed
 - BC BREAK: Coding standards now require a class to be added so PHP_CodeSniffer can get information from them
     - Please read the end user docs for info about the new class required for all coding standards
-
 - Coding standards can now include sniffs from other standards, or whole standards, without writing new sniff files
 - PHP_CodeSniffer_File::isReference() now correctly returns for references in function declarations
 - PHP_CodeSniffer_File::isReference() now returns false if you don't pass it a T_BITWISE_AND token
@@ -5467,7 +6709,7 @@
 - Errors no longer thrown on __autoload functions in PEAR ValidFunctionNameSniff
 - Errors now thrown for __autoload methods in PEAR ValidFunctionNameSniff
 - Errors now thrown if constructors or destructors have @return tags in Squiz FunctionCommentSniff
-- Errors now thrown if @throws tags dont start with a capital and end with a full stop in Squiz FunctionCommentSniff
+- Errors now thrown if @throws tags don't start with a capital and end with a full stop in Squiz FunctionCommentSniff
 - Errors now thrown for invalid @var tag values in Squiz VariableCommentSniff
 - Errors now thrown for missing doc comment in Squiz VariableCommentSniff
 - Errors now thrown for unspaced operators in FOR loop declarations in Squiz OperatorSpacingSniff
@@ -5475,6 +6717,7 @@
 - Errors now thrown for all missing member variable comments in Squiz VariableCommentSniff
 
 ## 0.4.0 - 2007-02-19
+
 ### Changed
 - Standard name specified with --standard command line argument is no longer case sensitive
 - Long error and warning messages are now wrapped to 80 characters in the full error report (thanks Endre Czirbesz)
@@ -5489,9 +6732,12 @@
 - Fixed missing error when multiple statements are not aligned correctly with object operators
 - Fixed incorrect errors for some PHP special variables in Squiz ValidVariableNameSniff
 - Fixed incorrect errors for arrays that only contain other arrays in Squiz ArrayDeclarationSniff
-- Fixed bug #9844 : throw new Exception(\n accidentally reported as error but it ain't
+- Fixed bug #9844pear-9844 : throw new Exception(\n accidentally reported as error but it ain't
+
+pear-9844: https://pear.php.net/bugs/bug.php?id=9844
 
 ## 0.3.0 - 2007-01-11
+
 ### Changed
 - Updated package.xml to version 2
 - Specifying coding standard on command line is now optional, even if you have multiple standards installed
@@ -5513,14 +6759,20 @@
 - Updated file, class and method comments for all files
 
 ### Fixed
-- Fixed bug #9274 : nested_parenthesis element not set for open and close parenthesis tokens
-- Fixed bug #9411 : too few pattern characters cause incorrect error report
+- Fixed bug #9274pear-9274 : nested_parenthesis element not set for open and close parenthesis tokens
+- Fixed bug #9411pear-9411 : too few pattern characters cause incorrect error report
+
+pear-9411: https://pear.php.net/bugs/bug.php?id=9411
 
 ## 0.2.1 - 2006-11-09
+
 ### Fixed
-- Fixed bug #9274 : nested_parenthesis element not set for open and close parenthesis tokens
+- Fixed bug #9274pear-9274 : nested_parenthesis element not set for open and close parenthesis tokens
+
+pear-9274: https://pear.php.net/bugs/bug.php?id=9274
 
 ## 0.2.0 - 2006-10-13
+
 ### Changed
 - Added a generic standards package that will contain generic sniffs to be used in specific coding standards
     - thanks to Frederic Poeydomenge for the idea
@@ -5539,13 +6791,20 @@
 
 ### Fixed
 - Fixed some coding standard errors
-- Fixed bug #8834 : Massive memory consumption
-- Fixed bug #8836 : path case issues in package.xml
-- Fixed bug #8843 : confusion on nested switch()
-- Fixed bug #8841 : comments taken as whitespace
-- Fixed bug #8884 : another problem with nested switch() statements
+- Fixed bug #8834pear-8834 : Massive memory consumption
+- Fixed bug #8836pear-8836 : path case issues in package.xml
+- Fixed bug #8843pear-8843 : confusion on nested switch()
+- Fixed bug #8841pear-8841 : comments taken as whitespace
+- Fixed bug #8884pear-8884 : another problem with nested switch() statements
+
+pear-8834: https://pear.php.net/bugs/bug.php?id=8834
+pear-8836: https://pear.php.net/bugs/bug.php?id=8836
+pear-8841: https://pear.php.net/bugs/bug.php?id=8841
+pear-8843: https://pear.php.net/bugs/bug.php?id=8843
+pear-8884: https://pear.php.net/bugs/bug.php?id=8884
 
 ## 0.1.1 - 2006-09-25
+
 ### Changed
 - Added unit tests for all PEAR sniffs
 - Exception class now extends from PEAR_Exception
@@ -5554,16 +6813,19 @@
 - Fixed summary report so files without errors but with warnings are not shown when warnings are hidden
 
 ## 0.1.0 - 2006-09-19
+
 ### Changed
 - Reorganised package contents to conform to PEAR standards
 - Changed version numbering to conform to PEAR standards
-- Removed duplicate require_once() of Exception.php from CodeSniffer.php
+- Removed duplicate `require_once()` of `Exception.php` from `CodeSniffer.php`
 
 ## 0.0.5 - 2006-09-18
+
 ### Fixed
-- Fixed .bat file for situation where php.ini cannot be found so include_path is not set
+- Fixed `.bat` file for situation where `php.ini` cannot be found so `include_path` is not set
 
 ## 0.0.4 - 2006-08-28
+
 ### Changed
 - Added .bat file for easier running of PHP_CodeSniffer on Windows
 - Sniff that checks method names now works for PHP4 style code where there is no scope keyword
@@ -5582,6 +6844,7 @@
 - Sniff that checks control structure declarations now gives more descriptive error message
 
 ## 0.0.3 - 2006-08-22
+
 ### Changed
 - Added sniff to check for invalid class and interface names
 - Added sniff to check for invalid function and method names
@@ -5593,11 +6856,12 @@
 - Fixed error where comments were not allowed on the same line as a control structure declaration
 
 ## 0.0.2 - 2006-07-25
+
 ### Changed
 - Removed the including of checked files to stop errors caused by parsing them
 - Removed the use of reflection so checked files do not have to be included
 - Memory usage has been greatly reduced
-- Much faster tokenising and checking times
+- Much faster tokenizing and checking times
 - Reworked the PEAR coding standard sniffs (much faster now)
 - Fix some bugs with the PEAR scope indentation standard
 - Better checking for installed coding standards
@@ -5607,9 +6871,10 @@
 - Added an option to hide warnings from reports
 - Added an option to print verbose output (so you know what is going on)
 - Reordered command line args to put switches first (although order is not enforced)
-- Switches can now be specified together (eg. php -nv) as well as separately (phpcs -n -v)
+- Switches can now be specified together (e.g. `phpcs -nv`) as well as separately (`phpcs -n -v`)
 
 ## 0.0.1 - 2006-07-19
+
 ### Added
 - Initial preview release
 
@@ -5618,6 +6883,8 @@
 -->
 
 Unreleased: https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/master...HEAD
+3.9.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.9.1...3.9.2
+3.9.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.9.0...3.9.1
 3.9.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.8.1...3.9.0
 3.8.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.8.0...3.8.1
 3.8.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.7.2...3.8.0
@@ -5816,9 +7083,11 @@
 @johanderuijter:      https://github.com/johanderuijter
 @johnmaguire:         https://github.com/johnmaguire
 @johnpbloch:          https://github.com/johnpbloch
+@jonmcp:              https://github.com/jonmcp
 @JorisDebonnet:       https://github.com/JorisDebonnet
 @josephzidell:        https://github.com/josephzidell
 @joshdavis11:         https://github.com/joshdavis11
+@jpoliveira08:        https://github.com/jpoliveira08
 @jpuck:               https://github.com/jpuck
 @jrfnl:               https://github.com/jrfnl
 @kdebisschop:         https://github.com/kdebisschop

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 @@
             }
 
             // Skip abstract classes.
-            $reflection = new \ReflectionClass($className);
+            $reflection = new ReflectionClass($className);
             if ($reflection->isAbstract() === true) {
                 continue;
             }
@@ -1381,7 +1385,7 @@
             $this->sniffs$sniffClass = null;
             $this->sniffs$sniffClass = new $sniffClass();
 
-            $sniffCode = Util\Common::getSniffCode($sniffClass);
+            $sniffCode = Common::getSniffCode($sniffClass);
             $this->sniffCodes$sniffCode = $sniffClass;
 
             if ($this->sniffs$sniffClass instanceof DeprecatedSniff) {

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;
+$res = $a  ? : $b;
+$res = $a  ? :  $b;
+
+function foo(string $a = '', ?string $b = ''): ?string {}
+
+// Issue #1605.
+$text = preg_replace_callback(
+		self::CHAR_REFS_REGEX,
+		 'Sanitizer', 'decodeCharReferencesCallback' ,
+		$text, /* limit */ -1, $count );
+
+if (true || /* test */ -1 == $b) {}
+$y = 10 + /* test */ -2;
+
+// Issue #1604.
+Hooks::run( 'ParserOptionsRegister', 
+	&self::$defaults,
+	&self::$inCacheKey,
+	&self::$lazyOptions,
+ );
+
+$x = $foo ? function (): int {
+    return 1;
+} : $bar;
+
+$x = $foo ? function ($foo)
+    // comment
+    : int {
+    return 1;
+} : $bar;
+
+$x = $foo ? function ($foo) use /* comment */ ($bar): int {
+    return 1;
+} : $bar;
+
+$x = !$foo ? $bar : function (): int {
+    return 1;
+};
+
+$a =
+    // Comment.
+    
+        'a',
+        'b',
+    ;
+
+$a =
+// phpcs:ignore Standard.Category.Sniff -- for reasons.
+
+    'a',
+    'b',
+;
+
+$foo = is_array($bar) ? array_map(
+        function () {},
+        $bar
+    ) : $bar;
+
+function bar(): array {}
+
+if ($line{-1} === ':') {
+    $line = substr($line, 0, -1);
+}
+
+$a = $a instanceof $b;
+$a = $a  instanceof  $b;
+$a = ($a)instanceof$b;
+
+fn&($x) => $x;
+
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreSpacingBeforeAssignments false
+$a  =  3;
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreSpacingBeforeAssignments true
+yield -1;
+echo -1;
+$a = -1;
+func(-1);
+$a = -1;
+return -1;
+print -1;
+$a &= -1;
+switch ($a) {
+    case -1:
+}
+$a = $a ?? -1;
+$a .= -1;
+$a /= -1;
+$a = 1 => -1;
+$a = $a == -1;
+$a = $a >= -1;
+$a = $a === -1;
+$a = $a != -1;
+$a = $a !== -1;
+$a = $a <= -1;
+$a = $a <=> -1;
+$a = $a and -1;
+$a = $a or -1;
+$a = $a xor -1;
+$a -= -1;
+$a %= -1;
+$a *= -1;
+$a |= -1;
+$a += -1;
+$a = $a ** -1;
+$a **= -1;
+$a = $a << -1;
+$a <<= -1;
+$a = $a >> -1;
+$a >>= -1;
+$a = (string) -1;
+$a = (array) -1;
+$a = (bool) -1;
+$a = (object) -1;
+$a = (unset) -1;
+$a = (float) -1;
+$a = (int) -1;
+$a ^= -1;
+$a = $a, -1;
+$a = $a-1;
+$a = $a ? -1 : -1;
+
+yield - 1;
+echo - 1;
+$a = - 1;
+func(- 1);
+$a = - 1;
+return - 1;
+print - 1;
+$a &= - 1;
+switch ($a) {
+    case - 1:
+}
+$a = $a ?? - 1;
+$a .= - 1;
+$a /= - 1;
+$a = 1 => - 1;
+$a = $a == - 1;
+$a = $a >= - 1;
+$a = $a === - 1;
+$a = $a != - 1;
+$a = $a !== - 1;
+$a = $a <= - 1;
+$a = $a <=> - 1;
+$a = $a and - 1;
+$a = $a or - 1;
+$a = $a xor - 1;
+$a -= - 1;
+$a %= - 1;
+$a *= - 1;
+$a |= - 1;
+$a += - 1;
+$a = $a ** - 1;
+$a **= - 1;
+$a = $a << - 1;
+$a <<= - 1;
+$a = $a >> - 1;
+$a >>= - 1;
+$a = (string) - 1;
+$a = (array) - 1;
+$a = (bool) - 1;
+$a = (object) - 1;
+$a = (unset) - 1;
+$a = (float) - 1;
+$a = (int) - 1;
+$a ^= - 1;
+$a = $a, - 1;
+$a = $a- 1;
+$a = $a ? - 1 : - 1;
+
+
+yield -$b;
+echo -$b;
+$a = -$b;
+func(-$b);
+$a = -$b;
+return -$b;
+print -$b;
+$a &= -$b;
+switch ($a) {
+    case -$b:
+}
+$a = $a ?? -$b;
+$a .= -$b;
+$a /= -$b;
+$a = 1 => -$b;
+$a = $a == -$b;
+$a = $a >= -$b;
+$a = $a === -$b;
+$a = $a != -$b;
+$a = $a !== -$b;
+$a = $a <= -$b;
+$a = $a <=> -$b;
+$a = $a and -$b;
+$a = $a or -$b;
+$a = $a xor -$b;
+$a -= -$b;
+$a %= -$b;
+$a *= -$b;
+$a |= -$b;
+$a += -$b;
+$a = $a ** -$b;
+$a **= -$b;
+$a = $a << -$b;
+$a <<= -$b;
+$a = $a >> -$b;
+$a >>= -$b;
+$a = (string) -$b;
+$a = (array) -$b;
+$a = (bool) -$b;
+$a = (object) -$b;
+$a = (unset) -$b;
+$a = (float) -$b;
+$a = (int) -$b;
+$a ^= -$b;
+$a = $a, -$b;
+$a = $a-$b;
+$a = $a ? -$b : -$b;
+
+yield - $b;
+echo - $b;
+$a = - $b;
+func(- $b);
+$a = - $b;
+return - $b;
+print - $b;
+$a &= - $b;
+switch ($a) {
+    case - $b:
+}
+$a = $a ?? - $b;
+$a .= - $b;
+$a /= - $b;
+$a = 1 => - $b;
+$a = $a == - $b;
+$a = $a >= - $b;
+$a = $a === - $b;
+$a = $a != - $b;
+$a = $a !== - $b;
+$a = $a <= - $b;
+$a = $a <=> - $b;
+$a = $a and - $b;
+$a = $a or - $b;
+$a = $a xor - $b;
+$a -= - $b;
+$a %= - $b;
+$a *= - $b;
+$a |= - $b;
+$a += - $b;
+$a = $a ** - $b;
+$a **= - $b;
+$a = $a << - $b;
+$a <<= - $b;
+$a = $a >> - $b;
+$a >>= - $b;
+$a = (string) - $b;
+$a = (array) - $b;
+$a = (bool) - $b;
+$a = (object) - $b;
+$a = (unset) - $b;
+$a = (float) - $b;
+$a = (int) - $b;
+$a ^= - $b;
+$a = $a, - $b;
+$a = $a- $b;
+$a = $a ? - $b : - $b;
+
+exit -1;
+
+$cl = function ($boo =-1) {};
+$cl = function ($boo =+1) {};
+$fn = fn ($boo =-1) => $boo;
+$fn = fn ($boo =+1) => $boo;
+
+$fn = static fn(DateTime $a, DateTime $b): int => -($a->getTimestamp() <=> $b->getTimestamp());
+
+$a = 'a '.-MY_CONSTANT;
+$a = 'a '.-$b;
+$a = 'a '.- MY_CONSTANT;
+$a = 'a '.- $b;
+
+match ($a) {
+    'a' => -1,
+    'b', 'c', 'd' => -2,
+    default => -3,
+};
+
+$foo = $var
+    ? 10
+    : true;
+
+// Safeguard that a non-fixable error is thrown when there is a new line before the operator,
+// but the last non-whitespace token before the operator is a comment token.
+$foo = $var // Comment
+    ? false /* Comment */
+    : true;
+
+$foo = $var // phpcs: ignore Stnd.Cat.Sniff -- for reasons.
+
+
+    ? $something /**
+     * Don't ask, but someone might have a docblock between the lines. It's valid PHP after all.
+     */
+
+
+    : true;
+
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines true
+$foo = $var // Comment
+    ? false // Comment
+    : true;
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines false

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.
+$text = preg_replace_callback(
+		self::CHAR_REFS_REGEX,
+		 'Sanitizer', 'decodeCharReferencesCallback' ,
+		$text, /* limit */ -1, $count );
+
+if (true || /* test */ -1 == $b) {}
+$y = 10 + /* test */ -2;
+
+// Issue #1604.
+Hooks::run( 'ParserOptionsRegister', 
+	&self::$defaults,
+	&self::$inCacheKey,
+	&self::$lazyOptions,
+ );
+
+$x = $foo ? function (): int {
+    return 1;
+} : $bar;
+
+$x = $foo ? function ($foo)
+    // comment
+    : int {
+    return 1;
+} : $bar;
+
+$x = $foo ? function ($foo) use /* comment */ ($bar): int {
+    return 1;
+} : $bar;
+
+$x = !$foo ? $bar : function (): int {
+    return 1;
+};
+
+$a =
+    // Comment.
+    
+        'a',
+        'b',
+    ;
+
+$a =
+// phpcs:ignore Standard.Category.Sniff -- for reasons.
+
+    'a',
+    'b',
+;
+
+$foo = is_array($bar) ? array_map(
+        function () {},
+        $bar
+    ) : $bar;
+
+function bar(): array {}
+
+if ($line{-1} === ':') {
+    $line = substr($line, 0, -1);
+}
+
+$a = $a instanceof $b;
+$a = $a instanceof $b;
+$a = ($a) instanceof $b;
+
+fn&($x) => $x;
+
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreSpacingBeforeAssignments false
+$a = 3;
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreSpacingBeforeAssignments true
+yield -1;
+echo -1;
+$a = -1;
+func(-1);
+$a = -1;
+return -1;
+print -1;
+$a &= -1;
+switch ($a) {
+    case -1:
+}
+$a = $a ?? -1;
+$a .= -1;
+$a /= -1;
+$a = 1 => -1;
+$a = $a == -1;
+$a = $a >= -1;
+$a = $a === -1;
+$a = $a != -1;
+$a = $a !== -1;
+$a = $a <= -1;
+$a = $a <=> -1;
+$a = $a and -1;
+$a = $a or -1;
+$a = $a xor -1;
+$a -= -1;
+$a %= -1;
+$a *= -1;
+$a |= -1;
+$a += -1;
+$a = $a ** -1;
+$a **= -1;
+$a = $a << -1;
+$a <<= -1;
+$a = $a >> -1;
+$a >>= -1;
+$a = (string) -1;
+$a = (array) -1;
+$a = (bool) -1;
+$a = (object) -1;
+$a = (unset) -1;
+$a = (float) -1;
+$a = (int) -1;
+$a ^= -1;
+$a = $a, -1;
+$a = $a-1;
+$a = $a ? -1 : -1;
+
+yield - 1;
+echo - 1;
+$a = - 1;
+func(- 1);
+$a = - 1;
+return - 1;
+print - 1;
+$a &= - 1;
+switch ($a) {
+    case - 1:
+}
+$a = $a ?? - 1;
+$a .= - 1;
+$a /= - 1;
+$a = 1 => - 1;
+$a = $a == - 1;
+$a = $a >= - 1;
+$a = $a === - 1;
+$a = $a != - 1;
+$a = $a !== - 1;
+$a = $a <= - 1;
+$a = $a <=> - 1;
+$a = $a and - 1;
+$a = $a or - 1;
+$a = $a xor - 1;
+$a -= - 1;
+$a %= - 1;
+$a *= - 1;
+$a |= - 1;
+$a += - 1;
+$a = $a ** - 1;
+$a **= - 1;
+$a = $a << - 1;
+$a <<= - 1;
+$a = $a >> - 1;
+$a >>= - 1;
+$a = (string) - 1;
+$a = (array) - 1;
+$a = (bool) - 1;
+$a = (object) - 1;
+$a = (unset) - 1;
+$a = (float) - 1;
+$a = (int) - 1;
+$a ^= - 1;
+$a = $a, - 1;
+$a = $a- 1;
+$a = $a ? - 1 : - 1;
+
+
+yield -$b;
+echo -$b;
+$a = -$b;
+func(-$b);
+$a = -$b;
+return -$b;
+print -$b;
+$a &= -$b;
+switch ($a) {
+    case -$b:
+}
+$a = $a ?? -$b;
+$a .= -$b;
+$a /= -$b;
+$a = 1 => -$b;
+$a = $a == -$b;
+$a = $a >= -$b;
+$a = $a === -$b;
+$a = $a != -$b;
+$a = $a !== -$b;
+$a = $a <= -$b;
+$a = $a <=> -$b;
+$a = $a and -$b;
+$a = $a or -$b;
+$a = $a xor -$b;
+$a -= -$b;
+$a %= -$b;
+$a *= -$b;
+$a |= -$b;
+$a += -$b;
+$a = $a ** -$b;
+$a **= -$b;
+$a = $a << -$b;
+$a <<= -$b;
+$a = $a >> -$b;
+$a >>= -$b;
+$a = (string) -$b;
+$a = (array) -$b;
+$a = (bool) -$b;
+$a = (object) -$b;
+$a = (unset) -$b;
+$a = (float) -$b;
+$a = (int) -$b;
+$a ^= -$b;
+$a = $a, -$b;
+$a = $a-$b;
+$a = $a ? -$b : -$b;
+
+yield - $b;
+echo - $b;
+$a = - $b;
+func(- $b);
+$a = - $b;
+return - $b;
+print - $b;
+$a &= - $b;
+switch ($a) {
+    case - $b:
+}
+$a = $a ?? - $b;
+$a .= - $b;
+$a /= - $b;
+$a = 1 => - $b;
+$a = $a == - $b;
+$a = $a >= - $b;
+$a = $a === - $b;
+$a = $a != - $b;
+$a = $a !== - $b;
+$a = $a <= - $b;
+$a = $a <=> - $b;
+$a = $a and - $b;
+$a = $a or - $b;
+$a = $a xor - $b;
+$a -= - $b;
+$a %= - $b;
+$a *= - $b;
+$a |= - $b;
+$a += - $b;
+$a = $a ** - $b;
+$a **= - $b;
+$a = $a << - $b;
+$a <<= - $b;
+$a = $a >> - $b;
+$a >>= - $b;
+$a = (string) - $b;
+$a = (array) - $b;
+$a = (bool) - $b;
+$a = (object) - $b;
+$a = (unset) - $b;
+$a = (float) - $b;
+$a = (int) - $b;
+$a ^= - $b;
+$a = $a, - $b;
+$a = $a- $b;
+$a = $a ? - $b : - $b;
+
+exit -1;
+
+$cl = function ($boo =-1) {};
+$cl = function ($boo =+1) {};
+$fn = fn ($boo =-1) => $boo;
+$fn = fn ($boo =+1) => $boo;
+
+$fn = static fn(DateTime $a, DateTime $b): int => -($a->getTimestamp() <=> $b->getTimestamp());
+
+$a = 'a '.-MY_CONSTANT;
+$a = 'a '.-$b;
+$a = 'a '.- MY_CONSTANT;
+$a = 'a '.- $b;
+
+match ($a) {
+    'a' => -1,
+    'b', 'c', 'd' => -2,
+    default => -3,
+};
+
+$foo = $var ? 10 : true;
+
+// Safeguard that a non-fixable error is thrown when there is a new line before the operator,
+// but the last non-whitespace token before the operator is a comment token.
+$foo = $var // Comment
+    ? false /* Comment */
+    : true;
+
+$foo = $var // phpcs: ignore Stnd.Cat.Sniff -- for reasons.
+
+
+    ? $something /**
+     * Don't ask, but someone might have a docblock between the lines. It's valid PHP after all.
+     */
+
+
+    : true;
+
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines true
+$foo = $var // Comment
+    ? false // Comment
+    : true;
+// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreNewlines false

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;
-$res = $a  ? : $b;
-$res = $a  ? :  $b;
-
-function foo(string $a = '', ?string $b = ''): ?string {}
-
-// Issue #1605.
-$text = preg_replace_callback(
-		self::CHAR_REFS_REGEX,
-		 'Sanitizer', 'decodeCharReferencesCallback' ,
-		$text, /* limit */ -1, $count );
-
-if (true || /* test */ -1 == $b) {}
-$y = 10 + /* test */ -2;
-
-// Issue #1604.
-Hooks::run( 'ParserOptionsRegister', 
-	&self::$defaults,
-	&self::$inCacheKey,
-	&self::$lazyOptions,
- );
-
-$x = $foo ? function (): int {
-    return 1;
-} : $bar;
-
-$x = $foo ? function ($foo)
-    // comment
-    : int {
-    return 1;
-} : $bar;
-
-$x = $foo ? function ($foo) use /* comment */ ($bar): int {
-    return 1;
-} : $bar;
-
-$x = !$foo ? $bar : function (): int {
-    return 1;
-};
-
-$a =
-    // Comment.
-    
-        'a',
-        'b',
-    ;
-
-$a =
-// phpcs:ignore Standard.Category.Sniff -- for reasons.
-
-    'a',
-    'b',
-;
-
-$foo = is_array($bar) ? array_map(
-        function () {},
-        $bar
-    ) : $bar;
-
-function bar(): array {}
-
-if ($line{-1} === ':') {
-    $line = substr($line, 0, -1);
-}
-
-$a = $a instanceof $b;
-$a = $a  instanceof  $b;
-$a = ($a)instanceof$b;
-
-fn&($x) => $x;
-
-// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreSpacingBeforeAssignments false
-$a  =  3;
-// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreSpacingBeforeAssignments true
-yield -1;
-echo -1;
-$a = -1;
-func(-1);
-$a = -1;
-return -1;
-print -1;
-$a &= -1;
-switch ($a) {
-    case -1:
-}
-$a = $a ?? -1;
-$a .= -1;
-$a /= -1;
-$a = 1 => -1;
-$a = $a == -1;
-$a = $a >= -1;
-$a = $a === -1;
-$a = $a != -1;
-$a = $a !== -1;
-$a = $a <= -1;
-$a = $a <=> -1;
-$a = $a and -1;
-$a = $a or -1;
-$a = $a xor -1;
-$a -= -1;
-$a %= -1;
-$a *= -1;
-$a |= -1;
-$a += -1;
-$a = $a ** -1;
-$a **= -1;
-$a = $a << -1;
-$a <<= -1;
-$a = $a >> -1;
-$a >>= -1;
-$a = (string) -1;
-$a = (array) -1;
-$a = (bool) -1;
-$a = (object) -1;
-$a = (unset) -1;
-$a = (float) -1;
-$a = (int) -1;
-$a ^= -1;
-$a = $a, -1;
-$a = $a-1;
-$a = $a ? -1 : -1;
-
-yield - 1;
-echo - 1;
-$a = - 1;
-func(- 1);
-$a = - 1;
-return - 1;
-print - 1;
-$a &= - 1;
-switch ($a) {
-    case - 1:
-}
-$a = $a ?? - 1;
-$a .= - 1;
-$a /= - 1;
-$a = 1 => - 1;
-$a = $a == - 1;
-$a = $a >= - 1;
-$a = $a === - 1;
-$a = $a != - 1;
-$a = $a !== - 1;
-$a = $a <= - 1;
-$a = $a <=> - 1;
-$a = $a and - 1;
-$a = $a or - 1;
-$a = $a xor - 1;
-$a -= - 1;
-$a %= - 1;
-$a *= - 1;
-$a |= - 1;
-$a += - 1;
-$a = $a ** - 1;
-$a **= - 1;
-$a = $a << - 1;
-$a <<= - 1;
-$a = $a >> - 1;
-$a >>= - 1;
-$a = (string) - 1;
-$a = (array) - 1;
-$a = (bool) - 1;
-$a = (object) - 1;
-$a = (unset) - 1;
-$a = (float) - 1;
-$a = (int) - 1;
-$a ^= - 1;
-$a = $a, - 1;
-$a = $a- 1;
-$a = $a ? - 1 : - 1;
-
-
-yield -$b;
-echo -$b;
-$a = -$b;
-func(-$b);
-$a = -$b;
-return -$b;
-print -$b;
-$a &= -$b;
-switch ($a) {
-    case -$b:
-}
-$a = $a ?? -$b;
-$a .= -$b;
-$a /= -$b;
-$a = 1 => -$b;
-$a = $a == -$b;
-$a = $a >= -$b;
-$a = $a === -$b;
-$a = $a != -$b;
-$a = $a !== -$b;
-$a = $a <= -$b;
-$a = $a <=> -$b;
-$a = $a and -$b;
-$a = $a or -$b;
-$a = $a xor -$b;
-$a -= -$b;
-$a %= -$b;
-$a *= -$b;
-$a |= -$b;
-$a += -$b;
-$a = $a ** -$b;
-$a **= -$b;
-$a = $a << -$b;
-$a <<= -$b;
-$a = $a >> -$b;
-$a >>= -$b;
-$a = (string) -$b;
-$a = (array) -$b;
-$a = (bool) -$b;
-$a = (object) -$b;
-$a = (unset) -$b;
-$a = (float) -$b;
-$a = (int) -$b;
-$a ^= -$b;
-$a = $a, -$b;
-$a = $a-$b;
-$a = $a ? -$b : -$b;
-
-yield - $b;
-echo - $b;
-$a = - $b;
-func(- $b);
-$a = - $b;
-return - $b;
-print - $b;
-$a &= - $b;
-switch ($a) {
-    case - $b:
-}
-$a = $a ?? - $b;
-$a .= - $b;
-$a /= - $b;
-$a = 1 => - $b;
-$a = $a == - $b;
-$a = $a >= - $b;
-$a = $a === - $b;
-$a = $a != - $b;
-$a = $a !== - $b;
-$a = $a <= - $b;
-$a = $a <=> - $b;
-$a = $a and - $b;
-$a = $a or - $b;
-$a = $a xor - $b;
-$a -= - $b;
-$a %= - $b;
-$a *= - $b;
-$a |= - $b;
-$a += - $b;
-$a = $a ** - $b;
-$a **= - $b;
-$a = $a << - $b;
-$a <<= - $b;
-$a = $a >> - $b;
-$a >>= - $b;
-$a = (string) - $b;
-$a = (array) - $b;
-$a = (bool) - $b;
-$a = (object) - $b;
-$a = (unset) - $b;
-$a = (float) - $b;
-$a = (int) - $b;
-$a ^= - $b;
-$a = $a, - $b;
-$a = $a- $b;
-$a = $a ? - $b : - $b;
-
-exit -1;
-
-$cl = function ($boo =-1) {};
-$cl = function ($boo =+1) {};
-$fn = fn ($boo =-1) => $boo;
-$fn = fn ($boo =+1) => $boo;
-
-$fn = static fn(DateTime $a, DateTime $b): int => -($a->getTimestamp() <=> $b->getTimestamp());
-
-$a = 'a '.-MY_CONSTANT;
-$a = 'a '.-$b;
-$a = 'a '.- MY_CONSTANT;
-$a = 'a '.- $b;
-
-match ($a) {
-    'a' => -1,
-    'b', 'c', 'd' => -2,
-    default => -3,
-};
-
-/* Intentional parse error. This has to be the last test in the file. */
-$a = 10 +

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.
-$text = preg_replace_callback(
-		self::CHAR_REFS_REGEX,
-		 'Sanitizer', 'decodeCharReferencesCallback' ,
-		$text, /* limit */ -1, $count );
-
-if (true || /* test */ -1 == $b) {}
-$y = 10 + /* test */ -2;
-
-// Issue #1604.
-Hooks::run( 'ParserOptionsRegister', 
-	&self::$defaults,
-	&self::$inCacheKey,
-	&self::$lazyOptions,
- );
-
-$x = $foo ? function (): int {
-    return 1;
-} : $bar;
-
-$x = $foo ? function ($foo)
-    // comment
-    : int {
-    return 1;
-} : $bar;
-
-$x = $foo ? function ($foo) use /* comment */ ($bar): int {
-    return 1;
-} : $bar;
-
-$x = !$foo ? $bar : function (): int {
-    return 1;
-};
-
-$a =
-    // Comment.
-    
-        'a',
-        'b',
-    ;
-
-$a =
-// phpcs:ignore Standard.Category.Sniff -- for reasons.
-
-    'a',
-    'b',
-;
-
-$foo = is_array($bar) ? array_map(
-        function () {},
-        $bar
-    ) : $bar;
-
-function bar(): array {}
-
-if ($line{-1} === ':') {
-    $line = substr($line, 0, -1);
-}
-
-$a = $a instanceof $b;
-$a = $a instanceof $b;
-$a = ($a) instanceof $b;
-
-fn&($x) => $x;
-
-// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreSpacingBeforeAssignments false
-$a = 3;
-// phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreSpacingBeforeAssignments true
-yield -1;
-echo -1;
-$a = -1;
-func(-1);
-$a = -1;
-return -1;
-print -1;
-$a &= -1;
-switch ($a) {
-    case -1:
-}
-$a = $a ?? -1;
-$a .= -1;
-$a /= -1;
-$a = 1 => -1;
-$a = $a == -1;
-$a = $a >= -1;
-$a = $a === -1;
-$a = $a != -1;
-$a = $a !== -1;
-$a = $a <= -1;
-$a = $a <=> -1;
-$a = $a and -1;
-$a = $a or -1;
-$a = $a xor -1;
-$a -= -1;
-$a %= -1;
-$a *= -1;
-$a |= -1;
-$a += -1;
-$a = $a ** -1;
-$a **= -1;
-$a = $a << -1;
-$a <<= -1;
-$a = $a >> -1;
-$a >>= -1;
-$a = (string) -1;
-$a = (array) -1;
-$a = (bool) -1;
-$a = (object) -1;
-$a = (unset) -1;
-$a = (float) -1;
-$a = (int) -1;
-$a ^= -1;
-$a = $a, -1;
-$a = $a-1;
-$a = $a ? -1 : -1;
-
-yield - 1;
-echo - 1;
-$a = - 1;
-func(- 1);
-$a = - 1;
-return - 1;
-print - 1;
-$a &= - 1;
-switch ($a) {
-    case - 1:
-}
-$a = $a ?? - 1;
-$a .= - 1;
-$a /= - 1;
-$a = 1 => - 1;
-$a = $a == - 1;
-$a = $a >= - 1;
-$a = $a === - 1;
-$a = $a != - 1;
-$a = $a !== - 1;
-$a = $a <= - 1;
-$a = $a <=> - 1;
-$a = $a and - 1;
-$a = $a or - 1;
-$a = $a xor - 1;
-$a -= - 1;
-$a %= - 1;
-$a *= - 1;
-$a |= - 1;
-$a += - 1;
-$a = $a ** - 1;
-$a **= - 1;
-$a = $a << - 1;
-$a <<= - 1;
-$a = $a >> - 1;
-$a >>= - 1;
-$a = (string) - 1;
-$a = (array) - 1;
-$a = (bool) - 1;
-$a = (object) - 1;
-$a = (unset) - 1;
-$a = (float) - 1;
-$a = (int) - 1;
-$a ^= - 1;
-$a = $a, - 1;
-$a = $a- 1;
-$a = $a ? - 1 : - 1;
-
-
-yield -$b;
-echo -$b;
-$a = -$b;
-func(-$b);
-$a = -$b;
-return -$b;
-print -$b;
-$a &= -$b;
-switch ($a) {
-    case -$b:
-}
-$a = $a ?? -$b;
-$a .= -$b;
-$a /= -$b;
-$a = 1 => -$b;
-$a = $a == -$b;
-$a = $a >= -$b;
-$a = $a === -$b;
-$a = $a != -$b;
-$a = $a !== -$b;
-$a = $a <= -$b;
-$a = $a <=> -$b;
-$a = $a and -$b;
-$a = $a or -$b;
-$a = $a xor -$b;
-$a -= -$b;
-$a %= -$b;
-$a *= -$b;
-$a |= -$b;
-$a += -$b;
-$a = $a ** -$b;
-$a **= -$b;
-$a = $a << -$b;
-$a <<= -$b;
-$a = $a >> -$b;
-$a >>= -$b;
-$a = (string) -$b;
-$a = (array) -$b;
-$a = (bool) -$b;
-$a = (object) -$b;
-$a = (unset) -$b;
-$a = (float) -$b;
-$a = (int) -$b;
-$a ^= -$b;
-$a = $a, -$b;
-$a = $a-$b;
-$a = $a ? -$b : -$b;
-
-yield - $b;
-echo - $b;
-$a = - $b;
-func(- $b);
-$a = - $b;
-return - $b;
-print - $b;
-$a &= - $b;
-switch ($a) {
-    case - $b:
-}
-$a = $a ?? - $b;
-$a .= - $b;
-$a /= - $b;
-$a = 1 => - $b;
-$a = $a == - $b;
-$a = $a >= - $b;
-$a = $a === - $b;
-$a = $a != - $b;
-$a = $a !== - $b;
-$a = $a <= - $b;
-$a = $a <=> - $b;
-$a = $a and - $b;
-$a = $a or - $b;
-$a = $a xor - $b;
-$a -= - $b;
-$a %= - $b;
-$a *= - $b;
-$a |= - $b;
-$a += - $b;
-$a = $a ** - $b;
-$a **= - $b;
-$a = $a << - $b;
-$a <<= - $b;
-$a = $a >> - $b;
-$a >>= - $b;
-$a = (string) - $b;
-$a = (array) - $b;
-$a = (bool) - $b;
-$a = (object) - $b;
-$a = (unset) - $b;
-$a = (float) - $b;
-$a = (int) - $b;
-$a ^= - $b;
-$a = $a, - $b;
-$a = $a- $b;
-$a = $a ? - $b : - $b;
-
-exit -1;
-
-$cl = function ($boo =-1) {};
-$cl = function ($boo =+1) {};
-$fn = fn ($boo =-1) => $boo;
-$fn = fn ($boo =+1) => $boo;
-
-$fn = static fn(DateTime $a, DateTime $b): int => -($a->getTimestamp() <=> $b->getTimestamp());
-
-$a = 'a '.-MY_CONSTANT;
-$a = 'a '.-$b;
-$a = 'a '.- MY_CONSTANT;
-$a = 'a '.- $b;
-
-match ($a) {
-    'a' => -1,
-    'b', 'c', 'd' => -2,
-    default => -3,
-};
-
-/* Intentional parse error. This has to be the last test in the file. */
-$a = 10 +

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) {
                         continue;
                     }
 
@@ -1872,7 +1873,7 @@
                     }
 
                     if (is_array($tokens$x) === false
-                        || isset(Util\Tokens::$emptyTokens$tokens$x0) === false
+                        || isset(Tokens::$emptyTokens$tokens$x0) === false
                     ) {
                         // Non-empty, non-comma content.
                         break;
@@ -1945,7 +1946,7 @@
                         $tokenType = $tokens$i;
                     }
 
-                    if (isset(Util\Tokens::$emptyTokens$tokenType) === true) {
+                    if (isset(Tokens::$emptyTokens$tokenType) === true) {
                         continue;
                     }
 
@@ -2014,7 +2015,7 @@
                     }
 
                     if ($prevNonEmpty === null
-                        && isset(Util\Tokens::$emptyTokens$tokenType) === false
+                        && isset(Tokens::$emptyTokens$tokenType) === false
                     ) {
                         // Found the previous non-empty token.
                         if ($tokenType === ':' || $tokenType === ',' || $tokenType === T_ATTRIBUTE_END) {
@@ -2033,7 +2034,7 @@
 
                     if ($tokenType === T_FUNCTION
                         || $tokenType === T_FN
-                        || isset(Util\Tokens::$methodPrefixes$tokenType) === true
+                        || isset(Tokens::$methodPrefixes$tokenType) === true
                         || $tokenType === T_VAR
                     ) {
                         if (PHP_CODESNIFFER_VERBOSITY > 1) {
@@ -2055,7 +2056,7 @@
                         break;
                     }
 
-                    if (isset(Util\Tokens::$emptyTokens$tokenType) === false) {
+                    if (isset(Tokens::$emptyTokens$tokenType) === false) {
                         $lastSeenNonEmpty = $tokenType;
                     }
                 }//end for
@@ -2078,7 +2079,7 @@
                 && $token0 !== T_STRING
                 && $token0 !== T_VARIABLE
                 && $token0 !== T_DOLLAR
-                && isset(Util\Tokens::$emptyTokens$token0) === false
+                && isset(Tokens::$emptyTokens$token0) === false
             ) {
                 $newToken            = ;
                 $newToken'code'    = T_STRING;
@@ -2138,7 +2139,7 @@
                 if ($parenthesisCloser !== false) {
                     for ($x = ($parenthesisCloser + 1); $x < $numTokens; $x++) {
                         if (is_array($tokens$x) === false
-                            || isset(Util\Tokens::$emptyTokens$tokens$x0) === false
+                            || isset(Tokens::$emptyTokens$tokens$x0) === false
                         ) {
                             // Non-empty content.
                             if (is_array($tokens$x) === true && $tokens$x0 === T_USE) {
@@ -2161,7 +2162,7 @@
                         // Find the start of the return type.
                         for ($x += 1; $x < $numTokens; $x++) {
                             if (is_array($tokens$x) === true
-                                && isset(Util\Tokens::$emptyTokens$tokens$x0) === true
+                                && isset(Tokens::$emptyTokens$tokens$x0) === true
                             ) {
                                 // Whitespace or comments before the return type.
                                 continue;
@@ -2273,7 +2274,7 @@
                 $tokenLines = explode($this->eolChar, $token1);
                 $numLines   = count($tokenLines);
                 $newToken   = 
-                    'type'    => Util\Tokens::tokenName($token0),
+                    'type'    => Tokens::tokenName($token0),
                     'code'    => $token0,
                     'content' => '',
                 ;
@@ -2305,7 +2306,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;
                             }
@@ -2333,7 +2334,7 @@
                     } else if ($finalTokens$lastNotEmptyToken'content' === '&') {
                         // Function names for functions declared to return by reference.
                         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;
                             }
 
@@ -2347,7 +2348,7 @@
                         // Keywords with special PHPCS token when used as a function call.
                         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;
                             }
@@ -2404,7 +2405,7 @@
                     // Get the previous non-empty token.
                     for ($i = ($stackPtr - 1); $i > 0; $i--) {
                         if (is_array($tokens$i) === false
-                            || isset(Util\Tokens::$emptyTokens$tokens$i0) === false
+                            || isset(Tokens::$emptyTokens$tokens$i0) === false
                         ) {
                             break;
                         }
@@ -2511,7 +2512,7 @@
                 if ($newToken'code' === T_ARRAY) {
                     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
                         ) {
                             // Non-empty content.
                             break;
@@ -2613,7 +2614,7 @@
 
                 if (isset($this->tokens$i'scope_opener') === true) {
                     for ($x = ($i + 1); $x < $numTokens; $x++) {
-                        if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === false
+                        if (isset(Tokens::$emptyTokens$this->tokens$x'code') === false
                             && $this->tokens$x'code' !== T_BITWISE_AND
                         ) {
                             break;
@@ -2649,7 +2650,7 @@
                 */
 
                 for ($x = ($i + 1); $x < $numTokens; $x++) {
-                    if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === false) {
+                    if (isset(Tokens::$emptyTokens$this->tokens$x'code') === false) {
                         break;
                     }
                 }
@@ -2700,7 +2701,7 @@
             } else if ($this->tokens$i'code' === T_FN && isset($this->tokens($i + 1)) === true) {
                 // Possible arrow function.
                 for ($x = ($i + 1); $x < $numTokens; $x++) {
-                    if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === false
+                    if (isset(Tokens::$emptyTokens$this->tokens$x'code') === false
                         && $this->tokens$x'code' !== T_BITWISE_AND
                     ) {
                         // Non-whitespace content.
@@ -2709,7 +2710,7 @@
                 }
 
                 if (isset($this->tokens$x) === true && $this->tokens$x'code' === T_OPEN_PARENTHESIS) {
-                    $ignore  = Util\Tokens::$emptyTokens;
+                    $ignore  = Tokens::$emptyTokens;
                     $ignore += 
                         T_ARRAY             => T_ARRAY,
                         T_CALLABLE          => T_CALLABLE,
@@ -2717,6 +2718,8 @@
                         T_NAMESPACE         => T_NAMESPACE,
                         T_NS_SEPARATOR      => T_NS_SEPARATOR,
                         T_NULL              => T_NULL,
+                        T_TRUE              => T_TRUE,
+                        T_FALSE             => T_FALSE,
                         T_NULLABLE          => T_NULLABLE,
                         T_PARENT            => T_PARENT,
                         T_SELF              => T_SELF,
@@ -2768,7 +2771,7 @@
                                 }
 
                                 for ($lastNonEmpty = ($scopeCloser - 1); $lastNonEmpty > $arrow; $lastNonEmpty--) {
-                                    if (isset(Util\Tokens::$emptyTokens$this->tokens$lastNonEmpty'code') === false) {
+                                    if (isset(Tokens::$emptyTokens$this->tokens$lastNonEmpty'code') === false) {
                                         $scopeCloser = $lastNonEmpty;
                                         break 2;
                                     }
@@ -2783,7 +2786,7 @@
                                     && $this->tokens$scopeCloser'bracket_opener' < $arrow))
                                 ) {
                                     for ($lastNonEmpty = ($scopeCloser - 1); $lastNonEmpty > $arrow; $lastNonEmpty--) {
-                                        if (isset(Util\Tokens::$emptyTokens$this->tokens$lastNonEmpty'code') === false) {
+                                        if (isset(Tokens::$emptyTokens$this->tokens$lastNonEmpty'code') === false) {
                                             $scopeCloser = $lastNonEmpty;
                                             break;
                                         }
@@ -2912,7 +2915,7 @@
                     T_CONSTANT_ENCAPSED_STRING => T_CONSTANT_ENCAPSED_STRING,
                     T_DOUBLE_QUOTED_STRING     => T_DOUBLE_QUOTED_STRING,
                 ;
-                $allowed     += Util\Tokens::$magicConstants;
+                $allowed     += Tokens::$magicConstants;
 
                 for ($x = ($i - 1); $x >= 0; $x--) {
                     // If we hit a scope opener, the statement has ended
@@ -2923,11 +2926,11 @@
                         break;
                     }
 
-                    if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === false) {
+                    if (isset(Tokens::$emptyTokens$this->tokens$x'code') === false) {
                         // Allow for control structures without braces.
                         if (($this->tokens$x'code' === T_CLOSE_PARENTHESIS
                             && isset($this->tokens$x'parenthesis_owner') === true
-                            && isset(Util\Tokens::$scopeOpeners$this->tokens$this->tokens$x'parenthesis_owner''code') === true)
+                            && isset(Tokens::$scopeOpeners$this->tokens$this->tokens$x'parenthesis_owner''code') === true)
                             || isset($allowed$this->tokens$x'code') === false
                         ) {
                             $isShortArray = true;
@@ -2989,7 +2992,7 @@
                         T_OPEN_SHORT_ARRAY    => T_OPEN_SHORT_ARRAY,
                         T_DOUBLE_ARROW        => T_DOUBLE_ARROW,
                     ;
-                    $searchFor += Util\Tokens::$scopeOpeners;
+                    $searchFor += Tokens::$scopeOpeners;
 
                     for ($x = ($this->tokens$i'scope_opener' + 1); $x < $this->tokens$i'scope_closer'; $x++) {
                         if (isset($searchFor$this->tokens$x'code') === false) {
@@ -3049,7 +3052,7 @@
                 $typeTokenCount = 0;
 
                 for ($x = ($i + 1); $x < $numTokens; $x++) {
-                    if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === true) {
+                    if (isset(Tokens::$emptyTokens$this->tokens$x'code') === true) {
                         continue;
                     }
 
@@ -3114,7 +3117,7 @@
                 $confirmed      = false;
 
                 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;
                     }
 
@@ -3144,7 +3147,7 @@
                     }
 
                     if ($suspectedType === 'property or parameter'
-                        && (isset(Util\Tokens::$scopeModifiers$this->tokens$x'code') === true
+                        && (isset(Tokens::$scopeModifiers$this->tokens$x'code') === true
                         || $this->tokens$x'code' === T_VAR
                         || $this->tokens$x'code' === T_STATIC
                         || $this->tokens$x'code' === T_READONLY)
@@ -3172,7 +3175,7 @@
                         // had additional processing done.
                         if (isset($this->tokens$last'parenthesis_opener') === true) {
                             for ($x = ($this->tokens$last'parenthesis_opener' - 1); $x >= 0; $x--) {
-                                if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === true) {
+                                if (isset(Tokens::$emptyTokens$this->tokens$x'code') === true) {
                                     continue;
                                 }
 
@@ -3181,7 +3184,7 @@
 
                             if ($this->tokens$x'code' === T_FN) {
                                 for (--$x; $x >= 0; $x--) {
-                                    if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === true
+                                    if (isset(Tokens::$emptyTokens$this->tokens$x'code') === true
                                         || $this->tokens$x'code' === T_BITWISE_AND
                                     ) {
                                         continue;
@@ -3228,7 +3231,7 @@
                 continue;
             } else if ($this->tokens$i'code' === T_STATIC) {
                 for ($x = ($i - 1); $x > 0; $x--) {
-                    if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === false) {
+                    if (isset(Tokens::$emptyTokens$this->tokens$x'code') === false) {
                         break;
                     }
                 }
@@ -3249,7 +3252,7 @@
                 || $this->tokens$i'code' === T_NULL
             ) {
                 for ($x = ($i + 1); $x < $numTokens; $x++) {
-                    if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === false) {
+                    if (isset(Tokens::$emptyTokens$this->tokens$x'code') === false) {
                         // Non-whitespace content.
                         break;
                     }
@@ -3285,7 +3288,7 @@
             // opening this case statement and the opener and closer are
             // probably set incorrectly.
             for ($x = ($scopeOpener + 1); $x < $numTokens; $x++) {
-                if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === false) {
+                if (isset(Tokens::$emptyTokens$this->tokens$x'code') === false) {
                     // Non-whitespace content.
                     break;
                 }
@@ -3389,14 +3392,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, ',');
@@ -3484,7 +3487,7 @@
         } else {
             $newToken = 
                 'code' => $token0,
-                'type' => Util\Tokens::tokenName($token0),
+                'type' => Tokens::tokenName($token0),
             ;
 
             self::$resolveTokenCache$token0 = $newToken;

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

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";
+        $expected .= '-'."\n";
+        $expected .= '-if ($var) {'."\n";
+        $expected .= '-	echo \'This line is tab indented\';'."\n";
+        $expected .= '-}'."\n";
+        $expected .= '+<?php'."\n";
+        $expected .= '+// Comment with 2 spaces trailing whitespace.  '."\n";
+        $expected .= '+$var = FALSE;'."\n";
+        $expected .= '+'."\n";
+        $expected .= '+if ($var) {'."\n";
+        $expected .= '+	echo \'This line is tab indented\';'."\n";
+        $expected .= '+}'."\n";
+
+        $filePath = __DIR__.'/Fixtures/GenerateDiffTest-WindowsLineEndings.inc';
+        $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);
+
+        // Normalize line endings of the diff.
+        $diff = preg_replace('`\R`', "\n", $diff);
+
+        $this->assertSame($expected, $diff);
+
+    }//end testGenerateDiffDifferentLineEndings()
+
+
+}//end class

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
+     */
+    public function testIntersectionReturnType()
+    {
+        $token = $this->getTargetToken('/* testIntersectionReturnType */', T_FN);
+        $this->backfillHelper($token);
+        $this->scopePositionTestHelper($token, 12, 20);
+
+    }//end testIntersectionReturnType()
+
+
+    /**
      * Test arrow functions used in ternary operators.
      *
      * @covers PHP_CodeSniffer\Tokenizers\PHP::processAdditional

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',
+            ,
+            'true: middle in union type for OO constant declaration'          => 
+                'testMarker'        => '/* testTrueIsKeywordAsConstUnionTypeMiddle */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: middle in union type for OO constant declaration'          => 
+                'testMarker'        => '/* testNullIsKeywordAsConstUnionTypeMiddle */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: middle in union type for OO constant declaration'          => 
+                'testMarker'        => '/* testSelfIsKeywordAsConstUnionTypeMiddle */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: middle in union type for OO constant declaration'        => 
+                'testMarker'        => '/* testParentIsKeywordAsConstUnionTypeMiddle */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: last in union type for OO constant declaration'           => 
+                'testMarker'        => '/* testFalseIsKeywordAsConstUnionTypeLast */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: last in union type for OO constant declaration'            => 
+                'testMarker'        => '/* testTrueIsKeywordAsConstUnionTypeLast */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: last in union type for OO constant declaration'            => 
+                'testMarker'        => '/* testNullIsKeywordAsConstUnionTypeLast */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: last in union type for OO constant declaration'            => 
+                'testMarker'        => '/* testSelfIsKeywordAsConstUnionTypeLast */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: last in union type for OO constant declaration'          => 
+                'testMarker'        => '/* testParentIsKeywordAsConstUnionTypeLast */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: first in union type for property declaration'             => 
+                'testMarker'        => '/* testFalseIsKeywordAsPropertyUnionTypeFirst */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: first in union type for property declaration'              => 
+                'testMarker'        => '/* testTrueIsKeywordAsPropertyUnionTypeFirst */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: first in union type for property declaration'              => 
+                'testMarker'        => '/* testNullIsKeywordAsPropertyUnionTypeFirst */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: first in union type for property declaration'              => 
+                'testMarker'        => '/* testSelfIsKeywordAsPropertyUnionTypeFirst */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: first in union type for property declaration'            => 
+                'testMarker'        => '/* testParentIsKeywordAsPropertyUnionTypeFirst */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: middle in union type for property declaration'            => 
+                'testMarker'        => '/* testFalseIsKeywordAsPropertyUnionTypeMiddle */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: middle in union type for property declaration'             => 
+                'testMarker'        => '/* testTrueIsKeywordAsPropertyUnionTypeMiddle */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: middle in union type for property declaration'             => 
+                'testMarker'        => '/* testNullIsKeywordAsPropertyUnionTypeMiddle */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: middle in union type for property declaration'             => 
+                'testMarker'        => '/* testSelfIsKeywordAsPropertyUnionTypeMiddle */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: middle in union type for property declaration'           => 
+                'testMarker'        => '/* testParentIsKeywordAsPropertyUnionTypeMiddle */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: last in union type for property declaration'              => 
+                'testMarker'        => '/* testFalseIsKeywordAsPropertyUnionTypeLast */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: last in union type for property declaration'               => 
+                'testMarker'        => '/* testTrueIsKeywordAsPropertyUnionTypeLast */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: last in union type for property declaration'               => 
+                'testMarker'        => '/* testNullIsKeywordAsPropertyUnionTypeLast */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: last in union type for property declaration'               => 
+                'testMarker'        => '/* testSelfIsKeywordAsPropertyUnionTypeLast */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: last in union type for property declaration'             => 
+                'testMarker'        => '/* testParentIsKeywordAsPropertyUnionTypeLast */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: first in union type for param declaration'                => 
+                'testMarker'        => '/* testFalseIsKeywordAsParamUnionTypeFirst */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: first in union type for param declaration'                 => 
+                'testMarker'        => '/* testTrueIsKeywordAsParamUnionTypeFirst */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: first in union type for param declaration'                 => 
+                'testMarker'        => '/* testNullIsKeywordAsParamUnionTypeFirst */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: first in union type for param declaration'                 => 
+                'testMarker'        => '/* testSelfIsKeywordAsParamUnionTypeFirst */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: first in union type for param declaration'               => 
+                'testMarker'        => '/* testParentIsKeywordAsParamUnionTypeFirst */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: middle in union type for param declaration'               => 
+                'testMarker'        => '/* testFalseIsKeywordAsParamUnionTypeMiddle */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: middle in union type for param declaration'                => 
+                'testMarker'        => '/* testTrueIsKeywordAsParamUnionTypeMiddle */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: middle in union type for param declaration'                => 
+                'testMarker'        => '/* testNullIsKeywordAsParamUnionTypeMiddle */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: middle in union type for param declaration'                => 
+                'testMarker'        => '/* testSelfIsKeywordAsParamUnionTypeMiddle */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: middle in union type for param declaration'              => 
+                'testMarker'        => '/* testParentIsKeywordAsParamUnionTypeMiddle */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: last in union type for param declaration'                 => 
+                'testMarker'        => '/* testFalseIsKeywordAsParamUnionTypeLast */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: last in union type for param declaration'                  => 
+                'testMarker'        => '/* testTrueIsKeywordAsParamUnionTypeLast */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: last in union type for param declaration'                  => 
+                'testMarker'        => '/* testNullIsKeywordAsParamUnionTypeLast */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: last in union type for param declaration'                  => 
+                'testMarker'        => '/* testSelfIsKeywordAsParamUnionTypeLast */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: last in union type for param declaration'                => 
+                'testMarker'        => '/* testParentIsKeywordAsParamUnionTypeLast */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: first in union type for return declaration'               => 
+                'testMarker'        => '/* testFalseIsKeywordAsReturnUnionTypeFirst */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: first in union type for return declaration'                => 
+                'testMarker'        => '/* testTrueIsKeywordAsReturnUnionTypeFirst */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: first in union type for return declaration'                => 
+                'testMarker'        => '/* testNullIsKeywordAsReturnUnionTypeFirst */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: first in union type for return declaration'                => 
+                'testMarker'        => '/* testSelfIsKeywordAsReturnUnionTypeFirst */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: first in union type for return declaration'              => 
+                'testMarker'        => '/* testParentIsKeywordAsReturnUnionTypeFirst */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: middle in union type for return declaration'              => 
+                'testMarker'        => '/* testFalseIsKeywordAsReturnUnionTypeMiddle */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: middle in union type for return declaration'               => 
+                'testMarker'        => '/* testTrueIsKeywordAsReturnUnionTypeMiddle */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: middle in union type for return declaration'               => 
+                'testMarker'        => '/* testNullIsKeywordAsReturnUnionTypeMiddle */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: middle in union type for return declaration'               => 
+                'testMarker'        => '/* testSelfIsKeywordAsReturnUnionTypeMiddle */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: middle in union type for return declaration'             => 
+                'testMarker'        => '/* testParentIsKeywordAsReturnUnionTypeMiddle */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'false: last in union type for return declaration'                => 
+                'testMarker'        => '/* testFalseIsKeywordAsReturnUnionTypeLast */',
+                'expectedTokenType' => 'T_FALSE',
+            ,
+            'true: last in union type for return declaration'                 => 
+                'testMarker'        => '/* testTrueIsKeywordAsReturnUnionTypeLast */',
+                'expectedTokenType' => 'T_TRUE',
+            ,
+            'null: last in union type for return declaration'                 => 
+                'testMarker'        => '/* testNullIsKeywordAsReturnUnionTypeLast */',
+                'expectedTokenType' => 'T_NULL',
+            ,
+            'self: last in union type for return declaration'                 => 
+                'testMarker'        => '/* testSelfIsKeywordAsReturnUnionTypeLast */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: last in union type for return declaration'               => 
+                'testMarker'        => '/* testParentIsKeywordAsReturnUnionTypeLast */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'self: first in intersection type for OO constant declaration'    => 
+                'testMarker'        => '/* testSelfIsKeywordAsConstIntersectionTypeFirst */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: first in intersection type for OO constant declaration'  => 
+                'testMarker'        => '/* testParentIsKeywordAsConstIntersectionTypeFirst */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+            'self: middle in intersection type for OO constant declaration'   => 
+                'testMarker'        => '/* testSelfIsKeywordAsConstIntersectionTypeMiddle */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: middle in intersection type for OO constant declaration' => 
+                'testMarker'        => '/* testParentIsKeywordAsConstIntersectionTypeMiddle */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+            'self: last in intersection type for OO constant declaration'     => 
+                'testMarker'        => '/* testSelfIsKeywordAsConstIntersectionTypeLast */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: last in intersection type for OO constant declaration'   => 
+                'testMarker'        => '/* testParentIsKeywordAsConstIntersectionTypeLast */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'self: first in intersection type for property declaration'       => 
+                'testMarker'        => '/* testSelfIsKeywordAsPropertyIntersectionTypeFirst */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: first in intersection type for property declaration'     => 
+                'testMarker'        => '/* testParentIsKeywordAsPropertyIntersectionTypeFirst */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+            'self: middle in intersection type for property declaration'      => 
+                'testMarker'        => '/* testSelfIsKeywordAsPropertyIntersectionTypeMiddle */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: middle in intersection type for property declaration'    => 
+                'testMarker'        => '/* testParentIsKeywordAsPropertyIntersectionTypeMiddle */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+            'self: last in intersection type for property declaration'        => 
+                'testMarker'        => '/* testSelfIsKeywordAsPropertyIntersectionTypeLast */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: last in intersection type for property declaration'      => 
+                'testMarker'        => '/* testParentIsKeywordAsPropertyIntersectionTypeLast */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'self: first in intersection type for param declaration'          => 
+                'testMarker'        => '/* testSelfIsKeywordAsParamIntersectionTypeFirst */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: first in intersection type for param declaration'        => 
+                'testMarker'        => '/* testParentIsKeywordAsParamIntersectionTypeFirst */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+            'self: middle in intersection type for param declaration'         => 
+                'testMarker'        => '/* testSelfIsKeywordAsParamIntersectionTypeMiddle */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: middle in intersection type for param declaration'       => 
+                'testMarker'        => '/* testParentIsKeywordAsParamIntersectionTypeMiddle */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+            'self: last in intersection type for param declaration'           => 
+                'testMarker'        => '/* testSelfIsKeywordAsParamIntersectionTypeLast */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: last in intersection type for param declaration'         => 
+                'testMarker'        => '/* testParentIsKeywordAsParamIntersectionTypeLast */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+
+            'self: first in intersection type for return declaration'         => 
+                'testMarker'        => '/* testSelfIsKeywordAsReturnIntersectionTypeFirst */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: first in intersection type for return declaration'       => 
+                'testMarker'        => '/* testParentIsKeywordAsReturnIntersectionTypeFirst */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+            'self: middle in intersection type for return declaration'        => 
+                'testMarker'        => '/* testSelfIsKeywordAsReturnIntersectionTypeMiddle */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: middle in intersection type for return declaration'      => 
+                'testMarker'        => '/* testParentIsKeywordAsReturnIntersectionTypeMiddle */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
+            'self: last in intersection type for return declaration'          => 
+                'testMarker'        => '/* testSelfIsKeywordAsReturnIntersectionTypeLast */',
+                'expectedTokenType' => 'T_SELF',
+            ,
+            'parent: last in intersection type for return declaration'        => 
+                'testMarker'        => '/* testParentIsKeywordAsReturnIntersectionTypeLast */',
+                'expectedTokenType' => 'T_PARENT',
+            ,
         ;
 
     }//end dataKeywords()

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