pradosoft / prado

tests/unit/Security/TUserManagerTest.php

Spacing +47 added lines, -47 removed lines

@@ -7,20 +7,20 @@ 
  */
 class TUserManagerTest extends PHPUnit_Framework_TestCase {
 
-	public static $app=null;
-	public static $config=null;
+	public static $app = null;
+	public static $config = null;
 
 
 	public function setUp() {
 
-		if(self::$app === null) {
-			self::$app = new TApplication(dirname(__FILE__).'/app');
+		if (self::$app === null) {
+			self::$app = new TApplication(dirname(__FILE__) . '/app');
 			prado::setPathofAlias('App', dirname(__FILE__));
 		}
 
 		if (self::$config === null) {
 			// Simulate a config file
-			self::$config=new TXmlDocument('1.0','utf8');
+			self::$config = new TXmlDocument('1.0', 'utf8');
 			self::$config->loadFromString('<users><user name="Joe" password="demo"/><user name="John" password="demo" /><user name="test" password="test" roles="Reader, User"/><role name="Administrator" users="John" /><role name="Writer" users="Joe, John" /></users>');
 		}
 	}
@@ -29,66 +29,66 @@ 
 	}
 
 	public function testInit() {
-		$userManager=new TUserManager ();
-		$userManager->init (self::$config);
-		self::assertEquals(array('joe'=>'demo','john'=>'demo', 'test' => 'test'), $userManager->getUsers());
-		$userManager=null;
+		$userManager = new TUserManager();
+		$userManager->init(self::$config);
+		self::assertEquals(array('joe'=>'demo', 'john'=>'demo', 'test' => 'test'), $userManager->getUsers());
+		$userManager = null;
 		// Test with a file
-		if (is_writable (dirname(__FILE__))) {
-			self::$config->saveToFile(dirname(__FILE__).'/users.xml');
-			$userManager=new TUserManager();
+		if (is_writable(dirname(__FILE__))) {
+			self::$config->saveToFile(dirname(__FILE__) . '/users.xml');
+			$userManager = new TUserManager();
 			$userManager->setUserFile('App.users');
-			$userManager->init (new TXmlDocument()); // Empty config
-			self::assertEquals(array('joe'=>'demo','john'=>'demo', 'test' => 'test'), $userManager->getUsers());
-			unlink (dirname(__FILE__).'/users.xml');
+			$userManager->init(new TXmlDocument()); // Empty config
+			self::assertEquals(array('joe'=>'demo', 'john'=>'demo', 'test' => 'test'), $userManager->getUsers());
+			unlink(dirname(__FILE__) . '/users.xml');
 		}
 	}
 
 	public function testUsers() {
-		$userManager=new TUserManager ();
-		$userManager->init (self::$config);
-		self::assertEquals(array('joe'=>'demo','john'=>'demo', 'test' => 'test'), $userManager->getUsers());
+		$userManager = new TUserManager();
+		$userManager->init(self::$config);
+		self::assertEquals(array('joe'=>'demo', 'john'=>'demo', 'test' => 'test'), $userManager->getUsers());
 	}
 
 	public function testRoles() {
-		$userManager=new TUserManager ();
-		$userManager->init (self::$config);
-		self::assertEquals(array('joe'=>array ('Writer'), 'john'=>array ('Administrator','Writer'), 'test' => array ('Reader', 'User')), $userManager->getRoles());
+		$userManager = new TUserManager();
+		$userManager->init(self::$config);
+		self::assertEquals(array('joe'=>array('Writer'), 'john'=>array('Administrator', 'Writer'), 'test' => array('Reader', 'User')), $userManager->getRoles());
 	}
 
 	public function testUserFile() {
-		$userManager=new TUserManager ();
+		$userManager = new TUserManager();
 		try {
 			$userManager->setUserFile('invalidFile');
-			self::fail ('Exception TConfigurationException not thrown');
+			self::fail('Exception TConfigurationException not thrown');
 		} catch (TConfigurationException $e) {}
-		$userManager=null;
-		if (is_writable (dirname(__FILE__))) {
-			self::$config->saveToFile(dirname(__FILE__).'/users.xml');
-			$userManager=new TUserManager();
+		$userManager = null;
+		if (is_writable(dirname(__FILE__))) {
+			self::$config->saveToFile(dirname(__FILE__) . '/users.xml');
+			$userManager = new TUserManager();
 			$userManager->setUserFile('App.users');
-			$userManager->init (new TXmlDocument()); // Empty config
-			self::assertEquals(dirname(__FILE__).'/users.xml', $userManager->getUserFile());
-			unlink (dirname(__FILE__).'/users.xml');
-			$userManager=null;
+			$userManager->init(new TXmlDocument()); // Empty config
+			self::assertEquals(dirname(__FILE__) . '/users.xml', $userManager->getUserFile());
+			unlink(dirname(__FILE__) . '/users.xml');
+			$userManager = null;
 		}
-		$userManager=new TUserManager ();
-		$userManager->init (self::$config);
+		$userManager = new TUserManager();
+		$userManager->init(self::$config);
 		try {
 			$userManager->setUserFile('App.users');
-			self::fail ('Exception TInvalidOperationException not thrown');
+			self::fail('Exception TInvalidOperationException not thrown');
 		} catch (TInvalidOperationException $e) {}
 	}
 
 	public function testGuestName() {
-		$userManager=new TUserManager ();
+		$userManager = new TUserManager();
 		self::assertEquals('Guest', $userManager->getGuestName());
 		$userManager->setGuestName('Invite');
 		self::assertEquals('Invite', $userManager->getGuestName());
 	}
 
 	public function testPasswordMode() {
-		$userManager=new TUserManager ();
+		$userManager = new TUserManager();
 		$userManager->setPasswordMode('Clear');
 		self::assertEquals('Clear', $userManager->getPasswordMode());
 		$userManager->setPasswordMode('MD5');
@@ -97,37 +97,37 @@ 
 		self::assertEquals('SHA1', $userManager->getPasswordMode());
 		try {
 			$userManager->setPasswordMode('Invalid');
-			self::fail ('Exception TInvalidDataValueException not thrown');
+			self::fail('Exception TInvalidDataValueException not thrown');
 		} catch (TInvalidDataValueException $e) {}
 
 	}
 
 	public function testValidateUser() {
-		$userManager=new TUserManager ();
-		$userManager->init (self::$config);
+		$userManager = new TUserManager();
+		$userManager->init(self::$config);
 		$userManager->setPasswordMode('Clear');
 		self::assertTrue($userManager->validateUser('Joe', 'demo'));
 		self::assertFalse($userManager->validateUser('John', 'bad'));
 	}
 
 	public function testUser() {
-		$userManager=new TUserManager ();
-		$userManager->init (self::$config);
-		$guest=$userManager->getUser(null);
+		$userManager = new TUserManager();
+		$userManager->init(self::$config);
+		$guest = $userManager->getUser(null);
 		self::assertInstanceOf('TUser', $guest);
 		self::assertTrue($guest->getIsGuest());
-		$user=$userManager->getUser('joe');
+		$user = $userManager->getUser('joe');
 		self::assertInstanceOf('TUser', $user);
 		self::assertEquals('joe', $user->getName());
-		self::assertEquals(array ('Writer'), $user->getRoles());
+		self::assertEquals(array('Writer'), $user->getRoles());
 		self::assertFalse($user->getIsGuest());
 		self::assertNull($userManager->getUser('badUser'));
 	}
 
 	public function testSwitchToGuest() {
-		$userManager=new TUserManager ();
-		$userManager->init (self::$config);
-		$user=$userManager->getUser('joe');
+		$userManager = new TUserManager();
+		$userManager->init(self::$config);
+		$user = $userManager->getUser('joe');
 		$userManager->switchToGuest($user);
 		self::assertTrue($user->getIsGuest());
 	}

tests/unit/Security/TAuthManagerTest.php

Spacing +15 added lines, -15 removed lines

@@ -13,16 +13,16 @@ 
 	public static $usrMgr = null;
 
 	public function setUp() {
-		ini_set('session.use_cookies',0);
+		ini_set('session.use_cookies', 0);
 		ini_set('session.cache_limiter', 'none');
-		if(self::$app === null) {
-			self::$app = new TApplication(dirname(__FILE__).'/app');
+		if (self::$app === null) {
+			self::$app = new TApplication(dirname(__FILE__) . '/app');
 		}
 
 		// Make a fake user manager module
 		if (self::$usrMgr === null) {
-			self::$usrMgr=new TUserManager ();
-			$config=new TXmlDocument('1.0','utf8');
+			self::$usrMgr = new TUserManager();
+			$config = new TXmlDocument('1.0', 'utf8');
 			$config->loadFromString('<users><user name="Joe" password="demo"/><user name="John" password="demo" /><role name="Administrator" users="John" /><role name="Writer" users="Joe,John" /></users>');
 			self::$usrMgr->init($config);
 			self::$app->setModule('users', self::$usrMgr);
@@ -33,20 +33,20 @@ 
 	}
 
 	public function testInit() {
-		$authManager=new TAuthManager ();
+		$authManager = new TAuthManager();
 		// Catch exception with null usermgr
 		try {
 			$authManager->init(null);
-			self::fail ('Expected TConfigurationException not thrown');
+			self::fail('Expected TConfigurationException not thrown');
 		} catch (TConfigurationException $e) {}
 
 		$authManager->setUserManager('users');
-		$authManager->init (null);
+		$authManager->init(null);
 		self::assertEquals(self::$usrMgr, $authManager->getUserManager());
 	}
 
 	public function testUserManager() {
-		$authManager=new TAuthManager ();
+		$authManager = new TAuthManager();
 		$authManager->setUserManager('users');
 		$authManager->init(null);
 		self::assertEquals(self::$usrMgr, $authManager->getUserManager());
@@ -54,16 +54,16 @@ 
 		// test change
 		try {
 			$authManager->setUserManager('invalid');
-			self::fail ('Expected TInvalidOperationException not thrown');
+			self::fail('Expected TInvalidOperationException not thrown');
 		} catch (TInvalidOperationException $e) {}
 
 	}
 
 	public function testLoginPage() {
-		$authManager=new TAuthManager ();
+		$authManager = new TAuthManager();
 		$authManager->setUserManager('users');
 		$authManager->init(null);
-		$authManager->setLoginPage ('LoginPage');
+		$authManager->setLoginPage('LoginPage');
 		self::assertEquals('LoginPage', $authManager->getLoginPage());
 	}
 
@@ -71,11 +71,11 @@ 
 		throw new PHPUnit_Framework_IncompleteTestError();
 		// Not yet finished, Session won't start because of headers :( :(
 
-		$authManager=new TAuthManager ();
+		$authManager = new TAuthManager();
 		$authManager->setUserManager('users');
 		$authManager->init(null);
-		$authManager->setLoginPage ('LoginPage');
-		self::$app->raiseEvent ('onAuthentication', self::$app, null);
+		$authManager->setLoginPage('LoginPage');
+		self::$app->raiseEvent('onAuthentication', self::$app, null);
 
 	}
 

tests/unit/Security/TUserTest.php

Spacing +24 added lines, -24 removed lines

@@ -7,19 +7,19 @@ 
  * @package System.Security
  */
 class TUserTest extends PHPUnit_Framework_TestCase {
-	public static $app=null;
-	public static $mgr=null;
+	public static $app = null;
+	public static $mgr = null;
 
 	public function setUp() {
-		if(self::$app === null) {
-			self::$app = new TApplication(dirname(__FILE__).'/app');
+		if (self::$app === null) {
+			self::$app = new TApplication(dirname(__FILE__) . '/app');
 			prado::setPathofAlias('App', dirname(__FILE__));
 		}
 
-		if (self::$mgr===null) {
-			$config=new TXmlDocument('1.0','utf8');
+		if (self::$mgr === null) {
+			$config = new TXmlDocument('1.0', 'utf8');
 			$config->loadFromString('<users><user name="Joe" password="demo"/><user name="John" password="demo" /><role name="Administrator" users="John" /><role name="Writer" users="Joe,John" /></users>');
-			self::$mgr=new TUserManager();
+			self::$mgr = new TUserManager();
 			self::$mgr->init($config);
 		}
 	}
@@ -28,44 +28,44 @@ 
 	}
 
 	public function testConstruct() {
-		$user = new TUser (self::$mgr);
+		$user = new TUser(self::$mgr);
 		self::assertEquals('Guest', $user->getName());
 		self::assertEquals(self::$mgr, $user->getManager());
 	}
 
 	public function testManager() {
-		$user = new TUser (self::$mgr);
+		$user = new TUser(self::$mgr);
 		self::assertEquals(self::$mgr, $user->getManager());
 	}
 
 	public function testName() {
-		$user = new TUser (self::$mgr);
+		$user = new TUser(self::$mgr);
 		$user->setName('joe');
 		self::assertEquals('joe', $user->getName());
 	}
 
 	public function testIsGuest() {
-		$user = new TUser (self::$mgr);
+		$user = new TUser(self::$mgr);
 		$user->setName('John');
 		$user->setIsGuest(false);
 		$user->setRoles('Administrator, Writer');
 		self::assertFalse($user->getIsGuest());
 		$user->setIsGuest(true);
 		self::assertTrue($user->getIsGuest());
-		self::assertEquals(array(),$user->getRoles());
+		self::assertEquals(array(), $user->getRoles());
 	}
 
 	public function testRoles() {
-		$user=new TUser(self::$mgr);
-		$user->setRoles(array('Administrator','Writer'));
-		self::assertEquals(array('Administrator','Writer'), $user->getRoles());
+		$user = new TUser(self::$mgr);
+		$user->setRoles(array('Administrator', 'Writer'));
+		self::assertEquals(array('Administrator', 'Writer'), $user->getRoles());
 		$user->setRoles('Reader,User');
-		self::assertEquals(array('Reader','User'), $user->getRoles());
+		self::assertEquals(array('Reader', 'User'), $user->getRoles());
 	}
 
 	public function testIsInRole() {
-		$user=new TUser(self::$mgr);
-		$user->setRoles(array('Administrator','Writer'));
+		$user = new TUser(self::$mgr);
+		$user->setRoles(array('Administrator', 'Writer'));
 		// Roles are case insensitive
 		self::assertTrue($user->IsInRole('writer'));
 		self::assertTrue($user->IsInRole('Writer'));
@@ -73,23 +73,23 @@ 
 	}
 
 	public function testSaveToString() {
-		$user = new TUser (self::$mgr);
+		$user = new TUser(self::$mgr);
 		$user->setName('John');
 		$user->setIsGuest(false);
 		$user->setRoles('Administrator, Writer');
 		// State array should now be :
-		$assumedState=array ('Name' => 'John', 'IsGuest' => false, 'Roles' => array ('Administrator', 'Writer'));
+		$assumedState = array('Name' => 'John', 'IsGuest' => false, 'Roles' => array('Administrator', 'Writer'));
 		self::assertEquals(serialize($assumedState), $user->saveToString());
 	}
 
 	public function testLoadFromString() {
-		$user = new TUser (self::$mgr);
+		$user = new TUser(self::$mgr);
 		$user->setName('John');
 		$user->setIsGuest(false);
 		$user->setRoles('Administrator, Writer');
-		$save=$user->saveToString();
+		$save = $user->saveToString();
 
-		$user2 = new TUser (self::$mgr);
+		$user2 = new TUser(self::$mgr);
 		$user2->loadFromString($save);
 
 		self::assertEquals($user, $user2);
@@ -102,7 +102,7 @@ 
 	*/
 
 	public function testStateChanged() {
-		$user = new TUser (self::$mgr);
+		$user = new TUser(self::$mgr);
 		$user->setName('John');
 		self::assertTrue($user->getStateChanged());
 		$user->setStateChanged(false);

tests/unit/Security/AllTests.php

Indentation +3 added lines, -3 removed lines

@@ -12,11 +12,11 @@ 
 
 class Security_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.Security');
+	$suite = new PHPUnit_Framework_TestSuite('System.Security');
 
 	$suite->addTestSuite('TAuthManagerTest');
 	$suite->addTestSuite('TAuthorizationRuleTest');
@@ -24,7 +24,7 @@ 
 	$suite->addTestSuite('TUserManagerTest');
 	$suite->addTestSuite('TUserTest');
 
-    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', 'Security_AllTests::main');
 }
 
@@ -28,6 +28,6 @@ 
   }
 }
 
-if(PHPUnit_MAIN_METHOD == 'Security_AllTests::main') {
+if (PHPUnit_MAIN_METHOD == 'Security_AllTests::main') {
   Security_AllTests::main();
 }

tests/unit/I18N/core/DateTimeFormatInfoTest.php

Indentation +153 added lines, -153 removed lines

@@ -11,196 +11,196 @@
   protected $format;
 
   function setUp() {
-    $this->format = DateTimeFormatInfo::getInstance('en');
+	$this->format = DateTimeFormatInfo::getInstance('en');
   }
 
   function testAbbreviatedDayNames() {
-    $names = $this->format->AbbreviatedDayNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),7,'Must have 7 day names');
-
-    //assuming invariant culture.
-    $days = array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");
-    $this->assertEquals($names, $days);
-
-    //try to set the data
-    $data = array('Hel', 'wor');
-    $this->format->AbbreviatedDayNames = $data;
-    $newNames = $this->format->AbbreviatedDayNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
-    $this->assertEquals($newNames, $data);
+	$names = $this->format->AbbreviatedDayNames;
+	$this->assertTrue(is_array($names),'Must be an array!');
+	$this->assertEquals(count($names),7,'Must have 7 day names');
+
+	//assuming invariant culture.
+	$days = array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");
+	$this->assertEquals($names, $days);
+
+	//try to set the data
+	$data = array('Hel', 'wor');
+	$this->format->AbbreviatedDayNames = $data;
+	$newNames = $this->format->AbbreviatedDayNames;
+	$this->assertTrue(is_array($newNames),'Must be an array!');
+	$this->assertEquals(count($newNames),2,'Must have 2 entries');
+	$this->assertEquals($newNames, $data);
   }
 
   function testNarrowDayNames() {
-    $names = $this->format->NarrowDayNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),7,'Must have 7 day names');
-
-    //assuming invariant culture.
-    $days = array("S", "M", "T", "W", "T", "F", "S");
-    $this->assertEquals($names, $days);
-
-    //try to set the data
-    $data = array('H', 'w');
-    $this->format->NarrowDayNames = $data;
-    $newNames = $this->format->NarrowDayNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
-    $this->assertEquals($newNames, $data);
+	$names = $this->format->NarrowDayNames;
+	$this->assertTrue(is_array($names),'Must be an array!');
+	$this->assertEquals(count($names),7,'Must have 7 day names');
+
+	//assuming invariant culture.
+	$days = array("S", "M", "T", "W", "T", "F", "S");
+	$this->assertEquals($names, $days);
+
+	//try to set the data
+	$data = array('H', 'w');
+	$this->format->NarrowDayNames = $data;
+	$newNames = $this->format->NarrowDayNames;
+	$this->assertTrue(is_array($newNames),'Must be an array!');
+	$this->assertEquals(count($newNames),2,'Must have 2 entries');
+	$this->assertEquals($newNames, $data);
   }
 
   function testDayNames() {
-    $names = $this->format->DayNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),7,'Must have 7 day names');
-
-    //assuming invariant culture.
-    $days = array(  "Sunday","Monday", "Tuesday", "Wednesday",
-		    "Thursday", "Friday", "Saturday");
-    $this->assertEquals($names, $days);
-
-    //try to set the data
-    $data = array('Hello', 'world');
-    $this->format->DayNames = $data;
-    $newNames = $this->format->DayNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
-    $this->assertEquals($newNames, $data);
+	$names = $this->format->DayNames;
+	$this->assertTrue(is_array($names),'Must be an array!');
+	$this->assertEquals(count($names),7,'Must have 7 day names');
+
+	//assuming invariant culture.
+	$days = array(  "Sunday","Monday", "Tuesday", "Wednesday",
+			"Thursday", "Friday", "Saturday");
+	$this->assertEquals($names, $days);
+
+	//try to set the data
+	$data = array('Hello', 'world');
+	$this->format->DayNames = $data;
+	$newNames = $this->format->DayNames;
+	$this->assertTrue(is_array($newNames),'Must be an array!');
+	$this->assertEquals(count($newNames),2,'Must have 2 entries');
+	$this->assertEquals($newNames, $data);
   }
 
   function testMonthNames() {
-    $names = $this->format->MonthNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),12,'Must have 12 month names');
-
-    //assuming invariant culture.
-    $days = array(  "January", "February", "March", "April",
-		    "May", "June", "July", "August", "September",
-		    "October", "November", "December");
-    $this->assertEquals($names, $days);
-
-    //try to set the data
-    $data = array('Hello', 'world');
-    $this->format->MonthNames = $data;
-    $newNames = $this->format->MonthNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
-    $this->assertEquals($newNames, $data);
+	$names = $this->format->MonthNames;
+	$this->assertTrue(is_array($names),'Must be an array!');
+	$this->assertEquals(count($names),12,'Must have 12 month names');
+
+	//assuming invariant culture.
+	$days = array(  "January", "February", "March", "April",
+			"May", "June", "July", "August", "September",
+			"October", "November", "December");
+	$this->assertEquals($names, $days);
+
+	//try to set the data
+	$data = array('Hello', 'world');
+	$this->format->MonthNames = $data;
+	$newNames = $this->format->MonthNames;
+	$this->assertTrue(is_array($newNames),'Must be an array!');
+	$this->assertEquals(count($newNames),2,'Must have 2 entries');
+	$this->assertEquals($newNames, $data);
   }
 
   function testNarrowMonthNames() {
-    $names = $this->format->NarrowMonthNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),12,'Must have 12 month names');
-
-    //assuming invariant culture.
-    $days = array(  "J", "F", "M", "A", "M", "J", "J",
-                        "A", "S", "O", "N", "D");
-    $this->assertEquals($names, $days);
-
-    //try to set the data
-    $data = array('Hello', 'world');
-    $this->format->NarrowMonthNames = $data;
-    $newNames = $this->format->NarrowMonthNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
-    $this->assertEquals($newNames, $data);
+	$names = $this->format->NarrowMonthNames;
+	$this->assertTrue(is_array($names),'Must be an array!');
+	$this->assertEquals(count($names),12,'Must have 12 month names');
+
+	//assuming invariant culture.
+	$days = array(  "J", "F", "M", "A", "M", "J", "J",
+						"A", "S", "O", "N", "D");
+	$this->assertEquals($names, $days);
+
+	//try to set the data
+	$data = array('Hello', 'world');
+	$this->format->NarrowMonthNames = $data;
+	$newNames = $this->format->NarrowMonthNames;
+	$this->assertTrue(is_array($newNames),'Must be an array!');
+	$this->assertEquals(count($newNames),2,'Must have 2 entries');
+	$this->assertEquals($newNames, $data);
   }
 
   function testAbbreviatedMonthNames() {
-    $names = $this->format->AbbreviatedMonthNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),12,'Must have 12 month names');
-
-    //assuming invariant culture.
-    $days = array(  "Jan", "Feb", "Mar", "Apr",
-		    "May", "Jun", "Jul", "Aug", "Sep",
-		    "Oct", "Nov", "Dec");
-    $this->assertEquals($names, $days);
-
-    //try to set the data
-    $data = array('Hello', 'world');
-    $this->format->AbbreviatedMonthNames = $data;
-    $newNames = $this->format->AbbreviatedMonthNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
-    $this->assertEquals($newNames, $data);
+	$names = $this->format->AbbreviatedMonthNames;
+	$this->assertTrue(is_array($names),'Must be an array!');
+	$this->assertEquals(count($names),12,'Must have 12 month names');
+
+	//assuming invariant culture.
+	$days = array(  "Jan", "Feb", "Mar", "Apr",
+			"May", "Jun", "Jul", "Aug", "Sep",
+			"Oct", "Nov", "Dec");
+	$this->assertEquals($names, $days);
+
+	//try to set the data
+	$data = array('Hello', 'world');
+	$this->format->AbbreviatedMonthNames = $data;
+	$newNames = $this->format->AbbreviatedMonthNames;
+	$this->assertTrue(is_array($newNames),'Must be an array!');
+	$this->assertEquals(count($newNames),2,'Must have 2 entries');
+	$this->assertEquals($newNames, $data);
   }
 
   function testEra() {
-    //era for invariant culture is assumed to have
-    // 1 for AD and 0 for BC
-    $this->assertEquals('AD', $this->format->getEra(1));
-    $this->assertEquals('BC', $this->format->getEra(0));
+	//era for invariant culture is assumed to have
+	// 1 for AD and 0 for BC
+	$this->assertEquals('AD', $this->format->getEra(1));
+	$this->assertEquals('BC', $this->format->getEra(0));
   }
 
   function testAMPMMarkers() {
-    $am_pm = array('AM','PM');
-    $data = $this->format->AMPMMarkers;
-    $this->assertTrue(is_array($data));
-    $this->assertEquals($am_pm, $data);
-    $this->assertEquals('AM', $this->format->AMDesignator);
-    $this->assertEquals('PM', $this->format->PMDesignator);
-
-    //try to set the data
-    $data = array('Hello', 'world');
-    $this->format->AMPMMarkers = $data;
-    $newNames = $this->format->AMPMMarkers;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
-    $this->assertEquals($newNames, $data);
-
-    $this->format->AMDesignator = 'TTTT';
-    $this->assertEquals('TTTT',$this->format->AMDesignator);
-
-    $this->format->PMDesignator = 'SSS';
-    $this->assertEquals('SSS',$this->format->PMDesignator);
+	$am_pm = array('AM','PM');
+	$data = $this->format->AMPMMarkers;
+	$this->assertTrue(is_array($data));
+	$this->assertEquals($am_pm, $data);
+	$this->assertEquals('AM', $this->format->AMDesignator);
+	$this->assertEquals('PM', $this->format->PMDesignator);
+
+	//try to set the data
+	$data = array('Hello', 'world');
+	$this->format->AMPMMarkers = $data;
+	$newNames = $this->format->AMPMMarkers;
+	$this->assertTrue(is_array($newNames),'Must be an array!');
+	$this->assertEquals(count($newNames),2,'Must have 2 entries');
+	$this->assertEquals($newNames, $data);
+
+	$this->format->AMDesignator = 'TTTT';
+	$this->assertEquals('TTTT',$this->format->AMDesignator);
+
+	$this->format->PMDesignator = 'SSS';
+	$this->assertEquals('SSS',$this->format->PMDesignator);
   }
 
   function testPatterns() {
-    //patterns for invariant
-    $patterns = array(
-		      'FullTimePattern' =>      'h:mm:ss a z',
-		      'LongTimePattern' =>      'h:mm:ss a z',
-		      'MediumTimePattern' =>    'h:mm:ss a',
-		      'ShortTimePattern' =>     'h:mm a',
-		      'FullDatePattern' =>      'EEEE, MMMM d, yyyy',
-		      'LongDatePattern' =>      'MMMM d, yyyy',
-		      'MediumDatePattern' =>    'MMM d, yyyy',
-		      'ShortDatePattern' =>     'M/d/yy',
-		      'DateTimeOrderPattern' => '{1} {0}'
-		      );
-
-    foreach($patterns as $property => $pattern) {
-      $this->assertEquals($pattern, $this->format->$property);
-    }
-
-    $hello = 'Hello';
-    $world = 'world';
-    $expectedResult = $hello.' '.$world;
-    $this->assertEquals($expectedResult,
-		       $this->format->formatDateTime($hello, $world));
+	//patterns for invariant
+	$patterns = array(
+			  'FullTimePattern' =>      'h:mm:ss a z',
+			  'LongTimePattern' =>      'h:mm:ss a z',
+			  'MediumTimePattern' =>    'h:mm:ss a',
+			  'ShortTimePattern' =>     'h:mm a',
+			  'FullDatePattern' =>      'EEEE, MMMM d, yyyy',
+			  'LongDatePattern' =>      'MMMM d, yyyy',
+			  'MediumDatePattern' =>    'MMM d, yyyy',
+			  'ShortDatePattern' =>     'M/d/yy',
+			  'DateTimeOrderPattern' => '{1} {0}'
+			  );
+
+	foreach($patterns as $property => $pattern) {
+	  $this->assertEquals($pattern, $this->format->$property);
+	}
+
+	$hello = 'Hello';
+	$world = 'world';
+	$expectedResult = $hello.' '.$world;
+	$this->assertEquals($expectedResult,
+			   $this->format->formatDateTime($hello, $world));
   }
 
   function testInvariantInfo() {
-    $format = DateTimeFormatInfo::getInstance();
+	$format = DateTimeFormatInfo::getInstance();
 
-    //the variant datetime format for medium date
-    //should be the follow
-    $pattern = 'MMM d, yyyy';
+	//the variant datetime format for medium date
+	//should be the follow
+	$pattern = 'MMM d, yyyy';
 
-    $this->assertEquals($pattern, $format->MediumDatePattern);
+	$this->assertEquals($pattern, $format->MediumDatePattern);
 
-    $invariant = $format->getInvariantInfo();
+	$invariant = $format->getInvariantInfo();
 
-    $this->assertSame($format, $invariant);
+	$this->assertSame($format, $invariant);
   }
 
   function testGetInstance() {
-    $format = DateTimeFormatInfo::getInstance('zh_CN');
+	$format = DateTimeFormatInfo::getInstance('zh_CN');
 
-    $pattern = 'yyyy-M-d';
-    $this->assertEquals($pattern, $format->MediumDatePattern);
+	$pattern = 'yyyy-M-d';
+	$this->assertEquals($pattern, $format->MediumDatePattern);
   }
 }
