pradosoft / prado

tests/unit/Web/TAssetManagerTest.php

Doc Comments +3 added lines

@@ -46,6 +46,9 @@
 
 	}
 
+	/**
+	 * @param string $dir
+	 */
 	private function removeDirectory ($dir) {
 	  // Let's be sure $dir is a directory to avoir any error. Clear the cache !
 	  clearstatcache();

Indentation +38 added lines, -38 removed lines

@@ -33,14 +33,14 @@ 
 
 		if (self::$assetDir===null) self::$assetDir= dirname(__FILE__).'/assets';
 		// Make asset directory if not exists
-	    if (!file_exists (self::$assetDir)) {
-    		if (is_writable(dirname(self::$assetDir)))
-    		  mkdir (self::$assetDir) ;
-    		else
-    		  throw new Exception ('Directory '.dirname(self::$assetDir).' is not writable');
-	    } elseif (!is_dir (self::$assetDir)) {
-	       throw new Exception (self::$assetDir.' exists and is not a directory');
-	    }
+		if (!file_exists (self::$assetDir)) {
+			if (is_writable(dirname(self::$assetDir)))
+			  mkdir (self::$assetDir) ;
+			else
+			  throw new Exception ('Directory '.dirname(self::$assetDir).' is not writable');
+		} elseif (!is_dir (self::$assetDir)) {
+		   throw new Exception (self::$assetDir.' exists and is not a directory');
+		}
 		// Define an alias to asset directory
 		prado::setPathofAlias('AssetAlias', self::$assetDir);
 
@@ -50,22 +50,22 @@ 
 	  // Let's be sure $dir is a directory to avoir any error. Clear the cache !
 	  clearstatcache();
 	  if (is_dir($dir)) {
-	    foreach (scandir($dir) as $content) {
-	      if ($content==='.' or $content==='..') continue; // skip . and ..
-	      $content=$dir.'/'.$content;
-	      if (is_dir($content))
-	        $this->removeDirectory ($content); // Recursivly remove directories
-	      else
-	        unlink ($content); // Remove file
-	    }
-	    // Now, directory should be empty, remove it
-	    rmdir ($dir);
+		foreach (scandir($dir) as $content) {
+		  if ($content==='.' or $content==='..') continue; // skip . and ..
+		  $content=$dir.'/'.$content;
+		  if (is_dir($content))
+			$this->removeDirectory ($content); // Recursivly remove directories
+		  else
+			unlink ($content); // Remove file
+		}
+		// Now, directory should be empty, remove it
+		rmdir ($dir);
 	  }
 	}
 
 	public function tearDown () {
 		// Make some cleaning :)
-	    $this->removeDirectory(self::$assetDir);
+		$this->removeDirectory(self::$assetDir);
 	}
 
 	public function testInit() {
@@ -126,27 +126,27 @@ 
 		$manager->init (null);
 
 		// Try to publish a single file
-	    $fileToPublish=dirname(__FILE__).'/data/pradoheader.gif';
+		$fileToPublish=dirname(__FILE__).'/data/pradoheader.gif';
 		$publishedUrl = $manager->publishFilePath($fileToPublish);
 		$publishedFile=self::$assetDir.$publishedUrl;
 		self::assertEquals($publishedFile, $manager->getPublishedPath($fileToPublish));
 		self::assertEquals($publishedUrl, $manager->getPublishedUrl($fileToPublish));
 		self::assertTrue(is_file($publishedFile));
 
-	    //  try to publish invalid file
-	    try {
-	      $manager->publishFilePath('invalid_file');
-	      self::fail('Expected TInvalidDataValueException not thrown');
-	    } catch (TInvalidDataValueException $e) {}
+		//  try to publish invalid file
+		try {
+		  $manager->publishFilePath('invalid_file');
+		  self::fail('Expected TInvalidDataValueException not thrown');
+		} catch (TInvalidDataValueException $e) {}
 	}
 
 	public function testPublishFilePathWithDirectory () {
-	    $manager=new TAssetManager();
+		$manager=new TAssetManager();
 		$manager->setBaseUrl('/');
 		$manager->init (null);
 
 		// Try to publish a directory
-	    $dirToPublish=dirname(__FILE__).'/data';
+		$dirToPublish=dirname(__FILE__).'/data';
 		$publishedUrl = $manager->publishFilePath($dirToPublish);
 		$publishedDir=self::$assetDir.$publishedUrl;
 		self::assertEquals($publishedDir, $manager->getPublishedPath($dirToPublish));
@@ -165,17 +165,17 @@ 
 		$md5File=dirname(__FILE__).'/data/aTarFile.md5';
 
 		// First, try with bad md5
-	    try {
-	      $manager->publishTarFile($tarFile, 'badMd5File');
-	      self::fail('Expected TInvalidDataValueException not thrown');
-	    } catch (TInvalidDataValueException $e) {}
-
-	    // Then, try with real md5 file
-	    $publishedUrl=$manager->publishTarFile($tarFile, $md5File);
-	    $publishedDir=self::$assetDir.$publishedUrl;
-	    self::assertTrue(is_dir($publishedDir));
-	    self::assertTrue(is_file($publishedDir.'/pradoheader.gif'));
-	    self::assertTrue(is_file($publishedDir.'/aTarFile.md5'));
+		try {
+		  $manager->publishTarFile($tarFile, 'badMd5File');
+		  self::fail('Expected TInvalidDataValueException not thrown');
+		} catch (TInvalidDataValueException $e) {}
+
+		// Then, try with real md5 file
+		$publishedUrl=$manager->publishTarFile($tarFile, $md5File);
+		$publishedDir=self::$assetDir.$publishedUrl;
+		self::assertTrue(is_dir($publishedDir));
+		self::assertTrue(is_file($publishedDir.'/pradoheader.gif'));
+		self::assertTrue(is_file($publishedDir.'/aTarFile.md5'));
 
 	}
 }
\ No newline at end of file

Spacing +49 added lines, -49 removed lines

@@ -10,7 +10,7 @@ 
 	public static $app = null;
 	public static $assetDir = null;
 
