Renamed _Array classes to _PHPArray

aimeos · Oct 4, 2015 · 30857e3 · 30857e3
1 parent 1bf12a1
commit 30857e3
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 27 deletions.
diff --git a/client/html/tests/Client/Html/Catalog/Filter/Attribute/DefaultTest.php b/client/html/tests/Client/Html/Catalog/Filter/Attribute/DefaultTest.php
@@ -66,7 +66,7 @@ public function testGetBodyAttributeOrder()
 	{
 		$view = $this->object->getView();
 
-		$conf = new MW_Config_Array();
+		$conf = new MW_Config_PHPArray();
 		$conf->set( 'client/html/catalog/filter/attribute/types', array( 'color', 'width', 'length' ) );
 		$helper = new MW_View_Helper_Config_Default( $view, $conf );
 		$view->addHelper( 'config', $helper );

diff --git a/client/html/tests/Client/Html/Catalog/Filter/Tree/DefaultTest.php b/client/html/tests/Client/Html/Catalog/Filter/Tree/DefaultTest.php
@@ -77,7 +77,7 @@ public function testGetBodyLevelsAlways()
 
 		$view = $this->object->getView();
 
-		$conf = new MW_Config_Array( array( 'client' => array( 'html' => array( 'catalog' => array( 'filter' => array( 'tree' => array( 'levels-always' => 2 ) ) ) ) ) ) );
+		$conf = new MW_Config_PHPArray( array( 'client' => array( 'html' => array( 'catalog' => array( 'filter' => array( 'tree' => array( 'levels-always' => 2 ) ) ) ) ) ) );
 		$helper = new MW_View_Helper_Config_Default( $view, $conf );
 		$view->addHelper( 'config', $helper );
 
@@ -101,7 +101,7 @@ public function testGetBodyLevelsOnly()
 
 		$view = $this->object->getView();
 
-		$conf = new MW_Config_Array( array( 'client' => array( 'html' => array( 'catalog' => array( 'filter' => array( 'tree' => array( 'levels-only' => 1 ) ) ) ) ) ) );
+		$conf = new MW_Config_PHPArray( array( 'client' => array( 'html' => array( 'catalog' => array( 'filter' => array( 'tree' => array( 'levels-only' => 1 ) ) ) ) ) ) );
 		$helper = new MW_View_Helper_Config_Default( $view, $conf );
 		$view->addHelper( 'config', $helper );
 

diff --git a/client/html/tests/TestHelper.php b/client/html/tests/TestHelper.php
@@ -108,7 +108,7 @@ private static function createContext( $site )
 		$paths[] = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$conf = new MW_Config_Decorator_Memory( $conf );
 		$conf = new MW_Config_Decorator_Documentor( $conf, $file );
 		$ctx->setConfig( $conf );

diff --git a/controller/common/tests/TestHelper.php b/controller/common/tests/TestHelper.php
@@ -55,7 +55,7 @@ private static function createContext( $site )
 		$paths[] = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$conf = new MW_Config_Decorator_Memory( $conf );
 		$conf = new MW_Config_Decorator_Documentor( $conf, $file );
 		$ctx->setConfig( $conf );

diff --git a/controller/extjs/tests/TestHelper.php b/controller/extjs/tests/TestHelper.php
@@ -64,7 +64,7 @@ private static function createContext( $site )
 		$paths[] = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$conf = new MW_Config_Decorator_Memory( $conf );
 		$conf = new MW_Config_Decorator_Documentor( $conf, $file );
 		$ctx->setConfig( $conf );

diff --git a/controller/frontend/tests/TestHelper.php b/controller/frontend/tests/TestHelper.php
@@ -56,7 +56,7 @@ private static function createContext( $site )
 		$paths[] = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$conf = new MW_Config_Decorator_Memory( $conf );
 		$conf = new MW_Config_Decorator_Documentor( $conf, $file );
 		$ctx->setConfig( $conf );

diff --git a/controller/jobs/tests/TestHelper.php b/controller/jobs/tests/TestHelper.php
@@ -61,7 +61,7 @@ private static function createContext( $site )
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$conf = new MW_Config_Decorator_Memory( $conf );
 		$conf = new MW_Config_Decorator_Documentor( $conf, $file );
 		$ctx->setConfig( $conf );

diff --git a/lib/mshoplib/tests/TestHelper.php b/lib/mshoplib/tests/TestHelper.php
@@ -55,7 +55,7 @@ private static function createContext( $site )
 		$paths[] = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$conf = new MW_Config_Decorator_Memory( $conf );
 		$conf = new MW_Config_Decorator_Documentor( $conf, $file );
 		$ctx->setConfig( $conf );

diff --git a/lib/mwlib/src/MW/Config/Array.php → lib/mwlib/src/MW/Config/PHPArray.php b/lib/mwlib/src/MW/Config/Array.php → lib/mwlib/src/MW/Config/PHPArray.php
@@ -14,7 +14,7 @@
  * @package MW
  * @subpackage Config
  */
-class MW_Config_Array
+class MW_Config_PHPArray
 	extends MW_Config_Base
 	implements MW_Config_Iface
 {

diff --git a/lib/mwlib/tests/MW/Config/ArrayTest.php b/lib/mwlib/tests/MW/Config/ArrayTest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * Test class for MW_Config_Array.
+ * Test class for MW_Config_PHPArray.
  *
  * @copyright Copyright (c) Metaways Infosystems GmbH, 2011
  * @license LGPLv3, http://www.gnu.org/licenses/lgpl.html
  */
-class MW_Config_ArrayTest extends PHPUnit_Framework_TestCase
+class MW_Config_PHPArrayTest extends PHPUnit_Framework_TestCase
 {
 	private $object;
 
@@ -23,7 +23,7 @@ protected function setUp()
 		$dir2 = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'testowrite';
 
 		$conf = array( 'resource' => array( 'db' => array( 'host' => '127.0.0.1' ) ) );
-		$this->object = new MW_Config_Array( $conf, array( $dir, $dir2 ) );
+		$this->object = new MW_Config_PHPArray( $conf, array( $dir, $dir2 ) );
 	}
 
 	/**

diff --git a/lib/mwlib/tests/MW/Config/Decorator/APCTest.php b/lib/mwlib/tests/MW/Config/Decorator/APCTest.php
@@ -23,7 +23,7 @@ protected function setUp()
 			$this->markTestSkipped( 'APC not installed' );
 		}
 
-		$conf = new MW_Config_Array( array() );
+		$conf = new MW_Config_PHPArray( array() );
 		$this->object = new MW_Config_Decorator_APC( $conf, 'test:' );
 	}
 

diff --git a/lib/mwlib/tests/MW/Config/Decorator/MemoryTest.php b/lib/mwlib/tests/MW/Config/Decorator/MemoryTest.php
@@ -18,7 +18,7 @@ class MW_Config_Decorator_MemoryTest extends PHPUnit_Framework_TestCase
 	 */
 	protected function setUp()
 	{
-		$conf = new MW_Config_Array( array() );
+		$conf = new MW_Config_PHPArray( array() );
 		$this->object = new MW_Config_Decorator_Memory( $conf );
 	}
 
@@ -40,7 +40,7 @@ public function testGetSet()
 
 	public function testGetCached()
 	{
-		$conf = new MW_Config_Array( array() );
+		$conf = new MW_Config_PHPArray( array() );
 		$cached = array( 'resource' => array( 'db' => array( 'host' => '127.0.0.1' ) ) );
 		$this->object = new MW_Config_Decorator_Memory( $conf, $cached );
 

diff --git a/lib/mwlib/tests/MW/View/Helper/Config/DefaultTest.php b/lib/mwlib/tests/MW/View/Helper/Config/DefaultTest.php
@@ -31,7 +31,7 @@ protected function setUp()
 			),
 		);
 
-		$conf = new MW_Config_Array( $config );
+		$conf = new MW_Config_PHPArray( $config );
 		$this->object = new MW_View_Helper_Config_Default( $view, $conf );
 	}
 

