Merge pull request #172 from supermetrics-public/chore/DropPhp74Support

Drop support for PHP 7.4
supermetrics-public · Dec 15, 2023 · daba02b · daba02b
2 parents 058b471 + 682579a
commit daba02b
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 58 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [7.4, 8.0, 8.1, 8.2, 8.3]
+                php: [8.0, 8.1, 8.2, 8.3]
                 use-opcache: [true, false]
 
         steps:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -7,7 +7,7 @@ jobs:
         shell: cmd
     strategy:
       matrix:
-          version: ['7.4', '8.0', '8.1', '8.2']
+          version: ['8.0', '8.1', '8.2']
           arch: [x64]
           ts: [ts]
     runs-on: windows-2019

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # Build
 .deps
+*.dep
 *.lo
 *.la
 .libs

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# JsonPath-PHP - extension for PHP 7.4+
+# JsonPath-PHP - extension for PHP 8.0+
 
 [![Build status](https://github.com/supermetrics-public/pecl-jsonpath/workflows/Build/badge.svg)](https://github.com/supermetrics-public/pecl-jsonpath/actions?query=workflow%3ABuild)
 ![Code coverage](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/crocodele/5ceb08845fe95635fc41af2f4c86c631/raw/pecl-jsonpath__main.json&labelColor=343940)

diff --git a/jsonpath.c b/jsonpath.c
@@ -21,11 +21,7 @@ void print_lex_tokens(struct jpath_token lex_tok[], int lex_tok_count, const cha
 zend_class_entry* jsonpath_ce;
 zend_class_entry* jsonpath_exception_ce;
 
-#if PHP_VERSION_ID < 80000
-#include "jsonpath_legacy_arginfo.h"
-#else
 #include "jsonpath_arginfo.h"
-#endif
 
 #define LEX_TOK_ARR_LEN 64
 

diff --git a/jsonpath.stub.php b/jsonpath.stub.php
@@ -2,22 +2,16 @@
 
 /**
  * @generate-class-entries
- * @generate-legacy-arginfo
  */
 
 namespace JsonPath;
 
 class JsonPath
 {
     /**
-     * @param array $data
-     * @param string $expression
-     *
-     * @return array|bool
-     *
      * @throws JsonPathException
      */
-    public function find(array $data, string $expression): array|bool;
+    public function find(array $data, string $expression): array|false;
 }
 
 class JsonPathException extends \RuntimeException

diff --git a/jsonpath_arginfo.h b/jsonpath_arginfo.h
@@ -1,7 +1,7 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 27fbe76d157af97672d8d6e085e2c68684e1024b */
+ * Stub hash: 0c874327bc35f4dfd0da2120cb50e2b8d299e28b */
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_JsonPath_JsonPath_find, 0, 2, MAY_BE_ARRAY|MAY_BE_BOOL)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_JsonPath_JsonPath_find, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, data, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, expression, IS_STRING, 0)
 ZEND_END_ARG_INFO()

diff --git a/jsonpath_legacy_arginfo.h b/jsonpath_legacy_arginfo.h
diff --git a/tools/build-packagexml.php b/tools/build-packagexml.php
@@ -340,7 +340,7 @@ class PackageXMLElement extends SimpleXMLElement
  <dependencies>
   <required>
    <php>
-    <min>7.4.0</min>
+    <min>8.0.0</min>
    </php>
    <pearinstaller>
     <min>1.10.0</min>
-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     # Build
     .deps
+    *.dep
     *.lo
     *.la
     .libs
@@ Expand Down @@