diff --git a/PHPUnit/Extensions/PhptTestCase.php b/PHPUnit/Extensions/PhptTestCase.php
index bb66bdc23eb..98bf0dad0bb 100644
--- a/PHPUnit/Extensions/PhptTestCase.php
+++ b/PHPUnit/Extensions/PhptTestCase.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 /**
  * PHPUnit
  *
@@ -115,12 +118,14 @@ public function count()
     /**
      * Runs a test and collects its result in a TestResult instance.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param  PHPUnit_Framework_TestResult|null $result
      * @param  array                        $options
      * @return PHPUnit_Framework_TestResult
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL, array $options = array())
+    public function run($result = NULL, array $options = array())
     {
+        Types::isNullable('result', $result, 'PHPUnit_Framework_TestResult');
+
         if (!class_exists('PEAR_RunTest', FALSE)) {
             throw new PHPUnit_Framework_Exception('Class PEAR_RunTest not found.');
         }
diff --git a/PHPUnit/Extensions/RepeatedTest.php b/PHPUnit/Extensions/RepeatedTest.php
index ea6dcc5415e..6c12c667be2 100644
--- a/PHPUnit/Extensions/RepeatedTest.php
+++ b/PHPUnit/Extensions/RepeatedTest.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 /**
  * PHPUnit
  *
@@ -125,12 +128,14 @@ public function count()
      * Runs the decorated test and collects the
      * result in a TestResult.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param  PHPUnit_Framework_TestResult|null $result
      * @return PHPUnit_Framework_TestResult
      * @throws PHPUnit_Framework_Exception
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run($result = NULL)
     {
+        Types::isNullable('result', $result, 'PHPUnit_Framework_TestResult');
+
         if ($result === NULL) {
             $result = $this->createResult();
         }
diff --git a/PHPUnit/Extensions/TestDecorator.php b/PHPUnit/Extensions/TestDecorator.php
index 18f0b13e9b1..36757fd2e0a 100644
--- a/PHPUnit/Extensions/TestDecorator.php
+++ b/PHPUnit/Extensions/TestDecorator.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 /**
  * PHPUnit
  *
@@ -134,11 +137,13 @@ public function getTest()
      * Runs the decorated test and collects the
      * result in a TestResult.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param  PHPUnit_Framework_TestResult|null $result
      * @return PHPUnit_Framework_TestResult
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run($result = NULL)
     {
+        Types::isNullable('result', $result, 'PHPUnit_Framework_TestResult');
+
         if ($result === NULL) {
             $result = $this->createResult();
         }
diff --git a/PHPUnit/Framework/Constraint.php b/PHPUnit/Framework/Constraint.php
index ded42147f42..91a51ab77bc 100644
--- a/PHPUnit/Framework/Constraint.php
+++ b/PHPUnit/Framework/Constraint.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 /**
  * PHPUnit
  *
@@ -123,11 +126,13 @@ public function count()
      *
      * @param  mixed $other Evaluated value or object.
      * @param  string $description Additional information about the test
-     * @param  PHPUnit_Framework_ComparisonFailure $comparisonFailure
+     * @param  PHPUnit_Framework_ComparisonFailure|null $comparisonFailure
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    protected function fail($other, $description, PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL)
+    protected function fail($other, $description, $comparisonFailure = NULL)
     {
+        Types::isNullable('comparisonFailure', $comparisonFailure, 'PHPUnit_Framework_ComparisonFailure');
+
         $failureDescription = sprintf(
           'Failed asserting that %s.',
           $this->failureDescription($other)
diff --git a/PHPUnit/Framework/Error.php b/PHPUnit/Framework/Error.php
index c599e18d2ee..ab3855bad6e 100644
--- a/PHPUnit/Framework/Error.php
+++ b/PHPUnit/Framework/Error.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 /**
  * PHPUnit
  *
@@ -63,10 +66,12 @@ class PHPUnit_Framework_Error extends Exception
      * @param  integer    $code
      * @param  string     $file
      * @param  integer    $line
-     * @param  Exception  $previous
+     * @param  Exception|null  $previous
      */
