Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurício Meneghini Fauth <mauricio@fauth.dev>2021-09-12 17:59:39 +0300
committerMaurício Meneghini Fauth <mauricio@fauth.dev>2021-09-12 17:59:39 +0300
commitf61d3183fbd68b84b265b4e787554760673ebe70 (patch)
treebcb0fca49971186a81b791631de29de7e4026429
parent59ca83150585ca1dc81b5d23019582a4182782a7 (diff)
Inline some phpcs ignores and remove deprecated annotations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
-rw-r--r--libraries/classes/Common.php1
-rw-r--r--libraries/classes/Dbal/DbiMysqli.php7
-rw-r--r--libraries/classes/Pdf.php9
-rw-r--r--libraries/classes/Plugins/Export/Helpers/Pdf.php16
-rw-r--r--libraries/classes/Plugins/Schema/Pdf/Pdf.php7
-rw-r--r--libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Text_Plain_Link.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php1
-rw-r--r--libraries/classes/Plugins/Transformations/Text_Plain_Substring.php1
-rw-r--r--libraries/classes/Server/SysInfo/WindowsNt.php2
-rw-r--r--libraries/classes/VersionInformation.php2
-rw-r--r--phpcs.xml.dist7
-rw-r--r--test/classes/NormalizationTest.php1
-rw-r--r--test/classes/VersionInformationTest.php2
-rw-r--r--test/selenium/TestBase.php2
38 files changed, 42 insertions, 41 deletions
diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php
index 078c4af9a5..0ba4bfe1fb 100644
--- a/libraries/classes/Common.php
+++ b/libraries/classes/Common.php
@@ -243,6 +243,7 @@ final class Common
// Sets the default delimiter (if specified).
$sqlDelimiter = $request->getParam('sql_delimiter', '');
if (strlen($sqlDelimiter) > 0) {
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
Lexer::$DEFAULT_DELIMITER = $sqlDelimiter;
}
diff --git a/libraries/classes/Dbal/DbiMysqli.php b/libraries/classes/Dbal/DbiMysqli.php
index 544effa34e..734f6a09ec 100644
--- a/libraries/classes/Dbal/DbiMysqli.php
+++ b/libraries/classes/Dbal/DbiMysqli.php
@@ -136,8 +136,10 @@ class DbiMysqli implements DbiExtension
* - #2001 - SSL Connection is required. Please specify SSL options and retry.
* - #9002 - SSL connection is required. Please specify SSL options and retry.
*/
+ // phpcs:disable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$error_number = $mysqli->connect_errno;
$error_message = $mysqli->connect_error;
+ // phpcs:enable
if (
! $server['ssl']
&& ($error_number == 3159
@@ -325,6 +327,7 @@ class DbiMysqli implements DbiExtension
*/
public function getHostInfo($link)
{
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
return $link->host_info;
}
@@ -337,6 +340,7 @@ class DbiMysqli implements DbiExtension
*/
public function getProtoInfo($link)
{
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
return $link->protocol_version;
}
@@ -402,6 +406,7 @@ class DbiMysqli implements DbiExtension
return 0;
}
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
return $result->num_rows;
}
@@ -415,6 +420,7 @@ class DbiMysqli implements DbiExtension
*/
public function affectedRows($link)
{
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
return $link->affected_rows;
}
@@ -452,6 +458,7 @@ class DbiMysqli implements DbiExtension
*/
public function numFields($result)
{
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
return $result->field_count;
}
diff --git a/libraries/classes/Pdf.php b/libraries/classes/Pdf.php
index b5025744a2..bf91d39ff8 100644
--- a/libraries/classes/Pdf.php
+++ b/libraries/classes/Pdf.php
@@ -78,7 +78,7 @@ class Pdf extends TCPDF
*
* @return void
*/
- // @codingStandardsIgnoreLine
+ // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
public function Footer()
{
// Check if footer for this page already exists
@@ -114,6 +114,7 @@ class Pdf extends TCPDF
*/
public function setAlias($name, $value)
{
+ // phpcs:disable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$name = TCPDF_FONTS::UTF8ToUTF16BE(
$name,
false,
@@ -126,6 +127,7 @@ class Pdf extends TCPDF
true,
$this->CurrentFont
);
+ // phpcs:enable
}
// phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
@@ -145,9 +147,10 @@ class Pdf extends TCPDF
}
parent::_putpages();
- // phpcs:enable
}
+ // phpcs:enable
+
/**
* Displays an error message
*
@@ -155,7 +158,7 @@ class Pdf extends TCPDF
*
* @return void
*/
- // @codingStandardsIgnoreLine
+ // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
public function Error($error_message = '')
{
echo Message::error(
diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php
index f831d08070..2f7d0fb976 100644
--- a/libraries/classes/Plugins/Export/Helpers/Pdf.php
+++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php
@@ -150,14 +150,12 @@ class Pdf extends PdfLib
}
$current_page = $this->page;
- if (
- ($y + $h > $this->PageBreakTrigger)
- && (! $this->InFooter)
- && $this->AcceptPageBreak()
- ) {
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+ if ($y + $h > $this->PageBreakTrigger && ! $this->InFooter && $this->AcceptPageBreak()) {
if ($addpage) {
//Automatic page break
$x = $this->x;
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$this->AddPage($this->CurOrientation);
$this->y = $this->dataY;
$oldpage = $this->page - 1;
@@ -193,7 +191,7 @@ class Pdf extends PdfLib
*
* @return void
*/
- // @codingStandardsIgnoreLine
+ // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
public function Header()
{
global $maxY;
@@ -203,6 +201,7 @@ class Pdf extends PdfLib
// FIXME: Better approach might be to try to compact the content
$this->SetAutoPageBreak(false);
// Check if header for this page already exists
+ // phpcs:disable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
if (! isset($this->headerset[$this->page])) {
$this->SetY($this->tMargin - ($this->FontSizePt / $this->k) * 5);
$this->cellFontSize = $this->FontSizePt;
@@ -267,6 +266,8 @@ class Pdf extends PdfLib
$this->headerset[$this->page] = 1;
}
+ // phpcs:enable
+
$this->dataY = $maxY;
$this->SetAutoPageBreak(true);
}
@@ -456,6 +457,7 @@ class Pdf extends PdfLib
if ($this->tablewidths[$col] > 0) {
$this->MultiCell(
$this->tablewidths[$col],
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$this->FontSizePt,
$txt,
0,
@@ -698,6 +700,7 @@ class Pdf extends PdfLib
if ($this->tablewidths[$col] > 0) {
$this->MultiCell(
$this->tablewidths[$col],
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$this->FontSizePt,
$txt,
0,
@@ -921,6 +924,7 @@ class Pdf extends PdfLib
$this->SetY($this->tMargin);
$this->AddPage();
$this->SetFont(PdfLib::PMA_PDF_FONT, '', 9);
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$this->morepagestable($this->FontSizePt);
$dbi->freeResult($this->results);
}
diff --git a/libraries/classes/Plugins/Schema/Pdf/Pdf.php b/libraries/classes/Plugins/Schema/Pdf/Pdf.php
index 5d0c9e021f..f673bcb59b 100644
--- a/libraries/classes/Plugins/Schema/Pdf/Pdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/Pdf.php
@@ -278,7 +278,7 @@ class Pdf extends PdfLib
*
* @return void
*/
- // @codingStandardsIgnoreLine
+ // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
public function Header()
{
global $dbi;
@@ -321,7 +321,7 @@ class Pdf extends PdfLib
*
* @return void
*/
- // @codingStandardsIgnoreLine
+ // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
public function Footer()
{
if (! $this->withDoc) {
@@ -361,6 +361,7 @@ class Pdf extends PdfLib
$nb = max($nb, $this->numLines($this->widths[$i], $data[$i]));
}
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$il = $this->FontSize;
$h = ($il + 1) * $nb;
// page break if necessary
@@ -398,11 +399,13 @@ class Pdf extends PdfLib
*/
public function numLines($w, $txt)
{
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$cw = &$this->CurrentFont['cw'];
if ($w == 0) {
$w = $this->w - $this->rMargin - $this->x;
}
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
$s = str_replace("\r", '', $txt);
$nb = strlen($s);
diff --git a/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php b/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php
index 71b242041c..73d4f1853d 100644
--- a/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php
+++ b/libraries/classes/Plugins/Transformations/Input/Image_JPEG_Upload.php
@@ -13,7 +13,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\ImageUploadTransformationsPlugin;
* Handles the image upload input transformation for JPEG.
* Has two option: width & height of the thumbnail
*/
-// @codingStandardsIgnoreLine
class Image_JPEG_Upload extends ImageUploadTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php
index e227c339cb..2b977ea3be 100644
--- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_FileUpload.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\TextFileUploadTransformationsPlugin;
/**
* Handles the input text file upload transformation for text plain.
*/
-// @codingStandardsIgnoreLine
class Text_Plain_FileUpload extends TextFileUploadTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php
index 16469c521d..ae9927755f 100644
--- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php
@@ -20,7 +20,6 @@ use function strlen;
/**
* Handles the IPv4/IPv6 to binary transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Iptobinary extends IOTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php
index 39459a277f..0cf5e52761 100644
--- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php
@@ -17,7 +17,6 @@ use function htmlspecialchars;
/**
* Handles the IPv4/IPv6 to long transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Iptolong extends IOTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php
index 7bc002b16c..f08dd3054d 100644
--- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php
@@ -14,7 +14,6 @@ use function __;
/**
* JSON editing with syntax highlighted CodeMirror editor
*/
-// @codingStandardsIgnoreLine
class Text_Plain_JsonEditor extends CodeMirrorEditorTransformationPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php
index 8f2db20a88..aa5089844f 100644
--- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_RegexValidation.php
@@ -13,7 +13,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\RegexValidationTransformationsPlugin;
* Handles the input regex validation transformation for text plain.
* Has one option: the regular expression
*/
-// @codingStandardsIgnoreLine
class Text_Plain_RegexValidation extends RegexValidationTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php
index 6bcf96c9fe..c7016b0f01 100644
--- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php
@@ -14,7 +14,6 @@ use function __;
/**
* SQL editing with syntax highlighted CodeMirror editor
*/
-// @codingStandardsIgnoreLine
class Text_Plain_SqlEditor extends CodeMirrorEditorTransformationPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php
index 6c85170220..e91da7d649 100644
--- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php
@@ -14,7 +14,6 @@ use function __;
/**
* XML (and HTML) editing with syntax highlighted CodeMirror editor
*/
-// @codingStandardsIgnoreLine
class Text_Plain_XmlEditor extends CodeMirrorEditorTransformationPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php
index 176097865b..b80b782b7d 100644
--- a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php
+++ b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Download.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\DownloadTransformationsPlugin;
/**
* Handles the download transformation for application octetstream
*/
-// @codingStandardsIgnoreLine
class Application_Octetstream_Download extends DownloadTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php
index f80cf7577d..b7e5a842b6 100644
--- a/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php
+++ b/libraries/classes/Plugins/Transformations/Output/Application_Octetstream_Hex.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\HexTransformationsPlugin;
/**
* Handles the hex transformation for application octetstream
*/
-// @codingStandardsIgnoreLine
class Application_Octetstream_Hex extends HexTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php
index c55ef8dca0..3322724e2f 100644
--- a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php
+++ b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Inline.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\InlineTransformationsPlugin;
/**
* Handles the inline transformation for image jpeg
*/
-// @codingStandardsIgnoreLine
class Image_JPEG_Inline extends InlineTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php
index 7651d945ed..4bb5d16b80 100644
--- a/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php
+++ b/libraries/classes/Plugins/Transformations/Output/Image_JPEG_Link.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\ImageLinkTransformationsPlugin;
/**
* Handles the link transformation for image jpeg
*/
-// @codingStandardsIgnoreLine
class Image_JPEG_Link extends ImageLinkTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php b/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php
index 629baa4eac..6102311fc7 100644
--- a/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php
+++ b/libraries/classes/Plugins/Transformations/Output/Image_PNG_Inline.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\InlineTransformationsPlugin;
/**
* Handles the inline transformation for image png
*/
-// @codingStandardsIgnoreLine
class Image_PNG_Inline extends InlineTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php b/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php
index 08aefa014c..e8a2b36c06 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\SQLTransformationsPlugin;
/**
* Handles the sql transformation for blob data
*/
-// @codingStandardsIgnoreLine
class Text_Octetstream_Sql extends SQLTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php
index d36bfb456d..ff59df1521 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php
@@ -16,7 +16,6 @@ use function __;
/**
* Handles the binary to IPv4/IPv6 transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Binarytoip extends TransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php
index f666bef4d4..dffb3b0cde 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Bool2Text.php
@@ -14,7 +14,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\Bool2TextTransformationsPlugin;
* Has one option: the output format (default 'T/F')
* or 'Y/N'
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Bool2Text extends Bool2TextTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php
index 5fe40806d5..832839480c 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Dateformat.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\DateFormatTransformationsPlugin;
/**
* Handles the date format transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Dateformat extends DateFormatTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php
index c539285089..24edbf14de 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_External.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\ExternalTransformationsPlugin;
/**
* Handles the external transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_External extends ExternalTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php
index e36734d8bc..1fd7ac4ba7 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Formatted.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\FormattedTransformationsPlugin;
/**
* Handles the formatted transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Formatted extends FormattedTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php
index 24cabba3fe..e19128dda9 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Imagelink.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\TextImageLinkTransformationsPlugin;
/**
* Handles the image link transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Imagelink extends TextImageLinkTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php
index 1a9c2ba7a5..7b07634ffe 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php
@@ -17,7 +17,6 @@ use function htmlspecialchars;
/**
* Handles the json transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Json extends TransformationsPlugin
{
public function __construct()
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php
index b0fc7c7037..251bcb8040 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php
@@ -13,7 +13,6 @@ use PhpMyAdmin\ResponseRenderer;
/**
* Handles the sql transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Sql extends SQLTransformationsPlugin
{
public function __construct()
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php
index b6f96eccf5..d7fd9fa91e 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php
@@ -17,7 +17,6 @@ use function htmlspecialchars;
/**
* Handles the XML transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Xml extends TransformationsPlugin
{
public function __construct()
diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_Link.php b/libraries/classes/Plugins/Transformations/Text_Plain_Link.php
index 32043bc76d..c3798e9e7a 100644
--- a/libraries/classes/Plugins/Transformations/Text_Plain_Link.php
+++ b/libraries/classes/Plugins/Transformations/Text_Plain_Link.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\TextLinkTransformationsPlugin;
/**
* Handles the link transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Link extends TextLinkTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php b/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php
index 774ede7f35..ddbf4d3562 100644
--- a/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php
+++ b/libraries/classes/Plugins/Transformations/Text_Plain_Longtoipv4.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\LongToIPv4TransformationsPlugin;
/**
* Handles the long to ipv4 transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Longtoipv4 extends LongToIPv4TransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php b/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php
index 57366fb5a6..044a5f9750 100644
--- a/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php
+++ b/libraries/classes/Plugins/Transformations/Text_Plain_PreApPend.php
@@ -13,7 +13,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\PreApPendTransformationsPlugin;
* Handles the prepend and/or append transformation for text plain.
* Has two options: the text to be prepended and appended (if any, default '')
*/
-// @codingStandardsIgnoreLine
class Text_Plain_PreApPend extends PreApPendTransformationsPlugin
{
/**
diff --git a/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php b/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php
index 1b3ff64a0f..6abfe1b437 100644
--- a/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php
+++ b/libraries/classes/Plugins/Transformations/Text_Plain_Substring.php
@@ -12,7 +12,6 @@ use PhpMyAdmin\Plugins\Transformations\Abs\SubstringTransformationsPlugin;
/**
* Handles the substring transformation for text plain
*/
-// @codingStandardsIgnoreLine
class Text_Plain_Substring extends SubstringTransformationsPlugin
{
/**
diff --git a/libraries/classes/Server/SysInfo/WindowsNt.php b/libraries/classes/Server/SysInfo/WindowsNt.php
index 6a4e354667..0143e4a6f5 100644
--- a/libraries/classes/Server/SysInfo/WindowsNt.php
+++ b/libraries/classes/Server/SysInfo/WindowsNt.php
@@ -84,11 +84,13 @@ class WindowsNt extends Base
$arrData = [];
$objWEBM = $this->wmi->Get($strClass);
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$arrProp = $objWEBM->Properties_;
$arrWEBMCol = $objWEBM->Instances_();
foreach ($arrWEBMCol as $objItem) {
$arrInstance = [];
foreach ($arrProp as $propItem) {
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$name = $propItem->Name;
if (! empty($strValue) && ! in_array($name, $strValue)) {
continue;
diff --git a/libraries/classes/VersionInformation.php b/libraries/classes/VersionInformation.php
index 0b5792ab7b..c13e5d73b8 100644
--- a/libraries/classes/VersionInformation.php
+++ b/libraries/classes/VersionInformation.php
@@ -160,6 +160,7 @@ class VersionInformation
// Maintains the latest compatible version
$latestRelease = null;
foreach ($releases as $release) {
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$phpVersions = $release->php_versions;
$phpConditions = explode(',', $phpVersions);
foreach ($phpConditions as $phpCondition) {
@@ -171,6 +172,7 @@ class VersionInformation
// We evaluate MySQL version constraint if there are only
// one server configured.
if (count($GLOBALS['cfg']['Servers']) === 1) {
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$mysqlVersions = $release->mysql_versions;
$mysqlConditions = explode(',', $mysqlVersions);
foreach ($mysqlConditions as $mysqlCondition) {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 136cfb32ec..01a288c908 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -20,6 +20,10 @@
<rule ref="PhpMyAdmin"/>
+ <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
+ <exclude-pattern>*/libraries/classes/Plugins/Transformations/*</exclude-pattern>
+ </rule>
+
<!-- Rules that should be followed, but are not required -->
<rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators">
<severity>4</severity>
@@ -39,9 +43,6 @@
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification">
<severity>4</severity>
</rule>
- <rule ref="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps">
- <severity>4</severity>
- </rule>
<rule ref="Squiz.NamingConventions.ValidVariableName.NotCamelCaps">
<severity>4</severity>
</rule>
diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php
index 0191e49d0d..5562ae4efc 100644
--- a/test/classes/NormalizationTest.php
+++ b/test/classes/NormalizationTest.php
@@ -386,6 +386,7 @@ class NormalizationTest extends AbstractTestCase
'PMA_table',
],
];
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$dependencies->PMA_table = [
'col4',
'col5',
diff --git a/test/classes/VersionInformationTest.php b/test/classes/VersionInformationTest.php
index c2569565c0..1621679b53 100644
--- a/test/classes/VersionInformationTest.php
+++ b/test/classes/VersionInformationTest.php
@@ -27,6 +27,7 @@ class VersionInformationTest extends AbstractTestCase
parent::setProxySettings();
$this->releases = [];
+ // phpcs:disable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$release = new stdClass();
$release->date = '2015-09-08';
$release->php_versions = '>=5.3,<7.1';
@@ -47,6 +48,7 @@ class VersionInformationTest extends AbstractTestCase
$release->version = '4.0.10.10';
$release->mysql_versions = '>=5.0';
$this->releases[] = $release;
+ // phpcs:enable
}
/**
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index dae7bc7011..7faac435e4 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -1251,7 +1251,9 @@ abstract class TestBase extends TestCase
}
$proj = json_decode($result);
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
if (isset($proj->automation_session)) {
+ // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
echo 'Test failed, get more information here: ' . $proj->automation_session->public_url . PHP_EOL;
}