Skip to content

Commit 8523367

Browse files
author
Gianluca Arbezzano
committed
Fix failure in php5.3 and upgrade travis conf
This commit resolve the problem with php 5.3 compatibility and upgrade the configuration of travis-ci
1 parent 0a4d86e commit 8523367

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ before_script:
1515
script:
1616
- vendor/bin/phpunit
1717

18-
branches:
19-
only:
20-
- master
21-
- develop
18+
matrix:
19+
fast_finish: true
20+
allow_failures:
21+
- php: 7

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
phpctags
22
========
3-
[![Build Status](https://travis-ci.org/vim-php/phpctags.svg)](https://travis-ci.org/vim-php/phpctags)
3+
Master [![Build Status](https://travis-ci.org/vim-php/phpctags.svg)](https://travis-ci.org/vim-php/phpctags?branch=master)
4+
Develop [![Build Status](https://travis-ci.org/vim-php/phpctags.svg)](https://travis-ci.org/vim-php/phpctags?branch=develop)
45

56
An enhanced php [ctags](http://ctags.sourceforge.net/) index file generator
67
compatible with http://ctags.sourceforge.net/FORMAT.

tests/Acceptance/AcceptanceTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ private function getSourceFileLineContent($filename, $line)
259259
{
260260
$filename = $this->testDir . DIRECTORY_SEPARATOR . $filename;
261261
$line--;
262-
263-
return rtrim(file($filename)[$line], PHP_EOL);
262+
$file = file($filename);
263+
return rtrim($file[$line], PHP_EOL);
264264
}
265265
}

0 commit comments

Comments
 (0)