From 838a2a7b5627f707ea4d0cdd6219a89503079006 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 1 Nov 2024 17:15:15 +0100 Subject: [PATCH 1/7] import plugin includes not via autoloader --- composer.json | 6 ------ includes/Plugin.php | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 3a2a22193..84a249881 100644 --- a/composer.json +++ b/composer.json @@ -10,12 +10,6 @@ } }, "autoload": { - "files": [ - "includes/Shortcodes.php", - "includes/Template.php", - "includes/TemplateParser.php", - "includes/Users.php" - ], "psr-4": { "CommonsBooking\\": "src/" } diff --git a/includes/Plugin.php b/includes/Plugin.php index fc1e53f3c..08f0e2f1c 100644 --- a/includes/Plugin.php +++ b/includes/Plugin.php @@ -12,6 +12,12 @@ $cbPlugin = new Plugin(); + +require_once __DIR__ . '/Users.php'; +require_once __DIR__ . '/TemplateParser.php'; +require_once __DIR__ . '/Shortcodes.php'; +require_once __DIR__ . '/Template.php'; + $cbPlugin->init(); $cbPlugin->initRoutes(); $cbPlugin->initBookingcodes(); \ No newline at end of file From 7df8120fb70d05df84779c0ed480584b21b6e58c Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 1 Nov 2024 17:16:30 +0100 Subject: [PATCH 2/7] remove ed-itsolutions/cmb2-field-ajax-search as long as it breaks the autoloading process --- composer.json | 3 +-- composer.lock | 43 +------------------------------------------ 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/composer.json b/composer.json index 84a249881..2daa9506d 100644 --- a/composer.json +++ b/composer.json @@ -38,8 +38,7 @@ "symfony/cache": "^5.4.30", "symfony/service-contracts": "^v2.5.2", "eluceo/ical": "~2.14.0", - "phpmailer/phpmailer": "^6.8.1", - "ed-itsolutions/cmb2-field-ajax-search": "^2.0" + "phpmailer/phpmailer": "^6.8.1" }, "require-dev": { "mockery/mockery": "^1.6.6", diff --git a/composer.lock b/composer.lock index cdcd1dabc..9cfd8c19d 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": "6e65082ff96f03504ba7fcf2a43a66c2", + "content-hash": "279f55d3ec009d757116e3fe8c40d729", "packages": [ { "name": "clue/stream-filter", @@ -131,47 +131,6 @@ }, "time": "2022-02-22T14:15:16+00:00" }, - { - "name": "ed-itsolutions/cmb2-field-ajax-search", - "version": "v2.0.0", - "source": { - "type": "git", - "url": "https://github.com/Ed-ITSolutions/cmb2-field-ajax-search.git", - "reference": "9b25b9ece948a2b5e5e79a46df8cbf6197cf8c89" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Ed-ITSolutions/cmb2-field-ajax-search/zipball/9b25b9ece948a2b5e5e79a46df8cbf6197cf8c89", - "reference": "9b25b9ece948a2b5e5e79a46df8cbf6197cf8c89", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "type": "library", - "autoload": { - "files": [ - "cmb2-field-ajax-search.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Adam Laycock", - "email": "adam@arcath.net", - "homepage": "https://arcath.net", - "role": "Developer" - } - ], - "description": "CMB2", - "support": { - "source": "https://github.com/Ed-ITSolutions/cmb2-field-ajax-search/tree/master" - }, - "time": "2020-07-01T15:35:03+00:00" - }, { "name": "eluceo/ical", "version": "2.14.0", From 46dea14bd057ccc517f0b85f107d7c7b38a32f4f Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 1 Nov 2024 19:49:05 +0100 Subject: [PATCH 3/7] Uses cmb2 ajax plugin via github (where autoloader is removed) * Includes it via require in plugin php file --- commonsbooking.php | 1 + composer.json | 5 +++++ composer.lock | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/commonsbooking.php b/commonsbooking.php index c1dd41ee0..cb962aa83 100644 --- a/commonsbooking.php +++ b/commonsbooking.php @@ -43,4 +43,5 @@ require __DIR__.'/vendor/autoload.php'; require __DIR__.'/vendor/cmb2/cmb2/init.php'; require __DIR__.'/vendor/mustardBees/cmb-field-select2/cmb-field-select2.php'; +require __DIR__.'/vendor/ed-itsolutions/cmb2-field-ajax-search/cmb2-field-ajax-search.php'; require_once __DIR__. '/includes/Plugin.php'; diff --git a/composer.json b/composer.json index 2daa9506d..42cb5c8c2 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,12 @@ { "type": "vcs", "url": "https://github.com/wielebenwir/cmb-field-select2" + }, + { + "type": "vcs", + "url": "https://github.com/datengraben/cmb2-field-ajax-search" } + ], "require": { "php": ">=7.3", diff --git a/composer.lock b/composer.lock index 9cfd8c19d..513d18acc 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": "279f55d3ec009d757116e3fe8c40d729", + "content-hash": "b763ef2b6087adace705e874beb9cde5", "packages": [ { "name": "clue/stream-filter", @@ -131,6 +131,41 @@ }, "time": "2022-02-22T14:15:16+00:00" }, + { + "name": "ed-itsolutions/cmb2-field-ajax-search", + "version": "v2.0.1", + "source": { + "type": "git", + "url": "https://github.com/datengraben/cmb2-field-ajax-search.git", + "reference": "887470a5cb9363a51d573bb8d49259435f519511" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/datengraben/cmb2-field-ajax-search/zipball/887470a5cb9363a51d573bb8d49259435f519511", + "reference": "887470a5cb9363a51d573bb8d49259435f519511", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "type": "library", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Adam Laycock", + "email": "adam@arcath.net", + "homepage": "https://arcath.net", + "role": "Developer" + } + ], + "description": "CMB2", + "support": { + "source": "https://github.com/datengraben/cmb2-field-ajax-search/tree/v2.0.1" + }, + "time": "2024-11-01T18:36:49+00:00" + }, { "name": "eluceo/ical", "version": "2.14.0", From cbde5b5f73b98425a4012e479e7124f6955adbb6 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 1 Nov 2024 21:12:33 +0100 Subject: [PATCH 4/7] update lockfile and unpin mustardbees dependency --- composer.json | 5 +++-- composer.lock | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 42cb5c8c2..ec60cf43b 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "require": { "php": ">=7.3", "cmb2/cmb2": "^2.10.1", - "mustardbees/cmb-field-select2": "3.0.4", + "mustardbees/cmb-field-select2": "^3.0.4", "geocoder-php/nominatim-provider": "^5.7", "php-http/curl-client": "^2.3", "nyholm/psr7": "^1.8", @@ -43,7 +43,8 @@ "symfony/cache": "^5.4.30", "symfony/service-contracts": "^v2.5.2", "eluceo/ical": "~2.14.0", - "phpmailer/phpmailer": "^6.8.1" + "phpmailer/phpmailer": "^6.8.1", + "ed-itsolutions/cmb2-field-ajax-search": "v2.0.1" }, "require-dev": { "mockery/mockery": "^1.6.6", diff --git a/composer.lock b/composer.lock index 513d18acc..4b7ec8a64 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": "b763ef2b6087adace705e874beb9cde5", + "content-hash": "a4b910ab792c67f3e50f722bc475f7f5", "packages": [ { "name": "clue/stream-filter", @@ -4138,13 +4138,13 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { "php": ">=7.3", "ext-json": "*" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } From 2dc64295f6d132aeb982ddf6d8b8261297601614 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 3 Nov 2024 13:36:57 +0100 Subject: [PATCH 5/7] update lockfile --- composer.lock | 272 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 162 insertions(+), 110 deletions(-) diff --git a/composer.lock b/composer.lock index 7f71d79f2..87564a50d 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": "223096162a0844bbfef4ad3f38b85ad3", + "content-hash": "09e3d8e24627a24642b3858942854a10", "packages": [ { "name": "clue/stream-filter", @@ -74,27 +74,27 @@ }, { "name": "cmb2/cmb2", - "version": "v2.10.1", + "version": "v2.11.0", "source": { "type": "git", "url": "https://github.com/CMB2/CMB2.git", - "reference": "4afc4bb7b92ab6d93aac2247c9a84af773e42532" + "reference": "2847828b5cce1b48d09427ee13e6f7c752704468" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CMB2/CMB2/zipball/4afc4bb7b92ab6d93aac2247c9a84af773e42532", - "reference": "4afc4bb7b92ab6d93aac2247c9a84af773e42532", + "url": "https://api.github.com/repos/CMB2/CMB2/zipball/2847828b5cce1b48d09427ee13e6f7c752704468", + "reference": "2847828b5cce1b48d09427ee13e6f7c752704468", "shasum": "" }, "require": { - "php": ">5.2.4" + "php": ">7.4" }, "require-dev": { "apigen/apigen": "4.1.2", - "awesomemotive/am-cli-tools": ">=1.3.1", + "awesomemotive/am-cli-tools": ">=1.3.7", "nette/utils": "2.5.3", "phpunit/phpunit": "^6.5", - "yoast/phpunit-polyfills": "^1.0" + "yoast/phpunit-polyfills": "^1.1" }, "suggest": { "composer/installers": "~1.0" @@ -129,7 +129,7 @@ "issues": "https://github.com/CMB2/CMB2/issues", "source": "http://wordpress.org/support/plugin/cmb2" }, - "time": "2022-02-22T14:15:16+00:00" + "time": "2024-04-02T19:30:07+00:00" }, { "name": "ed-itsolutions/cmb2-field-ajax-search", @@ -659,16 +659,16 @@ }, { "name": "php-http/curl-client", - "version": "2.3.2", + "version": "2.3.3", "source": { "type": "git", "url": "https://github.com/php-http/curl-client.git", - "reference": "0b869922458b1cde9137374545ed4fff7ac83623" + "reference": "f3eb48d266341afec0229a7a37a03521d3646b81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/curl-client/zipball/0b869922458b1cde9137374545ed4fff7ac83623", - "reference": "0b869922458b1cde9137374545ed4fff7ac83623", + "url": "https://api.github.com/repos/php-http/curl-client/zipball/f3eb48d266341afec0229a7a37a03521d3646b81", + "reference": "f3eb48d266341afec0229a7a37a03521d3646b81", "shasum": "" }, "require": { @@ -688,7 +688,7 @@ }, "require-dev": { "guzzlehttp/psr7": "^2.0", - "laminas/laminas-diactoros": "^2.0", + "laminas/laminas-diactoros": "^2.0 || ^3.0", "php-http/client-integration-tests": "^3.0", "php-http/message-factory": "^1.1", "phpunit/phpunit": "^7.5 || ^9.4" @@ -718,22 +718,22 @@ ], "support": { "issues": "https://github.com/php-http/curl-client/issues", - "source": "https://github.com/php-http/curl-client/tree/2.3.2" + "source": "https://github.com/php-http/curl-client/tree/2.3.3" }, - "time": "2024-03-03T08:21:07+00:00" + "time": "2024-10-31T07:36:58+00:00" }, { "name": "php-http/discovery", - "version": "1.19.2", + "version": "1.20.0", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb" + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb", - "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb", + "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d", + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d", "shasum": "" }, "require": { @@ -757,7 +757,8 @@ "php-http/httplug": "^1.0 || ^2.0", "php-http/message-factory": "^1.0", "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", - "symfony/phpunit-bridge": "^6.2" + "sebastian/comparator": "^3.0.5 || ^4.0.8", + "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1" }, "type": "composer-plugin", "extra": { @@ -796,22 +797,22 @@ ], "support": { "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.19.2" + "source": "https://github.com/php-http/discovery/tree/1.20.0" }, - "time": "2023-11-30T16:49:05+00:00" + "time": "2024-10-02T11:20:13+00:00" }, { "name": "php-http/httplug", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "625ad742c360c8ac580fcc647a1541d29e257f67" + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/625ad742c360c8ac580fcc647a1541d29e257f67", - "reference": "625ad742c360c8ac580fcc647a1541d29e257f67", + "url": "https://api.github.com/repos/php-http/httplug/zipball/5cad731844891a4c282f3f3e1b582c46839d22f4", + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4", "shasum": "" }, "require": { @@ -853,22 +854,22 @@ ], "support": { "issues": "https://github.com/php-http/httplug/issues", - "source": "https://github.com/php-http/httplug/tree/2.4.0" + "source": "https://github.com/php-http/httplug/tree/2.4.1" }, - "time": "2023-04-14T15:10:03+00:00" + "time": "2024-09-23T11:39:58+00:00" }, { "name": "php-http/message", - "version": "1.16.0", + "version": "1.16.2", "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "47a14338bf4ebd67d317bf1144253d7db4ab55fd" + "reference": "06dd5e8562f84e641bf929bfe699ee0f5ce8080a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/47a14338bf4ebd67d317bf1144253d7db4ab55fd", - "reference": "47a14338bf4ebd67d317bf1144253d7db4ab55fd", + "url": "https://api.github.com/repos/php-http/message/zipball/06dd5e8562f84e641bf929bfe699ee0f5ce8080a", + "reference": "06dd5e8562f84e641bf929bfe699ee0f5ce8080a", "shasum": "" }, "require": { @@ -922,9 +923,9 @@ ], "support": { "issues": "https://github.com/php-http/message/issues", - "source": "https://github.com/php-http/message/tree/1.16.0" + "source": "https://github.com/php-http/message/tree/1.16.2" }, - "time": "2023-05-17T06:43:38+00:00" + "time": "2024-10-02T11:34:13+00:00" }, { "name": "php-http/message-factory", @@ -983,16 +984,16 @@ }, { "name": "php-http/promise", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/php-http/promise.git", - "reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07" + "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/2916a606d3b390f4e9e8e2b8dd68581508be0f07", - "reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07", + "url": "https://api.github.com/repos/php-http/promise/zipball/fc85b1fba37c169a69a07ef0d5a8075770cc1f83", + "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83", "shasum": "" }, "require": { @@ -1029,9 +1030,9 @@ ], "support": { "issues": "https://github.com/php-http/promise/issues", - "source": "https://github.com/php-http/promise/tree/1.3.0" + "source": "https://github.com/php-http/promise/tree/1.3.1" }, - "time": "2024-01-04T18:49:48+00:00" + "time": "2024-03-15T13:55:21+00:00" }, { "name": "phpmailer/phpmailer", @@ -1503,16 +1504,16 @@ }, { "name": "symfony/cache", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "89005bc368ca02ed0433c592e4d27670d0844a66" + "reference": "12b03e3cc5c6fd495e56b2b9e7aca777f8608721" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/89005bc368ca02ed0433c592e4d27670d0844a66", - "reference": "89005bc368ca02ed0433c592e4d27670d0844a66", + "url": "https://api.github.com/repos/symfony/cache/zipball/12b03e3cc5c6fd495e56b2b9e7aca777f8608721", + "reference": "12b03e3cc5c6fd495e56b2b9e7aca777f8608721", "shasum": "" }, "require": { @@ -1580,7 +1581,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.40" + "source": "https://github.com/symfony/cache/tree/v5.4.45" }, "funding": [ { @@ -1596,7 +1597,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-10-25T15:37:00+00:00" }, { "name": "symfony/cache-contracts", @@ -1746,16 +1747,16 @@ }, { "name": "symfony/options-resolver", - "version": "v5.4.21", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9" + "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", - "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6", + "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6", "shasum": "" }, "require": { @@ -1795,7 +1796,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.21" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.45" }, "funding": [ { @@ -1811,24 +1812,24 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -1871,7 +1872,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" }, "funding": [ { @@ -1887,24 +1888,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -1951,7 +1952,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -1967,7 +1968,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/service-contracts", @@ -2054,16 +2055,16 @@ }, { "name": "symfony/var-exporter", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "6a13d37336d512927986e09f19a4bed24178baa6" + "reference": "862700068db0ddfd8c5b850671e029a90246ec75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/6a13d37336d512927986e09f19a4bed24178baa6", - "reference": "6a13d37336d512927986e09f19a4bed24178baa6", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/862700068db0ddfd8c5b850671e029a90246ec75", + "reference": "862700068db0ddfd8c5b850671e029a90246ec75", "shasum": "" }, "require": { @@ -2107,7 +2108,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.40" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.45" }, "funding": [ { @@ -2123,7 +2124,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "willdurand/geocoder", @@ -2312,16 +2313,16 @@ }, { "name": "mockery/mockery", - "version": "1.6.6", + "version": "1.6.12", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e" + "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/b8e0bb7d8c604046539c1115994632c74dcb361e", - "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e", + "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699", + "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699", "shasum": "" }, "require": { @@ -2333,10 +2334,8 @@ "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.6.10", - "psalm/plugin-phpunit": "^0.18.4", - "symplify/easy-coding-standard": "^11.5.0", - "vimeo/psalm": "^4.30" + "phpunit/phpunit": "^8.5 || ^9.6.17", + "symplify/easy-coding-standard": "^12.1.14" }, "type": "library", "autoload": { @@ -2393,7 +2392,7 @@ "security": "https://github.com/mockery/mockery/security/advisories", "source": "https://github.com/mockery/mockery" }, - "time": "2023-08-09T00:03:52+00:00" + "time": "2024-05-16T03:13:13+00:00" }, { "name": "myclabs/deep-copy", @@ -2695,28 +2694,28 @@ }, { "name": "phpcompatibility/phpcompatibility-paragonie", - "version": "1.3.2", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git", - "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26" + "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/bba5a9dfec7fcfbd679cfaf611d86b4d3759da26", - "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/293975b465e0e709b571cbf0c957c6c0a7b9a2ac", + "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac", "shasum": "" }, "require": { "phpcompatibility/php-compatibility": "^9.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", "paragonie/random_compat": "dev-master", "paragonie/sodium_compat": "dev-master" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -2746,22 +2745,37 @@ ], "support": { "issues": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/issues", + "security": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/security/policy", "source": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie" }, - "time": "2022-10-25T01:46:02+00:00" + "funding": [ + { + "url": "https://github.com/PHPCompatibility", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-04-24T21:30:46+00:00" }, { "name": "phpcompatibility/phpcompatibility-wp", - "version": "2.1.4", + "version": "2.1.5", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git", - "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5" + "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5", - "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/01c1ff2704a58e46f0cb1ca9d06aee07b3589082", + "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082", "shasum": "" }, "require": { @@ -2769,10 +2783,10 @@ "phpcompatibility/phpcompatibility-paragonie": "^1.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7" + "dealerdirect/phpcodesniffer-composer-installer": "^1.0" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -2801,9 +2815,24 @@ ], "support": { "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues", + "security": "https://github.com/PHPCompatibility/PHPCompatibilityWP/security/policy", "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP" }, - "time": "2022-10-24T09:00:36+00:00" + "funding": [ + { + "url": "https://github.com/PHPCompatibility", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-04-24T21:37:59+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4246,16 +4275,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.2", + "version": "3.10.3", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", "shasum": "" }, "require": { @@ -4265,11 +4294,11 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", "extra": { @@ -4284,22 +4313,45 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", "standards", "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2023-02-22T23:07:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-09-18T10:38:58+00:00" }, { "name": "theseer/tokenizer", From b6c65e8fb4b934f8002c63fedcd66e0e9678a4c2 Mon Sep 17 00:00:00 2001 From: Chris <105302830+datengraben@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:32:29 +0100 Subject: [PATCH 6/7] Uses composer phpunit for workflow file --- .github/workflows/phpunit.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index cbba83106..a06ae0948 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -73,8 +73,7 @@ jobs: - name: Run test suite run: | composer dump-autoload -o - curl -ksSfL -o ~/phpunit-9.phar https://phar.phpunit.de/phpunit-9.phar - php ~/phpunit-9.phar + php vendor/bin/phpunit - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4 @@ -90,4 +89,4 @@ jobs: GH_REPO: ${{ github.repository }} GH_TOKEN: ${{ github.token }} GH_DEBUG: api - run: gh workflow run rerun.yml -r ${{ github.head_ref || github.ref_name }} -F run_id=${{ github.run_id }} \ No newline at end of file + run: gh workflow run rerun.yml -r ${{ github.head_ref || github.ref_name }} -F run_id=${{ github.run_id }} From 0dc0c19bfeefbb8f8e9c0464ec0bbe731eafb0e9 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 25 Nov 2024 10:48:03 +0100 Subject: [PATCH 7/7] Change ed-itsolutions dependency to wielebenwir github repo and Update lockfile --- composer.json | 2 +- composer.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 92f2507fc..797b4f161 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ }, { "type": "vcs", - "url": "https://github.com/datengraben/cmb2-field-ajax-search" + "url": "https://github.com/wielebenwir/cmb2-field-ajax-search" } ], diff --git a/composer.lock b/composer.lock index fb0d361e7..239be9349 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": "38c36164c98b25f6677140c6e0b3f06b", + "content-hash": "3cef4a58c672b31917fae588e87f7e67", "packages": [ { "name": "clue/stream-filter", @@ -136,12 +136,12 @@ "version": "v2.0.1", "source": { "type": "git", - "url": "https://github.com/datengraben/cmb2-field-ajax-search.git", + "url": "https://github.com/wielebenwir/cmb2-field-ajax-search.git", "reference": "887470a5cb9363a51d573bb8d49259435f519511" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/datengraben/cmb2-field-ajax-search/zipball/887470a5cb9363a51d573bb8d49259435f519511", + "url": "https://api.github.com/repos/wielebenwir/cmb2-field-ajax-search/zipball/887470a5cb9363a51d573bb8d49259435f519511", "reference": "887470a5cb9363a51d573bb8d49259435f519511", "shasum": "" }, @@ -162,7 +162,8 @@ ], "description": "CMB2", "support": { - "source": "https://github.com/datengraben/cmb2-field-ajax-search/tree/v2.0.1" + "source": "https://github.com/wielebenwir/cmb2-field-ajax-search/tree/v2.0.1", + "issues": "https://github.com/wielebenwir/cmb2-field-ajax-search/issues" }, "time": "2024-11-01T18:36:49+00:00" },