Merge branch 'release/1.0.3'

atk4 · Jul 5, 2016 · b18a992 · b18a992
2 parents 3dc69f5 + 7346f34
commit b18a992
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.3
+
+* Minor cleanups, exception will now show previous exception
+
+## 1.0.2
+
+* Added FactoryTrait
+* FactoryTrait has normalizeClassName method
 
 ## 1.0.1
 

diff --git a/src/ContainerTrait.php b/src/ContainerTrait.php
@@ -49,7 +49,7 @@ function add($obj, $args = [])
     {
         if (isset($this->_factoryTrait)) {
             // Factory allows us to pass string-type objects
-            $obj = $this->factory($obj, $args);
+            $obj = $this->factory($this->normalizeClassName($obj), $args);
         }
         $obj = $this->_add_Container($obj, $args);
 
@@ -196,6 +196,7 @@ function getElement($short_name) {
         if (!isset($this->elements[$short_name])) {
             throw new Exception([
                 'Child element not found',
+                'parent'=>$this,
                 'element'=>$short_name
             ]);
         }

diff --git a/src/Exception.php b/src/Exception.php
@@ -60,10 +60,8 @@ public function getColorfulText()
 
         foreach($this->getTrace() as $i=>$call) {
             if (!isset($call['file'])) {
-                break;
-            }
-
-            if (
+                $call['file'] = '';
+            } elseif (
                 $in_atk &&
                 strpos($call['file'], '/data/src/') === false && 
                 strpos($call['file'], '/core/src/') === false &&
@@ -80,7 +78,7 @@ public function getColorfulText()
             $line = str_pad($call['line'], 4, ' ', STR_PAD_LEFT);
 
             $output .= "\n\033[0;34m".$file."\033[0m";
-            $output .= ":\033[0;31m".$call['line']."\033[0m";
+            $output .= ":\033[0;31m".$line."\033[0m";
 
             if (isset($call['object'])) {
                 $name = (!isset($call['object']->name)) ? get_class($call['object']) : $call['object']->name;
@@ -114,9 +112,16 @@ public function getColorfulText()
 
         }
 
+        if ($p= $this->getPrevious()) {
+            $output .= "\n\033[0mCaused by Previous Exception:\n";
+            $output .= "\033[1;31m".get_class($p).": ".$p->getMessage()."\033[0;31m".
+                ($p->getCode() ? ' [code: '.$p->getCode().']' : '');
+        }
+
         // next print params
 
         $output .= "\n\033[1;31m--------------------------------------------------------\n";
+
         return $output."\033[0m";
     }