Merge pull request #44 from gianarb/hotfix/php5.3-travis-conf

Fix failure in php5.3 and upgrade travis conf

Author: Gianluca Arbezzano

.gitignore

@@ -1,5 +1,3 @@
-tests/*.expect
-tests/*.result
 tests/.test_fs
 build/
 vendor/

.travis.yml

@@ -11,11 +11,12 @@ php:
 before_script:
     - composer self-update
     - composer install
+    - if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]; then export COMPOSER_PROCESS_TIMEOUT=900; fi
 
 script:
     - vendor/bin/phpunit
 
-branches:
-  only:
-    - master
-    - develop
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: 7

PHPCtags.class.php

@@ -421,7 +421,7 @@ private function process($file)
                     $this->struct($this->mParser->parse(file_get_contents($this->mFile)), TRUE)
                 );
             } catch(Exception $e) {
-                echo "PHPParser: {$e->getMessage()} - {$filename}".PHP_EOL;
+                echo "PHPParser: {$e->getMessage()} - {$file}".PHP_EOL;
             }
         }
     }

README.md

@@ -1,6 +1,7 @@
 phpctags
 ========
-[![Build Status](https://travis-ci.org/vim-php/phpctags.svg)](https://travis-ci.org/vim-php/phpctags)
+Master  [![Build Status](https://travis-ci.org/vim-php/phpctags.svg)](https://travis-ci.org/vim-php/phpctags?branch=master)  
+Develop [![Build Status](https://travis-ci.org/vim-php/phpctags.svg)](https://travis-ci.org/vim-php/phpctags?branch=develop)  
 
 An enhanced php [ctags](http://ctags.sourceforge.net/) index file generator
 compatible with http://ctags.sourceforge.net/FORMAT.

tests/Acceptance/AcceptanceTestCase.php

@@ -259,7 +259,7 @@ private function getSourceFileLineContent($filename, $line)
     {
         $filename = $this->testDir . DIRECTORY_SEPARATOR . $filename;
         $line--;
-
-        return rtrim(file($filename)[$line], PHP_EOL);
+        $file = file($filename);
+        return rtrim($file[$line], PHP_EOL);
     }
 }

tests/Acceptance/TraitsTest.php

@@ -9,6 +9,10 @@ final class TraitsTest extends AcceptanceTestCase
      */
     public function itCreatesTagForTopLevelTrait()
     {
+        if (version_compare('5.4.0', PHP_VERSION, '>')) {
+            $this->markTestSkipped('Traits were not introduced until 5.4');
+        }
+
         $this->givenSourceFile('TopLevelTraitExample.php', <<<'EOS'
 <?php
 
@@ -98,6 +102,10 @@ private function privateMethod()
      */
     public function itAddsNamespacesToTraitTags()
     {
+        if (version_compare('5.4.0', PHP_VERSION, '>')) {
+            $this->markTestSkipped('Traits were not introduced until 5.4');
+        }
+
         $this->givenSourceFile('MultiLevelNamespace.php', <<<'EOS'
 <?php