-    public function __construct($message, $code, $file, $line, Exception $previous = NULL)
+    public function __construct($message, $code, $file, $line, $previous = NULL)
     {
+        Types::isNullable('previous', $previous, 'Exception');
+
         parent::__construct($message, $code, $previous);
 
         $this->file  = $file;
diff --git a/PHPUnit/Framework/ExpectationFailedException.php b/PHPUnit/Framework/ExpectationFailedException.php
index cdb48cbba3f..373998d1851 100644
--- a/PHPUnit/Framework/ExpectationFailedException.php
+++ b/PHPUnit/Framework/ExpectationFailedException.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 /**
  * PHPUnit
  *
@@ -61,12 +64,15 @@
 class PHPUnit_Framework_ExpectationFailedException extends PHPUnit_Framework_AssertionFailedError
 {
     /**
-     * @var PHPUnit_Framework_ComparisonFailure
+     * @var null|PHPUnit_Framework_ComparisonFailure
      */
     protected $comparisonFailure;
 
-    public function __construct($message, PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL, Exception $previous = NULL)
+    public function __construct($message, $comparisonFailure = NULL, $previous = NULL)
     {
+        Types::isNullable('comparisonFailure', $comparisonFailure, 'PHPUnit_Framework_ComparisonFailure');
+        Types::isNullable('previous', $previous, 'Exception');
+
         $this->comparisonFailure = $comparisonFailure;
 
         parent::__construct($message, 0, $previous);
diff --git a/PHPUnit/Framework/Test.php b/PHPUnit/Framework/Test.php
index d77af35941a..a198028f9a5 100644
--- a/PHPUnit/Framework/Test.php
+++ b/PHPUnit/Framework/Test.php
@@ -62,5 +62,5 @@ interface PHPUnit_Framework_Test extends Countable
      * @param  PHPUnit_Framework_TestResult $result
      * @return PHPUnit_Framework_TestResult
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL);
+    public function run($result = NULL);
 }
diff --git a/PHPUnit/Framework/TestCase.php b/PHPUnit/Framework/TestCase.php
index 51ce9ad1289..021815a2efe 100644
--- a/PHPUnit/Framework/TestCase.php
+++ b/PHPUnit/Framework/TestCase.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 /**
  * PHPUnit
  *
@@ -672,12 +675,14 @@ public function hasFailed()
      * Runs the test case and collects the results in a TestResult object.
      * If no TestResult object is passed a new one will be created.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param  PHPUnit_Framework_TestResult|null $result
      * @return PHPUnit_Framework_TestResult
      * @throws PHPUnit_Framework_Exception
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run($result = NULL)
     {
+        Types::isNullable('result', $result, 'PHPUnit_Framework_TestResult');
+
         if ($result === NULL) {
             $result = $this->createResult();
         }
diff --git a/PHPUnit/Framework/TestSuite.php b/PHPUnit/Framework/TestSuite.php
index 4faad4ace27..6675097f3c0 100644
--- a/PHPUnit/Framework/TestSuite.php
+++ b/PHPUnit/Framework/TestSuite.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 /**
  * PHPUnit
  *
@@ -617,7 +620,7 @@ public function getGroups()
     /**
      * Runs the tests and collects their result in a TestResult.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param  PHPUnit_Framework_TestResult|null $result
      * @param  mixed                        $filter
      * @param  array                        $groups
      * @param  array                        $excludeGroups
@@ -625,8 +628,10 @@ public function getGroups()
      * @return PHPUnit_Framework_TestResult
      * @throws PHPUnit_Framework_Exception
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL, $filter = FALSE, array $groups = array(), array $excludeGroups = array(), $processIsolation = FALSE)
+    public function run($result = NULL, $filter = FALSE, array $groups = array(), array $excludeGroups = array(), $processIsolation = FALSE)
     {
+        Types::isNullable('result', $result, 'PHPUnit_Framework_TestResult');
+
         if ($result === NULL) {
             $result = $this->createResult();
         }
diff --git a/PHPUnit/TextUI/TestRunner.php b/PHPUnit/TextUI/TestRunner.php
index d3e273018cd..740607e2772 100644
--- a/PHPUnit/TextUI/TestRunner.php
+++ b/PHPUnit/TextUI/TestRunner.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 /**
  * PHPUnit
  *
@@ -82,12 +85,15 @@ class PHPUnit_TextUI_TestRunner extends PHPUnit_Runner_BaseTestRunner
     protected static $versionStringPrinted = FALSE;
 
     /**
-     * @param PHPUnit_Runner_TestSuiteLoader $loader
-     * @param PHP_CodeCoverage_Filter        $filter
+     * @param null|PHPUnit_Runner_TestSuiteLoader $loader
+     * @param null|PHP_CodeCoverage_Filter        $filter
      * @since Method available since Release 3.4.0
      */
