pradosoft / prado

tests/test_tools/simpletest/selector.php

Indentation +108 added lines, -108 removed lines

@@ -1,132 +1,132 @@
 <?php
-    /**
-     *	Base include file for SimpleTest.
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: selector.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	Base include file for SimpleTest.
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: selector.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      * include SimpleTest files
      */
-    require_once(dirname(__FILE__) . '/tag.php');
-    require_once(dirname(__FILE__) . '/encoding.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/tag.php');
+	require_once(dirname(__FILE__) . '/encoding.php');
+	/**#@-*/
 
-    /**
-     *    Used to extract form elements for testing against.
-     *    Searches by name attribute.
+	/**
+	 *    Used to extract form elements for testing against.
+	 *    Searches by name attribute.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleByName {
-        protected $_name;
+	 */
+	class SimpleByName {
+		protected $_name;
 
-        /**
-         *    Stashes the name for later comparison.
-         *    @param string $name     Name attribute to match.
-         */
-        function SimpleByName($name) {
-            $this->_name = $name;
-        }
+		/**
+		 *    Stashes the name for later comparison.
+		 *    @param string $name     Name attribute to match.
+		 */
+		function SimpleByName($name) {
+			$this->_name = $name;
+		}
 
-        /**
-         *    Compares with name attribute of widget.
-         *    @param SimpleWidget $widget    Control to compare.
-         *    @access public
-         */
-        function isMatch($widget) {
-            return ($widget->getName() == $this->_name);
-        }
-    }
+		/**
+		 *    Compares with name attribute of widget.
+		 *    @param SimpleWidget $widget    Control to compare.
+		 *    @access public
+		 */
+		function isMatch($widget) {
+			return ($widget->getName() == $this->_name);
+		}
+	}
 
-    /**
-     *    Used to extract form elements for testing against.
-     *    Searches by visible label or alt text.
+	/**
+	 *    Used to extract form elements for testing against.
+	 *    Searches by visible label or alt text.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleByLabel {
-        protected $_label;
+	 */
+	class SimpleByLabel {
+		protected $_label;
 
-        /**
-         *    Stashes the name for later comparison.
-         *    @param string $label     Visible text to match.
-         */
-        function SimpleByLabel($label) {
-            $this->_label = $label;
-        }
+		/**
+		 *    Stashes the name for later comparison.
+		 *    @param string $label     Visible text to match.
+		 */
+		function SimpleByLabel($label) {
+			$this->_label = $label;
+		}
 
-        /**
-         *    Comparison. Compares visible text of widget or
-         *    related label.
-         *    @param SimpleWidget $widget    Control to compare.
-         *    @access public
-         */
-        function isMatch($widget) {
-            if (! method_exists($widget, 'isLabel')) {
-                return false;
-            }
-            return $widget->isLabel($this->_label);
-        }
-    }
+		/**
+		 *    Comparison. Compares visible text of widget or
+		 *    related label.
+		 *    @param SimpleWidget $widget    Control to compare.
+		 *    @access public
+		 */
+		function isMatch($widget) {
+			if (! method_exists($widget, 'isLabel')) {
+				return false;
+			}
+			return $widget->isLabel($this->_label);
+		}
+	}
 
-    /**
-     *    Used to extract form elements for testing against.
-     *    Searches dy id attribute.
+	/**
+	 *    Used to extract form elements for testing against.
+	 *    Searches dy id attribute.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleById {
-        protected $_id;
+	 */
+	class SimpleById {
+		protected $_id;
 
-        /**
-         *    Stashes the name for later comparison.
-         *    @param string $id     ID atribute to match.
-         */
-        function SimpleById($id) {
-            $this->_id = $id;
-        }
+		/**
+		 *    Stashes the name for later comparison.
+		 *    @param string $id     ID atribute to match.
+		 */
+		function SimpleById($id) {
+			$this->_id = $id;
+		}
 
-        /**
-         *    Comparison. Compares id attribute of widget.
-         *    @param SimpleWidget $widget    Control to compare.
-         *    @access public
-         */
-        function isMatch($widget) {
-            return $widget->isId($this->_id);
-        }
-    }
+		/**
+		 *    Comparison. Compares id attribute of widget.
+		 *    @param SimpleWidget $widget    Control to compare.
+		 *    @access public
+		 */
+		function isMatch($widget) {
+			return $widget->isId($this->_id);
+		}
+	}
 