diff --git a/lib/mwlib/tests/MW/View/Helper/Partial/DefaultTest.php b/lib/mwlib/tests/MW/View/Helper/Partial/DefaultTest.php
@@ -20,7 +20,7 @@ class MW_View_Helper_Partial_DefaultTest extends PHPUnit_Framework_TestCase
 	protected function setUp()
 	{
 		$view = new MW_View_Default();
-		$conf = new MW_Config_Array();
+		$conf = new MW_Config_PHPArray();
 		$paths = array( __DIR__ => array( 'testfiles' ) );
 
 		$this->object = new MW_View_Helper_Partial_Default( $view, $conf, $paths );

diff --git a/lib/mwlib/tests/Perf/Config/ArrayTest.php b/lib/mwlib/tests/Perf/Config/ArrayTest.php
@@ -18,7 +18,7 @@ public function testArray()
 
 		for( $i = 0; $i < 1000; $i++ )
 		{
-			$conf = new MW_Config_Array( $paths );
+			$conf = new MW_Config_PHPArray( $paths );
 
 			$conf->get( 'test/db/host' );
 			$conf->get( 'test/db/username' );

diff --git a/lib/mwlib/tests/TestHelper.php b/lib/mwlib/tests/TestHelper.php
@@ -54,7 +54,7 @@ private static function createConfig()
 		$path = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$object = new MW_Config_Array( array(), $path );
+		$object = new MW_Config_PHPArray( array(), $path );
 		$object = new MW_Config_Decorator_Documentor( $object, $file );
 
 		return $object;

diff --git a/misc/ext-template/client/html/tests/TestHelper.php b/misc/ext-template/client/html/tests/TestHelper.php
@@ -95,7 +95,7 @@ private static function createContext( $site )
 		$paths = $aimeos->getConfigPaths( 'mysql' );
 		$paths[] = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$ctx->setConfig( $conf );
 
 

diff --git a/misc/ext-template/controller/common/tests/TestHelper.php b/misc/ext-template/controller/common/tests/TestHelper.php
@@ -58,7 +58,7 @@ private static function createContext( $site )
 		$paths = $aimeos->getConfigPaths( 'mysql' );
 		$paths[] = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$conf = new MW_Config_Decorator_Memory( $conf );
 		$ctx->setConfig( $conf );
 

diff --git a/misc/ext-template/controller/extjs/tests/TestHelper.php b/misc/ext-template/controller/extjs/tests/TestHelper.php
@@ -58,7 +58,7 @@ private static function createContext( $site )
 		$paths = $aimeos->getConfigPaths( 'mysql' );
 		$paths[] = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$conf = new MW_Config_Decorator_Memory( $conf );
 		$ctx->setConfig( $conf );
 

diff --git a/misc/ext-template/controller/frontend/tests/TestHelper.php b/misc/ext-template/controller/frontend/tests/TestHelper.php
@@ -58,7 +58,7 @@ private static function createContext( $site )
 		$paths = $aimeos->getConfigPaths( 'mysql' );
 		$paths[] = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$conf = new MW_Config_Decorator_Memory( $conf );
 		$ctx->setConfig( $conf );
 

diff --git a/misc/ext-template/controller/jobs/tests/TestHelper.php b/misc/ext-template/controller/jobs/tests/TestHelper.php
@@ -64,7 +64,7 @@ private static function createContext( $site )
 		$paths = $aimeos->getConfigPaths( 'mysql' );
 		$paths[] = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$conf = new MW_Config_Decorator_Memory( $conf );
 		$ctx->setConfig( $conf );
 

diff --git a/misc/ext-template/lib/custom/tests/TestHelper.php b/misc/ext-template/lib/custom/tests/TestHelper.php
@@ -55,7 +55,7 @@ private static function createContext( $site )
 		$paths = $aimeos->getConfigPaths( 'mysql' );
 		$paths[] = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'config';
 
-		$conf = new MW_Config_Array( array(), $paths );
+		$conf = new MW_Config_PHPArray( array(), $paths );
 		$ctx->setConfig( $conf );
 
 

diff --git a/setup.php b/setup.php
@@ -113,7 +113,7 @@ function usage()
 		$confPaths = array_merge( $confPaths, (array) $options['config'] );
 	}
 
-	$conf = new MW_Config_Array( array(), $confPaths );
+	$conf = new MW_Config_PHPArray( array(), $confPaths );
 	$conf = new MW_Config_Decorator_Memory( $conf );
 	$ctx->setConfig( $conf );