diff --git a/composer.json b/composer.json
index f2c9cf1..e980592 100644
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,7 @@
"composer/installers": "^2.0",
"cweagans/composer-patches": "^1.7",
"drupal/cer": "^5.0@beta",
+ "drupal/config_ignore": "^3.1",
"drupal/content_as_config": "^1.0",
"drupal/core-composer-scaffold": "^10.0",
"drupal/core-project-message": "^10.0",
diff --git a/composer.lock b/composer.lock
index 92946b4..f029d26 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": "d5d4122da2b7a3502081e8d79d06641a",
+ "content-hash": "185dc0d2be2be9514fc2dad73c4205d1",
"packages": [
{
"name": "asm89/stack-cors",
@@ -351,25 +351,25 @@
},
{
"name": "consolidation/annotated-command",
- "version": "4.7.1",
+ "version": "4.9.1",
"source": {
"type": "git",
"url": "https://github.com/consolidation/annotated-command.git",
- "reference": "fd263e3e9341d29758025b1a9b2878e3247525be"
+ "reference": "e01152f698eff4cb5df3ebfe5e097ef335dbd3c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/fd263e3e9341d29758025b1a9b2878e3247525be",
- "reference": "fd263e3e9341d29758025b1a9b2878e3247525be",
+ "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/e01152f698eff4cb5df3ebfe5e097ef335dbd3c9",
+ "reference": "e01152f698eff4cb5df3ebfe5e097ef335dbd3c9",
"shasum": ""
},
"require": {
- "consolidation/output-formatters": "^4.1.1",
+ "consolidation/output-formatters": "^4.3.1",
"php": ">=7.1.3",
- "psr/log": "^1|^2|^3",
- "symfony/console": "^4.4.8|^5|^6",
- "symfony/event-dispatcher": "^4.4.8|^5|^6",
- "symfony/finder": "^4.4.8|^5|^6"
+ "psr/log": "^1 || ^2 || ^3",
+ "symfony/console": "^4.4.8 || ^5 || ^6",
+ "symfony/event-dispatcher": "^4.4.8 || ^5 || ^6",
+ "symfony/finder": "^4.4.8 || ^5 || ^6"
},
"require-dev": {
"composer-runtime-api": "^2.0",
@@ -401,9 +401,9 @@
"description": "Initialize Symfony Console commands from annotated command class methods.",
"support": {
"issues": "https://github.com/consolidation/annotated-command/issues",
- "source": "https://github.com/consolidation/annotated-command/tree/4.7.1"
+ "source": "https://github.com/consolidation/annotated-command/tree/4.9.1"
},
- "time": "2022-12-06T22:57:25+00:00"
+ "time": "2023-05-20T04:19:01+00:00"
},
{
"name": "consolidation/config",
@@ -569,41 +569,36 @@
},
{
"name": "consolidation/output-formatters",
- "version": "4.2.3",
+ "version": "4.3.2",
"source": {
"type": "git",
"url": "https://github.com/consolidation/output-formatters.git",
- "reference": "cbb50cc86775f14972003f797b61e232788bee1f"
+ "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/cbb50cc86775f14972003f797b61e232788bee1f",
- "reference": "cbb50cc86775f14972003f797b61e232788bee1f",
+ "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/06711568b4cd169700ff7e8075db0a9a341ceb58",
+ "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58",
"shasum": ""
},
"require": {
"dflydev/dot-access-data": "^1.1.0 || ^2 || ^3",
"php": ">=7.1.3",
- "symfony/console": "^4|^5|^6",
- "symfony/finder": "^4|^5|^6"
+ "symfony/console": "^4 || ^5 || ^6",
+ "symfony/finder": "^4 || ^5 || ^6"
},
"require-dev": {
"php-coveralls/php-coveralls": "^2.4.2",
- "phpunit/phpunit": ">=7",
+ "phpunit/phpunit": "^7 || ^8 || ^9",
"squizlabs/php_codesniffer": "^3",
- "symfony/var-dumper": "^4|^5|^6",
- "symfony/yaml": "^4|^5|^6",
- "yoast/phpunit-polyfills": "^0.2.0"
+ "symfony/var-dumper": "^4 || ^5 || ^6",
+ "symfony/yaml": "^4 || ^5 || ^6",
+ "yoast/phpunit-polyfills": "^1"
},
"suggest": {
"symfony/var-dumper": "For using the var_dump formatter"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "4.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Consolidation\\OutputFormatters\\": "src"
@@ -622,26 +617,26 @@
"description": "Format text by applying transformations provided by plug-in formatters.",
"support": {
"issues": "https://github.com/consolidation/output-formatters/issues",
- "source": "https://github.com/consolidation/output-formatters/tree/4.2.3"
+ "source": "https://github.com/consolidation/output-formatters/tree/4.3.2"
},
- "time": "2022-10-17T04:01:40+00:00"
+ "time": "2023-07-06T04:45:41+00:00"
},
{
"name": "consolidation/robo",
- "version": "4.0.3",
+ "version": "4.0.6",
"source": {
"type": "git",
"url": "https://github.com/consolidation/robo.git",
- "reference": "d655b79c8e916f9f9947df0ddc1040967ddc5a28"
+ "reference": "55a272370940607649e5c46eb173c5c54f7c166d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/robo/zipball/d655b79c8e916f9f9947df0ddc1040967ddc5a28",
- "reference": "d655b79c8e916f9f9947df0ddc1040967ddc5a28",
+ "url": "https://api.github.com/repos/consolidation/robo/zipball/55a272370940607649e5c46eb173c5c54f7c166d",
+ "reference": "55a272370940607649e5c46eb173c5c54f7c166d",
"shasum": ""
},
"require": {
- "consolidation/annotated-command": "^4.3",
+ "consolidation/annotated-command": "^4.8.1",
"consolidation/config": "^2.0.1",
"consolidation/log": "^2.0.2 || ^3",
"consolidation/output-formatters": "^4.1.2",
@@ -695,22 +690,22 @@
"description": "Modern task runner",
"support": {
"issues": "https://github.com/consolidation/robo/issues",
- "source": "https://github.com/consolidation/robo/tree/4.0.3"
+ "source": "https://github.com/consolidation/robo/tree/4.0.6"
},
- "time": "2022-12-07T14:13:05+00:00"
+ "time": "2023-04-30T21:49:04+00:00"
},
{
"name": "consolidation/self-update",
- "version": "2.0.5",
+ "version": "2.2.0",
"source": {
"type": "git",
"url": "https://github.com/consolidation/self-update.git",
- "reference": "8a64bdd8daf5faa8e85f56534dd99caf928164b3"
+ "reference": "972a1016761c9b63314e040836a12795dff6953a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/self-update/zipball/8a64bdd8daf5faa8e85f56534dd99caf928164b3",
- "reference": "8a64bdd8daf5faa8e85f56534dd99caf928164b3",
+ "url": "https://api.github.com/repos/consolidation/self-update/zipball/972a1016761c9b63314e040836a12795dff6953a",
+ "reference": "972a1016761c9b63314e040836a12795dff6953a",
"shasum": ""
},
"require": {
@@ -750,22 +745,22 @@
"description": "Provides a self:update command for Symfony Console applications.",
"support": {
"issues": "https://github.com/consolidation/self-update/issues",
- "source": "https://github.com/consolidation/self-update/tree/2.0.5"
+ "source": "https://github.com/consolidation/self-update/tree/2.2.0"
},
- "time": "2022-02-09T22:44:24+00:00"
+ "time": "2023-03-18T01:37:41+00:00"
},
{
"name": "consolidation/site-alias",
- "version": "4.0.0",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/consolidation/site-alias.git",
- "reference": "103fbc9bad6bbadb1f7533454a8f070ddce18e13"
+ "reference": "b0eeb8c8f3d54d072824ee31b5e00cb5181f91c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/site-alias/zipball/103fbc9bad6bbadb1f7533454a8f070ddce18e13",
- "reference": "103fbc9bad6bbadb1f7533454a8f070ddce18e13",
+ "url": "https://api.github.com/repos/consolidation/site-alias/zipball/b0eeb8c8f3d54d072824ee31b5e00cb5181f91c5",
+ "reference": "b0eeb8c8f3d54d072824ee31b5e00cb5181f91c5",
"shasum": ""
},
"require": {
@@ -809,9 +804,9 @@
"description": "Manage alias records for local and remote sites.",
"support": {
"issues": "https://github.com/consolidation/site-alias/issues",
- "source": "https://github.com/consolidation/site-alias/tree/4.0.0"
+ "source": "https://github.com/consolidation/site-alias/tree/4.0.1"
},
- "time": "2022-10-14T03:41:22+00:00"
+ "time": "2023-04-29T17:18:10+00:00"
},
{
"name": "consolidation/site-process",
@@ -1266,6 +1261,66 @@
"source": "https://git.drupalcode.org/project/cer"
}
},
+ {
+ "name": "drupal/config_ignore",
+ "version": "3.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://git.drupalcode.org/project/config_ignore.git",
+ "reference": "8.x-3.1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-3.1.zip",
+ "reference": "8.x-3.1",
+ "shasum": "5e60f312e02735060d5e5b1724330bb243face4c"
+ },
+ "require": {
+ "drupal/core": "^8.8 || ^9 || ^10"
+ },
+ "require-dev": {
+ "drupal/config_filter": "^1.8||^2.2",
+ "drush/drush": "^10 || ^11 || ^12"
+ },
+ "type": "drupal-module",
+ "extra": {
+ "drupal": {
+ "version": "8.x-3.1",
+ "datestamp": "1699302168",
+ "security-coverage": {
+ "status": "covered",
+ "message": "Covered by Drupal's security advisory policy"
+ }
+ }
+ },
+ "notification-url": "https://packages.drupal.org/8/downloads",
+ "license": [
+ "GPL-2.0+"
+ ],
+ "authors": [
+ {
+ "name": "Tommy Lynge Jørgensen",
+ "homepage": "https://www.drupal.org/u/tlyngej",
+ "email": "tlyngej@gmail.com",
+ "role": "Maintainer"
+ },
+ {
+ "name": "Fabian Bircher",
+ "homepage": "https://www.drupal.org/u/bircher",
+ "role": "Maintainer"
+ },
+ {
+ "name": "tlyngej",
+ "homepage": "https://www.drupal.org/user/413139"
+ }
+ ],
+ "description": "Ignore certain configuration during import and export.",
+ "homepage": "http://drupal.org/project/config_ignore",
+ "support": {
+ "source": "https://git.drupalcode.org/project/config_ignore",
+ "issues": "http://drupal.org/project/config_ignore"
+ }
+ },
{
"name": "drupal/content_as_config",
"version": "1.0.10",
@@ -1333,16 +1388,16 @@
},
{
"name": "drupal/core",
- "version": "10.1.4",
+ "version": "10.1.7",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "443b8e72b4dff11cd0d6b40de5cd887c7a9bd94d"
+ "reference": "54415049a721ede65318e3980b402af59bc35913"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/443b8e72b4dff11cd0d6b40de5cd887c7a9bd94d",
- "reference": "443b8e72b4dff11cd0d6b40de5cd887c7a9bd94d",
+ "url": "https://api.github.com/repos/drupal/core/zipball/54415049a721ede65318e3980b402af59bc35913",
+ "reference": "54415049a721ede65318e3980b402af59bc35913",
"shasum": ""
},
"require": {
@@ -1487,22 +1542,22 @@
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"support": {
- "source": "https://github.com/drupal/core/tree/10.1.4"
+ "source": "https://github.com/drupal/core/tree/10.1.7"
},
- "time": "2023-09-19T17:57:50+00:00"
+ "time": "2023-12-06T09:22:56+00:00"
},
{
"name": "drupal/core-composer-scaffold",
- "version": "10.1.4",
+ "version": "10.1.7",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-composer-scaffold.git",
- "reference": "1ccd7db5ff8a5425b5bbba9b9a05e366363c0a51"
+ "reference": "6a2d817ccb59fdb7e6b3720a1478b0d00b475445"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/1ccd7db5ff8a5425b5bbba9b9a05e366363c0a51",
- "reference": "1ccd7db5ff8a5425b5bbba9b9a05e366363c0a51",
+ "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/6a2d817ccb59fdb7e6b3720a1478b0d00b475445",
+ "reference": "6a2d817ccb59fdb7e6b3720a1478b0d00b475445",
"shasum": ""
},
"require": {
@@ -1537,13 +1592,13 @@
"drupal"
],
"support": {
- "source": "https://github.com/drupal/core-composer-scaffold/tree/10.1.4"
+ "source": "https://github.com/drupal/core-composer-scaffold/tree/10.1.7"
},
- "time": "2023-04-30T16:15:32+00:00"
+ "time": "2023-11-15T23:23:43+00:00"
},
{
"name": "drupal/core-project-message",
- "version": "10.1.4",
+ "version": "10.1.7",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-project-message.git",
@@ -1578,22 +1633,22 @@
"drupal"
],
"support": {
- "source": "https://github.com/drupal/core-project-message/tree/10.1.4"
+ "source": "https://github.com/drupal/core-project-message/tree/10.1.7"
},
"time": "2022-07-01T08:32:39+00:00"
},
{
"name": "drupal/core-recommended",
- "version": "10.1.4",
+ "version": "10.1.7",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
- "reference": "c0306542c1e9377a47ce5f6084e1bd03c32d4817"
+ "reference": "e4726a4a0173a4b9acdac8cab5d4009d6085fd2e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/c0306542c1e9377a47ce5f6084e1bd03c32d4817",
- "reference": "c0306542c1e9377a47ce5f6084e1bd03c32d4817",
+ "url": "https://api.github.com/repos/drupal/core-recommended/zipball/e4726a4a0173a4b9acdac8cab5d4009d6085fd2e",
+ "reference": "e4726a4a0173a4b9acdac8cab5d4009d6085fd2e",
"shasum": ""
},
"require": {
@@ -1602,7 +1657,7 @@
"doctrine/annotations": "~1.14.3",
"doctrine/deprecations": "~v1.1.1",
"doctrine/lexer": "~2.1.0",
- "drupal/core": "10.1.4",
+ "drupal/core": "10.1.7",
"egulias/email-validator": "~4.0.1",
"guzzlehttp/guzzle": "~7.7.0",
"guzzlehttp/psr7": "~2.5.0",
@@ -1659,33 +1714,33 @@
],
"description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.",
"support": {
- "source": "https://github.com/drupal/core-recommended/tree/10.1.4"
+ "source": "https://github.com/drupal/core-recommended/tree/10.1.7"
},
- "time": "2023-09-19T17:57:50+00:00"
+ "time": "2023-12-06T09:22:56+00:00"
},
{
"name": "drupal/gin",
- "version": "3.0.0-rc1",
+ "version": "3.0.0-rc7",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/gin.git",
- "reference": "8.x-3.0-rc1"
+ "reference": "8.x-3.0-rc7"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc1.zip",
- "reference": "8.x-3.0-rc1",
- "shasum": "d9a9ed97a5f8741e6edf48ef03721b3a278ef167"
+ "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc7.zip",
+ "reference": "8.x-3.0-rc7",
+ "shasum": "9f91862fc82ef8b0adbf34b26caa3c42d4f1f6b2"
},
"require": {
- "drupal/core": "^8.9 || ^9 || ^10",
+ "drupal/core": "^9 || ^10",
"drupal/gin_toolbar": "^1.0@beta"
},
"type": "drupal-theme",
"extra": {
"drupal": {
- "version": "8.x-3.0-rc1",
- "datestamp": "1669708679",
+ "version": "8.x-3.0-rc7",
+ "datestamp": "1697193234",
"security-coverage": {
"status": "not-covered",
"message": "RC releases are not covered by Drupal security advisories."
@@ -1727,26 +1782,26 @@
},
{
"name": "drupal/gin_toolbar",
- "version": "1.0.0-rc1",
+ "version": "1.0.0-rc4",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/gin_toolbar.git",
- "reference": "8.x-1.0-rc1"
+ "reference": "8.x-1.0-rc4"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc1.zip",
- "reference": "8.x-1.0-rc1",
- "shasum": "90516f6aa22f4f60f1853bdceb757940f411ec7e"
+ "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc4.zip",
+ "reference": "8.x-1.0-rc4",
+ "shasum": "4f5fa958362b02804564302b0dfceb39e1b38119"
},
"require": {
- "drupal/core": "^8 || ^9 || ^10"
+ "drupal/core": "^9 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.0-rc1",
- "datestamp": "1669666957",
+ "version": "8.x-1.0-rc4",
+ "datestamp": "1697192878",
"security-coverage": {
"status": "not-covered",
"message": "RC releases are not covered by Drupal security advisories."
@@ -1962,29 +2017,26 @@
},
{
"name": "drupal/single_content_sync",
- "version": "1.3.13",
+ "version": "1.3.9",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/single_content_sync.git",
- "reference": "1.3.13"
+ "reference": "1.3.9"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/single_content_sync-1.3.13.zip",
- "reference": "1.3.13",
- "shasum": "e1db23df460b5a92c7347f8e85629d7e2fbeeb11"
+ "url": "https://ftp.drupal.org/files/projects/single_content_sync-1.3.9.zip",
+ "reference": "1.3.9",
+ "shasum": "1975bd88bbd0fd9ada8f53a9c4c3296445da0f85"
},
"require": {
- "drupal/core": "^9.3 || ^10",
- "ext-dom": "*",
- "ext-zip": "*",
- "php": ">=7.4"
+ "drupal/core": "^9.3 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "1.3.13",
- "datestamp": "1680707225",
+ "version": "1.3.9",
+ "datestamp": "1679596906",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -2019,17 +2071,17 @@
},
{
"name": "drupal/token",
- "version": "1.12.0",
+ "version": "1.13.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/token.git",
- "reference": "8.x-1.12"
+ "reference": "8.x-1.13"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/token-8.x-1.12.zip",
- "reference": "8.x-1.12",
- "shasum": "cefe1b203b793682f74ea43e18d0a814cf768763"
+ "url": "https://ftp.drupal.org/files/projects/token-8.x-1.13.zip",
+ "reference": "8.x-1.13",
+ "shasum": "f2a074b51726de3727c1d900237d6d471806a4d2"
},
"require": {
"drupal/core": "^9.2 || ^10"
@@ -2037,8 +2089,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.12",
- "datestamp": "1688015262",
+ "version": "8.x-1.13",
+ "datestamp": "1697885927",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -2046,7 +2098,7 @@
},
"drush": {
"services": {
- "drush.services.yml": "^9 || ^10"
+ "drush.services.yml": ">=9"
}
}
},
@@ -2088,11 +2140,17 @@
},
{
"name": "drupal/yaml_content",
- "version": "dev-1.x",
+ "version": "1.0.0-alpha9",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/yaml_content.git",
- "reference": "9f39fa762fda3285d091b276b787b4f6247b43c4"
+ "reference": "8.x-1.0-alpha9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://ftp.drupal.org/files/projects/yaml_content-8.x-1.0-alpha9.zip",
+ "reference": "8.x-1.0-alpha9",
+ "shasum": "21854b567ef6b9a17883da061c03850f136cc9d1"
},
"require": {
"drupal/core": "^9 || ^10"
@@ -2102,12 +2160,9 @@
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- },
"drupal": {
- "version": "8.x-1.0-alpha8+4-dev",
- "datestamp": "1690395239",
+ "version": "8.x-1.0-alpha9",
+ "datestamp": "1690397386",
"security-coverage": {
"status": "not-covered",
"message": "Project has not opted into security advisory coverage!"
@@ -2145,22 +2200,22 @@
},
{
"name": "drush/drush",
- "version": "11.4.0",
+ "version": "11.6.0",
"source": {
"type": "git",
"url": "https://github.com/drush-ops/drush.git",
- "reference": "d1f7809ceaf580c9e0bf4725e005975956af5629"
+ "reference": "f301df5dec8d2aacb03d3e01e0ffc6d98e10ae78"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drush-ops/drush/zipball/d1f7809ceaf580c9e0bf4725e005975956af5629",
- "reference": "d1f7809ceaf580c9e0bf4725e005975956af5629",
+ "url": "https://api.github.com/repos/drush-ops/drush/zipball/f301df5dec8d2aacb03d3e01e0ffc6d98e10ae78",
+ "reference": "f301df5dec8d2aacb03d3e01e0ffc6d98e10ae78",
"shasum": ""
},
"require": {
"chi-teck/drupal-code-generator": "^2.4",
"composer/semver": "^1.4 || ^3",
- "consolidation/annotated-command": "^4.7.0",
+ "consolidation/annotated-command": "^4.8.2",
"consolidation/config": "^2",
"consolidation/filter-via-dot-access-data": "^2",
"consolidation/robo": "^3.0.9 || ^4.0.1",
@@ -2278,7 +2333,7 @@
"forum": "http://drupal.stackexchange.com/questions/tagged/drush",
"issues": "https://github.com/drush-ops/drush/issues",
"slack": "https://drupal.slack.com/messages/C62H9CWQM",
- "source": "https://github.com/drush-ops/drush/tree/11.4.0"
+ "source": "https://github.com/drush-ops/drush/tree/11.6.0"
},
"funding": [
{
@@ -2286,20 +2341,20 @@
"type": "github"
}
],
- "time": "2022-12-14T16:02:30+00:00"
+ "time": "2023-06-06T18:46:18+00:00"
},
{
"name": "egulias/email-validator",
- "version": "4.0.1",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff"
+ "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/3a85486b709bc384dae8eb78fb2eec649bdb64ff",
- "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e",
+ "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e",
"shasum": ""
},
"require": {
@@ -2308,8 +2363,8 @@
"symfony/polyfill-intl-idn": "^1.26"
},
"require-dev": {
- "phpunit/phpunit": "^9.5.27",
- "vimeo/psalm": "^4.30"
+ "phpunit/phpunit": "^10.2",
+ "vimeo/psalm": "^5.12"
},
"suggest": {
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
@@ -2345,7 +2400,7 @@
],
"support": {
"issues": "https://github.com/egulias/EmailValidator/issues",
- "source": "https://github.com/egulias/EmailValidator/tree/4.0.1"
+ "source": "https://github.com/egulias/EmailValidator/tree/4.0.2"
},
"funding": [
{
@@ -2353,30 +2408,30 @@
"type": "github"
}
],
- "time": "2023-01-14T14:17:03+00:00"
+ "time": "2023-10-06T06:47:41+00:00"
},
{
"name": "enlightn/security-checker",
- "version": "v1.10.0",
+ "version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/enlightn/security-checker.git",
- "reference": "196bacc76e7a72a63d0e1220926dbb190272db97"
+ "reference": "68df5c7256c84b428bf8fcff0d249de06ce362d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/enlightn/security-checker/zipball/196bacc76e7a72a63d0e1220926dbb190272db97",
- "reference": "196bacc76e7a72a63d0e1220926dbb190272db97",
+ "url": "https://api.github.com/repos/enlightn/security-checker/zipball/68df5c7256c84b428bf8fcff0d249de06ce362d2",
+ "reference": "68df5c7256c84b428bf8fcff0d249de06ce362d2",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/guzzle": "^6.3|^7.0",
"php": ">=5.6",
- "symfony/console": "^3.4|^4|^5|^6",
- "symfony/finder": "^3|^4|^5|^6",
- "symfony/process": "^3.4|^4|^5|^6",
- "symfony/yaml": "^3.4|^4|^5|^6"
+ "symfony/console": "^3.4|^4|^5|^6|^7",
+ "symfony/finder": "^3|^4|^5|^6|^7",
+ "symfony/process": "^3.4|^4|^5|^6|^7",
+ "symfony/yaml": "^3.4|^4|^5|^6|^7"
},
"require-dev": {
"ext-zip": "*",
@@ -2417,9 +2472,9 @@
],
"support": {
"issues": "https://github.com/enlightn/security-checker/issues",
- "source": "https://github.com/enlightn/security-checker/tree/v1.10.0"
+ "source": "https://github.com/enlightn/security-checker/tree/v1.11.0"
},
- "time": "2022-02-21T22:40:16+00:00"
+ "time": "2023-11-17T07:53:29+00:00"
},
{
"name": "grasmash/expander",
@@ -2601,24 +2656,24 @@
},
{
"name": "guzzlehttp/promises",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "111166291a0f8130081195ac4556a5587d7f1b5d"
+ "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d",
- "reference": "111166291a0f8130081195ac4556a5587d7f1b5d",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
+ "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.8.1",
- "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+ "bamarni/composer-bin-plugin": "^1.8.2",
+ "phpunit/phpunit": "^8.5.36 || ^9.6.15"
},
"type": "library",
"extra": {
@@ -2664,7 +2719,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/2.0.1"
+ "source": "https://github.com/guzzle/promises/tree/2.0.2"
},
"funding": [
{
@@ -2680,7 +2735,7 @@
"type": "tidelift"
}
],
- "time": "2023-08-03T15:11:55+00:00"
+ "time": "2023-12-03T20:19:20+00:00"
},
{
"name": "guzzlehttp/psr7",
@@ -2998,16 +3053,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.15.3",
+ "version": "v4.17.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
+ "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
- "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+ "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
"shasum": ""
},
"require": {
@@ -3048,9 +3103,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
},
- "time": "2023-01-16T22:05:37+00:00"
+ "time": "2023-08-13T19:53:39+00:00"
},
{
"name": "pear/archive_tar",
@@ -3185,21 +3240,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"
@@ -3229,7 +3285,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",
@@ -3292,7 +3348,7 @@
},
{
"name": "phootwork/collection",
- "version": "v3.2.1",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/phootwork/collection.git",
@@ -3341,22 +3397,22 @@
],
"support": {
"issues": "https://github.com/phootwork/phootwork/issues",
- "source": "https://github.com/phootwork/collection/tree/v3.2.1"
+ "source": "https://github.com/phootwork/collection/tree/v3.2.2"
},
"time": "2022-08-27T12:51:24+00:00"
},
{
"name": "phootwork/lang",
- "version": "v3.2.1",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/phootwork/lang.git",
- "reference": "f6687cb0e5453ceb7b4a2c4f9fa81273758eedd0"
+ "reference": "baaf154ae7d521ebeee5e89105f5b12b0f234597"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phootwork/lang/zipball/f6687cb0e5453ceb7b4a2c4f9fa81273758eedd0",
- "reference": "f6687cb0e5453ceb7b4a2c4f9fa81273758eedd0",
+ "url": "https://api.github.com/repos/phootwork/lang/zipball/baaf154ae7d521ebeee5e89105f5b12b0f234597",
+ "reference": "baaf154ae7d521ebeee5e89105f5b12b0f234597",
"shasum": ""
},
"require": {
@@ -3390,9 +3446,9 @@
],
"support": {
"issues": "https://github.com/phootwork/phootwork/issues",
- "source": "https://github.com/phootwork/lang/tree/v3.2.1"
+ "source": "https://github.com/phootwork/lang/tree/v3.2.2"
},
- "time": "2022-08-27T12:51:24+00:00"
+ "time": "2023-05-26T05:37:59+00:00"
},
{
"name": "phpowermove/docblock",
@@ -3810,16 +3866,16 @@
},
{
"name": "psy/psysh",
- "version": "v0.11.12",
+ "version": "v0.11.22",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "52cb7c47d403c31c0adc9bf7710fc355f93c20f7"
+ "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/52cb7c47d403c31c0adc9bf7710fc355f93c20f7",
- "reference": "52cb7c47d403c31c0adc9bf7710fc355f93c20f7",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b",
+ "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b",
"shasum": ""
},
"require": {
@@ -3848,7 +3904,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "0.11.x-dev"
+ "dev-0.11": "0.11.x-dev"
+ },
+ "bamarni-bin": {
+ "bin-links": false,
+ "forward-command": false
}
},
"autoload": {
@@ -3880,9 +3940,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
- "source": "https://github.com/bobthecow/psysh/tree/v0.11.12"
+ "source": "https://github.com/bobthecow/psysh/tree/v0.11.22"
},
- "time": "2023-01-29T21:24:40+00:00"
+ "time": "2023-10-14T21:56:36+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -3996,16 +4056,16 @@
},
{
"name": "symfony/console",
- "version": "v6.3.4",
+ "version": "v6.3.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6"
+ "reference": "0566dbd051f8648d980592c7849f5d90d2c7c60c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6",
- "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6",
+ "url": "https://api.github.com/repos/symfony/console/zipball/0566dbd051f8648d980592c7849f5d90d2c7c60c",
+ "reference": "0566dbd051f8648d980592c7849f5d90d2c7c60c",
"shasum": ""
},
"require": {
@@ -4066,7 +4126,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v6.3.4"
+ "source": "https://github.com/symfony/console/tree/v6.3.9"
},
"funding": [
{
@@ -4082,20 +4142,20 @@
"type": "tidelift"
}
],
- "time": "2023-08-16T10:10:12+00:00"
+ "time": "2023-11-20T16:36:29+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v6.3.5",
+ "version": "v6.3.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993"
+ "reference": "51383a1d9d7e93d5c3c76ddc32672de1b3e82c77"
},
"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/51383a1d9d7e93d5c3c76ddc32672de1b3e82c77",
+ "reference": "51383a1d9d7e93d5c3c76ddc32672de1b3e82c77",
"shasum": ""
},
"require": {
@@ -4147,7 +4207,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.10"
},
"funding": [
{
@@ -4163,7 +4223,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-25T16:46:40+00:00"
+ "time": "2023-12-01T14:25:58+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -4464,16 +4524,16 @@
},
{
"name": "symfony/filesystem",
- "version": "v6.2.5",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "e59e8a4006afd7f5654786a83b4fcb8da98f4593"
+ "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/e59e8a4006afd7f5654786a83b4fcb8da98f4593",
- "reference": "e59e8a4006afd7f5654786a83b4fcb8da98f4593",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59",
+ "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59",
"shasum": ""
},
"require": {
@@ -4507,7 +4567,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v6.2.5"
+ "source": "https://github.com/symfony/filesystem/tree/v6.4.0"
},
"funding": [
{
@@ -4523,27 +4583,27 @@
"type": "tidelift"
}
],
- "time": "2023-01-20T17:45:48+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": {
@@ -4571,7 +4631,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": [
{
@@ -4587,20 +4647,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.5",
+ "version": "v6.3.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957"
+ "reference": "49a04fd3a21edc9ce503ab78e9f342805fefe780"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b50f5e281d722cb0f4c296f908bacc3e2b721957",
- "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49a04fd3a21edc9ce503ab78e9f342805fefe780",
+ "reference": "49a04fd3a21edc9ce503ab78e9f342805fefe780",
"shasum": ""
},
"require": {
@@ -4610,12 +4670,12 @@
"symfony/polyfill-php83": "^1.27"
},
"conflict": {
- "symfony/cache": "<6.2"
+ "symfony/cache": "<6.3"
},
"require-dev": {
- "doctrine/dbal": "^2.13.1|^3.0",
+ "doctrine/dbal": "^2.13.1|^3|^4",
"predis/predis": "^1.1|^2.0",
- "symfony/cache": "^5.4|^6.0",
+ "symfony/cache": "^6.3",
"symfony/dependency-injection": "^5.4|^6.0",
"symfony/expression-language": "^5.4|^6.0",
"symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4",
@@ -4648,7 +4708,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.5"
+ "source": "https://github.com/symfony/http-foundation/tree/v6.3.9"
},
"funding": [
{
@@ -4664,20 +4724,20 @@
"type": "tidelift"
}
],
- "time": "2023-09-04T21:33:54+00:00"
+ "time": "2023-11-20T16:36:29+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v6.3.5",
+ "version": "v6.3.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc"
+ "reference": "8d8e7aa60593fd0a2e3c1cea08cc687314841b61"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9f991a964368bee8d883e8d57ced4fe9fff04dfc",
- "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8d8e7aa60593fd0a2e3c1cea08cc687314841b61",
+ "reference": "8d8e7aa60593fd0a2e3c1cea08cc687314841b61",
"shasum": ""
},
"require": {
@@ -4761,7 +4821,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.5"
+ "source": "https://github.com/symfony/http-kernel/tree/v6.3.10"
},
"funding": [
{
@@ -4777,7 +4837,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-30T06:37:04+00:00"
+ "time": "2023-12-01T16:57:27+00:00"
},
{
"name": "symfony/mime",
@@ -5829,16 +5889,16 @@
},
{
"name": "symfony/routing",
- "version": "v6.3.5",
+ "version": "v6.3.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "82616e59acd3e3d9c916bba798326cb7796d7d31"
+ "reference": "cb7404232d49dd11cc971b832fcbd49e7c22b049"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/82616e59acd3e3d9c916bba798326cb7796d7d31",
- "reference": "82616e59acd3e3d9c916bba798326cb7796d7d31",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/cb7404232d49dd11cc971b832fcbd49e7c22b049",
+ "reference": "cb7404232d49dd11cc971b832fcbd49e7c22b049",
"shasum": ""
},
"require": {
@@ -5892,7 +5952,7 @@
"url"
],
"support": {
- "source": "https://github.com/symfony/routing/tree/v6.3.5"
+ "source": "https://github.com/symfony/routing/tree/v6.3.10"
},
"funding": [
{
@@ -5908,20 +5968,20 @@
"type": "tidelift"
}
],
- "time": "2023-09-20T16:05:51+00:00"
+ "time": "2023-12-01T14:25:58+00:00"
},
{
"name": "symfony/serializer",
- "version": "v6.3.5",
+ "version": "v6.3.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
- "reference": "855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c"
+ "reference": "6eee0fd95f5caa1e77cab29552620ebf8e5b1a5f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/serializer/zipball/855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c",
- "reference": "855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c",
+ "url": "https://api.github.com/repos/symfony/serializer/zipball/6eee0fd95f5caa1e77cab29552620ebf8e5b1a5f",
+ "reference": "6eee0fd95f5caa1e77cab29552620ebf8e5b1a5f",
"shasum": ""
},
"require": {
@@ -5986,7 +6046,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.5"
+ "source": "https://github.com/symfony/serializer/tree/v6.3.10"
},
"funding": [
{
@@ -6002,7 +6062,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-29T16:18:53+00:00"
+ "time": "2023-12-01T14:25:58+00:00"
},
{
"name": "symfony/service-contracts",
@@ -6088,16 +6148,16 @@
},
{
"name": "symfony/string",
- "version": "v6.3.5",
+ "version": "v6.3.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
+ "reference": "56427887aeaf540e9bbd121ad6c43f14ad3ce136"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
- "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
+ "url": "https://api.github.com/repos/symfony/string/zipball/56427887aeaf540e9bbd121ad6c43f14ad3ce136",
+ "reference": "56427887aeaf540e9bbd121ad6c43f14ad3ce136",
"shasum": ""
},
"require": {
@@ -6154,7 +6214,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.3.5"
+ "source": "https://github.com/symfony/string/tree/v6.3.9"
},
"funding": [
{
@@ -6170,7 +6230,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-18T10:38:32+00:00"
+ "time": "2023-11-28T20:40:29+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -6252,16 +6312,16 @@
},
{
"name": "symfony/validator",
- "version": "v6.3.5",
+ "version": "v6.3.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
- "reference": "48e815ba3b5eb72e632588dbf7ea2dc4e608ee47"
+ "reference": "c118889931856af47b0732b609f3ac2ddccd1da6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/validator/zipball/48e815ba3b5eb72e632588dbf7ea2dc4e608ee47",
- "reference": "48e815ba3b5eb72e632588dbf7ea2dc4e608ee47",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/c118889931856af47b0732b609f3ac2ddccd1da6",
+ "reference": "c118889931856af47b0732b609f3ac2ddccd1da6",
"shasum": ""
},
"require": {
@@ -6328,7 +6388,7 @@
"description": "Provides tools to validate values",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/validator/tree/v6.3.5"
+ "source": "https://github.com/symfony/validator/tree/v6.3.9"
},
"funding": [
{
@@ -6344,20 +6404,20 @@
"type": "tidelift"
}
],
- "time": "2023-09-29T07:41:15+00:00"
+ "time": "2023-11-29T07:44:47+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v6.3.5",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5"
+ "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3d9999376be5fea8de47752837a3e1d1c5f69ef5",
- "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/81acabba9046550e89634876ca64bfcd3c06aa0a",
+ "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a",
"shasum": ""
},
"require": {
@@ -6412,7 +6472,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v6.3.5"
+ "source": "https://github.com/symfony/var-dumper/tree/v6.3.8"
},
"funding": [
{
@@ -6428,20 +6488,20 @@
"type": "tidelift"
}
],
- "time": "2023-09-12T10:11:35+00:00"
+ "time": "2023-11-08T10:42:36+00:00"
},
{
"name": "symfony/var-exporter",
- "version": "v6.3.4",
+ "version": "v6.3.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
- "reference": "df1f8aac5751871b83d30bf3e2c355770f8f0691"
+ "reference": "7bfcf232a9c7e4acad00e96774e340eb86d10bf0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-exporter/zipball/df1f8aac5751871b83d30bf3e2c355770f8f0691",
- "reference": "df1f8aac5751871b83d30bf3e2c355770f8f0691",
+ "url": "https://api.github.com/repos/symfony/var-exporter/zipball/7bfcf232a9c7e4acad00e96774e340eb86d10bf0",
+ "reference": "7bfcf232a9c7e4acad00e96774e340eb86d10bf0",
"shasum": ""
},
"require": {
@@ -6486,7 +6546,7 @@
"serialize"
],
"support": {
- "source": "https://github.com/symfony/var-exporter/tree/v6.3.4"
+ "source": "https://github.com/symfony/var-exporter/tree/v6.3.10"
},
"funding": [
{
@@ -6502,20 +6562,20 @@
"type": "tidelift"
}
],
- "time": "2023-08-16T18:14:47+00:00"
+ "time": "2023-11-29T16:00:50+00:00"
},
{
"name": "symfony/yaml",
- "version": "v6.3.3",
+ "version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add"
+ "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/e23292e8c07c85b971b44c1c4b87af52133e2add",
- "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92",
+ "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92",
"shasum": ""
},
"require": {
@@ -6558,7 +6618,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v6.3.3"
+ "source": "https://github.com/symfony/yaml/tree/v6.3.8"
},
"funding": [
{
@@ -6574,7 +6634,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-31T07:08:24+00:00"
+ "time": "2023-11-06T10:58:05+00:00"
},
{
"name": "twig/twig",
diff --git a/config/sync/config_ignore.settings.yml b/config/sync/config_ignore.settings.yml
new file mode 100644
index 0000000..4498068
--- /dev/null
+++ b/config/sync/config_ignore.settings.yml
@@ -0,0 +1,5 @@
+_core:
+ default_config_hash: IgOVnECx6lbVt6JVFnadoEEugneDf3UblPZnOzov43Q
+mode: simple
+ignored_config_entities:
+ - etherpad_api.settings
diff --git a/config/sync/core.entity_form_display.node.concept.default.yml b/config/sync/core.entity_form_display.node.concept.default.yml
index 72a0ef6..3c8435e 100644
--- a/config/sync/core.entity_form_display.node.concept.default.yml
+++ b/config/sync/core.entity_form_display.node.concept.default.yml
@@ -6,7 +6,6 @@ dependencies:
- field.field.node.concept.body
- field.field.node.concept.field_media
- field.field.node.concept.field_related_concept
- - field.field.node.concept.field_tags
- node.type.concept
- workflows.workflow.concept_workflow
module:
@@ -52,16 +51,6 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
- field_tags:
- type: entity_reference_autocomplete
- weight: 4
- region: content
- settings:
- match_operator: CONTAINS
- match_limit: 10
- size: 60
- placeholder: ''
- third_party_settings: { }
langcode:
type: language_select
weight: 3
diff --git a/config/sync/core.entity_view_display.node.concept.default.yml b/config/sync/core.entity_view_display.node.concept.default.yml
index 0f4609d..2a140ac 100644
--- a/config/sync/core.entity_view_display.node.concept.default.yml
+++ b/config/sync/core.entity_view_display.node.concept.default.yml
@@ -6,7 +6,6 @@ dependencies:
- field.field.node.concept.body
- field.field.node.concept.field_media
- field.field.node.concept.field_related_concept
- - field.field.node.concept.field_tags
- node.type.concept
module:
- text
@@ -40,14 +39,6 @@ content:
third_party_settings: { }
weight: 103
region: content
- field_tags:
- type: entity_reference_label
- label: above
- settings:
- link: true
- third_party_settings: { }
- weight: 104
- region: content
links:
settings: { }
third_party_settings: { }
diff --git a/config/sync/core.entity_view_display.node.concept.teaser.yml b/config/sync/core.entity_view_display.node.concept.teaser.yml
index 5cf4b85..7ba194f 100644
--- a/config/sync/core.entity_view_display.node.concept.teaser.yml
+++ b/config/sync/core.entity_view_display.node.concept.teaser.yml
@@ -7,7 +7,6 @@ dependencies:
- field.field.node.concept.body
- field.field.node.concept.field_media
- field.field.node.concept.field_related_concept
- - field.field.node.concept.field_tags
- node.type.concept
module:
- text
@@ -33,5 +32,4 @@ content:
hidden:
field_media: true
field_related_concept: true
- field_tags: true
langcode: true
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
index 17d70f8..083257a 100644
--- a/config/sync/core.extension.yml
+++ b/config/sync/core.extension.yml
@@ -10,6 +10,7 @@ module:
ckeditor5: 0
comment: 0
config: 0
+ config_ignore: 0
config_translation: 0
content_as_config: 0
content_moderation: 0
diff --git a/config/sync/field.field.node.concept.field_tags.yml b/config/sync/field.field.node.concept.field_tags.yml
deleted file mode 100644
index fd9b0b9..0000000
--- a/config/sync/field.field.node.concept.field_tags.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: f5fade64-73dc-420b-8c1f-ab4fe3355a52
-langcode: en
-status: true
-dependencies:
- config:
- - field.storage.node.field_tags
- - node.type.concept
- - taxonomy.vocabulary.tags
-id: node.concept.field_tags
-field_name: field_tags
-entity_type: node
-bundle: concept
-label: Tags
-description: ''
-required: false
-translatable: true
-default_value: { }
-default_value_callback: ''
-settings:
- handler: 'default:taxonomy_term'
- handler_settings:
- target_bundles:
- tags: tags
- sort:
- field: name
- direction: asc
- auto_create: true
- auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/sync/node.settings.yml b/config/sync/node.settings.yml
index 6fcede9..3a9d97e 100644
--- a/config/sync/node.settings.yml
+++ b/config/sync/node.settings.yml
@@ -1,3 +1,3 @@
_core:
default_config_hash: 2OMXCScXUOLSYID9-phjO4q36nnnaMWNUlDxEqZzG1U
-use_admin_theme: true
+use_admin_theme: false
diff --git a/nuxt/components/DodajPojem.vue b/nuxt/components/DodajPojem.vue
index 20e3571..134353f 100644
--- a/nuxt/components/DodajPojem.vue
+++ b/nuxt/components/DodajPojem.vue
@@ -1,8 +1,21 @@
+
+
-
-
+
diff --git a/nuxt/components/EtherpadTextarea.vue b/nuxt/components/EtherpadTextarea.vue
index d302fc2..5e54562 100644
--- a/nuxt/components/EtherpadTextarea.vue
+++ b/nuxt/components/EtherpadTextarea.vue
@@ -5,20 +5,21 @@ import { ref } from 'vue'
const { etherpadUrl, etherpadPrefix } = useRuntimeConfig().public
const props = defineProps({
- revisionId: String
+ revisionId: String,
+ onLoad: Function
})
const embed = ref(null)
onMounted(() => {
+ // Ce ni revisionId propertyja, se random generira.
const uuid = props.revisionId ? props.revisionId : crypto.randomUUID()
const padUrl = `${etherpadUrl}p/${etherpadPrefix}${uuid}?showChat=false&showLineNumbers=false&toc=false`
embed.value.src = padUrl
- window.location.hash = uuid
})
-
+
diff --git a/nuxt/components/PojemForm.vue b/nuxt/components/PojemForm.vue
index 064b682..657a703 100644
--- a/nuxt/components/PojemForm.vue
+++ b/nuxt/components/PojemForm.vue
@@ -1,8 +1,12 @@
@@ -31,7 +43,7 @@ const oddajPredlog = data => {
-
+
diff --git a/web/modules/custom/etherpad_api/etherpad_api.install b/web/modules/custom/etherpad_api/etherpad_api.install
index b1b9356..baa85bf 100644
--- a/web/modules/custom/etherpad_api/etherpad_api.install
+++ b/web/modules/custom/etherpad_api/etherpad_api.install
@@ -1,95 +1,36 @@
addStatus(__FUNCTION__);
-}
-
-/**
- * Implements hook_uninstall().
- */
-function etherpad_api_uninstall() {
- \Drupal::messenger()->addStatus(__FUNCTION__);
-}
-
-/**
- * Implements hook_schema().
- */
-function etherpad_api_schema() {
- $schema['etherpad_api_example'] = [
- 'description' => 'Table description.',
- 'fields' => [
- 'id' => [
- 'type' => 'serial',
- 'not null' => TRUE,
- 'description' => 'Primary Key: Unique record ID.',
- ],
- 'uid' => [
- 'type' => 'int',
- 'unsigned' => TRUE,
- 'not null' => TRUE,
- 'default' => 0,
- 'description' => 'The {users}.uid of the user who created the record.',
- ],
- 'status' => [
- 'description' => 'Boolean indicating whether this record is active.',
- 'type' => 'int',
- 'unsigned' => TRUE,
- 'not null' => TRUE,
- 'default' => 0,
- 'size' => 'tiny',
- ],
- 'type' => [
- 'type' => 'varchar_ascii',
- 'length' => 64,
- 'not null' => TRUE,
- 'default' => '',
- 'description' => 'Type of the record.',
- ],
- 'created' => [
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- 'description' => 'Timestamp when the record was created.',
- ],
- 'data' => [
- 'type' => 'blob',
- 'not null' => TRUE,
- 'size' => 'big',
- 'description' => 'The arbitrary data for the item.',
- ],
- ],
- 'primary key' => ['id'],
- 'indexes' => [
- 'type' => ['type'],
- 'uid' => ['uid'],
- 'status' => ['status'],
- ],
- ];
-
- return $schema;
-}
-
/**
* Implements hook_requirements().
*/
function etherpad_api_requirements($phase) {
$requirements = [];
+ // Preveri ali api deluje
if ($phase == 'runtime') {
- $value = mt_rand(0, 100);
- $requirements['etherpad_api_status'] = [
- 'title' => t('Etherpad API status'),
- 'value' => t('Etherpad API value: @value', ['@value' => $value]),
- 'severity' => $value > 50 ? REQUIREMENT_INFO : REQUIREMENT_WARNING,
- ];
+ $client = Drupal::service('etherpad_api.client');
+
+ try {
+ $client->checkToken();
+ } catch (ClientException $exception) {
+ $value = $exception->getCode();
+ $msg = $exception->getMessage();
+ $requirements['etherpad_api_status'] = [
+ 'title' => t('Etherpad API status'),
+ 'value' => t('Etherpad API not accessible (@code: @msg)', [
+ '@code' => $exception->getCode(),
+ '@msg' => $exception->getMessage()
+ ]),
+ 'severity' => REQUIREMENT_ERROR,
+ ];
+ }
}
return $requirements;
diff --git a/web/modules/custom/etherpad_api/etherpad_api.services.yml b/web/modules/custom/etherpad_api/etherpad_api.services.yml
index 4450233..14c986a 100644
--- a/web/modules/custom/etherpad_api/etherpad_api.services.yml
+++ b/web/modules/custom/etherpad_api/etherpad_api.services.yml
@@ -3,3 +3,10 @@ services:
class: Drupal\etherpad_api\PathProcessor\EtherpadAPIPathProcessor
tags:
- { name: path_processor_inbound, priority: 1000 }
+ etherpad_api.settings:
+ class: Drupal\Core\Config\ImmutableConfig
+ factory: config.factory:get
+ arguments: ['etherpad_api.settings']
+ etherpad_api.client:
+ class: Drupal\etherpad_api\Client
+ arguments: ['@http_client', '@etherpad_api.settings']
diff --git a/web/modules/custom/etherpad_api/src/Client.php b/web/modules/custom/etherpad_api/src/Client.php
new file mode 100644
index 0000000..8fc4c4a
--- /dev/null
+++ b/web/modules/custom/etherpad_api/src/Client.php
@@ -0,0 +1,66 @@
+httpClient = $httpClient;
+ $this->config = $config;
+ $this->baseUrl = rtrim($config->get('url'), '/');
+ $this->apiKey = $config->get('key');
+ }
+
+ public function checkToken() {
+ return $this->request('get', '/checkToken');
+ }
+
+ /**
+ * Method description.
+ */
+ public function request($method, $url) {
+ $uri = "{$this->baseUrl}/" . self::API_VERSION . $url;
+
+ if (str_contains($uri, '?')) {
+ $uri .= "&apikey={$this->apiKey}";
+ } else {
+ $uri .= "?apikey={$this->apiKey}";
+ }
+
+ return $this->httpClient->request($method, $uri);
+ }
+}
diff --git a/web/modules/custom/etherpad_api/src/Controller/#EtherpadApiController.php# b/web/modules/custom/etherpad_api/src/Controller/#EtherpadApiController.php#
new file mode 100644
index 0000000..acd81b5
--- /dev/null
+++ b/web/modules/custom/etherpad_api/src/Controller/#EtherpadApiController.php#
@@ -0,0 +1,42 @@
+client = $client;
+ }
+
+ public static function create(ContainerInterface $container) {
+ return new static($container->get('etherpad_api.client'));
+ }
+
+ /**
+ * Builds the response.
+ */
+ public function build($components, Request $request) {
+ $uri = str_replace(':', '/', $components);
+ if ($params = $request->getQueryString()) {
+ $uri .= "?$params";
+ }
+
+ try {
+ return $this->client->request($request->getMethod(), $uri);
+ } catch (ClientException $exception) {
+ return new Response($exception->getMessage(), $exception->getCode());
+ }
+ }
+}
diff --git a/web/modules/custom/etherpad_api/src/Controller/EtherpadApiController.php b/web/modules/custom/etherpad_api/src/Controller/EtherpadApiController.php
index 86dc1cd..acd81b5 100644
--- a/web/modules/custom/etherpad_api/src/Controller/EtherpadApiController.php
+++ b/web/modules/custom/etherpad_api/src/Controller/EtherpadApiController.php
@@ -3,47 +3,38 @@
namespace Drupal\etherpad_api\Controller;
use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\ClientException;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
+use GuzzleHttp\Exception\ClientException;
+
+use Drupal\etherpad_api\Client;
/**
* Returns responses for Etherpad API routes.
*/
class EtherpadApiController extends ControllerBase {
- protected $httpClient;
- protected $config;
+ protected $client;
- public function __construct(ClientInterface $http_client, ConfigFactoryInterface $config_factory) {
- $this->httpClient = $http_client;
- $this->configFactory = $config_factory;
+ public function __construct(Client $client) {
+ $this->client = $client;
}
public static function create(ContainerInterface $container) {
- return new static($container->get('http_client'), $container->get('config.factory'));
+ return new static($container->get('etherpad_api.client'));
}
/**
* Builds the response.
*/
public function build($components, Request $request) {
- $baseUrl = $this->config('etherpad_api.settings')->get('url');
- $apiKey = $this->config('etherpad_api.settings')->get('key');
-
- $params = $request->getQueryString();
- if ($params) {
- $params .= "&apikey=$apiKey";
- } else {
- $params = "apikey=$apiKey";
+ $uri = str_replace(':', '/', $components);
+ if ($params = $request->getQueryString()) {
+ $uri .= "?$params";
}
- $uri = $baseUrl . str_replace(':', '/', $components) . "?$params";
- $method = $request->getMethod();
try {
- return $this->httpClient->request($method, $uri);
+ return $this->client->request($request->getMethod(), $uri);
} catch (ClientException $exception) {
return new Response($exception->getMessage(), $exception->getCode());
}
diff --git a/web/modules/custom/etherpad_api/src/Form/SettingsForm.php b/web/modules/custom/etherpad_api/src/Form/SettingsForm.php
index d870c9c..a95fdf7 100644
--- a/web/modules/custom/etherpad_api/src/Form/SettingsForm.php
+++ b/web/modules/custom/etherpad_api/src/Form/SettingsForm.php
@@ -2,13 +2,29 @@
namespace Drupal\etherpad_api\Form;
+use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Form\ConfigFormBase;
use Drupal\Core\Form\FormStateInterface;
+use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\ClientException;
+
+use Drupal\etherpad_api\Client;
/**
* Configure Etherpad API settings for this site.
*/
class SettingsForm extends ConfigFormBase {
+ protected $httpClient;
+ protected $settings;
+
+ public function __construct(ClientInterface $httpClient) {
+ $this->httpClient = $httpClient;
+ $this->settings = $this->config('etherpad_api.settings');
+ }
+
+ public static function create(ContainerInterface $container) {
+ return new static($container->get('http_client'));
+ }
/**
* {@inheritdoc}
@@ -31,12 +47,13 @@ class SettingsForm extends ConfigFormBase {
$form['url'] = [
'#type' => 'textfield',
'#title' => $this->t('Etherpad API URL'),
- '#default_value' => $this->config('etherpad_api.settings')->get('url'),
+ '#required' => true,
+ '#default_value' => $this->settings->get('url'),
];
$form['key'] = [
- '#type' => 'textfield',
+ '#type' => 'password',
'#title' => $this->t('Etherpad API key (found in instance root folder)'),
- '#default_value' => $this->config('etherpad_api.settings')->get('key'),
+ '#default_value' => $this->settings->get('key'),
];
return parent::buildForm($form, $form_state);
}
@@ -45,11 +62,22 @@ class SettingsForm extends ConfigFormBase {
* {@inheritdoc}
*/
public function validateForm(array &$form, FormStateInterface $form_state) {
- if (!$form_state->getValue('url')) {
- $form_state->setErrorByName('url', $this->t('The value is required.'));
+ // Check API accessibility
+ $apiKey = $form_state->getValue('key');
+
+ if (!$apiKey) {
+ $apiKey = $this->settings->get('key');
}
- if (!$form_state->getValue('key')) {
- $form_state->setErrorByName('key', $this->t('The value is required.'));
+ $baseUrl = $form_state->getValue('url');
+
+ $url = rtrim($baseUrl, '/') . "/1.2/checkToken?apikey=$apiKey";
+ try {
+ $this->httpClient->request('get', $url);
+ } catch (ClientException $e) {
+ $form_state->setErrorByName('url', $this->t('Etherpad API not accessible (@code: @msg). The URL or the API key is wrong', [
+ '@value' => $e->getCode(),
+ '@msg' => $e->getMessage()
+ ]));
}
parent::validateForm($form, $form_state);
}
@@ -58,10 +86,12 @@ class SettingsForm extends ConfigFormBase {
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->config('etherpad_api.settings')
- ->set('url', $form_state->getValue('url'))
- ->set('key', $form_state->getValue('key'))
- ->save();
+ $this->settings->set('url', $form_state->getValue('url'));
+ if ($form_state->getValue('key')) {
+ $this->settings->set('key', $form_state->getValue('key'));
+ }
+
+ $this->settings->save();
parent::submitForm($form, $form_state);
}