From 5f3578d7d3393f7d4ac5a89a21984a8a127252e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Sat, 21 Nov 2015 19:43:37 +0100
Subject: [PATCH 1/2] First class support for PHP7 and HHVM

---
 .travis.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6feb0a25..aca49750 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,17 +7,11 @@ php:
   - 5.6
   - 7
   - hhvm
-  - hhvm-nightly
 
-matrix:
-  allow_failures:
-    - php: 7
-    - php: hhvm
-    - php: hhvm-nightly
-  fast_finish: true
+sudo: false
 
-before_script:
-  - composer install --dev --prefer-source
+install:
+  - composer install --prefer-source --no-interaction
   
 script:
   - phpunit --coverage-text

From 44aad11574da993b678ea13f66e35f45ba10895a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Wed, 24 Feb 2016 23:41:22 +0100
Subject: [PATCH 2/2] Remove unneeded test (resolving with incorrect values)

---
 tests/Resolver/ResolverTest.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/tests/Resolver/ResolverTest.php b/tests/Resolver/ResolverTest.php
index 02f19a73..e28d92c8 100644
--- a/tests/Resolver/ResolverTest.php
+++ b/tests/Resolver/ResolverTest.php
@@ -100,22 +100,6 @@ public function resolveWithNoAnswersShouldCallErrbackIfGiven()
         $resolver->resolve('igor.io')->then($this->expectCallableNever(), $errback);
     }
 
-    /** @test */
-    public function resolveSouldProvideDefaultErrorbackToExecutor()
-    {
-        $executor = $this->createExecutorMock();
-        $executor
-            ->expects($this->once())
-            ->method('query')
-            ->with($this->anything(), $this->isInstanceOf('React\Dns\Query\Query'))
-            ->will($this->returnCallback(function ($nameserver, $query) {
-                return Promise\resolve();
-            }));;
-
-        $resolver = new Resolver('8.8.8.8:53', $executor);
-        $resolver->resolve('igor.io')->then($this->expectCallableNever());
-    }
-
     protected function expectCallableOnceWith($with)
     {
         $mock = $this->createCallableMock();