diff --git a/examples/openid.php b/examples/openid.php index 8d84566a49..c5383f82fb 100644 --- a/examples/openid.php +++ b/examples/openid.php @@ -31,7 +31,7 @@ $AUTH_MAP = [ ], ]; -// phpcs:disable PSR1.Files.SideEffects +// phpcs:disable PSR1.Files.SideEffects,Squiz.Functions.GlobalFunction /** * Simple function to show HTML page with given content. diff --git a/examples/signon-script.php b/examples/signon-script.php index aa4e778a0f..34e419c17c 100644 --- a/examples/signon-script.php +++ b/examples/signon-script.php @@ -9,6 +9,8 @@ declare(strict_types=1); +// phpcs:disable Squiz.Functions.GlobalFunction + /** * This function returns username and password. * diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php index 205629f52f..c72aa23208 100644 --- a/libraries/classes/Config/FormDisplay.php +++ b/libraries/classes/Config/FormDisplay.php @@ -615,6 +615,7 @@ class FormDisplay // keep boolean value as boolean if (! is_bool($value)) { + // phpcs:ignore Generic.PHP.ForbiddenFunctions settype($value, gettype($vk)); } @@ -699,12 +700,14 @@ class FormDisplay switch ($type) { case 'double': $_POST[$key] = Util::requestString($_POST[$key]); + // phpcs:ignore Generic.PHP.ForbiddenFunctions settype($_POST[$key], 'float'); break; case 'boolean': case 'integer': if ($_POST[$key] !== '') { $_POST[$key] = Util::requestString($_POST[$key]); + // phpcs:ignore Generic.PHP.ForbiddenFunctions settype($_POST[$key], $type); } break; diff --git a/libraries/classes/Plugins.php b/libraries/classes/Plugins.php index 00bb68b3a2..6a33c267a5 100644 --- a/libraries/classes/Plugins.php +++ b/libraries/classes/Plugins.php @@ -95,6 +95,8 @@ class Plugins */ public static function getPlugins($plugin_type, $plugins_dir, $plugin_param) { + global $skip_import; + $GLOBALS['plugin_param'] = $plugin_param; $handle = @opendir($plugins_dir); @@ -125,12 +127,12 @@ class Plugins continue; } - /** @var bool */ - $GLOBALS['skip_import'] = false; + /** @var bool $skip_import */ + $skip_import = false; include_once $plugins_dir . $file; - if ($GLOBALS['skip_import']) { + if ($skip_import) { continue; } diff --git a/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php index dd605fa081..25f034385e 100644 --- a/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php +++ b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php @@ -11,6 +11,7 @@ use PhpMyAdmin\Plugins\TransformationsPlugin; use PhpMyAdmin\Url; use stdClass; use function array_merge; +use function defined; use function htmlspecialchars; /** diff --git a/libraries/classes/Query/Cache.php b/libraries/classes/Query/Cache.php index b50c719d32..7d946b02b0 100644 --- a/libraries/classes/Query/Cache.php +++ b/libraries/classes/Query/Cache.php @@ -1,16 +1,19 @@ dbi->freeResult($tableRes); + return $cfgRelation; } diff --git a/libraries/classes/Response.php b/libraries/classes/Response.php index 0078158bbf..c20952b3ee 100644 --- a/libraries/classes/Response.php +++ b/libraries/classes/Response.php @@ -538,6 +538,7 @@ class Response */ public function header($text) { + // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly header($text); } diff --git a/libraries/classes/Twig/I18n/NodeTrans.php b/libraries/classes/Twig/I18n/NodeTrans.php index 8a187ef3a3..dd88ef358b 100644 --- a/libraries/classes/Twig/I18n/NodeTrans.php +++ b/libraries/classes/Twig/I18n/NodeTrans.php @@ -31,10 +31,10 @@ class NodeTrans extends TransNode */ public function __construct( Node $body, - Node $plural = null, - AbstractExpression $count = null, - Node $context = null, - Node $notes = null, + ?Node $plural = null, + ?AbstractExpression $count = null, + ?Node $context = null, + ?Node $notes = null, $lineno, $tag = null ) { @@ -66,11 +66,11 @@ class NodeTrans extends TransNode { $compiler->addDebugInfo($this); - list($msg, $vars) = $this->compileString($this->getNode('body')); + [$msg, $vars] = $this->compileString($this->getNode('body')); $msg1 = null; if ($this->hasNode('plural')) { - list($msg1, $vars1) = $this->compileString($this->getNode('plural')); + [$msg1, $vars1] = $this->compileString($this->getNode('plural')); $vars = array_merge($vars, $vars1); } diff --git a/libraries/classes/Twig/MessageExtension.php b/libraries/classes/Twig/MessageExtension.php index b8720b6cff..b642732b54 100644 --- a/libraries/classes/Twig/MessageExtension.php +++ b/libraries/classes/Twig/MessageExtension.php @@ -23,21 +23,21 @@ class MessageExtension extends AbstractExtension return [ new TwigFilter( 'notice', - function (string $string) { + static function (string $string) { return Message::notice($string)->getDisplay(); }, ['is_safe' => ['html']] ), new TwigFilter( 'error', - function (string $string) { + static function (string $string) { return Message::error($string)->getDisplay(); }, ['is_safe' => ['html']] ), new TwigFilter( 'raw_success', - function (string $string) { + static function (string $string) { return Message::rawSuccess($string)->getDisplay(); }, ['is_safe' => ['html']] diff --git a/libraries/classes/Twig/RelationExtension.php b/libraries/classes/Twig/RelationExtension.php index fa244744bc..8183bb1804 100644 --- a/libraries/classes/Twig/RelationExtension.php +++ b/libraries/classes/Twig/RelationExtension.php @@ -21,6 +21,7 @@ class RelationExtension extends AbstractExtension public function getFunctions() { $relation = new Relation($GLOBALS['dbi']); + return [ new TwigFunction( 'foreign_dropdown', diff --git a/libraries/classes/Twig/TransformationsExtension.php b/libraries/classes/Twig/TransformationsExtension.php index 7bfc51b629..7af3589292 100644 --- a/libraries/classes/Twig/TransformationsExtension.php +++ b/libraries/classes/Twig/TransformationsExtension.php @@ -21,6 +21,7 @@ class TransformationsExtension extends AbstractExtension public function getFunctions() { $transformations = new Transformations(); + return [ new TwigFunction( 'get_description', diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 58d8d56b24..946111625f 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -1016,6 +1016,7 @@ class Util $conditionValue = '= \'' . $GLOBALS['dbi']->escapeString($row) . '\''; } + return [$conditionValue, $condition]; } @@ -1114,7 +1115,7 @@ class Util $condition = ' ' . $con_key . ' '; [$con_val, $condition] = self::getConditionValue( - (! isset($row[$i]) || $row[$i] === null) ? null : $row[$i], + ! isset($row[$i]) || $row[$i] === null ? null : $row[$i], $meta, $GLOBALS['dbi']->fieldFlags($handle, $i), $fields_cnt, diff --git a/phpcs.xml.dist b/phpcs.xml.dist index eb32f33e3a..9c850ee5bf 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -22,29 +22,7 @@ - - - - - - - - - - - - - - - - - libraries/classes/Config/FormDisplay.php - - - - examples/openid.php - examples/signon-script.php diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index dd940ee9a6..cbbb8170e0 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -9,12 +9,11 @@ namespace PhpMyAdmin\Tests; use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Index; +use PhpMyAdmin\Query\Cache; use PhpMyAdmin\Relation; use PhpMyAdmin\Table; -use PhpMyAdmin\Query\Cache; use PhpMyAdmin\Tests\Stubs\DbiDummy; use stdClass; -use ReflectionClass; /** * Tests behaviour of Table class @@ -947,9 +946,7 @@ class TableTest extends AbstractTestCase $dbi->getCache()->cacheTableContent( ['PMA', 'PMA_BookMark'], - [ - 'ENGINE' => 'MERGE', - ] + ['ENGINE' => 'MERGE'] ); $tableObj = new Table('PMA_BookMark', 'PMA'); @@ -970,9 +967,7 @@ class TableTest extends AbstractTestCase $dbi->getCache()->cacheTableContent( ['PMA', 'PMA_BookMark'], - [ - 'ENGINE' => 'MRG_MYISAM', - ] + ['ENGINE' => 'MRG_MYISAM'] ); $tableObj = new Table('PMA_BookMark', 'PMA'); diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php index 92da6ea88d..d206b85726 100644 --- a/test/classes/UtilTest.php +++ b/test/classes/UtilTest.php @@ -21,6 +21,7 @@ use function floatval; use function htmlspecialchars; use function ini_get; use function ini_set; +use function str_repeat; use function str_replace; use function strlen; use function trim; @@ -74,6 +75,7 @@ class UtilTest extends AbstractTestCase /** * Test for listPHPExtensions + * * @requires extension mysqli * @requires extension curl * @requires extension mbstring