Revert PMA_String rename.

Signed-off-by: Hugues Peccatte <[email protected]>
karibu · Sep 14, 2015 · a5d35d4 · a5d35d4
1 parent 74ef226
commit a5d35d4
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 26 deletions.
diff --git a/db_operations.php b/db_operations.php
@@ -12,7 +12,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\plugins\export\ExportSql;
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 /**
  * requirements

diff --git a/export.php b/export.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 /**
  * Get the variables sent or posted to this script and a core script

diff --git a/file_echo.php b/file_echo.php
@@ -7,7 +7,7 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 define('PMA_MINIMUM_COMMON', true);
 require_once 'libraries/common.inc.php';

diff --git a/gis_data_editor.php b/gis_data_editor.php
@@ -7,7 +7,7 @@
  */
 use PMA\libraries\gis\GISFactory;
 use PMA\libraries\gis\GISVisualization;
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 /**
  * Escapes special characters if the variable is set.

diff --git a/import.php b/import.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\plugins\ImportPlugin;
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 /**
  * Get the variables sent or posted to this script and a core script

diff --git a/index.php b/index.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 use PMA\libraries\RecentFavoriteTable;
 
 /**

diff --git a/libraries/String.php → libraries/PMA_String.php b/libraries/String.php → libraries/PMA_String.php
@@ -13,7 +13,7 @@
  *
  * @package PhpMyAdmin-String
  */
-class String implements StringType
+class PMA_String implements StringType
 {
     /**
      * @var StringType

diff --git a/libraries/common.inc.php b/libraries/common.inc.php
@@ -36,7 +36,7 @@
 use PMA\libraries\Message;
 use PMA\libraries\plugins\AuthenticationPlugin;
 use PMA\libraries\PMA;
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 use PMA\libraries\Theme;
 use PMA\libraries\ThemeManager;
 use PMA\libraries\Tracker;
@@ -73,7 +73,7 @@
 /**
  * String handling (security)
  */
-$PMA_String = new String();
+$PMA_String = new PMA_String();
 
 /**
  * initialize the error handler

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
@@ -8,7 +8,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Message;
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -18,7 +18,7 @@
  * String handling (security)
  */
 require_once 'libraries/string.lib.php';
-$PMA_String = new String();
+$PMA_String = new PMA_String();
 
 /**
  * checks given $var and returns it if valid, or $default of not valid

diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
@@ -7,7 +7,7 @@
  */
 use PMA\libraries\Message;
 use PMA\libraries\Response;
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 if (! defined('PHPMYADMIN')) {
     exit;

diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php
@@ -7,7 +7,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Message;
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 if (! defined('PHPMYADMIN')) {
     exit;

diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
@@ -7,7 +7,7 @@
  */
 use PMA\libraries\Message;
 use PMA\libraries\Response;
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 if (! defined('PHPMYADMIN')) {
     exit;

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
@@ -6,7 +6,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 use PMA\libraries\Table;
 use PMA\Util;
 

diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php
@@ -8,7 +8,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 if (! defined('PHPMYADMIN')) {
     exit;

diff --git a/prefs_manage.php b/prefs_manage.php
@@ -9,7 +9,7 @@
 use PMA\libraries\config\FormDisplay;
 use PMA\libraries\Message;
 use PMA\libraries\Response;
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 use PMA\libraries\Util;
 
 /**

diff --git a/scripts/advisor2po b/scripts/advisor2po
@@ -55,7 +55,7 @@ if (!file_exists('./libraries/Advisor.class.php')) {
 }
 include './libraries/String.class.php';
 
-$GLOBALS['PMA_String'] = new String();
+$GLOBALS['PMA_String'] = new PMA_String();
 
 include './libraries/Advisor.class.php';
 

diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php
@@ -10,7 +10,7 @@
  *
  * @package PhpMyAdmin-debug
  */
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 /**
  * Displays the form

diff --git a/tbl_addfield.php b/tbl_addfield.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 /**
  * Get some core libraries

diff --git a/tbl_create.php b/tbl_create.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 /**
  * Get some core libraries

diff --git a/tbl_operations.php b/tbl_operations.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Partition;
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 use PMA\libraries\Table;
 
 /**

diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
@@ -7,7 +7,7 @@
  */
 
 // Let PHP complain about all errors
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 error_reporting(E_ALL);
 
@@ -52,7 +52,7 @@
 
 require_once 'libraries/autoloader.php';
 require_once 'libraries/core.lib.php';
-$GLOBALS['PMA_String'] = new String();
+$GLOBALS['PMA_String'] = new PMA_String();
 $CFG = new PMA\libraries\Config();
 // Initialize PMA_VERSION variable
 define('PMA_VERSION', $CFG->get('PMA_VERSION'));

diff --git a/test/libraries/PMA_string_test.php b/test/libraries/PMA_string_test.php
@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\String;
+use PMA\libraries\PMA_String;
 
 
 
@@ -33,7 +33,7 @@ class PMA_String_Test extends PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->_testObj = new String();
+        $this->_testObj = new PMA_String();
     }
 
     /**