\ No newline at end of file

Spacing +35 added lines, -35 removed lines

@@ -16,8 +16,8 @@ 
 
   function testAbbreviatedDayNames() {
     $names = $this->format->AbbreviatedDayNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),7,'Must have 7 day names');
+    $this->assertTrue(is_array($names), 'Must be an array!');
+    $this->assertEquals(count($names), 7, 'Must have 7 day names');
 
     //assuming invariant culture.
     $days = array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");
@@ -27,15 +27,15 @@ 
     $data = array('Hel', 'wor');
     $this->format->AbbreviatedDayNames = $data;
     $newNames = $this->format->AbbreviatedDayNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
+    $this->assertTrue(is_array($newNames), 'Must be an array!');
+    $this->assertEquals(count($newNames), 2, 'Must have 2 entries');
     $this->assertEquals($newNames, $data);
   }
 
   function testNarrowDayNames() {
     $names = $this->format->NarrowDayNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),7,'Must have 7 day names');
+    $this->assertTrue(is_array($names), 'Must be an array!');
+    $this->assertEquals(count($names), 7, 'Must have 7 day names');
 
     //assuming invariant culture.
     $days = array("S", "M", "T", "W", "T", "F", "S");
@@ -45,18 +45,18 @@ 
     $data = array('H', 'w');
     $this->format->NarrowDayNames = $data;
     $newNames = $this->format->NarrowDayNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
