Update for atoum 3.x

jubianchi · jubianchi · commit fa7d67e3c1d6 · 2017-10-01T22:05:50.000+02:00
diff --git a/.atoum.php b/.atoum.php
@@ -1,34 +1,4 @@
 <?php
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR . 'autoloader.php';
-
-use mageekguy\atoum\phpunit;
-use mageekguy\atoum\autoloop;
-use mageekguy\atoum\report\fields\runner\result\notifier;
-
-$extension = new autoloop\extension($script);
-$extension
-    ->setWatchedFiles(array(__DIR__ . '/classes'))
-    ->addToRunner($runner)
-;
-
-$extension = new phpunit\extension($script);
-$extension->addToRunner($runner);
-
-if (getenv('TRAVIS_PHP_VERSION') === '7.0')
-{
-    $script
-        ->php('php -n -ddate.timezone=Europe/Paris')
-        ->noCodeCoverage()
-    ;
-}
 
 $script->noCodeCoverageForClasses('mageekguy\atoum\asserter');
 $script->noCodeCoverageForNamespaces('mageekguy\atoum\asserters');
-$script->noCodeCoverageForNamespaces('mageekguy\atoum\autoloop');
-
-if (PHP_OS === 'Darwin') {
-    $notifier = new notifier\terminal();
-    $report = $script->addDefaultReport();
-    $report->addField($notifier);
-}
-
diff --git a/.bootstrap.atoum.php b/.bootstrap.atoum.php
diff --git a/autoloader.php b/autoloader.php
diff --git a/classes/constraints/containsOnly.php b/classes/constraints/containsOnly.php
@@ -2,6 +2,13 @@
 
 namespace mageekguy\atoum\phpunit\constraints;
 
+use mageekguy\atoum\asserters\boolean;
+use mageekguy\atoum\asserters\integer;
+use mageekguy\atoum\asserters\phpArray;
+use mageekguy\atoum\asserters\phpFloat;
+use mageekguy\atoum\asserters\phpObject;
+use mageekguy\atoum\asserters\phpString;
+use mageekguy\atoum\asserters\variable;
 use
 	mageekguy\atoum\phpunit\constraint,
 	mageekguy\atoum\exceptions,
