Skip to content

Commit 93cc32b

Browse files
committed
Updated php minimum version to 7.0.
Updated PHPUnit to 6.0. Removed php 5.x support.
1 parent 134dc0f commit 93cc32b

File tree

5 files changed

+6
-27
lines changed

5 files changed

+6
-27
lines changed

.travis.yml

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 5.6
54
- 7
65
- hhvm
76

@@ -15,5 +14,3 @@ script:
1514

1615
matrix:
1716
fast_finish: true
18-
allow_failures:
19-
- php: 7

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ for more details.
4545
Requirements
4646
------------
4747

48-
* PHP CLI 5.3+
48+
* PHP CLI 7.0+
4949
* [PHP-Parser](https://github.com/nikic/PHP-Parser)
5050

5151
Acknowledgements

buildPHAR.php

-18
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,6 @@
22

33
$phar = new Phar('build/phpctags.phar', 0, 'phpctags.phar');
44

5-
if (version_compare(PHP_VERSION, '5.4.0') < 0) {
6-
class RecursiveCallbackFilterIterator extends RecursiveFilterIterator {
7-
public function __construct ( RecursiveIterator $iterator, $callback ) {
8-
$this->callback = $callback;
9-
parent::__construct($iterator);
10-
}
11-
12-
public function accept () {
13-
$callback = $this->callback;
14-
return $callback(parent::current(), parent::key(), parent::getInnerIterator());
15-
}
16-
17-
public function getChildren () {
18-
return new self($this->getInnerIterator()->getChildren(), $this->callback);
19-
}
20-
}
21-
}
22-
235
$phar->buildFromIterator(
246
new RecursiveIteratorIterator(
257
new RecursiveCallbackFilterIterator(

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"keywords": ["ctags"],
55
"type": "library",
66
"require": {
7-
"php": ">=5.3",
8-
"nikic/php-parser": "^4.0"
7+
"php": ">=7.0",
8+
"nikic/php-parser": "^4.5"
99
},
1010
"require-dev": {
11-
"phpunit/phpunit": "~4"
11+
"phpunit/phpunit": "^6.5"
1212
},
1313
"autoload": {
1414
"classmap": ["PHPCtags.class.php"]

tests/Acceptance/AcceptanceTestCase.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
namespace tests\PHPCTags\Acceptance;
44

55
use Exception;
6-
use PHPUnit_Framework_TestCase;
6+
use PHPUnit\Framework\TestCase;
77
use RecursiveDirectoryIterator;
88
use RecursiveIteratorIterator;
99

10-
abstract class AcceptanceTestCase extends PHPUnit_Framework_TestCase
10+
abstract class AcceptanceTestCase extends TestCase
1111
{
1212
const FORMAT = "<name>\t<file>\t/^<line content>$/;\"\t<short kind>\tline:<line number>\t<scope>\t<access>";
1313

0 commit comments

Comments
 (0)