diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php
index 88c199d029..df2b86ffbc 100644
--- a/libraries/classes/Bookmark.php
+++ b/libraries/classes/Bookmark.php
@@ -116,8 +116,6 @@ class Bookmark
 
     /**
      * Adds a bookmark
-     *
-     * @access public
      */
     public function save(): bool
     {
@@ -139,8 +137,6 @@ class Bookmark
 
     /**
      * Deletes a bookmark
-     *
-     * @access public
      */
     public function delete(): bool
     {
@@ -206,8 +202,6 @@ class Bookmark
      * @param string $user Current user
      *
      * @return array|false the bookmark parameters for the current user
-     *
-     * @access public
      */
     public static function getParams(string $user)
     {
@@ -300,8 +294,6 @@ class Bookmark
      * @param string|false      $db   the current database name or false
      *
      * @return Bookmark[] the bookmarks list
-     *
-     * @access public
      */
     public static function getList(
         DatabaseInterface $dbi,
@@ -356,8 +348,6 @@ class Bookmark
      * @param bool              $exact_user_match    whether to ignore bookmarks with no user
      *
      * @return Bookmark|null the bookmark
-     *
-     * @access public
      */
     public static function get(
         DatabaseInterface $dbi,
diff --git a/libraries/classes/ConfigStorage/Relation.php b/libraries/classes/ConfigStorage/Relation.php
index 3d7282b420..e173e4172a 100644
--- a/libraries/classes/ConfigStorage/Relation.php
+++ b/libraries/classes/ConfigStorage/Relation.php
@@ -70,8 +70,6 @@ class Relation
      * @param int    $options    query options
      *
      * @return mixed|bool the result set, or false if no result set
-     *
-     * @access public
      */
     public function queryAsControlUser($sql, $show_error = true, $options = 0)
     {
@@ -381,8 +379,6 @@ class Relation
     /**
      * Check whether column_info table input transformation
      * upgrade is required and try to upgrade silently
-     *
-     * @access public
      */
     public function tryUpgradeTransformations(): bool
     {
@@ -454,8 +450,6 @@ class Relation
      * @param string $source the source for foreign key information
      *
      * @return array    db,table,column
-     *
-     * @access public
      */
     public function getForeigners($db, $table, $column = '', $source = 'both')
     {
@@ -527,8 +521,6 @@ class Relation
      * @param string $table the name of the table to check for
      *
      * @return string|false field name or false
-     *
-     * @access public
      */
     public function getDisplayField($db, $table)
     {
@@ -587,8 +579,6 @@ class Relation
      * @param string $table the name of the table to check for
      *
      * @return array    [column_name] = comment
-     *
-     * @access public
      */
     public function getComments($db, $table = ''): array
     {
@@ -615,8 +605,6 @@ class Relation
      * Gets the comment for a db
      *
      * @param string $db the name of the db to check for
-     *
-     * @access public
      */
     public function getDbComment(string $db): string
     {
@@ -646,8 +634,6 @@ class Relation
      * Gets the comment for a db
      *
      * @return array comments
-     *
-     * @access public
      */
     public function getDbComments()
     {
@@ -679,8 +665,6 @@ class Relation
      *
      * @param string $db      the name of the db
      * @param string $comment the value of the column
-     *
-     * @access public
      */
     public function setDbComment($db, $comment = ''): bool
     {
@@ -722,8 +706,6 @@ class Relation
      * @param string $table    the name of the table
      * @param string $username the username
      * @param string $sqlquery the sql query
-     *
-     * @access public
      */
     public function setHistory($db, $table, $username, $sqlquery): void
     {
@@ -780,8 +762,6 @@ class Relation
      * @param string $username the username
      *
      * @return array|bool list of history items
-     *
-     * @access public
      */
     public function getHistory($username)
     {
@@ -823,8 +803,6 @@ class Relation
      * given user
      *
      * @param string $username the username
-     *
-     * @access public
      */
     public function purgeHistory($username): void
     {
@@ -865,8 +843,6 @@ class Relation
      * @param string $mode    the needed mode
      *
      * @return string[] the <option value=""><option>s
-     *
-     * @access protected
      */
     public function buildForeignDropdown(array $foreign, $data, $mode): array
     {
@@ -960,8 +936,6 @@ class Relation
      * @param int|null $max             maximum number of items in the dropdown
      *
      * @return string   the <option value=""><option>s
-     *
-     * @access public
      */
     public function foreignDropdown(
         array $disp_row,
@@ -1068,8 +1042,6 @@ class Relation
      *     disp_row: list<non-empty-array>|null,
      *     foreign_field: mixed
      * }
-     *
-     * @access public
      */
     public function getForeignData(
         $foreigners,
diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php
index b63ea1df15..79e58ebdb2 100644
--- a/libraries/classes/Console.php
+++ b/libraries/classes/Console.php
@@ -22,7 +22,6 @@ class Console
     /**
      * Whether to display anything
      *
-     * @access private
      * @var bool
      */
     private $isEnabled;
@@ -30,7 +29,6 @@ class Console
     /**
      * Whether we are servicing an ajax request.
      *
-     * @access private
      * @var bool
      */
     private $isAjax;
@@ -74,8 +72,6 @@ class Console
 
     /**
      * Renders the bookmark content
-     *
-     * @access public
      */
     public static function getBookmarkContent(): string
     {
@@ -120,8 +116,6 @@ class Console
 
     /**
      * Renders the console
-     *
-     * @access public
      */
     public function getDisplay(): string
     {
diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php
index 0ef7fcc47a..e45c61987d 100644
--- a/libraries/classes/Controllers/Table/SearchController.php
+++ b/libraries/classes/Controllers/Table/SearchController.php
@@ -41,49 +41,42 @@ class SearchController extends AbstractController
     /**
      * Names of columns
      *
-     * @access private
      * @var array
      */
     private $columnNames;
     /**
      * Types of columns
      *
-     * @access private
      * @var array
      */
     private $columnTypes;
     /**
      * Types of columns without any replacement
      *
-     * @access private
      * @var array
      */
     private $originalColumnTypes;
     /**
      * Collations of columns
      *
-     * @access private
      * @var array
      */
     private $columnCollations;
     /**
      * Null Flags of columns
      *
-     * @access private
      * @var array
      */
     private $columnNullFlags;
     /**
      * Whether a geometry column is present
      *
-     * @access private
      * @var bool
      */
     private $geomColumnFlag;
     /**
      * Foreign Keys
      *
-     * @access private
      * @var array
      */
     private $foreigners;
diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
index d080556562..8dd732cef1 100644
--- a/libraries/classes/Core.php
+++ b/libraries/classes/Core.php
@@ -153,8 +153,6 @@ class Core
      * @param string $target anchor in documentation
      *
      * @return string  the URL
-     *
-     * @access public
      */
     public static function getPHPDocLink(string $target): string
     {
@@ -784,8 +782,6 @@ class Core
      * Gets the "true" IP address of the current user
      *
      * @return string|bool the ip of the user
-     *
-     * @access private
      */
     public static function getIp()
     {
diff --git a/libraries/classes/Database/CentralColumns.php b/libraries/classes/Database/CentralColumns.php
index ef103a778c..11563abbba 100644
--- a/libraries/classes/Database/CentralColumns.php
+++ b/libraries/classes/Database/CentralColumns.php
@@ -92,8 +92,6 @@ class CentralColumns
      * Defines the central_columns parameters for the current user
      *
      * @return array|bool the central_columns parameters for the current user
-     *
-     * @access public
      */
     public function getParams()
     {
diff --git a/libraries/classes/Database/MultiTableQuery.php b/libraries/classes/Database/MultiTableQuery.php
index 77284f2d2a..9eea9adba9 100644
--- a/libraries/classes/Database/MultiTableQuery.php
+++ b/libraries/classes/Database/MultiTableQuery.php
@@ -28,7 +28,6 @@ class MultiTableQuery
     /**
      * DatabaseInterface instance
      *
-     * @access private
      * @var DatabaseInterface
      */
     private $dbi;
@@ -36,7 +35,6 @@ class MultiTableQuery
     /**
      * Database name
      *
-     * @access private
      * @var string
      */
     private $db;
@@ -44,7 +42,6 @@ class MultiTableQuery
     /**
      * Default number of columns
      *
-     * @access private
      * @var int
      */
     private $defaultNoOfColumns;
@@ -52,7 +49,6 @@ class MultiTableQuery
     /**
      * Table names
      *
-     * @access private
      * @var array
      */
     private $tables;
diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php
index dc3606a5ee..77a6dad51f 100644
--- a/libraries/classes/Database/Qbe.php
+++ b/libraries/classes/Database/Qbe.php
@@ -48,189 +48,162 @@ class Qbe
     /**
      * Database name
      *
-     * @access private
      * @var string
      */
     private $db;
     /**
      * Table Names (selected/non-selected)
      *
-     * @access private
      * @var array
      */
     private $criteriaTables;
     /**
      * Column Names
      *
-     * @access private
      * @var array
      */
     private $columnNames;
     /**
      * Number of columns
      *
-     * @access private
      * @var int
      */
     private $criteriaColumnCount;
     /**
      * Number of Rows
      *
-     * @access private
      * @var int
      */
     private $criteriaRowCount;
     /**
      * Whether to insert a new column
      *
-     * @access private
      * @var array|null
      */
     private $criteriaColumnInsert;
     /**
      * Whether to delete a column
      *
-     * @access private
      * @var array|null
      */
     private $criteriaColumnDelete;
     /**
      * Whether to insert a new row
      *
-     * @access private
      * @var array
      */
     private $criteriaRowInsert;
     /**
      * Whether to delete a row
      *
-     * @access private
      * @var array
      */
     private $criteriaRowDelete;
     /**
      * Already set criteria values
      *
-     * @access private
      * @var array
      */
     private $criteria;
     /**
      * Previously set criteria values
      *
-     * @access private
      * @var array
      */
     private $prevCriteria;
     /**
      * AND/OR relation b/w criteria columns
      *
-     * @access private
      * @var array
      */
     private $criteriaAndOrColumn;
     /**
      * AND/OR relation b/w criteria rows
      *
-     * @access private
      * @var array
      */
     private $criteriaAndOrRow;
     /**
      * Large width of a column
      *
-     * @access private
      * @var string
      */
     private $realwidth;
     /**
      * Minimum width of a column
      *
-     * @access private
      * @var int
      */
     private $formColumnWidth;
     /**
      * Selected columns in the form
      *
-     * @access private
      * @var array
      */
     private $formColumns;
     /**
      * Entered aliases in the form
      *
-     * @access private
      * @var array
      */
     private $formAliases;
     /**
      * Chosen sort options in the form
      *
-     * @access private
      * @var array
      */
     private $formSorts;
     /**
      * Chosen sort orders in the form
      *
-     * @access private
      * @var array
      */
     private $formSortOrders;
     /**
      * Show checkboxes in the form
      *
-     * @access private
      * @var array
      */
     private $formShows;
     /**
      * Entered criteria values in the form
      *
-     * @access private
      * @var array
      */
     private $formCriterions;
     /**
      * AND/OR column radio buttons in the form
      *
-     * @access private
      * @var array
      */
     private $formAndOrCols;
     /**
      * AND/OR row radio buttons in the form
      *
-     * @access private
      * @var array
      */
     private $formAndOrRows;
     /**
      * New column count in case of add/delete
      *
-     * @access private
      * @var int
      */
     private $newColumnCount;
     /**
      * New row count in case of add/delete
      *
-     * @access private
      * @var int
      */
     private $newRowCount;
     /**
      * List of saved searches
      *
-     * @access private
      * @var array
      */
     private $savedSearchList = null;
     /**
      * Current search
      *
-     * @access private
      * @var SavedSearches|null
      */
     private $currentSearch = null;
diff --git a/libraries/classes/Database/Search.php b/libraries/classes/Database/Search.php
index fbe8e3f05d..0e545cf374 100644
--- a/libraries/classes/Database/Search.php
+++ b/libraries/classes/Database/Search.php
@@ -31,7 +31,6 @@ class Search
     /**
      * Database name
      *
-     * @access private
      * @var string
      */
     private $db;
@@ -39,7 +38,6 @@ class Search
     /**
      * Table Names
      *
-     * @access private
      * @var array
      */
     private $tablesNamesOnly;
@@ -47,7 +45,6 @@ class Search
     /**
      * Type of search
      *
-     * @access private
      * @var array
      */
     private $searchTypes;
@@ -55,7 +52,6 @@ class Search
     /**
      * Already set search type
      *
-     * @access private
      * @var int
      */
     private $criteriaSearchType;
@@ -63,7 +59,6 @@ class Search
     /**
      * Already set search type's description
      *
-     * @access private
      * @var string
      */
     private $searchTypeDescription;
@@ -71,7 +66,6 @@ class Search
     /**
      * Search string/regexp
      *
-     * @access private
      * @var string
      */
     private $criteriaSearchString;
@@ -79,7 +73,6 @@ class Search
     /**
      * Criteria Tables to search in
      *
-     * @access private
      * @var array
      */
     private $criteriaTables;
@@ -87,7 +80,6 @@ class Search
     /**
      * Restrict the search to this column
      *
-     * @access private
      * @var string
      */
     private $criteriaColumnName;
diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index f37ffc121b..11c4e7a332 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -249,8 +249,6 @@ class Results
      * @param int    $server   the server id
      * @param string $goto     the URL to go back in case of errors
      * @param string $sqlQuery the SQL query
-     *
-     * @access public
      */
     public function __construct($db, $table, $server, $goto, $sqlQuery)
     {
@@ -444,8 +442,6 @@ class Results
      * @param array $displayParts the parts to display
      *
      * @return array the modified display parts
-     *
-     * @access private
      */
     private function setDisplayPartsForPrintView(array $displayParts)
     {
@@ -467,8 +463,6 @@ class Results
      * @param array $displayParts the parts to display
      *
      * @return array the modified display parts
-     *
-     * @access private
      */
     private function setDisplayPartsForShow(array $displayParts)
     {
@@ -515,8 +509,6 @@ class Results
      * @param array $displayParts the parts to display
      *
      * @return array the modified display parts
-     *
-     * @access private
      */
     private function setDisplayPartsForNonData(array $displayParts)
     {
@@ -546,8 +538,6 @@ class Results
      * @param array $displayParts the parts to display
      *
      * @return array the modified display parts
-     *
-     * @access private
      */
     private function setDisplayPartsForSelect(array $displayParts)
     {
@@ -617,8 +607,6 @@ class Results
      *               by the SQL query without any programmatically appended
      *               LIMIT clause (just a copy of $unlim_num_rows if it exists,
      *               else computed inside this function)
-     *
-     * @access private
      */
     private function setDisplayPartsAndTotal(array $displayParts)
     {
@@ -693,8 +681,6 @@ class Results
      * @see getTableHeaders(), getColumnParams()
      *
      * @param array $analyzedSqlResults analyzed sql results
-     *
-     * @access private
      */
     private function isSelect(array $analyzedSqlResults): bool
     {
@@ -724,8 +710,6 @@ class Results
      * @param string $onclick         optional onclick clause
      *
      * @return string                     html content
-     *
-     * @access private
      */
     private function getTableNavigationButton(
         $caption,
@@ -775,8 +759,6 @@ class Results
      * Possibly return a page selector for table navigation
      *
      * @return array ($output, $nbTotalPage)
-     *
-     * @access private
      */
     private function getHtmlPageSelector(): array
     {
@@ -903,8 +885,6 @@ class Results
      * @param int    $posPrev      the offset for the "previous" page
      *
      * @return string                 html content
-     *
-     * @access private
      */
     private function getMoveBackwardButtonsForTableNavigation(
         $htmlSqlQuery,
@@ -936,8 +916,6 @@ class Results
      * @param bool   $isInnodb     whether it's InnoDB or not
      *
      * @return string   html content
-     *
-     * @access private
      */
     private function getMoveForwardButtonsForTableNavigation(
         $htmlSqlQuery,
@@ -1003,8 +981,6 @@ class Results
      * @param string $unsortedSqlQuery          query without the sort part
      *
      * @return string html content
-     *
-     * @access private
      */
     private function getTableHeadersForColumns(
         array $displayParts,
@@ -1200,8 +1176,6 @@ class Results
      * @param array|null $sortExpression     sort expression
      *
      * @return array     two element array - $unsorted_sql_query, $drop_down_html
-     *
-     * @access private
      */
     private function getUnsortedSqlAndSortByKeyDropDown(
         array $analyzedSqlResults,
@@ -1321,8 +1295,6 @@ class Results
      * @param string $fullOrPartialTextLink full/partial link or text button
      *
      * @return array 2 element array - $colspan, $button_html
-     *
-     * @access private
      */
     private function getFieldVisibilityParams(
         array &$displayParts,
@@ -1390,8 +1362,6 @@ class Results
      * @param array $analyzedSqlResults analyzed sql results
      *
      * @return array table comments
-     *
-     * @access private
      */
     private function getTableCommentsArray(array $analyzedSqlResults)
     {
@@ -1420,8 +1390,6 @@ class Results
      * @see getTableHeaders()
      *
      * @param array $analyzedSqlResults analyzed sql results
-     *
-     * @access private
      */
     private function setHighlightedColumnGlobalField(array $analyzedSqlResults): void
     {
@@ -1509,8 +1477,6 @@ class Results
      * @see getTableHeaders()
      *
      * @return string html content
-     *
-     * @access private
      */
     private function getFullOrPartialTextButtonOrLink()
     {
@@ -1552,8 +1518,6 @@ class Results
      * @param FieldMetadata $fieldsMeta  set of field properties
      *
      * @return string html content
-     *
-     * @access private
      */
     private function getCommentForRow(array $commentsMap, FieldMetadata $fieldsMeta)
     {
@@ -1581,8 +1545,6 @@ class Results
      * @param string        $colVisibElement           element of $col_visib array
      *
      * @return array   2 element array - $orderLink, $sortedHeaderHtml
-     *
-     * @access private
      */
     private function getOrderLinkAndSortedHeaderHtml(
         FieldMetadata $fieldsMeta,
@@ -1688,8 +1650,6 @@ class Results
      * @param FieldMetadata $fieldsMeta                set of field properties
      *
      * @return array   3 element array - $single_sort_order, $sort_order, $order_img
-     *
-     * @access private
      */
     private function getSingleAndMultiSortUrls(
         array $sortExpression,
@@ -1812,8 +1772,6 @@ class Results
      * @param array  $sortExpressionNoDirection sort expression without direction
      * @param string $sortTable                 the table name
      * @param string $nameToUseInSort           the sorting column name
-     *
-     * @access private
      */
     private function isInSorted(
         array $sortExpression,
@@ -1889,8 +1847,6 @@ class Results
      * @param int    $index         the index of sort direction array.
      *
      * @return array                  2 element array - $sort_order, $order_img
-     *
-     * @access private
      */
     private function getSortingUrlParams(array $sortDirection, $sortOrder, $index)
     {
@@ -1949,8 +1905,6 @@ class Results
      * @param string        $multiOrderUrl the url for sort
      *
      * @return string the sort order link
-     *
-     * @access private
      */
     private function getSortOrderLink(
         $orderImg,
@@ -2076,8 +2030,6 @@ class Results
      * @param string $colspan               column span of table header
      *
      * @return string  html content
-     *
-     * @access private
      */
     private function getColumnAtRightSide(
         array &$displayParts,
@@ -2136,8 +2088,6 @@ class Results
      * @param string $value          value to display
      *
      * @return string  the td
-     *
-     * @access private
      */
     private function buildValueDisplay($class, $conditionField, $value)
     {
@@ -2161,8 +2111,6 @@ class Results
      * @param string        $align          cell alignment
      *
      * @return string  the td
-     *
-     * @access private
      */
     private function buildNullDisplay($class, $conditionField, FieldMetadata $meta, $align = '')
     {
@@ -2189,8 +2137,6 @@ class Results
      * @param string        $align          cell alignment
      *
      * @return string  the td
-     *
-     * @access private
      */
     private function buildEmptyDisplay($class, $conditionField, FieldMetadata $meta, $align = '')
     {
@@ -2283,7 +2229,6 @@ class Results
      * @return string  html content
      *
      * @global array  $row                  current row data
-     * @access private
      */
     private function getTableBody(
         &$dtResult,
@@ -2604,8 +2549,6 @@ class Results
      * @param array             $analyzedSqlResults analyzed sql results
      *
      * @return string  html content
-     *
-     * @access private
      */
     private function getRowValues(
         array $row,
@@ -2943,8 +2886,6 @@ class Results
      * @param array $analyzedSqlResults analyzed sql results
      *
      * @return string analyzed sql query
-     *
-     * @access private
      */
     private function getUrlSqlQuery(array $analyzedSqlResults)
     {
@@ -2975,8 +2916,6 @@ class Results
      * @param array $analyzedSqlResults analyzed sql results
      *
      * @return array 2 element array - $col_order, $col_visib
-     *
-     * @access private
      */
     private function getColumnParams(array $analyzedSqlResults)
     {
@@ -3016,8 +2955,6 @@ class Results
      * @param array $displayParams holds various display info
      *
      * @return string html content
-     *
-     * @access private
      */
     private function getRepeatingHeaders(
         array $displayParams
@@ -3058,8 +2995,6 @@ class Results
      *
      * @return array<int,string>       5 element array - $edit_url, $copy_url,
      *                                                   $edit_str, $copy_str
-     *
-     * @access private
      */
     private function getModifiedLinks(
         $whereClause,
@@ -3115,8 +3050,6 @@ class Results
      *
      * @return array                    3 element array
      *                                  $del_url, $del_str, $js_conf
-     *
-     * @access private
      */
     private function getDeleteAndKillLinks(
         $whereClause,
@@ -3203,8 +3136,6 @@ class Results
      * @param string $displayText The text displaying after the image icon
      *
      * @return string
-     *
-     * @access private
      */
     private function getActionLinkContent($icon, $displayText)
     {
@@ -3241,8 +3172,6 @@ class Results
      * @param string $fieldTypeClass the class related to type of the field
      *
      * @return string the combined classes
-     *
-     * @access private
      */
     private function getClassesForColumn(
         string $gridEditClass,
@@ -3263,8 +3192,6 @@ class Results
      * @param FieldMetadata $meta the type of the column field
      *
      * @return string   the class for the column
-     *
-     * @access private
      */
     private function getClassForDateTimeRelatedFields(FieldMetadata $meta): string
     {
@@ -3619,7 +3546,6 @@ class Results
      * @todo    move/split into SQL class!?
      * @todo    currently this is called twice unnecessary
      * @todo    ignore LIMIT and ORDER in query!?
-     * @access public
      */
     public function setConfigParamsForDisplayTable(): void
     {
@@ -3757,8 +3683,6 @@ class Results
      * @param bool  $isLimitedDisplay   With limited operations or not
      *
      * @return string   Generated HTML content for resulted table
-     *
-     * @access public
      */
     public function getTable(
         &$dtResult,
@@ -3972,8 +3896,6 @@ class Results
      * @see    getTable()
      *
      * @return int[] array with two elements - $pos_next, $pos_prev
-     *
-     * @access private
      */
     private function getOffsets()
     {
@@ -4006,8 +3928,6 @@ class Results
      * @param string $sortExpressionNoDirection sort expression without direction
      *
      * @return string|null html content, null if not found sorted column
-     *
-     * @access private
      */
     private function getSortedColumnMessage(
         &$dtResult,
@@ -4125,8 +4045,6 @@ class Results
      * @param string $afterCount          the string renders after row count
      *
      * @return Message an object of Message
-     *
-     * @access private
      */
     private function setMessageInformation(
         string $sortedColumnMessage,
@@ -4217,8 +4135,6 @@ class Results
      * @see      getTable()
      *
      * @param array $map the list of relations
-     *
-     * @access private
      */
     private function setParamForLinkForeignKeyRelatedTables(array &$map): void
     {
@@ -4434,8 +4350,6 @@ class Results
      * @param bool          $isTruncated      the result is truncated or not
      *
      * @return mixed  string or float
-     *
-     * @access private
      */
     private function handleNonPrintableContents(
         $category,
@@ -4531,8 +4445,6 @@ class Results
      * @param string        $whereComparison data for the where clause
      *
      * @return string|null  formatted data
-     *
-     * @access private
      */
     private function getFromForeign(array $map, FieldMetadata $meta, $whereComparison)
     {
@@ -4582,8 +4494,6 @@ class Results
      * @param string        $originalLength     of a truncated column, or ''
      *
      * @return string  formatted data
-     *
-     * @access private
      */
     private function getRowData(
         $class,
@@ -4719,8 +4629,6 @@ class Results
      * @param string $str string to be truncated
      *
      * @return array
-     *
-     * @access private
      */
     private function getPartialText($str): array
     {
diff --git a/libraries/classes/Encoding.php b/libraries/classes/Encoding.php
index 4e764007b0..7387d3805c 100644
--- a/libraries/classes/Encoding.php
+++ b/libraries/classes/Encoding.php
@@ -171,8 +171,6 @@ class Encoding
      * @param string $what         what to convert
      *
      * @return string   converted text
-     *
-     * @access public
      */
     public static function convertString(
         string $src_charset,
diff --git a/libraries/classes/File.php b/libraries/classes/File.php
index 4cb96508a5..1069a8be40 100644
--- a/libraries/classes/File.php
+++ b/libraries/classes/File.php
@@ -51,34 +51,19 @@ use const UPLOAD_ERR_PARTIAL;
  */
 class File
 {
-    /**
-     * @var string the temporary file name
-     * @access protected
-     */
+    /** @var string the temporary file name */
     protected $name = null;
 
-    /**
-     * @var string the content
-     * @access protected
-     */
+    /** @var string the content */
     protected $content = null;
 
-    /**
-     * @var Message|null the error message
-     * @access protected
-     */
+    /** @var Message|null the error message */
     protected $errorMessage = null;
 
-    /**
-     * @var bool whether the file is temporary or not
-     * @access protected
-     */
+    /** @var bool whether the file is temporary or not */
     protected $isTemp = false;
 
-    /**
-     * @var string type of compression
-     * @access protected
-     */
+    /** @var string type of compression */
     protected $compression = null;
 
     /** @var int */
@@ -101,8 +86,6 @@ class File
 
     /**
      * @param bool|string $name file name or false
-     *
-     * @access public
      */
     public function __construct($name = false)
     {
@@ -121,8 +104,6 @@ class File
      * destructor
      *
      * @see     File::cleanUp()
-     *
-     * @access public
      */
     public function __destruct()
     {
@@ -131,8 +112,6 @@ class File
 
     /**
      * deletes file if it is temporary, usually from a moved upload file
-     *
-     * @access public
      */
     public function cleanUp(): bool
     {
@@ -145,8 +124,6 @@ class File
 
     /**
      * deletes the file
-     *
-     * @access public
      */
     public function delete(): bool
     {
@@ -158,8 +135,6 @@ class File
      * file objects with temp flags are deleted with object destruction
      *
      * @param bool $is_temp sets the temp flag
-     *
-     * @access public
      */
     public function isTemp(?bool $is_temp = null): bool
     {
@@ -174,8 +149,6 @@ class File
      * accessor
      *
      * @param string|null $name file name
-     *
-     * @access public
      */
     public function setName(?string $name): void
     {
@@ -186,8 +159,6 @@ class File
      * Gets file content
      *
      * @return string|false the binary file content, or false if no content
-     *
-     * @access public
      */
     public function getRawContent()
     {
@@ -213,8 +184,6 @@ class File
      *
      * @return string|false the binary file content as a string,
      *                      or false if no content
-     *
-     * @access public
      */
     public function getContent()
     {
@@ -228,8 +197,6 @@ class File
 
     /**
      * Whether file is uploaded.
-     *
-     * @access public
      */
     public function isUploaded(): bool
     {
@@ -244,8 +211,6 @@ class File
      * accessor
      *
      * @return string|null File::$_name
-     *
-     * @access public
      */
     public function getName(): ?string
     {
@@ -256,8 +221,6 @@ class File
      * Initializes object from uploaded file.
      *
      * @param string $name name of file uploaded
-     *
-     * @access public
      */
     public function setUploadedFile(string $name): bool
     {
@@ -278,8 +241,6 @@ class File
      *
      * @param string $key       the md5 hash of the column name
      * @param string $rownumber number of row to process
-     *
-     * @access public
      */
     public function setUploadedFromTblChangeRequest(
         string $key,
@@ -356,7 +317,6 @@ class File
      *
      * @return array
      *
-     * @access public
      * @static
      */
     public function fetchUploadedFromTblChangeRequestMultiple(
@@ -378,8 +338,6 @@ class File
      *
      * @param string $key       the md5 hash of the column name
      * @param string $rownumber number of row to process
-     *
-     * @access public
      */
     public function setSelectedFromTblChangeRequest(
         string $key,
@@ -400,8 +358,6 @@ class File
      * Returns possible error message.
      *
      * @return Message|null error message
-     *
-     * @access public
      */
     public function getError(): ?Message
     {
@@ -410,8 +366,6 @@ class File
 
     /**
      * Checks whether there was any error.
-     *
-     * @access public
      */
     public function isError(): bool
     {
@@ -424,8 +378,6 @@ class File
      *
      * @param string $key       the md5 hash of the column name
      * @param string $rownumber number of row to process
-     *
-     * @access public
      */
     public function checkTblChangeForm(string $key, string $rownumber): bool
     {
@@ -452,8 +404,6 @@ class File
      * Sets named file to be read from UploadDir.
      *
      * @param string $name file name
-     *
-     * @access public
      */
     public function setLocalSelectedFile(string $name): bool
     {
@@ -487,8 +437,6 @@ class File
 
     /**
      * Checks whether file can be read.
-     *
-     * @access public
      */
     public function isReadable(): bool
     {
@@ -503,7 +451,6 @@ class File
      * directory - if needed
      *
      * @todo move check of $cfg['TempDir'] into Config?
-     * @access public
      */
     public function checkUploadedFile(): bool
     {
@@ -560,7 +507,6 @@ class File
      *
      * @todo   move file read part into readChunk() or getChunk()
      * @todo   add support for compression plugins
-     * @access protected
      */
     protected function detectCompression()
     {
@@ -783,8 +729,6 @@ class File
      * Returns compression used by file.
      *
      * @return string MIME type of compression, none for none
-     *
-     * @access public
      */
     public function getCompression(): string
     {
diff --git a/libraries/classes/Font.php b/libraries/classes/Font.php
index b40c409b52..a5eaf36522 100644
--- a/libraries/classes/Font.php
+++ b/libraries/classes/Font.php
@@ -23,8 +23,6 @@ class Font
      * Get list with characters and the corresponding width modifiers.
      *
      * @return array with characters and corresponding width modifier
-     *
-     * @access public
      */
     public function getCharLists(): array
     {
@@ -184,8 +182,6 @@ class Font
      * @param array|null $charLists list of characters and their width modifiers
      *
      * @return int width of the text
-     *
-     * @access public
      */
     public function getStringWidth(
         string $text,
diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php
index c676441544..29c5d981f4 100644
--- a/libraries/classes/Footer.php
+++ b/libraries/classes/Footer.php
@@ -28,14 +28,12 @@ class Footer
     /**
      * Scripts instance
      *
-     * @access private
      * @var Scripts
      */
     private $scripts;
     /**
      * Whether we are servicing an ajax request.
      *
-     * @access private
      * @var bool
      */
     private $isAjax;
@@ -43,14 +41,12 @@ class Footer
      * Whether to only close the BODY and HTML tags
      * or also include scripts, errors and links
      *
-     * @access private
      * @var bool
      */
     private $isMinimal;
     /**
      * Whether to display anything
      *
-     * @access private
      * @var bool
      */
     private $isEnabled;
diff --git a/libraries/classes/Gis/GisFactory.php b/libraries/classes/Gis/GisFactory.php
index 4f4582969a..261ed890fe 100644
--- a/libraries/classes/Gis/GisFactory.php
+++ b/libraries/classes/Gis/GisFactory.php
@@ -21,7 +21,6 @@ class GisFactory
      *
      * @return GisGeometry|false the singleton instance of geometric class of the given type
      *
-     * @access public
      * @static
      */
     public static function factory($type)
diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php
index 0b206d1551..deef0cfb22 100644
--- a/libraries/classes/Gis/GisGeometry.php
+++ b/libraries/classes/Gis/GisGeometry.php
@@ -35,8 +35,6 @@ abstract class GisGeometry
      * @param array  $scale_data data related to scaling
      *
      * @return string the code related to a row in the GIS dataset
-     *
-     * @access public
      */
     abstract public function prepareRowAsSvg($spatial, $label, $color, array $scale_data);
 
@@ -66,8 +64,6 @@ abstract class GisGeometry
      * @param TCPDF       $pdf        TCPDF instance
      *
      * @return TCPDF the modified TCPDF instance
-     *
-     * @access public
      */
     abstract public function prepareRowAsPdf(
         $spatial,
@@ -88,8 +84,6 @@ abstract class GisGeometry
      * @param array  $scale_data array containing data related to scaling
      *
      * @return string the JavaScript related to a row in the GIS dataset
-     *
-     * @access public
      */
     abstract public function prepareRowAsOl(
         $spatial,
@@ -105,8 +99,6 @@ abstract class GisGeometry
      * @param string $spatial spatial data of a row
      *
      * @return array array containing the min, max values for x and y coordinates
-     *
-     * @access public
      */
     abstract public function scaleRow($spatial);
 
@@ -118,8 +110,6 @@ abstract class GisGeometry
      * @param string|null $empty    value for empty points
      *
      * @return string WKT with the set of parameters passed by the GIS editor
-     *
-     * @access public
      */
     abstract public function generateWkt(array $gis_data, $index, $empty = '');
 
@@ -131,8 +121,6 @@ abstract class GisGeometry
      *
      * @return string OpenLayers.Bounds object that
      *                correspond to the bounds of GIS data
-     *
-     * @access protected
      */
     protected function getBoundsForOl(int $srid, array $scale_data)
     {
@@ -157,8 +145,6 @@ abstract class GisGeometry
      * @param array  $min_max   existing min, max values
      *
      * @return array the updated min, max values
-     *
-     * @access protected
      */
     protected function setMinMax($point_set, array $min_max)
     {
@@ -201,8 +187,6 @@ abstract class GisGeometry
      * @param string $value value of the GIS column
      *
      * @return array parameters for the GIS editor from the value of the GIS column
-     *
-     * @access protected
      */
     public function generateParams($value)
     {
@@ -232,8 +216,6 @@ abstract class GisGeometry
      * @param bool       $linear     if true, as a 1D array, else as a 2D array
      *
      * @return array scaled points
-     *
-     * @access protected
      */
     protected function extractPoints($point_set, $scale_data, $linear = false): array
     {
@@ -282,8 +264,6 @@ abstract class GisGeometry
      * @param int   $srid     spatial reference id
      *
      * @return string JavaScript for adding an array of polygons to OpenLayers
-     *
-     * @access protected
      */
     protected function getPolygonArrayForOpenLayers(array $polygons, int $srid)
     {
@@ -304,8 +284,6 @@ abstract class GisGeometry
      * @param int   $srid    spatial reference id
      *
      * @return string JavaScript for adding points for OpenLayers polygon
-     *
-     * @access protected
      */
     protected function getPolygonForOpenLayers(array $polygon, int $srid)
     {
@@ -323,8 +301,6 @@ abstract class GisGeometry
      *
      * @return string JavaScript for adding an array of LineString
      *                or LineRing to OpenLayers
-     *
-     * @access protected
      */
     protected function getLineArrayForOpenLayers(
         array $lines,
@@ -352,8 +328,6 @@ abstract class GisGeometry
      * @param bool  $is_line_string whether it's a LineString
      *
      * @return string JavaScript for adding a LineString or LineRing to OpenLayers
-     *
-     * @access protected
      */
     protected function getLineForOpenLayers(
         array $points_arr,
@@ -373,8 +347,6 @@ abstract class GisGeometry
      * @param int   $srid       spatial reference id
      *
      * @return string JavaScript for adding an array of points to OpenLayers
-     *
-     * @access protected
      */
     protected function getPointsArrayForOpenLayers(array $points_arr, int $srid)
     {
@@ -395,8 +367,6 @@ abstract class GisGeometry
      * @param int   $srid  spatial reference id
      *
      * @return string JavaScript for adding points to OpenLayers
-     *
-     * @access protected
      */
     protected function getPointForOpenLayers(array $point, int $srid)
     {
diff --git a/libraries/classes/Gis/GisGeometryCollection.php b/libraries/classes/Gis/GisGeometryCollection.php
index 985469b9b9..e8b2ad59cd 100644
--- a/libraries/classes/Gis/GisGeometryCollection.php
+++ b/libraries/classes/Gis/GisGeometryCollection.php
@@ -26,8 +26,6 @@ class GisGeometryCollection extends GisGeometry
 
     /**
      * A private constructor; prevents direct creation of object.
-     *
-     * @access private
      */
     private function __construct()
     {
@@ -37,8 +35,6 @@ class GisGeometryCollection extends GisGeometry
      * Returns the singleton.
      *
      * @return GisGeometryCollection the singleton
-     *
-     * @access public
      */
     public static function singleton()
     {
@@ -55,8 +51,6 @@ class GisGeometryCollection extends GisGeometry
      * @param string $spatial spatial data of a row
      *
      * @return array array containing the min, max values for x and y coordinates
-     *
-     * @access public
      */
     public function scaleRow($spatial)
     {
@@ -159,8 +153,6 @@ class GisGeometryCollection extends GisGeometry
      * @param TCPDF       $pdf        TCPDF instance
      *
      * @return TCPDF the modified TCPDF instance
-     *
-     * @access public
      */
     public function prepareRowAsPdf($spatial, ?string $label, $color, array $scale_data, $pdf)
     {
@@ -197,8 +189,6 @@ class GisGeometryCollection extends GisGeometry
      * @param array  $scale_data array containing data related to scaling
      *
      * @return string the code related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsSvg($spatial, $label, $color, array $scale_data)
     {
@@ -239,8 +229,6 @@ class GisGeometryCollection extends GisGeometry
      * @param array  $scale_data array containing data related to scaling
      *
      * @return string JavaScript related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsOl($spatial, int $srid, $label, $color, array $scale_data)
     {
@@ -276,8 +264,6 @@ class GisGeometryCollection extends GisGeometry
      * @param string $geom_col geometry collection string
      *
      * @return array the constituents of the geometry collection object
-     *
-     * @access private
      */
     private function explodeGeomCol($geom_col)
     {
@@ -310,8 +296,6 @@ class GisGeometryCollection extends GisGeometry
      * @param string|null $empty    value for empty points
      *
      * @return string WKT with the set of parameters passed by the GIS editor
-     *
-     * @access public
      */
     public function generateWkt(array $gis_data, $index, $empty = '')
     {
@@ -344,8 +328,6 @@ class GisGeometryCollection extends GisGeometry
      * @param string $value of the GIS column
      *
      * @return array parameters for the GIS editor from the value of the GIS column
-     *
-     * @access public
      */
     public function generateParams($value)
     {
diff --git a/libraries/classes/Gis/GisLineString.php b/libraries/classes/Gis/GisLineString.php
index d66f7ab86f..fa5aae5524 100644
--- a/libraries/classes/Gis/GisLineString.php
+++ b/libraries/classes/Gis/GisLineString.php
@@ -27,8 +27,6 @@ class GisLineString extends GisGeometry
 
     /**
      * A private constructor; prevents direct creation of object.
-     *
-     * @access private
      */
     private function __construct()
     {
@@ -38,8 +36,6 @@ class GisLineString extends GisGeometry
      * Returns the singleton.
      *
      * @return GisLineString the singleton
-     *
-     * @access public
      */
     public static function singleton()
     {
@@ -56,8 +52,6 @@ class GisLineString extends GisGeometry
      * @param string $spatial spatial data of a row
      *
      * @return array an array containing the min, max values for x and y coordinates
-     *
-     * @access public
      */
     public function scaleRow($spatial)
     {
@@ -134,8 +128,6 @@ class GisLineString extends GisGeometry
      * @param TCPDF       $pdf        TCPDF instance
      *
      * @return TCPDF the modified TCPDF instance
-     *
-     * @access public
      */
     public function prepareRowAsPdf($spatial, ?string $label, $line_color, array $scale_data, $pdf)
     {
@@ -186,8 +178,6 @@ class GisLineString extends GisGeometry
      * @param array  $scale_data Array containing data related to scaling
      *
      * @return string the code related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsSvg($spatial, $label, $line_color, array $scale_data)
     {
@@ -230,8 +220,6 @@ class GisLineString extends GisGeometry
      * @param array  $scale_data Array containing data related to scaling
      *
      * @return string JavaScript related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsOl($spatial, int $srid, $label, $line_color, array $scale_data)
     {
@@ -273,8 +261,6 @@ class GisLineString extends GisGeometry
      * @param string|null $empty    Value for empty points
      *
      * @return string WKT with the set of parameters passed by the GIS editor
-     *
-     * @access public
      */
     public function generateWkt(array $gis_data, $index, $empty = '')
     {
@@ -305,8 +291,6 @@ class GisLineString extends GisGeometry
      * @param int    $index of the geometry
      *
      * @return array params for the GIS data editor from the value of the GIS column
-     *
-     * @access public
      */
     public function generateParams($value, $index = -1)
     {
diff --git a/libraries/classes/Gis/GisMultiLineString.php b/libraries/classes/Gis/GisMultiLineString.php
index 644fd0047d..6b41fcf649 100644
--- a/libraries/classes/Gis/GisMultiLineString.php
+++ b/libraries/classes/Gis/GisMultiLineString.php
@@ -28,8 +28,6 @@ class GisMultiLineString extends GisGeometry
 
     /**
      * A private constructor; prevents direct creation of object.
-     *
-     * @access private
      */
     private function __construct()
     {
@@ -39,8 +37,6 @@ class GisMultiLineString extends GisGeometry
      * Returns the singleton.
      *
      * @return GisMultiLineString the singleton
-     *
-     * @access public
      */
     public static function singleton()
     {
@@ -57,8 +53,6 @@ class GisMultiLineString extends GisGeometry
      * @param string $spatial spatial data of a row
      *
      * @return array an array containing the min, max values for x and y coordinates
-     *
-     * @access public
      */
     public function scaleRow($spatial)
     {
@@ -151,8 +145,6 @@ class GisMultiLineString extends GisGeometry
      * @param TCPDF       $pdf        TCPDF instance
      *
      * @return TCPDF the modified TCPDF instance
-     *
-     * @access public
      */
     public function prepareRowAsPdf($spatial, ?string $label, $line_color, array $scale_data, $pdf)
     {
@@ -211,8 +203,6 @@ class GisMultiLineString extends GisGeometry
      * @param array  $scale_data Array containing data related to scaling
      *
      * @return string the code related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsSvg($spatial, $label, $line_color, array $scale_data)
     {
@@ -261,8 +251,6 @@ class GisMultiLineString extends GisGeometry
      * @param array  $scale_data Array containing data related to scaling
      *
      * @return string JavaScript related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsOl($spatial, int $srid, $label, $line_color, array $scale_data)
     {
@@ -306,8 +294,6 @@ class GisMultiLineString extends GisGeometry
      * @param string|null $empty    Value for empty points
      *
      * @return string WKT with the set of parameters passed by the GIS editor
-     *
-     * @access public
      */
     public function generateWkt(array $gis_data, $index, $empty = '')
     {
@@ -350,8 +336,6 @@ class GisMultiLineString extends GisGeometry
      * @param array $row_data GIS data
      *
      * @return string the WKT for the data from ESRI shape files
-     *
-     * @access public
      */
     public function getShape(array $row_data)
     {
@@ -378,8 +362,6 @@ class GisMultiLineString extends GisGeometry
      * @param int    $index Index of the geometry
      *
      * @return array params for the GIS data editor from the value of the GIS column
-     *
-     * @access public
      */
     public function generateParams($value, $index = -1)
     {
diff --git a/libraries/classes/Gis/GisMultiPoint.php b/libraries/classes/Gis/GisMultiPoint.php
index cd4e1edf58..c4e30483ba 100644
--- a/libraries/classes/Gis/GisMultiPoint.php
+++ b/libraries/classes/Gis/GisMultiPoint.php
@@ -27,8 +27,6 @@ class GisMultiPoint extends GisGeometry
 
     /**
      * A private constructor; prevents direct creation of object.
-     *
-     * @access private
      */
     private function __construct()
     {
@@ -38,8 +36,6 @@ class GisMultiPoint extends GisGeometry
      * Returns the singleton.
      *
      * @return GisMultiPoint the singleton
-     *
-     * @access public
      */
     public static function singleton()
     {
@@ -56,8 +52,6 @@ class GisMultiPoint extends GisGeometry
      * @param string $spatial spatial data of a row
      *
      * @return array an array containing the min, max values for x and y coordinates
-     *
-     * @access public
      */
     public function scaleRow($spatial)
     {
@@ -134,8 +128,6 @@ class GisMultiPoint extends GisGeometry
      * @param TCPDF       $pdf         TCPDF instance
      *
      * @return TCPDF the modified TCPDF instance
-     *
-     * @access public
      */
     public function prepareRowAsPdf(
         $spatial,
@@ -189,8 +181,6 @@ class GisMultiPoint extends GisGeometry
      * @param array  $scale_data  Array containing data related to scaling
      *
      * @return string the code related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsSvg($spatial, $label, $point_color, array $scale_data)
     {
@@ -236,8 +226,6 @@ class GisMultiPoint extends GisGeometry
      * @param array  $scale_data  Array containing data related to scaling
      *
      * @return string JavaScript related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsOl(
         $spatial,
@@ -297,8 +285,6 @@ class GisMultiPoint extends GisGeometry
      * @param string|null $empty    Multipoint does not adhere to this
      *
      * @return string WKT with the set of parameters passed by the GIS editor
-     *
-     * @access public
      */
     public function generateWkt(array $gis_data, $index, $empty = '')
     {
@@ -328,8 +314,6 @@ class GisMultiPoint extends GisGeometry
      * @param array $row_data GIS data
      *
      * @return string the WKT for the data from ESRI shape files
-     *
-     * @access public
      */
     public function getShape(array $row_data)
     {
@@ -351,8 +335,6 @@ class GisMultiPoint extends GisGeometry
      * @param int    $index Index of the geometry
      *
      * @return array params for the GIS data editor from the value of the GIS column
-     *
-     * @access public
      */
     public function generateParams($value, $index = -1)
     {
@@ -389,8 +371,6 @@ class GisMultiPoint extends GisGeometry
      * @param int   $srid       spatial reference id
      *
      * @return string JavaScript for adding an array of points to OpenLayers
-     *
-     * @access protected
      */
     protected function getPointsArrayForOpenLayers(array $points_arr, int $srid)
     {
diff --git a/libraries/classes/Gis/GisMultiPolygon.php b/libraries/classes/Gis/GisMultiPolygon.php
index 97dffcd534..5e9f7b5df0 100644
--- a/libraries/classes/Gis/GisMultiPolygon.php
+++ b/libraries/classes/Gis/GisMultiPolygon.php
@@ -31,8 +31,6 @@ class GisMultiPolygon extends GisGeometry
 
     /**
      * A private constructor; prevents direct creation of object.
-     *
-     * @access private
      */
     private function __construct()
     {
@@ -42,8 +40,6 @@ class GisMultiPolygon extends GisGeometry
      * Returns the singleton.
      *
      * @return GisMultiPolygon the singleton
-     *
-     * @access public
      */
     public static function singleton()
     {
@@ -60,8 +56,6 @@ class GisMultiPolygon extends GisGeometry
      * @param string $spatial spatial data of a row
      *
      * @return array an array containing the min, max values for x and y coordinates
-     *
-     * @access public
      */
     public function scaleRow($spatial)
     {
@@ -175,8 +169,6 @@ class GisMultiPolygon extends GisGeometry
      * @param TCPDF       $pdf        TCPDF instance
      *
      * @return TCPDF the modified TCPDF instance
-     *
-     * @access public
      */
     public function prepareRowAsPdf($spatial, ?string $label, $fill_color, array $scale_data, $pdf)
     {
@@ -250,8 +242,6 @@ class GisMultiPolygon extends GisGeometry
      * @param array  $scale_data Array containing data related to scaling
      *
      * @return string the code related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsSvg($spatial, $label, $fill_color, array $scale_data)
     {
@@ -314,8 +304,6 @@ class GisMultiPolygon extends GisGeometry
      * @param array  $scale_data Array containing data related to scaling
      *
      * @return string JavaScript related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsOl($spatial, int $srid, $label, $fill_color, array $scale_data)
     {
@@ -361,8 +349,6 @@ class GisMultiPolygon extends GisGeometry
      * @param array  $scale_data Array containing data related to scaling
      *
      * @return string the code to draw the ring
-     *
-     * @access private
      */
     private function drawPath($polygon, array $scale_data)
     {
@@ -387,8 +373,6 @@ class GisMultiPolygon extends GisGeometry
      * @param string|null $empty    Value for empty points
      *
      * @return string WKT with the set of parameters passed by the GIS editor
-     *
-     * @access public
      */
     public function generateWkt(array $gis_data, $index, $empty = '')
     {
@@ -442,8 +426,6 @@ class GisMultiPolygon extends GisGeometry
      * @param array $row_data GIS data
      *
      * @return string the WKT for the data from ESRI shape files
-     *
-     * @access public
      */
     public function getShape(array $row_data)
     {
@@ -533,8 +515,6 @@ class GisMultiPolygon extends GisGeometry
      * @param int    $index Index of the geometry
      *
      * @return array params for the GIS data editor from the value of the GIS column
-     *
-     * @access public
      */
     public function generateParams($value, $index = -1)
     {
diff --git a/libraries/classes/Gis/GisPoint.php b/libraries/classes/Gis/GisPoint.php
index 554b729323..5fa88c5fe7 100644
--- a/libraries/classes/Gis/GisPoint.php
+++ b/libraries/classes/Gis/GisPoint.php
@@ -26,8 +26,6 @@ class GisPoint extends GisGeometry
 
     /**
      * A private constructor; prevents direct creation of object.
-     *
-     * @access private
      */
     private function __construct()
     {
@@ -37,8 +35,6 @@ class GisPoint extends GisGeometry
      * Returns the singleton.
      *
      * @return GisPoint the singleton
-     *
-     * @access public
      */
     public static function singleton()
     {
@@ -55,8 +51,6 @@ class GisPoint extends GisGeometry
      * @param string $spatial spatial data of a row
      *
      * @return array an array containing the min, max values for x and y coordinates
-     *
-     * @access public
      */
     public function scaleRow($spatial)
     {
@@ -130,8 +124,6 @@ class GisPoint extends GisGeometry
      * @param TCPDF       $pdf         TCPDF instance
      *
      * @return TCPDF the modified TCPDF instance
-     *
-     * @access public
      */
     public function prepareRowAsPdf(
         $spatial,
@@ -182,8 +174,6 @@ class GisPoint extends GisGeometry
      * @param array  $scale_data  Array containing data related to scaling
      *
      * @return string the code related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsSvg($spatial, $label, $point_color, array $scale_data)
     {
@@ -225,8 +215,6 @@ class GisPoint extends GisGeometry
      * @param array  $scale_data  Array containing data related to scaling
      *
      * @return string JavaScript related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsOl(
         $spatial,
@@ -289,8 +277,6 @@ class GisPoint extends GisGeometry
      * @param string|null $empty    Point does not adhere to this parameter
      *
      * @return string WKT with the set of parameters passed by the GIS editor
-     *
-     * @access public
      */
     public function generateWkt(array $gis_data, $index, $empty = '')
     {
@@ -310,8 +296,6 @@ class GisPoint extends GisGeometry
      * @param array $row_data GIS data
      *
      * @return string the WKT for the data from ESRI shape files
-     *
-     * @access public
      */
     public function getShape(array $row_data)
     {
@@ -326,8 +310,6 @@ class GisPoint extends GisGeometry
      * @param int    $index of the geometry
      *
      * @return array params for the GIS data editor from the value of the GIS column
-     *
-     * @access public
      */
     public function generateParams($value, $index = -1)
     {
diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php
index 335d7c3d51..8732909cad 100644
--- a/libraries/classes/Gis/GisPolygon.php
+++ b/libraries/classes/Gis/GisPolygon.php
@@ -34,8 +34,6 @@ class GisPolygon extends GisGeometry
 
     /**
      * A private constructor; prevents direct creation of object.
-     *
-     * @access private
      */
     private function __construct()
     {
@@ -45,8 +43,6 @@ class GisPolygon extends GisGeometry
      * Returns the singleton.
      *
      * @return GisPolygon the singleton
-     *
-     * @access public
      */
     public static function singleton()
     {
@@ -63,8 +59,6 @@ class GisPolygon extends GisGeometry
      * @param string $spatial spatial data of a row
      *
      * @return array an array containing the min, max values for x and y coordinates
-     *
-     * @access public
      */
     public function scaleRow($spatial)
     {
@@ -155,8 +149,6 @@ class GisPolygon extends GisGeometry
      * @param TCPDF       $pdf        TCPDF instance
      *
      * @return TCPDF the modified TCPDF instance
-     *
-     * @access public
      */
     public function prepareRowAsPdf($spatial, ?string $label, $fill_color, array $scale_data, $pdf)
     {
@@ -215,8 +207,6 @@ class GisPolygon extends GisGeometry
      * @param array  $scale_data Array containing data related to scaling
      *
      * @return string the code related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsSvg($spatial, $label, $fill_color, array $scale_data)
     {
@@ -273,8 +263,6 @@ class GisPolygon extends GisGeometry
      * @param array  $scale_data Array containing data related to scaling
      *
      * @return string JavaScript related to a row in the GIS dataset
-     *
-     * @access public
      */
     public function prepareRowAsOl($spatial, int $srid, $label, $fill_color, array $scale_data)
     {
@@ -319,8 +307,6 @@ class GisPolygon extends GisGeometry
      * @param array  $scale_data Array containing data related to scaling
      *
      * @return string the code to draw the ring
-     *
-     * @access private
      */
     private function drawPath($polygon, array $scale_data)
     {
@@ -345,8 +331,6 @@ class GisPolygon extends GisGeometry
      * @param string|null $empty    Value for empty points
      *
      * @return string WKT with the set of parameters passed by the GIS editor
-     *
-     * @access public
      */
     public function generateWkt(array $gis_data, $index, $empty = '')
     {
@@ -388,7 +372,6 @@ class GisPolygon extends GisGeometry
      *
      * @return float the area of a closed simple polygon
      *
-     * @access public
      * @static
      */
     public static function area(array $ring)
@@ -423,7 +406,6 @@ class GisPolygon extends GisGeometry
      *
      * @param array $ring array of points forming the ring
      *
-     * @access public
      * @static
      */
     public static function isOuterRing(array $ring): bool
@@ -439,7 +421,6 @@ class GisPolygon extends GisGeometry
      * @param array $point   x, y coordinates of the point
      * @param array $polygon array of points forming the ring
      *
-     * @access public
      * @static
      */
     public static function isPointInsidePolygon(array $point, array $polygon): bool
@@ -561,8 +542,6 @@ class GisPolygon extends GisGeometry
      * @param int    $index Index of the geometry
      *
      * @return array params for the GIS data editor from the value of the GIS column
-     *
-     * @access public
      */
     public function generateParams($value, $index = -1)
     {
diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php
index 7d6c009029..dedc4b6a36 100644
--- a/libraries/classes/Gis/GisVisualization.php
+++ b/libraries/classes/Gis/GisVisualization.php
@@ -97,8 +97,6 @@ class GisVisualization
      * Returns the settings array
      *
      * @return array the settings array
-     *
-     * @access public
      */
     public function getSettings()
     {
@@ -114,8 +112,6 @@ class GisVisualization
      * @param int    $pos       start position
      *
      * @return GisVisualization
-     *
-     * @access public
      */
     public static function get($sql_query, array $options, $row, $pos)
     {
@@ -159,8 +155,6 @@ class GisVisualization
      * @param int        $pos       start position
      * @param array|null $data      raw data. If set, parameters other than $options
      *                              will be ignored
-     *
-     * @access public
      */
     private function __construct($sql_query, array $options, $row, $pos, $data = null)
     {
@@ -175,8 +169,6 @@ class GisVisualization
 
     /**
      * All the variable initialization, options handling has to be done here.
-     *
-     * @access protected
      */
     protected function init(): void
     {
@@ -270,8 +262,6 @@ class GisVisualization
     /**
      * A function which handles passed parameters. Useful if desired
      * chart needs to be a little bit different from the default one.
-     *
-     * @access private
      */
     private function handleOptions(): void
     {
@@ -289,8 +279,6 @@ class GisVisualization
      * @param string $ext       extension of the file
      *
      * @return string the sanitized file name
-     *
-     * @access private
      */
     private function sanitizeName($file_name, $ext)
     {
@@ -314,8 +302,6 @@ class GisVisualization
      * @param string $file_name file name
      * @param string $type      mime type
      * @param string $ext       extension of the file
-     *
-     * @access private
      */
     private function writeToFile($file_name, $type, $ext): void
     {
@@ -327,8 +313,6 @@ class GisVisualization
      * Generate the visualization in SVG format.
      *
      * @return string the generated image resource
-     *
-     * @access private
      */
     private function svg()
     {
@@ -354,8 +338,6 @@ class GisVisualization
      * Get the visualization as a SVG.
      *
      * @return string the visualization as a SVG
-     *
-     * @access public
      */
     public function asSVG()
     {
@@ -366,8 +348,6 @@ class GisVisualization
      * Saves as a SVG image to a file.
      *
      * @param string $file_name File name
-     *
-     * @access public
      */
     public function toFileAsSvg($file_name): void
     {
@@ -380,8 +360,6 @@ class GisVisualization
      * Generate the visualization in PNG format.
      *
      * @return ImageWrapper|null the generated image resource
-     *
-     * @access private
      */
     private function png(): ?ImageWrapper
     {
@@ -407,8 +385,6 @@ class GisVisualization
      * Get the visualization as a PNG.
      *
      * @return string the visualization as a PNG
-     *
-     * @access public
      */
     public function asPng()
     {
@@ -452,7 +428,6 @@ class GisVisualization
      * @return string the code for visualization with OpenLayers
      *
      * @todo Should return JSON to avoid eval() in gis_data_editor.js
-     * @access public
      */
     public function asOl()
     {
@@ -496,8 +471,6 @@ class GisVisualization
      * Saves as a PDF to a file.
      *
      * @param string $file_name File name
-     *
-     * @access public
      */
     public function toFileAsPdf($file_name): void
     {
@@ -571,8 +544,6 @@ class GisVisualization
      * @param array $data Row data
      *
      * @return array an array containing the scale, x and y offsets
-     *
-     * @access private
      */
     private function scaleDataSet(array $data)
     {
@@ -673,8 +644,6 @@ class GisVisualization
      *                                                    TCPDF object in the case of pdf
      *
      * @return mixed the formatted array of data
-     *
-     * @access private
      */
     private function prepareDataSet(array $data, array $scale_data, $format, $results)
     {
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
index f4001fc609..e6d833f4d4 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -32,70 +32,60 @@ class Header
     /**
      * Scripts instance
      *
-     * @access private
      * @var Scripts
      */
     private $scripts;
     /**
      * PhpMyAdmin\Console instance
      *
-     * @access private
      * @var Console
      */
     private $console;
     /**
      * Menu instance
      *
-     * @access private
      * @var Menu
      */
     private $menu;
     /**
      * Whether to offer the option of importing user settings
      *
-     * @access private
      * @var bool
      */
     private $userprefsOfferImport;
     /**
      * The page title
      *
-     * @access private
      * @var string
      */
     private $title;
     /**
      * The value for the id attribute for the body tag
      *
-     * @access private
      * @var string
      */
     private $bodyId;
     /**
      * Whether to show the top menu
      *
-     * @access private
      * @var bool
      */
     private $menuEnabled;
     /**
      * Whether to show the warnings
      *
-     * @access private
      * @var bool
      */
     private $warningsEnabled;
     /**
      * Whether we are servicing an ajax request.
      *
-     * @access private
      * @var bool
      */
     private $isAjax;
     /**
      * Whether to display anything
      *
-     * @access private
      * @var bool
      */
     private $isEnabled;
@@ -103,7 +93,6 @@ class Header
      * Whether the HTTP headers (and possibly some HTML)
      * have already been sent to the browser
      *
-     * @access private
      * @var bool
      */
     private $headerIsSent;
diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php
index e4ceca98c4..f2807788fa 100644
--- a/libraries/classes/Html/Generator.php
+++ b/libraries/classes/Html/Generator.php
@@ -69,8 +69,6 @@ class Generator
      * @param string $text Text to copy to clipboard
      *
      * @return string  the html link
-     *
-     * @access public
      */
     public static function showCopyToClipboard(string $text): string
     {
@@ -103,8 +101,6 @@ class Generator
      * Returns HTML code for a tooltip
      *
      * @param string $message the message for the tooltip
-     *
-     * @access public
      */
     public static function showHint(string $message): string
     {
@@ -510,8 +506,6 @@ class Generator
      * @throws LoaderError
      * @throws RuntimeError
      * @throws SyntaxError
-     *
-     * @access public
      */
     public static function getMessage(
         $message,
@@ -769,8 +763,6 @@ class Generator
      * @param string $target anchor in documentation
      *
      * @return string  the html link
-     *
-     * @access public
      */
     public static function showPHPDocumentation($target): string
     {
@@ -785,8 +777,6 @@ class Generator
      * @param bool   $bbcode optional flag indicating whether to output bbcode
      *
      * @return string the html link
-     *
-     * @access public
      */
     public static function showDocumentationLink($link, $target = 'documentation', $bbcode = false): string
     {
@@ -813,8 +803,6 @@ class Generator
      *
      * @global string $table The current table.
      * @global string $db    The current database.
-     *
-     * @access public
      */
     public static function mysqlDie(
         $serverMessage = '',
@@ -1159,8 +1147,6 @@ class Generator
      *
      * @return string the  html content
      *
-     * @access public
-     *
      * @todo    use $pos from $_url_params
      */
     public static function getListNavigator(
@@ -1214,8 +1200,6 @@ class Generator
      * @return string the formatted sql
      *
      * @global array  $cfg the configuration array
-     *
-     * @access public
      */
     public static function formatSql($sqlQuery, $truncate = false): string
     {
diff --git a/libraries/classes/Html/MySQLDocumentation.php b/libraries/classes/Html/MySQLDocumentation.php
index 0bbc4fb5e2..b60373342c 100644
--- a/libraries/classes/Html/MySQLDocumentation.php
+++ b/libraries/classes/Html/MySQLDocumentation.php
@@ -30,8 +30,6 @@ class MySQLDocumentation
      * @param string      $anchor  anchor to page part
      *
      * @return string  the html link
-     *
-     * @access public
      */
     public static function show(
         $link,
@@ -68,8 +66,6 @@ class MySQLDocumentation
      * @param bool   $bbcode Optional flag indicating whether to output bbcode
      *
      * @return string  the html link
-     *
-     * @access public
      */
     public static function showDocumentation($page, $anchor = '', $bbcode = false): string
     {
diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php
index c180783859..ea89d854b1 100644
--- a/libraries/classes/Import.php
+++ b/libraries/classes/Import.php
@@ -79,8 +79,6 @@ class Import
 
     /**
      * Checks whether timeout is getting close
-     *
-     * @access public
      */
     public function checkTimeout(): bool
     {
@@ -111,8 +109,6 @@ class Import
      * @param string $sql     query to run
      * @param string $full    query to display, this might be commented
      * @param array  $sqlData SQL parse data storage
-     *
-     * @access public
      */
     public function executeQuery(string $sql, string $full, array &$sqlData): void
     {
@@ -189,8 +185,6 @@ class Import
      * @param string $sql     query to run
      * @param string $full    query to display, this might be commented
      * @param array  $sqlData SQL parse data storage
-     *
-     * @access public
      */
     public function runQuery(
         string $sql = '',
@@ -328,8 +322,6 @@ class Import
      * @param bool   $reload reload
      *
      * @return array (current or new db, whether to reload)
-     *
-     * @access public
      */
     public function lookForUse(?string $buffer, ?string $db, ?bool $reload): array
     {
@@ -476,8 +468,6 @@ class Import
      * @param int $num the column number
      *
      * @return string The column's "Excel" name
-     *
-     * @access public
      */
     public function getColumnAlphaName(int $num): string
     {
@@ -524,8 +514,6 @@ class Import
      * @param string $name column name(i.e. "A", or "BC", etc.)
      *
      * @return int The column number
-     *
-     * @access public
      */
     public function getColumnNumberFromName(string $name): int
     {
@@ -561,8 +549,6 @@ class Import
      * @param string $lastCumulativeSize Size of type decimal
      *
      * @return int Precision of the given decimal size notation
-     *
-     * @access public
      */
     public function getDecimalPrecision(string $lastCumulativeSize): int
     {
@@ -580,8 +566,6 @@ class Import
      * @param string $lastCumulativeSize Size of type decimal
      *
      * @return int Scale of the given decimal size notation
-     *
-     * @access public
      */
     public function getDecimalScale(string $lastCumulativeSize): int
     {
@@ -599,8 +583,6 @@ class Import
      *
      * @return array Contains the precision, scale, and full size
      *                representation of the given decimal cell
-     *
-     * @access public
      */
     public function getDecimalSize(string $cell): array
     {
@@ -628,7 +610,6 @@ class Import
      *
      * @return string|int Size of the given cell in the type-appropriate format
      *
-     * @access public
      * @todo    Handle the error cases more elegantly
      */
     public function detectSize(
@@ -855,8 +836,6 @@ class Import
      *
      * @return int  The MySQL type representation
      *               (VARCHAR or INT or BIGINT or DECIMAL or NONE)
-     *
-     * @access public
      */
     public function detectType(?int $lastCumulativeType, ?string $cell): int
     {
@@ -905,7 +884,6 @@ class Import
      *
      * @return array|bool array(array $types, array $sizes)
      *
-     * @access public
      * @todo    Handle the error case more elegantly
      */
     public function analyzeTable(array &$table)
@@ -1006,8 +984,6 @@ class Import
      * @param array|null $additionalSql Additional SQL statements to be executed
      * @param array|null $options       Associative array of options
      * @param array      $sqlData       2-element array with sql data
-     *
-     * @access public
      */
     public function buildSql(
         string $dbName,
diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php
index 1d5b65108b..79f9e3a239 100644
--- a/libraries/classes/Index.php
+++ b/libraries/classes/Index.php
@@ -591,8 +591,6 @@ class Index
      * @param string $schema schema name
      *
      * @return string  Output HTML
-     *
-     * @access public
      */
     public static function findDuplicates($table, $schema)
     {
diff --git a/libraries/classes/IpAllowDeny.php b/libraries/classes/IpAllowDeny.php
index 65d92c4371..17b84dd557 100644
--- a/libraries/classes/IpAllowDeny.php
+++ b/libraries/classes/IpAllowDeny.php
@@ -34,8 +34,6 @@ class IpAllowDeny
      *
      * @param string $testRange string of IP range to match
      * @param string $ipToTest  string of IP to test against range
-     *
-     * @access public
      */
     public function ipMaskTest($testRange, $ipToTest): bool
     {
@@ -65,8 +63,6 @@ class IpAllowDeny
      *
      * @param string $testRange string of IP range to match
      * @param string $ipToTest  string of IP to test against range
-     *
-     * @access public
      */
     public function ipv4MaskTest($testRange, $ipToTest): bool
     {
@@ -129,8 +125,6 @@ class IpAllowDeny
      *
      * @param string $test_range string of IP range to match
      * @param string $ip_to_test string of IP to test against range
-     *
-     * @access public
      */
     public function ipv6MaskTest($test_range, $ip_to_test): bool
     {
@@ -219,8 +213,6 @@ class IpAllowDeny
      * Runs through IP Allow rules the use of it below for more information
      *
      * @see     Core::getIp()
-     *
-     * @access public
      */
     public function allow(): bool
     {
@@ -231,8 +223,6 @@ class IpAllowDeny
      * Runs through IP Deny rules the use of it below for more information
      *
      * @see     Core::getIp()
-     *
-     * @access public
      */
     public function deny(): bool
     {
@@ -245,8 +235,6 @@ class IpAllowDeny
      * @see     Core::getIp()
      *
      * @param string $type 'allow' | 'deny' type of rule to match
-     *
-     * @access public
      */
     private function allowDeny($type): bool
     {
diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php
index ad6f7e6dcf..745af6cb7a 100644
--- a/libraries/classes/Menu.php
+++ b/libraries/classes/Menu.php
@@ -28,7 +28,6 @@ class Menu
     /**
      * Database name
      *
-     * @access private
      * @var string
      */
     private $db;
@@ -39,7 +38,6 @@ class Menu
     /**
      * Table name
      *
-     * @access private
      * @var string
      */
     private $table;
diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php
index 5a4cecb04e..02ef92adb8 100644
--- a/libraries/classes/Message.php
+++ b/libraries/classes/Message.php
@@ -74,7 +74,6 @@ class Message implements Stringable
     /**
      * The message number
      *
-     * @access protected
      * @var int
      */
     protected $number = self::NOTICE;
@@ -82,7 +81,6 @@ class Message implements Stringable
     /**
      * The locale string identifier
      *
-     * @access protected
      * @var    string
      */
     protected $string = '';
@@ -90,7 +88,6 @@ class Message implements Stringable
     /**
      * The formatted message
      *
-     * @access protected
      * @var    string
      */
     protected $message = '';
@@ -98,7 +95,6 @@ class Message implements Stringable
     /**
      * Whether the message was already displayed
      *
-     * @access protected
      * @var bool
      */
     protected $isDisplayed = false;
@@ -106,7 +102,6 @@ class Message implements Stringable
     /**
      * Whether to use BB code when displaying.
      *
-     * @access protected
      * @var bool
      */
     protected $useBBCode = true;
@@ -114,7 +109,6 @@ class Message implements Stringable
     /**
      * Unique id
      *
-     * @access protected
      * @var string
      */
     protected $hash = null;
@@ -122,7 +116,6 @@ class Message implements Stringable
     /**
      * holds parameters
      *
-     * @access protected
      * @var    array
      */
     protected $params = [];
@@ -130,7 +123,6 @@ class Message implements Stringable
     /**
      * holds additional messages
      *
-     * @access protected
      * @var    array
      */
     protected $addedMessages = [];
@@ -599,7 +591,6 @@ class Message implements Stringable
      *
      * @return mixed  the sanitized message(s)
      *
-     * @access public
      * @static
      */
     public static function sanitize($message)
@@ -623,7 +614,6 @@ class Message implements Stringable
      *
      * @return string  the decoded message
      *
-     * @access public
      * @static
      */
     public static function decodeBB(string $message): string
diff --git a/libraries/classes/OpenDocument.php b/libraries/classes/OpenDocument.php
index b10d98584b..5334abdd3b 100644
--- a/libraries/classes/OpenDocument.php
+++ b/libraries/classes/OpenDocument.php
@@ -30,8 +30,6 @@ EOT;
      * @param string $data document content
      *
      * @return string  OASIS OpenDocument data
-     *
-     * @access public
      */
     public static function create($mime, $data)
     {
diff --git a/libraries/classes/ParseAnalyze.php b/libraries/classes/ParseAnalyze.php
index cd618f7032..1a01f885ac 100644
--- a/libraries/classes/ParseAnalyze.php
+++ b/libraries/classes/ParseAnalyze.php
@@ -24,8 +24,6 @@ class ParseAnalyze
      * @param string $db       the current database
      *
      * @return array
-     *
-     * @access public
      */
     public static function sqlQuery($sqlQuery, $db)
     {
diff --git a/libraries/classes/Partitioning/Partition.php b/libraries/classes/Partitioning/Partition.php
index 0b28ee60f7..21c0bf1c91 100644
--- a/libraries/classes/Partitioning/Partition.php
+++ b/libraries/classes/Partitioning/Partition.php
@@ -141,8 +141,6 @@ class Partition extends SubPartition
      * @param string $table table name
      *
      * @return Partition[]
-     *
-     * @access public
      */
     public static function getPartitions($db, $table)
     {
@@ -190,8 +188,6 @@ class Partition extends SubPartition
      * @param string $table table name
      *
      * @return array   of partition names
-     *
-     * @access public
      */
     public static function getPartitionNames($db, $table)
     {
@@ -241,7 +237,6 @@ class Partition extends SubPartition
      * @static
      * @staticvar bool $have_partitioning
      * @staticvar bool $already_checked
-     * @access public
      */
     public static function havePartitioning(): bool
     {
diff --git a/libraries/classes/Pdf.php b/libraries/classes/Pdf.php
index 12e57240d7..1f694e8e69 100644
--- a/libraries/classes/Pdf.php
+++ b/libraries/classes/Pdf.php
@@ -45,8 +45,6 @@ class Pdf extends TCPDF
      * @param bool   $pdfa        If TRUE set the document to PDF/A mode.
      *
      * @throws Exception
-     *
-     * @access public
      */
     public function __construct(
         $orientation = 'P',
diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php
index 574ded6e71..a4e557150d 100644
--- a/libraries/classes/Plugins/Export/Helpers/Pdf.php
+++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php
@@ -105,8 +105,6 @@ class Pdf extends PdfLib
      * @param bool   $diskcache   if true reduce the RAM memory usage by caching
      *                            temporary data on filesystem (slower).
      * @param bool   $pdfa        If TRUE set the document to PDF/A mode.
-     *
-     * @access public
      */
     public function __construct(
         $orientation = 'P',
diff --git a/libraries/classes/Plugins/Schema/Dia/Dia.php b/libraries/classes/Plugins/Schema/Dia/Dia.php
index c070949753..756f2a03fd 100644
--- a/libraries/classes/Plugins/Schema/Dia/Dia.php
+++ b/libraries/classes/Plugins/Schema/Dia/Dia.php
@@ -20,8 +20,6 @@ use function strlen;
  * helps in developing structure of DIA Schema Export
  *
  * @see     https://www.php.net/manual/en/book.xmlwriter.php
- *
- * @access  public
  */
 class Dia extends XMLWriter
 {
@@ -65,8 +63,6 @@ class Dia extends XMLWriter
      * @param float  $leftMargin   left margin of the paper/document in cm
      * @param float  $rightMargin  right margin of the paper/document in cm
      * @param string $orientation  orientation of the document, portrait or landscape
-     *
-     * @access public
      */
     public function startDiaDoc(
         $paper,
@@ -159,8 +155,6 @@ class Dia extends XMLWriter
      *
      * @see XMLWriter::endElement()
      * @see XMLWriter::endDocument()
-     *
-     * @access public
      */
     public function endDiaDoc(): void
     {
@@ -174,8 +168,6 @@ class Dia extends XMLWriter
      * @see    XMLWriter::flush()
      *
      * @param string $fileName name of the dia document
-     *
-     * @access public
      */
     public function showOutput($fileName): void
     {
diff --git a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
index 8f13d518c8..2669779bd8 100644
--- a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
@@ -150,8 +150,6 @@ class DiaRelationSchema extends ExportRelationSchema
 
     /**
      * Output Dia Document for download
-     *
-     * @access public
      */
     public function showOutput(): void
     {
@@ -168,8 +166,6 @@ class DiaRelationSchema extends ExportRelationSchema
      * @param string $foreignTable The foreign table name
      * @param string $foreignField The relation field in the foreign table
      * @param bool   $showKeys     Whether to display ONLY keys or not
-     *
-     * @access private
      */
     private function addRelation(
         $masterTable,
@@ -215,8 +211,6 @@ class DiaRelationSchema extends ExportRelationSchema
      * type Database - Reference
      *
      * @see    RelationStatsDia::relationDraw()
-     *
-     * @access private
      */
     private function drawRelations(): void
     {
@@ -232,8 +226,6 @@ class DiaRelationSchema extends ExportRelationSchema
      * primary fields are underlined and bold in tables
      *
      * @see    TableStatsDia::tableDraw()
-     *
-     * @access private
      */
     private function drawTables(): void
     {
diff --git a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
index 53bfcca4ac..9fce1f173d 100644
--- a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
+++ b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
@@ -90,8 +90,6 @@ class RelationStatsDia
      * @param string        $column The relation column name
      *
      * @return array Table right,left connection points and key position
-     *
-     * @access private
      */
     private function getXy($table, $column)
     {
@@ -131,8 +129,6 @@ class RelationStatsDia
      *                        this
      *
      * @return bool|void
-     *
-     * @access public
      */
     public function relationDraw($showColor)
     {
diff --git a/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php
index edc390e701..36e4e9f558 100644
--- a/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php
+++ b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php
@@ -84,8 +84,6 @@ class TableStatsDia extends TableStats
      *                        if showColor is true then an array of $listOfColors
      *                        will be used to choose the random colors for tables
      *                        text we can change/add more colors to this array
-     *
-     * @access public
      */
     public function tableDraw($showColor): void
     {
diff --git a/libraries/classes/Plugins/Schema/Eps/Eps.php b/libraries/classes/Plugins/Schema/Eps/Eps.php
index e92d511b43..4e62f4b6ad 100644
--- a/libraries/classes/Plugins/Schema/Eps/Eps.php
+++ b/libraries/classes/Plugins/Schema/Eps/Eps.php
@@ -17,8 +17,6 @@ use function strlen;
  * helps in developing structure of EPS Schema Export
  *
  * @see     https://www.php.net/manual/en/book.xmlwriter.php
- *
- * @access  public
  */
 class Eps
 {
diff --git a/libraries/classes/Plugins/Schema/ExportRelationSchema.php b/libraries/classes/Plugins/Schema/ExportRelationSchema.php
index 211b6f4a9f..bbdd8de5f1 100644
--- a/libraries/classes/Plugins/Schema/ExportRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/ExportRelationSchema.php
@@ -149,8 +149,6 @@ class ExportRelationSchema
      * Set Show only keys
      *
      * @param bool $value show only keys or not
-     *
-     * @access public
      */
     public function setShowKeys(bool $value): void
     {
@@ -169,8 +167,6 @@ class ExportRelationSchema
      * Set Orientation
      *
      * @param string $value Orientation will be portrait or landscape
-     *
-     * @access public
      */
     public function setOrientation(string $value): void
     {
@@ -191,8 +187,6 @@ class ExportRelationSchema
      * Set type of paper
      *
      * @param string $value paper type can be A4 etc
-     *
-     * @access public
      */
     public function setPaper(string $value): void
     {
@@ -213,8 +207,6 @@ class ExportRelationSchema
      * Set whether the document is generated from client side DB
      *
      * @param bool $value offline or not
-     *
-     * @access public
      */
     public function setOffline(bool $value): void
     {
@@ -223,8 +215,6 @@ class ExportRelationSchema
 
     /**
      * Returns whether the client side database is used
-     *
-     * @access public
      */
     public function isOffline(): bool
     {
@@ -282,8 +272,6 @@ class ExportRelationSchema
      * @param int    $pageNumber    ID of the chosen page
      * @param string $type          Schema Type
      * @param string $error_message The error message
-     *
-     * @access public
      */
     public static function dieSchema($pageNumber, $type = '', $error_message = ''): void
     {
diff --git a/libraries/classes/Plugins/Schema/Pdf/Pdf.php b/libraries/classes/Plugins/Schema/Pdf/Pdf.php
index 35fbb656ef..c0aa515fbc 100644
--- a/libraries/classes/Plugins/Schema/Pdf/Pdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/Pdf.php
@@ -36,8 +36,6 @@ if (getcwd() == __DIR__) {
  * in developing the structure of PDF Schema Export
  *
  * @see     TCPDF
- *
- * @access  public
  */
 class Pdf extends PdfLib
 {
@@ -92,8 +90,6 @@ class Pdf extends PdfLib
      * @param int    $pageNumber  schema page number that is being exported
      * @param bool   $withDoc     with document dictionary
      * @param string $db          the database name
-     *
-     * @access public
      */
     public function __construct(
         $orientation,
@@ -436,8 +432,6 @@ class Pdf extends PdfLib
      * Set whether the document is generated from client side DB
      *
      * @param bool $value whether offline
-     *
-     * @access private
      */
     public function setOffline($value): void
     {
diff --git a/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
index 32f1c5e38b..af9f165352 100644
--- a/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
@@ -50,8 +50,6 @@ class RelationStatsPdf extends RelationStats
      *
      * @param bool $showColor Whether to use one color per relation or not
      * @param int  $i         The id of the link to draw
-     *
-     * @access public
      */
     public function relationDraw($showColor, $i): void
     {
diff --git a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
index fc8166ba26..f84161fe15 100644
--- a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
@@ -113,8 +113,6 @@ class TableStatsPdf extends TableStats
      * @see    PMA_Schema_PDF
      *
      * @param int $fontSize The font size
-     *
-     * @access private
      */
     private function setWidth($fontSize): void
     {
@@ -137,8 +135,6 @@ class TableStatsPdf extends TableStats
 
     /**
      * Sets the height of the table
-     *
-     * @access private
      */
     private function setHeight(): void
     {
@@ -153,8 +149,6 @@ class TableStatsPdf extends TableStats
      * @param int|null $fontSize The font size or null to use the default value
      * @param bool     $withDoc  Whether to include links to documentation
      * @param bool     $setColor Whether to display color
-     *
-     * @access public
      */
     public function tableDraw(?int $fontSize, bool $withDoc, bool $setColor = false): void
     {
diff --git a/libraries/classes/Plugins/Schema/RelationStats.php b/libraries/classes/Plugins/Schema/RelationStats.php
index 6962410575..d4f31801da 100644
--- a/libraries/classes/Plugins/Schema/RelationStats.php
+++ b/libraries/classes/Plugins/Schema/RelationStats.php
@@ -113,8 +113,6 @@ abstract class RelationStats
      * @param string     $column The relation column name
      *
      * @return array Arrows coordinates
-     *
-     * @access private
      */
     private function getXy($table, $column)
     {
diff --git a/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php
index 4b444d9cde..a4b6777b13 100644
--- a/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php
+++ b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php
@@ -48,8 +48,6 @@ class RelationStatsSvg extends RelationStats
      * @see    PMA_SVG
      *
      * @param bool $showColor Whether to use one color per relation or not
-     *
-     * @access public
      */
     public function relationDraw($showColor): void
     {
diff --git a/libraries/classes/Plugins/Schema/Svg/Svg.php b/libraries/classes/Plugins/Schema/Svg/Svg.php
index 3396135145..d464fe2412 100644
--- a/libraries/classes/Plugins/Schema/Svg/Svg.php
+++ b/libraries/classes/Plugins/Schema/Svg/Svg.php
@@ -21,8 +21,6 @@ use function strlen;
  * helps in developing structure of SVG Schema Export
  *
  * @see     https://www.php.net/manual/en/book.xmlwriter.php
- *
- * @access  public
  */
 class Svg extends XMLWriter
 {
diff --git a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php
index 9c370b2b53..8e89093aac 100644
--- a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php
+++ b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php
@@ -95,8 +95,6 @@ class TableStatsSvg extends TableStats
      *
      * @param string $font     The font size
      * @param int    $fontSize The font size
-     *
-     * @access private
      */
     private function setWidthTable($font, $fontSize): void
     {
@@ -135,8 +133,6 @@ class TableStatsSvg extends TableStats
      * @see Svg::printElement
      *
      * @param bool $showColor Whether to display color
-     *
-     * @access public
      */
     public function tableDraw($showColor): void
     {
diff --git a/libraries/classes/ResponseRenderer.php b/libraries/classes/ResponseRenderer.php
index a886b43d17..95790034ef 100644
--- a/libraries/classes/ResponseRenderer.php
+++ b/libraries/classes/ResponseRenderer.php
@@ -28,7 +28,6 @@ class ResponseRenderer
     /**
      * Response instance
      *
-     * @access private
      * @static
      * @var ResponseRenderer
      */
@@ -36,14 +35,12 @@ class ResponseRenderer
     /**
      * Header instance
      *
-     * @access private
      * @var Header
      */
     protected $header;
     /**
      * HTML data to be used in the response
      *
-     * @access private
      * @var string
      */
     private $HTML;
@@ -51,28 +48,24 @@ class ResponseRenderer
      * An array of JSON key-value pairs
      * to be sent back for ajax requests
      *
-     * @access private
      * @var array
      */
     private $JSON;
     /**
      * PhpMyAdmin\Footer instance
      *
-     * @access private
      * @var Footer
      */
     protected $footer;
     /**
      * Whether we are servicing an ajax request.
      *
-     * @access private
      * @var bool
      */
     protected $isAjax = false;
     /**
      * Whether response object is disabled
      *
-     * @access private
      * @var bool
      */
     private $isDisabled;
@@ -80,7 +73,6 @@ class ResponseRenderer
      * Whether there were any errors during the processing of the request
      * Only used for ajax responses
      *
-     * @access private
      * @var bool
      */
     protected $isSuccess;
diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php
index 9bbc92d7bd..f8366aec60 100644
--- a/libraries/classes/Sanitize.php
+++ b/libraries/classes/Sanitize.php
@@ -270,8 +270,6 @@ class Sanitize
      * @param bool   $add_backquotes whether to add backquotes to the string or not
      *
      * @return string   the formatted string
-     *
-     * @access public
      */
     public static function jsFormat($a_string = '', $add_backquotes = true)
     {
@@ -375,8 +373,6 @@ class Sanitize
      * Removes all variables from request except allowed ones.
      *
      * @param string[] $allowList list of variables to allow
-     *
-     * @access public
      */
     public static function removeRequestVars(&$allowList): void
     {
diff --git a/libraries/classes/StorageEngine.php b/libraries/classes/StorageEngine.php
index 55abd7fc71..aadbcaaec3 100644
--- a/libraries/classes/StorageEngine.php
+++ b/libraries/classes/StorageEngine.php
@@ -100,7 +100,6 @@ class StorageEngine
      *
      * @static
      * @staticvar array $storage_engines storage engines
-     * @access public
      */
     public static function getStorageEngines()
     {
diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php
index 314a089788..b15b1e699f 100644
--- a/libraries/classes/Table.php
+++ b/libraries/classes/Table.php
@@ -2008,8 +2008,6 @@ class Table implements Stringable
      * Get all column names which are MySQL reserved words
      *
      * @return array
-     *
-     * @access public
      */
     public function getReservedColumnNames()
     {
diff --git a/libraries/classes/Theme.php b/libraries/classes/Theme.php
index ee1e38f909..6dcb7950df 100644
--- a/libraries/classes/Theme.php
+++ b/libraries/classes/Theme.php
@@ -32,49 +32,28 @@ use const E_USER_ERROR;
  */
 class Theme
 {
-    /**
-     * @var string theme version
-     * @access protected
-     */
+    /** @var string theme version */
     public $version = '0.0.0.0';
 
-    /**
-     * @var string theme name
-     * @access protected
-     */
+    /** @var string theme name */
     public $name = '';
 
-    /**
-     * @var string theme id
-     * @access protected
-     */
+    /** @var string theme id */
     public $id = '';
 
-    /**
-     * @var string theme path
-     * @access protected
-     */
+    /** @var string theme path */
     public $path = '';
 
     /** @var string file system theme path */
     private $fsPath = '';
 
-    /**
-     * @var string image path as an URL
-     * @access protected
-     */
+    /** @var string image path as an URL */
     public $imgPath = '';
 
-    /**
-     * @var string image path on the file-system
-     * @access protected
-     */
+    /** @var string image path on the file-system */
     public $imgPathFs = '';
 
-    /**
-     * @var int last modification time for info file
-     * @access protected
-     */
+    /** @var int last modification time for info file */
     public $mtimeInfo = 0;
 
     /**
@@ -82,14 +61,11 @@ class Theme
      * is identical
      *
      * @var int filesize for info file
-     * @access protected
      */
     public $filesizeInfo = 0;
 
     /**
      * Loads theme information
-     *
-     * @access public
      */
     public function loadInfo(): bool
     {
@@ -163,8 +139,6 @@ class Theme
 
     /**
      * checks image path for existence - if not found use img from fallback theme
-     *
-     * @access public
      */
     public function checkImgPath(): bool
     {
@@ -204,8 +178,6 @@ class Theme
      * returns path to theme
      *
      * @return string path to theme
-     *
-     * @access public
      */
     public function getPath()
     {
@@ -226,8 +198,6 @@ class Theme
      * set path to theme
      *
      * @param string $path path to theme
-     *
-     * @access public
      */
     public function setPath($path): void
     {
@@ -248,8 +218,6 @@ class Theme
      * sets version
      *
      * @param string $version version to set
-     *
-     * @access public
      */
     public function setVersion($version): void
     {
@@ -260,8 +228,6 @@ class Theme
      * returns version
      *
      * @return string version
-     *
-     * @access public
      */
     public function getVersion()
     {
@@ -273,8 +239,6 @@ class Theme
      * returns true if theme version is equal or higher to $version
      *
      * @param string $version version to compare to
-     *
-     * @access public
      */
     public function checkVersion($version): bool
     {
@@ -285,8 +249,6 @@ class Theme
      * sets name
      *
      * @param string $name name to set
-     *
-     * @access public
      */
     public function setName($name): void
     {
@@ -297,8 +259,6 @@ class Theme
      * returns name
      *
      * @return string name
-     *
-     * @access public
      */
     public function getName()
     {
@@ -309,8 +269,6 @@ class Theme
      * sets id
      *
      * @param string $id new id
-     *
-     * @access public
      */
     public function setId($id): void
     {
@@ -321,8 +279,6 @@ class Theme
      * returns id
      *
      * @return string id
-     *
-     * @access public
      */
     public function getId()
     {
@@ -333,8 +289,6 @@ class Theme
      * Sets path to images for the theme
      *
      * @param string $path path to images for this theme as an URL path
-     *
-     * @access public
      */
     public function setImgPath($path): void
     {
@@ -360,8 +314,6 @@ class Theme
      * @param string $fallback fallback image
      *
      * @return string image path for this theme
-     *
-     * @access public
      */
     public function getImgPath($file = null, $fallback = null)
     {
diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php
index 457f768441..9c10859f21 100644
--- a/libraries/classes/ThemeManager.php
+++ b/libraries/classes/ThemeManager.php
@@ -27,16 +27,12 @@ class ThemeManager
     /**
      * ThemeManager instance
      *
-     * @access private
      * @static
      * @var ThemeManager
      */
     private static $instance;
 
-    /**
-     * @var string file-system path to the theme folder
-     * @access protected
-     */
+    /** @var string file-system path to the theme folder */
     private $themesPath;
 
     /** @var string path to theme folder as an URL */
@@ -127,8 +123,6 @@ class ThemeManager
      * sets if there are different themes per server
      *
      * @param bool $perServer Whether to enable per server flag
-     *
-     * @access public
      */
     public function setThemePerServer($perServer): void
     {
@@ -139,8 +133,6 @@ class ThemeManager
      * Sets active theme
      *
      * @param string|null $theme theme name
-     *
-     * @access public
      */
     public function setActiveTheme(?string $theme): bool
     {
@@ -169,8 +161,6 @@ class ThemeManager
      * Returns name for storing theme
      *
      * @return string cookie name
-     *
-     * @access public
      */
     public function getThemeCookieName()
     {
@@ -186,8 +176,6 @@ class ThemeManager
      * returns name of theme stored in the cookie
      *
      * @return string|false theme name from cookie or false
-     *
-     * @access public
      */
     public function getThemeCookie()
     {
@@ -205,8 +193,6 @@ class ThemeManager
      * save theme in cookie
      *
      * @return true
-     *
-     * @access public
      */
     public function setThemeCookie(): bool
     {
@@ -259,8 +245,6 @@ class ThemeManager
      * checks if given theme name is a known theme
      *
      * @param string|null $theme name fo theme to check for
-     *
-     * @access public
      */
     public function checkTheme(?string $theme): bool
     {
diff --git a/libraries/classes/Transformations.php b/libraries/classes/Transformations.php
index 2d119875fd..25bddc10b0 100644
--- a/libraries/classes/Transformations.php
+++ b/libraries/classes/Transformations.php
@@ -109,7 +109,6 @@ class Transformations
      * @return array    array[mimetype], array[transformation]
      *
      * @staticvar array $stack
-     * @access public
      */
     public function getAvailableMimeTypes(): array
     {
@@ -280,8 +279,6 @@ class Transformations
      * @param bool   $fullName whether to use full column names as the key
      *
      * @return array|null [field_name][field_key] = field_value
-     *
-     * @access public
      */
     public function getMime($db, $table, $strict = false, $fullName = false)
     {
@@ -352,8 +349,6 @@ class Transformations
      * @param string $inputTransformOpts the input transformation options of the column
      * @param bool   $forcedelete        force delete, will erase any existing
      *                                   comments for this column
-     *
-     * @access public
      */
     public function setMime(
         $db,
diff --git a/libraries/classes/Url.php b/libraries/classes/Url.php
index 6b48b01c34..34a8ec66e3 100644
--- a/libraries/classes/Url.php
+++ b/libraries/classes/Url.php
@@ -33,8 +33,6 @@ class Url
      *                             (can be an array of strings)
      *
      * @return string   string with input fields
-     *
-     * @access public
      */
     public static function getHiddenInputs(
         $db = '',
@@ -168,8 +166,6 @@ class Url
      * @param string                        $divider optional character to use instead of '?'
      *
      * @return string   string with URL parameters
-     *
-     * @access public
      */
     public static function getCommon(array $params = [], $divider = '?')
     {
@@ -203,8 +199,6 @@ class Url
      * @param string                            $divider optional character to use instead of '?'
      *
      * @return string   string with URL parameters
-     *
-     * @access public
      */
     public static function getCommonRaw(array $params = [], $divider = '?')
     {
@@ -246,8 +240,6 @@ class Url
      *                       currently 'none' or 'html'
      *
      * @return string  character used for separating url parts usually ; or &
-     *
-     * @access public
      */
     public static function getArgSeparator($encode = 'none')
     {
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index a7fb1f1e11..90e4c00558 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -121,8 +121,6 @@ class Util
      * @param int|float|string $maxUploadSize the size
      *
      * @return string the message
-     *
-     * @access public
      */
     public static function getFormattedMaximumUploadSize($maxUploadSize): string
     {
@@ -141,8 +139,6 @@ class Util
      * @param string $name the string to escape
      *
      * @return string the escaped string
-     *
-     * @access public
      */
     public static function escapeMysqlWildcards($name): string
     {
@@ -156,8 +152,6 @@ class Util
      * @param string $name the string to escape
      *
      * @return string the escaped string
-     *
-     * @access public
      */
     public static function unescapeMysqlWildcards($name): string
     {
@@ -206,8 +200,6 @@ class Util
      * @param string $anchor anchor to page part
      *
      * @return string  the URL link
-     *
-     * @access public
      */
     public static function getMySQLDocuURL(string $link, string $anchor = ''): string
     {
@@ -448,8 +440,6 @@ class Util
      * @param int                   $comma the number of decimals to retain
      *
      * @return array|null the formatted value and its unit
-     *
-     * @access public
      */
     public static function formatByteDown($value, $limes = 6, $comma = 0): ?array
     {
@@ -530,8 +520,6 @@ class Util
      * @param bool             $noTrailingZero removes trailing zeros right of the comma (default: true)
      *
      * @return string   the formatted value and its unit
-     *
-     * @access public
      */
     public static function formatNumber(
         $value,
@@ -668,8 +656,6 @@ class Util
      * @param string $format    format
      *
      * @return string   the formatted date
-     *
-     * @access public
      */
     public static function localisedDate($timestamp = -1, $format = '')
     {
@@ -828,8 +814,6 @@ class Util
      * @param string[] $params  The names of the parameters needed by the calling
      *                          script
      * @param bool     $request Check parameters in request
-     *
-     * @access public
      */
     public static function checkParameters($params, $request = false): void
     {
@@ -1105,8 +1089,6 @@ class Util
      * @param int    $range       Near the current page, how many pages should
      *                            be considered "nearby" and displayed as well?
      * @param string $prompt      The prompt to display (sometimes empty)
-     *
-     * @access public
      */
     public static function pageselector(
         $name,
@@ -1247,8 +1229,6 @@ class Util
      * @param int $maxCount number of items per page
      *
      * @return int $page_num
-     *
-     * @access public
      */
     public static function getPageFromPosition($pos, $maxCount)
     {
diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php
index 0e12115616..d8b49c91a8 100644
--- a/test/classes/BookmarkTest.php
+++ b/test/classes/BookmarkTest.php
@@ -15,8 +15,6 @@ class BookmarkTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/Config/ConfigFileTest.php b/test/classes/Config/ConfigFileTest.php
index d7be3ea2eb..1a8af14f05 100644
--- a/test/classes/Config/ConfigFileTest.php
+++ b/test/classes/Config/ConfigFileTest.php
@@ -31,8 +31,6 @@ class ConfigFileTest extends AbstractTestCase
 
     /**
      * Setup function for test cases
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/ConfigStorage/RelationTest.php b/test/classes/ConfigStorage/RelationTest.php
index f8a8fdb80e..298cf06f49 100644
--- a/test/classes/ConfigStorage/RelationTest.php
+++ b/test/classes/ConfigStorage/RelationTest.php
@@ -23,8 +23,6 @@ class RelationTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/Controllers/Table/IndexesControllerTest.php b/test/classes/Controllers/Table/IndexesControllerTest.php
index ae54d1046a..8cd1da9ffa 100644
--- a/test/classes/Controllers/Table/IndexesControllerTest.php
+++ b/test/classes/Controllers/Table/IndexesControllerTest.php
@@ -28,8 +28,6 @@ class IndexesControllerTest extends AbstractTestCase
 {
     /**
      * Setup function for test cases
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/Controllers/Table/SearchControllerTest.php b/test/classes/Controllers/Table/SearchControllerTest.php
index b4699331ec..64306193ff 100644
--- a/test/classes/Controllers/Table/SearchControllerTest.php
+++ b/test/classes/Controllers/Table/SearchControllerTest.php
@@ -32,8 +32,6 @@ class SearchControllerTest extends AbstractTestCase
 
     /**
      * Setup function for test cases
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php
index fb08312954..c9cb258d9e 100644
--- a/test/classes/Database/QbeTest.php
+++ b/test/classes/Database/QbeTest.php
@@ -21,8 +21,6 @@ class QbeTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -58,8 +56,6 @@ class QbeTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php
index 35eea02f32..808c5b9fad 100644
--- a/test/classes/Database/SearchTest.php
+++ b/test/classes/Database/SearchTest.php
@@ -20,8 +20,6 @@ class SearchTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -55,8 +53,6 @@ class SearchTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Dbal/DbiMysqliTest.php b/test/classes/Dbal/DbiMysqliTest.php
index 06cec6d4f7..29d303505f 100644
--- a/test/classes/Dbal/DbiMysqliTest.php
+++ b/test/classes/Dbal/DbiMysqliTest.php
@@ -24,8 +24,6 @@ class DbiMysqliTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php
index 40cc8d82e9..a4afab0abc 100644
--- a/test/classes/Display/ResultsTest.php
+++ b/test/classes/Display/ResultsTest.php
@@ -49,8 +49,6 @@ class ResultsTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -76,8 +74,6 @@ class ResultsTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Engines/BdbTest.php b/test/classes/Engines/BdbTest.php
index 83473baad4..1be43f6603 100644
--- a/test/classes/Engines/BdbTest.php
+++ b/test/classes/Engines/BdbTest.php
@@ -20,8 +20,6 @@ class BdbTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -33,8 +31,6 @@ class BdbTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Engines/BinlogTest.php b/test/classes/Engines/BinlogTest.php
index f1f54a4afd..045dc6d983 100644
--- a/test/classes/Engines/BinlogTest.php
+++ b/test/classes/Engines/BinlogTest.php
@@ -18,8 +18,6 @@ class BinlogTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -31,8 +29,6 @@ class BinlogTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php
index 5e434e8c52..4335ac2fd8 100644
--- a/test/classes/Engines/InnodbTest.php
+++ b/test/classes/Engines/InnodbTest.php
@@ -20,8 +20,6 @@ class InnodbTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -33,8 +31,6 @@ class InnodbTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Engines/MemoryTest.php b/test/classes/Engines/MemoryTest.php
index 584b798789..a24b1e955c 100644
--- a/test/classes/Engines/MemoryTest.php
+++ b/test/classes/Engines/MemoryTest.php
@@ -18,8 +18,6 @@ class MemoryTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -31,8 +29,6 @@ class MemoryTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Engines/MrgMyisamTest.php b/test/classes/Engines/MrgMyisamTest.php
index 987da74a3f..20ac355d6a 100644
--- a/test/classes/Engines/MrgMyisamTest.php
+++ b/test/classes/Engines/MrgMyisamTest.php
@@ -18,8 +18,6 @@ class MrgMyisamTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -31,8 +29,6 @@ class MrgMyisamTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Engines/MyisamTest.php b/test/classes/Engines/MyisamTest.php
index 98ca6a9140..1ab9145aae 100644
--- a/test/classes/Engines/MyisamTest.php
+++ b/test/classes/Engines/MyisamTest.php
@@ -20,8 +20,6 @@ class MyisamTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -33,8 +31,6 @@ class MyisamTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Engines/NdbclusterTest.php b/test/classes/Engines/NdbclusterTest.php
index 99442fff5f..b723987614 100644
--- a/test/classes/Engines/NdbclusterTest.php
+++ b/test/classes/Engines/NdbclusterTest.php
@@ -18,8 +18,6 @@ class NdbclusterTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -31,8 +29,6 @@ class NdbclusterTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Engines/PbxtTest.php b/test/classes/Engines/PbxtTest.php
index 513be15d5a..4881791135 100644
--- a/test/classes/Engines/PbxtTest.php
+++ b/test/classes/Engines/PbxtTest.php
@@ -22,8 +22,6 @@ class PbxtTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -36,8 +34,6 @@ class PbxtTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Engines/PerformanceSchemaTest.php b/test/classes/Engines/PerformanceSchemaTest.php
index 4336c6ad00..8829cf4562 100644
--- a/test/classes/Engines/PerformanceSchemaTest.php
+++ b/test/classes/Engines/PerformanceSchemaTest.php
@@ -18,8 +18,6 @@ class PerformanceSchemaTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -31,8 +29,6 @@ class PerformanceSchemaTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php
index e1d96a7256..a6a656707b 100644
--- a/test/classes/ErrorHandlerTest.php
+++ b/test/classes/ErrorHandlerTest.php
@@ -25,8 +25,6 @@ class ErrorHandlerTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -41,8 +39,6 @@ class ErrorHandlerTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php
index aaa119c030..27061e0988 100644
--- a/test/classes/ErrorTest.php
+++ b/test/classes/ErrorTest.php
@@ -15,17 +15,12 @@ use const DIRECTORY_SEPARATOR;
  */
 class ErrorTest extends AbstractTestCase
 {
-    /**
-     * @var Error
-     * @access protected
-     */
+    /** @var Error */
     protected $object;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -36,8 +31,6 @@ class ErrorTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index 51e2b7f40c..679734704f 100644
--- a/test/classes/FooterTest.php
+++ b/test/classes/FooterTest.php
@@ -24,8 +24,6 @@ class FooterTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -53,8 +51,6 @@ class FooterTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php
index eda5ca61ae..42b366cda3 100644
--- a/test/classes/Gis/GisGeometryCollectionTest.php
+++ b/test/classes/Gis/GisGeometryCollectionTest.php
@@ -23,8 +23,6 @@ class GisGeometryCollectionTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -35,8 +33,6 @@ class GisGeometryCollectionTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Gis/GisGeometryTest.php b/test/classes/Gis/GisGeometryTest.php
index 8bff73e949..58d47c6560 100644
--- a/test/classes/Gis/GisGeometryTest.php
+++ b/test/classes/Gis/GisGeometryTest.php
@@ -19,8 +19,6 @@ class GisGeometryTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -31,8 +29,6 @@ class GisGeometryTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Gis/GisLineStringTest.php b/test/classes/Gis/GisLineStringTest.php
index a83fc7b2b5..fbfa38029f 100644
--- a/test/classes/Gis/GisLineStringTest.php
+++ b/test/classes/Gis/GisLineStringTest.php
@@ -15,17 +15,12 @@ use function preg_match;
  */
 class GisLineStringTest extends GisGeomTestCase
 {
-    /**
-     * @var    GisLineString
-     * @access protected
-     */
+    /** @var    GisLineString */
     protected $object;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -36,8 +31,6 @@ class GisLineStringTest extends GisGeomTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Gis/GisMultiLineStringTest.php b/test/classes/Gis/GisMultiLineStringTest.php
index 28bb824ea5..0afc3680e0 100644
--- a/test/classes/Gis/GisMultiLineStringTest.php
+++ b/test/classes/Gis/GisMultiLineStringTest.php
@@ -15,17 +15,12 @@ use function preg_match;
  */
 class GisMultiLineStringTest extends GisGeomTestCase
 {
-    /**
-     * @var    GisMultiLineString
-     * @access protected
-     */
+    /** @var    GisMultiLineString */
     protected $object;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -36,8 +31,6 @@ class GisMultiLineStringTest extends GisGeomTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Gis/GisMultiPointTest.php b/test/classes/Gis/GisMultiPointTest.php
index c480425512..5ec5dcebcf 100644
--- a/test/classes/Gis/GisMultiPointTest.php
+++ b/test/classes/Gis/GisMultiPointTest.php
@@ -15,17 +15,12 @@ use function preg_match;
  */
 class GisMultiPointTest extends GisGeomTestCase
 {
-    /**
-     * @var    GisMultiPoint
-     * @access protected
-     */
+    /** @var    GisMultiPoint */
     protected $object;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -36,8 +31,6 @@ class GisMultiPointTest extends GisGeomTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Gis/GisMultiPolygonTest.php b/test/classes/Gis/GisMultiPolygonTest.php
index 783c37f9aa..ac388a790a 100644
--- a/test/classes/Gis/GisMultiPolygonTest.php
+++ b/test/classes/Gis/GisMultiPolygonTest.php
@@ -15,17 +15,12 @@ use function preg_match;
  */
 class GisMultiPolygonTest extends GisGeomTestCase
 {
-    /**
-     * @var    GisMultiPolygon
-     * @access protected
-     */
+    /** @var    GisMultiPolygon */
     protected $object;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -36,8 +31,6 @@ class GisMultiPolygonTest extends GisGeomTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Gis/GisPointTest.php b/test/classes/Gis/GisPointTest.php
index 2ba27e4930..8f5192b09d 100644
--- a/test/classes/Gis/GisPointTest.php
+++ b/test/classes/Gis/GisPointTest.php
@@ -13,17 +13,12 @@ use TCPDF;
  */
 class GisPointTest extends GisGeomTestCase
 {
-    /**
-     * @var    GisPoint
-     * @access protected
-     */
+    /** @var    GisPoint */
     protected $object;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -34,8 +29,6 @@ class GisPointTest extends GisGeomTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Gis/GisPolygonTest.php b/test/classes/Gis/GisPolygonTest.php
index efe02d0fa9..98598e9b92 100644
--- a/test/classes/Gis/GisPolygonTest.php
+++ b/test/classes/Gis/GisPolygonTest.php
@@ -15,17 +15,12 @@ use function preg_match;
  */
 class GisPolygonTest extends GisGeomTestCase
 {
-    /**
-     * @var    GisPolygon
-     * @access protected
-     */
+    /** @var    GisPolygon */
     protected $object;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -36,8 +31,6 @@ class GisPolygonTest extends GisGeomTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/LinterTest.php b/test/classes/LinterTest.php
index dab91e2cd0..47078a94b5 100644
--- a/test/classes/LinterTest.php
+++ b/test/classes/LinterTest.php
@@ -16,8 +16,6 @@ class LinterTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php
index 8b75163694..d9b9b9f7ed 100644
--- a/test/classes/MessageTest.php
+++ b/test/classes/MessageTest.php
@@ -13,17 +13,12 @@ use function md5;
  */
 class MessageTest extends AbstractTestCase
 {
-    /**
-     * @var Message
-     * @access protected
-     */
+    /** @var Message */
     protected $object;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/Navigation/NavigationTest.php b/test/classes/Navigation/NavigationTest.php
index 315a6ba66b..876a671e43 100644
--- a/test/classes/Navigation/NavigationTest.php
+++ b/test/classes/Navigation/NavigationTest.php
@@ -22,8 +22,6 @@ class NavigationTest extends AbstractTestCase
 
     /**
      * Sets up the fixture.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -51,8 +49,6 @@ class NavigationTest extends AbstractTestCase
 
     /**
      * Tears down the fixture.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Navigation/NavigationTreeTest.php b/test/classes/Navigation/NavigationTreeTest.php
index 89eabca501..615e446773 100644
--- a/test/classes/Navigation/NavigationTreeTest.php
+++ b/test/classes/Navigation/NavigationTreeTest.php
@@ -18,8 +18,6 @@ class NavigationTreeTest extends AbstractTestCase
 
     /**
      * Sets up the fixture.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -44,8 +42,6 @@ class NavigationTreeTest extends AbstractTestCase
 
     /**
      * Tears down the fixture.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
index 23bfa700b2..1a31cb6cbc 100644
--- a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
+++ b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
@@ -25,8 +25,6 @@ class NodeDatabaseChildTest extends AbstractTestCase
 
     /**
      * Sets up the fixture.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -46,8 +44,6 @@ class NodeDatabaseChildTest extends AbstractTestCase
 
     /**
      * Tears down the fixture.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Import/ImportCsvTest.php b/test/classes/Plugins/Import/ImportCsvTest.php
index c0cadfe6aa..4798f278aa 100644
--- a/test/classes/Plugins/Import/ImportCsvTest.php
+++ b/test/classes/Plugins/Import/ImportCsvTest.php
@@ -23,8 +23,6 @@ class ImportCsvTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -66,8 +64,6 @@ class ImportCsvTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Import/ImportLdiTest.php b/test/classes/Plugins/Import/ImportLdiTest.php
index ef43af41ea..edcd25f6ee 100644
--- a/test/classes/Plugins/Import/ImportLdiTest.php
+++ b/test/classes/Plugins/Import/ImportLdiTest.php
@@ -20,17 +20,12 @@ class ImportLdiTest extends AbstractTestCase
     /** @var ImportLdi */
     protected $object;
 
-    /**
-     * @var DatabaseInterface
-     * @access protected
-     */
+    /** @var DatabaseInterface */
     protected $dbi;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -71,8 +66,6 @@ class ImportLdiTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Import/ImportMediawikiTest.php b/test/classes/Plugins/Import/ImportMediawikiTest.php
index 79cab2d2e8..7c2423609b 100644
--- a/test/classes/Plugins/Import/ImportMediawikiTest.php
+++ b/test/classes/Plugins/Import/ImportMediawikiTest.php
@@ -22,8 +22,6 @@ class ImportMediawikiTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -47,8 +45,6 @@ class ImportMediawikiTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Import/ImportOdsTest.php b/test/classes/Plugins/Import/ImportOdsTest.php
index 0baedee98f..8e8ae01afa 100644
--- a/test/classes/Plugins/Import/ImportOdsTest.php
+++ b/test/classes/Plugins/Import/ImportOdsTest.php
@@ -23,8 +23,6 @@ class ImportOdsTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -53,8 +51,6 @@ class ImportOdsTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Import/ImportShpTest.php b/test/classes/Plugins/Import/ImportShpTest.php
index 85875d20bf..b9f06b56c0 100644
--- a/test/classes/Plugins/Import/ImportShpTest.php
+++ b/test/classes/Plugins/Import/ImportShpTest.php
@@ -24,8 +24,6 @@ class ImportShpTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -76,8 +74,6 @@ class ImportShpTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Import/ImportSqlTest.php b/test/classes/Plugins/Import/ImportSqlTest.php
index 631f6e2eb5..6222cf9cd1 100644
--- a/test/classes/Plugins/Import/ImportSqlTest.php
+++ b/test/classes/Plugins/Import/ImportSqlTest.php
@@ -20,8 +20,6 @@ class ImportSqlTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -46,8 +44,6 @@ class ImportSqlTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Import/ImportXmlTest.php b/test/classes/Plugins/Import/ImportXmlTest.php
index f8bd923604..c90bb97e1c 100644
--- a/test/classes/Plugins/Import/ImportXmlTest.php
+++ b/test/classes/Plugins/Import/ImportXmlTest.php
@@ -24,8 +24,6 @@ class ImportXmlTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -50,8 +48,6 @@ class ImportXmlTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php
index 717878d0af..679c8b8a0b 100644
--- a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php
@@ -19,8 +19,6 @@ class DiaRelationSchemaTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -47,8 +45,6 @@ class DiaRelationSchemaTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php
index f8a07d16a9..aaaeb11612 100644
--- a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php
@@ -18,8 +18,6 @@ class EpsRelationSchemaTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -47,8 +45,6 @@ class EpsRelationSchemaTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php
index 6c0256b00f..bca05ad3a6 100644
--- a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php
@@ -18,8 +18,6 @@ class ExportRelationSchemaTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -31,8 +29,6 @@ class ExportRelationSchemaTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php
index 7224ffb99d..c43e21431d 100644
--- a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php
@@ -18,8 +18,6 @@ class PdfRelationSchemaTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -50,8 +48,6 @@ class PdfRelationSchemaTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php
index 473687280f..1d3610cf56 100644
--- a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php
@@ -19,8 +19,6 @@ class SvgRelationSchemaTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -51,8 +49,6 @@ class SvgRelationSchemaTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Plugins/Transformations/TransformationPluginsTest.php b/test/classes/Plugins/Transformations/TransformationPluginsTest.php
index 8d2b16f425..a3529ffb0e 100644
--- a/test/classes/Plugins/Transformations/TransformationPluginsTest.php
+++ b/test/classes/Plugins/Transformations/TransformationPluginsTest.php
@@ -43,8 +43,6 @@ class TransformationPluginsTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php
index c55c378093..30ad0a4578 100644
--- a/test/classes/ScriptsTest.php
+++ b/test/classes/ScriptsTest.php
@@ -21,8 +21,6 @@ class ScriptsTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -33,8 +31,6 @@ class ScriptsTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php
index 1c08ee3a98..85381fcf57 100644
--- a/test/classes/StorageEngineTest.php
+++ b/test/classes/StorageEngineTest.php
@@ -33,8 +33,6 @@ class StorageEngineTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
@@ -49,8 +47,6 @@ class StorageEngineTest extends AbstractTestCase
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
-     *
-     * @access protected
      */
     protected function tearDown(): void
     {
diff --git a/test/classes/Stubs/ResponseRenderer.php b/test/classes/Stubs/ResponseRenderer.php
index ccff98d148..8f1c9a43f5 100644
--- a/test/classes/Stubs/ResponseRenderer.php
+++ b/test/classes/Stubs/ResponseRenderer.php
@@ -22,7 +22,6 @@ class ResponseRenderer extends \PhpMyAdmin\ResponseRenderer
     /**
      * HTML data to be used in the response
      *
-     * @access private
      * @var string
      */
     protected $htmlString;
@@ -31,7 +30,6 @@ class ResponseRenderer extends \PhpMyAdmin\ResponseRenderer
      * An array of JSON key-value pairs
      * to be sent back for ajax requests
      *
-     * @access private
      * @var array
      */
     protected $json;
diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php
index 0412398cc6..03c30b2fea 100644
--- a/test/classes/SystemDatabaseTest.php
+++ b/test/classes/SystemDatabaseTest.php
@@ -22,8 +22,6 @@ class SystemDatabaseTest extends AbstractTestCase
 
     /**
      * Setup function for test cases
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php
index dd09c7627f..005f6280e3 100644
--- a/test/classes/TrackerTest.php
+++ b/test/classes/TrackerTest.php
@@ -18,8 +18,6 @@ class TrackerTest extends AbstractTestCase
 {
     /**
      * Setup function for test cases
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php
index 1093423b25..ab96e3eeac 100644
--- a/test/classes/TrackingTest.php
+++ b/test/classes/TrackingTest.php
@@ -26,8 +26,6 @@ class TrackingTest extends AbstractTestCase
 
     /**
      * Setup function for test cases
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/classes/UrlTest.php b/test/classes/UrlTest.php
index feca9e450e..24f37fa273 100644
--- a/test/classes/UrlTest.php
+++ b/test/classes/UrlTest.php
@@ -16,8 +16,6 @@ class UrlTest extends AbstractTestCase
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
-     *
-     * @access protected
      */
     protected function setUp(): void
     {
diff --git a/test/selenium/CreateRemoveUserTest.php b/test/selenium/CreateRemoveUserTest.php
index 333ee8b889..ec442666c8 100644
--- a/test/selenium/CreateRemoveUserTest.php
+++ b/test/selenium/CreateRemoveUserTest.php
@@ -19,7 +19,6 @@ class CreateRemoveUserTest extends TestBase
     /**
      * Username for the user
      *
-     * @access private
      * @var string
      */
     private $txtUsername;
@@ -27,7 +26,6 @@ class CreateRemoveUserTest extends TestBase
     /**
      * Password for the user
      *
-     * @access private
      * @var string
      */
     private $txtPassword;
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index dac1a16cbe..967dbaf55c 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -68,7 +68,6 @@ abstract class TestBase extends TestCase
     /**
      * Name of database for the test
      *
-     * @access public
      * @var string
      */
     public $databaseName;