+    $this->assertTrue(is_array($newNames), 'Must be an array!');
+    $this->assertEquals(count($newNames), 2, 'Must have 2 entries');
     $this->assertEquals($newNames, $data);
   }
 
   function testDayNames() {
     $names = $this->format->DayNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),7,'Must have 7 day names');
+    $this->assertTrue(is_array($names), 'Must be an array!');
+    $this->assertEquals(count($names), 7, 'Must have 7 day names');
 
     //assuming invariant culture.
-    $days = array(  "Sunday","Monday", "Tuesday", "Wednesday",
+    $days = array("Sunday", "Monday", "Tuesday", "Wednesday",
 		    "Thursday", "Friday", "Saturday");
     $this->assertEquals($names, $days);
 
@@ -64,18 +64,18 @@ 
     $data = array('Hello', 'world');
     $this->format->DayNames = $data;
     $newNames = $this->format->DayNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
+    $this->assertTrue(is_array($newNames), 'Must be an array!');
+    $this->assertEquals(count($newNames), 2, 'Must have 2 entries');
     $this->assertEquals($newNames, $data);
   }
 
   function testMonthNames() {
     $names = $this->format->MonthNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),12,'Must have 12 month names');
+    $this->assertTrue(is_array($names), 'Must be an array!');
+    $this->assertEquals(count($names), 12, 'Must have 12 month names');
 
     //assuming invariant culture.
