Skip to content
This repository was archived by the owner on Jan 31, 2022. It is now read-only.

Feature bump php #32

Open
DavidGoodwin wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature bump php #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49aaad8
update PHP versions; include PHP 7.x in travis build
DavidGoodwin Apr 3, 2019
2a669c6
fix deprecated PHPUnit getMock() -> createMock()
DavidGoodwin Apr 3, 2019
2e9d5d6
bump phpunit to fix deprecation warnings
DavidGoodwin Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
}
],
"require": {
"php": ">=5.3.0",
"php": ">=5.6.0",
"symfony/process": "~2.0|~3.0|~4.0"
},
"require-dev": {
"phpunit/phpunit": "~3.7"
"phpunit/phpunit": "^5.7"
},
"autoload": {
"psr-0": { "Nmap": "src/" }
Expand Down
4 changes: 2 additions & 2 deletions tests/Nmap/Tests/NmapTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function testScanWithUserTimeout()
*/
public function testExecutableNotExecutable()
{
$executor = $this->getMock('Nmap\Util\ProcessExecutor');
$executor = $this->createMock('Nmap\Util\ProcessExecutor');
Copy link

@peter279k peter279k Apr 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If upgrading the PHP version to php-5.6+, the class instance string can use the ::class magic method approach.

$executor
->expects($this->once())
->method('execute')
Expand All @@ -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')
Expand Down