-	public function setUp () {
+	public function setUp() {
 		// Fake environment variables needed to determine path
 		$_SERVER['HTTP_HOST'] = 'localhost';
 		$_SERVER['SERVER_NAME'] = 'localhost';
@@ -27,66 +27,66 @@ 
 		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3';
 		$_SERVER['REMOTE_HOST'] = 'localhost';
 
-		if (self::$app===null) {
-			self::$app=new TApplication(dirname(__FILE__).'/app');
+		if (self::$app === null) {
+			self::$app = new TApplication(dirname(__FILE__) . '/app');
 		}
 
-		if (self::$assetDir===null) self::$assetDir= dirname(__FILE__).'/assets';
+		if (self::$assetDir === null) self::$assetDir = dirname(__FILE__) . '/assets';
 		// Make asset directory if not exists
-	    if (!file_exists (self::$assetDir)) {
+	    if (!file_exists(self::$assetDir)) {
     		if (is_writable(dirname(self::$assetDir)))
-    		  mkdir (self::$assetDir) ;
+    		  mkdir(self::$assetDir);
     		else
-    		  throw new Exception ('Directory '.dirname(self::$assetDir).' is not writable');
-	    } elseif (!is_dir (self::$assetDir)) {
-	       throw new Exception (self::$assetDir.' exists and is not a directory');
+    		  throw new Exception('Directory ' . dirname(self::$assetDir) . ' is not writable');
+	    } elseif (!is_dir(self::$assetDir)) {
+	       throw new Exception(self::$assetDir . ' exists and is not a directory');
 	    }
 		// Define an alias to asset directory
 		prado::setPathofAlias('AssetAlias', self::$assetDir);
 
 	}
 
-	private function removeDirectory ($dir) {
+	private function removeDirectory($dir) {
 	  // Let's be sure $dir is a directory to avoir any error. Clear the cache !
 	  clearstatcache();
 	  if (is_dir($dir)) {
 	    foreach (scandir($dir) as $content) {
-	      if ($content==='.' or $content==='..') continue; // skip . and ..
-	      $content=$dir.'/'.$content;
+	      if ($content === '.' or $content === '..') continue; // skip . and ..
+	      $content = $dir . '/' . $content;
 	      if (is_dir($content))
-	        $this->removeDirectory ($content); // Recursivly remove directories
+	        $this->removeDirectory($content); // Recursivly remove directories
 	      else
-	        unlink ($content); // Remove file
+	        unlink($content); // Remove file
 	    }
 	    // Now, directory should be empty, remove it
-	    rmdir ($dir);
+	    rmdir($dir);
 	  }
 	}
 
-	public function tearDown () {
+	public function tearDown() {
 		// Make some cleaning :)
 	    $this->removeDirectory(self::$assetDir);
 	}
 
 	public function testInit() {
 
-		$manager=new TAssetManager ();
+		$manager = new TAssetManager();
 
-		$manager->init (null);
+		$manager->init(null);
 
 		self::assertEquals(self::$assetDir, $manager->getBasePath());
 		self::assertEquals($manager, self::$app->getAssetManager());
 
 		// No, remove asset directory, and catch the exception
-		if (is_dir(self::$assetDir)) $this->removeDirectory (self::$assetDir);
+		if (is_dir(self::$assetDir)) $this->removeDirectory(self::$assetDir);
 		try {
-			$manager->init (null);
-			self::fail ('Expected TConfigurationException not thrown');
+			$manager->init(null);
+			self::fail('Expected TConfigurationException not thrown');
 		} catch (TConfigurationException $e) {}
 	}
 
 	public function testSetBasePath() {
-		$manager = new TAssetManager ();
+		$manager = new TAssetManager();
 		// First try, invalid directory
 		try {
 			$manager->setBasePath('invalid');
@@ -95,40 +95,40 @@ 
 
 		// Next, standard asset directory, should work
 
-		$manager->setBasePath ('AssetAlias');
+		$manager->setBasePath('AssetAlias');
 		self::assertEquals(self::$assetDir, $manager->getBasePath());
 
 		// Finally, test to change after init
-		$manager->init (null);
+		$manager->init(null);
 		try {
-			$manager->setBasePath ('test');
-			self::fail ('Expected TInvalidOperationException not thrown');
+			$manager->setBasePath('test');
+			self::fail('Expected TInvalidOperationException not thrown');
 		} catch (TInvalidOperationException $e) {}
 
 	}
 
 	public function testSetBaseUrl() {
-		$manager=new TAssetManager ();
-		$manager->setBaseUrl ('/assets/');
+		$manager = new TAssetManager();
+		$manager->setBaseUrl('/assets/');
 		self::assertEquals("/assets", $manager->getBaseUrl());
 
-		$manager->init (null);
+		$manager->init(null);
 		try {
-			$manager->setBaseUrl ('/test');
-			self::fail ('Expected TInvalidOperationException not thrown');
+			$manager->setBaseUrl('/test');
+			self::fail('Expected TInvalidOperationException not thrown');
 		} catch (TInvalidOperationException $e) {}
 
 	}
 
 	public function testPublishFilePath() {
-		$manager=new TAssetManager();
+		$manager = new TAssetManager();
 		$manager->setBaseUrl('/');
-		$manager->init (null);
+		$manager->init(null);
 
 		// Try to publish a single file
-	    $fileToPublish=dirname(__FILE__).'/data/pradoheader.gif';
+	    $fileToPublish = dirname(__FILE__) . '/data/pradoheader.gif';
 		$publishedUrl = $manager->publishFilePath($fileToPublish);
-		$publishedFile=self::$assetDir.$publishedUrl;
+		$publishedFile = self::$assetDir . $publishedUrl;
 		self::assertEquals($publishedFile, $manager->getPublishedPath($fileToPublish));
 		self::assertEquals($publishedUrl, $manager->getPublishedUrl($fileToPublish));
 		self::assertTrue(is_file($publishedFile));
@@ -140,29 +140,29 @@ 
 	    } catch (TInvalidDataValueException $e) {}
 	}
 
-	public function testPublishFilePathWithDirectory () {
-	    $manager=new TAssetManager();
+	public function testPublishFilePathWithDirectory() {
+	    $manager = new TAssetManager();
 		$manager->setBaseUrl('/');
-		$manager->init (null);
+		$manager->init(null);
 
 		// Try to publish a directory
-	    $dirToPublish=dirname(__FILE__).'/data';
+	    $dirToPublish = dirname(__FILE__) . '/data';
 		$publishedUrl = $manager->publishFilePath($dirToPublish);
-		$publishedDir=self::$assetDir.$publishedUrl;
+		$publishedDir = self::$assetDir . $publishedUrl;
 		self::assertEquals($publishedDir, $manager->getPublishedPath($dirToPublish));
 		self::assertEquals($publishedUrl, $manager->getPublishedUrl($dirToPublish));
 		self::assertTrue(is_dir($publishedDir));
-		self::assertTrue(is_file($publishedDir.'/pradoheader.gif'));
+		self::assertTrue(is_file($publishedDir . '/pradoheader.gif'));
 
 	}
 
 	public function testPublishTarFile() {
-		$manager=new TAssetManager();
+		$manager = new TAssetManager();
 		$manager->setBaseUrl('/');
-		$manager->init (null);
+		$manager->init(null);
 
-		$tarFile=dirname(__FILE__).'/data/aTarFile.tar';
-		$md5File=dirname(__FILE__).'/data/aTarFile.md5';
+		$tarFile = dirname(__FILE__) . '/data/aTarFile.tar';
+		$md5File = dirname(__FILE__) . '/data/aTarFile.md5';
 
 		// First, try with bad md5
 	    try {
@@ -171,11 +171,11 @@ 
 	    } catch (TInvalidDataValueException $e) {}
 
 	    // Then, try with real md5 file
-	    $publishedUrl=$manager->publishTarFile($tarFile, $md5File);
-	    $publishedDir=self::$assetDir.$publishedUrl;
+	    $publishedUrl = $manager->publishTarFile($tarFile, $md5File);
+	    $publishedDir = self::$assetDir . $publishedUrl;
 	    self::assertTrue(is_dir($publishedDir));
-	    self::assertTrue(is_file($publishedDir.'/pradoheader.gif'));
-	    self::assertTrue(is_file($publishedDir.'/aTarFile.md5'));
+	    self::assertTrue(is_file($publishedDir . '/pradoheader.gif'));
+	    self::assertTrue(is_file($publishedDir . '/aTarFile.md5'));
 
 	}
 }
\ No newline at end of file

Braces +23 added lines, -11 removed lines

@@ -31,13 +31,16 @@ 
 			self::$app=new TApplication(dirname(__FILE__).'/app');
 		}
 
-		if (self::$assetDir===null) self::$assetDir= dirname(__FILE__).'/assets';
+		if (self::$assetDir===null) {
+			self::$assetDir= dirname(__FILE__).'/assets';
+		}
 		// Make asset directory if not exists
 	    if (!file_exists (self::$assetDir)) {
-    		if (is_writable(dirname(self::$assetDir)))
-    		  mkdir (self::$assetDir) ;
-    		else
-    		  throw new Exception ('Directory '.dirname(self::$assetDir).' is not writable');
+    		if (is_writable(dirname(self::$assetDir))) {
+    		    		  mkdir (self::$assetDir) ;
+    		} else {
+    		    		  throw new Exception ('Directory '.dirname(self::$assetDir).' is not writable');
+    		}
 	    } elseif (!is_dir (self::$assetDir)) {
 	       throw new Exception (self::$assetDir.' exists and is not a directory');
 	    }
@@ -51,12 +54,19 @@ 
 	  clearstatcache();
 	  if (is_dir($dir)) {
 	    foreach (scandir($dir) as $content) {
-	      if ($content==='.' or $content==='..') continue; // skip . and ..
+	      if ($content==='.' or $content==='..') {
+	      	continue;
+	      }
+	      // skip . and ..
 	      $content=$dir.'/'.$content;
-	      if (is_dir($content))
-	        $this->removeDirectory ($content); // Recursivly remove directories
-	      else
-	        unlink ($content); // Remove file
+	      if (is_dir($content)) {
+	      	        $this->removeDirectory ($content);
+	      }
+	      // Recursivly remove directories
+	      else {
+	      	        unlink ($content);
+	      }
+	      // Remove file
 	    }
 	    // Now, directory should be empty, remove it
 	    rmdir ($dir);
@@ -78,7 +88,9 @@ 
 		self::assertEquals($manager, self::$app->getAssetManager());
 
 		// No, remove asset directory, and catch the exception
-		if (is_dir(self::$assetDir)) $this->removeDirectory (self::$assetDir);
+		if (is_dir(self::$assetDir)) {
+			$this->removeDirectory (self::$assetDir);
+		}
 		try {
 			$manager->init (null);
 			self::fail ('Expected TConfigurationException not thrown');

tests/unit/Web/UI/THtmlWriterTest.php

Doc Comments +3 added lines

@@ -21,6 +21,9 @@
 	}
 
 
+	/**
+	 * @param string $str
+	 */
 	public function write($str)
 	{
 		$this->_str.=$str;

Spacing +47 added lines, -47 removed lines

@@ -9,27 +9,27 @@ 
 
 class TestWriter extends TComponent implements ITextWriter
 {
-	private $_str='';
-	private $_flushedContent=null;
+	private $_str = '';
+	private $_flushedContent = null;
 
 
 	public function flush()
 	{
-		$this->_flushedContent=$this->_str;
-		$this->_str='';
+		$this->_flushedContent = $this->_str;
+		$this->_str = '';
 		return $this->_flushedContent;
 	}
 
 
 	public function write($str)
 	{
-		$this->_str.=$str;
+		$this->_str .= $str;
 	}
 
 
-	public function writeLine($str='')
+	public function writeLine($str = '')
 	{
-		$this->write($str."\n");
+		$this->write($str . "\n");
 	}
 
 	// Accessors to get value of private vars during tests
@@ -43,120 +43,120 @@ 
  */
 class THtmlWriterTest extends PHPUnit_Framework_TestCase {
 
-	private static $output=null;
+	private static $output = null;
 
-	public function setUp () {
+	public function setUp() {
 		// We need an output writer, use a TestWriter for this
-		if (self::$output===null) self::$output=new TestWriter();
+		if (self::$output === null) self::$output = new TestWriter();
 	}
 
 	public function testConstruct() {
-		$writer=new THtmlWriter(self::$output);
+		$writer = new THtmlWriter(self::$output);
 		self::assertEquals(self::$output, $writer->getWriter());
 	}
 
 	public function testSetAndGetWriter() {
-		$writer=new THtmlWriter(null);
+		$writer = new THtmlWriter(null);
 		self::assertNull($writer->getWriter());
 		$writer->setWriter(self::$output);
 		self::assertEquals(self::$output, $writer->getWriter());
 	}
 
 	public function testAddAttributes() {
-		$writer=new THtmlWriter(self::$output);
-		$writer->addAttributes(array ('type' => 'text', 'value' => 'Prado & Cie'));
+		$writer = new THtmlWriter(self::$output);
+		$writer->addAttributes(array('type' => 'text', 'value' => 'Prado & Cie'));
 		// get the private var _attributes
-		$result=self::readAttribute($writer, '_attributes');
-		self::assertEquals('text',$result['type']);
+		$result = self::readAttribute($writer, '_attributes');
+		self::assertEquals('text', $result['type']);
 		self::assertEquals(THttpUtility::htmlEncode('Prado & Cie'), $result['value']);
 	}
 
 	public function testAddAttribute() {
-		$writer=new THtmlWriter(self::$output);
-		$writer->addAttribute('type','text');
-		$writer->addAttribute('value','Prado & Cie');
-		$result=self::readAttribute($writer, '_attributes');
-		self::assertEquals('text',$result['type']);
+		$writer = new THtmlWriter(self::$output);
+		$writer->addAttribute('type', 'text');
+		$writer->addAttribute('value', 'Prado & Cie');
+		$result = self::readAttribute($writer, '_attributes');
+		self::assertEquals('text', $result['type']);
 		self::assertEquals(THttpUtility::htmlEncode('Prado & Cie'), $result['value']);
 	}
 
 	public function testRemoveAttribute() {
-		$writer=new THtmlWriter(self::$output);
-		$writer->addAttribute('type','text');
-		$writer->addAttribute('value','Prado & Cie');
+		$writer = new THtmlWriter(self::$output);
+		$writer->addAttribute('type', 'text');
+		$writer->addAttribute('value', 'Prado & Cie');
 		$writer->removeAttribute('value');
-		$result=self::readAttribute($writer, '_attributes');
+		$result = self::readAttribute($writer, '_attributes');
 		// 'type' should be present, 'value' not
 		self::assertTrue(isset($result['type']));
 		self::assertFalse(isset($result['value']));
 	}
 
 	public function testAddStyleAttributes() {
-		$writer=new THtmlWriter(self::$output);
-		$writer->addStyleAttributes(array ('font-size' => '1em', 'background-image'=>'url(image.gif)'));
-		$result=self::readAttribute($writer, '_styles');
+		$writer = new THtmlWriter(self::$output);
+		$writer->addStyleAttributes(array('font-size' => '1em', 'background-image'=>'url(image.gif)'));
+		$result = self::readAttribute($writer, '_styles');
 		self::assertEquals('1em', $result['font-size']);
 		self::assertEquals(THttpUtility::htmlEncode('url(image.gif)'), $result['background-image']);
 	}
 
 	public function testAddStyleAttribute() {
-		$writer=new THtmlWriter(self::$output);
-		$writer->addStyleAttribute('font-size','1em');
-		$writer->addStyleAttribute('background-image','url(image.gif)');
-		$result=self::readAttribute($writer, '_styles');
+		$writer = new THtmlWriter(self::$output);
+		$writer->addStyleAttribute('font-size', '1em');
+		$writer->addStyleAttribute('background-image', 'url(image.gif)');
+		$result = self::readAttribute($writer, '_styles');
 		self::assertEquals('1em', $result['font-size']);
 		self::assertEquals(THttpUtility::htmlEncode('url(image.gif)'), $result['background-image']);
 	}
 
 	public function testRemoveStyleAttribute() {
-		$writer=new THtmlWriter(self::$output);
-		$writer->addStyleAttribute('font-size','1em');
-		$writer->addStyleAttribute('background-image','url(image.gif)');
+		$writer = new THtmlWriter(self::$output);
+		$writer->addStyleAttribute('font-size', '1em');
+		$writer->addStyleAttribute('background-image', 'url(image.gif)');
 		$writer->removeStyleAttribute('font-size');
-		$result=self::readAttribute($writer, '_styles');
+		$result = self::readAttribute($writer, '_styles');
 		self::assertTrue(isset($result['background-image']));
 		self::assertFalse(isset($result['font-size']));
 	}
 
 	public function testFlush() {
-		$writer=new THtmlWriter(self::$output);
+		$writer = new THtmlWriter(self::$output);
 		$writer->write('Some Text');
 		$writer->flush();
 		self::assertEquals('Some Text', self::$output->getFlushedContent());
 	}
 
 	public function testWrite() {
-		$writer=new THtmlWriter(self::$output);
-		$writer->write('Some Text');;
+		$writer = new THtmlWriter(self::$output);
+		$writer->write('Some Text'); ;
 		self::assertEquals('Some Text', self::$output->flush());
 
 	}
 
 	public function testWriteLine() {
-		$writer=new THtmlWriter(self::$output);
-		$writer->writeLine('Some Text');;
+		$writer = new THtmlWriter(self::$output);
+		$writer->writeLine('Some Text'); ;
 		self::assertEquals("Some Text\n", self::$output->flush());
 
 	}
 
 	public function testWriteBreak() {
-		$writer=new THtmlWriter(self::$output);
+		$writer = new THtmlWriter(self::$output);
 		$writer->writeBreak();
 		self::assertEquals("<br/>", self::$output->flush());
 
 	}
 
 	public function testRenderBeginTag() {
-		$writer=new THtmlWriter(self::$output);
-		$writer->addAttribute('type','text');
-		$writer->addAttribute('value','Prado');
-		$writer->addStyleAttribute('font-size','1em');
+		$writer = new THtmlWriter(self::$output);
+		$writer->addAttribute('type', 'text');
+		$writer->addAttribute('value', 'Prado');
+		$writer->addStyleAttribute('font-size', '1em');
 		$writer->renderBeginTag('input');
 		self::assertEquals('<input type="text" value="Prado" style="font-size:1em;" />', self::$output->flush());
 	}
 
 	public function testRenderEndTag() {
-		$writer=new THtmlWriter(self::$output);
+		$writer = new THtmlWriter(self::$output);
 		$writer->renderBeginTag('div');
 		$writer->write('Div Content');
 		$writer->renderEndTag();

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
 
 	public function setUp () {
 		// We need an output writer, use a TestWriter for this
-		if (self::$output===null) self::$output=new TestWriter();
+		if (self::$output===null) {
+			self::$output=new TestWriter();
+		}
 	}
 
 	public function testConstruct() {

tests/test_tools/phpunit_bootstrap.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 date_default_timezone_set('UTC');
 
 if (!@include_once VENDOR_DIR.'/autoload.php') {
-    die('You must set up the project dependencies, run the following commands:
+	die('You must set up the project dependencies, run the following commands:
         wget http://getcomposer.org/composer.phar
         php composer.phar install');
 }

Spacing +6 added lines, -6 removed lines

@@ -7,21 +7,21 @@
  */
 
 define('PRADO_TEST_RUN', true);
-define('PRADO_FRAMEWORK_DIR', dirname(__FILE__).'/../../framework');
-define('VENDOR_DIR', dirname(__FILE__).'/../../vendor');
-set_include_path(PRADO_FRAMEWORK_DIR.PATH_SEPARATOR.get_include_path());
+define('PRADO_FRAMEWORK_DIR', dirname(__FILE__) . '/../../framework');
+define('VENDOR_DIR', dirname(__FILE__) . '/../../vendor');
+set_include_path(PRADO_FRAMEWORK_DIR . PATH_SEPARATOR . get_include_path());
 // coverage tests waste a lot of memory!
 ini_set('memory_limit', '1G');
 
 date_default_timezone_set('UTC');
 
-if (!@include_once VENDOR_DIR.'/autoload.php') {
+if (!@include_once VENDOR_DIR . '/autoload.php') {
     die('You must set up the project dependencies, run the following commands:
         wget http://getcomposer.org/composer.phar
         php composer.phar install');
 }
 
-require_once(PRADO_FRAMEWORK_DIR.'/prado.php');
+require_once(PRADO_FRAMEWORK_DIR . '/prado.php');
 
 // for FunctionalTests
-require_once(__DIR__.'/PradoGenericSelenium2Test.php');
\ No newline at end of file
+require_once(__DIR__ . '/PradoGenericSelenium2Test.php');
\ No newline at end of file

tests/test_tools/simpletest/reporter.php

Indentation +330 added lines, -330 removed lines

@@ -1,366 +1,366 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: reporter.php 1532 2006-12-01 12:28:55Z xue $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: reporter.php 1532 2006-12-01 12:28:55Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/scorer.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/scorer.php');
+	/**#@-*/
 
-    /**
-     *    Sample minimal test displayer. Generates only
-     *    failure messages and a pass count.
+	/**
+	 *    Sample minimal test displayer. Generates only
+	 *    failure messages and a pass count.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class HtmlReporter extends SimpleReporter {
-        protected $_character_set;
+	 */
+	class HtmlReporter extends SimpleReporter {
+		protected $_character_set;
 
-        /**
-         *    Does nothing yet. The first output will
-         *    be sent on the first test start. For use
-         *    by a web browser.
-         *    @access public
-         */
-        function HtmlReporter($character_set = 'ISO-8859-1') {
-            $this->SimpleReporter();
-            $this->_character_set = $character_set;
-        }
+		/**
+		 *    Does nothing yet. The first output will
+		 *    be sent on the first test start. For use
+		 *    by a web browser.
+		 *    @access public
+		 */
+		function HtmlReporter($character_set = 'ISO-8859-1') {
+			$this->SimpleReporter();
+			$this->_character_set = $character_set;
+		}
 
-        /**
-         *    Paints the top of the web page setting the
-         *    title to the name of the starting test.
-         *    @param string $test_name      Name class of test.
-         *    @access public
-         */
-        function paintHeader($test_name) {
-            $this->sendNoCacheHeaders();
-            print "<html>\n<head>\n<title>$test_name</title>\n";
-            print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" .
-                    $this->_character_set . "\">\n";
-            print "<style type=\"text/css\">\n";
-            print $this->_getCss() . "\n";
-            print "</style>\n";
-            print "</head>\n<body>\n";
-            print "<h1>$test_name</h1>\n";
-            flush();
-        }
+		/**
+		 *    Paints the top of the web page setting the
+		 *    title to the name of the starting test.
+		 *    @param string $test_name      Name class of test.
+		 *    @access public
+		 */
+		function paintHeader($test_name) {
+			$this->sendNoCacheHeaders();
+			print "<html>\n<head>\n<title>$test_name</title>\n";
+			print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" .
+					$this->_character_set . "\">\n";
+			print "<style type=\"text/css\">\n";
+			print $this->_getCss() . "\n";
+			print "</style>\n";
+			print "</head>\n<body>\n";
+			print "<h1>$test_name</h1>\n";
+			flush();
+		}
 
-        /**
-         *    Send the headers necessary to ensure the page is
-         *    reloaded on every request. Otherwise you could be
-         *    scratching your head over out of date test data.
-         *    @access public
-         *    @static
-         */
-        static function sendNoCacheHeaders() {
-            if (! headers_sent()) {
-                header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-                header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-                header("Cache-Control: no-store, no-cache, must-revalidate");
-                header("Cache-Control: post-check=0, pre-check=0", false);
-                header("Pragma: no-cache");
-            }
-        }
+		/**
+		 *    Send the headers necessary to ensure the page is
+		 *    reloaded on every request. Otherwise you could be
+		 *    scratching your head over out of date test data.
+		 *    @access public
+		 *    @static
+		 */
+		static function sendNoCacheHeaders() {
+			if (! headers_sent()) {
+				header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+				header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+				header("Cache-Control: no-store, no-cache, must-revalidate");
+				header("Cache-Control: post-check=0, pre-check=0", false);
+				header("Pragma: no-cache");
+			}
+		}
 
-        /**
-         *    Paints the CSS. Add additional styles here.
-         *    @return string            CSS code as text.
-         *    @access protected
-         */
-        function _getCss() {
-            return ".fail { color: red; } pre { background-color: lightgray; }";
-        }
+		/**
+		 *    Paints the CSS. Add additional styles here.
+		 *    @return string            CSS code as text.
+		 *    @access protected
+		 */
+		function _getCss() {
+			return ".fail { color: red; } pre { background-color: lightgray; }";
+		}
 
-        /**
-         *    Paints the end of the test with a summary of
-         *    the passes and failures.
-         *    @param string $test_name        Name class of test.
-         *    @access public
-         */
-        function paintFooter($test_name) {
-            $colour = ($this->getFailCount() + $this->getExceptionCount() > 0 ? "red" : "green");
-            print "<div style=\"";
-            print "padding: 8px; margin-top: 1em; background-color: $colour; color: white;";
-            print "\">";
-            print $this->getTestCaseProgress() . "/" . $this->getTestCaseCount();
-            print " test cases complete:\n";
-            print "<strong>" . $this->getPassCount() . "</strong> passes, ";
-            print "<strong>" . $this->getFailCount() . "</strong> fails and ";
-            print "<strong>" . $this->getExceptionCount() . "</strong> exceptions.";
-            print "</div>\n";
-            print "</body>\n</html>\n";
-        }
+		/**
+		 *    Paints the end of the test with a summary of
+		 *    the passes and failures.
+		 *    @param string $test_name        Name class of test.
+		 *    @access public
+		 */
+		function paintFooter($test_name) {
+			$colour = ($this->getFailCount() + $this->getExceptionCount() > 0 ? "red" : "green");
+			print "<div style=\"";
+			print "padding: 8px; margin-top: 1em; background-color: $colour; color: white;";
+			print "\">";
+			print $this->getTestCaseProgress() . "/" . $this->getTestCaseCount();
+			print " test cases complete:\n";
+			print "<strong>" . $this->getPassCount() . "</strong> passes, ";
+			print "<strong>" . $this->getFailCount() . "</strong> fails and ";
+			print "<strong>" . $this->getExceptionCount() . "</strong> exceptions.";
+			print "</div>\n";
+			print "</body>\n</html>\n";
+		}
 
-        /**
-         *    Paints the test failure with a breadcrumbs
-         *    trail of the nesting test suites below the
-         *    top level test.
-         *    @param string $message    Failure message displayed in
-         *                              the context of the other tests.
-         *    @access public
-         */
-        function paintFail($message) {
-            parent::paintFail($message);
-            print "<span class=\"fail\">Fail</span>: ";
-            $breadcrumb = $this->getTestList();
-            array_shift($breadcrumb);
-            print implode(" -&gt; ", $breadcrumb);
-            print " -&gt; " . $this->_htmlEntities($message) . "<br />\n";
-        }
+		/**
+		 *    Paints the test failure with a breadcrumbs
+		 *    trail of the nesting test suites below the
+		 *    top level test.
+		 *    @param string $message    Failure message displayed in
+		 *                              the context of the other tests.
+		 *    @access public
+		 */
+		function paintFail($message) {
+			parent::paintFail($message);
+			print "<span class=\"fail\">Fail</span>: ";
+			$breadcrumb = $this->getTestList();
+			array_shift($breadcrumb);
+			print implode(" -&gt; ", $breadcrumb);
+			print " -&gt; " . $this->_htmlEntities($message) . "<br />\n";
+		}
 
-        /**
-         *    Paints a PHP error or exception.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         *    @abstract
-         */
-        function paintError($message) {
-            parent::paintError($message);
-            print "<span class=\"fail\">Exception</span>: ";
-            $breadcrumb = $this->getTestList();
-            array_shift($breadcrumb);
-            print implode(" -&gt; ", $breadcrumb);
-            print " -&gt; <strong>" . $this->_htmlEntities($message) . "</strong><br />\n";
-        }
+		/**
+		 *    Paints a PHP error or exception.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 *    @abstract
+		 */
+		function paintError($message) {
+			parent::paintError($message);
+			print "<span class=\"fail\">Exception</span>: ";
+			$breadcrumb = $this->getTestList();
+			array_shift($breadcrumb);
+			print implode(" -&gt; ", $breadcrumb);
+			print " -&gt; <strong>" . $this->_htmlEntities($message) . "</strong><br />\n";
+		}
 
-        /**
-         *    Paints formatted text such as dumped variables.
-         *    @param string $message        Text to show.
-         *    @access public
-         */
-        function paintFormattedMessage($message) {
-            print '<pre>' . $this->_htmlEntities($message) . '</pre>';
-        }
+		/**
+		 *    Paints formatted text such as dumped variables.
+		 *    @param string $message        Text to show.
+		 *    @access public
+		 */
+		function paintFormattedMessage($message) {
+			print '<pre>' . $this->_htmlEntities($message) . '</pre>';
+		}
 
-        /**
-         *    Character set adjusted entity conversion.
-         *    @param string $message    Plain text or Unicode message.
-         *    @return string            Browser readable message.
-         *    @access protected
-         */
-        function _htmlEntities($message) {
-            return htmlentities($message, ENT_COMPAT, $this->_character_set);
-        }
-    }
+		/**
+		 *    Character set adjusted entity conversion.
+		 *    @param string $message    Plain text or Unicode message.
+		 *    @return string            Browser readable message.
+		 *    @access protected
+		 */
+		function _htmlEntities($message) {
+			return htmlentities($message, ENT_COMPAT, $this->_character_set);
+		}
+	}
 
-    /**
-     *    Sample minimal test displayer. Generates only
-     *    failure messages and a pass count. For command
-     *    line use. I've tried to make it look like JUnit,
-     *    but I wanted to output the errors as they arrived
-     *    which meant dropping the dots.
+	/**
+	 *    Sample minimal test displayer. Generates only
+	 *    failure messages and a pass count. For command
+	 *    line use. I've tried to make it look like JUnit,
+	 *    but I wanted to output the errors as they arrived
+	 *    which meant dropping the dots.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class TextReporter extends SimpleReporter {
+	 */
+	class TextReporter extends SimpleReporter {
 
-        /**
-         *    Does nothing yet. The first output will
-         *    be sent on the first test start.
-         *    @access public
-         */
-        function TextReporter() {
-            $this->SimpleReporter();
-        }
+		/**
+		 *    Does nothing yet. The first output will
+		 *    be sent on the first test start.
+		 *    @access public
+		 */
+		function TextReporter() {
+			$this->SimpleReporter();
+		}
 
-        /**
-         *    Paints the title only.
-         *    @param string $test_name        Name class of test.
-         *    @access public
-         */
-        function paintHeader($test_name) {
-            if (! SimpleReporter::inCli()) {
-                header('Content-type: text/plain');
-            }
-            print "$test_name\n";
-            flush();
-        }
+		/**
+		 *    Paints the title only.
+		 *    @param string $test_name        Name class of test.
+		 *    @access public
+		 */
+		function paintHeader($test_name) {
+			if (! SimpleReporter::inCli()) {
+				header('Content-type: text/plain');
+			}
+			print "$test_name\n";
+			flush();
+		}
 
-        /**
-         *    Paints the end of the test with a summary of
-         *    the passes and failures.
-         *    @param string $test_name        Name class of test.
-         *    @access public
-         */
-        function paintFooter($test_name) {
-            if ($this->getFailCount() + $this->getExceptionCount() == 0) {
-                print "OK\n";
-            } else {
-                print "FAILURES!!!\n";
-            }
-            print "Test cases run: " . $this->getTestCaseProgress() .
-                    "/" . $this->getTestCaseCount() .
-                    ", Passes: " . $this->getPassCount() .
-                    ", Failures: " . $this->getFailCount() .
-                    ", Exceptions: " . $this->getExceptionCount() . "\n";
-        }
+		/**
+		 *    Paints the end of the test with a summary of
+		 *    the passes and failures.
+		 *    @param string $test_name        Name class of test.
+		 *    @access public
+		 */
+		function paintFooter($test_name) {
+			if ($this->getFailCount() + $this->getExceptionCount() == 0) {
+				print "OK\n";
+			} else {
+				print "FAILURES!!!\n";
+			}
+			print "Test cases run: " . $this->getTestCaseProgress() .
+					"/" . $this->getTestCaseCount() .
+					", Passes: " . $this->getPassCount() .
+					", Failures: " . $this->getFailCount() .
+					", Exceptions: " . $this->getExceptionCount() . "\n";
+		}
 
-        /**
-         *    Paints the test failure as a stack trace.
-         *    @param string $message    Failure message displayed in
-         *                              the context of the other tests.
-         *    @access public
-         */
-        function paintFail($message) {
-            parent::paintFail($message);
-            print $this->getFailCount() . ") $message\n";
-            $breadcrumb = $this->getTestList();
-            array_shift($breadcrumb);
-            print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
-            print "\n";
-        }
+		/**
+		 *    Paints the test failure as a stack trace.
+		 *    @param string $message    Failure message displayed in
+		 *                              the context of the other tests.
+		 *    @access public
+		 */
+		function paintFail($message) {
+			parent::paintFail($message);
+			print $this->getFailCount() . ") $message\n";
+			$breadcrumb = $this->getTestList();
+			array_shift($breadcrumb);
+			print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+			print "\n";
+		}
 
-        /**
-         *    Paints a PHP error or exception.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         *    @abstract
-         */
-        function paintError($message) {
-            parent::paintError($message);
-            print "Exception " . $this->getExceptionCount() . "!\n$message\n";
-        }
+		/**
+		 *    Paints a PHP error or exception.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 *    @abstract
+		 */
+		function paintError($message) {
+			parent::paintError($message);
+			print "Exception " . $this->getExceptionCount() . "!\n$message\n";
+		}
 
-        /**
-         *    Paints formatted text such as dumped variables.
-         *    @param string $message        Text to show.
-         *    @access public
-         */
-        function paintFormattedMessage($message) {
-            print "$message\n";
-            flush();
-        }
-    }
+		/**
+		 *    Paints formatted text such as dumped variables.
+		 *    @param string $message        Text to show.
+		 *    @access public
+		 */
+		function paintFormattedMessage($message) {
+			print "$message\n";
+			flush();
+		}
+	}
 
-    /**
-     *    Runs just a single test group, a single case or
-     *    even a single test within that case.
+	/**
+	 *    Runs just a single test group, a single case or
+	 *    even a single test within that case.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SelectiveReporter extends SimpleReporterDecorator {
-        protected $_just_this_case =false;
-        protected $_just_this_test = false;
-        protected $_within_test_case = true;
+	 */
+	class SelectiveReporter extends SimpleReporterDecorator {
+		protected $_just_this_case =false;
+		protected $_just_this_test = false;
+		protected $_within_test_case = true;
 
-        /**
-         *    Selects the test case or group to be run,
-         *    and optionally a specific test.
-         *    @param SimpleScorer $reporter    Reporter to receive events.
-         *    @param string $just_this_case    Only this case or group will run.
-         *    @param string $just_this_test    Only this test method will run.
-         */
-        function SelectiveReporter($reporter, $just_this_case = false, $just_this_test = false) {
-            if (isset($just_this_case) && $just_this_case) {
-                $this->_just_this_case = strtolower($just_this_case);
-                $this->_within_test_case = false;
-            }
-            if (isset($just_this_test) && $just_this_test) {
-                $this->_just_this_test = strtolower($just_this_test);
-            }
-            $this->SimpleReporterDecorator($reporter);
-        }
+		/**
+		 *    Selects the test case or group to be run,
+		 *    and optionally a specific test.
+		 *    @param SimpleScorer $reporter    Reporter to receive events.
+		 *    @param string $just_this_case    Only this case or group will run.
+		 *    @param string $just_this_test    Only this test method will run.
+		 */
+		function SelectiveReporter($reporter, $just_this_case = false, $just_this_test = false) {
+			if (isset($just_this_case) && $just_this_case) {
+				$this->_just_this_case = strtolower($just_this_case);
+				$this->_within_test_case = false;
+			}
+			if (isset($just_this_test) && $just_this_test) {
+				$this->_just_this_test = strtolower($just_this_test);
+			}
+			$this->SimpleReporterDecorator($reporter);
+		}
 
-        /**
-         *    Compares criteria to actual the case/group name.
-         *    @param string $test_case    The incoming test.
-         *    @return boolean             True if matched.
-         *    @access protected
-         */
-        function _isCaseMatch($test_case) {
-            if ($this->_just_this_case) {
-                return $this->_just_this_case == strtolower($test_case);
-            }
-            return false;
-        }
+		/**
+		 *    Compares criteria to actual the case/group name.
+		 *    @param string $test_case    The incoming test.
+		 *    @return boolean             True if matched.
+		 *    @access protected
+		 */
+		function _isCaseMatch($test_case) {
+			if ($this->_just_this_case) {
+				return $this->_just_this_case == strtolower($test_case);
+			}
+			return false;
+		}
 
-        /**
-         *    Compares criteria to actual the test name.
-         *    @param string $method       The incoming test method.
-         *    @return boolean             True if matched.
-         *    @access protected
-         */
-        function _isTestMatch($method) {
-            if ($this->_just_this_test) {
-                return $this->_just_this_test == strtolower($method);
-            }
-            return true;
-        }
+		/**
+		 *    Compares criteria to actual the test name.
+		 *    @param string $method       The incoming test method.
+		 *    @return boolean             True if matched.
+		 *    @access protected
+		 */
+		function _isTestMatch($method) {
+			if ($this->_just_this_test) {
+				return $this->_just_this_test == strtolower($method);
+			}
+			return true;
+		}
 
-        /**
-         *    Veto everything that doesn't match the method wanted.
-         *    @param string $test_case       Name of test case.
-         *    @param string $method          Name of test method.
-         *    @return boolean                True if test should be run.
-         *    @access public
-         */
-        function shouldInvoke($test_case, $method) {
-            if ($this->_within_test_case && $this->_isTestMatch($method)) {
-                return $this->_reporter->shouldInvoke($test_case, $method);
-            }
-            return false;
-        }
+		/**
+		 *    Veto everything that doesn't match the method wanted.
+		 *    @param string $test_case       Name of test case.
+		 *    @param string $method          Name of test method.
+		 *    @return boolean                True if test should be run.
+		 *    @access public
+		 */
+		function shouldInvoke($test_case, $method) {
+			if ($this->_within_test_case && $this->_isTestMatch($method)) {
+				return $this->_reporter->shouldInvoke($test_case, $method);
+			}
+			return false;
+		}
 
-        /**
-         *    Paints the start of a group test.
-         *    @param string $test_case     Name of test or other label.
-         *    @param integer $size         Number of test cases starting.
-         *    @access public
-         */
-        function paintGroupStart($test_case, $size) {
-            if ($this->_isCaseMatch($test_case)) {
-                $this->_within_test_case = true;
-            }
-            if ($this->_within_test_case) {
-                $this->_reporter->paintGroupStart($test_case, $size);
-            }
-        }
+		/**
+		 *    Paints the start of a group test.
+		 *    @param string $test_case     Name of test or other label.
+		 *    @param integer $size         Number of test cases starting.
+		 *    @access public
+		 */
+		function paintGroupStart($test_case, $size) {
+			if ($this->_isCaseMatch($test_case)) {
+				$this->_within_test_case = true;
+			}
+			if ($this->_within_test_case) {
+				$this->_reporter->paintGroupStart($test_case, $size);
+			}
+		}
 
-        /**
-         *    Paints the end of a group test.
-         *    @param string $test_case     Name of test or other label.
-         *    @access public
-         */
-        function paintGroupEnd($test_case) {
-            if ($this->_within_test_case) {
-                $this->_reporter->paintGroupEnd($test_case);
-            }
-            if ($this->_isCaseMatch($test_case)) {
-                $this->_within_test_case = false;
-            }
-        }
+		/**
+		 *    Paints the end of a group test.
+		 *    @param string $test_case     Name of test or other label.
+		 *    @access public
+		 */
+		function paintGroupEnd($test_case) {
+			if ($this->_within_test_case) {
+				$this->_reporter->paintGroupEnd($test_case);
+			}
+			if ($this->_isCaseMatch($test_case)) {
+				$this->_within_test_case = false;
+			}
+		}
 
-        /**
-         *    Paints the start of a test case.
-         *    @param string $test_case     Name of test or other label.
-         *    @access public
-         */
-        function paintCaseStart($test_case) {
-            if ($this->_isCaseMatch($test_case)) {
-                $this->_within_test_case = true;
-            }
-            if ($this->_within_test_case) {
-                $this->_reporter->paintCaseStart($test_case);
-            }
-        }
+		/**
+		 *    Paints the start of a test case.
+		 *    @param string $test_case     Name of test or other label.
+		 *    @access public
+		 */
+		function paintCaseStart($test_case) {
+			if ($this->_isCaseMatch($test_case)) {
+				$this->_within_test_case = true;
+			}
+			if ($this->_within_test_case) {
+				$this->_reporter->paintCaseStart($test_case);
+			}
+		}
 
-        /**
-         *    Paints the end of a test case.
-         *    @param string $test_case     Name of test or other label.
-         *    @access public
-         */
-        function paintCaseEnd($test_case) {
-            if ($this->_within_test_case) {
-                $this->_reporter->paintCaseEnd($test_case);
-            }
-            if ($this->_isCaseMatch($test_case)) {
-                $this->_within_test_case = false;
-            }
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Paints the end of a test case.
+		 *    @param string $test_case     Name of test or other label.
+		 *    @access public
+		 */
+		function paintCaseEnd($test_case) {
+			if ($this->_within_test_case) {
+				$this->_reporter->paintCaseEnd($test_case);
+			}
+			if ($this->_isCaseMatch($test_case)) {
+				$this->_within_test_case = false;
+			}
+		}
+	}
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
          *    @static
          */
         static function sendNoCacheHeaders() {
-            if (! headers_sent()) {
+            if (!headers_sent()) {
                 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
                 header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
                 header("Cache-Control: no-store, no-cache, must-revalidate");
@@ -175,7 +175,7 @@ 
          *    @access public
          */
         function paintHeader($test_name) {
-            if (! SimpleReporter::inCli()) {
+            if (!SimpleReporter::inCli()) {
                 header('Content-type: text/plain');
             }
             print "$test_name\n";
@@ -245,7 +245,7 @@ 
 	 *	  @subpackage UnitTester
      */
     class SelectiveReporter extends SimpleReporterDecorator {
-        protected $_just_this_case =false;
+        protected $_just_this_case = false;
         protected $_just_this_test = false;
         protected $_within_test_case = true;
 

tests/test_tools/simpletest/socket.php

Indentation +207 added lines, -207 removed lines

@@ -1,215 +1,215 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	MockObjects
-     *	@version	$Id: socket.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	MockObjects
+	 *	@version	$Id: socket.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      * include SimpleTest files
      */
-    require_once(dirname(__FILE__) . '/compatibility.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/compatibility.php');
+	/**#@-*/
 
-    /**
-     *    Stashes an error for later. Useful for constructors
-     *    until PHP gets exceptions.
+	/**
+	 *    Stashes an error for later. Useful for constructors
+	 *    until PHP gets exceptions.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleStickyError {
-        protected $_error = 'Constructor not chained';
-
-        /**
-         *    Sets the error to empty.
-         *    @access public
-         */
-        function SimpleStickyError() {
-            $this->_clearError();
-        }
-
-        /**
-         *    Test for an outstanding error.
-         *    @return boolean           True if there is an error.
-         *    @access public
-         */
-        function isError() {
-            return ($this->_error != '');
-        }
-
-        /**
-         *    Accessor for an outstanding error.
-         *    @return string     Empty string if no error otherwise
-         *                       the error message.
-         *    @access public
-         */
-        function getError() {
-            return $this->_error;
-        }
-
-        /**
-         *    Sets the internal error.
-         *    @param string       Error message to stash.
-         *    @access protected
-         */
-        function _setError($error) {
-            $this->_error = $error;
-        }
-
-        /**
-         *    Resets the error state to no error.
-         *    @access protected
-         */
-        function _clearError() {
-            $this->_setError('');
-        }
-    }
-
-    /**
-     *    Wrapper for TCP/IP socket.
-     *    @package SimpleTest
-     *    @subpackage WebTester
-     */
-    class SimpleSocket extends SimpleStickyError {
-        protected $_handle;
-        protected $_is_open = false;
-        protected $_sent = '';
-        public $lock_size;
-
-        /**
-         *    Opens a socket for reading and writing.
-         *    @param string $host          Hostname to send request to.
-         *    @param integer $port         Port on remote machine to open.
-         *    @param integer $timeout      Connection timeout in seconds.
-         *    @param integer $block_size   Size of chunk to read.
-         *    @access public
-         */
-        function SimpleSocket($host, $port, $timeout, $block_size = 255) {
-            $this->SimpleStickyError();
-            if (! ($this->_handle = $this->_openSocket($host, $port, $error_number, $error, $timeout))) {
-                $this->_setError("Cannot open [$host:$port] with [$error] within [$timeout] seconds");
-                return;
-            }
-            $this->_is_open = true;
-            $this->_block_size = $block_size;
-            SimpleTestCompatibility::setTimeout($this->_handle, $timeout);
-        }
-
-        /**
-         *    Writes some data to the socket and saves alocal copy.
-         *    @param string $message       String to send to socket.
-         *    @return boolean              True if successful.
-         *    @access public
-         */
-        function write($message) {
-            if ($this->isError() || ! $this->isOpen()) {
-                return false;
-            }
-            $count = fwrite($this->_handle, $message);
-            if (! $count) {
-                if ($count === false) {
-                    $this->_setError('Cannot write to socket');
-                    $this->close();
-                }
-                return false;
-            }
-            fflush($this->_handle);
-            $this->_sent .= $message;
-            return true;
-        }
-
-        /**
-         *    Reads data from the socket. The error suppresion
-         *    is a workaround for PHP4 always throwing a warning
-         *    with a secure socket.
-         *    @return integer/boolean           Incoming bytes. False
-         *                                     on error.
-         *    @access public
-         */
-        function read() {
-            if ($this->isError() || ! $this->isOpen()) {
-                return false;
-            }
-            $raw = @fread($this->_handle, $this->_block_size);
-            if ($raw === false) {
-                $this->_setError('Cannot read from socket');
-                $this->close();
-            }
-            return $raw;
-        }
-
-        /**
-         *    Accessor for socket open state.
-         *    @return boolean           True if open.
-         *    @access public
-         */
-        function isOpen() {
-            return $this->_is_open;
-        }
-
-        /**
-         *    Closes the socket preventing further reads.
-         *    Cannot be reopened once closed.
-         *    @return boolean           True if successful.
-         *    @access public
-         */
-        function close() {
-            $this->_is_open = false;
-            return fclose($this->_handle);
-        }
-
-        /**
-         *    Accessor for content so far.
-         *    @return string        Bytes sent only.
-         *    @access public
-         */
-        function getSent() {
-            return $this->_sent;
-        }
-
-        /**
-         *    Actually opens the low level socket.
-         *    @param string $host          Host to connect to.
-         *    @param integer $port         Port on host.
-         *    @param integer $error_number Recipient of error code.
-         *    @param string $error         Recipoent of error message.
-         *    @param integer $timeout      Maximum time to wait for connection.
-         *    @access protected
-         */
-        function _openSocket($host, $port, $error_number, $error, $timeout) {
-            return @fsockopen($host, $port, $error_number, $error, $timeout);
-        }
-    }
-
-    /**
-     *    Wrapper for TCP/IP socket over TLS.
+	 */
+	class SimpleStickyError {
+		protected $_error = 'Constructor not chained';
+
+		/**
+		 *    Sets the error to empty.
+		 *    @access public
+		 */
+		function SimpleStickyError() {
+			$this->_clearError();
+		}
+
+		/**
+		 *    Test for an outstanding error.
+		 *    @return boolean           True if there is an error.
+		 *    @access public
+		 */
+		function isError() {
+			return ($this->_error != '');
+		}
+
+		/**
+		 *    Accessor for an outstanding error.
+		 *    @return string     Empty string if no error otherwise
+		 *                       the error message.
+		 *    @access public
+		 */
+		function getError() {
+			return $this->_error;
+		}
+
+		/**
+		 *    Sets the internal error.
+		 *    @param string       Error message to stash.
+		 *    @access protected
+		 */
+		function _setError($error) {
+			$this->_error = $error;
+		}
+
+		/**
+		 *    Resets the error state to no error.
+		 *    @access protected
+		 */
+		function _clearError() {
+			$this->_setError('');
+		}
+	}
+
+	/**
+	 *    Wrapper for TCP/IP socket.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleSecureSocket extends SimpleSocket {
-
-        /**
-         *    Opens a secure socket for reading and writing.
-         *    @param string $host      Hostname to send request to.
-         *    @param integer $port     Port on remote machine to open.
-         *    @param integer $timeout  Connection timeout in seconds.
-         *    @access public
-         */
-        function SimpleSecureSocket($host, $port, $timeout) {
-            $this->SimpleSocket($host, $port, $timeout);
-        }
-
-        /**
-         *    Actually opens the low level socket.
-         *    @param string $host          Host to connect to.
-         *    @param integer $port         Port on host.
-         *    @param integer $error_number Recipient of error code.
-         *    @param string $error         Recipient of error message.
-         *    @param integer $timeout      Maximum time to wait for connection.
-         *    @access protected
-         */
-        function _openSocket($host, $port, $error_number, $error, $timeout) {
-            return parent::_openSocket("tls://$host", $port, $error_number, $error, $timeout);
-        }
-    }
\ No newline at end of file
+	 */
+	class SimpleSocket extends SimpleStickyError {
+		protected $_handle;
+		protected $_is_open = false;
+		protected $_sent = '';
+		public $lock_size;
+
+		/**
+		 *    Opens a socket for reading and writing.
+		 *    @param string $host          Hostname to send request to.
+		 *    @param integer $port         Port on remote machine to open.
+		 *    @param integer $timeout      Connection timeout in seconds.
+		 *    @param integer $block_size   Size of chunk to read.
+		 *    @access public
+		 */
+		function SimpleSocket($host, $port, $timeout, $block_size = 255) {
+			$this->SimpleStickyError();
+			if (! ($this->_handle = $this->_openSocket($host, $port, $error_number, $error, $timeout))) {
+				$this->_setError("Cannot open [$host:$port] with [$error] within [$timeout] seconds");
+				return;
+			}
+			$this->_is_open = true;
+			$this->_block_size = $block_size;
+			SimpleTestCompatibility::setTimeout($this->_handle, $timeout);
+		}
+
+		/**
+		 *    Writes some data to the socket and saves alocal copy.
+		 *    @param string $message       String to send to socket.
+		 *    @return boolean              True if successful.
+		 *    @access public
+		 */
+		function write($message) {
+			if ($this->isError() || ! $this->isOpen()) {
+				return false;
+			}
+			$count = fwrite($this->_handle, $message);
+			if (! $count) {
+				if ($count === false) {
+					$this->_setError('Cannot write to socket');
+					$this->close();
+				}
+				return false;
+			}
+			fflush($this->_handle);
+			$this->_sent .= $message;
+			return true;
+		}
+
+		/**
+		 *    Reads data from the socket. The error suppresion
+		 *    is a workaround for PHP4 always throwing a warning
+		 *    with a secure socket.
+		 *    @return integer/boolean           Incoming bytes. False
+		 *                                     on error.
+		 *    @access public
+		 */
+		function read() {
+			if ($this->isError() || ! $this->isOpen()) {
+				return false;
+			}
+			$raw = @fread($this->_handle, $this->_block_size);
+			if ($raw === false) {
+				$this->_setError('Cannot read from socket');
+				$this->close();
+			}
+			return $raw;
+		}
+
+		/**
+		 *    Accessor for socket open state.
+		 *    @return boolean           True if open.
+		 *    @access public
+		 */
+		function isOpen() {
+			return $this->_is_open;
+		}
+
+		/**
+		 *    Closes the socket preventing further reads.
+		 *    Cannot be reopened once closed.
+		 *    @return boolean           True if successful.
+		 *    @access public
+		 */
+		function close() {
+			$this->_is_open = false;
+			return fclose($this->_handle);
+		}
+
+		/**
+		 *    Accessor for content so far.
+		 *    @return string        Bytes sent only.
+		 *    @access public
+		 */
+		function getSent() {
+			return $this->_sent;
+		}
+
+		/**
+		 *    Actually opens the low level socket.
+		 *    @param string $host          Host to connect to.
+		 *    @param integer $port         Port on host.
+		 *    @param integer $error_number Recipient of error code.
+		 *    @param string $error         Recipoent of error message.
+		 *    @param integer $timeout      Maximum time to wait for connection.
+		 *    @access protected
+		 */
+		function _openSocket($host, $port, $error_number, $error, $timeout) {
+			return @fsockopen($host, $port, $error_number, $error, $timeout);
+		}
+	}
+
+	/**
+	 *    Wrapper for TCP/IP socket over TLS.
+	 *    @package SimpleTest
+	 *    @subpackage WebTester
+	 */
+	class SimpleSecureSocket extends SimpleSocket {
+
+		/**
+		 *    Opens a secure socket for reading and writing.
+		 *    @param string $host      Hostname to send request to.
+		 *    @param integer $port     Port on remote machine to open.
+		 *    @param integer $timeout  Connection timeout in seconds.
+		 *    @access public
+		 */
+		function SimpleSecureSocket($host, $port, $timeout) {
+			$this->SimpleSocket($host, $port, $timeout);
+		}
+
+		/**
+		 *    Actually opens the low level socket.
+		 *    @param string $host          Host to connect to.
+		 *    @param integer $port         Port on host.
+		 *    @param integer $error_number Recipient of error code.
+		 *    @param string $error         Recipient of error message.
+		 *    @param integer $timeout      Maximum time to wait for connection.
+		 *    @access protected
+		 */
+		function _openSocket($host, $port, $error_number, $error, $timeout) {
+			return parent::_openSocket("tls://$host", $port, $error_number, $error, $timeout);
+		}
+	}
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -87,7 +87,7 @@ 
          */
         function SimpleSocket($host, $port, $timeout, $block_size = 255) {
             $this->SimpleStickyError();
-            if (! ($this->_handle = $this->_openSocket($host, $port, $error_number, $error, $timeout))) {
+            if (!($this->_handle = $this->_openSocket($host, $port, $error_number, $error, $timeout))) {
                 $this->_setError("Cannot open [$host:$port] with [$error] within [$timeout] seconds");
                 return;
             }
@@ -103,11 +103,11 @@ 
          *    @access public
          */
         function write($message) {
-            if ($this->isError() || ! $this->isOpen()) {
+            if ($this->isError() || !$this->isOpen()) {
                 return false;
             }
             $count = fwrite($this->_handle, $message);
-            if (! $count) {
+            if (!$count) {
                 if ($count === false) {
                     $this->_setError('Cannot write to socket');
                     $this->close();
@@ -128,7 +128,7 @@ 
          *    @access public
          */
         function read() {
-            if ($this->isError() || ! $this->isOpen()) {
+            if ($this->isError() || !$this->isOpen()) {
                 return false;
             }
             $raw = @fread($this->_handle, $this->_block_size);

tests/test_tools/simpletest/dumper.php

Indentation +378 added lines, -378 removed lines

@@ -1,401 +1,401 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: dumper.php 1532 2006-12-01 12:28:55Z xue $
-     */
-    /**
-     * does type matter
-     */
-    if (! defined('TYPE_MATTERS')) {
-        define('TYPE_MATTERS', true);
-    }
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: dumper.php 1532 2006-12-01 12:28:55Z xue $
+	 */
+	/**
+	 * does type matter
+	 */
+	if (! defined('TYPE_MATTERS')) {
+		define('TYPE_MATTERS', true);
+	}
 
-    /**
-     *    Displays variables as text and does diffs.
+	/**
+	 *    Displays variables as text and does diffs.
 	 *	  @package	SimpleTest
 	 *	  @subpackage	UnitTester
-     */
-    class SimpleDumper {
+	 */
+	class SimpleDumper {
 
-        /**
-         *    Renders a variable in a shorter form than print_r().
-         *    @param mixed $value      Variable to render as a string.
-         *    @return string           Human readable string form.
-         *    @access public
-         */
-        function describeValue($value) {
-            $type = $this->getType($value);
-            switch($type) {
-                case "Null":
-                    return "NULL";
-                case "Boolean":
-                    return "Boolean: " . ($value ? "true" : "false");
-                case "Array":
-                    return "Array: " . count($value) . " items";
-                case "Object":
-                    return "Object: of " . get_class($value);
-                case "String":
-                    return "String: " . $this->clipString($value, 200);
-                default:
-                    return "$type: $value";
-            }
-            return "Unknown";
-        }
+		/**
+		 *    Renders a variable in a shorter form than print_r().
+		 *    @param mixed $value      Variable to render as a string.
+		 *    @return string           Human readable string form.
+		 *    @access public
+		 */
+		function describeValue($value) {
+			$type = $this->getType($value);
+			switch($type) {
+				case "Null":
+					return "NULL";
+				case "Boolean":
+					return "Boolean: " . ($value ? "true" : "false");
+				case "Array":
+					return "Array: " . count($value) . " items";
+				case "Object":
+					return "Object: of " . get_class($value);
+				case "String":
+					return "String: " . $this->clipString($value, 200);
+				default:
+					return "$type: $value";
+			}
+			return "Unknown";
+		}
 
-        /**
-         *    Gets the string representation of a type.
-         *    @param mixed $value    Variable to check against.
-         *    @return string         Type.
-         *    @access public
-         */
-        function getType($value) {
-            if (! isset($value)) {
-                return "Null";
-            } elseif (is_bool($value)) {
-                return "Boolean";
-            } elseif (is_string($value)) {
-                return "String";
-            } elseif (is_integer($value)) {
-                return "Integer";
-            } elseif (is_float($value)) {
-                return "Float";
-            } elseif (is_array($value)) {
-                return "Array";
-            } elseif (is_resource($value)) {
-                return "Resource";
-            } elseif (is_object($value)) {
-                return "Object";
-            }
-            return "Unknown";
-        }
+		/**
+		 *    Gets the string representation of a type.
+		 *    @param mixed $value    Variable to check against.
+		 *    @return string         Type.
+		 *    @access public
+		 */
+		function getType($value) {
+			if (! isset($value)) {
+				return "Null";
+			} elseif (is_bool($value)) {
+				return "Boolean";
+			} elseif (is_string($value)) {
+				return "String";
+			} elseif (is_integer($value)) {
+				return "Integer";
+			} elseif (is_float($value)) {
+				return "Float";
+			} elseif (is_array($value)) {
+				return "Array";
+			} elseif (is_resource($value)) {
+				return "Resource";
+			} elseif (is_object($value)) {
+				return "Object";
+			}
+			return "Unknown";
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between two variables. Uses a
-         *    dynamic call.
-         *    @param mixed $first        First variable.
-         *    @param mixed $second       Value to compare with.
-         *    @param boolean $identical  If true then type anomolies count.
-         *    @return string             Description of difference.
-         *    @access public
-         */
-        function describeDifference($first, $second, $identical = false) {
-            if ($identical) {
-                if (! $this->_isTypeMatch($first, $second)) {
-                    return "with type mismatch as [" . $this->describeValue($first) .
-                        "] does not match [" . $this->describeValue($second) . "]";
-                }
-            }
-            $type = $this->getType($first);
-            if ($type == "Unknown") {
-                return "with unknown type";
-            }
-            $method = '_describe' . $type . 'Difference';
-            return $this->$method($first, $second, $identical);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between two variables. Uses a
+		 *    dynamic call.
+		 *    @param mixed $first        First variable.
+		 *    @param mixed $second       Value to compare with.
+		 *    @param boolean $identical  If true then type anomolies count.
+		 *    @return string             Description of difference.
+		 *    @access public
+		 */
+		function describeDifference($first, $second, $identical = false) {
+			if ($identical) {
+				if (! $this->_isTypeMatch($first, $second)) {
+					return "with type mismatch as [" . $this->describeValue($first) .
+						"] does not match [" . $this->describeValue($second) . "]";
+				}
+			}
+			$type = $this->getType($first);
+			if ($type == "Unknown") {
+				return "with unknown type";
+			}
+			$method = '_describe' . $type . 'Difference';
+			return $this->$method($first, $second, $identical);
+		}
 
-        /**
-         *    Tests to see if types match.
-         *    @param mixed $first        First variable.
-         *    @param mixed $second       Value to compare with.
-         *    @return boolean            True if matches.
-         *    @access private
-         */
-        function _isTypeMatch($first, $second) {
-            return ($this->getType($first) == $this->getType($second));
-        }
+		/**
+		 *    Tests to see if types match.
+		 *    @param mixed $first        First variable.
+		 *    @param mixed $second       Value to compare with.
+		 *    @return boolean            True if matches.
+		 *    @access private
+		 */
+		function _isTypeMatch($first, $second) {
+			return ($this->getType($first) == $this->getType($second));
+		}
 
-        /**
-         *    Clips a string to a maximum length.
-         *    @param string $value         String to truncate.
-         *    @param integer $size         Minimum string size to show.
-         *    @param integer $position     Centre of string section.
-         *    @return string               Shortened version.
-         *    @access public
-         */
-        function clipString($value, $size, $position = 0) {
-            $length = strlen($value);
-            if ($length <= $size) {
-                return $value;
-            }
-            $position = min($position, $length);
-            $start = ($size/2 > $position ? 0 : $position - $size/2);
-            if ($start + $size > $length) {
-                $start = $length - $size;
-            }
-            $value = substr($value, $start, $size);
-            return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
-        }
+		/**
+		 *    Clips a string to a maximum length.
+		 *    @param string $value         String to truncate.
+		 *    @param integer $size         Minimum string size to show.
+		 *    @param integer $position     Centre of string section.
+		 *    @return string               Shortened version.
+		 *    @access public
+		 */
+		function clipString($value, $size, $position = 0) {
+			$length = strlen($value);
+			if ($length <= $size) {
+				return $value;
+			}
+			$position = min($position, $length);
+			$start = ($size/2 > $position ? 0 : $position - $size/2);
+			if ($start + $size > $length) {
+				$start = $length - $size;
+			}
+			$value = substr($value, $start, $size);
+			return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between two variables. The minimal
-         *    version.
-         *    @param null $first          First value.
-         *    @param mixed $second        Value to compare with.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeGenericDifference($first, $second) {
-            return "as [" . $this->describeValue($first) .
-                    "] does not match [" .
-                    $this->describeValue($second) . "]";
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between two variables. The minimal
+		 *    version.
+		 *    @param null $first          First value.
+		 *    @param mixed $second        Value to compare with.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeGenericDifference($first, $second) {
+			return "as [" . $this->describeValue($first) .
+					"] does not match [" .
+					$this->describeValue($second) . "]";
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between a null and another variable.
-         *    @param null $first          First null.
-         *    @param mixed $second        Null to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeNullDifference($first, $second, $identical) {
-            return $this->_describeGenericDifference($first, $second);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between a null and another variable.
+		 *    @param null $first          First null.
+		 *    @param mixed $second        Null to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeNullDifference($first, $second, $identical) {
+			return $this->_describeGenericDifference($first, $second);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between a boolean and another variable.
-         *    @param boolean $first       First boolean.
-         *    @param mixed $second        Boolean to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeBooleanDifference($first, $second, $identical) {
-            return $this->_describeGenericDifference($first, $second);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between a boolean and another variable.
+		 *    @param boolean $first       First boolean.
+		 *    @param mixed $second        Boolean to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeBooleanDifference($first, $second, $identical) {
+			return $this->_describeGenericDifference($first, $second);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between a string and another variable.
-         *    @param string $first        First string.
-         *    @param mixed $second        String to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeStringDifference($first, $second, $identical) {
-            if (is_object($second) || is_array($second)) {
-                return $this->_describeGenericDifference($first, $second);
-            }
-            $position = $this->_stringDiffersAt($first, $second);
-            $message = "at character $position";
-            $message .= " with [" .
-                    $this->clipString($first, 200, $position) . "] and [" .
-                    $this->clipString($second, 200, $position) . "]";
-            return $message;
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between a string and another variable.
+		 *    @param string $first        First string.
+		 *    @param mixed $second        String to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeStringDifference($first, $second, $identical) {
+			if (is_object($second) || is_array($second)) {
+				return $this->_describeGenericDifference($first, $second);
+			}
+			$position = $this->_stringDiffersAt($first, $second);
+			$message = "at character $position";
+			$message .= " with [" .
+					$this->clipString($first, 200, $position) . "] and [" .
+					$this->clipString($second, 200, $position) . "]";
+			return $message;
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between an integer and another variable.
-         *    @param integer $first       First number.
-         *    @param mixed $second        Number to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeIntegerDifference($first, $second, $identical) {
-            if (is_object($second) || is_array($second)) {
-                return $this->_describeGenericDifference($first, $second);
-            }
-            return "because [" . $this->describeValue($first) .
-                    "] differs from [" .
-                    $this->describeValue($second) . "] by " .
-                    abs($first - $second);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between an integer and another variable.
+		 *    @param integer $first       First number.
+		 *    @param mixed $second        Number to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeIntegerDifference($first, $second, $identical) {
+			if (is_object($second) || is_array($second)) {
+				return $this->_describeGenericDifference($first, $second);
+			}
+			return "because [" . $this->describeValue($first) .
+					"] differs from [" .
+					$this->describeValue($second) . "] by " .
+					abs($first - $second);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between two floating point numbers.
-         *    @param float $first         First float.
-         *    @param mixed $second        Float to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeFloatDifference($first, $second, $identical) {
-            if (is_object($second) || is_array($second)) {
-                return $this->_describeGenericDifference($first, $second);
-            }
-            return "because [" . $this->describeValue($first) .
-                    "] differs from [" .
-                    $this->describeValue($second) . "] by " .
-                    abs($first - $second);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between two floating point numbers.
+		 *    @param float $first         First float.
+		 *    @param mixed $second        Float to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeFloatDifference($first, $second, $identical) {
+			if (is_object($second) || is_array($second)) {
+				return $this->_describeGenericDifference($first, $second);
+			}
+			return "because [" . $this->describeValue($first) .
+					"] differs from [" .
+					$this->describeValue($second) . "] by " .
+					abs($first - $second);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between two arrays.
-         *    @param array $first         First array.
-         *    @param mixed $second        Array to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeArrayDifference($first, $second, $identical) {
-            if (! is_array($second)) {
-                return $this->_describeGenericDifference($first, $second);
-            }
-            if (! $this->_isMatchingKeys($first, $second, $identical)) {
-                return "as key list [" .
-                        implode(", ", array_keys($first)) . "] does not match key list [" .
-                        implode(", ", array_keys($second)) . "]";
-            }
-            foreach (array_keys($first) as $key) {
-                if ($identical && ($first[$key] === $second[$key])) {
-                    continue;
-                }
-                if (! $identical && ($first[$key] == $second[$key])) {
-                    continue;
-                }
-                return "with member [$key] " . $this->describeDifference(
-                        $first[$key],
-                        $second[$key],
-                        $identical);
-            }
-            return "";
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between two arrays.
+		 *    @param array $first         First array.
+		 *    @param mixed $second        Array to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeArrayDifference($first, $second, $identical) {
+			if (! is_array($second)) {
+				return $this->_describeGenericDifference($first, $second);
+			}
+			if (! $this->_isMatchingKeys($first, $second, $identical)) {
+				return "as key list [" .
+						implode(", ", array_keys($first)) . "] does not match key list [" .
+						implode(", ", array_keys($second)) . "]";
+			}
+			foreach (array_keys($first) as $key) {
+				if ($identical && ($first[$key] === $second[$key])) {
+					continue;
+				}
+				if (! $identical && ($first[$key] == $second[$key])) {
+					continue;
+				}
+				return "with member [$key] " . $this->describeDifference(
+						$first[$key],
+						$second[$key],
+						$identical);
+			}
+			return "";
+		}
 
-        /**
-         *    Compares two arrays to see if their key lists match.
-         *    For an identical match, the ordering and types of the keys
-         *    is significant.
-         *    @param array $first         First array.
-         *    @param array $second        Array to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return boolean             True if matching.
-         *    @access private
-         */
-        function _isMatchingKeys($first, $second, $identical) {
-            $first_keys = array_keys($first);
-            $second_keys = array_keys($second);
-            if ($identical) {
-                return ($first_keys === $second_keys);
-            }
-            sort($first_keys);
-            sort($second_keys);
-            return ($first_keys == $second_keys);
-        }
+		/**
+		 *    Compares two arrays to see if their key lists match.
+		 *    For an identical match, the ordering and types of the keys
+		 *    is significant.
+		 *    @param array $first         First array.
+		 *    @param array $second        Array to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return boolean             True if matching.
+		 *    @access private
+		 */
+		function _isMatchingKeys($first, $second, $identical) {
+			$first_keys = array_keys($first);
+			$second_keys = array_keys($second);
+			if ($identical) {
+				return ($first_keys === $second_keys);
+			}
+			sort($first_keys);
+			sort($second_keys);
+			return ($first_keys == $second_keys);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between a resource and another variable.
-         *    @param resource $first       First resource.
-         *    @param mixed $second         Resource to compare with.
-         *    @param boolean $identical    If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeResourceDifference($first, $second, $identical) {
-            return $this->_describeGenericDifference($first, $second);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between a resource and another variable.
+		 *    @param resource $first       First resource.
+		 *    @param mixed $second         Resource to compare with.
+		 *    @param boolean $identical    If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeResourceDifference($first, $second, $identical) {
+			return $this->_describeGenericDifference($first, $second);
+		}
 
-        /**
-         *    Creates a human readable description of the
-         *    difference between two objects.
-         *    @param object $first        First object.
-         *    @param mixed $second        Object to compare with.
-         *    @param boolean $identical   If true then type anomolies count.
-         *    @return string              Human readable description.
-         *    @access private
-         */
-        function _describeObjectDifference($first, $second, $identical) {
-            if (! is_object($second)) {
-                return $this->_describeGenericDifference($first, $second);
-            }
-            return $this->_describeArrayDifference(
-                    get_object_vars($first),
-                    get_object_vars($second),
-                    $identical);
-        }
+		/**
+		 *    Creates a human readable description of the
+		 *    difference between two objects.
+		 *    @param object $first        First object.
+		 *    @param mixed $second        Object to compare with.
+		 *    @param boolean $identical   If true then type anomolies count.
+		 *    @return string              Human readable description.
+		 *    @access private
+		 */
+		function _describeObjectDifference($first, $second, $identical) {
+			if (! is_object($second)) {
+				return $this->_describeGenericDifference($first, $second);
+			}
+			return $this->_describeArrayDifference(
+					get_object_vars($first),
+					get_object_vars($second),
+					$identical);
+		}
 
-        /**
-         *    Find the first character position that differs
-         *    in two strings by binary chop.
-         *    @param string $first        First string.
-         *    @param string $second       String to compare with.
-         *    @return integer             Position of first differing
-         *                                character.
-         *    @access private
-         */
-        function _stringDiffersAt($first, $second) {
-            if (! $first || ! $second) {
-                return 0;
-            }
-            if (strlen($first) < strlen($second)) {
-                list($first, $second) = array($second, $first);
-            }
-            $position = 0;
-            $step = strlen($first);
-            while ($step > 1) {
-                $step = (integer)(($step + 1) / 2);
-                if (strncmp($first, $second, $position + $step) == 0) {
-                    $position += $step;
-                }
-            }
-            return $position;
-        }
+		/**
+		 *    Find the first character position that differs
+		 *    in two strings by binary chop.
+		 *    @param string $first        First string.
+		 *    @param string $second       String to compare with.
+		 *    @return integer             Position of first differing
+		 *                                character.
+		 *    @access private
+		 */
+		function _stringDiffersAt($first, $second) {
+			if (! $first || ! $second) {
+				return 0;
+			}
+			if (strlen($first) < strlen($second)) {
+				list($first, $second) = array($second, $first);
+			}
+			$position = 0;
+			$step = strlen($first);
+			while ($step > 1) {
+				$step = (integer)(($step + 1) / 2);
+				if (strncmp($first, $second, $position + $step) == 0) {
+					$position += $step;
+				}
+			}
+			return $position;
+		}
 
-        /**
-         *    Sends a formatted dump of a variable to a string.
-         *    @param mixed $variable    Variable to display.
-         *    @return string            Output from print_r().
-         *    @access public
-         *    @static
-         */
-        static function dump($variable) {
-            ob_start();
-            print_r($variable);
-            $formatted = ob_get_contents();
-            ob_end_clean();
-            return $formatted;
-        }
+		/**
+		 *    Sends a formatted dump of a variable to a string.
+		 *    @param mixed $variable    Variable to display.
+		 *    @return string            Output from print_r().
+		 *    @access public
+		 *    @static
+		 */
+		static function dump($variable) {
+			ob_start();
+			print_r($variable);
+			$formatted = ob_get_contents();
+			ob_end_clean();
+			return $formatted;
+		}
 
-        /**
-         *    Extracts the last assertion that was not within
-         *    Simpletest itself. The name must start with "assert".
-         *    @param array $stack      List of stack frames.
-         *    @access public
-         *    @static
-         */
-        static function getFormattedAssertionLine($stack) {
-            foreach ($stack as $frame) {
-                if (isset($frame['file'])) {
-                    if (strpos($frame['file'], SIMPLE_TEST) !== false) {
-                        if (dirname($frame['file']) . '/' == SIMPLE_TEST) {
-                            continue;
-                        }
-                    }
-                }
-                if (SimpleDumper::_stackFrameIsAnAssertion($frame)) {
-                    return ' at [' . $frame['file'] . ' line ' . $frame['line'] . ']';
-                }
-            }
-            return '';
-        }
+		/**
+		 *    Extracts the last assertion that was not within
+		 *    Simpletest itself. The name must start with "assert".
+		 *    @param array $stack      List of stack frames.
+		 *    @access public
+		 *    @static
+		 */
+		static function getFormattedAssertionLine($stack) {
+			foreach ($stack as $frame) {
+				if (isset($frame['file'])) {
+					if (strpos($frame['file'], SIMPLE_TEST) !== false) {
+						if (dirname($frame['file']) . '/' == SIMPLE_TEST) {
+							continue;
+						}
+					}
+				}
+				if (SimpleDumper::_stackFrameIsAnAssertion($frame)) {
+					return ' at [' . $frame['file'] . ' line ' . $frame['line'] . ']';
+				}
+			}
+			return '';
+		}
 
-        /**
-         *    Tries to determine if the method call is an assertion.
-         *    @param array $frame     PHP stack frame.
-         *    @access private
-         *    @static
-         */
-        static function _stackFrameIsAnAssertion($frame) {
-            if (($frame['function'] == 'fail') || ($frame['function'] == 'pass')) {
-                return true;
-            }
-            if (strncmp($frame['function'], 'assert', 6) == 0) {
-                return true;
-            }
-            if (strncmp($frame['function'], 'expect', 6) == 0) {
-                return true;
-            }
-            return false;
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Tries to determine if the method call is an assertion.
+		 *    @param array $frame     PHP stack frame.
+		 *    @access private
+		 *    @static
+		 */
+		static function _stackFrameIsAnAssertion($frame) {
+			if (($frame['function'] == 'fail') || ($frame['function'] == 'pass')) {
+				return true;
+			}
+			if (strncmp($frame['function'], 'assert', 6) == 0) {
+				return true;
+			}
+			if (strncmp($frame['function'], 'expect', 6) == 0) {
+				return true;
+			}
+			return false;
+		}
+	}
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
     /**
      * does type matter
      */
-    if (! defined('TYPE_MATTERS')) {
+    if (!defined('TYPE_MATTERS')) {
         define('TYPE_MATTERS', true);
     }
 
@@ -27,7 +27,7 @@ 
          */
         function describeValue($value) {
             $type = $this->getType($value);
-            switch($type) {
+            switch ($type) {
                 case "Null":
                     return "NULL";
                 case "Boolean":
@@ -51,7 +51,7 @@ 
          *    @access public
          */
         function getType($value) {
-            if (! isset($value)) {
+            if (!isset($value)) {
                 return "Null";
             } elseif (is_bool($value)) {
                 return "Boolean";
@@ -83,7 +83,7 @@ 
          */
         function describeDifference($first, $second, $identical = false) {
             if ($identical) {
-                if (! $this->_isTypeMatch($first, $second)) {
+                if (!$this->_isTypeMatch($first, $second)) {
                     return "with type mismatch as [" . $this->describeValue($first) .
                         "] does not match [" . $this->describeValue($second) . "]";
                 }
@@ -121,7 +121,7 @@ 
                 return $value;
             }
             $position = min($position, $length);
-            $start = ($size/2 > $position ? 0 : $position - $size/2);
+            $start = ($size / 2 > $position ? 0 : $position - $size / 2);
             if ($start + $size > $length) {
                 $start = $length - $size;
             }
@@ -239,10 +239,10 @@ 
          *    @access private
          */
         function _describeArrayDifference($first, $second, $identical) {
-            if (! is_array($second)) {
+            if (!is_array($second)) {
                 return $this->_describeGenericDifference($first, $second);
             }
-            if (! $this->_isMatchingKeys($first, $second, $identical)) {
+            if (!$this->_isMatchingKeys($first, $second, $identical)) {
                 return "as key list [" .
                         implode(", ", array_keys($first)) . "] does not match key list [" .
                         implode(", ", array_keys($second)) . "]";
@@ -251,7 +251,7 @@ 
                 if ($identical && ($first[$key] === $second[$key])) {
                     continue;
                 }
-                if (! $identical && ($first[$key] == $second[$key])) {
+                if (!$identical && ($first[$key] == $second[$key])) {
                     continue;
                 }
                 return "with member [$key] " . $this->describeDifference(
@@ -306,7 +306,7 @@ 
          *    @access private
          */
         function _describeObjectDifference($first, $second, $identical) {
-            if (! is_object($second)) {
+            if (!is_object($second)) {
                 return $this->_describeGenericDifference($first, $second);
             }
             return $this->_describeArrayDifference(
@@ -325,7 +325,7 @@ 
          *    @access private
          */
         function _stringDiffersAt($first, $second) {
-            if (! $first || ! $second) {
+            if (!$first || !$second) {
                 return 0;
             }
             if (strlen($first) < strlen($second)) {
@@ -334,7 +334,7 @@ 
             $position = 0;
             $step = strlen($first);
             while ($step > 1) {
-                $step = (integer)(($step + 1) / 2);
+                $step = (integer) (($step + 1) / 2);
                 if (strncmp($first, $second, $position + $step) == 0) {
                     $position += $step;
                 }

tests/test_tools/simpletest/reflection_php5.php

Indentation +251 added lines, -251 removed lines

@@ -1,274 +1,274 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: reflection_php5.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: reflection_php5.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**
-     *    Version specific reflection API.
+	/**
+	 *    Version specific reflection API.
 	 *    @package SimpleTest
 	 *    @subpackage UnitTester
-     */
-    class SimpleReflection {
-        protected $_interface;
+	 */
+	class SimpleReflection {
+		protected $_interface;
 
-        /**
-         *    Stashes the class/interface.
-         *    @param string $interface    Class or interface
-         *                                to inspect.
-         */
-        function SimpleReflection($interface) {
-            $this->_interface = $interface;
-        }
+		/**
+		 *    Stashes the class/interface.
+		 *    @param string $interface    Class or interface
+		 *                                to inspect.
+		 */
+		function SimpleReflection($interface) {
+			$this->_interface = $interface;
+		}
 
-        /**
-         *    Checks that a class has been declared. Versions
-         *    before PHP5.0.2 need a check that it's not really
-         *    an interface.
-         *    @return boolean            True if defined.
-         *    @access public
-         */
-        function classExists() {
-            if (! class_exists($this->_interface)) {
-                return false;
-            }
-            $reflection = new ReflectionClass($this->_interface);
-            return ! $reflection->isInterface();
-        }
+		/**
+		 *    Checks that a class has been declared. Versions
+		 *    before PHP5.0.2 need a check that it's not really
+		 *    an interface.
+		 *    @return boolean            True if defined.
+		 *    @access public
+		 */
+		function classExists() {
+			if (! class_exists($this->_interface)) {
+				return false;
+			}
+			$reflection = new ReflectionClass($this->_interface);
+			return ! $reflection->isInterface();
+		}
 
-        /**
-         *    Needed to kill the autoload feature in PHP5
-         *    for classes created dynamically.
-         *    @return boolean        True if defined.
-         *    @access public
-         */
-        function classExistsSansAutoload() {
-            return class_exists($this->_interface, false);
-        }
+		/**
+		 *    Needed to kill the autoload feature in PHP5
+		 *    for classes created dynamically.
+		 *    @return boolean        True if defined.
+		 *    @access public
+		 */
+		function classExistsSansAutoload() {
+			return class_exists($this->_interface, false);
+		}
 
-        /**
-         *    Checks that a class or interface has been
-         *    declared.
-         *    @return boolean            True if defined.
-         *    @access public
-         */
-        function classOrInterfaceExists() {
-            return $this->_classOrInterfaceExistsWithAutoload($this->_interface, true);
-        }
+		/**
+		 *    Checks that a class or interface has been
+		 *    declared.
+		 *    @return boolean            True if defined.
+		 *    @access public
+		 */
+		function classOrInterfaceExists() {
+			return $this->_classOrInterfaceExistsWithAutoload($this->_interface, true);
+		}
 
-        /**
-         *    Needed to kill the autoload feature in PHP5
-         *    for classes created dynamically.
-         *    @return boolean        True if defined.
-         *    @access public
-         */
-        function classOrInterfaceExistsSansAutoload() {
-            return $this->_classOrInterfaceExistsWithAutoload($this->_interface, false);
-        }
+		/**
+		 *    Needed to kill the autoload feature in PHP5
+		 *    for classes created dynamically.
+		 *    @return boolean        True if defined.
+		 *    @access public
+		 */
+		function classOrInterfaceExistsSansAutoload() {
+			return $this->_classOrInterfaceExistsWithAutoload($this->_interface, false);
+		}
 
-        /**
-         *    Needed to select the autoload feature in PHP5
-         *    for classes created dynamically.
-         *    @param string $interface       Class or interface name.
-         *    @param boolean $autoload       True totriggerautoload.
-         *    @return boolean                True if interface defined.
-         *    @access private
-         */
-        function _classOrInterfaceExistsWithAutoload($interface, $autoload) {
-            if (function_exists('interface_exists')) {
-                if (interface_exists($this->_interface, $autoload)) {
-                    return true;
-                }
-            }
-            return class_exists($this->_interface, $autoload);
-        }
+		/**
+		 *    Needed to select the autoload feature in PHP5
+		 *    for classes created dynamically.
+		 *    @param string $interface       Class or interface name.
+		 *    @param boolean $autoload       True totriggerautoload.
+		 *    @return boolean                True if interface defined.
+		 *    @access private
+		 */
+		function _classOrInterfaceExistsWithAutoload($interface, $autoload) {
+			if (function_exists('interface_exists')) {
+				if (interface_exists($this->_interface, $autoload)) {
+					return true;
+				}
+			}
+			return class_exists($this->_interface, $autoload);
+		}
 
-        /**
-         *    Gets the list of methods on a class or
-         *    interface. Needs to recursively look at all of
-         *    the interfaces included.
-         *    @returns array              List of method names.
-         *    @access public
-         */
-        function getMethods() {
-            return array_unique(get_class_methods($this->_interface));
-        }
+		/**
+		 *    Gets the list of methods on a class or
+		 *    interface. Needs to recursively look at all of
+		 *    the interfaces included.
+		 *    @returns array              List of method names.
+		 *    @access public
+		 */
+		function getMethods() {
+			return array_unique(get_class_methods($this->_interface));
+		}
 
-        /**
-         *    Gets the list of interfaces from a class. If the
-         *    class name is actually an interface then just that
-         *    interface is returned.
-         *    @returns array          List of interfaces.
-         *    @access public
-         */
-        function getInterfaces() {
-            $reflection = new ReflectionClass($this->_interface);
-            if ($reflection->isInterface()) {
-            	return array($this->_interface);
-            }
-            return $this->_onlyParents($reflection->getInterfaces());
-        }
+		/**
+		 *    Gets the list of interfaces from a class. If the
+		 *    class name is actually an interface then just that
+		 *    interface is returned.
+		 *    @returns array          List of interfaces.
+		 *    @access public
+		 */
+		function getInterfaces() {
+			$reflection = new ReflectionClass($this->_interface);
+			if ($reflection->isInterface()) {
+				return array($this->_interface);
+			}
+			return $this->_onlyParents($reflection->getInterfaces());
+		}
 
-        /**
-         *    Gets the list of methods for the implemented
-         *    interfaces only.
-         *    @returns array      List of enforced method signatures.
-         *    @access public
-         */
-        function getInterfaceMethods() {
-            $methods = array();
-            foreach ($this->getInterfaces() as $interface) {
-                $methods = array_merge($methods, get_class_methods($interface));
-            }
-            return array_unique($methods);
-        }
+		/**
+		 *    Gets the list of methods for the implemented
+		 *    interfaces only.
+		 *    @returns array      List of enforced method signatures.
+		 *    @access public
+		 */
+		function getInterfaceMethods() {
+			$methods = array();
+			foreach ($this->getInterfaces() as $interface) {
+				$methods = array_merge($methods, get_class_methods($interface));
+			}
+			return array_unique($methods);
+		}
 
-        /**
-         *    Checks to see if the method signature has to be tightly
-         *    specified.
-         *    @param string $method        Method name.
-         *    @returns boolean             True if enforced.
-         *    @access private
-         */
-        function _isInterfaceMethod($method) {
-            return in_array($method, $this->getInterfaceMethods());
-        }
+		/**
+		 *    Checks to see if the method signature has to be tightly
+		 *    specified.
+		 *    @param string $method        Method name.
+		 *    @returns boolean             True if enforced.
+		 *    @access private
+		 */
+		function _isInterfaceMethod($method) {
+			return in_array($method, $this->getInterfaceMethods());
+		}
 
-        /**
-         *    Finds the parent class name.
-         *    @returns string      Parent class name.
-         *    @access public
-         */
-        function getParent() {
-            $reflection = new ReflectionClass($this->_interface);
-            $parent = $reflection->getParentClass();
-            if ($parent) {
-                return $parent->getName();
-            }
-            return false;
-        }
+		/**
+		 *    Finds the parent class name.
+		 *    @returns string      Parent class name.
+		 *    @access public
+		 */
+		function getParent() {
+			$reflection = new ReflectionClass($this->_interface);
+			$parent = $reflection->getParentClass();
+			if ($parent) {
+				return $parent->getName();
+			}
+			return false;
+		}
 
-        /**
-         *    Determines if the class is abstract.
-         *    @returns boolean      True if abstract.
-         *    @access public
-         */
-        function isAbstract() {
-            $reflection = new ReflectionClass($this->_interface);
-            return $reflection->isAbstract();
-        }
+		/**
+		 *    Determines if the class is abstract.
+		 *    @returns boolean      True if abstract.
+		 *    @access public
+		 */
+		function isAbstract() {
+			$reflection = new ReflectionClass($this->_interface);
+			return $reflection->isAbstract();
+		}
 
-        /**
-         *    Wittles a list of interfaces down to only the top
-         *    level parents.
-         *    @param array $interfaces     Reflection API interfaces
-         *                                 to reduce.
-         *    @returns array               List of parent interface names.
-         *    @access private
-         */
-        function _onlyParents($interfaces) {
-            $parents = array();
-            foreach ($interfaces as $interface) {
-                foreach($interfaces as $possible_parent) {
-                    if ($interface->getName() == $possible_parent->getName()) {
-                        continue;
-                    }
-                    if ($interface->isSubClassOf($possible_parent)) {
-                        break;
-                    }
-                }
-                $parents[] = $interface->getName();
-            }
-            return $parents;
-        }
+		/**
+		 *    Wittles a list of interfaces down to only the top
+		 *    level parents.
+		 *    @param array $interfaces     Reflection API interfaces
+		 *                                 to reduce.
+		 *    @returns array               List of parent interface names.
+		 *    @access private
+		 */
+		function _onlyParents($interfaces) {
+			$parents = array();
+			foreach ($interfaces as $interface) {
+				foreach($interfaces as $possible_parent) {
+					if ($interface->getName() == $possible_parent->getName()) {
+						continue;
+					}
+					if ($interface->isSubClassOf($possible_parent)) {
+						break;
+					}
+				}
+				$parents[] = $interface->getName();
+			}
+			return $parents;
+		}
 
-        /**
-         *    Gets the source code matching the declaration
-         *    of a method.
-         *    @param string $name    Method name.
-         *    @return string         Method signature up to last
-         *                           bracket.
-         *    @access public
-         */
-        function getSignature($name) {
-        	if ($name == '__get') {
-        		return 'function __get($key)';
-        	}
-        	if ($name == '__set') {
-        		return 'function __set($key, $value)';
-        	}
-        	if (! is_callable(array($this->_interface, $name))) {
-        		return "function $name()";
-        	}
-        	if ($this->_isInterfaceMethod($name)) {
-        	    return $this->_getFullSignature($name);
-        	}
-        	return "function $name()";
-        }
+		/**
+		 *    Gets the source code matching the declaration
+		 *    of a method.
+		 *    @param string $name    Method name.
+		 *    @return string         Method signature up to last
+		 *                           bracket.
+		 *    @access public
+		 */
+		function getSignature($name) {
+			if ($name == '__get') {
+				return 'function __get($key)';
+			}
+			if ($name == '__set') {
+				return 'function __set($key, $value)';
+			}
+			if (! is_callable(array($this->_interface, $name))) {
+				return "function $name()";
+			}
+			if ($this->_isInterfaceMethod($name)) {
+				return $this->_getFullSignature($name);
+			}
+			return "function $name()";
+		}
 
-        /**
-         *    For a signature specified in an interface, full
-         *    details must be replicated to be a valid implementation.
-         *    @param string $name    Method name.
-         *    @return string         Method signature up to last
-         *                           bracket.
-         *    @access private
-         */
-        function _getFullSignature($name) {
-	        $interface = new ReflectionClass($this->_interface);
-	        $method = $interface->getMethod($name);
-	        $reference = $method->returnsReference() ? '&' : '';
-        	return "function $reference$name(" .
-            		implode(', ', $this->_getParameterSignatures($method)) .
-            		")";
-        }
+		/**
+		 *    For a signature specified in an interface, full
+		 *    details must be replicated to be a valid implementation.
+		 *    @param string $name    Method name.
+		 *    @return string         Method signature up to last
+		 *                           bracket.
+		 *    @access private
+		 */
+		function _getFullSignature($name) {
+			$interface = new ReflectionClass($this->_interface);
+			$method = $interface->getMethod($name);
+			$reference = $method->returnsReference() ? '&' : '';
+			return "function $reference$name(" .
+					implode(', ', $this->_getParameterSignatures($method)) .
+					")";
+		}
 
-        /**
-         *    Gets the source code for each parameter.
-         *    @param ReflectionMethod $method   Method object from
-         *										reflection API
-         *    @return array                     List of strings, each
-         *                                      a snippet of code.
-         *    @access private
-         */
-        function _getParameterSignatures($method) {
-        	$signatures = array();
-            foreach ($method->getParameters() as $parameter) {
-                $type = $parameter->getClass();
-            	$signatures[] =
+		/**
+		 *    Gets the source code for each parameter.
+		 *    @param ReflectionMethod $method   Method object from
+		 *										reflection API
+		 *    @return array                     List of strings, each
+		 *                                      a snippet of code.
+		 *    @access private
+		 */
+		function _getParameterSignatures($method) {
+			$signatures = array();
+			foreach ($method->getParameters() as $parameter) {
+				$type = $parameter->getClass();
+				$signatures[] =
 					(! is_null($type) ? $type->getName() . ' ' : '') .
-            			($parameter->isPassedByReference() ? '&' : '') .
-            			'$' . $this->_suppressSpurious($parameter->getName()) .
-            			($this->_isOptional($parameter) ? ' = null' : '');
-            }
-            return $signatures;
-        }
+						($parameter->isPassedByReference() ? '&' : '') .
+						'$' . $this->_suppressSpurious($parameter->getName()) .
+						($this->_isOptional($parameter) ? ' = null' : '');
+			}
+			return $signatures;
+		}
 
-        /**
-         *    The SPL library has problems with the
-         *    Reflection library. In particular, you can
-         *    get extra characters in parameter names :(.
-         *    @param string $name    Parameter name.
-         *    @return string         Cleaner name.
-         *    @access private
-         */
-        function _suppressSpurious($name) {
-            return str_replace(array('[', ']', ' '), '', $name);
-        }
+		/**
+		 *    The SPL library has problems with the
+		 *    Reflection library. In particular, you can
+		 *    get extra characters in parameter names :(.
+		 *    @param string $name    Parameter name.
+		 *    @return string         Cleaner name.
+		 *    @access private
+		 */
+		function _suppressSpurious($name) {
+			return str_replace(array('[', ']', ' '), '', $name);
+		}
 
-        /**
-         *    Test of a reflection parameter being optional
-         *    that works with early versions of PHP5.
-         *    @param reflectionParameter $parameter    Is this optional.
-         *    @return boolean                          True if optional.
-         *    @access private
-         */
-        function _isOptional($parameter) {
-            if (method_exists($parameter, 'isOptional')) {
-                return $parameter->isOptional();
-            }
-            return false;
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Test of a reflection parameter being optional
+		 *    that works with early versions of PHP5.
+		 *    @param reflectionParameter $parameter    Is this optional.
+		 *    @return boolean                          True if optional.
+		 *    @access private
+		 */
+		function _isOptional($parameter) {
+			if (method_exists($parameter, 'isOptional')) {
+				return $parameter->isOptional();
+			}
+			return false;
+		}
+	}
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -31,11 +31,11 @@ 
          *    @access public
          */
         function classExists() {
-            if (! class_exists($this->_interface)) {
+            if (!class_exists($this->_interface)) {
                 return false;
             }
             $reflection = new ReflectionClass($this->_interface);
-            return ! $reflection->isInterface();
+            return !$reflection->isInterface();
         }
 
         /**
@@ -171,7 +171,7 @@ 
         function _onlyParents($interfaces) {
             $parents = array();
             foreach ($interfaces as $interface) {
-                foreach($interfaces as $possible_parent) {
+                foreach ($interfaces as $possible_parent) {
                     if ($interface->getName() == $possible_parent->getName()) {
                         continue;
                     }
@@ -199,7 +199,7 @@ 
         	if ($name == '__set') {
         		return 'function __set($key, $value)';
         	}
-        	if (! is_callable(array($this->_interface, $name))) {
+        	if (!is_callable(array($this->_interface, $name))) {
         		return "function $name()";
         	}
         	if ($this->_isInterfaceMethod($name)) {
@@ -238,7 +238,7 @@ 
             foreach ($method->getParameters() as $parameter) {
                 $type = $parameter->getClass();
             	$signatures[] =
-					(! is_null($type) ? $type->getName() . ' ' : '') .
+					(!is_null($type) ? $type->getName() . ' ' : '') .
             			($parameter->isPassedByReference() ? '&' : '') .
             			'$' . $this->_suppressSpurious($parameter->getName()) .
             			($this->_isOptional($parameter) ? ' = null' : '');

tests/test_tools/simpletest/detached.php

Indentation +79 added lines, -79 removed lines

@@ -1,95 +1,95 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: detached.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: detached.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/xml.php');
-    require_once(dirname(__FILE__) . '/shell_tester.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/xml.php');
+	require_once(dirname(__FILE__) . '/shell_tester.php');
+	/**#@-*/
 
-    /**
-     *    Runs an XML formated test in a separate process.
+	/**
+	 *    Runs an XML formated test in a separate process.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class DetachedTestCase {
-        protected $_command;
-        protected $_dry_command;
-        protected $_size;
+	 */
+	class DetachedTestCase {
+		protected $_command;
+		protected $_dry_command;
+		protected $_size;
 
-        /**
-         *    Sets the location of the remote test.
-         *    @param string $command       Test script.
-         *    @param string $dry_command   Script for dry run.
-         *    @access public
-         */
-        function DetachedTestCase($command, $dry_command = false) {
-            $this->_command = $command;
-            $this->_dry_command = $dry_command ? $dry_command : $command;
-            $this->_size = false;
-        }
+		/**
+		 *    Sets the location of the remote test.
+		 *    @param string $command       Test script.
+		 *    @param string $dry_command   Script for dry run.
+		 *    @access public
+		 */
+		function DetachedTestCase($command, $dry_command = false) {
+			$this->_command = $command;
+			$this->_dry_command = $dry_command ? $dry_command : $command;
+			$this->_size = false;
+		}
 
-        /**
-         *    Accessor for the test name for subclasses.
-         *    @return string       Name of the test.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->_command;
-        }
+		/**
+		 *    Accessor for the test name for subclasses.
+		 *    @return string       Name of the test.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->_command;
+		}
 
-        /**
-         *    Runs the top level test for this class. Currently
-         *    reads the data as a single chunk. I'll fix this
-         *    once I have added iteration to the browser.
-         *    @param SimpleReporter $reporter    Target of test results.
-         *    @returns boolean                   True if no failures.
-         *    @access public
-         */
-        function run($reporter) {
+		/**
+		 *    Runs the top level test for this class. Currently
+		 *    reads the data as a single chunk. I'll fix this
+		 *    once I have added iteration to the browser.
+		 *    @param SimpleReporter $reporter    Target of test results.
+		 *    @returns boolean                   True if no failures.
+		 *    @access public
+		 */
+		function run($reporter) {
 			$shell = new SimpleShell();
 			$shell->execute($this->_command);
-            $parser = $this->_createParser($reporter);
-            if (! $parser->parse($shell->getOutput())) {
-                trigger_error('Cannot parse incoming XML from [' . $this->_command . ']');
-                return false;
-            }
-            return true;
-        }
+			$parser = $this->_createParser($reporter);
+			if (! $parser->parse($shell->getOutput())) {
+				trigger_error('Cannot parse incoming XML from [' . $this->_command . ']');
+				return false;
+			}
+			return true;
+		}
 
-        /**
-         *    Accessor for the number of subtests.
-         *    @return integer       Number of test cases.
-         *    @access public
-         */
-        function getSize() {
-            if ($this->_size === false) {
+		/**
+		 *    Accessor for the number of subtests.
+		 *    @return integer       Number of test cases.
+		 *    @access public
+		 */
+		function getSize() {
+			if ($this->_size === false) {
 				$shell = new SimpleShell();
 				$shell->execute($this->_dry_command);
-                $reporter = new SimpleReporter();
-                $parser = $this->_createParser($reporter);
-                if (! $parser->parse($shell->getOutput())) {
-                    trigger_error('Cannot parse incoming XML from [' . $this->_dry_command . ']');
-                    return false;
-                }
-                $this->_size = $reporter->getTestCaseCount();
-            }
-            return $this->_size;
-        }
+				$reporter = new SimpleReporter();
+				$parser = $this->_createParser($reporter);
+				if (! $parser->parse($shell->getOutput())) {
+					trigger_error('Cannot parse incoming XML from [' . $this->_dry_command . ']');
+					return false;
+				}
+				$this->_size = $reporter->getTestCaseCount();
+			}
+			return $this->_size;
+		}
 
-        /**
-         *    Creates the XML parser.
-         *    @param SimpleReporter $reporter    Target of test results.
-         *    @return SimpleTestXmlListener      XML reader.
-         *    @access protected
-         */
-        function &_createParser($reporter) {
-            return new SimpleTestXmlParser($reporter);
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Creates the XML parser.
+		 *    @param SimpleReporter $reporter    Target of test results.
+		 *    @return SimpleTestXmlListener      XML reader.
+		 *    @access protected
+		 */
+		function &_createParser($reporter) {
+			return new SimpleTestXmlParser($reporter);
+		}
+	}
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 			$shell = new SimpleShell();
 			$shell->execute($this->_command);
             $parser = $this->_createParser($reporter);
-            if (! $parser->parse($shell->getOutput())) {
+            if (!$parser->parse($shell->getOutput())) {
                 trigger_error('Cannot parse incoming XML from [' . $this->_command . ']');
                 return false;
             }
@@ -74,7 +74,7 @@ 
 				$shell->execute($this->_dry_command);
                 $reporter = new SimpleReporter();
                 $parser = $this->_createParser($reporter);
-                if (! $parser->parse($shell->getOutput())) {
+                if (!$parser->parse($shell->getOutput())) {
                     trigger_error('Cannot parse incoming XML from [' . $this->_dry_command . ']');
                     return false;
                 }

Doc Comments +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         /**
          *    Creates the XML parser.
          *    @param SimpleReporter $reporter    Target of test results.
-         *    @return SimpleTestXmlListener      XML reader.
+         *    @return SimpleTestXmlParser      XML reader.
          *    @access protected
          */
         function &_createParser($reporter) {

tests/test_tools/simpletest/exceptions.php

Indentation +35 added lines, -35 removed lines

@@ -1,45 +1,45 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: exceptions.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: exceptions.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      * Includes SimpleTest files and defined the root constant
      * for dependent libraries.
      */
-    require_once(dirname(__FILE__) . '/invoker.php');
+	require_once(dirname(__FILE__) . '/invoker.php');
 
-    /**
-     *    Extension that traps exceptions and turns them into
-     *    an error message.
+	/**
+	 *    Extension that traps exceptions and turns them into
+	 *    an error message.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleExceptionTrappingInvoker extends SimpleInvokerDecorator {
+	 */
+	class SimpleExceptionTrappingInvoker extends SimpleInvokerDecorator {
 
-        /**
-         *    Stores the invoker to be wrapped.
-         *    @param SimpleInvoker $invoker   Test method runner.
-         */
-        function SimpleExceptionTrappingInvoker($invoker) {
-            $this->SimpleInvokerDecorator($invoker);
-        }
+		/**
+		 *    Stores the invoker to be wrapped.
+		 *    @param SimpleInvoker $invoker   Test method runner.
+		 */
+		function SimpleExceptionTrappingInvoker($invoker) {
+			$this->SimpleInvokerDecorator($invoker);
+		}
 
-        /**
-         *    Invokes a test method and dispatches any
-         *    untrapped errors.
-         *    @param string $method    Test method to call.
-         *    @access public
-         */
-        function invoke($method) {
-            try {
-                parent::invoke($method);
-            } catch (Exception $exception) {
-                $test_case = $this->getTestCase();
-                $test_case->exception($exception);
-            }
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Invokes a test method and dispatches any
+		 *    untrapped errors.
+		 *    @param string $method    Test method to call.
+		 *    @access public
+		 */
+		function invoke($method) {
+			try {
+				parent::invoke($method);
+			} catch (Exception $exception) {
+				$test_case = $this->getTestCase();
+				$test_case->exception($exception);
+			}
+		}
+	}
\ No newline at end of file