Merge 4c43a09 into 173ff91

composer.json

@@ -13,9 +13,10 @@
     "require": {
         "php": ">=5.4.0",
         "zircote/swagger-php": "0.9.*",
-        "phpunit/phpunit": "4.0.*"
+        "sebastian/comparator": "~1.1"
     },
     "require-dev": {
+        "phpunit/phpunit": "~4.0",
         "satooshi/php-coveralls": "dev-master"
     },
     "autoload": {

src/Compare/CompareResponseAndAnnotation.php

@@ -2,10 +2,11 @@
 
 namespace SwaggerAssert\Compare;
 
+use SebastianBergmann\Comparator\ComparisonFailure;
+use SebastianBergmann\Comparator\Factory as ComparatorFactory;
 use SwaggerAssert\CompareInterface;
 use SwaggerAssert\PickInterface;
 use SwaggerAssert\Exception\CompareException;
-use PHPUnit_Framework_ComparatorFactory;
 use SebastianBergmann\Diff\Differ;
 
 /**
@@ -16,7 +17,7 @@ class CompareResponseAndAnnotation implements CompareInterface
     /* @var \SwaggerAssert\Pick\PickResponseAndAnnotation $pick */
     private $pick;
 
-    /* @var \PHPUnit_Framework_ComparatorFactory */
+    /* @var ComparatorFactory */
     private $comparatorFactory;
 
     /* @var \SebastianBergmann\Diff\Differ  */
@@ -29,7 +30,7 @@ public function __construct(PickInterface $pick)
     {
         $this->pick = $pick;
         $this->pick->execute();
-        $this->comparatorFactory = PHPUnit_Framework_ComparatorFactory::getDefaultInstance();
+        $this->comparatorFactory = ComparatorFactory::getInstance();
         $this->differ = new Differ("--- Response\n+++ Swagger\n");
     }
 
@@ -70,7 +71,7 @@ private function emulateAssertEquals($expected, $actual)
         try {
             $comparator = $this->comparatorFactory->getComparatorFor($expected, $actual);
             $comparator->assertEquals($actual, $expected, 0, false, false);
-        } catch (\PHPUnit_Framework_ComparisonFailure $e) {
+        } catch (ComparisonFailure $e) {
             $messageHead = "Failed asserting that API response and swagger document are equal.\n";
             throw new CompareException($messageHead . $this->differ->diff($e->getExpectedAsString(), $e->getActualAsString()));
         }

tests/SwaggerAssert/ContainerTest.php

@@ -49,14 +49,4 @@ public function keysWithValue($subject)
     {
         $this->assertInstanceOf('SwaggerAssert\Container\Actual', $subject->sample);
     }
-
-    /**
-     * @test
-     * @expectedException \Exception
-     */
-    public function setWithInvalidValue()
-    {
-        $subject = new Container();
-        $subject->push('sample', ['something array']);
-    }
 }