@@ -51,35 +58,34 @@ protected function matches($actual)
 
 	private static function getAssertion($type)
 	{
-		$namespace = 'mageekguy\atoum\asserters';
 		$assertion = null;
 		$transform = null;
 		$expected = null;
 
 		switch ($type)
 		{
 			case 'int':
-				$classname = $namespace . '\\integer';
+				$classname = integer::class;
 				break;
 
 			case 'float':
-				$classname = $namespace . '\\phpFloat';
+				$classname = phpFloat::class;
 				break;
 
 			case 'bool':
-				$classname = $namespace . '\\boolean';
+				$classname = boolean::class;
 				break;
 
 			case 'string':
-				$classname = $namespace . '\\phpString';
+				$classname = phpString::class;
 				break;
 
 			case 'array':
-				$classname = $namespace . '\\phpArray';
+				$classname = phpArray::class;
 				break;
 
 			case 'null':
-				$classname = $namespace . '\\variable';
+				$classname = variable::class;
 				$assertion = 'isNull';
 				break;
 
@@ -88,19 +94,19 @@ private static function getAssertion($type)
 			case 'double':
 			case 'real':
 			case 'callable':
-				$classname = $namespace . '\\boolean';
+				$classname = boolean::class;
 				$transform = 'is_' . $type;
 				$assertion = 'isTrue';
 				break;
 
 			case 'boolean':
 			case 'integer':
 			case 'resource':
-				$classname = $namespace . '\\' . $type;
+				$classname = 'mageekguy\atoum\asserters\\' . $type;
 				break;
 
 			default:
-				$classname = $namespace . '\\object';
+				$classname = phpObject::class;
 
 				if ($type !== 'object') {
 					$assertion = 'isInstanceOf';
diff --git a/classes/constraints/containsOnlyInstancesOf.php b/classes/constraints/containsOnlyInstancesOf.php
@@ -30,7 +30,7 @@ protected function matches($actual)
 
 		try
 		{
-			$asserter = new asserters\object(null, $this->analyzer);
+			$asserter = new asserters\phpObject(null, $this->analyzer);
 
 			foreach ($actual as $value)
 			{
diff --git a/classes/constraints/isInstanceOf.php b/classes/constraints/isInstanceOf.php
@@ -20,7 +20,7 @@ public function __construct($expected, $description = null)
 
 	protected function matches($actual)
 	{
-		$asserter = new asserters\object();
+		$asserter = new asserters\phpObject();
 
 		try
 		{
diff --git a/classes/constraints/isNotInstanceOf.php b/classes/constraints/isNotInstanceOf.php
@@ -20,7 +20,7 @@ public function __construct($expected, $description = null)
 
 	protected function matches($actual)
 	{
-		$asserter = new asserters\object();
+		$asserter = new asserters\phpObject();
 
 		try
 		{
diff --git a/classes/test.php b/classes/test.php
@@ -11,6 +11,7 @@
 
 abstract class test extends atoum\test
 {
+	const defaultMethodPrefix = '/^(test|should)|.*_should_/';
 	const defaultEngine = 'inline';
 	const defaultNamespace = '#(?:^|\\\)tests?\\\.*?units?.*?\\\#i';
 
@@ -173,6 +174,10 @@ public function setAssertionManager(assertion\manager $assertionManager = null)
 					$test->skip('getMock is not supported.');
 				}
 			)
+			->setHandler('getMockForAbstractClass', function() use ($test) {
+					$test->skip('getMockForAbstractClass is not supported.');
+				}
+			)
 			->setHandler('setExpectedException', function() use ($test) {
 					$test->skip('setExpectedException is not supported.');
 				}
diff --git a/composer.json b/composer.json
@@ -12,15 +12,18 @@
         }
     ],
     "require": {
-        "atoum/atoum": "dev-virtual-hooks as 2.6.0"
+        "atoum/atoum": "dev-virtual-hooks as 3.3.0"
 
     },
     "require-dev": {
-        "phpunit/phpunit": "@stable",
-        "atoum/autoloop-extension": "^0.0.1"
+        "phpunit/phpunit": "@stable"
     },
     "autoload": {
-        "files": ["autoloader.php"]
+        "psr-4": {
+            "mageekguy\\atoum\\phpunit\\": "classes"
+        },
+        "classmap": [ "phpunit/" ],
+        "files": ["configuration.php"]
     },
     "extra": {
         "branch-alias": {
diff --git a/configuration.php b/configuration.php
@@ -0,0 +1,12 @@
+<?php
+
+use mageekguy\atoum;
+use mageekguy\atoum\phpunit;
+use mageekguy\atoum\scripts;
+
+if (defined('mageekguy\atoum\scripts\runner') === true && (constant('mageekguy\atoum\version') === 'dev-master' || version_compare(constant('mageekguy\atoum\version'), '2.9.0-beta', '>=') === true)) {
+    scripts\runner::addConfigurationCallable(function(atoum\configurator $script, atoum\runner $runner) {
+        $extension = new phpunit\extension($script);
+        $extension->addToRunner($runner);
+    });
+}
diff --git a/phpunit/AssertionFailedError.php b/phpunit/AssertionFailedError.php
@@ -0,0 +1,3 @@
+<?php
+
+class PHPUnit_Framework_AssertionFailedError extends \mageekguy\atoum\asserter\exception {}
diff --git a/phpunit/Constraint.php b/phpunit/Constraint.php
@@ -0,0 +1,3 @@
+<?php
+
+abstract class PHPUnit_Framework_Constraint extends \mageekguy\atoum\phpunit\constraint {}
diff --git a/phpunit/Exception.php b/phpunit/Exception.php
@@ -0,0 +1,3 @@
+<?php
+
+class PHPUnit_Framework_Exception extends \mageekguy\atoum\exceptions\runtime {}
diff --git a/phpunit/ExpectationFailedException.php b/phpunit/ExpectationFailedException.php
@@ -0,0 +1,3 @@
+<?php
+
+class PHPUnit_Framework_ExpectationFailedException extends \mageekguy\atoum\phpunit\constraint\exception {}
diff --git a/phpunit/TestCase.php b/phpunit/TestCase.php
@@ -0,0 +1,3 @@
+<?php
+
+class PHPUnit_Framework_TestCase extends \mageekguy\atoum\phpunit\test {}
diff --git a/tests/autoloader.php b/tests/autoloader.php
diff --git a/tests/units/classes/constraints/isInstanceofTest.php b/tests/units/classes/constraints/isInstanceofTest.php
@@ -11,12 +11,12 @@ class isInstanceOf extends \PHPUnit_Framework_TestCase
 {
 	public function testClass()
 	{
-		$this->assertInstanceOf('mageekguy\atoum\phpunit\constraint', new testedClass(new \stdClass));
+		$this->assertInstanceOf(atoum\phpunit\constraint::class, new testedClass(new \stdClass));
 	}
 
 	public function testAssertInstanceOf()
 	{
-		$constraint = new testedClass('stdClass');
+		$constraint = new testedClass(\stdClass::class);
 		$this->assertSame($constraint, $constraint->evaluate(new \stdClass()));
 
 		try
@@ -43,7 +43,7 @@ public function testAssertInstanceOfThrowsExceptionForInvalidArgument()
 		}
 		catch (\PHPUnit_Framework_Exception $exception)
 		{
-			$this->assertEquals('Argument of mageekguy\atoum\asserters\object::isInstanceOf() must be a class instance or a class name', $exception->getMessage());
+			$this->assertEquals('Argument of mageekguy\atoum\asserters\phpObject::isInstanceOf() must be a class instance or a class name', $exception->getMessage());
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ protected function matches($actual)`
`30`	`30`
`31`	`31`	`try`
`32`	`32`	`{`
`33`		`- $asserter = new asserters\object(null, $this->analyzer);`
	`33`	`+ $asserter = new asserters\phpObject(null, $this->analyzer);`
`34`	`34`
`35`	`35`	`foreach ($actual as $value)`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function __construct($expected, $description = null)`
`20`	`20`
`21`	`21`	`protected function matches($actual)`
`22`	`22`	`{`
`23`		`- $asserter = new asserters\object();`
	`23`	`+ $asserter = new asserters\phpObject();`
`24`	`24`
`25`	`25`	`try`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`abstract class test extends atoum\test`
`13`	`13`	`{`
	`14`	`+ const defaultMethodPrefix = '/^(test\|should)\|.*_should_/';`
`14`	`15`	`const defaultEngine = 'inline';`
`15`	`16`	`const defaultNamespace = '#(?:^\|\\\)tests?\\\.?units?.?\\\#i';`
`16`	`17`
`@@ -173,6 +174,10 @@ public function setAssertionManager(assertion\manager $assertionManager = null)`
`173`	`174`	`$test->skip('getMock is not supported.');`
`174`	`175`	`}`
`175`	`176`	`)`
	`177`	`+ ->setHandler('getMockForAbstractClass', function() use ($test) {`
	`178`	`+ $test->skip('getMockForAbstractClass is not supported.');`
	`179`	`+ }`
	`180`	`+ )`
`176`	`181`	`->setHandler('setExpectedException', function() use ($test) {`
`177`	`182`	`$test->skip('setExpectedException is not supported.');`
`178`	`183`	`}`