diff --git a/PATCHES/maintenance200-drupal-10-compatibility.patch b/PATCHES/maintenance200-drupal-10-compatibility.patch deleted file mode 100644 index f29fcc762..000000000 --- a/PATCHES/maintenance200-drupal-10-compatibility.patch +++ /dev/null @@ -1,187 +0,0 @@ -diff --git a/maintenance200.info.yml b/maintenance200.info.yml -index fa88b4e..9e81116 100755 ---- a/maintenance200.info.yml -+++ b/maintenance200.info.yml -@@ -1,6 +1,5 @@ - name: 'Maintenance 200' - type: module - description: 'Allows the maintenance page to return a configurable HTTP status code rather than the standard 503 code.' --core: 8.x --core_version_requirement: ^8 || ^9 -+core_version_requirement: ^9.1 || ^10 - configure: maintenance200_settings -diff --git a/src/EventSubscriber/MaintenanceModeSubscriber.php b/src/EventSubscriber/MaintenanceModeSubscriber.php -index 59c9691..21c58ab 100644 ---- a/src/EventSubscriber/MaintenanceModeSubscriber.php -+++ b/src/EventSubscriber/MaintenanceModeSubscriber.php -@@ -2,21 +2,40 @@ - - namespace Drupal\maintenance200\EventSubscriber; - -+use Symfony\Component\HttpKernel\Event\ResponseEvent; - use Symfony\Component\EventDispatcher\EventSubscriberInterface; --use Symfony\Component\HttpKernel\Event\GetResponseEvent; - use Symfony\Component\HttpKernel\KernelEvents; --use Symfony\Component\HttpFoundation\Response; - use Symfony\Component\HttpFoundation\RedirectResponse; --use Symfony\Component\HttpKernel\Event\FilterResponseEvent; - - use Drupal\Core\Site\MaintenanceModeInterface; - use Drupal\Core\Session\AccountInterface; -+use Drupal\Core\Config\ImmutableConfig; - use Drupal\Core\Config\ConfigFactoryInterface; - use Drupal\Core\Routing\RouteMatch; - -- - class MaintenanceModeSubscriber implements EventSubscriberInterface { - -+ /** -+ * Configuration. -+ * -+ * @var \Drupal\Core\Config\ImmutableConfig -+ */ -+ private ImmutableConfig $config; -+ -+ /** -+ * Maintenance mode. -+ * -+ * @var \Drupal\Core\Site\MaintenanceModeInterface -+ */ -+ private MaintenanceModeInterface $maintenanceMode; -+ -+ /** -+ * User account. -+ * -+ * @var \Drupal\Core\Session\AccountInterface -+ */ -+ private AccountInterface $account; -+ - /** - * @inheritDoc - */ -@@ -30,7 +49,7 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface { - * Respond to RESPONSE Kernel event by setting status code if in maintenance. - * - */ -- public function onKernelResponse(FilterResponseEvent $event) { -+ public function onKernelResponse(ResponseEvent $event) { - if ($this->config->get('maintenance200_enabled')) { - $status_code = $this->config->get('maintenance200_status_code'); - $request = $event->getRequest(); -diff --git a/tests/src/Functional/Maintenance200SettingsTest.php b/tests/src/Functional/Maintenance200SettingsTest.php -index 044f2f9..1869431 100644 ---- a/tests/src/Functional/Maintenance200SettingsTest.php -+++ b/tests/src/Functional/Maintenance200SettingsTest.php -@@ -20,7 +20,7 @@ class Maintenance200SettingsTest extends BrowserTestBase { - * - * @var array - */ -- public static $modules = [ -+ protected static $modules = [ - 'block', - 'maintenance200', - ]; -@@ -40,7 +40,7 @@ class Maintenance200SettingsTest extends BrowserTestBase { - /** - * {@inheritdoc} - */ -- protected function setUp() { -+ protected function setUp(): void { - parent::setUp(); - - $this->sut = $this -@@ -57,8 +57,8 @@ class Maintenance200SettingsTest extends BrowserTestBase { - */ - public function testSettingsForm() { - $this->drupalGet(Url::fromRoute('maintenance200_settings')); -- $this->assertRaw('Change the status code during maintenance mode', 'Checkbox found.'); -- $this->assertFieldByName('maintenance200_enabled', TRUE); -+ $this->assertSession()->responseContains('Change the status code during maintenance mode'); -+ $this->assertSession()->fieldValueEquals('maintenance200_enabled', TRUE); - } - - /** -@@ -68,7 +68,7 @@ class Maintenance200SettingsTest extends BrowserTestBase { - $maintenance200FormUrl = Url::fromRoute('maintenance200_settings') - ->toString(); - $this->drupalGet(Url::fromRoute('system.site_maintenance_mode')); -- $this->assertLinkByHref($maintenance200FormUrl); -+ $this->assertSession()->linkByHrefExists($maintenance200FormUrl); - } - - /** -@@ -80,12 +80,13 @@ class Maintenance200SettingsTest extends BrowserTestBase { - $edit = [ - 'maintenance200_enabled' => 0, - ]; -- $this->drupalPostForm('admin/config/development/maintenance200', $edit, t('Save configuration')); -+ $this->drupalGet('admin/config/development/maintenance200'); -+ $this->submitForm($edit, t('Save configuration')); - -- $this->assertRaw('The configuration options have been saved.', 'Settings saved.'); -+ $this->assertSession()->responseContains('The configuration options have been saved.'); - - $this->drupalGet(Url::fromRoute('maintenance200_settings')); -- $this->assertFieldByName('maintenance200_enabled', FALSE); -+ $this->assertSession()->fieldValueEquals('maintenance200_enabled', FALSE); - } - - } -diff --git a/tests/src/Functional/Maintenance200Test.php b/tests/src/Functional/Maintenance200Test.php -index 8a3d39e..238ea14 100644 ---- a/tests/src/Functional/Maintenance200Test.php -+++ b/tests/src/Functional/Maintenance200Test.php -@@ -19,7 +19,7 @@ class Maintenance200Test extends BrowserTestBase { - * - * @var array - */ -- public static $modules = [ -+ protected static $modules = [ - 'maintenance200', - 'node', - ]; -@@ -32,7 +32,7 @@ class Maintenance200Test extends BrowserTestBase { - /** - * {@inheritdoc} - */ -- protected function setUp() { -+ protected function setUp(): void { - parent::setUp(); - - // Create Basic page node type. -@@ -63,7 +63,7 @@ class Maintenance200Test extends BrowserTestBase { - \Drupal::state()->set('system.maintenance_mode', FALSE); - - $this->drupalGet(''); -- $this->assertResponse(200); -+ $this->assertSession()->statusCodeEquals(200); - } - - /** -@@ -81,7 +81,7 @@ class Maintenance200Test extends BrowserTestBase { - ->save(); - - $this->drupalGet(''); -- $this->assertResponse(503); -+ $this->assertSession()->statusCodeEquals(503); - } - - /** -@@ -99,7 +99,7 @@ class Maintenance200Test extends BrowserTestBase { - ->save(); - - $this->drupalGet(''); -- $this->assertResponse(200); -+ $this->assertSession()->statusCodeEquals(200); - } - - /** -@@ -117,7 +117,7 @@ class Maintenance200Test extends BrowserTestBase { - ->save(); - - $this->drupalGet(''); -- $this->assertResponse(418); -+ $this->assertSession()->statusCodeEquals(418); - } - - } diff --git a/composer.json b/composer.json index ea08b8af8..93e82b515 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "drupal/imagemagick": "^3.4", "drupal/inline_entity_form": "^1.0@rc", "drupal/mailsystem": "^4.4", - "drupal/maintenance200": "^1.1", + "drupal/maintenance200": "^2", "drupal/memcache": "^2.5", "drupal/metatag": "^1.22", "drupal/mimemail": "^1.0@alpha", diff --git a/composer.lock b/composer.lock index 2038f51e3..64ab68b02 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": "b7f38acac99378e724d9c22c99e6df60", + "content-hash": "dd8400528d41acfe03d6cfc845d55b88", "packages": [ { "name": "asm89/stack-cors", @@ -322,16 +322,16 @@ }, { "name": "colinodell/psr-testlogger", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/colinodell/psr-testlogger.git", - "reference": "9246155e688b310fb3d0f201ead2445686b5844e" + "reference": "291f5b70ea0d3139787d18f442365a8e2784a462" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/colinodell/psr-testlogger/zipball/9246155e688b310fb3d0f201ead2445686b5844e", - "reference": "9246155e688b310fb3d0f201ead2445686b5844e", + "url": "https://api.github.com/repos/colinodell/psr-testlogger/zipball/291f5b70ea0d3139787d18f442365a8e2784a462", + "reference": "291f5b70ea0d3139787d18f442365a8e2784a462", "shasum": "" }, "require": { @@ -397,7 +397,7 @@ "type": "github" } ], - "time": "2023-03-14T19:12:55+00:00" + "time": "2023-11-29T23:03:34+00:00" }, { "name": "composer/ca-bundle", @@ -3109,27 +3109,31 @@ }, { "name": "drupal/geofield", - "version": "1.56.0", + "version": "1.57.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/geofield.git", - "reference": "8.x-1.56" + "reference": "8.x-1.57" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.56.zip", - "reference": "8.x-1.56", - "shasum": "edcb25304edb860d0fe907b8aa2dc73b6fc83f39" + "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.57.zip", + "reference": "8.x-1.57", + "shasum": "17155834e7abe78b5710907d1f2897f3a01c5702" }, "require": { "drupal/core": "^8.8 || ^9 || ^10", "itamair/geophp": "^1.3" }, + "require-dev": { + "drupal/diff": "^1.1", + "drupal/feeds": "^3.0@beta" + }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.56", - "datestamp": "1698017493", + "version": "8.x-1.57", + "datestamp": "1701039529", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3660,17 +3664,17 @@ }, { "name": "drupal/maintenance200", - "version": "1.1.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/maintenance200.git", - "reference": "8.x-1.1" + "reference": "8.x-2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/maintenance200-8.x-1.1.zip", - "reference": "8.x-1.1", - "shasum": "b01ed2dd4371c9ff24dbbbe235bedfe44f0e008e" + "url": "https://ftp.drupal.org/files/projects/maintenance200-8.x-2.1.zip", + "reference": "8.x-2.1", + "shasum": "fc8ea60619b6b4682bade340e13fb4565d3a7e0c" }, "require": { "drupal/core": "^10" @@ -3678,8 +3682,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.1", - "datestamp": "1597142482", + "version": "8.x-2.1", + "datestamp": "1697195734", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7623,21 +7627,22 @@ }, { "name": "pear/pear-core-minimal", - "version": "v1.10.13", + "version": "v1.10.14", "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d" + "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/aed862e95fd286c53cc546734868dc38ff4b5b1d", - "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/a86fc145edb5caedbf96527214ce3cadc9de4a32", + "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32", "shasum": "" }, "require": { "pear/console_getopt": "~1.4", - "pear/pear_exception": "~1.0" + "pear/pear_exception": "~1.0", + "php": ">=5.4" }, "replace": { "rsky/pear-core-min": "self.version" @@ -7667,7 +7672,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR", "source": "https://github.com/pear/pear-core-minimal" }, - "time": "2023-04-19T19:15:47+00:00" + "time": "2023-11-26T16:15:38+00:00" }, { "name": "pear/pear_exception", @@ -8451,16 +8456,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.3", + "version": "1.24.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083" + "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/12f01d214f1c73b9c91fdb3b1c415e4c70652083", - "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6bd0c26f3786cd9b7c359675cb789e35a8e07496", + "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496", "shasum": "" }, "require": { @@ -8492,22 +8497,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.3" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.4" }, - "time": "2023-11-18T20:15:32+00:00" + "time": "2023-11-26T18:29:22+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.44", + "version": "1.10.46", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "bf84367c53a23f759513985c54ffe0d0c249825b" + "reference": "90d3d25c5b98b8068916bbf08ce42d5cb6c54e70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bf84367c53a23f759513985c54ffe0d0c249825b", - "reference": "bf84367c53a23f759513985c54ffe0d0c249825b", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/90d3d25c5b98b8068916bbf08ce42d5cb6c54e70", + "reference": "90d3d25c5b98b8068916bbf08ce42d5cb6c54e70", "shasum": "" }, "require": { @@ -8556,7 +8561,7 @@ "type": "tidelift" } ], - "time": "2023-11-21T16:30:46+00:00" + "time": "2023-11-28T14:57:26+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -11120,27 +11125,27 @@ }, { "name": "symfony/browser-kit", - "version": "v6.3.8", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe" + "reference": "a3bb210e001580ec75e1d02b27fae3452e6bf502" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e270297dbee59168274c2b535ab1bccd593e6ffe", - "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/a3bb210e001580ec75e1d02b27fae3452e6bf502", + "reference": "a3bb210e001580ec75e1d02b27fae3452e6bf502", "shasum": "" }, "require": { "php": ">=8.1", - "symfony/dom-crawler": "^5.4|^6.0" + "symfony/dom-crawler": "^5.4|^6.0|^7.0" }, "require-dev": { - "symfony/css-selector": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/mime": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0" + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/mime": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -11168,7 +11173,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v6.3.8" + "source": "https://github.com/symfony/browser-kit/tree/v6.4.0" }, "funding": [ { @@ -11184,20 +11189,20 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:07:48+00:00" + "time": "2023-10-31T08:18:17+00:00" }, { "name": "symfony/console", - "version": "v6.3.8", + "version": "v6.3.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92" + "reference": "0566dbd051f8648d980592c7849f5d90d2c7c60c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92", - "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92", + "url": "https://api.github.com/repos/symfony/console/zipball/0566dbd051f8648d980592c7849f5d90d2c7c60c", + "reference": "0566dbd051f8648d980592c7849f5d90d2c7c60c", "shasum": "" }, "require": { @@ -11258,7 +11263,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.3.8" + "source": "https://github.com/symfony/console/tree/v6.3.9" }, "funding": [ { @@ -11274,20 +11279,20 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:09:35+00:00" + "time": "2023-11-20T16:36:29+00:00" }, { "name": "symfony/css-selector", - "version": "v6.3.2", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "883d961421ab1709877c10ac99451632a3d6fa57" + "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/883d961421ab1709877c10ac99451632a3d6fa57", - "reference": "883d961421ab1709877c10ac99451632a3d6fa57", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/d036c6c0d0b09e24a14a35f8292146a658f986e4", + "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4", "shasum": "" }, "require": { @@ -11323,7 +11328,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.3.2" + "source": "https://github.com/symfony/css-selector/tree/v6.4.0" }, "funding": [ { @@ -11339,7 +11344,7 @@ "type": "tidelift" } ], - "time": "2023-07-12T16:00:22+00:00" + "time": "2023-10-31T08:40:20+00:00" }, { "name": "symfony/dependency-injection", @@ -11491,16 +11496,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v6.3.4", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "3fdd2a3d5fdc363b2e8dbf817f9726a4d013cbd1" + "reference": "14ff4fd2a5c8969d6158dbe7ef5b17d6a9c6ba33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/3fdd2a3d5fdc363b2e8dbf817f9726a4d013cbd1", - "reference": "3fdd2a3d5fdc363b2e8dbf817f9726a4d013cbd1", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/14ff4fd2a5c8969d6158dbe7ef5b17d6a9c6ba33", + "reference": "14ff4fd2a5c8969d6158dbe7ef5b17d6a9c6ba33", "shasum": "" }, "require": { @@ -11510,7 +11515,7 @@ "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/css-selector": "^5.4|^6.0" + "symfony/css-selector": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -11538,7 +11543,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.3.4" + "source": "https://github.com/symfony/dom-crawler/tree/v6.4.0" }, "funding": [ { @@ -11554,7 +11559,7 @@ "type": "tidelift" } ], - "time": "2023-08-01T07:43:40+00:00" + "time": "2023-11-20T16:41:16+00:00" }, { "name": "symfony/error-handler", @@ -11788,16 +11793,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.3.1", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae" + "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", - "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59", + "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59", "shasum": "" }, "require": { @@ -11831,7 +11836,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.3.1" + "source": "https://github.com/symfony/filesystem/tree/v6.4.0" }, "funding": [ { @@ -11847,27 +11852,27 @@ "type": "tidelift" } ], - "time": "2023-06-01T08:30:39+00:00" + "time": "2023-07-26T17:27:13+00:00" }, { "name": "symfony/finder", - "version": "v6.3.5", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4" + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4", - "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4", + "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce", + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce", "shasum": "" }, "require": { "php": ">=8.1" }, "require-dev": { - "symfony/filesystem": "^6.0" + "symfony/filesystem": "^6.0|^7.0" }, "type": "library", "autoload": { @@ -11895,7 +11900,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.3.5" + "source": "https://github.com/symfony/finder/tree/v6.4.0" }, "funding": [ { @@ -11911,20 +11916,20 @@ "type": "tidelift" } ], - "time": "2023-09-26T12:56:25+00:00" + "time": "2023-10-31T17:30:12+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.3.8", + "version": "v6.3.9", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "ce332676de1912c4389222987193c3ef38033df6" + "reference": "49a04fd3a21edc9ce503ab78e9f342805fefe780" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ce332676de1912c4389222987193c3ef38033df6", - "reference": "ce332676de1912c4389222987193c3ef38033df6", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49a04fd3a21edc9ce503ab78e9f342805fefe780", + "reference": "49a04fd3a21edc9ce503ab78e9f342805fefe780", "shasum": "" }, "require": { @@ -11972,7 +11977,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.3.8" + "source": "https://github.com/symfony/http-foundation/tree/v6.3.9" }, "funding": [ { @@ -11988,20 +11993,20 @@ "type": "tidelift" } ], - "time": "2023-11-07T10:17:15+00:00" + "time": "2023-11-20T16:36:29+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.3.8", + "version": "v6.3.9", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "929202375ccf44a309c34aeca8305408442ebcc1" + "reference": "d63fe6b1e3ad2f037f6f000a6fc867fa8934f35c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/929202375ccf44a309c34aeca8305408442ebcc1", - "reference": "929202375ccf44a309c34aeca8305408442ebcc1", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d63fe6b1e3ad2f037f6f000a6fc867fa8934f35c", + "reference": "d63fe6b1e3ad2f037f6f000a6fc867fa8934f35c", "shasum": "" }, "require": { @@ -12085,7 +12090,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.3.8" + "source": "https://github.com/symfony/http-kernel/tree/v6.3.9" }, "funding": [ { @@ -12101,20 +12106,20 @@ "type": "tidelift" } ], - "time": "2023-11-10T13:47:32+00:00" + "time": "2023-11-29T10:24:27+00:00" }, { "name": "symfony/lock", - "version": "v6.3.8", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "5379d56b6cedba2d9dfb86563c4ed73de5b194ca" + "reference": "49c2d0ae4777d118edb13f23d0b4f125d7302cb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/5379d56b6cedba2d9dfb86563c4ed73de5b194ca", - "reference": "5379d56b6cedba2d9dfb86563c4ed73de5b194ca", + "url": "https://api.github.com/repos/symfony/lock/zipball/49c2d0ae4777d118edb13f23d0b4f125d7302cb3", + "reference": "49c2d0ae4777d118edb13f23d0b4f125d7302cb3", "shasum": "" }, "require": { @@ -12164,7 +12169,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v6.3.8" + "source": "https://github.com/symfony/lock/tree/v6.4.0" }, "funding": [ { @@ -12180,7 +12185,7 @@ "type": "tidelift" } ], - "time": "2023-11-07T10:17:15+00:00" + "time": "2023-11-21T09:41:01+00:00" }, { "name": "symfony/mime", @@ -12268,16 +12273,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v6.3.8", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "45610900872a35b77db7698651f36129906041ea" + "reference": "36bc5bc71fff1f6ca9c7c7fe1e7e23f4c1ca2aa3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/45610900872a35b77db7698651f36129906041ea", - "reference": "45610900872a35b77db7698651f36129906041ea", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/36bc5bc71fff1f6ca9c7c7fe1e7e23f4c1ca2aa3", + "reference": "36bc5bc71fff1f6ca9c7c7fe1e7e23f4c1ca2aa3", "shasum": "" }, "require": { @@ -12288,7 +12293,7 @@ }, "require-dev": { "symfony/deprecation-contracts": "^2.5|^3.0", - "symfony/error-handler": "^5.4|^6.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", "symfony/polyfill-php81": "^1.27" }, "bin": [ @@ -12329,7 +12334,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.8" + "source": "https://github.com/symfony/phpunit-bridge/tree/v6.4.0" }, "funding": [ { @@ -12345,7 +12350,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:07:48+00:00" + "time": "2023-10-31T08:18:17+00:00" }, { "name": "symfony/polyfill-ctype", @@ -13557,16 +13562,16 @@ }, { "name": "symfony/serializer", - "version": "v6.3.8", + "version": "v6.3.9", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "b3ad1515a276473f7919ac97e560017284a7c4bf" + "reference": "87faafcc88ace143b30fdc34b240d9a3603bc95e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/b3ad1515a276473f7919ac97e560017284a7c4bf", - "reference": "b3ad1515a276473f7919ac97e560017284a7c4bf", + "url": "https://api.github.com/repos/symfony/serializer/zipball/87faafcc88ace143b30fdc34b240d9a3603bc95e", + "reference": "87faafcc88ace143b30fdc34b240d9a3603bc95e", "shasum": "" }, "require": { @@ -13631,7 +13636,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v6.3.8" + "source": "https://github.com/symfony/serializer/tree/v6.3.9" }, "funding": [ { @@ -13647,7 +13652,7 @@ "type": "tidelift" } ], - "time": "2023-11-07T10:11:25+00:00" + "time": "2023-11-29T10:00:30+00:00" }, { "name": "symfony/service-contracts", @@ -13733,16 +13738,16 @@ }, { "name": "symfony/string", - "version": "v6.3.8", + "version": "v6.3.9", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "13880a87790c76ef994c91e87efb96134522577a" + "reference": "56427887aeaf540e9bbd121ad6c43f14ad3ce136" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", - "reference": "13880a87790c76ef994c91e87efb96134522577a", + "url": "https://api.github.com/repos/symfony/string/zipball/56427887aeaf540e9bbd121ad6c43f14ad3ce136", + "reference": "56427887aeaf540e9bbd121ad6c43f14ad3ce136", "shasum": "" }, "require": { @@ -13799,7 +13804,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.8" + "source": "https://github.com/symfony/string/tree/v6.3.9" }, "funding": [ { @@ -13815,7 +13820,7 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:28:21+00:00" + "time": "2023-11-28T20:40:29+00:00" }, { "name": "symfony/translation-contracts", @@ -13971,16 +13976,16 @@ }, { "name": "symfony/validator", - "version": "v6.3.8", + "version": "v6.3.9", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "f75b40e088d095db1e788b81605a76f4563cb80e" + "reference": "c118889931856af47b0732b609f3ac2ddccd1da6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/f75b40e088d095db1e788b81605a76f4563cb80e", - "reference": "f75b40e088d095db1e788b81605a76f4563cb80e", + "url": "https://api.github.com/repos/symfony/validator/zipball/c118889931856af47b0732b609f3ac2ddccd1da6", + "reference": "c118889931856af47b0732b609f3ac2ddccd1da6", "shasum": "" }, "require": { @@ -14047,7 +14052,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.3.8" + "source": "https://github.com/symfony/validator/tree/v6.3.9" }, "funding": [ { @@ -14063,7 +14068,7 @@ "type": "tidelift" } ], - "time": "2023-11-07T10:17:15+00:00" + "time": "2023-11-29T07:44:47+00:00" }, { "name": "symfony/var-dumper", @@ -14151,16 +14156,16 @@ }, { "name": "symfony/var-exporter", - "version": "v6.3.6", + "version": "v6.3.9", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "374d289c13cb989027274c86206ddc63b16a2441" + "reference": "a00fd2d47af5c95e95e8e371a74be2e79b95dfae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/374d289c13cb989027274c86206ddc63b16a2441", - "reference": "374d289c13cb989027274c86206ddc63b16a2441", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/a00fd2d47af5c95e95e8e371a74be2e79b95dfae", + "reference": "a00fd2d47af5c95e95e8e371a74be2e79b95dfae", "shasum": "" }, "require": { @@ -14205,7 +14210,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.3.6" + "source": "https://github.com/symfony/var-exporter/tree/v6.3.9" }, "funding": [ { @@ -14221,7 +14226,7 @@ "type": "tidelift" } ], - "time": "2023-10-13T09:16:49+00:00" + "time": "2023-11-28T20:34:48+00:00" }, { "name": "symfony/yaml", @@ -14476,16 +14481,16 @@ }, { "name": "unocha/common_design", - "version": "v9.2.1", + "version": "v9.2.2", "source": { "type": "git", "url": "https://github.com/UN-OCHA/common_design.git", - "reference": "c52613835d3e10baf03783d3601c030483057684" + "reference": "f582963b5848d92b42de871b628f52c5a9f34930" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/c52613835d3e10baf03783d3601c030483057684", - "reference": "c52613835d3e10baf03783d3601c030483057684", + "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/f582963b5848d92b42de871b628f52c5a9f34930", + "reference": "f582963b5848d92b42de871b628f52c5a9f34930", "shasum": "" }, "require": { @@ -14500,9 +14505,9 @@ "description": "OCHA Common Design base theme for Drupal 9+", "support": { "issues": "https://github.com/UN-OCHA/common_design/issues", - "source": "https://github.com/UN-OCHA/common_design/tree/v9.2.1" + "source": "https://github.com/UN-OCHA/common_design/tree/v9.2.2" }, - "time": "2023-10-11T12:36:16+00:00" + "time": "2023-10-26T10:03:06+00:00" }, { "name": "webflo/drupal-finder", diff --git a/composer.patches.json b/composer.patches.json index 089861f7e..c1422f75c 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -12,9 +12,6 @@ "Fix derivatives for webp source images": "PATCHES/imageapi_optimize_webp-webp-source-image.patch", "Support imagemagick toolkit": "PATCHES/imageapi_optimize_webp-imagemagick-toolkit.patch" }, - "drupal/maintenance200": { - "Drupal 10 compatibility": "PATCHES/maintenance200-drupal-10-compatibility.patch" - }, "drupal/stage_file_proxy": { "Webp support fix": "PATCHES/stage_file_proxy-webp-support-fix-3171559.patch" },