REPOSITORY CONVERTED TO PHP 5.3

nette · Sep 9, 2012 · cbb4de6 · cbb4de6
1 parent 8cfc1a1
commit cbb4de6
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 19 deletions.
diff --git a/Tester/Assert.php b/Tester/Assert.php
@@ -123,7 +123,7 @@ private static function dump($var)
 	/**
 	 * Returns message and file and line from call stack.
 	 * @param  string
-     * @return void
+	 * @return void
 	 */
 	private static function output($message)
 	{

diff --git a/Tester/NetteTestHelpers.php b/Tester/NetteTestHelpers.php
@@ -244,9 +244,9 @@ public static function prepareSaveCoverage()
 	 */
 	public static function saveCoverage()
 	{
-		$file = dirname(__FILE__) . '/coverage.tmp';
+		$file = __DIR__ . '/coverage.tmp';
 		$coverage = @unserialize(file_get_contents($file));
-		$root = realpath(dirname(__FILE__) . '/../../Nette') . DIRECTORY_SEPARATOR;
+		$root = realpath(__DIR__ . '/../../Nette') . DIRECTORY_SEPARATOR;
 
 		foreach (xdebug_get_code_coverage() as $filename => $lines) {
 			if (strncmp($root, $filename, strlen($root))) continue;

diff --git a/Tester/RunTests.php b/Tester/RunTests.php
@@ -3,7 +3,7 @@
 ---------------------------
 <?php
 
-require_once dirname(__FILE__) . '/NetteTestCase.php';
+require_once __DIR__ . '/NetteTestCase.php';
 
 
 
@@ -31,7 +31,7 @@
  * Execute tests
  */
 try {
-	@unlink(dirname(__FILE__) . '/coverage.tmp'); // intentionally @
+	@unlink(__DIR__ . '/coverage.tmp'); // intentionally @
 
 	$manager = new NetteTestRunner;
 	$manager->parseConfigFile();
@@ -180,7 +180,7 @@ public function log($testFile, $content, $type, $section = '')
 	 */
 	public function parseConfigFile()
 	{
-		$configFile = dirname(__FILE__) .'/config.ini';
+		$configFile = __DIR__ .'/config.ini';
 		if (file_exists($configFile)) {
 			$this->config = parse_ini_file($configFile, TRUE);
 			if ($this->config === FALSE) {

diff --git a/Tester/initialize.php b/Tester/initialize.php
@@ -7,19 +7,19 @@
  * @package    Nette\Test
  */
 
-require dirname(__FILE__) . '/NetteTestCase.php';
+require __DIR__ . '/NetteTestCase.php';
 
-require dirname(__FILE__) . '/NetteTestHelpers.php';
+require __DIR__ . '/NetteTestHelpers.php';
 
-require dirname(__FILE__) . '/Assert.php';
+require __DIR__ . '/Assert.php';
 
 
 
 NetteTestHelpers::startup();
 
 
 
-require dirname(__FILE__) . '/../../Nette/loader.php';
+require __DIR__ . '/../../Nette/loader.php';
 
 
 

diff --git a/tests/NetteTestCase.compare().phpt b/tests/NetteTestCase.compare().phpt
@@ -9,7 +9,7 @@
  * @subpackage UnitTests
  */
 
-require dirname(__FILE__) . '/../initialize.php';
+require __DIR__ . '/../initialize.php';
 
 
 

diff --git a/tests/Test.assertations.phpt b/tests/Test.assertations.phpt
@@ -9,7 +9,7 @@
  * @subpackage UnitTests
  */
 
-require dirname(__FILE__) . '/../initialize.php';
+require __DIR__ . '/../initialize.php';
 
 
 

diff --git a/tests/Test.dump().001.phpt b/tests/Test.dump().001.phpt
@@ -9,7 +9,7 @@
  * @subpackage UnitTests
  */
 
-require dirname(__FILE__) . '/../initialize.php';
+require __DIR__ . '/../initialize.php';
 
 
 

diff --git a/tests/Test.dump().002.phpt b/tests/Test.dump().002.phpt
@@ -9,7 +9,7 @@
  * @subpackage UnitTests
  */
 
-require dirname(__FILE__) . '/../initialize.php';
+require __DIR__ . '/../initialize.php';
 
 
 

diff --git a/tests/Test.dump().003.phpt b/tests/Test.dump().003.phpt
@@ -9,7 +9,7 @@
  * @subpackage UnitTests
  */
 
-require dirname(__FILE__) . '/../initialize.php';
+require __DIR__ . '/../initialize.php';
 
 
 

diff --git a/tests/Test.error.001.phpt b/tests/Test.error.001.phpt
@@ -9,7 +9,7 @@
  * @subpackage UnitTests
  */
 
-require dirname(__FILE__) . '/../initialize.php';
+require __DIR__ . '/../initialize.php';
 
 
 

diff --git a/tests/Test.error.002.phpt b/tests/Test.error.002.phpt
@@ -9,7 +9,7 @@
  * @subpackage UnitTests
  */
 
-require dirname(__FILE__) . '/../initialize.php';
+require __DIR__ . '/../initialize.php';
 
 
 

diff --git a/tests/Test.exception.phpt b/tests/Test.exception.phpt
@@ -9,7 +9,7 @@
  * @subpackage UnitTests
  */
 
-require dirname(__FILE__) . '/../initialize.php';
+require __DIR__ . '/../initialize.php';
 
 
 

diff --git a/tests/Test.getSection().phpt b/tests/Test.getSection().phpt
@@ -9,7 +9,7 @@
  * @subpackage UnitTests
  */
 
-require dirname(__FILE__) . '/../initialize.php';
+require __DIR__ . '/../initialize.php';