From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sun, 12 Jun 2022 23:09:22 +0000 (+1200)
Subject: dev/core#2198 switch to more mainted phpquery
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a0f0777e0cd0e4aac7d3de87294b57e1d3e07a5c;p=civicrm-core.git

dev/core#2198 switch to more mainted phpquery
---

diff --git a/composer.json b/composer.json
index 43f5f96eff..f54084c9b8 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,7 @@
     "cache/integration-tests": "~0.17.0",
     "dompdf/dompdf" : "~1.2.1",
     "firebase/php-jwt": ">=3 <6",
-    "electrolinux/phpquery": "^0.9.6",
+    "rubobaquero/phpquery": "^0.9.15",
     "symfony/config": "~3.0 || ~4.4",
     "symfony/polyfill-iconv": "~1.0",
     "symfony/dependency-injection": "~3.0 || ~4.4",
@@ -278,9 +278,6 @@
       "adrienrn/php-mimetyper": {
         "Update gitignore to ensure that sites that manage via git don't miss out on the important db.json file": "https://patch-diff.githubusercontent.com/raw/adrienrn/php-mimetyper/pull/15.patch"
       },
-      "electrolinux/phpquery": {
-        "PHP7.4 Fix for array access using {} instead of []": "https://raw.githubusercontent.com/civicrm/civicrm-core/fe45bdfc4f3e3d3deb27e3d853cdbc7f616620a9/tools/scripts/composer/patches/php74_array_access_fix_phpquery.patch"
-      },
       "pear/db": {
         "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/2ad420c394/tools/scripts/composer/pear_db_civicrm_changes.patch"
       },
diff --git a/composer.lock b/composer.lock
index a19285ebab..5a8d0a6dd8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4e838bb74d3f8a86df51dd86b6d58c2a",
+    "content-hash": "99c1c2664bd882eb657072896ba9fbe6",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -673,49 +673,6 @@
             },
             "time": "2022-03-24T12:57:42+00:00"
         },
-        {
-            "name": "electrolinux/phpquery",
-            "version": "0.9.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/electrolinux/phpquery.git",
-                "reference": "6cb8afcfe8cd4ce45f2f8c27d561383037c27a3a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/electrolinux/phpquery/zipball/6cb8afcfe8cd4ce45f2f8c27d561383037c27a3a",
-                "reference": "6cb8afcfe8cd4ce45f2f8c27d561383037c27a3a",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "phpQuery/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Tobiasz Cudnik",
-                    "email": "tobiasz.cudnik@gmail.com",
-                    "homepage": "https://github.com/TobiaszCudnik",
-                    "role": "Developer"
-                },
-                {
-                    "name": "didier Belot",
-                    "role": "Packager"
-                }
-            ],
-            "description": "phpQuery is a server-side, chainable, CSS3 selector driven Document Object Model (DOM) API based on jQuery JavaScript Library",
-            "homepage": "http://code.google.com/p/phpquery/",
-            "support": {
-                "source": "https://github.com/electrolinux/phpquery/tree/0.9.6"
-            },
-            "time": "2013-03-21T12:39:33+00:00"
-        },
         {
             "name": "ezyang/htmlpurifier",
             "version": "v4.13.0",
@@ -3336,6 +3293,53 @@
             },
             "time": "2019-03-08T08:55:37+00:00"
         },
+        {
+            "name": "rubobaquero/phpquery",
+            "version": "0.9.15",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rubobaquero/phpquery.git",
+                "reference": "d2c3c1bb8a9d48dd0f1230bda2413ce38108b5fe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rubobaquero/phpquery/zipball/d2c3c1bb8a9d48dd0f1230bda2413ce38108b5fe",
+                "reference": "d2c3c1bb8a9d48dd0f1230bda2413ce38108b5fe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "phpQuery/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "didier Belot",
+                    "homepage": "https://github.com/electrolinux/phpquery",
+                    "role": "Packager, maintainer"
+                },
+                {
+                    "name": "Tobiasz Cudnik",
+                    "email": "tobiasz.cudnik@gmail.com",
+                    "homepage": "https://github.com/TobiaszCudnik",
+                    "role": "Developer"
+                }
+            ],
+            "description": "phpQuery is a server-side, chainable, CSS3 selector driven Document Object Model (DOM) API based on jQuery JavaScript Library",
+            "homepage": "http://code.google.com/p/phpquery/",
+            "support": {
+                "source": "https://github.com/rubobaquero/phpquery/tree/0.9.15"
+            },
+            "time": "2022-05-03T12:31:11+00:00"
+        },
         {
             "name": "sabberworm/php-css-parser",
             "version": "8.4.0",