From f40715f577bcde9ae49735c6f466786b4829a8d0 Mon Sep 17 00:00:00 2001
From: Simon Frings <simon@clue.engineering>
Date: Tue, 2 Feb 2021 12:12:25 +0100
Subject: [PATCH 1/3] Use GitHub actions for continuous integration (CI)

Bye bye Travis CI, you've served us well.
---
 .gitattributes           |  2 +-
 .github/workflows/ci.yml | 45 ++++++++++++++++++++++++++++++++++++++++
 .travis.yml              | 27 ------------------------
 README.md                |  2 +-
 4 files changed, 47 insertions(+), 29 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis.yml

diff --git a/.gitattributes b/.gitattributes
index 64ab6e0f..f658344c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
 /.gitattributes export-ignore
+/.github/ export-ignore
 /.gitignore export-ignore
-/.travis.yml export-ignore
 /examples export-ignore
 /phpunit.xml.dist export-ignore
 /phpunit.xml.legacy export-ignore
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..d321f381
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,45 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  PHPUnit:
+    name: PHPUnit (PHP ${{ matrix.php }})
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        php:
+          - 7.4
+          - 7.3
+          - 7.2
+          - 7.1
+          - 7.0
+          - 5.6
+          - 5.5
+          - 5.4
+          - 5.3
+    steps:
+      - uses: actions/checkout@v2
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+      - run: composer install
+      - run: vendor/bin/phpunit --coverage-text
+        if: ${{ matrix.php >= 7.3 }}
+      - run: vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy
+        if: ${{ matrix.php < 7.3 }}
+
+  PHPUnit-hhvm:
+    name: PHPUnit (HHVM)
+    runs-on: ubuntu-18.04
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v2
+      - uses: azjezz/setup-hhvm@v1
+        with:
+          version: lts-3.30
+      - run: hhvm $(which composer) install
+      - run: hhvm vendor/bin/phpunit
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 56233305..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-language: php
-
-# lock distro so new future defaults will not break the build
-dist: trusty
-
-jobs:
-  include:
-    - php: 5.3
-      dist: precise
-    - php: 5.4
-    - php: 5.5
-    - php: 5.6
-    - php: 7.0
-    - php: 7.1
-    - php: 7.2
-    - php: 7.3
-    - php: 7.4
-    - php: hhvm-3.18
-  allow_failures:
-    - php: hhvm-3.18
-
-install:
-  - composer install
-
-script:
-  - if [[ "$TRAVIS_PHP_VERSION" > "7.2" ]]; then vendor/bin/phpunit --coverage-text; fi
-  - if [[ "$TRAVIS_PHP_VERSION" < "7.3" ]]; then vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy; fi
diff --git a/README.md b/README.md
index be66c197..3337aacb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Dns
 
-[![Build Status](https://travis-ci.org/reactphp/dns.svg?branch=master)](https://travis-ci.org/reactphp/dns)
+[![CI status](https://github.com/reactphp/dns/workflows/CI/badge.svg)](https://github.com/reactphp/dns/actions)
 
 Async DNS resolver for [ReactPHP](https://reactphp.org/).
 

From 6994664a0f9f9d2314bc2cf312dd0f805863225d Mon Sep 17 00:00:00 2001
From: Simon Frings <simon@clue.engineering>
Date: Tue, 2 Feb 2021 12:15:48 +0100
Subject: [PATCH 2/3] Support PHP 8

---
 .github/workflows/ci.yml | 1 +
 README.md                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d321f381..cf214c83 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,7 @@ jobs:
     strategy:
       matrix:
         php:
+          - 8.0
           - 7.4
           - 7.3
           - 7.2
diff --git a/README.md b/README.md
index 3337aacb..e7d86bc6 100644
--- a/README.md
+++ b/README.md
@@ -431,7 +431,7 @@ $ composer require react/dns:^1.4
 See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades.
 
 This project aims to run on any platform and thus does not require any PHP
-extensions and supports running on legacy PHP 5.3 through current PHP 7+ and
+extensions and supports running on legacy PHP 5.3 through current PHP 8+ and
 HHVM.
 It's *highly recommended to use PHP 7+* for this project.
 

From b555fcaa8b4c3c7e29003cc8fbdb07a52908da8e Mon Sep 17 00:00:00 2001
From: Simon Frings <simon@clue.engineering>
Date: Wed, 3 Feb 2021 09:13:36 +0100
Subject: [PATCH 3/3] Set Xdebug's stack limit to 256 for legacy PHP

---
 tests/FunctionalResolverTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/FunctionalResolverTest.php b/tests/FunctionalResolverTest.php
index d56e677e..ca037fee 100644
--- a/tests/FunctionalResolverTest.php
+++ b/tests/FunctionalResolverTest.php
@@ -119,6 +119,9 @@ public function testResolveInvalidRejects()
 
     public function testResolveCancelledRejectsImmediately()
     {
+        // max_nesting_level was set to 100 for PHP Versions < 5.4 which resulted in failing test for legacy PHP
+        ini_set('xdebug.max_nesting_level', 256);
+
         $ex = $this->callback(function ($param) {
             return ($param instanceof \RuntimeException && $param->getMessage() === 'DNS query for google.com has been cancelled');
         });