From 4ef2afca9c3166c641fc64b06a9be137a8f33126 Mon Sep 17 00:00:00 2001
From: Nicholas Calugar <njcalugar@gmail.com>
Date: Mon, 26 Nov 2012 12:56:17 -0800
Subject: [PATCH 1/2] Making tests fail by adding a class that extends
 \Exception

---
 tests/ZendTest/Di/TestAsset/CompilerClasses/F.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 tests/ZendTest/Di/TestAsset/CompilerClasses/F.php

diff --git a/tests/ZendTest/Di/TestAsset/CompilerClasses/F.php b/tests/ZendTest/Di/TestAsset/CompilerClasses/F.php
new file mode 100644
index 00000000000..9317f74f05e
--- /dev/null
+++ b/tests/ZendTest/Di/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
+{
+}

From 095e92a315cb1eb62f4613c80d725291fcfc3004 Mon Sep 17 00:00:00 2001
From: Nicholas Calugar <njcalugar@gmail.com>
Date: Mon, 26 Nov 2012 16:37:01 -0800
Subject: [PATCH 2/2] Check if default value is available.

---
 library/Zend/Di/Definition/CompilerDefinition.php | 2 +-
 library/Zend/Di/Definition/RuntimeDefinition.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Zend/Di/Definition/CompilerDefinition.php b/library/Zend/Di/Definition/CompilerDefinition.php
index e4d8eeb2047..5749d3780f3 100644
--- a/library/Zend/Di/Definition/CompilerDefinition.php
+++ b/library/Zend/Di/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/library/Zend/Di/Definition/RuntimeDefinition.php b/library/Zend/Di/Definition/RuntimeDefinition.php
index f2384902f65..df3c0cc2288 100644
--- a/library/Zend/Di/Definition/RuntimeDefinition.php
+++ b/library/Zend/Di/Definition/RuntimeDefinition.php
@@ -347,7 +347,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;
         }
 
     }