Fixes for PHP 7

jmespath · Dec 28, 2019 · ed55b43 · ed55b43
1 parent 32d5678
commit ed55b43
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
   },
 
   "require-dev": {
-    "phpunit/phpunit": "~4.0"
+    "phpunit/phpunit": "^4.8.36|^7.5.15"
   },
 
   "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,7 +3,7 @@
          colors="true">
 
     <testsuites>
-        <testsuite>
+        <testsuite name="Unit Tests">
             <directory>tests</directory>
         </testsuite>
     </testsuites>

diff --git a/src/TreeCompiler.php b/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
         );
     }

diff --git a/src/Utils.php b/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;
     }
 }
diff --git a/tests/ComplianceTest.php b/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;
 

diff --git a/tests/EnvTest.php b/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()
     {

diff --git a/tests/FnDispatcherTest.php b/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()
     {

diff --git a/tests/LexerTest.php b/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()
     {

diff --git a/tests/ParserTest.php b/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

diff --git a/tests/SyntaxErrorExceptionTest.php b/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()
     {

diff --git a/tests/TreeCompilerTest.php b/tests/TreeCompilerTest.php
@@ -2,11 +2,12 @@
 namespace JmesPath\Tests\Tree;
 
 use JmesPath\TreeCompiler;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers JmesPath\Tree\TreeCompiler
  */
-class TreeCompilerTest extends \PHPUnit_Framework_TestCase
+class TreeCompilerTest extends TestCase
 {
     public function testCreatesSourceCode()
     {

diff --git a/tests/TreeInterpreterTest.php b/tests/TreeInterpreterTest.php
@@ -3,11 +3,12 @@
 
 use JmesPath\AstRuntime;
 use JmesPath\TreeInterpreter;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers JmesPath\Tree\TreeInterpreter
  */
-class TreeInterpreterTest extends \PHPUnit_Framework_TestCase
+class TreeInterpreterTest extends TestCase
 {
     public function testReturnsNullWhenMergingNonArray()
     {

diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
@@ -2,8 +2,9 @@
 namespace JmesPath\Tests;
 
 use JmesPath\Utils;
+use PHPUnit\Framework\TestCase;
 
-class UtilsTest extends \PHPUnit_Framework_TestCase
+class UtilsTest extends TestCase
 {
     public function typeProvider()
     {
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            return $type == 'string' ? implode($result, '') : $result;
+            return $type == 'string' ? implode('', $result) : $result;
         }
     }