Update

Author: SoftCreatR

.github/workflows/Test.yml

@@ -3,6 +3,8 @@ name: Test
 
 on:
   push:
+    tags-ignore:
+      - '**'
     paths:
       - '*.php'
       - 'composer.json'

README.md

@@ -1,4 +1,4 @@
-JSONPath ![Test](https://github.com/SoftCreatR/JSONPath/workflows/Test/badge.svg) 
+JSONPath ![Test](https://github.com/SoftCreatR/JSONPath/workflows/Test/badge.svg?branch=main) 
 =============
 
 This is a [JSONPath](http://goessner.net/articles/JsonPath/) implementation for PHP based on Stefan Goessner's JSONPath script.
@@ -106,7 +106,7 @@ So here are the types of query expressions that are supported:
 Known issues
 ------
 
-- This project has not implemented multiple string indexes eg. `$[name,year]` or `$["name","year"]`. I have no ETA on that feature and it would require some re-writing of the parser that uses a very basic regex implementation.
+- This project has not implemented multiple string indexes e.g. `$[name,year]` or `$["name","year"]`. I have no ETA on that feature, and it would require some re-writing of the parser that uses a very basic regex implementation.
 
 Similar projects
 ----------------
@@ -119,8 +119,7 @@ Similar projects
 
 The [Hash](http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html) utility from CakePHP does some similar things 
 
-The original JsonPath implementations is available at [http://code.google.com/p/jsonpath]() and re-hosted for composer
-here [Peekmo/JsonPath](https://github.com/Peekmo/JsonPath).
+The original JsonPath implementations is available at [http://code.google.com/p/jsonpath]() and re-hosted for composer here [Peekmo/JsonPath](https://github.com/Peekmo/JsonPath).
 
 [ObjectPath](http://objectpath.org) ([https://github.com/adriank/ObjectPath]()) appears to be a Python/JS implementation with a new name and extra features.
 
@@ -135,15 +134,16 @@ Changelog
  - Added missing PHPDoc blocks
  - Added return type hints
  - Moved from Travis to GitHub actions
+ - Set `strict_types=1`
 
 ### 0.5.0
- - Fixed the slice notation (eg. [0:2:5] etc.). **Breaks code relying on the broken implementation**
+ - Fixed the slice notation (e.g. [0:2:5] etc.). **Breaks code relying on the broken implementation**
 
 ### 0.3.0
  - Added JSONPathToken class as value object
  - Lexer clean up and refactor
  - Updated the lexing and filtering of the recursive token ("..") to allow for a combination of recursion
-   and filters, eg. $..[?(@.type == 'suburb')].name
+   and filters, e.g. $..[?(@.type == 'suburb')].name
 
 ### 0.2.1 - 0.2.5
  - Various bug fixes and clean up

phpunit.xml.dist

@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         verbose="true">
+         colors="true"
+>
     <testsuites>
-        <testsuite name="default">
-            <directory>tests</directory>
+        <testsuite name="Unit">
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
 </phpunit>

tests/JSONPathArrayAccessTest.php

@@ -12,6 +12,7 @@
 use Exception;
 use PHPUnit\Framework\TestCase;
 use Flow\JSONPath\JSONPath;
+use function json_decode;
 use function random_int;
 
 class JSONPathArrayAccessTest extends TestCase
@@ -22,7 +23,6 @@ class JSONPathArrayAccessTest extends TestCase
     public function testChaining(): void
     {
         $data = $this->exampleData(random_int(0, 1));
-
         $conferences = (new JSONPath($data))->find('.conferences.*');
         $teams = $conferences->find('..teams.*');
 
@@ -46,9 +46,7 @@ public function testChaining(): void
     public function testIterating(): void
     {
         $data = $this->exampleData(random_int(0, 1));
-
         $conferences = (new JSONPath($data))->find('.conferences.*');
-
         $names = [];
 
         foreach ($conferences as $conference) {
@@ -67,11 +65,17 @@ public function testIterating(): void
      */
     public function testDifferentStylesOfAccess(): void
     {
-        $data = $this->exampleData(random_int(0, 1));
+        $data = (new JSONPath($this->exampleData(random_int(0, 1))));
+
+        self::assertArrayHasKey('conferences', $data);
 
-        $firstConference = (new JSONPath($data))->conferences[0];
+        $conferences = $data->__get('conferences')->getData();
 
-        self::assertEquals('Western Conference', $firstConference->name);
+        if (is_array($conferences[0])) {
+            self::assertEquals('Western Conference', $conferences[0]['name']);
+        } else {
+            self::assertEquals('Western Conference', $conferences[0]->name);
+        }
     }
 
     /**
@@ -131,6 +135,6 @@ public function exampleData(int $asArray = 1)
            ]
         }';
 
-        return \json_decode($json, $asArray === 1);
+        return json_decode($json, $asArray === 1);
     }
 }

tests/JSONPathDashedIndexTest.php

@@ -49,12 +49,12 @@ public function indexDataProvider(): array
 
     /**
      * @dataProvider indexDataProvider
-     * @param $path
-     * @param $data
-     * @param $expected
+     * @param string $path
+     * @param array $data
+     * @param array $expected
      * @throws Exception
      */
-    public function testSlice($path, $data, $expected): void
+    public function testSlice(string $path, array $data, array $expected): void
     {
         $jsonPath = new JSONPath($data);
         $result = $jsonPath->find($path)->getData();

tests/JSONPathSliceAccessTest.php

@@ -218,13 +218,14 @@ public function sliceDataProvider(): array
         ];
     }
 
-    /** @dataProvider sliceDataProvider
-     * @param $path
-     * @param $data
-     * @param $expected
+    /**
+     * @dataProvider sliceDataProvider
+     * @param string $path
+     * @param array $data
+     * @param array $expected
      * @throws Exception
      */
-    public function testSlice($path, $data, $expected): void
+    public function testSlice(string $path, array $data, array $expected): void
     {
         $jsonPath = new JSONPath($data);
         $result = $jsonPath->find($path)->getData();