This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ | |
"require": { | |
"mach/silex-rest": "dev-master" | |
}, | |
"autoload": { | |
"psr-0": { "": "src/" } | |
} | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/library/Mockery/Container.php b/library/Mockery/Container.php | |
index 0d7bdf2..f412c5b 100644 | |
--- a/library/Mockery/Container.php | |
+++ b/library/Mockery/Container.php | |
@@ -193,7 +193,7 @@ class Container | |
$builder->addBlackListedMethods($blocks); | |
if (!is_null($constructorArgs)) { | |
- $builder->addBlackListedMethod("__construct"); // we need to pass through | |
+ $builder->addBlackListedMethods(array("__construct", "__destruct")); // we need to pass through |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/library/Mockery/Container.php b/library/Mockery/Container.php | |
index 0d7bdf2..a5db81f 100644 | |
--- a/library/Mockery/Container.php | |
+++ b/library/Mockery/Container.php | |
@@ -200,6 +200,10 @@ class Container | |
$constructorArgs = array(); | |
} | |
+ if (empty($partialMethods)) { | |
+ $builder->addBlackListedMethod("__destruct"); |
OlderNewer