-    $days = array(  "January", "February", "March", "April",
+    $days = array("January", "February", "March", "April",
 		    "May", "June", "July", "August", "September",
 		    "October", "November", "December");
     $this->assertEquals($names, $days);
@@ -84,18 +84,18 @@ 
     $data = array('Hello', 'world');
     $this->format->MonthNames = $data;
     $newNames = $this->format->MonthNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
+    $this->assertTrue(is_array($newNames), 'Must be an array!');
+    $this->assertEquals(count($newNames), 2, 'Must have 2 entries');
     $this->assertEquals($newNames, $data);
   }
 
   function testNarrowMonthNames() {
     $names = $this->format->NarrowMonthNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),12,'Must have 12 month names');
+    $this->assertTrue(is_array($names), 'Must be an array!');
+    $this->assertEquals(count($names), 12, 'Must have 12 month names');
 
     //assuming invariant culture.
-    $days = array(  "J", "F", "M", "A", "M", "J", "J",
+    $days = array("J", "F", "M", "A", "M", "J", "J",
                         "A", "S", "O", "N", "D");
     $this->assertEquals($names, $days);
 
@@ -103,18 +103,18 @@ 
     $data = array('Hello', 'world');
     $this->format->NarrowMonthNames = $data;
     $newNames = $this->format->NarrowMonthNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
+    $this->assertTrue(is_array($newNames), 'Must be an array!');
+    $this->assertEquals(count($newNames), 2, 'Must have 2 entries');
     $this->assertEquals($newNames, $data);
   }
 
   function testAbbreviatedMonthNames() {
     $names = $this->format->AbbreviatedMonthNames;
-    $this->assertTrue(is_array($names),'Must be an array!');
-    $this->assertEquals(count($names),12,'Must have 12 month names');
+    $this->assertTrue(is_array($names), 'Must be an array!');
+    $this->assertEquals(count($names), 12, 'Must have 12 month names');
 
     //assuming invariant culture.
-    $days = array(  "Jan", "Feb", "Mar", "Apr",
+    $days = array("Jan", "Feb", "Mar", "Apr",
 		    "May", "Jun", "Jul", "Aug", "Sep",
 		    "Oct", "Nov", "Dec");
     $this->assertEquals($names, $days);
@@ -123,8 +123,8 @@ 
     $data = array('Hello', 'world');
     $this->format->AbbreviatedMonthNames = $data;
     $newNames = $this->format->AbbreviatedMonthNames;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
+    $this->assertTrue(is_array($newNames), 'Must be an array!');
+    $this->assertEquals(count($newNames), 2, 'Must have 2 entries');
     $this->assertEquals($newNames, $data);
   }
 
@@ -136,7 +136,7 @@ 
   }
 
   function testAMPMMarkers() {
-    $am_pm = array('AM','PM');
+    $am_pm = array('AM', 'PM');
     $data = $this->format->AMPMMarkers;
     $this->assertTrue(is_array($data));
     $this->assertEquals($am_pm, $data);
@@ -147,15 +147,15 @@ 
     $data = array('Hello', 'world');
     $this->format->AMPMMarkers = $data;
     $newNames = $this->format->AMPMMarkers;
-    $this->assertTrue(is_array($newNames),'Must be an array!');
-    $this->assertEquals(count($newNames),2,'Must have 2 entries');
+    $this->assertTrue(is_array($newNames), 'Must be an array!');
+    $this->assertEquals(count($newNames), 2, 'Must have 2 entries');
     $this->assertEquals($newNames, $data);
 
     $this->format->AMDesignator = 'TTTT';
-    $this->assertEquals('TTTT',$this->format->AMDesignator);
+    $this->assertEquals('TTTT', $this->format->AMDesignator);
 
     $this->format->PMDesignator = 'SSS';
-    $this->assertEquals('SSS',$this->format->PMDesignator);
+    $this->assertEquals('SSS', $this->format->PMDesignator);
   }
 
   function testPatterns() {
@@ -172,13 +172,13 @@ 
 		      'DateTimeOrderPattern' => '{1} {0}'
 		      );
 
-    foreach($patterns as $property => $pattern) {
+    foreach ($patterns as $property => $pattern) {
       $this->assertEquals($pattern, $this->format->$property);
     }
 
     $hello = 'Hello';
     $world = 'world';
-    $expectedResult = $hello.' '.$world;
+    $expectedResult = $hello . ' ' . $world;
     $this->assertEquals($expectedResult,
 		       $this->format->formatDateTime($hello, $world));
   }

tests/unit/I18N/core/NumberFormatTest.php

Indentation +98 added lines, -98 removed lines

