From 49aaad84fce44545114ef3605b927e9539ab0eec Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Wed, 3 Apr 2019 20:59:41 +0100 Subject: [PATCH 1/3] update PHP versions; include PHP 7.x in travis build --- .travis.yml | 6 ++++-- composer.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84ba3b8..f4c0451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,11 @@ language: php php: - - 5.4 - - 5.5 - 5.6 + - 7.0 + - 7.1 + - 7.2 + - 7.3 before_script: - composer install diff --git a/composer.json b/composer.json index 568a0a4..f5d832a 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ } ], "require": { - "php": ">=5.3.0", + "php": ">=5.6.0", "symfony/process": "~2.0|~3.0|~4.0" }, "require-dev": { From 2a669c6749bf90af0de110f1f9b1226117a50e3a Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Wed, 3 Apr 2019 21:02:19 +0100 Subject: [PATCH 2/3] fix deprecated PHPUnit getMock() -> createMock() --- tests/Nmap/Tests/NmapTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Nmap/Tests/NmapTest.php b/tests/Nmap/Tests/NmapTest.php index 337bf43..f7fd519 100644 --- a/tests/Nmap/Tests/NmapTest.php +++ b/tests/Nmap/Tests/NmapTest.php @@ -258,7 +258,7 @@ public function testScanWithUserTimeout() */ public function testExecutableNotExecutable() { - $executor = $this->getMock('Nmap\Util\ProcessExecutor'); + $executor = $this->createMock('Nmap\Util\ProcessExecutor'); $executor ->expects($this->once()) ->method('execute') @@ -272,7 +272,7 @@ public function testExecutableNotExecutable() */ private function getProcessExecutorMock() { - $executor = $this->getMock('Nmap\Util\ProcessExecutor'); + $executor = $this->createMock('Nmap\Util\ProcessExecutor'); $executor ->expects($this->at(0)) ->method('execute') From 2e9d5d63e0e8c0efa256e870d5a1807ca7188478 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Wed, 3 Apr 2019 21:06:48 +0100 Subject: [PATCH 3/3] bump phpunit to fix deprecation warnings --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f5d832a..498f33d 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "symfony/process": "~2.0|~3.0|~4.0" }, "require-dev": { - "phpunit/phpunit": "~3.7" + "phpunit/phpunit": "^5.7" }, "autoload": { "psr-0": { "Nmap": "src/" }