Fix function name: PMA_array_write -> PMA_arrayWrite

phpmyadmin · Jun 1, 2012 · 0a595f1 · 0a595f1
1 parent ddc575c
commit 0a595f1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
@@ -840,8 +840,8 @@ function setUserValue($cookie_name, $cfg_path, $new_cfg_value,
             }
             $this->setCookie($cookie_name, $new_cfg_value, $default_value);
         }
-        PMA_array_write($cfg_path, $GLOBALS['cfg'], $new_cfg_value);
-        PMA_array_write($cfg_path, $this->settings, $new_cfg_value);
+        PMA_arrayWrite($cfg_path, $GLOBALS['cfg'], $new_cfg_value);
+        PMA_arrayWrite($cfg_path, $this->settings, $new_cfg_value);
     }
 
     /**

diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
@@ -91,7 +91,7 @@ private function __construct()
         // apply default values overrides
         if (count($cfg_db['_overrides'])) {
             foreach ($cfg_db['_overrides'] as $path => $value) {
-                PMA_array_write($path, $cfg, $value);
+                PMA_arrayWrite($path, $cfg, $value);
             }
         }
 
@@ -244,7 +244,7 @@ public function set($path, $value, $canonical_path = null)
                 return;
             }
         }
-        PMA_array_write($path, $_SESSION[$this->_id], $value);
+        PMA_arrayWrite($path, $_SESSION[$this->_id], $value);
     }
 
     /**
@@ -511,7 +511,7 @@ public function getConfig()
     {
         $c = $_SESSION[$this->_id];
         foreach ($this->_cfgUpdateReadMapping as $map_to => $map_from) {
-            PMA_array_write($map_to, $c, PMA_array_read($map_from, $c));
+            PMA_arrayWrite($map_to, $c, PMA_array_read($map_from, $c));
             PMA_arrayRemove($map_from, $c);
         }
         return $c;

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
@@ -664,7 +664,7 @@ function PMA_array_read($path, $array, $default = null)
  *
  * @return void
  */
-function PMA_array_write($path, &$array, $value)
+function PMA_arrayWrite($path, &$array, $value)
 {
     $keys = explode('/', $path);
     $last_key = array_pop($keys);

diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
@@ -159,7 +159,7 @@ function PMA_apply_userprefs(array $config_data)
         if (! isset($whitelist[$path]) || isset($blacklist[$path])) {
             continue;
         }
-        PMA_array_write($path, $cfg, $value);
+        PMA_arrayWrite($path, $cfg, $value);
     }
     return $cfg;
 }

diff --git a/test/libraries/core/PMA_array_test.php b/test/libraries/core/PMA_array_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA_array_read(), PMA_array_write(), PMA_arrayRemove(), PMA_array_merge_recursive(),
+ * Test for PMA_array_read(), PMA_arrayWrite(), PMA_arrayRemove(), PMA_array_merge_recursive(),
  * PMA_arrayWalkRecursive() from libraries/core.lib.php
  *
  * @package PhpMyAdmin-test
@@ -52,7 +52,7 @@ function testPMA_array_read()
         $this->assertEquals(PMA_array_read('sarr/not_exiting/1', $arr, 'defailt_val'), 'defailt_val');
     }
 
-    function testPMA_array_write()
+    function testPMA_arrayWrite()
     {
         $arr = array(
             "int" => 1,
@@ -61,40 +61,40 @@ function testPMA_array_write()
             "sarr" => array('arr1' => array(1, 2, 3), array(3, array('a', 'b', 'c'), 4))
         );
 
-        PMA_array_write('int', $arr, 5);
+        PMA_arrayWrite('int', $arr, 5);
         $this->assertEquals($arr['int'], 5);
 
-        PMA_array_write('str', $arr, '_str');
+        PMA_arrayWrite('str', $arr, '_str');
         $this->assertEquals($arr['str'], '_str');
 
-        PMA_array_write('arr/0', $arr, 'val_arr_0');
+        PMA_arrayWrite('arr/0', $arr, 'val_arr_0');
         $this->assertEquals($arr['arr'][0], 'val_arr_0');
 
-        PMA_array_write('arr/1', $arr, 'val_arr_1');
+        PMA_arrayWrite('arr/1', $arr, 'val_arr_1');
         $this->assertEquals($arr['arr'][1], 'val_arr_1');
 
-        PMA_array_write('arr/2', $arr, 'val_arr_2');
+        PMA_arrayWrite('arr/2', $arr, 'val_arr_2');
         $this->assertEquals($arr['arr'][2], 'val_arr_2');
 
-        PMA_array_write('sarr/arr1/0', $arr, 'val_sarr_arr_0');
+        PMA_arrayWrite('sarr/arr1/0', $arr, 'val_sarr_arr_0');
         $this->assertEquals($arr['sarr']['arr1'][0], 'val_sarr_arr_0');
 
-        PMA_array_write('sarr/arr1/1', $arr, 'val_sarr_arr_1');
+        PMA_arrayWrite('sarr/arr1/1', $arr, 'val_sarr_arr_1');
         $this->assertEquals($arr['sarr']['arr1'][1], 'val_sarr_arr_1');
 
-        PMA_array_write('sarr/arr1/2', $arr, 'val_sarr_arr_2');
+        PMA_arrayWrite('sarr/arr1/2', $arr, 'val_sarr_arr_2');
         $this->assertEquals($arr['sarr']['arr1'][2], 'val_sarr_arr_2');
 
-        PMA_array_write('sarr/0/0', $arr, 5);
+        PMA_arrayWrite('sarr/0/0', $arr, 5);
         $this->assertEquals($arr['sarr'][0][0], 5);
 
-        PMA_array_write('sarr/0/1/0', $arr, 'e');
+        PMA_arrayWrite('sarr/0/1/0', $arr, 'e');
         $this->assertEquals($arr['sarr'][0][1][0], 'e');
 
-        PMA_array_write('sarr/not_existing/1', $arr, 'some_val');
+        PMA_arrayWrite('sarr/not_existing/1', $arr, 'some_val');
         $this->assertEquals($arr['sarr']['not_existing'][1], 'some_val');
 
-        PMA_array_write('sarr/0/2', $arr, null);
+        PMA_arrayWrite('sarr/0/2', $arr, null);
         $this->assertNull($arr['sarr'][0][2]);
     }