@@ -9,161 +9,161 @@
  */
 class NumberFormatTest extends PHPUnit_Framework_TestCase {
   function testDefaultFormats() {
-    $formatter = new NumberFormat();
-    $number = '123456789.125156';
-    $wanted = '123,456,789.125156';
+	$formatter = new NumberFormat();
+	$number = '123456789.125156';
+	$wanted = '123,456,789.125156';
 
-    $this->assertEquals($wanted, $formatter->format($number));
+	$this->assertEquals($wanted, $formatter->format($number));
 
-    //currency
-    $wanted = 'US$123,456,789.13';
-    $this->assertEquals($wanted, $formatter->format($number,'c'));
+	//currency
+	$wanted = 'US$123,456,789.13';
+	$this->assertEquals($wanted, $formatter->format($number,'c'));
   }
 
   function testLocalizedCurrencyFormats() {
-    $fr = new NumberFormat('fr');
-    $de = new NumberFormat('de');
-    $ja = new NumberFormat('ja_JP');
-    $it = new NumberFormat('it_IT');
+	$fr = new NumberFormat('fr');
+	$de = new NumberFormat('de');
+	$ja = new NumberFormat('ja_JP');
+	$it = new NumberFormat('it_IT');
 
-    $number = '123456789.125156';
+	$number = '123456789.125156';
 
-    //french
-    $wanted = '123 456 789,13 F';
-    $this->assertEquals($wanted, $fr->format($number,'c','FRF'));
+	//french
+	$wanted = '123 456 789,13 F';
+	$this->assertEquals($wanted, $fr->format($number,'c','FRF'));
 
-    //german
-    $wanted = 'DES 123.456.789,13';
-    $this->assertEquals($wanted, $de->format($number,'c','DES'));
+	//german
+	$wanted = 'DES 123.456.789,13';
+	$this->assertEquals($wanted, $de->format($number,'c','DES'));
 
-    //japanese
-    $wanted = '￥123,456,789';
-    $this->assertEquals($wanted, $ja->format($number,'c','JPY'));
+	//japanese
+	$wanted = '￥123,456,789';
+	$this->assertEquals($wanted, $ja->format($number,'c','JPY'));
 
-    //custom/unkown currency
-    $wanted = 'DLL123,456,789';
-    $this->assertEquals($wanted, $ja->format($number,'c','DLL'));
+	//custom/unkown currency
+	$wanted = 'DLL123,456,789';
+	$this->assertEquals($wanted, $ja->format($number,'c','DLL'));
 
-    //italian
-    $wanted = '€ 123.456.789,13';
-    $this->assertEquals($wanted, $it->format($number,'c','EUR'));
+	//italian
+	$wanted = '€ 123.456.789,13';
+	$this->assertEquals($wanted, $it->format($number,'c','EUR'));
   }
 
   function testCustomFormat() {
-    $formatter = new NumberFormat();
-    $number = '123456789.125156';
-
-    //primay and secondary grouping test
-    $pattern = '#,###,##.###';
-    $wanted = '1,234,567,89.125156';
-    $this->assertEquals($wanted, $formatter->format($number, $pattern));
-
-    //4 digits grouping test
-    $pattern = '#,####.###';
-    $wanted = '1,2345,6789.125156';
-    $this->assertEquals($wanted, $formatter->format($number, $pattern));
-
-    //custom percentage
-    $pattern = '#,###.00%';
-    $wanted = '123,456,789.13%';
-    $this->assertEquals($wanted, $formatter->format($number, $pattern));
+	$formatter = new NumberFormat();
+	$number = '123456789.125156';
+
+	//primay and secondary grouping test
+	$pattern = '#,###,##.###';
+	$wanted = '1,234,567,89.125156';
+	$this->assertEquals($wanted, $formatter->format($number, $pattern));
+
+	//4 digits grouping test
+	$pattern = '#,####.###';
+	$wanted = '1,2345,6789.125156';
+	$this->assertEquals($wanted, $formatter->format($number, $pattern));
+
+	//custom percentage
+	$pattern = '#,###.00%';
+	$wanted = '123,456,789.13%';
+	$this->assertEquals($wanted, $formatter->format($number, $pattern));
   }
 
   function testPercentageFormat() {
-    $formatter = new NumberFormat();
-    $number = '0.125156';
-    $wanted = '12%';
-    $this->assertEquals($wanted, $formatter->format($number, 'p'));
+	$formatter = new NumberFormat();
+	$number = '0.125156';
+	$wanted = '12%';
+	$this->assertEquals($wanted, $formatter->format($number, 'p'));
   }
 
   function testQuotes() {
-    $formatter = new NumberFormat();
-    $number = '123456789.125156';
+	$formatter = new NumberFormat();
+	$number = '123456789.125156';
 
-    $pattern = "# o'clock";
-    $wanted = "123456789 o'clock";
-    $this->assertEquals($wanted, $formatter->format($number, $pattern));
+	$pattern = "# o'clock";
+	$wanted = "123456789 o'clock";
+	$this->assertEquals($wanted, $formatter->format($number, $pattern));
 
   }
 
   function testPadding() {
-    $formatter = new NumberFormat();
-    $number = '5';
+	$formatter = new NumberFormat();
+	$number = '5';
 
-    $pattern = '0000';
-    $wanted = '0005';
+	$pattern = '0000';
+	$wanted = '0005';
 
-    $this->assertEquals($wanted, $formatter->format($number, $pattern));
+	$this->assertEquals($wanted, $formatter->format($number, $pattern));
   }
 
   function testFormatWithANegativeValue() {
-    $formatter = new NumberFormat();
-    $number = "-1.2";
+	$formatter = new NumberFormat();
+	$number = "-1.2";
 
-    $wanted = "-1.2";
-    $this->assertEquals($wanted, $formatter->format($number));
+	$wanted = "-1.2";
+	$this->assertEquals($wanted, $formatter->format($number));
   }
 
   public function testFormatWithAScientificPattern() {
-    $formatter = new NumberFormat();
-    $number = "10";
-    $expected = "10E";
-    $this->assertEquals('10E', $formatter->format($number, 'e'));
+	$formatter = new NumberFormat();
+	$number = "10";
+	$expected = "10E";
+	$this->assertEquals('10E', $formatter->format($number, 'e'));
   }
 
   function testRounding()
   {
-      $formatter = new NumberFormat();
+	  $formatter = new NumberFormat();
 
-      $number = 349.999;
-      $pattern = '#.00';
-      $expected = '350.00';
+	  $number = 349.999;
+	  $pattern = '#.00';
+	  $expected = '350.00';
 
-      $this->assertEquals($expected, $formatter->format($number, $pattern));
+	  $this->assertEquals($expected, $formatter->format($number, $pattern));
   }
 
   function testRounding2()
   {
-      $formatter = new NumberFormat();
+	  $formatter = new NumberFormat();
 
-      $number = 349.99;
-      $pattern = '#.00';
-      $expected = '349.99';
+	  $number = 349.99;
+	  $pattern = '#.00';
+	  $expected = '349.99';
 
-      $this->assertEquals($expected, $formatter->format($number, $pattern));
+	  $this->assertEquals($expected, $formatter->format($number, $pattern));
   }
 
   function testLocalizedCurrencyFormats2() {
 
-    $it = new NumberFormat('it_IT');
+	$it = new NumberFormat('it_IT');
 
-    $number = 12.41;
-    $wanted = '12,41';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+	$number = 12.41;
+	$wanted = '12,41';
+	$this->assertEquals($wanted, $it->format($number,'d'));
 
-    $number = 10.23;
-    $wanted = '10,23';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+	$number = 10.23;
+	$wanted = '10,23';
+	$this->assertEquals($wanted, $it->format($number,'d'));
 
-    $number = 10010.23;
-    $wanted = '10.010,23';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+	$number = 10010.23;
+	$wanted = '10.010,23';
+	$this->assertEquals($wanted, $it->format($number,'d'));
 
-    $old= setlocale(LC_ALL,"0");
-    setlocale(LC_ALL,"it_IT");
+	$old= setlocale(LC_ALL,"0");
+	setlocale(LC_ALL,"it_IT");
 
-    $number = 12.41;
-    $wanted = '12,41';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+	$number = 12.41;
+	$wanted = '12,41';
+	$this->assertEquals($wanted, $it->format($number,'d'));
 
-    $number = 10.23;
-    $wanted = '10,23';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+	$number = 10.23;
+	$wanted = '10,23';
+	$this->assertEquals($wanted, $it->format($number,'d'));
 
-    $number = 10010.23;
-    $wanted = '10.010,23';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+	$number = 10010.23;
+	$wanted = '10.010,23';
+	$this->assertEquals($wanted, $it->format($number,'d'));
 
-    setlocale(LC_ALL,$old);
+	setlocale(LC_ALL,$old);
   }
 }

Spacing +15 added lines, -15 removed lines

@@ -17,7 +17,7 @@ 
 
     //currency
     $wanted = 'US$123,456,789.13';
