Merge branch 'hotfix/3074'

Close zendframework/zendframework#3074 Fixes zendframework/zendframework#2451
zendframework · Dec 11, 2012 · 24a5c98 · 24a5c98
commit 24a5c98
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/Definition/CompilerDefinition.php b/src/Definition/CompilerDefinition.php
@@ -299,7 +299,7 @@ protected function processParams(&$def, Reflection\ClassReflection $rClass, Refl
             $def['parameters'][$methodName][$fqName][] = $actualParamName;
             $def['parameters'][$methodName][$fqName][] = ($p->getClass() !== null) ? $p->getClass()->getName() : null;
             $def['parameters'][$methodName][$fqName][] = !($optional =$p->isOptional());
-            $def['parameters'][$methodName][$fqName][] = $optional ? $p->getDefaultValue() : null;
+            $def['parameters'][$methodName][$fqName][] = $optional && $p->isDefaultValueAvailable() ? $p->getDefaultValue() : null;
         }
 
     }

diff --git a/src/Definition/RuntimeDefinition.php b/src/Definition/RuntimeDefinition.php
@@ -346,7 +346,7 @@ protected function processParams(&$def, Reflection\ClassReflection $rClass, Refl
             // set the class name, if it exists
             $def['parameters'][$methodName][$fqName][] = $actualParamName;
             $def['parameters'][$methodName][$fqName][] = ($p->getClass() !== null) ? $p->getClass()->getName() : null;
-            $def['parameters'][$methodName][$fqName][] = !($optional =$p->isOptional() && $p->isDefaultValueAvailable());
+            $def['parameters'][$methodName][$fqName][] = !($optional = $p->isOptional() && $p->isDefaultValueAvailable());
             $def['parameters'][$methodName][$fqName][] = $optional ? $p->getDefaultValue() : null;
         }
 

diff --git a/test/TestAsset/CompilerClasses/F.php b/test/TestAsset/CompilerClasses/F.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Di
+ */
+
+namespace ZendTest\Di\TestAsset\CompilerClasses;
+
+class F extends \Exception
+{
+}