bug fixed for container

Author: inhere

src/collections/Collection.php

@@ -103,9 +103,9 @@ public static function make($data = null, $format = 'php', $name = 'box1')
      */
     public function set($path, $value)
     {
-        if (is_array($value) || is_object($value)) {
-            $value = DataHelper::toArray($value, true);
-        }
+//        if (is_array($value) || is_object($value)) {
+//            $value = DataHelper::toArray($value, true);
+//        }
 
         Arr::setByPath($this->data, $path, $value, $this->separator);
 
@@ -331,7 +331,7 @@ protected function bindData(&$parent, $data, $raw = false)
     {
         // Ensure the input data is an array.
         if (!$raw) {
-            $data = DataHelper::toArray($data, true);
+            $data = DataHelper::toArray($data);
         }
 
         foreach ($data as $key => $value) {

src/di/Container.php

@@ -119,7 +119,7 @@ public function __destruct()
      *  'shared' => (bool), 是否共享
      *  'locked' => (bool), 是否锁定服务
      *  'aliases' => (array), 别名
-     *  'activity' => (bool), 立即激活
+     *  'active' => (bool), 立即激活
      * ]
      * @return $this
      * @internal param bool $shared 是否共享
@@ -139,7 +139,7 @@ public function set($id, $definition, array $opts = [])
             'aliases' => null,
             'shared' => true,
             'locked' => false,
-            'activity' => false,
+            'active' => false,
         ], $opts);
 
         // 已经是个服务实例 object 不是闭包 closure
@@ -189,8 +189,8 @@ public function set($id, $definition, array $opts = [])
 
         $this->services[$id] = new Service($callback, $args, $opts['shared'], $opts['locked']);
 
-        // activity
-        if ($opts['activity']) {
+        // active service
+        if ($opts['active']) {
             $this->get($id);
         }
 

src/helpers/DataHelper.php

@@ -45,10 +45,10 @@ public static function decode($txt, $allowedClasses = false)
     public static function toArray($data, $recursive = false)
     {
         // Ensure the input data is an array.
-        if ($data instanceof \Traversable) {
+        if (is_object($data) && $data instanceof \Traversable) {
             $data = iterator_to_array($data);
-        } elseif (is_object($data)) {
-            $data = get_object_vars($data);
+//        } elseif (is_object($data)) {
+//            $data = get_object_vars($data);
         } else {
             $data = (array)$data;
         }

src/helpers/PhpHelper.php

@@ -132,21 +132,24 @@ public static function hasXdebug(): bool
      * @param \Exception|\Throwable $e the exception being converted
      * @param bool $clearHtml
      * @param bool $getTrace
+     * @param null|string $catcher
      * @return string the string representation of the exception.
      */
-    public static function exceptionToString($e, $clearHtml = false, $getTrace = false): string
+    public static function exceptionToString($e, $clearHtml = false, $getTrace = false, $catcher = null): string
     {
         if (!$getTrace) {
             $message = "Error: {$e->getMessage()}";
         } else {
             $type = $e instanceof \ErrorException ? 'Error' : 'Exception';
+            $catcher = $catcher ? "Catch By: $catcher\n" : '';
             $message = sprintf(
-                "<h3>%s(%d): %s</h3>\n<pre><strong>File: %s(Line %d)</strong> \n\n%s</pre>",
+                "<h3>%s(%d): %s</h3>\n<pre><strong>File: %s(Line %d)</strong>%s \n\n%s</pre>",
                 $type,
                 $e->getCode(),
                 $e->getMessage(),
                 $e->getFile(),
                 $e->getLine(),
+                $catcher,
                 $e->getTraceAsString()
             );