Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Hotfix/issue #2451 #3074

Closed
wants to merge 2 commits into from
Closed

Hotfix/issue #2451 #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ef2afc
Making tests fail by adding a class that extends \Exception
SocalNick Nov 26, 2012
095e92a
Check if default value is available.
SocalNick Nov 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/Zend/Di/Definition/CompilerDefinition.php
View file
Open in desktop
Expand Up @@ -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;
}

}
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Di/Definition/RuntimeDefinition.php
View file
Open in desktop
Expand Up @@ -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;
}

}
Expand Down
15 changes: 15 additions & 0 deletions tests/ZendTest/Di/TestAsset/CompilerClasses/F.php
View file
Open in desktop
@@ -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
{
}