-    public function __construct(PHPUnit_Runner_TestSuiteLoader $loader = NULL, PHP_CodeCoverage_Filter $filter = NULL)
+    public function __construct($loader = NULL, $filter = NULL)
     {
+        Types::isNullable('loader', $loader, 'PHPUnit_Runner_TestSuiteLoader');
+        Types::isNullable('filter', $filter, 'PHP_CodeCoverage_Filter');
+
         if ($filter === NULL) {
             $filter = new PHP_CodeCoverage_Filter;
         }
diff --git a/PHPUnit/Util/PHP.php b/PHPUnit/Util/PHP.php
index 27b7f3790f2..b7450aa02d4 100644
--- a/PHPUnit/Util/PHP.php
+++ b/PHPUnit/Util/PHP.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 /**
  * PHPUnit
  *
@@ -154,13 +157,16 @@ public static function factory()
      * Runs a single job (PHP code) using a separate PHP process.
      *
      * @param  string                       $job
-     * @param  PHPUnit_Framework_TestCase   $test
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param  PHPUnit_Framework_TestCase|null   $test
+     * @param  PHPUnit_Framework_TestResult|null $result
      * @return array|null
      * @throws PHPUnit_Framework_Exception
      */
-    public function runJob($job, PHPUnit_Framework_Test $test = NULL, PHPUnit_Framework_TestResult $result = NULL)
+    public function runJob($job, $test = NULL, $result = NULL)
     {
+        Types::isNullable('test', $test, 'PHPUnit_Framework_Test');
+        Types::isNullable('result', $result, 'PHPUnit_Framework_TestResult');
+
         $process = proc_open(
           $this->getPhpBinary(),
           array(
diff --git a/Tests/_files/DoubleTestCase.php b/Tests/_files/DoubleTestCase.php
index 1e8380a1d0d..4de6c3bfe56 100644
--- a/Tests/_files/DoubleTestCase.php
+++ b/Tests/_files/DoubleTestCase.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 class DoubleTestCase implements PHPUnit_Framework_Test
 {
     protected $testCase;
@@ -14,8 +17,10 @@ public function count()
         return 2;
     }
 
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run($result = NULL)
     {
+        Types::isNullable('result', $result, 'PHPUnit_Framework_TestResult');
+
         $result->startTest($this);
 
         $this->testCase->runBare();
diff --git a/composer.json b/composer.json
index 0bd52ed7d03..70fb95fb90b 100644
--- a/composer.json
+++ b/composer.json
@@ -29,6 +29,10 @@
         {
             "type": "pear",
             "url": "https://pear.php.net"
+        },
+        {
+            "type": "git",
+            "url": "git@github.com:zf1s/compat.git"
         }
     ],
     "require": {
@@ -44,7 +48,8 @@
         "ext-json": "*",
         "ext-pcre": "*",
         "ext-reflection": "*",
-        "ext-spl": "*"
+        "ext-spl": "*",
+        "zf1s/compat": "^1.0"
     },
     "require-dev": {
         "pear-pear.php.net/pear": "~1.9|~1.10"
diff --git a/deps/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator.php b/deps/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator.php
index b5af44db160..daf52bd7c89 100644
--- a/deps/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator.php
+++ b/deps/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator.php
@@ -1,4 +1,7 @@
 <?php
+
+use Zf1s\Compat\Types;
+
 /**
  * PHPUnit
  *
@@ -376,8 +379,10 @@ public static function getObjectForTrait($traitName, array $arguments = array(),
      * @param  boolean $cloneArguments
      * @return array
      */
-    public static function generate($originalClassName, array $methods = NULL, $mockClassName = '', $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = TRUE)
+    public static function generate($originalClassName, $methods = NULL, $mockClassName = '', $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = TRUE)
     {
+        Types::isNullable('methods', $methods, 'array');
+    
         if ($mockClassName == '') {
             $key = md5(
               $originalClassName .