-    /**
-     *    Used to extract form elements for testing against.
-     *    Searches by visible label, name or alt text.
+	/**
+	 *    Used to extract form elements for testing against.
+	 *    Searches by visible label, name or alt text.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleByLabelOrName {
-        protected $_label;
+	 */
+	class SimpleByLabelOrName {
+		protected $_label;
 
-        /**
-         *    Stashes the name/label for later comparison.
-         *    @param string $label     Visible text to match.
-         */
-        function SimpleByLabelOrName($label) {
-            $this->_label = $label;
-        }
+		/**
+		 *    Stashes the name/label for later comparison.
+		 *    @param string $label     Visible text to match.
+		 */
+		function SimpleByLabelOrName($label) {
+			$this->_label = $label;
+		}
 
-        /**
-         *    Comparison. Compares visible text of widget or
-         *    related label or name.
-         *    @param SimpleWidget $widget    Control to compare.
-         *    @access public
-         */
-        function isMatch($widget) {
-            if (method_exists($widget, 'isLabel')) {
-                if ($widget->isLabel($this->_label)) {
-                    return true;
-                }
-            }
-            return ($widget->getName() == $this->_label);
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Comparison. Compares visible text of widget or
+		 *    related label or name.
+		 *    @param SimpleWidget $widget    Control to compare.
+		 *    @access public
+		 */
+		function isMatch($widget) {
+			if (method_exists($widget, 'isLabel')) {
+				if ($widget->isLabel($this->_label)) {
+					return true;
+				}
+			}
+			return ($widget->getName() == $this->_label);
+		}
+	}
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
          *    @access public
          */
         function isMatch($widget) {
-            if (! method_exists($widget, 'isLabel')) {
+            if (!method_exists($widget, 'isLabel')) {
                 return false;
             }
             return $widget->isLabel($this->_label);

tests/unit/Collections/TPagedListTest.php

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
 		$list = new TPagedList();
 		try {
 			$list->PageSize = 0;
-		} catch(TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidDataValueException was not raised');
@@ -96,7 +96,7 @@ 
 		$myList = new MyPagedList();
 		$list->attachEventHandler('OnFetchData', array($myList, 'fetchData'));
 		self::assertEquals(false, $myList->hasFetchedData());
-		$list->onFetchData(new TPagedListFetchDataEventParameter($list->CurrentPageIndex, $list->PageSize*$list->CurrentPageIndex, $list->PageSize));
+		$list->onFetchData(new TPagedListFetchDataEventParameter($list->CurrentPageIndex, $list->PageSize * $list->CurrentPageIndex, $list->PageSize));
 		self::assertEquals(true, $myList->hasFetchedData());
 	}
 
@@ -174,13 +174,13 @@ 
 		self::assertInstanceOf('ArrayIterator', $list->getIterator());
 		$n = 0;
 		$found = 0;
-		foreach($list as $index => $item) {
-			foreach($list as $a => $b); // test of iterator
+		foreach ($list as $index => $item) {
+			foreach ($list as $a => $b); // test of iterator
 			$n++;
-			if($index === 0 && $item === 1) {
+			if ($index === 0 && $item === 1) {
 				$found++;
 			}
-			if($index === 1 && $item === 2) {
+			if ($index === 1 && $item === 2) {
 				$found++;
 			}
 		}

tests/unit/Collections/TMapTest.php

Indentation +18 added lines, -18 removed lines

@@ -12,27 +12,27 @@ 
   protected $item1,$item2,$item3;
 
   public function setUp() {
-    $this->map=new TMap;
-    $this->item1=new TMapTest_MapItem;
-    $this->item2=new TMapTest_MapItem;
-    $this->item3=new TMapTest_MapItem;
-    $this->map->add('key1',$this->item1);
-    $this->map->add('key2',$this->item2);
+	$this->map=new TMap;
+	$this->item1=new TMapTest_MapItem;
+	$this->item2=new TMapTest_MapItem;
+	$this->item3=new TMapTest_MapItem;
+	$this->map->add('key1',$this->item1);
+	$this->map->add('key2',$this->item2);
   }
 
   public function tearDown() {
-    $this->map=null;
-    $this->item1=null;
-    $this->item2=null;
-    $this->item3=null;
+	$this->map=null;
+	$this->item1=null;
+	$this->item2=null;
+	$this->item3=null;
   }
 
   public function testConstruct() {
-    $a=array(1,2,'key3'=>3);
-    $map=new TMap($a);
-    $this->assertEquals(3,$map->getCount());
-    $map2=new TMap($this->map);
-    $this->assertEquals(2,$map2->getCount());
+	$a=array(1,2,'key3'=>3);
+	$map=new TMap($a);
+	$this->assertEquals(3,$map->getCount());
+	$map2=new TMap($this->map);
+	$this->assertEquals(2,$map2->getCount());
   }
 
 	public function testGetReadOnly() {
@@ -43,12 +43,12 @@ 
 	}
 
   public function testGetCount() {
-    $this->assertEquals(2,$this->map->getCount());
+	$this->assertEquals(2,$this->map->getCount());
   }
 
   public function testGetKeys() {
-    $keys=$this->map->getKeys();
-    $this->assertTrue(count($keys)===2 && $keys[0]==='key1' && $keys[1]==='key2');
+	$keys=$this->map->getKeys();
+	$this->assertTrue(count($keys)===2 && $keys[0]==='key1' && $keys[1]==='key2');
   }
 
 	public function testAdd()

Spacing +49 added lines, -49 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 class TMapTest_MapItem {
-  public $data='data';
+  public $data = 'data';
 }
 
 /**
@@ -9,30 +9,30 @@ 
  */
 class TMapTest extends PHPUnit_Framework_TestCase {
   protected $map;
-  protected $item1,$item2,$item3;
+  protected $item1, $item2, $item3;
 
   public function setUp() {
-    $this->map=new TMap;
-    $this->item1=new TMapTest_MapItem;
-    $this->item2=new TMapTest_MapItem;
-    $this->item3=new TMapTest_MapItem;
-    $this->map->add('key1',$this->item1);
-    $this->map->add('key2',$this->item2);
+    $this->map = new TMap;
+    $this->item1 = new TMapTest_MapItem;
+    $this->item2 = new TMapTest_MapItem;
+    $this->item3 = new TMapTest_MapItem;
+    $this->map->add('key1', $this->item1);
+    $this->map->add('key2', $this->item2);
   }
 
   public function tearDown() {
-    $this->map=null;
-    $this->item1=null;
-    $this->item2=null;
-    $this->item3=null;
+    $this->map = null;
+    $this->item1 = null;
+    $this->item2 = null;
+    $this->item3 = null;
   }
 
   public function testConstruct() {
-    $a=array(1,2,'key3'=>3);
-    $map=new TMap($a);
-    $this->assertEquals(3,$map->getCount());
-    $map2=new TMap($this->map);
-    $this->assertEquals(2,$map2->getCount());
+    $a = array(1, 2, 'key3'=>3);
+    $map = new TMap($a);
+    $this->assertEquals(3, $map->getCount());
+    $map2 = new TMap($this->map);
+    $this->assertEquals(2, $map2->getCount());
   }
 
 	public function testGetReadOnly() {
@@ -43,25 +43,25 @@ 
 	}
 
   public function testGetCount() {
-    $this->assertEquals(2,$this->map->getCount());
+    $this->assertEquals(2, $this->map->getCount());
   }
 
   public function testGetKeys() {
-    $keys=$this->map->getKeys();
-    $this->assertTrue(count($keys)===2 && $keys[0]==='key1' && $keys[1]==='key2');
+    $keys = $this->map->getKeys();
+    $this->assertTrue(count($keys) === 2 && $keys[0] === 'key1' && $keys[1] === 'key2');
   }
 
 	public function testAdd()
 	{
-		$this->map->add('key3',$this->item3);
-		$this->assertTrue($this->map->getCount()==3 && $this->map->contains('key3'));
+		$this->map->add('key3', $this->item3);
+		$this->assertTrue($this->map->getCount() == 3 && $this->map->contains('key3'));
 	}
 
 	public function testCanNotAddWhenReadOnly() {
 		$map = new TMap(array(), true);
 		try {
 			$map->add('key', 'value');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');
@@ -70,15 +70,15 @@ 
 	public function testRemove()
 	{
 		$this->map->remove('key1');
-		$this->assertTrue($this->map->getCount()==1 && !$this->map->contains('key1'));
-		$this->assertTrue($this->map->remove('unknown key')===null);
+		$this->assertTrue($this->map->getCount() == 1 && !$this->map->contains('key1'));
+		$this->assertTrue($this->map->remove('unknown key') === null);
 	}
 
 	public function testCanNotRemoveWhenReadOnly() {
 		$map = new TMap(array('key' => 'value'), true);
 		try {
 			$map->remove('key');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');
@@ -87,7 +87,7 @@ 
 	public function testClear()
 	{
 		$this->map->clear();
-		$this->assertTrue($this->map->getCount()==0 && !$this->map->contains('key1') && !$this->map->contains('key2'));
+		$this->assertTrue($this->map->getCount() == 0 && !$this->map->contains('key1') && !$this->map->contains('key2'));
 	}
 
 	public function testContains()
@@ -99,15 +99,15 @@ 
 
 	public function testCopyFrom()
 	{
-		$array=array('key3'=>$this->item3,'key4'=>$this->item1);
+		$array = array('key3'=>$this->item3, 'key4'=>$this->item1);
 		$this->map->copyFrom($array);
-		$this->assertTrue($this->map->getCount()==2 && $this->map['key3']===$this->item3 && $this->map['key4']===$this->item1);
+		$this->assertTrue($this->map->getCount() == 2 && $this->map['key3'] === $this->item3 && $this->map['key4'] === $this->item1);
 		try
 		{
 			$this->map->copyFrom($this);
 			$this->fail('no exception raised when copying a non-traversable object');
 		}
-		catch(TInvalidDataTypeException $e)
+		catch (TInvalidDataTypeException $e)
 		{
 
 		}
@@ -115,15 +115,15 @@ 
 
 	public function testMergeWith()
 	{
-		$array=array('key2'=>$this->item1,'key3'=>$this->item3);
+		$array = array('key2'=>$this->item1, 'key3'=>$this->item3);
 		$this->map->mergeWith($array);
-		$this->assertTrue($this->map->getCount()==3 && $this->map['key2']===$this->item1 && $this->map['key3']===$this->item3);
+		$this->assertTrue($this->map->getCount() == 3 && $this->map['key2'] === $this->item1 && $this->map['key3'] === $this->item3);
 		try
 		{
 			$this->map->mergeWith($this);
 			$this->fail('no exception raised when copying a non-traversable object');
 		}
-		catch(TInvalidDataTypeException $e)
+		catch (TInvalidDataTypeException $e)
 		{
 
 		}
@@ -131,25 +131,25 @@ 
 
 	public function testArrayRead()
 	{
-		$this->assertTrue($this->map['key1']===$this->item1);
-		$this->assertTrue($this->map['key2']===$this->item2);
-		$this->assertEquals(null,$this->map['key3']);
+		$this->assertTrue($this->map['key1'] === $this->item1);
+		$this->assertTrue($this->map['key2'] === $this->item2);
+		$this->assertEquals(null, $this->map['key3']);
 	}
 
 	public function testArrayWrite()
 	{
-		$this->map['key3']=$this->item3;
-		$this->assertTrue($this->map['key3']===$this->item3 && $this->map->getCount()===3);
-		$this->map['key1']=$this->item3;
-		$this->assertTrue($this->map['key1']===$this->item3 && $this->map->getCount()===3);
+		$this->map['key3'] = $this->item3;
+		$this->assertTrue($this->map['key3'] === $this->item3 && $this->map->getCount() === 3);
+		$this->map['key1'] = $this->item3;
+		$this->assertTrue($this->map['key1'] === $this->item3 && $this->map->getCount() === 3);
 		unset($this->map['key2']);
-		$this->assertTrue($this->map->getCount()===2 && !$this->map->contains('key2'));
+		$this->assertTrue($this->map->getCount() === 2 && !$this->map->contains('key2'));
 		try
 		{
 			unset($this->map['unknown key']);
 
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			$this->fail('exception raised when unsetting element with unknown key');
 		}
@@ -157,22 +157,22 @@ 
 
 	public function testArrayForeach()
 	{
-		$n=0;
-		$found=0;
-		foreach($this->map as $index=>$item)
+		$n = 0;
+		$found = 0;
+		foreach ($this->map as $index=>$item)
 		{
 			$n++;
-			if($index==='key1' && $item===$this->item1)
+			if ($index === 'key1' && $item === $this->item1)
 				$found++;
-			if($index==='key2' && $item===$this->item2)
+			if ($index === 'key2' && $item === $this->item2)
 				$found++;
 		}
-		$this->assertTrue($n==2 && $found==2);
+		$this->assertTrue($n == 2 && $found == 2);
 	}
 
 	public function testArrayMisc()
 	{
-		$this->assertEquals($this->map->Count,count($this->map));
+		$this->assertEquals($this->map->Count, count($this->map));
 		$this->assertTrue(isset($this->map['key1']));
 		$this->assertFalse(isset($this->map['unknown key']));
 	}

Braces +9 added lines, -10 removed lines

@@ -127,8 +127,7 @@ 
 		{
 			$this->map->copyFrom($this);
 			$this->fail('no exception raised when copying a non-traversable object');
-		}
-		catch(TInvalidDataTypeException $e)
+		} catch(TInvalidDataTypeException $e)
 		{
 
 		}
@@ -145,8 +144,7 @@ 
 		{
 			$this->map->mergeWith($this);
 			$this->fail('no exception raised when copying a non-traversable object');
-		}
-		catch(TInvalidDataTypeException $e)
+		} catch(TInvalidDataTypeException $e)
 		{
 
 		}
@@ -174,8 +172,7 @@ 
 		{
 			unset($this->map['unknown key']);
 
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->fail('exception raised when unsetting element with unknown key');
 		}
@@ -188,10 +185,12 @@ 
 		foreach($this->map as $index=>$item)
 		{
 			$n++;
-			if($index==='key1' && $item===$this->item1)
-				$found++;
-			if($index==='key2' && $item===$this->item2)
-				$found++;
+			if($index==='key1' && $item===$this->item1) {
+							$found++;
+			}
+			if($index==='key2' && $item===$this->item2) {
+							$found++;
+			}
 		}
 		$this->assertTrue($n==2 && $found==2);
 	}

tests/unit/Collections/TStackTest.php

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 		$data = new stdClass();
 		try {
 			$stack->copyFrom($data);
-		} catch(TInvalidDataTypeException $e) {
+		} catch (TInvalidDataTypeException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidDataTypeException was not raised');
@@ -64,7 +64,7 @@ 
 		$stack = new TStack();
 		try {
 			$item = $stack->peek();
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');
@@ -81,7 +81,7 @@ 
 		$stack = new TStack();
 		try {
 			$item = $stack->pop();
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');
@@ -98,13 +98,13 @@ 
 		self::assertInstanceOf('ArrayIterator', $stack->getIterator());
 		$n = 0;
 		$found = 0;
-		foreach($stack as $index => $item) {
-			foreach($stack as $a => $b); // test of iterator
+		foreach ($stack as $index => $item) {
+			foreach ($stack as $a => $b); // test of iterator
 			$n++;
-			if($index === 0 && $item === 1) {
+			if ($index === 0 && $item === 1) {
 				$found++;
 			}
-			if($index === 1 && $item === 2) {
+			if ($index === 1 && $item === 2) {
 				$found++;
 			}
 		}

tests/unit/Collections/TQueueTest.php

Indentation +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 	}
 
 	public function testGetCount() {
-    	$queue = new TQueue();
+		$queue = new TQueue();
 		self::assertEquals(0, $queue->getCount());
 		$queue = new TQueue(array(1, 2, 3));
 		self::assertEquals(3, $queue->getCount());

Spacing +8 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
 		$data = new stdClass();
 		try {
 			$queue->copyFrom($data);
-		} catch(TInvalidDataTypeException $e) {
+		} catch (TInvalidDataTypeException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidDataTypeException was not raised');
@@ -56,7 +56,7 @@ 
 	}
 
 	public function testPeek() {
-		$queue = new TQueue(array(1,2,3));
+		$queue = new TQueue(array(1, 2, 3));
 		self::assertEquals(1, $queue->peek());
 	}
 
@@ -64,7 +64,7 @@ 
 		$queue = new TQueue();
 		try {
 			$item = $queue->peek();
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');
@@ -81,7 +81,7 @@ 
 		$queue = new TQueue();
 		try {
 			$item = $queue->dequeue();
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');
@@ -98,13 +98,13 @@ 
 		self::assertInstanceOf('ArrayIterator', $queue->getIterator());
 		$n = 0;
 		$found = 0;
-		foreach($queue as $index => $item) {
-			foreach($queue as $a => $b); // test of iterator
+		foreach ($queue as $index => $item) {
+			foreach ($queue as $a => $b); // test of iterator
 			$n++;
-			if($index === 0 && $item === 1) {
+			if ($index === 0 && $item === 1) {
 				$found++;
 			}
-			if($index === 1 && $item === 2) {
+			if ($index === 1 && $item === 2) {
 				$found++;
 			}
 		}

tests/unit/Collections/TAttributeCollectionTest.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 		self::assertEquals(false, $collection->canGetProperty('Property'));
 		try {
 			$value = $collection->Property;
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');
@@ -42,7 +42,7 @@ 
 		$collection = new TAttributeCollection(array(), true);
 		try {
 			$collection->Property = 'value';
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');

tests/unit/Collections/TListTest.php

Indentation +10 added lines, -10 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 class ListItem {
-    public $data='data';
+	public $data='data';
 }
 
 /**
@@ -9,17 +9,17 @@ 
  */
 class TListTest extends PHPUnit_Framework_TestCase {
 
-    protected $list;
-    protected $item1, $item2, $item3, $item4;
+	protected $list;
+	protected $item1, $item2, $item3, $item4;
 
 	public function setUp() {
-	    $this->list=new TList;
-	    $this->item1=new ListItem;
-	    $this->item2=new ListItem;
-	    $this->item3=new ListItem;
-	    $this->item4=new ListItem;
-	    $this->list->add($this->item1);
-	    $this->list->add($this->item2);
+		$this->list=new TList;
+		$this->item1=new ListItem;
+		$this->item2=new ListItem;
+		$this->item3=new ListItem;
+		$this->item4=new ListItem;
+		$this->list->add($this->item1);
+		$this->list->add($this->item2);
 	}
 
 	public function tearDown() {

Spacing +93 added lines, -93 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 class ListItem {
-    public $data='data';
+    public $data = 'data';
 }
 
 /**
@@ -13,29 +13,29 @@ 
     protected $item1, $item2, $item3, $item4;
 
 	public function setUp() {
-	    $this->list=new TList;
-	    $this->item1=new ListItem;
-	    $this->item2=new ListItem;
-	    $this->item3=new ListItem;
-	    $this->item4=new ListItem;
+	    $this->list = new TList;
+	    $this->item1 = new ListItem;
+	    $this->item2 = new ListItem;
+	    $this->item3 = new ListItem;
+	    $this->item4 = new ListItem;
 	    $this->list->add($this->item1);
 	    $this->list->add($this->item2);
 	}
 
 	public function tearDown() {
-		$this->list=null;
-		$this->item1=null;
-		$this->item2=null;
-		$this->item3=null;
-		$this->item4=null;
+		$this->list = null;
+		$this->item1 = null;
+		$this->item2 = null;
+		$this->item3 = null;
+		$this->item4 = null;
 	}
 
 	public function testConstruct() {
-		$a=array(1,2,3);
-		$list=new TList($a);
-		$this->assertEquals(3,$list->getCount());
-		$list2=new TList($this->list);
-		$this->assertEquals(2,$list2->getCount());
+		$a = array(1, 2, 3);
+		$list = new TList($a);
+		$this->assertEquals(3, $list->getCount());
+		$list2 = new TList($this->list);
+		$this->assertEquals(2, $list2->getCount());
 	}
 
 	public function testGetReadOnly() {
@@ -46,8 +46,8 @@ 
 	}
 
 	public function testGetCount() {
-		$this->assertEquals(2,$this->list->getCount());
-		$this->assertEquals(2,$this->list->Count);
+		$this->assertEquals(2, $this->list->getCount());
+		$this->assertEquals(2, $this->list->Count);
 	}
 
 	public function testItemAt() {
@@ -56,15 +56,15 @@ 
 		try {
 			$this->list->itemAt(2);
 			$this->fail('exception not raised when adding item at an out-of-range index');
-		} catch(TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 	}
 
 	public function testAdd() {
-		$this->assertEquals(2,$this->list->add(null));
-		$this->assertEquals(3,$this->list->add($this->item3));
-		$this->assertEquals(4,$this->list->getCount());
-		$this->assertEquals(3,$this->list->indexOf($this->item3));
+		$this->assertEquals(2, $this->list->add(null));
+		$this->assertEquals(3, $this->list->add($this->item3));
+		$this->assertEquals(4, $this->list->getCount());
+		$this->assertEquals(3, $this->list->indexOf($this->item3));
 	}
 
 	public function testCanNotAddWhenReadOnly() {
@@ -72,20 +72,20 @@ 
 		try {
 			$list->add(1);
 			self::fail('An expected TInvalidOperationException was not raised');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 
 	public function testInsertAt() {
-		$this->assertNull($this->list->insertAt(0,$this->item3));
-		$this->assertEquals(3,$this->list->getCount());
-		$this->assertEquals(2,$this->list->indexOf($this->item2));
-		$this->assertEquals(0,$this->list->indexOf($this->item3));
-		$this->assertEquals(1,$this->list->indexOf($this->item1));
+		$this->assertNull($this->list->insertAt(0, $this->item3));
+		$this->assertEquals(3, $this->list->getCount());
+		$this->assertEquals(2, $this->list->indexOf($this->item2));
+		$this->assertEquals(0, $this->list->indexOf($this->item3));
+		$this->assertEquals(1, $this->list->indexOf($this->item1));
 		try {
-			$this->list->insertAt(4,$this->item3);
+			$this->list->insertAt(4, $this->item3);
 			$this->fail('exception not raised when adding item at an out-of-range index');
-		} catch(TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 	}
 
@@ -94,27 +94,27 @@ 
 		try {
 			$list->insertAt(1, 2);
 			self::fail('An expected TInvalidOperationException was not raised');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 		try {
 			$list->insertAt(0, 2);
 			self::fail('An expected TInvalidOperationException was not raised');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 
 	public function testInsertBefore() {
 		try {
-			$this->list->insertBefore($this->item4,$this->item3);
+			$this->list->insertBefore($this->item4, $this->item3);
 			$this->fail('exception not raised when adding item before a non-existant base item');
-		} catch(TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
-		$this->assertEquals(2,$this->list->getCount());
-		$this->assertEquals(0,$this->list->insertBefore($this->item1,$this->item3));
-		$this->assertEquals(3,$this->list->getCount());
-		$this->assertEquals(0,$this->list->indexOf($this->item3));
-		$this->assertEquals(1,$this->list->indexOf($this->item1));
-		$this->assertEquals(2,$this->list->indexOf($this->item2));
+		$this->assertEquals(2, $this->list->getCount());
+		$this->assertEquals(0, $this->list->insertBefore($this->item1, $this->item3));
+		$this->assertEquals(3, $this->list->getCount());
+		$this->assertEquals(0, $this->list->indexOf($this->item3));
+		$this->assertEquals(1, $this->list->indexOf($this->item1));
+		$this->assertEquals(2, $this->list->indexOf($this->item2));
 	}
 
 	public function testCanNotInsertBeforeWhenReadOnly() {
@@ -122,27 +122,27 @@ 
 		try {
 			$list->insertBefore(5, 6);
 			self::fail('An expected TInvalidOperationException was not raised');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 		try {
 			$list->insertBefore(8, 6);
 			self::fail('An expected TInvalidOperationException was not raised');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 
 	public function testInsertAfter() {
 		try {
-			$this->list->insertAfter($this->item4,$this->item3);
+			$this->list->insertAfter($this->item4, $this->item3);
 			$this->fail('exception not raised when adding item after a non-existant base item');
-		} catch(TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
-		$this->assertEquals(2,$this->list->getCount());
-		$this->assertEquals(2,$this->list->insertAfter($this->item2,$this->item3));
-		$this->assertEquals(3,$this->list->getCount());
-		$this->assertEquals(0,$this->list->indexOf($this->item1));
-		$this->assertEquals(1,$this->list->indexOf($this->item2));
-		$this->assertEquals(2,$this->list->indexOf($this->item3));
+		$this->assertEquals(2, $this->list->getCount());
+		$this->assertEquals(2, $this->list->insertAfter($this->item2, $this->item3));
+		$this->assertEquals(3, $this->list->getCount());
+		$this->assertEquals(0, $this->list->indexOf($this->item1));
+		$this->assertEquals(1, $this->list->indexOf($this->item2));
+		$this->assertEquals(2, $this->list->indexOf($this->item3));
 	}
 
 	public function testCanNotInsertAfterWhenReadOnly() {
@@ -150,24 +150,24 @@ 
 		try {
 			$list->insertAfter(5, 6);
 			self::fail('An expected TInvalidOperationException was not raised');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 		try {
 			$list->insertAfter(8, 6);
 			self::fail('An expected TInvalidOperationException was not raised');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 
 	public function testRemove() {
-		$this->assertEquals(0,$this->list->remove($this->item1));
-		$this->assertEquals(1,$this->list->getCount());
-		$this->assertEquals(-1,$this->list->indexOf($this->item1));
-		$this->assertEquals(0,$this->list->indexOf($this->item2));
+		$this->assertEquals(0, $this->list->remove($this->item1));
+		$this->assertEquals(1, $this->list->getCount());
+		$this->assertEquals(-1, $this->list->indexOf($this->item1));
+		$this->assertEquals(0, $this->list->indexOf($this->item2));
 		try {
 			$this->list->remove($this->item1);
 			$this->fail('exception not raised when removing nonexisting item');
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 		}
 	}
 
@@ -176,27 +176,27 @@ 
 		try {
 			$list->remove(2);
 			self::fail('An expected TInvalidOperationException was not raised');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 
 		$list = new TList(array(1, 2, 3), true);
 		try {
 			$list->remove(10);
 			self::fail('An expected TInvalidOperationException was not raised');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 
 	public function testRemoveAt() {
 		$this->list->add($this->item3);
 		$this->assertEquals($this->item2, $this->list->removeAt(1));
-		$this->assertEquals(-1,$this->list->indexOf($this->item2));
-		$this->assertEquals(1,$this->list->indexOf($this->item3));
-		$this->assertEquals(0,$this->list->indexOf($this->item1));
+		$this->assertEquals(-1, $this->list->indexOf($this->item2));
+		$this->assertEquals(1, $this->list->indexOf($this->item3));
+		$this->assertEquals(0, $this->list->indexOf($this->item1));
 		try {
 			$this->list->removeAt(2);
 			$this->fail('exception not raised when removing item with invalid index');
-		} catch(TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 	}
 
@@ -205,29 +205,29 @@ 
 		try {
 			$list->removeAt(2);
 			self::fail('An expected TInvalidOperationException was not raised');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 
 		$list = new TList(array(1, 2, 3), true);
 		try {
 			$list->removeAt(10);
 			self::fail('An expected TInvalidOperationException was not raised');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 
 	public function testClear() {
 		$this->list->clear();
-		$this->assertEquals(0,$this->list->getCount());
-		$this->assertEquals(-1,$this->list->indexOf($this->item1));
-		$this->assertEquals(-1,$this->list->indexOf($this->item2));
+		$this->assertEquals(0, $this->list->getCount());
+		$this->assertEquals(-1, $this->list->indexOf($this->item1));
+		$this->assertEquals(-1, $this->list->indexOf($this->item2));
 	}
 
 	public function testCanNotClearWhenReadOnly() {
 		$list = new TList(array(1, 2, 3), true);
 		try {
 			$list->clear();
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');
@@ -240,64 +240,64 @@ 
 	}
 
 	public function testIndexOf() {
-		$this->assertEquals(0,$this->list->indexOf($this->item1));
-		$this->assertEquals(1,$this->list->indexOf($this->item2));
-		$this->assertEquals(-1,$this->list->indexOf($this->item3));
+		$this->assertEquals(0, $this->list->indexOf($this->item1));
+		$this->assertEquals(1, $this->list->indexOf($this->item2));
+		$this->assertEquals(-1, $this->list->indexOf($this->item3));
 	}
 
 	public function testCopyFrom() {
-		$array=array($this->item3,$this->item1);
+		$array = array($this->item3, $this->item1);
 		$this->list->copyFrom($array);
-		$this->assertTrue(count($array)==2 && $this->list[0]===$this->item3 && $this->list[1]===$this->item1);
+		$this->assertTrue(count($array) == 2 && $this->list[0] === $this->item3 && $this->list[1] === $this->item1);
 		try {
 			$this->list->copyFrom($this);
 			$this->fail('exception not raised when copying from non-traversable object');
-		} catch(TInvalidDataTypeException $e) {
+		} catch (TInvalidDataTypeException $e) {
 		}
 	}
 
 	public function testMergeWith() {
-		$array=array($this->item3,$this->item1);
+		$array = array($this->item3, $this->item1);
 		$this->list->mergeWith($array);
-		$this->assertTrue($this->list->getCount()==4 && $this->list[0]===$this->item1 && $this->list[3]===$this->item1);
+		$this->assertTrue($this->list->getCount() == 4 && $this->list[0] === $this->item1 && $this->list[3] === $this->item1);
 		try {
 			$this->list->mergeWith($this);
 			$this->fail('exception not raised when copying from non-traversable object');
-		} catch(TInvalidDataTypeException $e) {
+		} catch (TInvalidDataTypeException $e) {
 		}
 	}
 
 	public function testToArray() {
-		$array=$this->list->toArray();
-		$this->assertTrue(count($array)==2 && $array[0]===$this->item1 && $array[1]===$this->item2);
+		$array = $this->list->toArray();
+		$this->assertTrue(count($array) == 2 && $array[0] === $this->item1 && $array[1] === $this->item2);
 	}
 
 	public function testArrayRead() {
-		$this->assertTrue($this->list[0]===$this->item1);
-		$this->assertTrue($this->list[1]===$this->item2);
+		$this->assertTrue($this->list[0] === $this->item1);
+		$this->assertTrue($this->list[1] === $this->item2);
 		try {
-			$a=$this->list[2];
+			$a = $this->list[2];
 			$this->fail('exception not raised when accessing item with out-of-range index');
-		} catch(TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 	}
 
 	public function testGetIterator() {
-		$n=0;
-		$found=0;
-		foreach($this->list as $index=>$item) {
-			foreach($this->list as $a=>$b);	// test of iterator
+		$n = 0;
+		$found = 0;
+		foreach ($this->list as $index=>$item) {
+			foreach ($this->list as $a=>$b); // test of iterator
 				$n++;
-			if($index===0 && $item===$this->item1)
+			if ($index === 0 && $item === $this->item1)
 				$found++;
-			if($index===1 && $item===$this->item2)
+			if ($index === 1 && $item === $this->item2)
 				$found++;
 		}
-		$this->assertTrue($n==2 && $found==2);
+		$this->assertTrue($n == 2 && $found == 2);
 	}
 
 	public function testArrayMisc() {
-		$this->assertEquals($this->list->Count,count($this->list));
+		$this->assertEquals($this->list->Count, count($this->list));
 		$this->assertTrue(isset($this->list[1]));
 		$this->assertFalse(isset($this->list[2]));
 	}

Braces +6 added lines, -4 removed lines

@@ -288,10 +288,12 @@
 		foreach($this->list as $index=>$item) {
 			foreach($this->list as $a=>$b);	// test of iterator
 				$n++;
-			if($index===0 && $item===$this->item1)
-				$found++;
-			if($index===1 && $item===$this->item2)
-				$found++;
+			if($index===0 && $item===$this->item1) {
+							$found++;
+			}
+			if($index===1 && $item===$this->item2) {
+							$found++;
+			}
 		}
 		$this->assertTrue($n==2 && $found==2);
 	}

tests/unit/Collections/AllTests.php

Indentation +4 added lines, -4 removed lines

@@ -14,13 +14,13 @@ 
 
 class Collections_AllTests {
   public static function main() {
-    PHPUnit_TextUI_TestRunner::run(self::suite());
+	PHPUnit_TextUI_TestRunner::run(self::suite());
   }
 
   public static function suite() {
-    $suite = new PHPUnit_Framework_TestSuite('System.Collections');
+	$suite = new PHPUnit_Framework_TestSuite('System.Collections');
 
-    $suite->addTestSuite('TListTest');
+	$suite->addTestSuite('TListTest');
 	$suite->addTestSuite('TMapTest');
 	$suite->addTestSuite('TQueueTest');
 	$suite->addTestSuite('TStackTest');
@@ -28,7 +28,7 @@ 
 	$suite->addTestSuite('TPagedListTest');
 	$suite->addTestSuite('TPagedDataSourceTest');
 
-    return $suite;
+	return $suite;
   }
 }
 

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('PHPUnit_MAIN_METHOD')) {
+if (!defined('PHPUnit_MAIN_METHOD')) {
   define('PHPUnit_MAIN_METHOD', 'Collections_AllTests::main');
 }
 
@@ -32,6 +32,6 @@ 
   }
 }
 
-if(PHPUnit_MAIN_METHOD == 'Collections_AllTests::main') {
+if (PHPUnit_MAIN_METHOD == 'Collections_AllTests::main') {
   Collections_AllTests::main();
 }

tests/unit/Collections/TPriorityMapTest.php

Indentation +25 added lines, -25 removed lines

@@ -14,16 +14,16 @@ 
 
   public function setUp() {
   	// test that TPriorityMap complies with TMap
-    $this->map=new TPriorityMap;
-    $this->item1=new TPriorityMapTest_MapItem;
-    $this->item2=new TPriorityMapTest_MapItem;
-    $this->item3=new TPriorityMapTest_MapItem;
-    $this->item4=new TPriorityMapTest_MapItem;
-    $this->item5=new TPriorityMapTest_MapItem;
-    $this->map->add('key1',$this->item1);
-    $this->map->add('key2',$this->item2);
-
-    //Test the priority capabilities
+	$this->map=new TPriorityMap;
+	$this->item1=new TPriorityMapTest_MapItem;
+	$this->item2=new TPriorityMapTest_MapItem;
+	$this->item3=new TPriorityMapTest_MapItem;
+	$this->item4=new TPriorityMapTest_MapItem;
+	$this->item5=new TPriorityMapTest_MapItem;
+	$this->map->add('key1',$this->item1);
+	$this->map->add('key2',$this->item2);
+
+	//Test the priority capabilities
   }
 
   public function setUpPriorities() {
@@ -33,24 +33,24 @@ 
   }
 
   public function tearDown() {
-    $this->map=null;
-    $this->item1=null;
-    $this->item2=null;
-    $this->item3=null;
+	$this->map=null;
+	$this->item1=null;
+	$this->item2=null;
+	$this->item3=null;
   }
 
   public function testConstruct() {
-    $a=array(1,2,'key3'=>3);
-    $map=new TPriorityMap($a);
-    $this->assertEquals(3,$map->getCount());
-    $map2=new TPriorityMap($this->map);
-    $this->assertEquals(2,$map2->getCount());
+	$a=array(1,2,'key3'=>3);
+	$map=new TPriorityMap($a);
+	$this->assertEquals(3,$map->getCount());
+	$map2=new TPriorityMap($this->map);
+	$this->assertEquals(2,$map2->getCount());
 
 	/* Test the priority functionality of TPriorityMap  */
 
-    $map3=new TPriorityMap($this->map, false, 100, -1);
-    $this->assertEquals(100,$map3->getDefaultPriority());
-    $this->assertEquals(-1,$map3->getPrecision());
+	$map3=new TPriorityMap($this->map, false, 100, -1);
+	$this->assertEquals(100,$map3->getDefaultPriority());
+	$this->assertEquals(-1,$map3->getPrecision());
   }
 
   /* Test that TPriorityMap complies with TMap   */
@@ -64,12 +64,12 @@ 
 	}
 
   public function testGetCount() {
-    $this->assertEquals(2,$this->map->getCount());
+	$this->assertEquals(2,$this->map->getCount());
   }
 
   public function testGetKeys() {
-    $keys=$this->map->getKeys();
-    $this->assertTrue(count($keys)===2 && $keys[0]==='key1' && $keys[1]==='key2');
+	$keys=$this->map->getKeys();
+	$this->assertTrue(count($keys)===2 && $keys[0]==='key1' && $keys[1]==='key2');
   }
 
 	public function testAdd()

Spacing +59 added lines, -59 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 class TPriorityMapTest_MapItem {
-  public $data='data';
+  public $data = 'data';
 }
 
 Prado::using('System.Collections.TPriorityMap');
@@ -10,18 +10,18 @@ 
  */
 class TPriorityMapTest extends PHPUnit_Framework_TestCase {
   protected $map;
-  protected $item1,$item2,$item3,$item4,$item5;
+  protected $item1, $item2, $item3, $item4, $item5;
 
   public function setUp() {
   	// test that TPriorityMap complies with TMap
-    $this->map=new TPriorityMap;
-    $this->item1=new TPriorityMapTest_MapItem;
-    $this->item2=new TPriorityMapTest_MapItem;
-    $this->item3=new TPriorityMapTest_MapItem;
-    $this->item4=new TPriorityMapTest_MapItem;
-    $this->item5=new TPriorityMapTest_MapItem;
-    $this->map->add('key1',$this->item1);
-    $this->map->add('key2',$this->item2);
+    $this->map = new TPriorityMap;
+    $this->item1 = new TPriorityMapTest_MapItem;
+    $this->item2 = new TPriorityMapTest_MapItem;
+    $this->item3 = new TPriorityMapTest_MapItem;
+    $this->item4 = new TPriorityMapTest_MapItem;
+    $this->item5 = new TPriorityMapTest_MapItem;
+    $this->map->add('key1', $this->item1);
+    $this->map->add('key2', $this->item2);
 
     //Test the priority capabilities
   }
@@ -33,24 +33,24 @@ 
   }
 
   public function tearDown() {
-    $this->map=null;
-    $this->item1=null;
-    $this->item2=null;
-    $this->item3=null;
+    $this->map = null;
+    $this->item1 = null;
+    $this->item2 = null;
+    $this->item3 = null;
   }
 
   public function testConstruct() {
-    $a=array(1,2,'key3'=>3);
-    $map=new TPriorityMap($a);
-    $this->assertEquals(3,$map->getCount());
-    $map2=new TPriorityMap($this->map);
-    $this->assertEquals(2,$map2->getCount());
+    $a = array(1, 2, 'key3'=>3);
+    $map = new TPriorityMap($a);
+    $this->assertEquals(3, $map->getCount());
+    $map2 = new TPriorityMap($this->map);
+    $this->assertEquals(2, $map2->getCount());
 
 	/* Test the priority functionality of TPriorityMap  */
 
-    $map3=new TPriorityMap($this->map, false, 100, -1);
-    $this->assertEquals(100,$map3->getDefaultPriority());
-    $this->assertEquals(-1,$map3->getPrecision());
+    $map3 = new TPriorityMap($this->map, false, 100, -1);
+    $this->assertEquals(100, $map3->getDefaultPriority());
+    $this->assertEquals(-1, $map3->getPrecision());
   }
 
   /* Test that TPriorityMap complies with TMap   */
@@ -64,25 +64,25 @@ 
 	}
 
   public function testGetCount() {
-    $this->assertEquals(2,$this->map->getCount());
+    $this->assertEquals(2, $this->map->getCount());
   }
 
   public function testGetKeys() {
-    $keys=$this->map->getKeys();
-    $this->assertTrue(count($keys)===2 && $keys[0]==='key1' && $keys[1]==='key2');
+    $keys = $this->map->getKeys();
+    $this->assertTrue(count($keys) === 2 && $keys[0] === 'key1' && $keys[1] === 'key2');
   }
 
 	public function testAdd()
 	{
-		$this->map->add('key3',$this->item3);
-		$this->assertTrue($this->map->getCount()==3 && $this->map->contains('key3'));
+		$this->map->add('key3', $this->item3);
+		$this->assertTrue($this->map->getCount() == 3 && $this->map->contains('key3'));
 	}
 
 	public function testCanNotAddWhenReadOnly() {
 		$map = new TPriorityMap(array(), true);
 		try {
 			$map->add('key', 'value');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');
@@ -91,15 +91,15 @@ 
 	public function testRemove()
 	{
 		$this->map->remove('key1');
-		$this->assertTrue($this->map->getCount()==1 && !$this->map->contains('key1'));
-		$this->assertTrue($this->map->remove('unknown key')===null);
+		$this->assertTrue($this->map->getCount() == 1 && !$this->map->contains('key1'));
+		$this->assertTrue($this->map->remove('unknown key') === null);
 	}
 
 	public function testCanNotRemoveWhenReadOnly() {
 		$map = new TPriorityMap(array('key' => 'value'), true);
 		try {
 			$map->remove('key');
-		} catch(TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');
@@ -108,7 +108,7 @@ 
 	public function testClear()
 	{
 		$this->map->clear();
-		$this->assertTrue($this->map->getCount()==0 && !$this->map->contains('key1') && !$this->map->contains('key2'));
+		$this->assertTrue($this->map->getCount() == 0 && !$this->map->contains('key1') && !$this->map->contains('key2'));
 	}
 
 	public function testContains()
@@ -120,15 +120,15 @@ 
 
 	public function testCopyFrom()
 	{
-		$array=array('key3'=>$this->item3,'key4'=>$this->item1);
+		$array = array('key3'=>$this->item3, 'key4'=>$this->item1);
 		$this->map->copyFrom($array);
-		$this->assertTrue($this->map->getCount()==2 && $this->map['key3']===$this->item3 && $this->map['key4']===$this->item1);
+		$this->assertTrue($this->map->getCount() == 2 && $this->map['key3'] === $this->item3 && $this->map['key4'] === $this->item1);
 		try
 		{
 			$this->map->copyFrom($this);
 			$this->fail('no exception raised when copying a non-traversable object');
 		}
-		catch(TInvalidDataTypeException $e)
+		catch (TInvalidDataTypeException $e)
 		{
 
 		}
@@ -136,17 +136,17 @@ 
 
 	public function testMergeWith()
 	{
-		$array=array('key2'=>$this->item1,'key3'=>$this->item3);
+		$array = array('key2'=>$this->item1, 'key3'=>$this->item3);
 		$this->map->mergeWith($array);
-		$this->assertEquals(3,$this->map->getCount());
-		$this->assertTrue($this->map['key2']===$this->item1);
-		$this->assertTrue($this->map['key3']===$this->item3);
+		$this->assertEquals(3, $this->map->getCount());
+		$this->assertTrue($this->map['key2'] === $this->item1);
+		$this->assertTrue($this->map['key3'] === $this->item3);
 		try
 		{
 			$this->map->mergeWith($this);
 			$this->fail('no exception raised when copying a non-traversable object');
 		}
-		catch(TInvalidDataTypeException $e)
+		catch (TInvalidDataTypeException $e)
 		{
 
 		}
@@ -154,28 +154,28 @@ 
 
 	public function testArrayRead()
 	{
-		$this->assertTrue($this->map['key1']===$this->item1);
-		$this->assertTrue($this->map['key2']===$this->item2);
-		$this->assertEquals(null,$this->map['key3']);
+		$this->assertTrue($this->map['key1'] === $this->item1);
+		$this->assertTrue($this->map['key2'] === $this->item2);
+		$this->assertEquals(null, $this->map['key3']);
 	}
 
 	public function testArrayWrite()
 	{
-		$this->map['key3']=$this->item3;
-		$this->assertTrue($this->map['key3']===$this->item3);
-		$this->assertEquals(3,$this->map->getCount());
-		$this->map['key1']=$this->item3;
-		$this->assertTrue($this->map['key1']===$this->item3);
-		$this->assertEquals(3,$this->map->getCount());
+		$this->map['key3'] = $this->item3;
+		$this->assertTrue($this->map['key3'] === $this->item3);
+		$this->assertEquals(3, $this->map->getCount());
+		$this->map['key1'] = $this->item3;
+		$this->assertTrue($this->map['key1'] === $this->item3);
+		$this->assertEquals(3, $this->map->getCount());
 		unset($this->map['key2']);
-		$this->assertEquals(2,$this->map->getCount());
+		$this->assertEquals(2, $this->map->getCount());
 		$this->assertFalse($this->map->contains('key2'));
 		try
 		{
 			unset($this->map['unknown key']);
 
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			$this->fail('exception raised when unsetting element with unknown key');
 		}
@@ -183,22 +183,22 @@ 
 
 	public function testArrayForeach()
 	{
-		$n=0;
-		$found=0;
-		foreach($this->map as $index=>$item)
+		$n = 0;
+		$found = 0;
+		foreach ($this->map as $index=>$item)
 		{
 			$n++;
-			if($index==='key1' && $item===$this->item1)
+			if ($index === 'key1' && $item === $this->item1)
 				$found++;
-			if($index==='key2' && $item===$this->item2)
+			if ($index === 'key2' && $item === $this->item2)
 				$found++;
 		}
-		$this->assertTrue($n==2 && $found==2);
+		$this->assertTrue($n == 2 && $found == 2);
 	}
 
 	public function testArrayMisc()
 	{
-		$this->assertEquals($this->map->Count,count($this->map));
+		$this->assertEquals($this->map->Count, count($this->map));
 		$this->assertTrue(isset($this->map['key1']));
 		$this->assertFalse(isset($this->map['unknown key']));
 	}
@@ -408,7 +408,7 @@ 
 		$this->assertEquals($this->item1, $ordered_values[3]);
 		$this->assertEquals($this->item2, $ordered_values[4]);
 		$this->assertEquals($this->item4, $ordered_values[5]);
-		$this->assertEquals('endvalue',   $ordered_values[6]);
+		$this->assertEquals('endvalue', $ordered_values[6]);
 
 		$this->assertEquals(1, $map2->priorityAt('key5'));
 		$this->assertEquals(1, $map2->priorityOf($this->item5));

Braces +9 added lines, -10 removed lines

@@ -127,8 +127,7 @@ 
 		{
 			$this->map->copyFrom($this);
 			$this->fail('no exception raised when copying a non-traversable object');
-		}
-		catch(TInvalidDataTypeException $e)
+		} catch(TInvalidDataTypeException $e)
 		{
 
 		}
@@ -145,8 +144,7 @@ 
 		{
 			$this->map->mergeWith($this);
 			$this->fail('no exception raised when copying a non-traversable object');
-		}
-		catch(TInvalidDataTypeException $e)
+		} catch(TInvalidDataTypeException $e)
 		{
 
 		}
@@ -174,8 +172,7 @@ 
 		{
 			unset($this->map['unknown key']);
 
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->fail('exception raised when unsetting element with unknown key');
 		}
@@ -188,10 +185,12 @@ 
 		foreach($this->map as $index=>$item)
 		{
 			$n++;
-			if($index==='key1' && $item===$this->item1)
-				$found++;
-			if($index==='key2' && $item===$this->item2)
-				$found++;
+			if($index==='key1' && $item===$this->item1) {
+							$found++;
+			}
+			if($index==='key2' && $item===$this->item2) {
+							$found++;
+			}
 		}
 		$this->assertTrue($n==2 && $found==2);
 	}