diff --git a/composer.json b/composer.json index 50a158329..90fd34cfc 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "drupal/social_auth_hid": "^3.0", "drupal/svg_image": "^1.15", "drupal/taxonomy_term_preview": "^1.0.0", - "drupal/taxonomy_term_revision": "1.x-dev", + "drupal/taxonomy_term_revision": "^1.1", "drupal/theme_switcher": "^1.2", "drupal/token": "^1.10", "drupal/user_display_name": "^1.0", diff --git a/composer.lock b/composer.lock index 9b5329ee7..72674abbc 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": "f1502e99b6706e57af89681f0a8d9619", + "content-hash": "a4f03471cdd9d43a16488220e8d1550c", "packages": [ { "name": "asm89/stack-cors", @@ -334,16 +334,16 @@ }, { "name": "composer/composer", - "version": "2.2.17", + "version": "2.2.18", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "a8ab5070fb99396e4710baee286478ad697724c2" + "reference": "84175907664ca8b73f73f4883e67e886dfefb9f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/a8ab5070fb99396e4710baee286478ad697724c2", - "reference": "a8ab5070fb99396e4710baee286478ad697724c2", + "url": "https://api.github.com/repos/composer/composer/zipball/84175907664ca8b73f73f4883e67e886dfefb9f5", + "reference": "84175907664ca8b73f73f4883e67e886dfefb9f5", "shasum": "" }, "require": { @@ -413,7 +413,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.2.17" + "source": "https://github.com/composer/composer/tree/2.2.18" }, "funding": [ { @@ -429,7 +429,7 @@ "type": "tidelift" } ], - "time": "2022-07-13T13:27:38+00:00" + "time": "2022-08-20T09:33:38+00:00" }, { "name": "composer/installers", @@ -2156,23 +2156,23 @@ }, { "name": "drupal/coder", - "version": "8.3.15", + "version": "8.3.16", "source": { "type": "git", "url": "https://git.drupalcode.org/project/coder.git", - "reference": "0cfad3a21f1168bdc3030ae73351c31f88abba74" + "reference": "d6f6112e5e84ff4f6baaada223c93dadbd6d3887" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1", "ext-mbstring": "*", "php": ">=7.1", - "sirbrillig/phpcs-variable-analysis": "^2.10", - "slevomat/coding-standard": "^7.0", - "squizlabs/php_codesniffer": "^3.6.0", - "symfony/yaml": ">=2.0.5" + "sirbrillig/phpcs-variable-analysis": "^2.11.7", + "slevomat/coding-standard": "^7.0 || ^8.0", + "squizlabs/php_codesniffer": "^3.7.1", + "symfony/yaml": ">=3.4.0" }, "require-dev": { - "phpstan/phpstan": "^1.4.9", + "phpstan/phpstan": "^1.7.12", "phpunit/phpunit": "^7.0 || ^8.0" }, "type": "phpcodesniffer-standard", @@ -2197,7 +2197,7 @@ "issues": "https://www.drupal.org/project/issues/coder", "source": "https://www.drupal.org/project/coder" }, - "time": "2022-04-02T17:56:30+00:00" + "time": "2022-08-20T17:31:46+00:00" }, { "name": "drupal/components", @@ -2745,7 +2745,7 @@ "extra": { "drupal": { "version": "4.0.1", - "datestamp": "1659069125", + "datestamp": "1660252593", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3417,17 +3417,17 @@ }, { "name": "drupal/memcache", - "version": "2.4.0", + "version": "2.5.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/memcache.git", - "reference": "8.x-2.4" + "reference": "8.x-2.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/memcache-8.x-2.4.zip", - "reference": "8.x-2.4", - "shasum": "200c3a95d535549459091f061203d22f8b47d44a" + "url": "https://ftp.drupal.org/files/projects/memcache-8.x-2.5.zip", + "reference": "8.x-2.5", + "shasum": "a01db2a9b7122a397c4f4ad66e0a380d1148a157" }, "require": { "drupal/core": "^9.1 || ^10" @@ -3435,8 +3435,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.4", - "datestamp": "1659633918", + "version": "8.x-2.5", + "datestamp": "1661188440", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3809,26 +3809,26 @@ }, { "name": "drupal/redirect", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/redirect.git", - "reference": "8.x-1.7" + "reference": "8.x-1.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.7.zip", - "reference": "8.x-1.7", - "shasum": "013b2541a5ef0cf423a3caa1ae89cc5866504877" + "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.8.zip", + "reference": "8.x-1.8", + "shasum": "a7a440423434472ff7115ae69df01553f763f839" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9.2 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.7", - "datestamp": "1639380488", + "version": "8.x-1.8", + "datestamp": "1661806955", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3938,20 +3938,20 @@ }, { "name": "drupal/social_auth", - "version": "3.0.2", + "version": "3.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/social_auth.git", - "reference": "3.0.2" + "reference": "3.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/social_auth-3.0.2.zip", - "reference": "3.0.2", - "shasum": "50daa69961433dfea8c4f23747b2bc81ef4ebaba" + "url": "https://ftp.drupal.org/files/projects/social_auth-3.1.0.zip", + "reference": "3.1.0", + "shasum": "9225e99d2a482ca82bb7faeefd2eb92867bf0f1a" }, "require": { - "drupal/core": "^8.8 || ^9.0", + "drupal/core": "^9.3 || ^10", "drupal/social_api": "^3" }, "require-dev": { @@ -3960,8 +3960,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.2", - "datestamp": "1629547533", + "version": "3.1.0", + "datestamp": "1660225275", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4210,27 +4210,38 @@ }, { "name": "drupal/taxonomy_term_revision", - "version": "dev-1.x", + "version": "1.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/taxonomy_term_revision.git", - "reference": "d403d6cc9dc6658a1635f21bad40c5543cf69b62" + "reference": "8.x-1.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/taxonomy_term_revision-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "72a3c67ff7fff4a8247f59a2ba95c25c914f5359" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8 || ^9 || ^10" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.0-alpha2+3-dev", - "datestamp": "1613990349", + "version": "8.x-1.1", + "datestamp": "1660910720", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" } + }, + "branch-alias": { + "dev-8.x-2.x": "2.x-dev" + }, + "drush": { + "services": { + "drush.services.yml": ">=9" + } } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -4243,7 +4254,7 @@ "homepage": "https://www.drupal.org/user/3591861" } ], - "description": "Taxonomy Revision module for Drupal 8.7 onwards", + "description": "Allows user to revert or delete taxonomy term revisions.", "homepage": "https://www.drupal.org/project/taxonomy_term_revision", "support": { "source": "https://git.drupalcode.org/project/taxonomy_term_revision" @@ -5504,16 +5515,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "reference": "b94b2807d85443f9719887892882d0329d1e2598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", + "reference": "b94b2807d85443f9719887892882d0329d1e2598", "shasum": "" }, "require": { @@ -5568,7 +5579,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "source": "https://github.com/guzzle/promises/tree/1.5.2" }, "funding": [ { @@ -5584,7 +5595,7 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2022-08-28T14:55:35+00:00" }, { "name": "guzzlehttp/psr7", @@ -5698,16 +5709,16 @@ }, { "name": "instaclick/php-webdriver", - "version": "1.4.14", + "version": "1.4.15", "source": { "type": "git", "url": "https://github.com/instaclick/php-webdriver.git", - "reference": "200b8df772b74d604bebf25ef42ad6f8ee6380a9" + "reference": "ed8f7741a0952db42686aae0780a0935138a7cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/200b8df772b74d604bebf25ef42ad6f8ee6380a9", - "reference": "200b8df772b74d604bebf25ef42ad6f8ee6380a9", + "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/ed8f7741a0952db42686aae0780a0935138a7cf8", + "reference": "ed8f7741a0952db42686aae0780a0935138a7cf8", "shasum": "" }, "require": { @@ -5755,9 +5766,9 @@ ], "support": { "issues": "https://github.com/instaclick/php-webdriver/issues", - "source": "https://github.com/instaclick/php-webdriver/tree/1.4.14" + "source": "https://github.com/instaclick/php-webdriver/tree/1.4.15" }, - "time": "2022-04-19T02:06:59+00:00" + "time": "2022-08-09T14:26:29+00:00" }, { "name": "itamair/geophp", @@ -6728,16 +6739,16 @@ }, { "name": "masterminds/html5", - "version": "2.7.5", + "version": "2.7.6", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab" + "reference": "897eb517a343a2281f11bc5556d6548db7d93947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab", - "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947", + "reference": "897eb517a343a2281f11bc5556d6548db7d93947", "shasum": "" }, "require": { @@ -6791,22 +6802,22 @@ ], "support": { "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.7.5" + "source": "https://github.com/Masterminds/html5-php/tree/2.7.6" }, - "time": "2021-07-01T14:25:37+00:00" + "time": "2022-08-18T16:18:26+00:00" }, { "name": "mikey179/vfsstream", - "version": "v1.6.10", + "version": "v1.6.11", "source": { "type": "git", "url": "https://github.com/bovigo/vfsStream.git", - "reference": "250c0825537d501e327df879fb3d4cd751933b85" + "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/250c0825537d501e327df879fb3d4cd751933b85", - "reference": "250c0825537d501e327df879fb3d4cd751933b85", + "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f", + "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f", "shasum": "" }, "require": { @@ -6844,7 +6855,7 @@ "source": "https://github.com/bovigo/vfsStream/tree/master", "wiki": "https://github.com/bovigo/vfsStream/wiki" }, - "time": "2021-09-25T08:05:01+00:00" + "time": "2022-02-23T02:02:42+00:00" }, { "name": "myclabs/deep-copy", @@ -7903,23 +7914,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.15", + "version": "9.2.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f" + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.13.0", + "nikic/php-parser": "^4.14", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -7968,7 +7979,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17" }, "funding": [ { @@ -7976,7 +7987,7 @@ "type": "github" } ], - "time": "2022-03-07T09:28:20+00:00" + "time": "2022-08-30T12:24:04+00:00" }, { "name": "phpunit/php-file-iterator", @@ -8221,16 +8232,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.21", + "version": "9.5.24", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1" + "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1", - "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", "shasum": "" }, "require": { @@ -8245,7 +8256,6 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpspec/prophecy": "^1.12.1", "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", @@ -8260,12 +8270,9 @@ "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.0", + "sebastian/type": "^3.1", "sebastian/version": "^3.0.2" }, - "require-dev": { - "phpspec/prophecy-phpunit": "^2.0.1" - }, "suggest": { "ext-soap": "*", "ext-xdebug": "*" @@ -8307,7 +8314,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24" }, "funding": [ { @@ -8319,7 +8326,7 @@ "type": "github" } ], - "time": "2022-06-19T12:14:25+00:00" + "time": "2022-08-30T07:42:16+00:00" }, { "name": "psr/cache", @@ -9841,16 +9848,16 @@ }, { "name": "sebastian/type", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad" + "reference": "fb44e1cc6e557418387ad815780360057e40753e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb44e1cc6e557418387ad815780360057e40753e", + "reference": "fb44e1cc6e557418387ad815780360057e40753e", "shasum": "" }, "require": { @@ -9862,7 +9869,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -9885,7 +9892,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.0.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.1.0" }, "funding": [ { @@ -9893,7 +9900,7 @@ "type": "github" } ], - "time": "2022-03-15T09:54:48+00:00" + "time": "2022-08-29T06:55:37+00:00" }, { "name": "sebastian/version", @@ -10014,16 +10021,16 @@ }, { "name": "seld/phar-utils", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/Seldaek/phar-utils.git", - "reference": "9f3452c93ff423469c0d56450431562ca423dcee" + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/9f3452c93ff423469c0d56450431562ca423dcee", - "reference": "9f3452c93ff423469c0d56450431562ca423dcee", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", "shasum": "" }, "require": { @@ -10056,22 +10063,22 @@ ], "support": { "issues": "https://github.com/Seldaek/phar-utils/issues", - "source": "https://github.com/Seldaek/phar-utils/tree/1.2.0" + "source": "https://github.com/Seldaek/phar-utils/tree/1.2.1" }, - "time": "2021-12-10T11:20:11+00:00" + "time": "2022-08-31T10:31:18+00:00" }, { "name": "sirbrillig/phpcs-variable-analysis", - "version": "v2.11.4", + "version": "v2.11.7", "source": { "type": "git", "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git", - "reference": "e9c99cda31b21ccb4da4c2124b57c8355ddce48e" + "reference": "ad2b0b57803a48bb3495777bee2a9a13c8e9da53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/e9c99cda31b21ccb4da4c2124b57c8355ddce48e", - "reference": "e9c99cda31b21ccb4da4c2124b57c8355ddce48e", + "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/ad2b0b57803a48bb3495777bee2a9a13c8e9da53", + "reference": "ad2b0b57803a48bb3495777bee2a9a13c8e9da53", "shasum": "" }, "require": { @@ -10083,7 +10090,8 @@ "phpcsstandards/phpcsdevcs": "^1.1", "phpstan/phpstan": "^1.7", "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.5 || ^7.0 || ^8.0 || ^9.0", - "sirbrillig/phpcs-import-detection": "^1.1" + "sirbrillig/phpcs-import-detection": "^1.1", + "vimeo/psalm": "^0.2 || ^0.3 || ^1.1 || ^4.24 || ^5.0@beta" }, "type": "phpcodesniffer-standard", "autoload": { @@ -10111,41 +10119,41 @@ "source": "https://github.com/sirbrillig/phpcs-variable-analysis", "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki" }, - "time": "2022-06-13T13:49:41+00:00" + "time": "2022-08-16T22:19:00+00:00" }, { "name": "slevomat/coding-standard", - "version": "7.2.1", + "version": "8.4.0", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90" + "reference": "02f27326be19633a1b6ba76745390bbf9a4be0b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/aff06ae7a84e4534bf6f821dc982a93a5d477c90", - "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/02f27326be19633a1b6ba76745390bbf9a4be0b6", + "reference": "02f27326be19633a1b6ba76745390bbf9a4be0b6", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": "^1.5.1", - "squizlabs/php_codesniffer": "^3.6.2" + "phpstan/phpdoc-parser": ">=1.7.0 <1.8.0", + "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { - "phing/phing": "2.17.3", + "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.7.1", + "phpstan/phpstan": "1.4.10|1.8.2", "phpstan/phpstan-deprecation-rules": "1.0.0", "phpstan/phpstan-phpunit": "1.0.0|1.1.1", - "phpstan/phpstan-strict-rules": "1.2.3", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.20" + "phpstan/phpstan-strict-rules": "1.3.0", + "phpunit/phpunit": "7.5.20|8.5.21|9.5.21" }, "type": "phpcodesniffer-standard", "extra": { "branch-alias": { - "dev-master": "7.x-dev" + "dev-master": "8.x-dev" } }, "autoload": { @@ -10160,7 +10168,7 @@ "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/7.2.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.4.0" }, "funding": [ { @@ -10172,7 +10180,7 @@ "type": "tidelift" } ], - "time": "2022-05-25T10:58:12+00:00" + "time": "2022-08-09T19:03:45+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -10421,16 +10429,16 @@ }, { "name": "symfony/console", - "version": "v4.4.44", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c35fafd7f12ebd6f9e29c95a370df7f1fb171a40" + "reference": "28b77970939500fb04180166a1f716e75a871ef8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c35fafd7f12ebd6f9e29c95a370df7f1fb171a40", - "reference": "c35fafd7f12ebd6f9e29c95a370df7f1fb171a40", + "url": "https://api.github.com/repos/symfony/console/zipball/28b77970939500fb04180166a1f716e75a871ef8", + "reference": "28b77970939500fb04180166a1f716e75a871ef8", "shasum": "" }, "require": { @@ -10491,7 +10499,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.44" + "source": "https://github.com/symfony/console/tree/v4.4.45" }, "funding": [ { @@ -10507,7 +10515,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2022-08-17T14:50:19+00:00" }, { "name": "symfony/css-selector", @@ -10799,16 +10807,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.4.44", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "53cee1108a9748682b1268bc1a76a3d6a665ede2" + "reference": "4b8daf6c56801e6d664224261cb100b73edc78a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/53cee1108a9748682b1268bc1a76a3d6a665ede2", - "reference": "53cee1108a9748682b1268bc1a76a3d6a665ede2", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4b8daf6c56801e6d664224261cb100b73edc78a5", + "reference": "4b8daf6c56801e6d664224261cb100b73edc78a5", "shasum": "" }, "require": { @@ -10853,7 +10861,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v4.4.44" + "source": "https://github.com/symfony/dom-crawler/tree/v4.4.45" }, "funding": [ { @@ -10869,7 +10877,7 @@ "type": "tidelift" } ], - "time": "2022-06-27T13:16:42+00:00" + "time": "2022-08-03T12:57:57+00:00" }, { "name": "symfony/error-handler", @@ -11372,16 +11380,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.44", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "9bc83c2f78949fc64503134a3139a7b055890d06" + "reference": "b2f2e3cb66349d89cb46c939cea03c62ad71cf00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9bc83c2f78949fc64503134a3139a7b055890d06", - "reference": "9bc83c2f78949fc64503134a3139a7b055890d06", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b2f2e3cb66349d89cb46c939cea03c62ad71cf00", + "reference": "b2f2e3cb66349d89cb46c939cea03c62ad71cf00", "shasum": "" }, "require": { @@ -11420,7 +11428,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.44" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.45" }, "funding": [ { @@ -11436,20 +11444,20 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2022-08-17T15:29:03+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.44", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "9e444442334fae9637ef3209bc2abddfef49e714" + "reference": "4f2d38e9a3c6997ea0886ede5aaf337dfd0fc938" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9e444442334fae9637ef3209bc2abddfef49e714", - "reference": "9e444442334fae9637ef3209bc2abddfef49e714", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4f2d38e9a3c6997ea0886ede5aaf337dfd0fc938", + "reference": "4f2d38e9a3c6997ea0886ede5aaf337dfd0fc938", "shasum": "" }, "require": { @@ -11524,7 +11532,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/v4.4.44" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.45" }, "funding": [ { @@ -11540,7 +11548,7 @@ "type": "tidelift" } ], - "time": "2022-07-29T12:23:38+00:00" + "time": "2022-08-26T14:34:48+00:00" }, { "name": "symfony/lock", @@ -11622,16 +11630,16 @@ }, { "name": "symfony/mime", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "3cd175cdcdb6db2e589e837dd46aff41027d9830" + "reference": "03876e9c5a36f5b45e7d9a381edda5421eff8a90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/3cd175cdcdb6db2e589e837dd46aff41027d9830", - "reference": "3cd175cdcdb6db2e589e837dd46aff41027d9830", + "url": "https://api.github.com/repos/symfony/mime/zipball/03876e9c5a36f5b45e7d9a381edda5421eff8a90", + "reference": "03876e9c5a36f5b45e7d9a381edda5421eff8a90", "shasum": "" }, "require": { @@ -11685,7 +11693,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.11" + "source": "https://github.com/symfony/mime/tree/v5.4.12" }, "funding": [ { @@ -11701,7 +11709,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T11:34:24+00:00" + "time": "2022-08-19T14:24:03+00:00" }, { "name": "symfony/phpunit-bridge", @@ -12847,16 +12855,16 @@ }, { "name": "symfony/serializer", - "version": "v4.4.44", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "375509ca128d3e8b38df92af74814c765571911e" + "reference": "d19621a350491f76e2faed2afb982e0706f63252" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/375509ca128d3e8b38df92af74814c765571911e", - "reference": "375509ca128d3e8b38df92af74814c765571911e", + "url": "https://api.github.com/repos/symfony/serializer/zipball/d19621a350491f76e2faed2afb982e0706f63252", + "reference": "d19621a350491f76e2faed2afb982e0706f63252", "shasum": "" }, "require": { @@ -12921,7 +12929,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/v4.4.44" + "source": "https://github.com/symfony/serializer/tree/v4.4.45" }, "funding": [ { @@ -12937,7 +12945,7 @@ "type": "tidelift" } ], - "time": "2022-07-28T12:55:20+00:00" + "time": "2022-08-17T14:28:21+00:00" }, { "name": "symfony/service-contracts", @@ -13024,16 +13032,16 @@ }, { "name": "symfony/string", - "version": "v6.0.11", + "version": "v6.0.12", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "042b6bf0f6ccca6d456a0572eb788cfb8b1ff809" + "reference": "3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/042b6bf0f6ccca6d456a0572eb788cfb8b1ff809", - "reference": "042b6bf0f6ccca6d456a0572eb788cfb8b1ff809", + "url": "https://api.github.com/repos/symfony/string/zipball/3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0", + "reference": "3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0", "shasum": "" }, "require": { @@ -13089,7 +13097,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.0.11" + "source": "https://github.com/symfony/string/tree/v6.0.12" }, "funding": [ { @@ -13105,20 +13113,20 @@ "type": "tidelift" } ], - "time": "2022-07-27T15:50:26+00:00" + "time": "2022-08-12T18:05:20+00:00" }, { "name": "symfony/translation", - "version": "v4.4.44", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "af947fefc306cec6ea5a1f6160c7e305a71f2493" + "reference": "4e6b4c0dbeb04d6f004ed7f43eb0905ce8396def" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/af947fefc306cec6ea5a1f6160c7e305a71f2493", - "reference": "af947fefc306cec6ea5a1f6160c7e305a71f2493", + "url": "https://api.github.com/repos/symfony/translation/zipball/4e6b4c0dbeb04d6f004ed7f43eb0905ce8396def", + "reference": "4e6b4c0dbeb04d6f004ed7f43eb0905ce8396def", "shasum": "" }, "require": { @@ -13178,7 +13186,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v4.4.44" + "source": "https://github.com/symfony/translation/tree/v4.4.45" }, "funding": [ { @@ -13194,7 +13202,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2022-08-02T12:44:49+00:00" }, { "name": "symfony/translation-contracts", @@ -13350,16 +13358,16 @@ }, { "name": "symfony/validator", - "version": "v4.4.44", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "4b566c8d15f3490b0e72b42dd33ea8d2b4857cb1" + "reference": "06db9bfca8fefea4dfe8e804bbcd0aa79a414d0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/4b566c8d15f3490b0e72b42dd33ea8d2b4857cb1", - "reference": "4b566c8d15f3490b0e72b42dd33ea8d2b4857cb1", + "url": "https://api.github.com/repos/symfony/validator/zipball/06db9bfca8fefea4dfe8e804bbcd0aa79a414d0c", + "reference": "06db9bfca8fefea4dfe8e804bbcd0aa79a414d0c", "shasum": "" }, "require": { @@ -13436,7 +13444,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v4.4.44" + "source": "https://github.com/symfony/validator/tree/v4.4.45" }, "funding": [ { @@ -13452,7 +13460,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2022-08-04T16:19:35+00:00" }, { "name": "symfony/var-dumper", @@ -13545,16 +13553,16 @@ }, { "name": "symfony/yaml", - "version": "v4.4.44", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "c2b28c10fb3b7ac67bafa7b8f952cd83f35acde2" + "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c2b28c10fb3b7ac67bafa7b8f952cd83f35acde2", - "reference": "c2b28c10fb3b7ac67bafa7b8f952cd83f35acde2", + "url": "https://api.github.com/repos/symfony/yaml/zipball/aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", + "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", "shasum": "" }, "require": { @@ -13596,7 +13604,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v4.4.44" + "source": "https://github.com/symfony/yaml/tree/v4.4.45" }, "funding": [ { @@ -13612,7 +13620,7 @@ "type": "tidelift" } ], - "time": "2022-06-27T13:16:42+00:00" + "time": "2022-08-02T15:47:23+00:00" }, { "name": "theseer/tokenizer", @@ -13666,16 +13674,16 @@ }, { "name": "twig/twig", - "version": "v2.15.1", + "version": "v2.15.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4" + "reference": "3e43405a9a8b578809426339cc3780e16fba0c52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4", - "reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e43405a9a8b578809426339cc3780e16fba0c52", + "reference": "3e43405a9a8b578809426339cc3780e16fba0c52", "shasum": "" }, "require": { @@ -13730,7 +13738,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.15.1" + "source": "https://github.com/twigphp/Twig/tree/v2.15.2" }, "funding": [ { @@ -13742,7 +13750,7 @@ "type": "tidelift" } ], - "time": "2022-05-17T05:46:24+00:00" + "time": "2022-08-12T06:43:37+00:00" }, { "name": "typo3/phar-stream-wrapper", @@ -14200,26 +14208,27 @@ }, { "name": "doctrine/collections", - "version": "1.6.8", + "version": "1.7.2", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af" + "reference": "3fe77330f5591108bbf1315da7377a7e704ed8a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/1958a744696c6bb3bb0d28db2611dc11610e78af", - "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af", + "url": "https://api.github.com/repos/doctrine/collections/zipball/3fe77330f5591108bbf1315da7377a7e704ed8a0", + "reference": "3fe77330f5591108bbf1315da7377a7e704ed8a0", "shasum": "" }, "require": { + "doctrine/deprecations": "^0.5.3 || ^1", "php": "^7.1.3 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9.0", - "phpstan/phpstan": "^0.12", + "doctrine/coding-standard": "^9.0 || ^10.0", + "phpstan/phpstan": "^1.4.8", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5", - "vimeo/psalm": "^4.2.1" + "vimeo/psalm": "^4.22" }, "type": "library", "autoload": { @@ -14263,9 +14272,9 @@ ], "support": { "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/1.6.8" + "source": "https://github.com/doctrine/collections/tree/1.7.2" }, - "time": "2021-08-10T18:51:53+00:00" + "time": "2022-08-27T16:08:58+00:00" }, { "name": "doctrine/common", @@ -14368,6 +14377,49 @@ ], "time": "2020-06-05T16:46:05+00:00" }, + { + "name": "doctrine/deprecations", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/deprecations.git", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5|^8.5|^9.5", + "psr/log": "^1|^2|^3" + }, + "suggest": { + "psr/log": "Allows logging deprecations via PSR-3 logger implementation" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", + "homepage": "https://www.doctrine-project.org/", + "support": { + "issues": "https://github.com/doctrine/deprecations/issues", + "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + }, + "time": "2022-05-02T15:47:09+00:00" + }, { "name": "doctrine/event-manager", "version": "1.1.2", @@ -15585,8 +15637,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/inline_entity_form": 5, - "drupal/taxonomy_term_revision": 20 + "drupal/inline_entity_form": 5 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/config/migrate_plus.migration.reliefweb_node_revision__job.yml b/config/migrate_plus.migration.reliefweb_node_revision__job.yml index b47dfc043..c44785348 100644 --- a/config/migrate_plus.migration.reliefweb_node_revision__job.yml +++ b/config/migrate_plus.migration.reliefweb_node_revision__job.yml @@ -17,7 +17,7 @@ process: body/format: plugin: default_value default_value: markdown_editor - field_career_categories/value: + field_career_categories: plugin: sub_process source: field_career_categories process: diff --git a/config/migrate_plus.migration.reliefweb_node_revision__report.yml b/config/migrate_plus.migration.reliefweb_node_revision__report.yml index 9afa95245..a25ebdc72 100644 --- a/config/migrate_plus.migration.reliefweb_node_revision__report.yml +++ b/config/migrate_plus.migration.reliefweb_node_revision__report.yml @@ -19,7 +19,7 @@ process: plugin: skip_on_empty method: process source: field_bury/0/value - field_content_format/value: + field_content_format: plugin: sub_process source: field_content_format process: diff --git a/config/migrate_plus.migration.reliefweb_node_revision__training.yml b/config/migrate_plus.migration.reliefweb_node_revision__training.yml index a8a4ba47d..74e1b1c0e 100644 --- a/config/migrate_plus.migration.reliefweb_node_revision__training.yml +++ b/config/migrate_plus.migration.reliefweb_node_revision__training.yml @@ -17,7 +17,7 @@ process: body/format: plugin: default_value default_value: markdown_editor - field_career_categories/value: + field_career_categories: plugin: sub_process source: field_career_categories process: diff --git a/docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua b/docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua index 48cee12f1..6b59f18fd 100644 --- a/docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua +++ b/docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua @@ -6,7 +6,8 @@ local attachment_file = ngx.var.attachment_file -- the URL, URI in DB and file on disk in D7. -- This can also be used to handle aliases for some specific files. local symlink = ngx.var.document_root .. '/sites/default/files/legacy-attachments/' .. attachment_file; -local handle = io.popen('readlink "' .. symlink .. '"') +local escaped = symlink:gsub('"', ''):gsub("'", ""):gsub('`', ''):gsub('%$', ''):gsub('%!', '') +local handle = io.popen('readlink "' .. escaped .. '"') local target = handle:read() handle:close() diff --git a/docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua b/docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua index c3b862e87..42e23ed25 100644 --- a/docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua +++ b/docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua @@ -30,7 +30,8 @@ end -- Some legacy preview file names cannot be derived from the PDF file name, in -- that case there should be a symlink pointing to the new preview. local symlink = ngx.var.document_root .. '/sites/default/files/legacy-previews/' .. ngx.var.file_id .. '.' .. image_ext; -local handle = io.popen('readlink "' .. symlink .. '"') +local escaped = symlink:gsub('"', ''):gsub("'", ""):gsub('`', ''):gsub('%$', ''):gsub('%!', '') +local handle = io.popen('readlink "' .. escaped .. '"') local target = handle:read() handle:close() diff --git a/docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua b/docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua index 5358641b4..0d849890d 100644 --- a/docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua +++ b/docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua @@ -5,7 +5,8 @@ local image_ext = 'png' -- Some legacy preview file names cannot be derived from the PDF file name, in -- that case there should be a symlink pointing to the new preview. local symlink = ngx.var.document_root .. '/sites/default/files/legacy-previews/' .. ngx.var.file_id .. '.' .. image_ext; -local handle = io.popen('readlink "' .. symlink .. '"') +local escaped = symlink:gsub('"', ''):gsub("'", ""):gsub('`', ''):gsub('%$', ''):gsub('%!', '') +local handle = io.popen('readlink "' .. escaped .. '"') local target = handle:read() handle:close() diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__job.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__job.yml index f9ed8e384..3ab2cd417 100644 --- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__job.yml +++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__job.yml @@ -8,7 +8,7 @@ process: body/format: plugin: default_value default_value: "markdown_editor" - field_career_categories/value: + field_career_categories: plugin: sub_process source: field_career_categories process: diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml index 33825e1ae..1fb5bc309 100644 --- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml +++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml @@ -10,7 +10,7 @@ process: plugin: skip_on_empty method: process source: field_bury/0/value - field_content_format/value: + field_content_format: plugin: sub_process source: field_content_format process: diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__training.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__training.yml index 2a6367ea4..98fcde108 100644 --- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__training.yml +++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__training.yml @@ -8,7 +8,7 @@ process: body/format: plugin: default_value default_value: "markdown_editor" - field_career_categories/value: + field_career_categories: plugin: sub_process source: field_career_categories process: diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php index 04434fea3..a93e2f868 100644 --- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php +++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php @@ -2160,4 +2160,126 @@ public function migrateFileRevisions($options = [ } } + /** + * Migrated job/training career categories revisions. + * + * @command rw-migrate:migrate-career-categories-revisions + * + * @usage rw-migrate:migrate-career-categories-revisions + * Migrated career categories revisions + * + * @validate-module-enabled reliefweb_migrate + */ + public function migrateCareerCategoriesRevisions(array $options = [ + 'dry-run' => FALSE, + ]) { + $last_id = 0; + $count = 0; + $fields = [ + 'bundle', + 'deleted', + 'entity_id', + 'revision_id', + 'langcode', + 'delta', + 'field_career_categories_target_id', + ]; + $query_options = [ + // Note: this is deprecated in Drupal 9.4 and will be removed in Drupal + // 11 and there is no replacement. We don't really care because the + // reliefweb_migrate will be removed way before that. + 'return' => Database::RETURN_AFFECTED, + ]; + $dry_run = !empty($options['dry-run']); + + while (TRUE) { + $rw7_records = Database::getConnection('default', 'rwint7') + ->select('field_revision_field_career_categories', 'f') + ->fields('f') + ->condition('f.bundle', ['job', 'training'], 'IN') + ->condition('f.revision_id', $last_id, '>') + ->orderBy('f.revision_id', 'ASC') + ->range(0, 1000) + ->execute() + ?->fetchAll() ?? []; + + if (empty($rw7_records)) { + break; + } + + // Extract the revision IDs. + $revision_ids = []; + foreach ($rw7_records as $record) { + $revision_ids[$record->revision_id] = $record->revision_id; + } + $last_id = max($revision_ids); + + // Get the existing revision IDs. + $existing_revision_ids = []; + $query = $this->database->select('node_revision', 'nr'); + $query->fields('nr', ['vid']); + $query->leftJoin('node_revision__field_career_categories', 'f', 'f.revision_id = nr.vid'); + $query->fields('f', ['field_career_categories_target_id']); + $query->condition('nr.vid', $revision_ids, 'IN'); + foreach ($query->execute() ?? [] as $record) { + if (empty($existing_revision_ids[$record->vid])) { + $existing_revision_ids[$record->vid] = !empty($record->field_career_categories_target_id); + } + } + + // Generate the list of records to insert. + $nids = []; + $rw9_records = []; + foreach ($rw7_records as $record) { + if (isset($existing_revision_ids[$record->revision_id]) && $existing_revision_ids[$record->revision_id] === FALSE) { + $rw9_records[] = [ + 'bundle' => $record->bundle, + 'deleted' => $record->deleted, + 'entity_id' => $record->entity_id, + 'revision_id' => $record->revision_id, + 'langcode' => 'en', + 'delta' => $record->delta, + 'field_career_categories_target_id' => $record->field_career_categories_tid, + ]; + $nids[$record->entity_id] = $record->entity_id; + } + } + + if (!empty($rw9_records)) { + try { + $transaction = $this->database->startTransaction(); + + $query = $this->database + ->insert('node_revision__field_career_categories', $query_options) + ->fields($fields); + foreach ($rw9_records as $record) { + $query->values($record); + } + $query->execute(); + + if ($dry_run) { + $transaction->rollback(); + } + } + catch (\Exception $exception) { + $transaction->rollback(); + $this->logger()->error(dt('Error while trying to update the database: @error', [ + '@error' => $exception->getMessage(), + ])); + return FALSE; + } + + $count += count($rw9_records); + + $this->logger()->info(dt('Inserted @count records', [ + '@count' => $count, + ])); + } + } + + if ($count === 0) { + $this->logger()->info(dt('Nothing to insert')); + } + } + } diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php index c2c8d905c..21d10e3a3 100644 --- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php +++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php @@ -132,7 +132,7 @@ protected function getEntity(Row $row, array $old_destination_id_values) { if ($source_plugin instanceof EntityBase) { $exists = $this->migration->getSourcePlugin()->entityExists($entity_id); } - elseif ($original = $this->storage->load($entity_id)) { + elseif ($this->storage->load($entity_id)) { $exists = TRUE; } else { diff --git a/html/modules/custom/reliefweb_moderation/src/Services/SourceModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/SourceModeration.php index 026f6bce1..9a0c2641b 100644 --- a/html/modules/custom/reliefweb_moderation/src/Services/SourceModeration.php +++ b/html/modules/custom/reliefweb_moderation/src/Services/SourceModeration.php @@ -208,6 +208,8 @@ public function isViewableStatus($status, ?AccountInterface $account = NULL) { * {@inheritdoc} */ public function entityPresave(EntityModeratedInterface $entity) { + parent::entityPresave($entity); + // Ensure all posting rights are 'blocked' if the status is 'blocked'. $status = $entity->getModerationStatus(); if ($status === 'blocked') { @@ -233,8 +235,6 @@ public function entityPresave(EntityModeratedInterface $entity) { ]))); } } - - return $status; } /** diff --git a/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-search.html.twig b/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-search.html.twig index f2abe3407..3b325bbea 100644 --- a/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-search.html.twig +++ b/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-search.html.twig @@ -10,7 +10,7 @@ .setAttribute('data-cd-focus-target', 'site-search-input') .addClass('cd-search__form') }}> -

+

{{ 'Content Search'|t }}