From b6435e9ed2ef4d3396cfd1e96e9e4653714c6a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 14 May 2018 21:57:19 -0300 Subject: [PATCH] Enable strict mode in Config classes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MaurĂ­cio Meneghini Fauth --- libraries/classes/Config/ConfigFile.php | 2 ++ libraries/classes/Config/Descriptions.php | 2 ++ libraries/classes/Config/Form.php | 8 +++++--- libraries/classes/Config/FormDisplay.php | 2 ++ libraries/classes/Config/FormDisplayTemplate.php | 8 +++++--- libraries/classes/Config/Forms/BaseForm.php | 2 ++ libraries/classes/Config/Forms/BaseFormList.php | 2 ++ libraries/classes/Config/Forms/Page/BrowseForm.php | 2 ++ libraries/classes/Config/Forms/Page/DbStructureForm.php | 2 ++ libraries/classes/Config/Forms/Page/EditForm.php | 2 ++ libraries/classes/Config/Forms/Page/ExportForm.php | 2 ++ libraries/classes/Config/Forms/Page/ImportForm.php | 2 ++ libraries/classes/Config/Forms/Page/NaviForm.php | 2 ++ libraries/classes/Config/Forms/Page/PageFormList.php | 2 ++ libraries/classes/Config/Forms/Page/SqlForm.php | 2 ++ .../classes/Config/Forms/Page/TableStructureForm.php | 2 ++ libraries/classes/Config/Forms/Setup/ConfigForm.php | 2 ++ libraries/classes/Config/Forms/Setup/ExportForm.php | 2 ++ libraries/classes/Config/Forms/Setup/FeaturesForm.php | 2 ++ libraries/classes/Config/Forms/Setup/ImportForm.php | 2 ++ libraries/classes/Config/Forms/Setup/MainForm.php | 2 ++ libraries/classes/Config/Forms/Setup/NaviForm.php | 2 ++ libraries/classes/Config/Forms/Setup/ServersForm.php | 2 ++ libraries/classes/Config/Forms/Setup/SetupFormList.php | 2 ++ libraries/classes/Config/Forms/Setup/SqlForm.php | 2 ++ libraries/classes/Config/Forms/User/ExportForm.php | 2 ++ libraries/classes/Config/Forms/User/FeaturesForm.php | 2 ++ libraries/classes/Config/Forms/User/ImportForm.php | 2 ++ libraries/classes/Config/Forms/User/MainForm.php | 2 ++ libraries/classes/Config/Forms/User/NaviForm.php | 2 ++ libraries/classes/Config/Forms/User/SqlForm.php | 2 ++ libraries/classes/Config/Forms/User/UserFormList.php | 2 ++ libraries/classes/Config/PageSettings.php | 2 ++ libraries/classes/Config/ServerConfigChecks.php | 2 ++ libraries/classes/Config/Validator.php | 2 ++ 35 files changed, 76 insertions(+), 6 deletions(-) diff --git a/libraries/classes/Config/ConfigFile.php b/libraries/classes/Config/ConfigFile.php index 2cb0c6c088..918bbc4450 100644 --- a/libraries/classes/Config/ConfigFile.php +++ b/libraries/classes/Config/ConfigFile.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Config; use PhpMyAdmin\Config; diff --git a/libraries/classes/Config/Descriptions.php b/libraries/classes/Config/Descriptions.php index 12a47130c1..58c9f4f2c6 100644 --- a/libraries/classes/Config/Descriptions.php +++ b/libraries/classes/Config/Descriptions.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Config; use PhpMyAdmin\Sanitize; diff --git a/libraries/classes/Config/Form.php b/libraries/classes/Config/Form.php index f7c670fa31..a9b724294d 100644 --- a/libraries/classes/Config/Form.php +++ b/libraries/classes/Config/Form.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Config; use PhpMyAdmin\Config\ConfigFile; @@ -81,7 +83,7 @@ class Form $key = ltrim( mb_substr( $option_name, - mb_strrpos($option_name, '/') + (int) mb_strrpos($option_name, '/') ), '/' ); @@ -184,7 +186,7 @@ class Form $this->fields = array(); foreach ($paths as $path) { $key = ltrim( - mb_substr($path, mb_strrpos($path, '/')), + mb_substr($path, (int) mb_strrpos($path, '/')), '/' ); $this->fields[$key] = $path; @@ -201,7 +203,7 @@ class Form { $cf = $this->_configFile; foreach ($this->fields as $name => $path) { - if (mb_strpos($name, ':group:') === 0) { + if (mb_strpos((string) $name, ':group:') === 0) { $this->_fieldsTypes[$name] = 'group'; continue; } diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php index 9cc114da6e..981f771f86 100644 --- a/libraries/classes/Config/FormDisplay.php +++ b/libraries/classes/Config/FormDisplay.php @@ -12,6 +12,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Config; use PhpMyAdmin\Config\ConfigFile; diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php index 28ce77d94a..bcf0198e1a 100644 --- a/libraries/classes/Config/FormDisplayTemplate.php +++ b/libraries/classes/Config/FormDisplayTemplate.php @@ -5,6 +5,8 @@ * * @package PhpMyAdmin */ +declare(strict_types=1); + namespace PhpMyAdmin\Config; use PhpMyAdmin\Sanitize; @@ -263,7 +265,7 @@ class FormDisplayTemplate break; case 'number_text': $htmlOutput .= ''; + . ' value="' . htmlspecialchars((string) $value) . '" />'; break; case 'checkbox': $htmlOutput .= '