/Tester changed to /src

.travis.yml

@@ -30,8 +30,8 @@ matrix:
           env: TESTER_PHP_BIN=php-cgi
 
 script:
-    - Tester/tester -p $TESTER_PHP_BIN tests -s
-    - Tester/tester -p $TESTER_PHP_BIN -o none tests/fail.phptx; if [ $? -eq 0 ]; then echo "tests/fail.phptx SHOULD FAIL"; exit 1; else echo "fail checked"; fi;
+    - src/tester -p $TESTER_PHP_BIN tests -s
+    - src/tester -p $TESTER_PHP_BIN -o none tests/fail.phptx; if [ $? -eq 0 ]; then echo "tests/fail.phptx SHOULD FAIL"; exit 1; else echo "fail checked"; fi;
     - php code-checker/src/code-checker.php
 
 after_failure:

Tester/bootstrap.php

@@ -1,18 +1,2 @@
 <?php
-
-/**
- * Test environment initialization.
- */
-
-require __DIR__ . '/Framework/Helpers.php';
-require __DIR__ . '/Framework/Environment.php';
-require __DIR__ . '/Framework/DataProvider.php';
-require __DIR__ . '/Framework/Assert.php';
-require __DIR__ . '/Framework/Dumper.php';
-require __DIR__ . '/Framework/FileMock.php';
-require __DIR__ . '/Framework/TestCase.php';
-require __DIR__ . '/Framework/DomQuery.php';
-require __DIR__ . '/CodeCoverage/Collector.php';
-require __DIR__ . '/Runner/Job.php';
-
-Tester\Environment::setup();
+require __DIR__ . '/../src/bootstrap.php';

Tester/tester

@@ -1,4 +1,3 @@
 #!/usr/bin/env php
 <?php
-
-require __DIR__ . '/tester.php';
+require __DIR__ . '/../src/tester.php';

Tester/tester.php

@@ -1,34 +1,2 @@
 <?php
-
-/**
- * Nette Tester.
- * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
- */
-
-require __DIR__ . '/Runner/PhpInterpreter.php';
-require __DIR__ . '/Runner/ZendPhpInterpreter.php';
-require __DIR__ . '/Runner/HhvmPhpInterpreter.php';
-require __DIR__ . '/Runner/Runner.php';
-require __DIR__ . '/Runner/CliTester.php';
-require __DIR__ . '/Runner/Job.php';
-require __DIR__ . '/Runner/CommandLine.php';
-require __DIR__ . '/Runner/TestHandler.php';
-require __DIR__ . '/Runner/OutputHandler.php';
-require __DIR__ . '/Runner/Output/Logger.php';
-require __DIR__ . '/Runner/Output/TapPrinter.php';
-require __DIR__ . '/Runner/Output/ConsolePrinter.php';
-require __DIR__ . '/Runner/Output/JUnitPrinter.php';
-require __DIR__ . '/Framework/Helpers.php';
-require __DIR__ . '/Framework/Environment.php';
-require __DIR__ . '/Framework/Assert.php';
-require __DIR__ . '/Framework/Dumper.php';
-require __DIR__ . '/Framework/DataProvider.php';
-require __DIR__ . '/Framework/TestCase.php';
-require __DIR__ . '/CodeCoverage/PhpParser.php';
-require __DIR__ . '/CodeCoverage/Generators/AbstractGenerator.php';
-require __DIR__ . '/CodeCoverage/Generators/HtmlGenerator.php';
-require __DIR__ . '/CodeCoverage/Generators/CloverXMLGenerator.php';
-
-
-$tester = new Tester\Runner\CliTester;
-die($tester->run());
+require __DIR__ . '/../src/tester.php';

composer.json

@@ -18,9 +18,9 @@
 		"php": ">=5.3.0"
 	},
 	"autoload": {
-		"classmap": ["Tester/"]
+		"classmap": ["src/"]
 	},
-	"bin": ["Tester/tester"],
+	"bin": ["src/tester"],
 	"extra": {
 		"branch-alias": { "dev-master": "1.3-dev" }
 	}

readme.md