-    $this->assertEquals($wanted, $formatter->format($number,'c'));
+    $this->assertEquals($wanted, $formatter->format($number, 'c'));
   }
 
   function testLocalizedCurrencyFormats() {
@@ -30,23 +30,23 @@ 
 
     //french
     $wanted = '123 456 789,13 F';
-    $this->assertEquals($wanted, $fr->format($number,'c','FRF'));
+    $this->assertEquals($wanted, $fr->format($number, 'c', 'FRF'));
 
     //german
     $wanted = 'DES 123.456.789,13';
-    $this->assertEquals($wanted, $de->format($number,'c','DES'));
+    $this->assertEquals($wanted, $de->format($number, 'c', 'DES'));
 
     //japanese
     $wanted = '￥123,456,789';
-    $this->assertEquals($wanted, $ja->format($number,'c','JPY'));
+    $this->assertEquals($wanted, $ja->format($number, 'c', 'JPY'));
 
     //custom/unkown currency
     $wanted = 'DLL123,456,789';
-    $this->assertEquals($wanted, $ja->format($number,'c','DLL'));
+    $this->assertEquals($wanted, $ja->format($number, 'c', 'DLL'));
 
     //italian
     $wanted = '€ 123.456.789,13';
-    $this->assertEquals($wanted, $it->format($number,'c','EUR'));
+    $this->assertEquals($wanted, $it->format($number, 'c', 'EUR'));
   }
 
   function testCustomFormat() {
@@ -139,31 +139,31 @@ 
 
     $number = 12.41;
     $wanted = '12,41';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+    $this->assertEquals($wanted, $it->format($number, 'd'));
 
     $number = 10.23;
     $wanted = '10,23';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+    $this->assertEquals($wanted, $it->format($number, 'd'));
 
     $number = 10010.23;
     $wanted = '10.010,23';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+    $this->assertEquals($wanted, $it->format($number, 'd'));
 
-    $old= setlocale(LC_ALL,"0");
-    setlocale(LC_ALL,"it_IT");
+    $old = setlocale(LC_ALL, "0");
+    setlocale(LC_ALL, "it_IT");
 
     $number = 12.41;
     $wanted = '12,41';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+    $this->assertEquals($wanted, $it->format($number, 'd'));
 
     $number = 10.23;
     $wanted = '10,23';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+    $this->assertEquals($wanted, $it->format($number, 'd'));
 
     $number = 10010.23;
     $wanted = '10.010,23';
-    $this->assertEquals($wanted, $it->format($number,'d'));
+    $this->assertEquals($wanted, $it->format($number, 'd'));
 
-    setlocale(LC_ALL,$old);
+    setlocale(LC_ALL, $old);
   }
 }

tests/unit/I18N/core/CultureInfoTest.php

Indentation +35 added lines, -35 removed lines

@@ -10,76 +10,76 @@
   protected $culture;
 
   function setUp() {
-    $this->culture = CultureInfo::getInvariantCulture();
+	$this->culture = CultureInfo::getInvariantCulture();
   }
 
   function testCultureName() {
-    $name = 'en';
+	$name = 'en';
 
-    $this->assertEquals($name, $this->culture->Name);
+	$this->assertEquals($name, $this->culture->Name);
 
-    //the default/invariant culture should be neutral
-    $this->assertTrue($this->culture->IsNeutralCulture);
+	//the default/invariant culture should be neutral
+	$this->assertTrue($this->culture->IsNeutralCulture);
   }
 
   function testCultureList() {
-    $allCultures = CultureInfo::getCultures();
-    $neutralCultures = CultureInfo::getCultures(CultureInfo::NEUTRAL);
-    $specificCultures = CultureInfo::getCultures(CultureInfo::SPECIFIC);
-
-    //there should be 246 cultures all together.
-    $this->assertEquals(count($allCultures),246);
-    $this->assertEquals(count($neutralCultures),76);
-    $this->assertEquals(count($specificCultures),170);
+	$allCultures = CultureInfo::getCultures();
+	$neutralCultures = CultureInfo::getCultures(CultureInfo::NEUTRAL);
+	$specificCultures = CultureInfo::getCultures(CultureInfo::SPECIFIC);
+
+	//there should be 246 cultures all together.
+	$this->assertEquals(count($allCultures),246);
+	$this->assertEquals(count($neutralCultures),76);
+	$this->assertEquals(count($specificCultures),170);
   }
 
   function testParentCultures() {
-    $zh_CN = new CultureInfo('zh_CN');
-    $parent = $zh_CN->Parent;
-    $grandparent = $parent->Parent;
-
-    $this->assertEquals($zh_CN->Name, 'zh_CN');
-    $this->assertEquals($parent->Name, 'zh');
-    $this->assertEquals($grandparent->Name, 'en');
-    $this->assertEquals($grandparent->Parent->Name, 'en');
+	$zh_CN = new CultureInfo('zh_CN');
+	$parent = $zh_CN->Parent;
+	$grandparent = $parent->Parent;
+
+	$this->assertEquals($zh_CN->Name, 'zh_CN');
+	$this->assertEquals($parent->Name, 'zh');
+	$this->assertEquals($grandparent->Name, 'en');
+	$this->assertEquals($grandparent->Parent->Name, 'en');
   }
 
   function testCountryNames() {
-    $culture = new CultureInfo('fr_FR');
-    $this->assertEquals($culture->Countries['AE'], 'Émirats arabes unis');
+	$culture = new CultureInfo('fr_FR');
+	$this->assertEquals($culture->Countries['AE'], 'Émirats arabes unis');
   }
 
   function testCurrencies() {
-    $culture = new CultureInfo('en_AU');
-    $au = array('$', 'Australian Dollar');
-    $this->assertEquals($au, $culture->Currencies['AUD']);
+	$culture = new CultureInfo('en_AU');
+	$au = array('$', 'Australian Dollar');
+	$this->assertEquals($au, $culture->Currencies['AUD']);
   }
 
   function testLanguages() {
-    $culture = new CultureInfo('fr_BE');
-    $this->assertEquals($culture->Languages['fr'], 'français');
+	$culture = new CultureInfo('fr_BE');
+	$this->assertEquals($culture->Languages['fr'], 'français');
   }
 
   function testScripts() {
-    $culture = new CultureInfo('fr');
-    $this->assertEquals($culture->Scripts['Armn'], 'arménien');
+	$culture = new CultureInfo('fr');
+	$this->assertEquals($culture->Scripts['Armn'], 'arménien');
   }
 
   function testTimeZones() {
-    $culture = new CultureInfo('fi');
-    $zone = array(
+	$culture = new CultureInfo('fi');
+	$zone = array(
 		  "America/Los_Angeles",
 		  "Tyynenmeren normaaliaika",
 		  "PST",
 		  "Tyynenmeren kesäaika",
 		  "PDT",
 		  "Los Angeles");
-    $this->assertEquals($culture->TimeZones[1],$zone);
+	$this->assertEquals($culture->TimeZones[1],$zone);
   }
 
   function test_missing_english_names_returns_culture_code()
   {
-    $culture = new CultureInfo('iw');
-    $this->assertEquals($culture->getEnglishName(), 'iw');
+	$culture = new CultureInfo('iw');
+	$this->assertEquals($culture->getEnglishName(), 'iw');
   }
 }

Spacing +4 added lines, -4 removed lines

@@ -28,9 +28,9 @@ 
     $specificCultures = CultureInfo::getCultures(CultureInfo::SPECIFIC);
 
     //there should be 246 cultures all together.
-    $this->assertEquals(count($allCultures),246);
-    $this->assertEquals(count($neutralCultures),76);
-    $this->assertEquals(count($specificCultures),170);
+    $this->assertEquals(count($allCultures), 246);
+    $this->assertEquals(count($neutralCultures), 76);
+    $this->assertEquals(count($specificCultures), 170);
   }
 
   function testParentCultures() {
@@ -74,7 +74,7 @@ 
 		  "Tyynenmeren kesäaika",
 		  "PDT",
 		  "Los Angeles");
-    $this->assertEquals($culture->TimeZones[1],$zone);
+    $this->assertEquals($culture->TimeZones[1], $zone);
   }
 
   function test_missing_english_names_returns_culture_code()

tests/unit/I18N/core/NumberFormatInfoTest.php

Indentation +57 added lines, -57 removed lines

