run code inspection check. fix some errors

Author: inhere

src/CallableResolver.php

@@ -16,7 +16,7 @@
  */
 final class CallableResolver implements CallableResolverInterface
 {
-    const CALLABLE_PATTERN = '!^([^\:]+)\:([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)$!';
+    public const CALLABLE_PATTERN = '!^([^\:]+)\:([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)$!';
 
     /**
      * @var ContainerInterface|Container

src/Container.php

@@ -25,7 +25,7 @@ class Container implements ContainerInterface, \ArrayAccess, \IteratorAggregate,
 {
     use NameAliasTrait;
 
-    const DEFAULT_OPTIONS = [
+    public const DEFAULT_OPTIONS = [
         'aliases' => null,
         'shared'  => true,
         'locked'  => false,
@@ -565,11 +565,7 @@ public function isLocked(string $id): bool
     {
         $id = $this->resolveAlias($id);
 
-        if (isset($this->ids[$id])) {
-            return $this->ids[$id];
-        }
-
-        return false;
+        return $this->ids[$id] ?? false;
     }
 
     /**

test/boot.php

@@ -13,14 +13,8 @@
     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\\')));