Add PHP 7.4 compatibility

Author: thekid

.travis.yml

@@ -10,15 +10,15 @@ php:
   - 7.1
   - 7.2
   - 7.3
-  - hhvm
+  - 7.4snapshot
   - nightly
 
 matrix:
   allow_failures:
     - php: nightly
 
 before_script:
-  - curl -sSL https://dl.bintray.com/xp-runners/generic/xp-run-master.sh > xp-run
+  - curl -sSL https://dl.bintray.com/xp-runners/generic/xp-run-8.1.7.sh > xp-run
   - composer install --prefer-dist
   - echo "vendor/autoload.php" > composer.pth
 

ChangeLog.md

@@ -3,6 +3,11 @@ Tokenize log
 
 ## ?.?.? / ????-??-??
 
+## 8.1.0 / 2018-08-10
+
+* Made compatible with PHP 7.4 - refrain using `{}` for string offsets
+  (@thekid)
+
 ## 8.0.0 / 2017-06-03
 
 * **Heads up:** Dropped PHP 5.5 support - @thekid

src/main/php/text/StreamTokenizer.class.php

@@ -1,5 +1,9 @@
 <?php namespace text;
- 
+
+use io\streams\Seekable;
+use lang\IllegalStateException;
+use util\Objects;
+
 /**
  * A stream tokenizer is a tokenizer that works on streams.
  * 
@@ -28,12 +32,10 @@ public function reset() {
     $this->_stack= [];
 
     if ($this->_src) {
-      if ($this->_src instanceof \io\streams\Seekable) {
+      if ($this->_src instanceof Seekable) {
         $this->_src->seek(0, SEEK_SET);
       } else {
-        throw new \lang\IllegalStateException(
-          'Cannot reset, Source '.\xp::stringOf($this->_src).' is not seekable'
-        );
+        throw new IllegalStateException('Cannot reset, Source '.Objects::stringOf($this->_src).' is not seekable');
       }
     }
     $this->_src= $this->source;
@@ -79,7 +81,7 @@ public function nextToken($delimiters= null) {
       if (!$this->returnDelims || $offset > 0) $this->_stack[]= substr($this->_buf, 0, $offset);
       $l= strlen($this->_buf);
       if ($this->returnDelims && $offset < $l) {
-        $this->_stack[]= $this->_buf{$offset};
+        $this->_stack[]= $this->_buf[$offset];
       }
       $offset++;
       $this->_buf= $offset < $l ? substr($this->_buf, $offset) : false;

src/main/php/text/StringTokenizer.class.php

@@ -77,7 +77,7 @@ public function nextToken($delimiters= null) {
       $offset= strcspn($this->source, $delimiters ? $delimiters : $this->delimiters, $this->_ofs);
       if (!$this->returnDelims || $offset > 0) $this->_stack[]= substr($this->source, $this->_ofs, $offset);
       if ($this->returnDelims && $this->_ofs + $offset < $this->_len) {
-        $this->_stack[]= $this->source{$this->_ofs + $offset};
+        $this->_stack[]= $this->source[$this->_ofs + $offset];
       }
       $this->_ofs+= $offset+ 1;
     }

src/main/php/text/TextTokenizer.class.php

@@ -1,7 +1,7 @@
 <?php namespace text;
 
-use io\streams\Reader;
 use io\IOException;
+use io\streams\Reader;
 use lang\IllegalStateException;
 
 /**
@@ -82,7 +82,7 @@ public function nextToken($delimiters= null) {
       if (!$this->returnDelims || $offset > 0) $this->_stack[]= substr($this->_buf, 0, $offset);
       $l= strlen($this->_buf);
       if ($this->returnDelims && $offset < $l) {
-        $this->_stack[]= $this->_buf{$offset};
+        $this->_stack[]= $this->_buf[$offset];
       }
       $offset++;
       $this->_buf= $offset < $l ? substr($this->_buf, $offset) : false;