Merge commit '42776df603e867a87654e7edfa6649337cb975f6'

Author: inhere

test/ContainerTest.php

@@ -13,7 +13,7 @@
 
 /**
  * Class ContainerTest
- * @package Toolkit\DI\Test
+ * @package Toolkit\DITest
  * @covers \Toolkit\DI\Container
  */
 class ContainerTest extends TestCase

test/boot.php

@@ -13,8 +13,13 @@
     if (0 === strpos($class,'Toolkit\DI\Example\\')) {
         $path = str_replace('\\', '/', substr($class, strlen('Toolkit\DI\Example\\')));
         $file = dirname(__DIR__) . "/example/{$path}.php";
+<<<<<<< HEAD
     } elseif (0 === strpos($class,'Toolkit\DITest\\')) {
         $path = str_replace('\\', '/', substr($class, strlen('Toolkit\DITest\\')));
+=======
+    } elseif (0 === strpos($class,'Toolkit\DI\Test\\')) {
+        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\DI\Test\\')));
+>>>>>>> 42776df603e867a87654e7edfa6649337cb975f6
         $file = __DIR__ . "/{$path}.php";
     } elseif (0 === strpos($class,'Toolkit\DI\\')) {
         $path = str_replace('\\', '/', substr($class, strlen('Toolkit\DI\\')));