Merge pull request #1273 from jim-parry/fix/timing

Fix/timing

Author: lonnieezell

tests/system/Debug/TimerTest.php

@@ -1,13 +1,20 @@
-<?php namespace CodeIgniter\Debug;
+<?php
+namespace CodeIgniter\Debug;
 
 class TimerTest extends \CIUnitTestCase
 {
 
-	public function setUp() { }
+	public function setUp()
+	{
+		
+	}
 
 	//--------------------------------------------------------------------
 
-	public function tearDown() { }
+	public function tearDown()
+	{
+		
+	}
 
 	//--------------------------------------------------------------------
 
@@ -83,38 +90,38 @@ public function testThrowsExceptionStoppingNonTimer()
 
 	//--------------------------------------------------------------------
 
-    public function testLongExecutionTime()
-    {
-        $timer = new Timer();
+	public function testLongExecutionTime()
+	{
+		$timer = new Timer();
 
-        $timer->start('longjohn', strtotime('-11 minutes'));
+		$timer->start('longjohn', strtotime('-11 minutes'));
 
-        // Use floor here to account for fractional differences in seconds.
-        $this->assertEquals(11 * 60, (int)$timer->getElapsedTime('longjohn'));
-    }
+		// Use floor here to account for fractional differences in seconds.
+		$this->assertEquals(11 * 60, (int) floor($timer->getElapsedTime('longjohn')));
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function testLongExecutionTimeThroughCommonFunc()
-    {
-        timer()->start('longjohn', strtotime('-11 minutes'));
+	public function testLongExecutionTimeThroughCommonFunc()
+	{
+		timer()->start('longjohn', strtotime('-11 minutes'));
 
-        // Use floor here to account for fractional differences in seconds.
-        $this->assertEquals(11 * 60, (int)timer()->getElapsedTime('longjohn'));
-    }
+		// Use floor here to account for fractional differences in seconds.
+		$this->assertEquals(11 * 60, (int) floor(timer()->getElapsedTime('longjohn')));
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function testCommonStartStop()
-    {
-        timer('test1');
-        sleep(1);
-        timer('test1');
+	public function testCommonStartStop()
+	{
+		timer('test1');
+		sleep(1);
+		timer('test1');
 
-        $this->assertGreaterThanOrEqual(1.0, timer()->getElapsedTime('test1'));
-    }
+		$this->assertGreaterThanOrEqual(1.0, timer()->getElapsedTime('test1'));
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	public function testReturnsNullGettingElapsedTimeOfNonTimer()
 	{
@@ -123,5 +130,5 @@ public function testReturnsNullGettingElapsedTimeOfNonTimer()
 		$this->assertNull($timer->getElapsedTime('test1'));
 	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 }

tests/system/I18n/TimeTest.php

@@ -14,8 +14,6 @@ public function setUp()
 
 	public function testNewTimeNow()
 	{
-		$time = new Time(null, 'America/Chicago');
-
 		$formatter = new IntlDateFormatter(
 			'en_US',
 			IntlDateFormatter::SHORT,
@@ -25,13 +23,13 @@ public function testNewTimeNow()
 			'yyyy-MM-dd HH:mm:ss'
 		);
 
+		$time = new Time(null, 'America/Chicago');
+
 		$this->assertEquals($formatter->format(strtotime('now')), (string)$time);
 	}
 
 	public function testTimeWithTimezone()
 	{
-		$time = new Time('now', 'Europe/London');
-
 		$formatter = new IntlDateFormatter(
 			'en_US',
 			IntlDateFormatter::SHORT,
@@ -41,13 +39,13 @@ public function testTimeWithTimezone()
 			'yyyy-MM-dd HH:mm:ss'
 		);
 
+		$time = new Time('now', 'Europe/London');
+
 		$this->assertEquals($formatter->format(strtotime('now')), (string)$time);
 	}
 
 	public function testTimeWithTimezoneAndLocale()
 	{
-		$time = new Time('now', 'Europe/London', 'fr_FR');
-
 		$formatter = new IntlDateFormatter(
 			'fr_FR',
 			IntlDateFormatter::SHORT,
@@ -57,13 +55,13 @@ public function testTimeWithTimezoneAndLocale()
 			'yyyy-MM-dd HH:mm:ss'
 		);
 
+		$time = new Time('now', 'Europe/London', 'fr_FR');
+
 		$this->assertEquals($formatter->format(strtotime('now')), (string)$time);
 	}
 
 	public function testTimeWithDateTimeZone()
 	{
-		$time = new Time('now', new \DateTimeZone('Europe/London'), 'fr_FR');
-
 		$formatter = new IntlDateFormatter(
 			'fr_FR',
 			IntlDateFormatter::SHORT,
@@ -73,6 +71,8 @@ public function testTimeWithDateTimeZone()
 			'yyyy-MM-dd HH:mm:ss'
 		);
 
+		$time = new Time('now', new \DateTimeZone('Europe/London'), 'fr_FR');
+
 		$this->assertEquals($formatter->format(strtotime('now')), (string)$time);
 	}