Code refactoring and modernization

[kamil-tekiela]

No description provided.

[MoonE]

@kamil-tekiela dd1362b breaks the phpmyadmin tests

There were 2 failures:

1. PhpMyAdmin\Tests\Plugins\Import\ImportShpTest::testDoImport
   Failed asserting that PhpMyAdmin\Message Object #29202 (
   'number' => 8
   'string' => 'The imported file does not contain any data!'
   'message' => ''
   'isDisplayed' => false
   'useBBCode' => true
   'hash' => null
   'params' => Array &0 ()
   'addedMessages' => Array &1 ()
   ) matches expected ''.

/phpmyadmin/test/classes/Plugins/Import/ImportShpTest.php:84
/phpmyadmin/test/classes/Plugins/Import/ImportShpTest.php:170

2. PhpMyAdmin\Tests\Plugins\Import\ImportShpTest::testImportOsm
   Failed asserting that PhpMyAdmin\Message Object #27819 (
   'number' => 8
   'string' => 'The imported file does not contain any data!'
   'message' => ''
   'isDisplayed' => false
   'useBBCode' => true
   'hash' => null
   'params' => Array &0 ()
   'addedMessages' => Array &1 ()
   ) matches expected ''.

/phpmyadmin/test/classes/Plugins/Import/ImportShpTest.php:84
/phpmyadmin/test/classes/Plugins/Import/ImportShpTest.php:135

[MauricioFauth]

dd1362b breaks the phpmyadmin tests

Fixed by 861d3b4. I reverted the change that caused the test to fail.

[kamil-tekiela]

Thanks @MoonE for reporting the problem, and thanks @MauricioFauth for fixing it. I never imagined it could have been used this way.