update test namespace. update travis config

inhere · inhere · commit 8970aee3c191 · 2019-02-02T00:19:02.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ before_script:
   - composer require php-coveralls/php-coveralls:^2.1.0
 
 script:
-  - phpunit --coverage-clover clover.xml
+  - phpunit -vvv --coverage-clover clover.xml
 
 after_success:
   - vendor/bin/php-coveralls --coverage_clover=clover.xml --json_path=coveralls-upload.json -v
diff --git a/composer.json b/composer.json
@@ -28,6 +28,11 @@
       "src/Helper/functions.php"
     ]
   },
+  "autoload-dev":  {
+    "psr-4": {
+      "Inhere\\RouteTest\\": "src/"
+    }
+  },
   "suggest": {
     "inhere/simple-print-tool": "Very lightweight data printing tools"
   }
diff --git a/test/CachedRouterTest.php b/test/CachedRouterTest.php
@@ -6,7 +6,7 @@
  * Time: 00:10
  */
 
-namespace Inhere\Route\Test;
+namespace Inhere\RouteTest;
 
 use Inhere\Route\CachedRouter;
 use Inhere\Route\Route;
@@ -15,7 +15,7 @@
 
 /**
  * Class CachedRouterTest
- * @package Inhere\Route\Test
+ * @package Inhere\RouteTest
  */
 class CachedRouterTest extends TestCase
 {
diff --git a/test/DispatcherTest.php b/test/DispatcherTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Inhere\Route\Test;
+namespace Inhere\RouteTest;
 
 use Inhere\Route\Dispatcher\Dispatcher;
 use Inhere\Route\Router;
diff --git a/test/PreMatchRouterTest.php b/test/PreMatchRouterTest.php
@@ -6,7 +6,7 @@
  * Time: 15:13
  */
 
-namespace Inhere\Route\Test;
+namespace Inhere\RouteTest;
 
 use Inhere\Route\PreMatchRouter;
 use Inhere\Route\Route;
@@ -15,7 +15,7 @@
 
 /**
  * Class PreMatchRouterTest
- * @package Inhere\Route\Test
+ * @package Inhere\RouteTest
  * @covers \Inhere\Route\PreMatchRouter
  */
 class PreMatchRouterTest extends TestCase
diff --git a/test/RouteHelperTest.php b/test/RouteHelperTest.php
@@ -6,14 +6,14 @@
  * Time: 23:53
  */
 
-namespace Inhere\Route\Test;
+namespace Inhere\RouteTest;
 
 use Inhere\Route\Helper\RouteHelper;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Class RouteHelperTest
- * @package Inhere\Route\Test
+ * @package Inhere\RouteTest
  */
 class RouteHelperTest extends TestCase
 {
diff --git a/test/RouteTest.php b/test/RouteTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Inhere\Route\Test;
+namespace Inhere\RouteTest;
 
 use Inhere\Route\Route;
 use PHPUnit\Framework\TestCase;
diff --git a/test/RouterManagerTest.php b/test/RouterManagerTest.php
@@ -6,7 +6,7 @@
  * Time: 12:00
  */
 
-namespace Inhere\Route\Test;
+namespace Inhere\RouteTest;
 
 use Inhere\Route\PreMatchRouter;
 use Inhere\Route\Router;
@@ -15,7 +15,7 @@
 
 /**
  * Class RouterManagerTest
- * @package Inhere\Route\Test
+ * @package Inhere\RouteTest
  * @covers \Inhere\Route\RouterManager
  */
 class RouterManagerTest extends TestCase
diff --git a/test/RouterTest.php b/test/RouterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Inhere\Route\Test;
+namespace Inhere\RouteTest;
 
 use Inhere\Route\Route;
 use Inhere\Route\Router;
diff --git a/test/SRouterTest.php b/test/SRouterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Inhere\Route\Test;
+namespace Inhere\RouteTest;
 
 use Inhere\Route\Route;
 use Inhere\Route\Router;
@@ -9,7 +9,7 @@
 
 /**
  * Class SRouterTest
- * @package Inhere\Route\Test
+ * @package Inhere\RouteTest
  */
 class SRouterTest extends TestCase
 {
diff --git a/test/ServerRouterTest.php b/test/ServerRouterTest.php
@@ -6,15 +6,15 @@
  * Time: 12:59
  */
 
-namespace Inhere\Route\Test;
+namespace Inhere\RouteTest;
 
 use Inhere\Route\Route;
 use Inhere\Route\ServerRouter;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Class ServerRouterTest
- * @package Inhere\Route\Test
+ * @package Inhere\RouteTest
  */
 class ServerRouterTest extends TestCase
 {
diff --git a/test/boot.php b/test/boot.php
@@ -16,32 +16,30 @@
 
 require dirname(__DIR__) . '/src/Helper/functions.php';
 
-spl_autoload_register(function ($class) {
-    $file = null;
-
-    if (0 === strpos($class, 'Inhere\Route\Example\\')) {
-        $path = str_replace('\\', '/', substr($class, strlen('Inhere\Route\Example\\')));
-        $file = dirname(__DIR__) . "/example/{$path}.php";
-    } elseif (0 === strpos($class, 'Inhere\Route\Test\\')) {
-        $path = str_replace('\\', '/', substr($class, strlen('Inhere\Route\Test\\')));
-        $file = __DIR__ . "/{$path}.php";
-    } elseif (0 === strpos($class, 'Inhere\Route\\')) {
-        $path = str_replace('\\', '/', substr($class, strlen('Inhere\Route\\')));
-        $file = dirname(__DIR__) . "/src/{$path}.php";
-    }
-
-    if ($file && is_file($file)) {
-        include $file;
+$libDir = dirname(__DIR__);
+$npMap  = [
+    'Inhere\Route\Example\\' => $libDir . '/example/',
+    'Inhere\RouteTest\\'     => $libDir . '/test/',
+    'Inhere\Route\\'         => $libDir . '/src/',
+];
+
+spl_autoload_register(function ($class) use ($npMap) {
+    foreach ($npMap as $np => $dir) {
+        $file = $dir . str_replace('\\', '/', substr($class, strlen($np))) . '.php';
+
+        if (file_exists($file)) {
+            include $file;
+        }
     }
 });
 
 // generates a random request url
 function random_request_url($chance = 5)
 {
-    $characters = 'abcdefghijklmnopqrstuvwxyz';
+    $characters       = 'abcdefghijklmnopqrstuvwxyz';
     $charactersLength = strlen($characters);
-    $randomString = '/';
-    $rand = random_int(5, 20);
+    $randomString     = '/';
+    $rand             = random_int(5, 20);
 
     // create random path of 5-20 characters
     for ($i = 0; $i < $rand; $i++) {
@@ -73,21 +71,21 @@ function random_request_method()
 function pretty_echo($msg, $style = 'green', $nl = false)
 {
     static $styles = [
-        'yellow' => '1;33',
+        'yellow'  => '1;33',
         'magenta' => '1;35',
-        'white' => '1;37',
-        'black' => '0;30',
-        'red' => '0;31',
-        'green' => '0;32',
-        'brown' => '0;33',
-        'blue' => '0;34',
-        'cyan' => '0;36',
-
-        'light_red' => '1;31',
-        'light_blue' => '1;34',
-        'light_gray' => '37',
+        'white'   => '1;37',
+        'black'   => '0;30',
+        'red'     => '0;31',
+        'green'   => '0;32',
+        'brown'   => '0;33',
+        'blue'    => '0;34',
+        'cyan'    => '0;36',
+
+        'light_red'   => '1;31',
+        'light_blue'  => '1;34',
+        'light_gray'  => '37',
         'light_green' => '1;32',
-        'light_cyan' => '1;36',
+        'light_cyan'  => '1;36',
     ];
 
     if (isset($styles[$style]) && false === strpos(PHP_OS, 'WIN')) {

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,11 @@`
`28`	`28`	`"src/Helper/functions.php"`
`29`	`29`	`]`
`30`	`30`	`},`
	`31`	`+ "autoload-dev": {`
	`32`	`+ "psr-4": {`
	`33`	`+ "Inhere\\RouteTest\\": "src/"`
	`34`	`+ }`
	`35`	`+ },`
`31`	`36`	`"suggest": {`
`32`	`37`	`"inhere/simple-print-tool": "Very lightweight data printing tools"`
`33`	`38`	`}`