Fixes for PHP 7

Author: GrahamCampbell

composer.json

@@ -17,7 +17,7 @@
   },
 
   "require-dev": {
-    "phpunit/phpunit": "~4.0"
+    "phpunit/phpunit": "^4.8.36|^7.5.15"
   },
 
   "autoload": {

phpunit.xml.dist

@@ -3,7 +3,7 @@
          colors="true">
 
     <testsuites>
-        <testsuite>
+        <testsuite name="Unit Tests">
             <directory>tests</directory>
         </testsuite>
     </testsuites>

src/TreeCompiler.php

@@ -23,7 +23,7 @@ public function visit(array $ast, $fnName, $expr)
         $this->source = $this->indentation = '';
         $this->write("<?php\n")
             ->write('use JmesPath\\TreeInterpreter as Ti;')
-            ->write('use JmesPath\\FnDispatcher as Fn;')
+            ->write('use JmesPath\\FnDispatcher as Fd;')
             ->write('use JmesPath\\Utils;')
             ->write('')
             ->write('function %s(Ti $interpreter, $value) {', $fnName)
@@ -257,7 +257,7 @@ private function visit_function(array $node)
         }
 
         return $this->write(
-            '$value = Fn::getInstance()->__invoke("%s", %s);',
+            '$value = Fd::getInstance()->__invoke("%s", %s);',
             $node['value'], $args
         );
     }

src/Utils.php

@@ -224,6 +224,6 @@ private static function sliceIndices($subject, $start, $stop, $step)
             }
         }
 
-        return $type == 'string' ? implode($result, '') : $result;
+        return $type == 'string' ? implode('', $result) : $result;
     }
 }

tests/ComplianceTest.php

@@ -4,8 +4,9 @@
 use JmesPath\AstRuntime;
 use JmesPath\CompilerRuntime;
 use JmesPath\SyntaxErrorException;
+use PHPUnit\Framework\TestCase;
 
-class ComplianceTest extends \PHPUnit_Framework_TestCase
+class ComplianceTest extends TestCase
 {
     private static $path;
 

tests/EnvTest.php

@@ -3,8 +3,9 @@
 
 use JmesPath\Env;
 use JmesPath\CompilerRuntime;
+use PHPUnit\Framework\TestCase;
 
-class EnvTest extends \PHPUnit_Framework_TestCase
+class EnvTest extends TestCase
 {
     public function testSearchesInput()
     {

tests/FnDispatcherTest.php

@@ -1,9 +1,10 @@
 <?php
 namespace JmesPath\Tests;
 
-use JmesPath\FnDispatcher;
+use JmesPath\fnDispatcher;
+use PHPUnit\Framework\TestCase;
 
-class FnDispatcherTest extends \PHPUnit_Framework_TestCase
+class fnDispatcherTest extends TestCase
 {
     public function testConvertsToString()
     {

tests/LexerTest.php

@@ -3,11 +3,12 @@
 
 use JmesPath\Lexer;
 use JmesPath\SyntaxErrorException;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers JmesPath\Lexer
  */
-class LexerTest extends \PHPUnit_Framework_TestCase
+class LexerTest extends TestCase
 {
     public function inputProvider()
     {

tests/ParserTest.php

@@ -3,11 +3,12 @@
 
 use JmesPath\Lexer;
 use JmesPath\Parser;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers JmesPath\Parser
  */
-class ParserTest extends \PHPUnit_Framework_TestCase
+class ParserTest extends TestCase
 {
     /**
      * @expectedException \JmesPath\SyntaxErrorException

tests/SyntaxErrorExceptionTest.php

@@ -2,11 +2,12 @@
 namespace JmesPath\Tests;
 
 use JmesPath\SyntaxErrorException;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers JmesPath\SyntaxErrorException
  */
-class SyntaxErrorExceptionTest extends \PHPUnit_Framework_TestCase
+class SyntaxErrorExceptionTest extends TestCase
 {
     public function testCreatesWithNoArray()
     {