@@ -10,77 +10,77 @@
 class NumberFormatInfoTest extends PHPUnit_Framework_TestCase {
 
   function testCurrencyPatterns() {
-    $numberInfo = NumberFormatInfo::getCurrencyInstance();
-
-    //there should be 2 decimal places.
-    $this->assertEquals($numberInfo->DecimalDigits,2);
-    $this->assertEquals($numberInfo->DecimalSeparator,'.');
-    $this->assertEquals($numberInfo->GroupSeparator,',');
-
-    //there should be only 1 grouping of size 3
-    $groupsize = array(3,false);
-    $this->assertEquals($numberInfo->GroupSizes, $groupsize);
-
-    //the default negative pattern prefix and postfix
-    $negPattern = array('-¤','');
-    $this->assertEquals($numberInfo->NegativePattern, $negPattern);
-
-    //the default positive pattern prefix and postfix
-    $negPattern = array('¤','');
-    $this->assertEquals($numberInfo->PositivePattern, $negPattern);
-
-    //the default currency symbol
-    $this->assertEquals($numberInfo->CurrencySymbol, 'US$');
-    $this->assertEquals($numberInfo->getCurrencySymbol('JPY'), '¥');
-    $this->assertEquals($numberInfo->NegativeInfinitySymbol, '-∞');
-    $this->assertEquals($numberInfo->PositiveInfinitySymbol, '+∞');
-    $this->assertEquals($numberInfo->NegativeSign, '-');
-    $this->assertEquals($numberInfo->PositiveSign, '+');
-    $this->assertEquals($numberInfo->NaNSymbol, '�');
-    $this->assertEquals($numberInfo->PercentSymbol, '%');
-    $this->assertEquals($numberInfo->PerMilleSymbol, '‰');
+	$numberInfo = NumberFormatInfo::getCurrencyInstance();
+
+	//there should be 2 decimal places.
+	$this->assertEquals($numberInfo->DecimalDigits,2);
+	$this->assertEquals($numberInfo->DecimalSeparator,'.');
+	$this->assertEquals($numberInfo->GroupSeparator,',');
+
+	//there should be only 1 grouping of size 3
+	$groupsize = array(3,false);
+	$this->assertEquals($numberInfo->GroupSizes, $groupsize);
+
+	//the default negative pattern prefix and postfix
+	$negPattern = array('-¤','');
+	$this->assertEquals($numberInfo->NegativePattern, $negPattern);
+
+	//the default positive pattern prefix and postfix
+	$negPattern = array('¤','');
+	$this->assertEquals($numberInfo->PositivePattern, $negPattern);
+
+	//the default currency symbol
+	$this->assertEquals($numberInfo->CurrencySymbol, 'US$');
+	$this->assertEquals($numberInfo->getCurrencySymbol('JPY'), '¥');
+	$this->assertEquals($numberInfo->NegativeInfinitySymbol, '-∞');
+	$this->assertEquals($numberInfo->PositiveInfinitySymbol, '+∞');
+	$this->assertEquals($numberInfo->NegativeSign, '-');
+	$this->assertEquals($numberInfo->PositiveSign, '+');
+	$this->assertEquals($numberInfo->NaNSymbol, '�');
+	$this->assertEquals($numberInfo->PercentSymbol, '%');
+	$this->assertEquals($numberInfo->PerMilleSymbol, '‰');
   }
 
   function testPatternsSet() {
-    $numberInfo = NumberFormatInfo::getInstance();
+	$numberInfo = NumberFormatInfo::getInstance();
 
-    $numberInfo->DecimalDigits = 0;
-    $this->assertEquals($numberInfo->DecimalDigits,0);
+	$numberInfo->DecimalDigits = 0;
+	$this->assertEquals($numberInfo->DecimalDigits,0);
 
-    $numberInfo->DecimalSeparator = ',';
-    $this->assertEquals($numberInfo->DecimalSeparator,',');
+	$numberInfo->DecimalSeparator = ',';
+	$this->assertEquals($numberInfo->DecimalSeparator,',');
 
-    $numberInfo->GroupSeparator = ' ';
-    $this->assertEquals($numberInfo->GroupSeparator,' ');
+	$numberInfo->GroupSeparator = ' ';
+	$this->assertEquals($numberInfo->GroupSeparator,' ');
 
-    $numberInfo->GroupSizes = array(2,3);
-    $groupsize = array(2,3);
-    $this->assertEquals($numberInfo->GroupSizes, $groupsize);
+	$numberInfo->GroupSizes = array(2,3);
+	$groupsize = array(2,3);
+	$this->assertEquals($numberInfo->GroupSizes, $groupsize);
 
-    $numberInfo->NegativePattern = array('-$$','.');
-    $negPattern = array('-$$','.');
-    $this->assertEquals($numberInfo->NegativePattern, $negPattern);
+	$numberInfo->NegativePattern = array('-$$','.');
+	$negPattern = array('-$$','.');
+	$this->assertEquals($numberInfo->NegativePattern, $negPattern);
 
-    $numberInfo->PositivePattern = array('YY','.');
-    $negPattern = array('YY','.');
-    $this->assertEquals($numberInfo->PositivePattern, $negPattern);
+	$numberInfo->PositivePattern = array('YY','.');
+	$negPattern = array('YY','.');
+	$this->assertEquals($numberInfo->PositivePattern, $negPattern);
 
-    //the default CurrencySymbol symbol
-    $numberInfo->CurrencySymbol = '$$$';
-    $this->assertEquals($numberInfo->CurrencySymbol, '$$$');
+	//the default CurrencySymbol symbol
+	$numberInfo->CurrencySymbol = '$$$';
+	$this->assertEquals($numberInfo->CurrencySymbol, '$$$');
   }
 
   function testLocalizedPatterns() {
-    $fr = NumberFormatInfo::getInstance('fr');
-    $de = NumberFormatInfo::getInstance('de');
-    $en = NumberFormatInfo::getInstance('en_US');
+	$fr = NumberFormatInfo::getInstance('fr');
+	$de = NumberFormatInfo::getInstance('de');
+	$en = NumberFormatInfo::getInstance('en_US');
 
-    $this->assertEquals($fr->DecimalSeparator, ',');
-    $this->assertEquals($de->DecimalSeparator, ',');
-    $this->assertEquals($en->DecimalSeparator, '.');
+	$this->assertEquals($fr->DecimalSeparator, ',');
+	$this->assertEquals($de->DecimalSeparator, ',');
+	$this->assertEquals($en->DecimalSeparator, '.');
 
-    $this->assertEquals($fr->GroupSeparator, ' ');
-    $this->assertEquals($de->GroupSeparator, '.');
-    $this->assertEquals($en->GroupSeparator, ',');
+	$this->assertEquals($fr->GroupSeparator, ' ');
+	$this->assertEquals($de->GroupSeparator, '.');
+	$this->assertEquals($en->GroupSeparator, ',');
   }
 }

Spacing +15 added lines, -15 removed lines

@@ -13,20 +13,20 @@ 
     $numberInfo = NumberFormatInfo::getCurrencyInstance();
 
     //there should be 2 decimal places.
-    $this->assertEquals($numberInfo->DecimalDigits,2);
-    $this->assertEquals($numberInfo->DecimalSeparator,'.');
-    $this->assertEquals($numberInfo->GroupSeparator,',');
+    $this->assertEquals($numberInfo->DecimalDigits, 2);
+    $this->assertEquals($numberInfo->DecimalSeparator, '.');
+    $this->assertEquals($numberInfo->GroupSeparator, ',');
 
     //there should be only 1 grouping of size 3
-    $groupsize = array(3,false);
+    $groupsize = array(3, false);
     $this->assertEquals($numberInfo->GroupSizes, $groupsize);
 
     //the default negative pattern prefix and postfix
-    $negPattern = array('-¤','');
+    $negPattern = array('-¤', '');
     $this->assertEquals($numberInfo->NegativePattern, $negPattern);
 
     //the default positive pattern prefix and postfix
-    $negPattern = array('¤','');
+    $negPattern = array('¤', '');
     $this->assertEquals($numberInfo->PositivePattern, $negPattern);
 
     //the default currency symbol
@@ -45,24 +45,24 @@ 
     $numberInfo = NumberFormatInfo::getInstance();
 
     $numberInfo->DecimalDigits = 0;
-    $this->assertEquals($numberInfo->DecimalDigits,0);
+    $this->assertEquals($numberInfo->DecimalDigits, 0);
 
     $numberInfo->DecimalSeparator = ',';
-    $this->assertEquals($numberInfo->DecimalSeparator,',');
+    $this->assertEquals($numberInfo->DecimalSeparator, ',');
 
     $numberInfo->GroupSeparator = ' ';
-    $this->assertEquals($numberInfo->GroupSeparator,' ');
+    $this->assertEquals($numberInfo->GroupSeparator, ' ');
 
-    $numberInfo->GroupSizes = array(2,3);
-    $groupsize = array(2,3);
+    $numberInfo->GroupSizes = array(2, 3);
+    $groupsize = array(2, 3);
     $this->assertEquals($numberInfo->GroupSizes, $groupsize);
 
-    $numberInfo->NegativePattern = array('-$$','.');
-    $negPattern = array('-$$','.');
+    $numberInfo->NegativePattern = array('-$$', '.');
+    $negPattern = array('-$$', '.');
     $this->assertEquals($numberInfo->NegativePattern, $negPattern);
 
-    $numberInfo->PositivePattern = array('YY','.');
-    $negPattern = array('YY','.');
+    $numberInfo->PositivePattern = array('YY', '.');
+    $negPattern = array('YY', '.');
     $this->assertEquals($numberInfo->PositivePattern, $negPattern);
 
     //the default CurrencySymbol symbol

tests/unit/I18N/core/DateFormatTest.php

Indentation +75 added lines, -75 removed lines

