Merge branch 'release/1.1.10'

atk4 · Feb 13, 2017 · 34a7252 · 34a7252
2 parents c7d16dd + 98d27e6
commit 34a7252
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.1.10
+
+ - prevent looping by calling normalizeClass in the API that may also
+   implement factory trait and cause a loop
+
 ## 1.1.8
 
  - Added Exception::getHTML(), similar to getColofulException but for

diff --git a/src/FactoryTrait.php b/src/FactoryTrait.php
@@ -78,9 +78,9 @@ public function normalizeClassName($name, $prefix = null)
         if (
             is_string($name)
             && isset($this->_appScopeTrait, $this->app)
-            && method_exists($this->app, 'normalizeClassName')
+            && method_exists($this->app, 'normalizeClassNameApp')
         ) {
-            $name = $this->app->normalizeClassName($name, $prefix);
+            $name = $this->app->normalizeClassNameApp($name, $prefix);
         }
 
         if (!is_string($name)) {