@@ -43,7 +43,7 @@ class Greeting
 So we create test file named `greeting.test.phpt`:
 
 ```php
-require 'Tester/bootstrap.php';
+require 'src/bootstrap.php';
 
 use Tester\Assert;
 

src/bootstrap.php

@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Test environment initialization.
+ */
+
+require __DIR__ . '/Framework/Helpers.php';
+require __DIR__ . '/Framework/Environment.php';
+require __DIR__ . '/Framework/DataProvider.php';
+require __DIR__ . '/Framework/Assert.php';
+require __DIR__ . '/Framework/Dumper.php';
+require __DIR__ . '/Framework/FileMock.php';
+require __DIR__ . '/Framework/TestCase.php';
+require __DIR__ . '/Framework/DomQuery.php';
+require __DIR__ . '/CodeCoverage/Collector.php';
+require __DIR__ . '/Runner/Job.php';
+
+Tester\Environment::setup();

src/tester

@@ -0,0 +1,4 @@
+#!/usr/bin/env php
+<?php
+
+require __DIR__ . '/tester.php';

src/tester.php

@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Nette Tester.
+ * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
+ */
+
+require __DIR__ . '/Runner/PhpInterpreter.php';
+require __DIR__ . '/Runner/ZendPhpInterpreter.php';
+require __DIR__ . '/Runner/HhvmPhpInterpreter.php';
+require __DIR__ . '/Runner/Runner.php';
+require __DIR__ . '/Runner/CliTester.php';
+require __DIR__ . '/Runner/Job.php';
+require __DIR__ . '/Runner/CommandLine.php';
+require __DIR__ . '/Runner/TestHandler.php';
+require __DIR__ . '/Runner/OutputHandler.php';
+require __DIR__ . '/Runner/Output/Logger.php';
+require __DIR__ . '/Runner/Output/TapPrinter.php';
+require __DIR__ . '/Runner/Output/ConsolePrinter.php';
+require __DIR__ . '/Runner/Output/JUnitPrinter.php';
+require __DIR__ . '/Framework/Helpers.php';
+require __DIR__ . '/Framework/Environment.php';
+require __DIR__ . '/Framework/Assert.php';
+require __DIR__ . '/Framework/Dumper.php';
+require __DIR__ . '/Framework/DataProvider.php';
+require __DIR__ . '/Framework/TestCase.php';
+require __DIR__ . '/CodeCoverage/PhpParser.php';
+require __DIR__ . '/CodeCoverage/Generators/AbstractGenerator.php';
+require __DIR__ . '/CodeCoverage/Generators/HtmlGenerator.php';
+require __DIR__ . '/CodeCoverage/Generators/CloverXMLGenerator.php';
+
+
+$tester = new Tester\Runner\CliTester;
+die($tester->run());

tests/CodeCoverage/CloverXMLGenerator.phpt

@@ -4,9 +4,9 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
-require __DIR__ . '/../../Tester/CodeCoverage/Generators/AbstractGenerator.php';
-require __DIR__ . '/../../Tester/CodeCoverage/Generators/CloverXMLGenerator.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/Generators/AbstractGenerator.php';
+require __DIR__ . '/../../src/CodeCoverage/Generators/CloverXMLGenerator.php';
 
 
 $coveredFile = __DIR__ . DIRECTORY_SEPARATOR . 'CloverXMLGenerator.covered.php';

tests/CodeCoverage/PhpParser.parse.edge.phpt

@@ -4,7 +4,7 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
 
 
 $parser = new CodeCoverage\PhpParser;

tests/CodeCoverage/PhpParser.parse.lines-of-code.phpt

@@ -4,7 +4,7 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
 
 
 $parser = new CodeCoverage\PhpParser;

tests/CodeCoverage/PhpParser.parse.lines.phpt

@@ -4,7 +4,7 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
 
 
 $parser = new CodeCoverage\PhpParser;

tests/CodeCoverage/PhpParser.parse.methods.phpt

@@ -4,7 +4,7 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
 
 
 $parser = new CodeCoverage\PhpParser;

tests/CodeCoverage/PhpParser.parse.namespaces.phpt

@@ -4,7 +4,7 @@ use Tester\Assert;
 use Tester\CodeCoverage;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/CodeCoverage/PhpParser.php';
+require __DIR__ . '/../../src/CodeCoverage/PhpParser.php';
 
 
 $parser = new CodeCoverage\PhpParser;

tests/Runner/CommandLine.phpt

@@ -4,7 +4,7 @@ use Tester\Assert,
 	Tester\Runner\CommandLine as Cmd;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/CommandLine.php';
+require __DIR__ . '/../../src/Runner/CommandLine.php';
 
 
 

tests/Runner/Runner.annotations.phpt

@@ -8,9 +8,9 @@ use Tester\Assert,
 	Tester\Runner\Runner;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/OutputHandler.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/OutputHandler.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 class Logger implements Tester\Runner\OutputHandler

tests/Runner/Runner.edge.phpt

@@ -8,9 +8,9 @@ use Tester\Assert,
 	Tester\Runner\Runner;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/OutputHandler.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/OutputHandler.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 class Logger implements Tester\Runner\OutputHandler

tests/Runner/Runner.find-tests.phpt

@@ -7,8 +7,8 @@
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 $runner = new Tester\Runner\Runner(createInterpreter());

tests/Runner/Runner.multiple-fails.phpt

@@ -9,9 +9,9 @@ use Tester\Assert,
 	Tester\Runner\Runner;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/OutputHandler.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/OutputHandler.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 class Logger implements Tester\Runner\OutputHandler

tests/Runner/Runner.multiple.phpt

@@ -8,8 +8,8 @@ use Tester\Assert,
 	Tester\Helpers;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 $runner = new Tester\Runner\Runner(createInterpreter());

tests/Runner/Runner.stop-on-fail.phpt

@@ -8,9 +8,9 @@ use Tester\Assert,
 	Tester\Runner\Runner;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/OutputHandler.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/OutputHandler.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
 
 
 class Logger implements Tester\Runner\OutputHandler

tests/RunnerOutput/JUnitPrinter.phpt

@@ -9,10 +9,10 @@ use Tester\Assert,
 	Tester\Runner\Output\JUnitPrinter;
 
 require __DIR__ . '/../bootstrap.php';
-require __DIR__ . '/../../Tester/Runner/TestHandler.php';
-require __DIR__ . '/../../Tester/Runner/Runner.php';
-require __DIR__ . '/../../Tester/Runner/OutputHandler.php';
-require __DIR__ . '/../../Tester/Runner/Output/JUnitPrinter.php';
+require __DIR__ . '/../../src/Runner/TestHandler.php';
+require __DIR__ . '/../../src/Runner/Runner.php';
+require __DIR__ . '/../../src/Runner/OutputHandler.php';
+require __DIR__ . '/../../src/Runner/Output/JUnitPrinter.php';
 
 
 Environment::$useColors = FALSE;

tests/bootstrap.php

@@ -1,9 +1,9 @@
 <?php
 
-require __DIR__ . '/../Tester/bootstrap.php';
-require __DIR__ . '/../Tester/Runner/PhpInterpreter.php';
-require __DIR__ . '/../Tester/Runner/ZendPhpInterpreter.php';
-require __DIR__ . '/../Tester/Runner/HhvmPhpInterpreter.php';
+require __DIR__ . '/../src/bootstrap.php';
+require __DIR__ . '/../src/Runner/PhpInterpreter.php';
+require __DIR__ . '/../src/Runner/ZendPhpInterpreter.php';
+require __DIR__ . '/../src/Runner/HhvmPhpInterpreter.php';
 
 
 date_default_timezone_set('Europe/Prague');
@@ -14,7 +14,7 @@ function test(\Closure $function)
 	$function();
 }
 
-/** @return \Tester\Runner\PhpInterpreter */
+/** @return Tester\Runner\PhpInterpreter */
 function createInterpreter()
 {
 	return defined('HHVM_VERSION')

tools/create-phar/create-phar.php

@@ -25,7 +25,7 @@
 ");
 
 $phar->startBuffering();
-foreach ($iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__ . '/../../Tester', RecursiveDirectoryIterator::SKIP_DOTS)) as $file) {
+foreach ($iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__ . '/../../src', RecursiveDirectoryIterator::SKIP_DOTS)) as $file) {
 	echo "adding: {$iterator->getSubPathname()}\n";
 	$phar[$iterator->getSubPathname()] = php_strip_whitespace($file);
 }