Use PSR-4 autoloader and proper namespace for tests

composer.json

@@ -14,6 +14,9 @@
         "psr-4": { "React\\Promise\\Timer\\": "src/" },
         "files": [ "src/functions.php" ]
     },
+    "autoload-dev": {
+        "psr-4": { "React\\Tests\\Promise\\Timer\\": "tests/" }
+    },
     "require": {
         "php": ">=5.3",
         "react/event-loop": "~0.4.0|~0.3.0",

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php"
+<phpunit bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"

tests/CallableStub.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace React\Tests\Promise\Timer;
+
+class CallableStub
+{
+    public function __invoke()
+    {
+    }
+}

tests/FunctionRejectTest.php

@@ -1,7 +1,8 @@
 <?php
 
+namespace React\Tests\Promise\Timer;
+
 use React\Promise\Timer;
-use React\Promise\CancellablePromiseInterface;
 
 class FunctionRejectTest extends TestCase
 {

tests/FunctionResolveTest.php

@@ -1,7 +1,8 @@
 <?php
 
+namespace React\Tests\Promise\Timer;
+
 use React\Promise\Timer;
-use React\Promise\CancellablePromiseInterface;
 
 class FunctionResolveTest extends TestCase
 {

tests/FunctionTimeoutTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace React\Tests\Promise\Timer;
+
 use React\Promise\Timer;
 use React\Promise;
 

tests/bootstrap.php → tests/TestCase.php

@@ -1,8 +1,9 @@
 <?php
 
-use React\EventLoop\Factory;
+namespace React\Tests\Promise\Timer;
 
-require __DIR__ . '/../vendor/autoload.php';
+use React\EventLoop\Factory;
+use PHPUnit_Framework_TestCase;
 
 class TestCase extends PHPUnit_Framework_TestCase
 {
@@ -40,10 +41,9 @@ protected function expectCallableNever()
      */
     protected function createCallableMock()
     {
-        return $this->getMock('CallableStub');
+        return $this->getMock('React\Tests\Promise\Timer\CallableStub');
     }
 
-
     protected function expectPromiseRejected($promise)
     {
         return $promise->then($this->expectCallableNever(), $this->expectCallableOnce());
@@ -59,10 +59,3 @@ protected function expectPromisePending($promise)
         return $promise->then($this->expectCallableNever(), $this->expectCallableNever());
     }
 }
-
-class CallableStub
-{
-    public function __invoke()
-    {
-    }
-}

tests/TimeoutExceptionTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace React\Tests\Promise\Timer;
+
 use React\Promise\Timer\TimeoutException;
 
 class TimeoutExceptionTest extends TestCase