diff --git a/composer.lock b/composer.lock index 0882826b..1d94b2a0 100644 --- a/composer.lock +++ b/composer.lock @@ -261,16 +261,16 @@ }, { "name": "caxy/php-htmldiff", - "version": "v0.1.14", + "version": "v0.1.15", "source": { "type": "git", "url": "https://github.com/caxy/php-htmldiff.git", - "reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5" + "reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5", - "reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5", + "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/6342b02ddb86fd36093ad7e2db2efc21f01ab7cd", + "reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd", "shasum": "" }, "require": { @@ -316,9 +316,9 @@ ], "support": { "issues": "https://github.com/caxy/php-htmldiff/issues", - "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.14" + "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.15" }, - "time": "2022-01-19T11:09:59+00:00" + "time": "2023-11-05T23:49:04+00:00" }, { "name": "chi-teck/drupal-code-generator", @@ -4229,17 +4229,17 @@ }, { "name": "drupal/graphql", - "version": "4.5.0", + "version": "4.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/graphql.git", - "reference": "8.x-4.5" + "reference": "8.x-4.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/graphql-8.x-4.5.zip", - "reference": "8.x-4.5", - "shasum": "2f08a45f51ffba915fabeba9d6ecde90f1406c98" + "url": "https://ftp.drupal.org/files/projects/graphql-8.x-4.6.zip", + "reference": "8.x-4.6", + "shasum": "629eb1d405ea35460e6f94bd46a20316adf4fbe9" }, "require": { "drupal/core": "^9.3 || ^10", @@ -4253,8 +4253,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-4.5", - "datestamp": "1681744536", + "version": "8.x-4.6", + "datestamp": "1699463388", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5686,17 +5686,17 @@ }, { "name": "drupal/sophron", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/sophron.git", - "reference": "2.0.1" + "reference": "2.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/sophron-2.0.1.zip", - "reference": "2.0.1", - "shasum": "eb9b22e843400392ba7fa35dc99c644d2cf08982" + "url": "https://ftp.drupal.org/files/projects/sophron-2.0.2.zip", + "reference": "2.0.2", + "shasum": "ed5d910d6612ea591950b67384cc5ff26c5c7cc9" }, "require": { "drupal/core": "^10", @@ -5705,8 +5705,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.1", - "datestamp": "1676319965", + "version": "2.0.2", + "datestamp": "1699798487", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6454,16 +6454,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d" + "reference": "0795b7db12838ffb7bc564e0a02cf53fb1463ec0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", - "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/0795b7db12838ffb7bc564e0a02cf53fb1463ec0", + "reference": "0795b7db12838ffb7bc564e0a02cf53fb1463ec0", "shasum": "" }, "require": { @@ -6510,9 +6510,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.0.2" + "source": "https://github.com/FileEye/MimeMap/tree/2.0.3" }, - "time": "2023-08-29T16:20:26+00:00" + "time": "2023-11-11T14:14:23+00:00" }, { "name": "fileeye/pel", @@ -7723,37 +7723,37 @@ }, { "name": "mglaman/phpstan-drupal", - "version": "1.2.0", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/mglaman/phpstan-drupal.git", - "reference": "d721420086f146640acecebb7a678661a66e97d5" + "reference": "57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/d721420086f146640acecebb7a678661a66e97d5", - "reference": "d721420086f146640acecebb7a678661a66e97d5", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6", + "reference": "57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6", "shasum": "" }, "require": { "php": "^7.4 || ^8.0", "phpstan/phpstan": "^1.10.1", "phpstan/phpstan-deprecation-rules": "^1.1.4", - "symfony/finder": "~3.4.5 ||^4.2 || ^5.0 || ^6.0", - "symfony/yaml": "~3.4.5 || ^4.2|| ^5.0 || ^6.0", + "symfony/finder": "^4.2 || ^5.0 || ^6.0 || ^7.0", + "symfony/yaml": "^4.2|| ^5.0 || ^6.0 || ^7.0", "webflo/drupal-finder": "^1.2" }, "require-dev": { "behat/mink": "^1.8", "composer/installers": "^1.9", - "drupal/core-recommended": "^8.8@alpha || ^9.0", - "drush/drush": "^9.6 || ^10.0 || ^11", + "drupal/core-recommended": "^9.0", + "drush/drush": "^10.0 || ^11 || ^12", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^6.5 || ^7.5 || ^8.0 || ^9", + "phpunit/phpunit": "^8.5 || ^9", "slevomat/coding-standard": "^7.1", "squizlabs/php_codesniffer": "^3.3", - "symfony/phpunit-bridge": "^3.4.3 || ^4.4 || ^5.4 || ^6.0" + "symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.0 || ^7.0" }, "suggest": { "jangregor/phpstan-prophecy": "Provides a prophecy/prophecy extension for phpstan/phpstan.", @@ -7807,7 +7807,7 @@ "description": "Drupal extension and rules for PHPStan", "support": { "issues": "https://github.com/mglaman/phpstan-drupal/issues", - "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.0" + "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.4" }, "funding": [ { @@ -7823,7 +7823,7 @@ "type": "tidelift" } ], - "time": "2023-08-24T20:32:56+00:00" + "time": "2023-11-14T22:47:32+00:00" }, { "name": "mikey179/vfsstream", @@ -9174,16 +9174,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.40", + "version": "1.10.41", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d" + "reference": "c6174523c2a69231df55bdc65b61655e72876d76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/93c84b5bf7669920d823631e39904d69b9c7dc5d", - "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76", + "reference": "c6174523c2a69231df55bdc65b61655e72876d76", "shasum": "" }, "require": { @@ -9232,7 +9232,7 @@ "type": "tidelift" } ], - "time": "2023-10-30T14:48:31+00:00" + "time": "2023-11-05T12:57:57+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -11677,16 +11677,16 @@ }, { "name": "symfony/browser-kit", - "version": "v6.3.2", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "ca4a988488f61ac18f8f845445eabdd36f89aa8d" + "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ca4a988488f61ac18f8f845445eabdd36f89aa8d", - "reference": "ca4a988488f61ac18f8f845445eabdd36f89aa8d", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e270297dbee59168274c2b535ab1bccd593e6ffe", + "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe", "shasum": "" }, "require": { @@ -11725,7 +11725,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.2" + "source": "https://github.com/symfony/browser-kit/tree/v6.3.8" }, "funding": [ { @@ -11741,20 +11741,20 @@ "type": "tidelift" } ], - "time": "2023-07-06T06:56:43+00:00" + "time": "2023-10-31T08:07:48+00:00" }, { "name": "symfony/console", - "version": "v6.3.4", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6" + "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", + "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92", + "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92", "shasum": "" }, "require": { @@ -11815,7 +11815,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.3.4" + "source": "https://github.com/symfony/console/tree/v6.3.8" }, "funding": [ { @@ -11831,7 +11831,7 @@ "type": "tidelift" } ], - "time": "2023-08-16T10:10:12+00:00" + "time": "2023-10-31T08:09:35+00:00" }, { "name": "symfony/css-selector", @@ -11900,16 +11900,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.3.5", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993" + "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ed62b3bf98346e1f45529a7b6be2196739bb993", - "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1f30f545c4151f611148fc19e28d54d39e0a00bc", + "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc", "shasum": "" }, "require": { @@ -11961,7 +11961,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.3.5" + "source": "https://github.com/symfony/dependency-injection/tree/v6.3.8" }, "funding": [ { @@ -11977,7 +11977,7 @@ "type": "tidelift" } ], - "time": "2023-09-25T16:46:40+00:00" + "time": "2023-10-31T08:07:48+00:00" }, { "name": "symfony/deprecation-contracts", @@ -12537,16 +12537,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e" + "reference": "ce332676de1912c4389222987193c3ef38033df6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/59d1837d5d992d16c2628cd0d6b76acf8d69b33e", - "reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ce332676de1912c4389222987193c3ef38033df6", + "reference": "ce332676de1912c4389222987193c3ef38033df6", "shasum": "" }, "require": { @@ -12594,7 +12594,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.7" + "source": "https://github.com/symfony/http-foundation/tree/v6.3.8" }, "funding": [ { @@ -12610,20 +12610,20 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:55:27+00:00" + "time": "2023-11-07T10:17:15+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6d4098095f93279d9536a0e9124439560cc764d0" + "reference": "929202375ccf44a309c34aeca8305408442ebcc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6d4098095f93279d9536a0e9124439560cc764d0", - "reference": "6d4098095f93279d9536a0e9124439560cc764d0", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/929202375ccf44a309c34aeca8305408442ebcc1", + "reference": "929202375ccf44a309c34aeca8305408442ebcc1", "shasum": "" }, "require": { @@ -12707,7 +12707,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.7" + "source": "https://github.com/symfony/http-kernel/tree/v6.3.8" }, "funding": [ { @@ -12723,20 +12723,20 @@ "type": "tidelift" } ], - "time": "2023-10-29T14:31:45+00:00" + "time": "2023-11-10T13:47:32+00:00" }, { "name": "symfony/lock", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "7e5d1412827aa97e90f9af9495d452f0b9465a85" + "reference": "5379d56b6cedba2d9dfb86563c4ed73de5b194ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/7e5d1412827aa97e90f9af9495d452f0b9465a85", - "reference": "7e5d1412827aa97e90f9af9495d452f0b9465a85", + "url": "https://api.github.com/repos/symfony/lock/zipball/5379d56b6cedba2d9dfb86563c4ed73de5b194ca", + "reference": "5379d56b6cedba2d9dfb86563c4ed73de5b194ca", "shasum": "" }, "require": { @@ -12786,7 +12786,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v6.3.7" + "source": "https://github.com/symfony/lock/tree/v6.3.8" }, "funding": [ { @@ -12802,7 +12802,7 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:55:27+00:00" + "time": "2023-11-07T10:17:15+00:00" }, { "name": "symfony/mime", @@ -12890,16 +12890,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v6.3.6", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "c6f1df6a76c2c12bd14a0a5bf7c556dd935efe1d" + "reference": "45610900872a35b77db7698651f36129906041ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c6f1df6a76c2c12bd14a0a5bf7c556dd935efe1d", - "reference": "c6f1df6a76c2c12bd14a0a5bf7c556dd935efe1d", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/45610900872a35b77db7698651f36129906041ea", + "reference": "45610900872a35b77db7698651f36129906041ea", "shasum": "" }, "require": { @@ -12951,7 +12951,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.6" + "source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.8" }, "funding": [ { @@ -12967,7 +12967,7 @@ "type": "tidelift" } ], - "time": "2023-10-12T15:02:41+00:00" + "time": "2023-10-31T08:07:48+00:00" }, { "name": "symfony/polyfill-ctype", @@ -14179,16 +14179,16 @@ }, { "name": "symfony/serializer", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9" + "reference": "b3ad1515a276473f7919ac97e560017284a7c4bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9", - "reference": "641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9", + "url": "https://api.github.com/repos/symfony/serializer/zipball/b3ad1515a276473f7919ac97e560017284a7c4bf", + "reference": "b3ad1515a276473f7919ac97e560017284a7c4bf", "shasum": "" }, "require": { @@ -14253,7 +14253,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.7" + "source": "https://github.com/symfony/serializer/tree/v6.3.8" }, "funding": [ { @@ -14269,7 +14269,7 @@ "type": "tidelift" } ], - "time": "2023-10-26T18:15:14+00:00" + "time": "2023-11-07T10:11:25+00:00" }, { "name": "symfony/service-contracts", @@ -14355,16 +14355,16 @@ }, { "name": "symfony/string", - "version": "v6.3.5", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" + "reference": "13880a87790c76ef994c91e87efb96134522577a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", + "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", + "reference": "13880a87790c76ef994c91e87efb96134522577a", "shasum": "" }, "require": { @@ -14421,7 +14421,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.5" + "source": "https://github.com/symfony/string/tree/v6.3.8" }, "funding": [ { @@ -14437,7 +14437,7 @@ "type": "tidelift" } ], - "time": "2023-09-18T10:38:32+00:00" + "time": "2023-11-09T08:28:21+00:00" }, { "name": "symfony/translation-contracts", @@ -14593,16 +14593,16 @@ }, { "name": "symfony/validator", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "9cc736663fa5839b9710ac2c303bb0b951014fc1" + "reference": "f75b40e088d095db1e788b81605a76f4563cb80e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/9cc736663fa5839b9710ac2c303bb0b951014fc1", - "reference": "9cc736663fa5839b9710ac2c303bb0b951014fc1", + "url": "https://api.github.com/repos/symfony/validator/zipball/f75b40e088d095db1e788b81605a76f4563cb80e", + "reference": "f75b40e088d095db1e788b81605a76f4563cb80e", "shasum": "" }, "require": { @@ -14669,7 +14669,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.3.7" + "source": "https://github.com/symfony/validator/tree/v6.3.8" }, "funding": [ { @@ -14685,20 +14685,20 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:11:45+00:00" + "time": "2023-11-07T10:17:15+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.3.6", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97" + "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/999ede244507c32b8e43aebaa10e9fce20de7c97", - "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/81acabba9046550e89634876ca64bfcd3c06aa0a", + "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a", "shasum": "" }, "require": { @@ -14753,7 +14753,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.3.6" + "source": "https://github.com/symfony/var-dumper/tree/v6.3.8" }, "funding": [ { @@ -14769,7 +14769,7 @@ "type": "tidelift" } ], - "time": "2023-10-12T18:45:56+00:00" + "time": "2023-11-08T10:42:36+00:00" }, { "name": "symfony/var-exporter", @@ -14847,16 +14847,16 @@ }, { "name": "symfony/yaml", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8" + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/9758b6c69d179936435d0ffb577c3708d57e38a8", - "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92", + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92", "shasum": "" }, "require": { @@ -14899,7 +14899,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.3.7" + "source": "https://github.com/symfony/yaml/tree/v6.3.8" }, "funding": [ { @@ -14915,7 +14915,7 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:31:00+00:00" + "time": "2023-11-06T10:58:05+00:00" }, { "name": "theseer/tokenizer", @@ -15880,5 +15880,5 @@ "php": ">=8.2" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/config/core.entity_form_display.node.story.default.yml b/config/core.entity_form_display.node.story.default.yml index 83290307..58cb2bde 100755 --- a/config/core.entity_form_display.node.story.default.yml +++ b/config/core.entity_form_display.node.story.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.node.story.field_caption - field.field.node.story.field_content_space - field.field.node.story.field_footnotes - field.field.node.story.field_media @@ -13,6 +14,7 @@ dependencies: module: - allowed_formats - content_moderation + - double_field - media_library - text id: node.story.default @@ -20,6 +22,33 @@ targetEntityType: node bundle: story mode: default content: + field_caption: + type: double_field + weight: 4 + region: content + settings: + first: + type: textfield + label_display: block + size: 60 + placeholder: 'Ex: Mbuji-Mayi, RDC' + label: Ok + cols: 10 + rows: 5 + prefix: '' + suffix: '' + second: + type: textarea + label_display: block + size: 10 + placeholder: '' + label: Ok + cols: 10 + rows: 5 + prefix: '' + suffix: '' + inline: false + third_party_settings: { } field_content_space: type: options_select weight: 0 @@ -28,7 +57,7 @@ content: third_party_settings: { } field_footnotes: type: text_textarea - weight: 5 + weight: 6 region: content settings: rows: 5 @@ -46,7 +75,7 @@ content: third_party_settings: { } field_source: type: text_textarea - weight: 6 + weight: 7 region: content settings: rows: 5 @@ -57,7 +86,7 @@ content: hide_guidelines: '1' field_text: type: text_textarea - weight: 4 + weight: 5 region: content settings: rows: 5 @@ -74,13 +103,13 @@ content: third_party_settings: { } moderation_state: type: moderation_state_default - weight: 8 + weight: 9 region: content settings: { } third_party_settings: { } status: type: boolean_checkbox - weight: 7 + weight: 8 region: content settings: display_label: true diff --git a/config/core.entity_view_display.node.story.default.yml b/config/core.entity_view_display.node.story.default.yml index fc2f705f..79aee67b 100755 --- a/config/core.entity_view_display.node.story.default.yml +++ b/config/core.entity_view_display.node.story.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.node.story.field_caption - field.field.node.story.field_content_space - field.field.node.story.field_footnotes - field.field.node.story.field_media @@ -11,6 +12,7 @@ dependencies: - field.field.node.story.field_type - node.type.story module: + - gho_fields - text - user id: node.story.default @@ -18,6 +20,13 @@ targetEntityType: node bundle: story mode: default content: + field_caption: + type: gho_caption + label: hidden + settings: { } + third_party_settings: { } + weight: 6 + region: content field_footnotes: type: text_default label: above diff --git a/config/core.entity_view_display.node.story.full.yml b/config/core.entity_view_display.node.story.full.yml new file mode 100644 index 00000000..d3d69949 --- /dev/null +++ b/config/core.entity_view_display.node.story.full.yml @@ -0,0 +1,50 @@ +uuid: 66a0c6ee-2406-498b-9756-620fb42f3b09 +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.full + - field.field.node.story.field_caption + - field.field.node.story.field_content_space + - field.field.node.story.field_footnotes + - field.field.node.story.field_media + - field.field.node.story.field_source + - field.field.node.story.field_text + - field.field.node.story.field_type + - node.type.story + module: + - gho_fields + - user +id: node.story.full +targetEntityType: node +bundle: story +mode: full +content: + field_caption: + type: gho_caption + label: hidden + settings: { } + third_party_settings: { } + weight: 4 + region: content + links: + settings: { } + third_party_settings: { } + weight: 100 + region: content + title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: -5 + region: content +hidden: + field_content_space: true + field_footnotes: true + field_media: true + field_source: true + field_text: true + field_type: true + langcode: true diff --git a/config/core.entity_view_display.node.story.home_page.yml b/config/core.entity_view_display.node.story.home_page.yml new file mode 100644 index 00000000..45bc4d11 --- /dev/null +++ b/config/core.entity_view_display.node.story.home_page.yml @@ -0,0 +1,50 @@ +uuid: aa35d3d3-c347-415f-a191-94eb15cf4769 +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.node.home_page + - field.field.node.story.field_caption + - field.field.node.story.field_content_space + - field.field.node.story.field_footnotes + - field.field.node.story.field_media + - field.field.node.story.field_source + - field.field.node.story.field_text + - field.field.node.story.field_type + - node.type.story + module: + - gho_fields + - user +id: node.story.home_page +targetEntityType: node +bundle: story +mode: home_page +content: + field_caption: + type: gho_caption + label: hidden + settings: { } + third_party_settings: { } + weight: 4 + region: content + links: + settings: { } + third_party_settings: { } + weight: 100 + region: content + title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: -5 + region: content +hidden: + field_content_space: true + field_footnotes: true + field_media: true + field_source: true + field_text: true + field_type: true + langcode: true diff --git a/config/core.entity_view_display.node.story.preview.yml b/config/core.entity_view_display.node.story.preview.yml index a852a5a8..760f9af3 100755 --- a/config/core.entity_view_display.node.story.preview.yml +++ b/config/core.entity_view_display.node.story.preview.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - core.entity_view_mode.node.preview + - field.field.node.story.field_caption - field.field.node.story.field_content_space - field.field.node.story.field_footnotes - field.field.node.story.field_media @@ -71,6 +72,7 @@ content: weight: -5 region: content hidden: + field_caption: true field_content_space: true langcode: true links: true diff --git a/config/core.entity_view_display.node.story.teaser.yml b/config/core.entity_view_display.node.story.teaser.yml index 5aff49a3..0f33fecc 100755 --- a/config/core.entity_view_display.node.story.teaser.yml +++ b/config/core.entity_view_display.node.story.teaser.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - core.entity_view_mode.node.teaser + - field.field.node.story.field_caption - field.field.node.story.field_content_space - field.field.node.story.field_footnotes - field.field.node.story.field_media @@ -12,6 +13,7 @@ dependencies: - field.field.node.story.field_type - node.type.story module: + - double_field - text - user id: node.story.teaser @@ -19,12 +21,36 @@ targetEntityType: node bundle: story mode: teaser content: + field_caption: + type: double_field_unformatted_list + label: hidden + settings: + first: + format_type: medium + link: false + hidden: false + key: false + decimal_separator: . + thousand_separator: '' + scale: 2 + second: + format_type: medium + link: false + hidden: false + key: false + decimal_separator: . + thousand_separator: '' + scale: 2 + inline: true + third_party_settings: { } + weight: 3 + region: content field_footnotes: type: text_default label: above settings: { } third_party_settings: { } - weight: 3 + weight: 5 region: content field_media: type: entity_reference_entity_view @@ -33,21 +59,21 @@ content: view_mode: story link: false third_party_settings: { } - weight: 1 + weight: 2 region: content field_source: type: text_default label: above settings: { } third_party_settings: { } - weight: 4 + weight: 6 region: content field_text: type: text_default label: hidden settings: { } third_party_settings: { } - weight: 2 + weight: 4 region: content field_type: type: entity_reference_label @@ -55,7 +81,7 @@ content: settings: link: false third_party_settings: { } - weight: 0 + weight: 1 region: content title: type: string @@ -63,7 +89,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: -5 + weight: 0 region: content hidden: field_content_space: true diff --git a/config/field.field.node.story.field_caption.yml b/config/field.field.node.story.field_caption.yml new file mode 100644 index 00000000..354e4066 --- /dev/null +++ b/config/field.field.node.story.field_caption.yml @@ -0,0 +1,39 @@ +uuid: 727f2c1b-3db9-4588-b276-40b695622243 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_caption + - node.type.story + module: + - double_field +id: node.story.field_caption +field_name: field_caption +entity_type: node +bundle: story +label: Caption +description: 'When this image is used on Humanitarian Action, it will include a written text comprising the location in bold, followed by the caption, and then the image credits. These credits are defined in the Media Library and not editable here.' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + first: + label: 'Image location' + list: false + allowed_values: { } + max: null + min: null + required: false + on_label: 'On' + off_label: 'Off' + second: + label: Caption + list: false + allowed_values: { } + max: null + min: null + required: false + on_label: 'On' + off_label: 'Off' +field_type: double_field diff --git a/html/modules/custom/ncms_graphql/graphql/ncms_schema_extension.base.graphqls b/html/modules/custom/ncms_graphql/graphql/ncms_schema_extension.base.graphqls index 79e36e56..74514c23 100644 --- a/html/modules/custom/ncms_graphql/graphql/ncms_schema_extension.base.graphqls +++ b/html/modules/custom/ncms_graphql/graphql/ncms_schema_extension.base.graphqls @@ -7,7 +7,7 @@ type Article { id: Int! uuid: String! title: String! - title_short: String! + title_short: String section: String language: Language status: Int @@ -28,7 +28,7 @@ type Document { id: Int! uuid: String! title: String! - title_short: String! + title_short: String status: Int created: String updated: String diff --git a/html/modules/custom/ncms_ui/ncms_ui.module b/html/modules/custom/ncms_ui/ncms_ui.module index a9fbeb32..dfd445fc 100644 --- a/html/modules/custom/ncms_ui/ncms_ui.module +++ b/html/modules/custom/ncms_ui/ncms_ui.module @@ -337,15 +337,11 @@ function ncms_ui_form_node_form_alter(&$form, FormStateInterface $form_state) { ]; if ($node instanceof Document) { - // Hide the label of the double field widget. - $form['field_caption']['widget'][0]['#title_display'] = FALSE; // Attach custom styles. $form['#attached']['library'][] = 'ncms_ui/document_edit_form'; } if ($node instanceof Article) { - // Hide the label of the double field widget. - $form['field_caption']['widget'][0]['#title_display'] = FALSE; // Attach custom styles. $form['#attached']['library'][] = 'ncms_ui/article_edit_form'; } @@ -368,6 +364,11 @@ function ncms_ui_form_node_form_alter(&$form, FormStateInterface $form_state) { $entity_overview_form_alter->alterForm($form, $form_state); } + // Hide the label of the double field widget. + if (array_key_exists('field_caption', $form)) { + $form['field_caption']['widget'][0]['#title_display'] = FALSE; + } + // Add a cancel link. This either redirects to the publisher site if this // request came from an external publisher, or to a url given in the // destination query argument, or, as a fallback, to the main content diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme index 9300709d..6dd0f500 100644 --- a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme +++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme @@ -169,7 +169,7 @@ function common_design_subtheme_preprocess_node(&$variables) { function common_design_subtheme_preprocess_node__story(&$variables) { if (isset($variables['content']['field_media'][0]['#media'])) { $credits = $variables['content']['field_media'][0]['#media']->field_credits->value; - $variables['content']['credits'] = ['#markup' => $credits]; + $variables['content']['credits'] = $credits; } } diff --git a/html/themes/custom/common_design_subtheme/components/gho-story/gho-story.css b/html/themes/custom/common_design_subtheme/components/gho-story/gho-story.css index aa54ded0..1f22e617 100644 --- a/html/themes/custom/common_design_subtheme/components/gho-story/gho-story.css +++ b/html/themes/custom/common_design_subtheme/components/gho-story/gho-story.css @@ -52,7 +52,31 @@ } .gho-story .field--name-field-media { - margin-bottom: 2rem; + margin-bottom: 1rem; +} +.gho-story .field--name-field-media .media--view-mode-story { + position: relative; +} +.gho-story .media-caption { + padding: 1rem 0 0.5rem 0; + margin-bottom: 0.5rem; + border-bottom: 1px solid #fff; + color: #fff; + font-size: 0.75rem; +} +@media (min-width: 768px) { + .gho-story .media-caption { + font-size: 0.875rem; + } +} +.gho-story .media-caption * { + display: inline; +} +.gho-story .media-caption .double-field-first { + font-weight: bold; +} +.gho-story .media-caption .field--name-field-caption > *::after { + content: "."; } .gho-story .gho-caption { margin: 0; diff --git a/html/themes/custom/common_design_subtheme/templates/nodes/node--story--full.html.twig b/html/themes/custom/common_design_subtheme/templates/nodes/node--story--full.html.twig index 732ca162..d7aa92ac 100644 --- a/html/themes/custom/common_design_subtheme/templates/nodes/node--story--full.html.twig +++ b/html/themes/custom/common_design_subtheme/templates/nodes/node--story--full.html.twig @@ -111,14 +111,17 @@ {{ content.field_media }} +
+ {{ content.field_caption }} + {{ content.credits }} +
{{ content.field_text }} - {{ content.credits }}
- {{ content|without(['field_type', 'field_media', 'field_text', 'credits']) }} + {{ content|without(['field_type', 'field_media', 'field_text', 'field_caption', 'credits']) }} {# diff --git a/html/themes/custom/common_design_subtheme/templates/nodes/node--story--teaser.html.twig b/html/themes/custom/common_design_subtheme/templates/nodes/node--story--teaser.html.twig index f37d165f..9fe49970 100644 --- a/html/themes/custom/common_design_subtheme/templates/nodes/node--story--teaser.html.twig +++ b/html/themes/custom/common_design_subtheme/templates/nodes/node--story--teaser.html.twig @@ -98,13 +98,16 @@ {{ content.field_media }} +
+ {{ content.field_caption }} + {{ content.credits }} +
{{ content.field_text }} - {{ content.credits }}
- {{ content|without(['field_type', 'field_media', 'field_text', 'credits']) }} + {{ content|without(['field_type', 'field_media', 'field_text', 'field_caption', 'credits']) }} {#