@@ -9,85 +9,85 @@
 class DateFormatTest extends PHPUnit_Framework_TestCase {
 
   public function testStandardPatterns() {
-    $dateFormatter = new DateFormat();
-
-    $time = @mktime(9, 9, 9, 9, 1, 2004);
-    $zone = @date('T', $time);
-    //var_dump(date('c',$time));
-    //for ShortDatePattern  "M/d/yy"
-    $this->assertEquals('9/1/04', $dateFormatter->format($time, 'd'));
-    //var_dump(date('c',strtotime($dateFormatter->format($time,'d'))));
-
-    //for LongDatePattern  "MMMM d, yyyy"
-    $wants = 'September 1, 2004';
-    $this->assertEquals($wants, $dateFormatter->format($time, 'D'));
-    //var_dump(date('c',strtotime($dateFormatter->format($time,'D'))));
-
-    //for Full date and time  "MMMM d, yyyy h:mm a"
-    $wants = 'September 1, 2004 9:09 AM';
-    $this->assertEquals($wants, $dateFormatter->format($time, 'f'));
-    //var_dump(date('c',strtotime($dateFormatter->format($time,'f'))));
-
-    //for FullDateTimePattern  "MMMM d, yyyy h:mm:ss a z"
-    $wants = 'September 1, 2004 9:09:09 AM '.$zone;
-    $this->assertEquals($wants, $dateFormatter->format($time, 'F'));
-
-    //for General "M/d/yy h:mm a"
-    $wants = '9/1/04 9:09 AM';
-    $this->assertEquals($wants, $dateFormatter->format($time, 'g'));
-    //var_dump(date('c',strtotime($dateFormatter->format($time,'g'))));
-
-    //for General "M/d/yy h:mm:ss a z"
-    $wants = '9/1/04 9:09:09 AM '.$zone;
-    $this->assertEquals($wants, $dateFormatter->format($time, 'G'));
-
-    //for MonthDayPattern  "MMMM dd" (invariant)
-    $wants = 'September 01';
-    $this->assertEquals($wants, $dateFormatter->format($time, 'm'));
-    //var_dump(date('c',strtotime($dateFormatter->format($time,'m'))));
-
-    //for RFC1123Pattern  "EEE, dd MMM yyyy HH:mm:ss" (invariant)
-    $wants = 'Wed, 01 Sep 2004 09:09:09';
-    $this->assertEquals($wants, $dateFormatter->format($time, 'r'));
-    //var_dump(date('c',strtotime($dateFormatter->format($time,'r'))));
-
-    //for SortableDateTimePattern "yyyy-MM-ddTHH:mm:ss" (invariant)
-    $wants = '2004-09-01T09:09:09';
-    $this->assertEquals($wants, $dateFormatter->format($time, 's'));
-    //var_dump(date('c',strtotime($dateFormatter->format($time,'s'))));
-
-    //for ShortTimePattern  "H:mm a"
-    $wants = '9:09 AM';
-    $this->assertEquals($wants, $dateFormatter->format($time, 't'));
-    //(date('c',strtotime($dateFormatter->format($time,'t'))));
-
-    //for LongTimePattern  "H:mm:ss a z"
-    $wants = '9:09:09 AM '.$zone;
-    $this->assertEquals($wants, $dateFormatter->format($time, 'T'));
-
-    //for UniversalSortableDateTimePattern "yyyy-MM-dd HH:mm:ss z"
-    //(invariant)
-    $wants = '2004-09-01 09:09:09 '.$zone;
-    $this->assertEquals($wants, $dateFormatter->format($time, 'u'));
-
-    //for Full date and time  "EEEE dd MMMM yyyy HH:mm:ss" (invariant)
-    $wants = 'Wednesday 01 September 2004 09:09:09';
-    $this->assertEquals($wants, $dateFormatter->format($time, 'U'));
-    //var_dump(date('c',strtotime($dateFormatter->format($time,'U'))));
-
-    //for YearMonthPattern  "yyyy MMMM" (invariant)
-    $wants = '2004 September';
-    $this->assertEquals($wants, $dateFormatter->format($time, 'y'));
-    //var_dump(date('c',strtotime($dateFormatter->format($time,'y'))));
+	$dateFormatter = new DateFormat();
+
+	$time = @mktime(9, 9, 9, 9, 1, 2004);
+	$zone = @date('T', $time);
+	//var_dump(date('c',$time));
+	//for ShortDatePattern  "M/d/yy"
+	$this->assertEquals('9/1/04', $dateFormatter->format($time, 'd'));
+	//var_dump(date('c',strtotime($dateFormatter->format($time,'d'))));
+
+	//for LongDatePattern  "MMMM d, yyyy"
+	$wants = 'September 1, 2004';
+	$this->assertEquals($wants, $dateFormatter->format($time, 'D'));
+	//var_dump(date('c',strtotime($dateFormatter->format($time,'D'))));
+
+	//for Full date and time  "MMMM d, yyyy h:mm a"
+	$wants = 'September 1, 2004 9:09 AM';
+	$this->assertEquals($wants, $dateFormatter->format($time, 'f'));
+	//var_dump(date('c',strtotime($dateFormatter->format($time,'f'))));
+
+	//for FullDateTimePattern  "MMMM d, yyyy h:mm:ss a z"
+	$wants = 'September 1, 2004 9:09:09 AM '.$zone;
+	$this->assertEquals($wants, $dateFormatter->format($time, 'F'));
+
+	//for General "M/d/yy h:mm a"
+	$wants = '9/1/04 9:09 AM';
+	$this->assertEquals($wants, $dateFormatter->format($time, 'g'));
+	//var_dump(date('c',strtotime($dateFormatter->format($time,'g'))));
+
+	//for General "M/d/yy h:mm:ss a z"
+	$wants = '9/1/04 9:09:09 AM '.$zone;
+	$this->assertEquals($wants, $dateFormatter->format($time, 'G'));
+
+	//for MonthDayPattern  "MMMM dd" (invariant)
+	$wants = 'September 01';
+	$this->assertEquals($wants, $dateFormatter->format($time, 'm'));
+	//var_dump(date('c',strtotime($dateFormatter->format($time,'m'))));
+
+	//for RFC1123Pattern  "EEE, dd MMM yyyy HH:mm:ss" (invariant)
+	$wants = 'Wed, 01 Sep 2004 09:09:09';
+	$this->assertEquals($wants, $dateFormatter->format($time, 'r'));
+	//var_dump(date('c',strtotime($dateFormatter->format($time,'r'))));
+
+	//for SortableDateTimePattern "yyyy-MM-ddTHH:mm:ss" (invariant)
+	$wants = '2004-09-01T09:09:09';
+	$this->assertEquals($wants, $dateFormatter->format($time, 's'));
+	//var_dump(date('c',strtotime($dateFormatter->format($time,'s'))));
+
+	//for ShortTimePattern  "H:mm a"
+	$wants = '9:09 AM';
+	$this->assertEquals($wants, $dateFormatter->format($time, 't'));
+	//(date('c',strtotime($dateFormatter->format($time,'t'))));
+
+	//for LongTimePattern  "H:mm:ss a z"
+	$wants = '9:09:09 AM '.$zone;
+	$this->assertEquals($wants, $dateFormatter->format($time, 'T'));
+
+	//for UniversalSortableDateTimePattern "yyyy-MM-dd HH:mm:ss z"
+	//(invariant)
+	$wants = '2004-09-01 09:09:09 '.$zone;
+	$this->assertEquals($wants, $dateFormatter->format($time, 'u'));
+
+	//for Full date and time  "EEEE dd MMMM yyyy HH:mm:ss" (invariant)
+	$wants = 'Wednesday 01 September 2004 09:09:09';
+	$this->assertEquals($wants, $dateFormatter->format($time, 'U'));
+	//var_dump(date('c',strtotime($dateFormatter->format($time,'U'))));
+
+	//for YearMonthPattern  "yyyy MMMM" (invariant)
+	$wants = '2004 September';
+	$this->assertEquals($wants, $dateFormatter->format($time, 'y'));
+	//var_dump(date('c',strtotime($dateFormatter->format($time,'y'))));
   }
 
   public function testCustomPatterns() {
-    $dateFormatter = new DateFormat();
+	$dateFormatter = new DateFormat();
 
-    $time = @mktime(9, 9, 9, 9, 1, 2004);
+	$time = @mktime(9, 9, 9, 9, 1, 2004);
 
-    $pattern = "'Hello' EEEE, 'it should be' MMM yyyy HH:mm:ss!!!";
-    $wants = 'Hello Wednesday, it should be Sep 2004 09:09:09!!!';
-    $this->assertEquals($wants, $dateFormatter->format($time, $pattern));
+	$pattern = "'Hello' EEEE, 'it should be' MMM yyyy HH:mm:ss!!!";
+	$wants = 'Hello Wednesday, it should be Sep 2004 09:09:09!!!';
+	$this->assertEquals($wants, $dateFormatter->format($time, $pattern));
   }
 }

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
     //var_dump(date('c',strtotime($dateFormatter->format($time,'f'))));
 
     //for FullDateTimePattern  "MMMM d, yyyy h:mm:ss a z"
-    $wants = 'September 1, 2004 9:09:09 AM '.$zone;
+    $wants = 'September 1, 2004 9:09:09 AM ' . $zone;
     $this->assertEquals($wants, $dateFormatter->format($time, 'F'));
 
     //for General "M/d/yy h:mm a"
@@ -38,7 +38,7 @@ 
     //var_dump(date('c',strtotime($dateFormatter->format($time,'g'))));
 
     //for General "M/d/yy h:mm:ss a z"
-    $wants = '9/1/04 9:09:09 AM '.$zone;
+    $wants = '9/1/04 9:09:09 AM ' . $zone;
     $this->assertEquals($wants, $dateFormatter->format($time, 'G'));
 
     //for MonthDayPattern  "MMMM dd" (invariant)
@@ -62,12 +62,12 @@ 
     //(date('c',strtotime($dateFormatter->format($time,'t'))));
 
     //for LongTimePattern  "H:mm:ss a z"
-    $wants = '9:09:09 AM '.$zone;
+    $wants = '9:09:09 AM ' . $zone;
     $this->assertEquals($wants, $dateFormatter->format($time, 'T'));
 
     //for UniversalSortableDateTimePattern "yyyy-MM-dd HH:mm:ss z"
     //(invariant)
-    $wants = '2004-09-01 09:09:09 '.$zone;
+    $wants = '2004-09-01 09:09:09 ' . $zone;
     $this->assertEquals($wants, $dateFormatter->format($time, 'u'));
 
     //for Full date and time  "EEEE dd MMMM yyyy HH:mm:ss" (invariant)