From b8d54c9780b9cd5b45df8ee1c67e5dc74c01fac6 Mon Sep 17 00:00:00 2001 From: Guergana Tzatchkova Date: Thu, 7 Sep 2023 16:32:57 +0200 Subject: [PATCH 01/28] Upgrade composer dependencies (#675) Bug: T345615 --- composer.json | 2 +- composer.lock | 610 ++++++++++++++++++++++++++++---------------------- 2 files changed, 340 insertions(+), 272 deletions(-) diff --git a/composer.json b/composer.json index f4abd111..d3fe63ca 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "php": "^7.3|^8.0", "ext-zip": "*", "fideloper/proxy": "^4.4", - "fruitcake/laravel-cors": "^2.0", + "fruitcake/laravel-cors": "^2.2.0", "guzzlehttp/guzzle": "^7.6.1", "inertiajs/inertia-laravel": "0.6.9", "kevinrob/guzzle-cache-middleware": "^4.0.2", diff --git a/composer.lock b/composer.lock index e6c40c26..441689e1 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": "afb5b931d1cad1dca4b8f77aa2d4aee1", + "content-hash": "26f729e65d51c073a69ed09df4e6ebca", "packages": [ { "name": "asm89/stack-cors", @@ -124,28 +124,28 @@ }, { "name": "doctrine/inflector", - "version": "2.0.6", + "version": "2.0.8", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024" + "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024", - "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff", + "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^10", + "doctrine/coding-standard": "^11.0", "phpstan/phpstan": "^1.8", "phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-strict-rules": "^1.3", "phpunit/phpunit": "^8.5 || ^9.5", - "vimeo/psalm": "^4.25" + "vimeo/psalm": "^4.25 || ^5.4" }, "type": "library", "autoload": { @@ -195,7 +195,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.6" + "source": "https://github.com/doctrine/inflector/tree/2.0.8" }, "funding": [ { @@ -211,7 +211,7 @@ "type": "tidelift" } ], - "time": "2022-10-20T09:10:12+00:00" + "time": "2023-06-16T13:40:37+00:00" }, { "name": "doctrine/lexer", @@ -291,16 +291,16 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.3.2", + "version": "v3.3.3", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8" + "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8", - "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", + "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", "shasum": "" }, "require": { @@ -340,7 +340,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.2" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3" }, "funding": [ { @@ -348,7 +348,7 @@ "type": "github" } ], - "time": "2022-09-10T18:51:20+00:00" + "time": "2023-08-10T19:36:49+00:00" }, { "name": "egulias/email-validator", @@ -620,22 +620,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.7.0", + "version": "7.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5" + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5", - "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -726,7 +726,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.7.0" + "source": "https://github.com/guzzle/guzzle/tree/7.8.0" }, "funding": [ { @@ -742,20 +742,20 @@ "type": "tidelift" } ], - "time": "2023-05-21T14:04:53+00:00" + "time": "2023-08-27T10:20:53+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6" + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6", - "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6", + "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d", + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", "shasum": "" }, "require": { @@ -809,7 +809,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.0" + "source": "https://github.com/guzzle/promises/tree/2.0.1" }, "funding": [ { @@ -825,20 +825,20 @@ "type": "tidelift" } ], - "time": "2023-05-21T13:50:22+00:00" + "time": "2023-08-03T15:11:55+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.5.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "b635f279edd83fc275f822a1188157ffea568ff6" + "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6", - "reference": "b635f279edd83fc275f822a1188157ffea568ff6", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/be45764272e8873c72dbe3d2edcfdfcc3bc9f727", + "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727", "shasum": "" }, "require": { @@ -925,7 +925,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.5.0" + "source": "https://github.com/guzzle/psr7/tree/2.6.1" }, "funding": [ { @@ -941,7 +941,7 @@ "type": "tidelift" } ], - "time": "2023-04-17T16:11:26+00:00" + "time": "2023-08-27T10:13:57+00:00" }, { "name": "inertiajs/inertia-laravel", @@ -1017,16 +1017,16 @@ }, { "name": "kevinrob/guzzle-cache-middleware", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/Kevinrob/guzzle-cache-middleware.git", - "reference": "0e12dccf3c811a18bb2f6c93882c5b5727e1b859" + "reference": "2546d1035e844da378b03e1fb42d3d1cf53187e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Kevinrob/guzzle-cache-middleware/zipball/0e12dccf3c811a18bb2f6c93882c5b5727e1b859", - "reference": "0e12dccf3c811a18bb2f6c93882c5b5727e1b859", + "url": "https://api.github.com/repos/Kevinrob/guzzle-cache-middleware/zipball/2546d1035e844da378b03e1fb42d3d1cf53187e2", + "reference": "2546d1035e844da378b03e1fb42d3d1cf53187e2", "shasum": "" }, "require": { @@ -1096,9 +1096,9 @@ ], "support": { "issues": "https://github.com/Kevinrob/guzzle-cache-middleware/issues", - "source": "https://github.com/Kevinrob/guzzle-cache-middleware/tree/v4.1.1" + "source": "https://github.com/Kevinrob/guzzle-cache-middleware/tree/v4.1.2" }, - "time": "2023-05-31T07:04:24+00:00" + "time": "2023-06-14T11:19:21+00:00" }, { "name": "laravel/framework", @@ -1340,16 +1340,16 @@ }, { "name": "laravel/serializable-closure", - "version": "v1.3.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37" + "reference": "e5a3057a5591e1cfe8183034b0203921abe2c902" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f23fe9d4e95255dacee1bf3525e0810d1a1b0f37", - "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/e5a3057a5591e1cfe8183034b0203921abe2c902", + "reference": "e5a3057a5591e1cfe8183034b0203921abe2c902", "shasum": "" }, "require": { @@ -1396,20 +1396,20 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2023-01-30T18:31:20+00:00" + "time": "2023-07-14T13:56:28+00:00" }, { "name": "laravel/socialite", - "version": "v5.6.3", + "version": "v5.9.0", "source": { "type": "git", "url": "https://github.com/laravel/socialite.git", - "reference": "00ea7f8630673ea49304fc8a9fca5a64eb838c7e" + "reference": "14acfa3262875f180fba51efe3c7aaa089a9ef24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/socialite/zipball/00ea7f8630673ea49304fc8a9fca5a64eb838c7e", - "reference": "00ea7f8630673ea49304fc8a9fca5a64eb838c7e", + "url": "https://api.github.com/repos/laravel/socialite/zipball/14acfa3262875f180fba51efe3c7aaa089a9ef24", + "reference": "14acfa3262875f180fba51efe3c7aaa089a9ef24", "shasum": "" }, "require": { @@ -1466,20 +1466,20 @@ "issues": "https://github.com/laravel/socialite/issues", "source": "https://github.com/laravel/socialite" }, - "time": "2023-06-06T13:42:43+00:00" + "time": "2023-09-05T15:20:21+00:00" }, { "name": "laravel/tinker", - "version": "v2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10" + "reference": "b936d415b252b499e8c3b1f795cd4fc20f57e1f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/04a2d3bd0d650c0764f70bf49d1ee39393e4eb10", - "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10", + "url": "https://api.github.com/repos/laravel/tinker/zipball/b936d415b252b499e8c3b1f795cd4fc20f57e1f3", + "reference": "b936d415b252b499e8c3b1f795cd4fc20f57e1f3", "shasum": "" }, "require": { @@ -1492,6 +1492,7 @@ }, "require-dev": { "mockery/mockery": "~1.3.3|^1.4.2", + "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^8.5.8|^9.3.3" }, "suggest": { @@ -1532,9 +1533,9 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.8.1" + "source": "https://github.com/laravel/tinker/tree/v2.8.2" }, - "time": "2023-02-15T16:40:09+00:00" + "time": "2023-08-15T14:27:00+00:00" }, { "name": "league/commonmark", @@ -1725,16 +1726,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" + "reference": "c7f2872fb273bf493811473dafc88d60ae829f48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/c7f2872fb273bf493811473dafc88d60ae829f48", + "reference": "c7f2872fb273bf493811473dafc88d60ae829f48", "shasum": "" }, "require": { @@ -1765,7 +1766,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.12.0" }, "funding": [ { @@ -1777,7 +1778,7 @@ "type": "tidelift" } ], - "time": "2022-04-17T13:12:02+00:00" + "time": "2023-08-03T07:14:11+00:00" }, { "name": "league/oauth1-client", @@ -1959,25 +1960,29 @@ }, { "name": "nesbot/carbon", - "version": "2.67.0", + "version": "2.69.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8" + "reference": "4308217830e4ca445583a37d1bf4aff4153fa81c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/c1001b3bc75039b07f38a79db5237c4c529e04c8", - "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4308217830e4ca445583a37d1bf4aff4153fa81c", + "reference": "4308217830e4ca445583a37d1bf4aff4153fa81c", "shasum": "" }, "require": { "ext-json": "*", "php": "^7.1.8 || ^8.0", + "psr/clock": "^1.0", "symfony/polyfill-mbstring": "^1.0", "symfony/polyfill-php80": "^1.16", "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, + "provide": { + "psr/clock-implementation": "1.0" + }, "require-dev": { "doctrine/dbal": "^2.0 || ^3.1.4", "doctrine/orm": "^2.7", @@ -2057,20 +2062,20 @@ "type": "tidelift" } ], - "time": "2023-05-25T22:09:47+00:00" + "time": "2023-08-03T09:00:52+00:00" }, { "name": "nikic/php-parser", - "version": "v4.15.5", + "version": "v4.17.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", "shasum": "" }, "require": { @@ -2111,9 +2116,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" }, - "time": "2023-05-19T20:20:00+00:00" + "time": "2023-08-13T19:53:39+00:00" }, { "name": "opis/closure", @@ -2255,6 +2260,54 @@ ], "time": "2023-02-25T19:38:58+00:00" }, + { + "name": "psr/clock", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "support": { + "issues": "https://github.com/php-fig/clock/issues", + "source": "https://github.com/php-fig/clock/tree/1.0.0" + }, + "time": "2022-11-25T14:36:26+00:00" + }, { "name": "psr/container", "version": "1.1.1", @@ -2616,16 +2669,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.18", + "version": "v0.11.20", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec" + "reference": "0fa27040553d1d280a67a4393194df5228afea5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", - "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/0fa27040553d1d280a67a4393194df5228afea5b", + "reference": "0fa27040553d1d280a67a4393194df5228afea5b", "shasum": "" }, "require": { @@ -2686,9 +2739,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.18" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.20" }, - "time": "2023-05-23T02:31:11+00:00" + "time": "2023-07-31T14:32:22+00:00" }, { "name": "ralouphie/getallheaders", @@ -2989,16 +3042,16 @@ }, { "name": "symfony/console", - "version": "v5.4.24", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8" + "reference": "f4f71842f24c2023b91237c72a365306f3c58827" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", - "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", + "url": "https://api.github.com/repos/symfony/console/zipball/f4f71842f24c2023b91237c72a365306f3c58827", + "reference": "f4f71842f24c2023b91237c72a365306f3c58827", "shasum": "" }, "require": { @@ -3068,7 +3121,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.24" + "source": "https://github.com/symfony/console/tree/v5.4.28" }, "funding": [ { @@ -3084,20 +3137,20 @@ "type": "tidelift" } ], - "time": "2023-05-26T05:13:16+00:00" + "time": "2023-08-07T06:12:30+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.21", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d" + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/95f3c7468db1da8cc360b24fa2a26e7cefcb355d", - "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", + "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a", "shasum": "" }, "require": { @@ -3134,7 +3187,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.21" + "source": "https://github.com/symfony/css-selector/tree/v5.4.26" }, "funding": [ { @@ -3150,7 +3203,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-07-07T06:10:25+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3221,16 +3274,16 @@ }, { "name": "symfony/error-handler", - "version": "v5.4.24", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "c1b9be3b8a6f60f720bec28c4ffb6fb5b00a8946" + "reference": "b26719213a39c9ba57520cbc5e52bfcc5e8d92f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/c1b9be3b8a6f60f720bec28c4ffb6fb5b00a8946", - "reference": "c1b9be3b8a6f60f720bec28c4ffb6fb5b00a8946", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/b26719213a39c9ba57520cbc5e52bfcc5e8d92f9", + "reference": "b26719213a39c9ba57520cbc5e52bfcc5e8d92f9", "shasum": "" }, "require": { @@ -3272,7 +3325,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v5.4.24" + "source": "https://github.com/symfony/error-handler/tree/v5.4.26" }, "funding": [ { @@ -3288,20 +3341,20 @@ "type": "tidelift" } ], - "time": "2023-05-02T16:13:31+00:00" + "time": "2023-07-16T16:48:57+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.22", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f" + "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1df20e45d56da29a4b1d8259dd6e950acbf1b13f", - "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac", + "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac", "shasum": "" }, "require": { @@ -3357,7 +3410,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.22" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.26" }, "funding": [ { @@ -3373,7 +3426,7 @@ "type": "tidelift" } ], - "time": "2023-03-17T11:31:58+00:00" + "time": "2023-07-06T06:34:20+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -3456,16 +3509,16 @@ }, { "name": "symfony/finder", - "version": "v5.4.21", + "version": "v5.4.27", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19" + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/078e9a5e1871fcfe6a5ce421b539344c21afef19", - "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19", + "url": "https://api.github.com/repos/symfony/finder/zipball/ff4bce3c33451e7ec778070e45bd23f74214cd5d", + "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d", "shasum": "" }, "require": { @@ -3499,7 +3552,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.21" + "source": "https://github.com/symfony/finder/tree/v5.4.27" }, "funding": [ { @@ -3515,20 +3568,20 @@ "type": "tidelift" } ], - "time": "2023-02-16T09:33:00+00:00" + "time": "2023-07-31T08:02:31+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.4.24", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "3c59f97f6249ce552a44f01b93bfcbd786a954f5" + "reference": "365992c83a836dfe635f1e903ccca43ee03d3dd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3c59f97f6249ce552a44f01b93bfcbd786a954f5", - "reference": "3c59f97f6249ce552a44f01b93bfcbd786a954f5", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/365992c83a836dfe635f1e903ccca43ee03d3dd2", + "reference": "365992c83a836dfe635f1e903ccca43ee03d3dd2", "shasum": "" }, "require": { @@ -3575,7 +3628,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.24" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.28" }, "funding": [ { @@ -3591,20 +3644,20 @@ "type": "tidelift" } ], - "time": "2023-05-19T07:21:23+00:00" + "time": "2023-08-21T07:23:18+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.4.24", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "f38b722e1557eb3f487d351b48f5a1279b50e9d1" + "reference": "127a2322ca1828157901092518b8ea8e4e1109d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f38b722e1557eb3f487d351b48f5a1279b50e9d1", - "reference": "f38b722e1557eb3f487d351b48f5a1279b50e9d1", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/127a2322ca1828157901092518b8ea8e4e1109d4", + "reference": "127a2322ca1828157901092518b8ea8e4e1109d4", "shasum": "" }, "require": { @@ -3687,7 +3740,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/v5.4.24" + "source": "https://github.com/symfony/http-kernel/tree/v5.4.28" }, "funding": [ { @@ -3703,20 +3756,20 @@ "type": "tidelift" } ], - "time": "2023-05-27T08:06:30+00:00" + "time": "2023-08-26T13:47:51+00:00" }, { "name": "symfony/mime", - "version": "v5.4.23", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "ae0a1032a450a3abf305ee44fc55ed423fbf16e3" + "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/ae0a1032a450a3abf305ee44fc55ed423fbf16e3", - "reference": "ae0a1032a450a3abf305ee44fc55ed423fbf16e3", + "url": "https://api.github.com/repos/symfony/mime/zipball/2ea06dfeee20000a319d8407cea1d47533d5a9d2", + "reference": "2ea06dfeee20000a319d8407cea1d47533d5a9d2", "shasum": "" }, "require": { @@ -3731,7 +3784,7 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<4.4", - "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" + "symfony/serializer": "<5.4.26|>=6,<6.2.13|>=6.3,<6.3.2" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", @@ -3739,7 +3792,7 @@ "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" + "symfony/serializer": "^5.4.26|~6.2.13|^6.3.2" }, "type": "library", "autoload": { @@ -3771,7 +3824,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.23" + "source": "https://github.com/symfony/mime/tree/v5.4.26" }, "funding": [ { @@ -3787,20 +3840,20 @@ "type": "tidelift" } ], - "time": "2023-04-19T09:49:13+00:00" + "time": "2023-07-27T06:29:31+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -3815,7 +3868,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3853,7 +3906,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -3869,20 +3922,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "927013f3aac555983a5059aada98e1907d842695" + "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695", - "reference": "927013f3aac555983a5059aada98e1907d842695", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6de50471469b8c9afc38164452ab2b6170ee71c1", + "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1", "shasum": "" }, "require": { @@ -3897,7 +3950,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3936,7 +3989,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.28.0" }, "funding": [ { @@ -3952,20 +4005,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -3977,7 +4030,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4017,7 +4070,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -4033,20 +4086,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da" + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", "shasum": "" }, "require": { @@ -4060,7 +4113,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4104,7 +4157,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0" }, "funding": [ { @@ -4120,20 +4173,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:30:37+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -4145,7 +4198,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4188,7 +4241,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -4204,20 +4257,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -4232,7 +4285,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4271,7 +4324,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -4287,20 +4340,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", "shasum": "" }, "require": { @@ -4309,7 +4362,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4347,7 +4400,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" }, "funding": [ { @@ -4363,20 +4416,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", "shasum": "" }, "require": { @@ -4385,7 +4438,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4426,7 +4479,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" }, "funding": [ { @@ -4442,20 +4495,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -4464,7 +4517,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4509,7 +4562,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -4525,20 +4578,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", "shasum": "" }, "require": { @@ -4547,7 +4600,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4588,7 +4641,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" }, "funding": [ { @@ -4604,20 +4657,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/process", - "version": "v5.4.24", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64" + "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/e3c46cc5689c8782944274bb30702106ecbe3b64", - "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64", + "url": "https://api.github.com/repos/symfony/process/zipball/45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", + "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b", "shasum": "" }, "require": { @@ -4650,7 +4703,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.24" + "source": "https://github.com/symfony/process/tree/v5.4.28" }, "funding": [ { @@ -4666,20 +4719,20 @@ "type": "tidelift" } ], - "time": "2023-05-17T11:26:05+00:00" + "time": "2023-08-07T10:36:04+00:00" }, { "name": "symfony/routing", - "version": "v5.4.22", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d" + "reference": "853fc7df96befc468692de0a48831b38f04d2cb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/c2ac11eb34947999b7c38fb4c835a57306907e6d", - "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d", + "url": "https://api.github.com/repos/symfony/routing/zipball/853fc7df96befc468692de0a48831b38f04d2cb2", + "reference": "853fc7df96befc468692de0a48831b38f04d2cb2", "shasum": "" }, "require": { @@ -4740,7 +4793,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v5.4.22" + "source": "https://github.com/symfony/routing/tree/v5.4.26" }, "funding": [ { @@ -4756,7 +4809,7 @@ "type": "tidelift" } ], - "time": "2023-03-14T14:59:20+00:00" + "time": "2023-07-24T13:28:37+00:00" }, { "name": "symfony/service-contracts", @@ -4843,16 +4896,16 @@ }, { "name": "symfony/string", - "version": "v5.4.22", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62" + "reference": "1181fe9270e373537475e826873b5867b863883c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", - "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", + "url": "https://api.github.com/repos/symfony/string/zipball/1181fe9270e373537475e826873b5867b863883c", + "reference": "1181fe9270e373537475e826873b5867b863883c", "shasum": "" }, "require": { @@ -4909,7 +4962,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.22" + "source": "https://github.com/symfony/string/tree/v5.4.26" }, "funding": [ { @@ -4925,7 +4978,7 @@ "type": "tidelift" } ], - "time": "2023-03-14T06:11:53+00:00" + "time": "2023-06-28T12:46:07+00:00" }, { "name": "symfony/translation", @@ -5104,16 +5157,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.24", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3" + "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8e12706bf9c68a2da633f23bfdc15b4dce5970b3", - "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73", + "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73", "shasum": "" }, "require": { @@ -5127,6 +5180,7 @@ "require-dev": { "ext-iconv": "*", "symfony/console": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/process": "^4.4|^5.0|^6.0", "symfony/uid": "^5.1|^6.0", "twig/twig": "^2.13|^3.0.4" @@ -5172,7 +5226,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.24" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.28" }, "funding": [ { @@ -5188,7 +5242,7 @@ "type": "tidelift" } ], - "time": "2023-05-25T13:05:00+00:00" + "time": "2023-08-24T13:38:36+00:00" }, { "name": "taavi/laravel-socialite-mediawiki", @@ -5838,16 +5892,16 @@ }, { "name": "filp/whoops", - "version": "2.15.2", + "version": "2.15.3", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73" + "reference": "c83e88a30524f9360b11f585f71e6b17313b7187" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", - "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", + "url": "https://api.github.com/repos/filp/whoops/zipball/c83e88a30524f9360b11f585f71e6b17313b7187", + "reference": "c83e88a30524f9360b11f585f71e6b17313b7187", "shasum": "" }, "require": { @@ -5897,7 +5951,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.15.2" + "source": "https://github.com/filp/whoops/tree/2.15.3" }, "funding": [ { @@ -5905,7 +5959,7 @@ "type": "github" } ], - "time": "2023-04-12T12:00:00+00:00" + "time": "2023-07-13T12:00:00+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -6093,38 +6147,40 @@ }, { "name": "mockery/mockery", - "version": "1.5.1", + "version": "1.6.6", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e" + "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/e92dcc83d5a51851baf5f5591d32cb2b16e3684e", - "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e", + "url": "https://api.github.com/repos/mockery/mockery/zipball/b8e0bb7d8c604046539c1115994632c74dcb361e", + "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e", "shasum": "" }, "require": { "hamcrest/hamcrest-php": "^2.0.1", "lib-pcre": ">=7.0", - "php": "^7.3 || ^8.0" + "php": ">=7.3" }, "conflict": { "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.3" + "phpunit/phpunit": "^8.5 || ^9.6.10", + "psalm/plugin-phpunit": "^0.18.4", + "symplify/easy-coding-standard": "^11.5.0", + "vimeo/psalm": "^4.30" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, "autoload": { - "psr-0": { - "Mockery": "library/" + "files": [ + "library/helpers.php", + "library/Mockery.php" + ], + "psr-4": { + "Mockery\\": "library/Mockery" } }, "notification-url": "https://packagist.org/downloads/", @@ -6135,12 +6191,20 @@ { "name": "Pádraic Brady", "email": "padraic.brady@gmail.com", - "homepage": "http://blog.astrumfutura.com" + "homepage": "https://github.com/padraic", + "role": "Author" }, { "name": "Dave Marshall", "email": "dave.marshall@atstsolutions.co.uk", - "homepage": "http://davedevelopment.co.uk" + "homepage": "https://davedevelopment.co.uk", + "role": "Developer" + }, + { + "name": "Nathanael Esayeas", + "email": "nathanael.esayeas@protonmail.com", + "homepage": "https://github.com/ghostwriter", + "role": "Lead Developer" } ], "description": "Mockery is a simple yet flexible PHP mock object framework", @@ -6158,10 +6222,13 @@ "testing" ], "support": { + "docs": "https://docs.mockery.io/", "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/1.5.1" + "rss": "https://github.com/mockery/mockery/releases.atom", + "security": "https://github.com/mockery/mockery/security/advisories", + "source": "https://github.com/mockery/mockery" }, - "time": "2022-09-07T15:32:08+00:00" + "time": "2023-08-09T00:03:52+00:00" }, { "name": "myclabs/deep-copy", @@ -6422,16 +6489,16 @@ }, { "name": "php-webdriver/webdriver", - "version": "1.14.0", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/php-webdriver/php-webdriver.git", - "reference": "3ea4f924afb43056bf9c630509e657d951608563" + "reference": "a1578689290055586f1ee51eaf0ec9d52895bb6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/3ea4f924afb43056bf9c630509e657d951608563", - "reference": "3ea4f924afb43056bf9c630509e657d951608563", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/a1578689290055586f1ee51eaf0ec9d52895bb6d", + "reference": "a1578689290055586f1ee51eaf0ec9d52895bb6d", "shasum": "" }, "require": { @@ -6482,22 +6549,22 @@ ], "support": { "issues": "https://github.com/php-webdriver/php-webdriver/issues", - "source": "https://github.com/php-webdriver/php-webdriver/tree/1.14.0" + "source": "https://github.com/php-webdriver/php-webdriver/tree/1.15.0" }, - "time": "2023-02-09T12:12:19+00:00" + "time": "2023-08-29T13:52:26+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.26", + "version": "9.2.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1", + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1", "shasum": "" }, "require": { @@ -6553,7 +6620,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27" }, "funding": [ { @@ -6561,7 +6629,7 @@ "type": "github" } ], - "time": "2023-03-06T12:58:08+00:00" + "time": "2023-07-26T13:44:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -6806,16 +6874,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.8", + "version": "9.6.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e" + "reference": "810500e92855eba8a7a5319ae913be2da6f957b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/810500e92855eba8a7a5319ae913be2da6f957b0", + "reference": "810500e92855eba8a7a5319ae913be2da6f957b0", "shasum": "" }, "require": { @@ -6889,7 +6957,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.11" }, "funding": [ { @@ -6905,7 +6973,7 @@ "type": "tidelift" } ], - "time": "2023-05-11T05:14:45+00:00" + "time": "2023-08-19T07:10:56+00:00" }, { "name": "sebastian/cli-parser", @@ -7413,16 +7481,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -7465,7 +7533,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, "funding": [ { @@ -7473,7 +7541,7 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", From d22a5234fed26674ebe582c0b08e55c227e59799 Mon Sep 17 00:00:00 2001 From: Guergana Tzatchkova Date: Wed, 20 Sep 2023 15:46:03 +0200 Subject: [PATCH 02/28] Add db 'type' column to migration (#678) * Add column 'type' to migrations The seemingly unrelated CSV validation tests have been updated as well to test the change is working. To test the changes run sail artisan migrate:refresh --seed Bug: T313467 --- app/Models/Mismatch.php | 6 ++- config/imports.php | 6 ++- config/mismatches.php | 3 ++ database/factories/MismatchFactory.php | 11 ++++- ...9_103513_add_type_column_to_mismatches.php | 35 +++++++++++++++ tests/Feature/CSVImportReaderTest.php | 4 +- tests/Feature/ImportCSVTest.php | 4 +- tests/Feature/ValidateCSVTest.php | 43 ++++++++++--------- 8 files changed, 82 insertions(+), 30 deletions(-) create mode 100644 database/migrations/2023_09_19_103513_add_type_column_to_mismatches.php diff --git a/app/Models/Mismatch.php b/app/Models/Mismatch.php index de7ab903..5d32bf7e 100644 --- a/app/Models/Mismatch.php +++ b/app/Models/Mismatch.php @@ -22,7 +22,8 @@ class Mismatch extends Model 'meta_wikidata_value', 'external_value', 'external_url', - 'review_status' + 'review_status', + 'type' ]; /** @@ -31,7 +32,8 @@ class Mismatch extends Model * @var array */ protected $attributes = [ - 'review_status' => 'pending' + 'review_status' => 'pending', + 'type' => 'statement' ]; public function importMeta() diff --git a/config/imports.php b/config/imports.php index 8a08f4d2..76f19615 100644 --- a/config/imports.php +++ b/config/imports.php @@ -15,7 +15,8 @@ 'wikidata_value', 'meta_wikidata_value', 'external_value', - 'external_url' + 'external_url', + 'type' ] ], @@ -63,7 +64,8 @@ 'meta_wikidata_value', 'external_value', 'external_url', - 'review_status' + 'review_status', + 'type' ] ] ]; diff --git a/config/mismatches.php b/config/mismatches.php index 0478277b..aa5ee5cc 100644 --- a/config/mismatches.php +++ b/config/mismatches.php @@ -36,6 +36,9 @@ ], 'review_status' => [ 'accepted_values' => ['pending', 'wikidata', 'missing', 'external', 'both', 'none'] + ], + 'type' => [ + 'accepted_values' => ['statement', 'qualifier'] ] ], 'id_separator' => '|', diff --git a/database/factories/MismatchFactory.php b/database/factories/MismatchFactory.php index 314553af..968687f1 100644 --- a/database/factories/MismatchFactory.php +++ b/database/factories/MismatchFactory.php @@ -66,7 +66,8 @@ public function definition() return null; }, 'external_value'=> $this->getRandomValue(), - 'external_url' => $this->faker->optional(0.6)->url() + 'external_url' => $this->faker->optional(0.6)->url(), + 'type' => $this->getRandomMismatchType() ]; } @@ -167,4 +168,12 @@ static function ($propertyId) use ($datatype) { } )); } + + private function getRandomMismatchType() + { + return $this->faker->randomElement([ + 'statement', + 'qualifier' + ]); + } } diff --git a/database/migrations/2023_09_19_103513_add_type_column_to_mismatches.php b/database/migrations/2023_09_19_103513_add_type_column_to_mismatches.php new file mode 100644 index 00000000..7f01c172 --- /dev/null +++ b/database/migrations/2023_09_19_103513_add_type_column_to_mismatches.php @@ -0,0 +1,35 @@ +enum('type', [ + 'statement', + 'qualifier' + ])->default('statement'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('mismatches', function (Blueprint $table) { + $table->dropColumn('type'); + }); + } +} diff --git a/tests/Feature/CSVImportReaderTest.php b/tests/Feature/CSVImportReaderTest.php index 33591f0e..969012fd 100644 --- a/tests/Feature/CSVImportReaderTest.php +++ b/tests/Feature/CSVImportReaderTest.php @@ -40,9 +40,9 @@ public function test_parses_mismatch_lines($data) $fakeLines = [ ["some-item-id","some-statement-guid","some-pid" - ,"some-data","some-meta-data","more-data","a-url"], + ,"some-data","some-meta-data","more-data","a-url", "some-type"], ["another-item-id","another-statement-guid","another-pid" - ,"another-data","another-meta-data","different-data","no-url"] + ,"another-data","another-meta-data","different-data","no-url", "another-type"] ]; $fakeCSVContent = join("\n", array_map(function (array $line) { diff --git a/tests/Feature/ImportCSVTest.php b/tests/Feature/ImportCSVTest.php index 0286ca41..0b262959 100644 --- a/tests/Feature/ImportCSVTest.php +++ b/tests/Feature/ImportCSVTest.php @@ -27,9 +27,9 @@ public function test_creates_mismatches(): void $header = config('imports.upload.column_keys'); $lines = [ ["Q184746","Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5","P569","3 April 1934" - ,"Q12138","1934-04-03","https://d-nb.info/gnd/119004453"], + ,"Q12138","1934-04-03","https://d-nb.info/gnd/119004453","statement"], ["Q184746","Q184746$7200D1AD-E4E8-401B-8D57-8C823810F11F","P21","Q6581072" - ,"","nonbinary","https://www.imdb.com/name/nm0328762/"] + ,"","nonbinary","https://www.imdb.com/name/nm0328762/","statement"] ]; $content = join("\n", array_map(function (array $line) { diff --git a/tests/Feature/ValidateCSVTest.php b/tests/Feature/ValidateCSVTest.php index 5a685567..a619eabc 100644 --- a/tests/Feature/ValidateCSVTest.php +++ b/tests/Feature/ValidateCSVTest.php @@ -34,7 +34,7 @@ public function invalidLineProvider(): iterable function (array $config): array { return [ ',Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,P569' // Emulate missing item ID - . ',3 April 1934,,1934-04-03,http://www.example.com', // Ensure correct columns + . ',3 April 1934,,1934-04-03,http://www.example.com,statement', // Ensure correct columns __('validation.required', [ 'attribute' => 'item id' ]) @@ -49,7 +49,7 @@ function (array $config, Generator $faker): array { return [ $longQID // Emulate long item ID . ',Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,P569' // Ensure correct columns - . ',3 April 1934,,1934-04-03,http://www.example.com', // Ensure correct columns + . ',3 April 1934,,1934-04-03,http://www.example.com,', // Ensure correct columns __('validation.max.string', [ 'attribute' => 'item id', 'max' => $config['item_id']['max_length'] @@ -63,7 +63,7 @@ function (array $config): array { return [ 'q184746' // Emulate malformed item ID (must be initial-uppercase) . ',Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,P569' // Ensure correct columns - . ',3 April 1934,,1934-04-03,http://www.example.com', // Ensure correct columns + . ',3 April 1934,,1934-04-03,http://www.example.com,', // Ensure correct columns __('validation.regex', [ 'attribute' => 'item id' ]) @@ -75,7 +75,7 @@ function (array $config): array { function (array $config): array { return [ 'Q184746,,' // Emulate missing guid - . 'P569,3 April 1934,,1934-04-03,http://www.example.com', + . 'P569,3 April 1934,,1934-04-03,http://www.example.com,qualifier', __('validation.required_with', [ 'values' => 'wikidata value', 'attribute' => 'statement guid' @@ -91,7 +91,7 @@ function (array $config, Generator $faker): array { return [ 'Q184746,' . $longQID . '$' . $faker->uuid() . ',' // Emulate long guid - . 'P569,3 April 1934,,1934-04-03,http://www.example.com', // Ensure correct columns + . 'P569,3 April 1934,,1934-04-03,http://www.example.com,statement', // Ensure correct columns __('validation.max.string', [ 'attribute' => 'statement guid', 'max' => $config['guid']['max_length'] @@ -105,7 +105,7 @@ function (array $config): array { return [ 'Q184746,' . 'some-malformed-guid,' // Emulate malformed guid - . 'P569,3 April 1934,,1934-04-03,http://www.example.com', // Ensure correct columns + . 'P569,3 April 1934,,1934-04-03,http://www.example.com,qualifier', // Ensure correct columns __('validation.regex', [ 'attribute' => 'statement guid' ]) @@ -117,7 +117,7 @@ function (array $config): array { function (array $config): array { return [ 'Q91465763,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,' // Emulate inconsistent data - . 'P569,3 April 1934,,1934-04-03,http://www.example.com', // Ensure correct columns + . 'P569,3 April 1934,,1934-04-03,http://www.example.com,statement', // Ensure correct columns __('validation.statement_guid') ]; } @@ -127,7 +127,7 @@ function (array $config): array { function (array $config): array { return [ 'Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,,' // Emulate missing property id - . '3 April 1934,,1934-04-03,http://www.example.com', // Ensure correct columns + . '3 April 1934,,1934-04-03,http://www.example.com,statement', // Ensure correct columns __('validation.required', [ 'attribute' => 'property id' ]) @@ -142,7 +142,7 @@ function (array $config, Generator $faker): array { return [ 'Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,' // Ensure correct columns . $longPID . ',' // Emulate long pid - . '3 April 1934,,1934-04-03,http://www.example.com', // Ensure correct columns + . '3 April 1934,,1934-04-03,http://www.example.com,statement', // Ensure correct columns __('validation.max.string', [ 'attribute' => 'property id', 'max' => $config['pid']['max_length'] @@ -156,7 +156,7 @@ function (array $config): array { return [ 'Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,' // Ensure correct columns . 'some-malformed-pid,' // Emulate malformed pid - . '3 April 1934,,1934-04-03,http://www.example.com', // Ensure correct columns + . '3 April 1934,,1934-04-03,http://www.example.com,statement', // Ensure correct columns __('validation.regex', [ 'attribute' => 'property id' ]) @@ -168,7 +168,7 @@ function (array $config): array { function (array $config): array { return [ 'Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,P569' - . ',,,1934-04-03,http://www.example.com', // Emulate missing wikidata value + . ',,,1934-04-03,http://www.example.com,statement', // Emulate missing wikidata value __('validation.required_with', [ 'values' => 'statement guid', 'attribute' => 'wikidata value' @@ -181,7 +181,8 @@ function (array $config): array { function (array $config): array { return [ 'Q1462,Q1462$97120cf9-ff1b-37c9-8af6-89d0b44a1cf2,P5,' // Ensure correct columns - . '634463875,Q123,516380568,http://www.example.com', // Emulate invalid meta wikidata value + . '634463875,Q123,516380568,' // Emulate invalid meta wikidata value + . 'http://www.example.com,statement', __('validation.meta_wikidata_value') ]; } @@ -191,7 +192,7 @@ function (array $config): array { function (array $config): array { return [ 'Q1462,,P3150,' - . ',Q12138,1879-03-14,http://www.example.com', // Emulate invalid meta wikidata value + . ',Q12138,1879-03-14,http://www.example.com,qualifier', // Emulate invalid meta wikidata value __('validation.prohibited_if', [ 'attribute' => 'meta wikidata value', 'other' => 'wikidata value', @@ -207,7 +208,7 @@ function (array $config): array { return [ 'Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,P569,' // Ensure correct columns - . $longValue . ',,1934-04-03,http://www.example.com', // Emulate long wikidata value + . $longValue . ',,1934-04-03,http://www.example.com,statement', // Emulate long wikidata value __('validation.max.string', [ 'attribute' => 'wikidata value', 'max' => $config['wikidata_value']['max_length'] @@ -220,7 +221,7 @@ function (array $config): array { function (array $config): array { return [ 'Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,P569,3 April 1934' // Ensure correct columns - . ',,,http://www.example.com', // Emulate missing external data + . ',,,http://www.example.com,statement', // Emulate missing external data __('validation.required', [ 'attribute' => 'external value' ]) @@ -234,7 +235,7 @@ function (array $config, Generator $faker): array { return [ 'Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,P569,3 April 1934,,' // Ensure correct cols - . $longValue . ',http://www.example.com', // Emulate long value + . $longValue . ',http://www.example.com,statement', // Emulate long value __('validation.max.string', [ 'attribute' => 'external value', 'max' => $config['external_value']['max_length'] @@ -250,7 +251,7 @@ function (array $config, Generator $faker): array { return [ 'Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5' // Ensure correct cols . ',P569,3 April 1934,,1934-04-03,' // Ensure correct cols - . $longURL, // Emulate long url + . $longURL . ',statement', // Emulate long url __('validation.max.string', [ 'attribute' => 'external url', 'max' => $config['external_url']['max_length'] @@ -264,7 +265,7 @@ function (array $config): array { return [ 'Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5' // Ensure correct cols . ',P569,3 April 1934,,1934-04-03,' // Ensure correct cols - . 'i-am-not-your-gurl', + . 'i-am-not-your-gurl,', __('validation.url', [ 'attribute' => 'external url' ]) @@ -301,7 +302,7 @@ public function test_does_not_throw_on_generic_uuid(): void { // Ensure correct columns $line = 'Q4115189,Q4115189$ffa51229-4877-3135-a2e2-a22fe9b7039d' // Emulate non v4 UUID - . ',P569,3 April 1934,,1934-04-03,http://www.example.com'; + . ',P569,3 April 1934,,1934-04-03,http://www.example.com,statement'; // Emulate passed validation rule, as this is not the system under test $this->partialMock(WikidataValue::class, function (MockInterface $mock) { @@ -322,7 +323,7 @@ public function test_throws_on_malformed_wikidata_value(): void { // Ensure correct columns $line = 'Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,P569,invalid-wikidata-value,,' - . '1934-04-03,http://www.example.com'; + . '1934-04-03,http://www.example.com,statement'; $message = __('validation.wikidata_value', [ 'attribute' => 'wikidata value' ]); @@ -364,7 +365,7 @@ public function test_fails_on_thrown_exceptions(Closure $failSetup): void // Ensure rows $import = $this->createMockImport( - 'some-item-id,some-guid,some-pid,some-value,some-meta-value,another-value,a-url' + 'some-item-id,some-guid,some-pid,some-value,some-meta-value,another-value,a-url,a-type' ); try { From 315b5865f02849d2bdd7b4058b970232468e9b39 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Sat, 23 Sep 2023 22:00:34 +0530 Subject: [PATCH 03/28] Localisation updates from https://translatewiki.net. (#677) --- public/i18n/ru.json | 8 +++++++- public/i18n/sv.json | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/public/i18n/ru.json b/public/i18n/ru.json index a50aa648..334b885f 100644 --- a/public/i18n/ru.json +++ b/public/i18n/ru.json @@ -14,7 +14,10 @@ "log-in": "Войти", "log-out": "Выйти", "language-selector-options-menu-aria-label": "Языки", + "language-selector-mobile-header": "Выберите язык", + "language-selector-clear-button-label": "Очистить поле ввода", "language-selector-input-placeholder": "Поиск языков", + "language-selector-no-results": "Язык недоступен", "column-property": "Свойство", "column-wikidata-value": "Значение в Викиданных", "column-external-value": "Значение во внешнем источнике", @@ -27,6 +30,7 @@ "review-status-wikidata": "Неверные данные в Викиданных", "review-status-missing": "Отсутствуют данные в Викиданных", "review-status-both": "Оба неверны", + "results-page-title": "Что мне делать с несоответствиями?", "results-instructions-button": "Инструкции", "confirmation-dialog-title": "Следующие шаги", "results-full-description-button": "прочитать полное описание", @@ -35,6 +39,7 @@ "confirm-dialog-button": "Подтвердить", "results-back-button": "Найти ещё несоответствий", "faq-button": "Подробнее", + "faq-dialog-question-relevance": "Насколько актуальны эти несоответствия?", "faq-dialog-question-more-info": "Где я могу найти дополнительную информацию?", "wikidata-tool-footer-about-tool": "О $1", "wikidata-tool-footer-license": "Под лицензией $2", @@ -47,5 +52,6 @@ "mismatch-finder-footer-more-tools": "Ещё инструменты по работе с качеством данных", "tool-query-builder": "Конструктор запросов", "tool-item-quality-evaluator": "Оценка качества элементов", - "tool-curious-facts": "Любопытные факты" + "tool-curious-facts": "Любопытные факты", + "tool-constraints-violation-checker": "Проверка нарушения ограничений" } diff --git a/public/i18n/sv.json b/public/i18n/sv.json index 16f5d1a3..69dc88c3 100644 --- a/public/i18n/sv.json +++ b/public/i18n/sv.json @@ -3,7 +3,8 @@ "authors": [ "Jopparn", "Sabelöga", - "WikiPhoenix" + "WikiPhoenix", + "Yupik" ] }, "about-mismatch-finder-title": "Om verktyget", @@ -16,6 +17,7 @@ "log-in": "Logga in", "log-out": "Logga ut", "mismatch-finder-title": "Wikidata Mismatch Finder", + "language-selector-mobile-header": "Välj språk", "item-form-error-message-empty": "Ange objektsidentifierare som bör kontrolleras.", "item-form-error-message-max": "Minska antalet objektidentifierare för att vara inom gränsen ($1)", "item-form-error-message-invalid": "En eller fler objektidentifierare kunde inte bearbetats. Se till att bara lägga till en identifierare per rad, utan mellanslag eller komma. Objektidentifierare borde bara vara en uppsättning giltiga siffror som föregås av Q (exempelvis: Q80378).", From 81eb5ce908a7c8f37e12b76fbf1924d6d30173eb Mon Sep 17 00:00:00 2001 From: Guergana Tzatchkova Date: Tue, 26 Sep 2023 10:04:58 +0200 Subject: [PATCH 04/28] Add Download CSV button only on completed imports (#681) Bug: T335864 --- resources/views/importStatus.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/views/importStatus.blade.php b/resources/views/importStatus.blade.php index babb65bb..0a6b38e2 100644 --- a/resources/views/importStatus.blade.php +++ b/resources/views/importStatus.blade.php @@ -4,7 +4,9 @@ @foreach ($imports as $import)
-
{{__('store-layout.button:download-import-csv') }}
+ @if($import->status == 'completed') +
{{__('store-layout.button:download-import-csv') }}
+ @endif
{{ __('import-status.item:status') }}
{{ __('import-status.item:status.' . $import->status) }}
From 8759f6a4ade849833a7682f10f83ee78fda87273 Mon Sep 17 00:00:00 2001 From: Guergana Tzatchkova Date: Tue, 26 Sep 2023 15:24:17 +0200 Subject: [PATCH 05/28] Make footer stay at the bottom of the page aka sticky (#682) * Make footer stay at the bottom of the page aka sticky Bug: T344336 --- resources/js/Pages/Layout.vue | 7 +++++++ resources/sass/app.scss | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/resources/js/Pages/Layout.vue b/resources/js/Pages/Layout.vue index 39aefe96..2b70eaf1 100644 --- a/resources/js/Pages/Layout.vue +++ b/resources/js/Pages/Layout.vue @@ -181,8 +181,15 @@ export default defineComponent({ @import '~@wmde/wikit-tokens/dist/_variables.scss'; .website { + box-sizing: border-box; + min-height: 100%; + display: flex; + flex-direction: column; + .content-wrap { max-width: 1168px; + width: 100%; + flex-grow: 1; } .mismatch-finder-logo { diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 30d46df6..ba5e83af 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -5,8 +5,13 @@ @import '~@wmde/wikit-tokens/dist/_variables.scss'; @import './_typography.scss'; +html { + height: 100%; +} + body { @include body-text; + height: 100%; } /** From c0b42b13aba79637c5d9fd24b33c734b616b51af Mon Sep 17 00:00:00 2001 From: Guergana Tzatchkova Date: Tue, 26 Sep 2023 15:26:55 +0200 Subject: [PATCH 06/28] Update docs and exampleMismatchFile to account for new type column (#679) * Update docs and exampleMismatchFile to account for new type column Bug: T313467 --------- Co-authored-by: noa --- app/Jobs/ImportCSV.php | 3 +++ app/Jobs/ValidateCSV.php | 4 ++++ docs/AdminGuide.md | 1 + docs/UserGuide.md | 3 ++- docs/exampleMismatchFile.csv | 18 +++++++++--------- tests/Feature/ValidateCSVTest.php | 12 ++++++++++++ 6 files changed, 31 insertions(+), 10 deletions(-) diff --git a/app/Jobs/ImportCSV.php b/app/Jobs/ImportCSV.php index 3b2b6bff..ef926ce1 100644 --- a/app/Jobs/ImportCSV.php +++ b/app/Jobs/ImportCSV.php @@ -49,6 +49,9 @@ public function handle(CSVImportReader $reader) DB::transaction(function () use ($reader, $filepath) { $reader->lines($filepath)->each(function ($mismatchLine) { $mismatch = Mismatch::make($mismatchLine); + if ($mismatch->type == null) { + $mismatch->type = 'statement'; + } $mismatch->importMeta()->associate($this->meta); $mismatch->save(); }); diff --git a/app/Jobs/ValidateCSV.php b/app/Jobs/ValidateCSV.php index e7fc7679..57e0c6e8 100644 --- a/app/Jobs/ValidateCSV.php +++ b/app/Jobs/ValidateCSV.php @@ -136,6 +136,10 @@ private function checkFieldErrors($mismatch): ?string 'prohibited_if:wikidata_value,', 'max:' . $rules['meta_wikidata_value']['max_length'], 'regex:' . $rules['meta_wikidata_value']['format'] + ], + 'type' => [ + 'string', + 'in:' . implode(',', $rules['type']['accepted_values']), ] ]); diff --git a/docs/AdminGuide.md b/docs/AdminGuide.md index 3b7fec85..2eb7f8ee 100644 --- a/docs/AdminGuide.md +++ b/docs/AdminGuide.md @@ -108,6 +108,7 @@ Example entry: "review_status_old": "pending", "review_status_new": "wikidata", "time": "2021-10-05 14:44:59", + "type": "statement" } ``` diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 755972f0..e289ea95 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -48,7 +48,7 @@ Users which have sufficient access rights may perform batch imports into the Mis A CSV import file must include the following header row, to describe each column: ```csv -item_id,statement_guid,property_id,wikidata_value,meta_wikidata_value,external_value,external_url +item_id,statement_guid,property_id,wikidata_value,meta_wikidata_value,external_value,external_url,type ``` * `item_id` - The item ID of the Wikidata item containing the mismatching statement. @@ -61,6 +61,7 @@ item_id,statement_guid,property_id,wikidata_value,meta_wikidata_value,external_v * `meta_wikidata_value` - _(Optional)_ The value on wikidata that represents property calendar/time type. * `external_value` - The value in the external database that mismatches a wikidata value. * `external_url` - _(Optional)_ A url or uri to the mismatching entity in the external database. +* `type` - _(Optional)_ A string that contains either the value 'statement' or the value 'qualifier' to indicate where the mismatch occurs. If left empty a value of 'statement' will be assumed. _**Note**: The data `wikidata_value`, `external_value`, `external_url` should be limited to a length of 1500 characters maximum._ diff --git a/docs/exampleMismatchFile.csv b/docs/exampleMismatchFile.csv index 52aafcfa..95c92430 100644 --- a/docs/exampleMismatchFile.csv +++ b/docs/exampleMismatchFile.csv @@ -1,9 +1,9 @@ -item_id,statement_guid,property_id,wikidata_value,meta_wikidata_value,external_value,external_url -Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,P569,3 April 1934,,1934-04-03,http://fake.source.url/12345 -Q184746,Q184746$7200D1AD-E4E8-401B-8D57-8C823810F11F,P21,Q6581072,,nonbinary,http://fake.source.url/12345 -Q184746,Q184746$417B1AD5-396D-471E-8F9F-D45619EDBE85,P101,Q7155,,Anthropologist, -Q184746,Q184746$E347266B-AE85-4D91-84D9-442B28F6C33C,P937,Q170478,,Congo, -Q184746,,P106,,,primatologist, -Q9391,Q9391$87CB9756-0941-40D1-816F-EA10535DCF83,P20,Q350,,Dublin, -Q9391,Q9391$A095A4AD-091B-4BC8-809E-7FF5CBD75034,P21,Q6581097,,nonbinary, -Q7243,Q7243$5377d420-4e08-9095-6ec4-cd406d98e2f9,P569,1828-08-28,Q1985786,28 August 1828 (Julian), +item_id,statement_guid,property_id,wikidata_value,meta_wikidata_value,external_value,external_url,type +Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,P569,3 April 1934,,1934-04-03,http://fake.source.url/12345,statement +Q184746,Q184746$7200D1AD-E4E8-401B-8D57-8C823810F11F,P21,Q6581072,,nonbinary,http://fake.source.url/12345,statement +Q184746,Q184746$417B1AD5-396D-471E-8F9F-D45619EDBE85,P101,Q7155,,Anthropologist,,qualifier +Q184746,Q184746$E347266B-AE85-4D91-84D9-442B28F6C33C,P937,Q170478,,Congo,, +Q184746,,P106,,,primatologist,,statement +Q9391,Q9391$87CB9756-0941-40D1-816F-EA10535DCF83,P20,Q350,,Dublin,,qualifier +Q9391,Q9391$A095A4AD-091B-4BC8-809E-7FF5CBD75034,P21,Q6581097,,nonbinary,,statement +Q7243,Q7243$5377d420-4e08-9095-6ec4-cd406d98e2f9,P569,1828-08-28,Q1985786,28 August 1828 (Julian),,statement diff --git a/tests/Feature/ValidateCSVTest.php b/tests/Feature/ValidateCSVTest.php index a619eabc..735cc804 100644 --- a/tests/Feature/ValidateCSVTest.php +++ b/tests/Feature/ValidateCSVTest.php @@ -272,6 +272,18 @@ function (array $config): array { ]; } ]; + + yield 'invalid type value' => [ + function (array $config): array { + return [ + 'Q184746,Q184746$7814880A-A6EF-40EC-885E-F46DD58C8DC5,P569,' // Ensure correct columns + . '3 April 1934,,1934-04-03,http://www.example.com,potato', // Ensure correct columns + __('validation.in', [ + 'attribute' => 'type' + ]) + ]; + } + ]; } /** From 00ddab47abfb4040cfea363765b6d54217f24b80 Mon Sep 17 00:00:00 2001 From: Guergana Tzatchkova Date: Thu, 28 Sep 2023 13:13:06 +0200 Subject: [PATCH 07/28] Add concurrency to github staging workflow (#683) * Add concurrency to github workflows Bug: T345857 --- .github/workflows/deploy-app-staging.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy-app-staging.yml b/.github/workflows/deploy-app-staging.yml index 5a7e83ee..281020a0 100644 --- a/.github/workflows/deploy-app-staging.yml +++ b/.github/workflows/deploy-app-staging.yml @@ -7,6 +7,10 @@ on: - staging/** - gh-actions/** +concurrency: + group: '${{ github.workflow }}' + cancel-in-progress: true + jobs: build-deploy: name: Ship and Deploy From edbc1c1cc5478a6230786a5c974b0055fb7a5bde Mon Sep 17 00:00:00 2001 From: Itamar Givon Date: Wed, 4 Oct 2023 10:45:56 +0200 Subject: [PATCH 08/28] Prevent `gh-action` branches from deplying to production (#700) --- .github/workflows/deploy-app.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-app.yml b/.github/workflows/deploy-app.yml index bfebee20..b7e1b35c 100644 --- a/.github/workflows/deploy-app.yml +++ b/.github/workflows/deploy-app.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - gh-actions/** jobs: build-deploy: From 23441e7f422fa2cfcce5fd6d9238c90c59f70a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Akg=C3=BCn?= Date: Fri, 6 Oct 2023 10:17:29 +0200 Subject: [PATCH 09/28] Add custom noscript page for Javascript disabled browsers (#686) * Add custom noscript page for Javascript disabled browsers * Move noscript to a separate file and update codex-design-tokens scss import Bug: T343344 --- package-lock.json | 100 +++++++++++++++++++++++++++++ package.json | 8 +++ public/mix-manifest.json | 1 + resources/sass/noscript.scss | 65 +++++++++++++++++++ resources/views/app.blade.php | 4 ++ resources/views/noscript.blade.php | 20 ++++++ webpack.mix.js | 1 + 7 files changed, 199 insertions(+) create mode 100644 resources/sass/noscript.scss create mode 100644 resources/views/noscript.blade.php diff --git a/package-lock.json b/package-lock.json index b02c45e7..2caf434e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,6 +25,9 @@ "@vue/eslint-config-typescript": "^11.0.3", "@vue/test-utils": "^1.3.6", "@vue/vue2-jest": "^29.2.6", + "@wikimedia/codex": "^0.20.0", + "@wikimedia/codex-design-tokens": "^0.20.0", + "@wikimedia/codex-icons": "^0.20.0", "@wikimedia/language-data": "^1.1.4", "axios": "^1.5.0", "axios-mock-adapter": "^1.21.4", @@ -1932,6 +1935,41 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@floating-ui/core": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.0.tgz", + "integrity": "sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==", + "dev": true, + "dependencies": { + "@floating-ui/utils": "^0.1.3" + } + }, + "node_modules/@floating-ui/dom": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.3.tgz", + "integrity": "sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==", + "dev": true, + "dependencies": { + "@floating-ui/core": "^1.4.2", + "@floating-ui/utils": "^0.1.3" + } + }, + "node_modules/@floating-ui/utils": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.4.tgz", + "integrity": "sha512-qprfWkn82Iw821mcKofJ5Pk9wgioHicxcQMxx+5zt5GSKoqdWvgG5AxVmpmUUjzTLPVSH5auBrhI93Deayn/DA==", + "dev": true + }, + "node_modules/@floating-ui/vue": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@floating-ui/vue/-/vue-1.0.2.tgz", + "integrity": "sha512-sImlAl9mAoCKZLNlwWz2P2ZMJIDlOEDXrRD6aD2sIHAka1LPC+nWtB+D3lPe7IE7FGWSbwBPTnlSdlABa3Fr0A==", + "dev": true, + "dependencies": { + "@floating-ui/dom": "^1.4.5", + "vue-demi": ">=0.13.0" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", @@ -3899,6 +3937,42 @@ } } }, + "node_modules/@wikimedia/codex": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@wikimedia/codex/-/codex-0.20.0.tgz", + "integrity": "sha512-zsK/oOS/V3ltC5fBTh0BSC3bQaERsk5SLfcTkNdFDbOdDvVlyS4NeUKrZNEVNg/sL5DipL8Bogyfuglm36f7iw==", + "dev": true, + "dependencies": { + "@floating-ui/vue": "^1.0.2" + }, + "engines": { + "node": ">=16", + "npm": ">=7.21.0" + }, + "peerDependencies": { + "vue": "^3.2.37" + } + }, + "node_modules/@wikimedia/codex-design-tokens": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@wikimedia/codex-design-tokens/-/codex-design-tokens-0.20.0.tgz", + "integrity": "sha512-uLKt76q7gUnDuzmODyEb54MO9VyrsRXhtRBJxxXEtjyD5jxKMacNK36tJ1JV2bpHD7ETVR1jvMwgjWqR43NUzA==", + "dev": true, + "engines": { + "node": ">=16", + "npm": ">=7.21.0" + } + }, + "node_modules/@wikimedia/codex-icons": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@wikimedia/codex-icons/-/codex-icons-0.20.0.tgz", + "integrity": "sha512-iuOY0BZut7dtTIXBpG3A8XabEERpQM2yhlmWlBnOg4XxTDpPuZe87Tz3lUavdM6jIaMgqGaEFr203J5SWIfLaw==", + "dev": true, + "engines": { + "node": ">=16", + "npm": ">=7.21.0" + } + }, "node_modules/@wikimedia/language-data": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@wikimedia/language-data/-/language-data-1.1.4.tgz", @@ -14387,6 +14461,32 @@ "banana-i18n": "^2.2.0" } }, + "node_modules/vue-demi": { + "version": "0.14.6", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz", + "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==", + "dev": true, + "hasInstallScript": true, + "bin": { + "vue-demi-fix": "bin/vue-demi-fix.js", + "vue-demi-switch": "bin/vue-demi-switch.js" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "@vue/composition-api": "^1.0.0-rc.1", + "vue": "^3.0.0-0 || ^2.6.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, "node_modules/vue-eslint-parser": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.3.1.tgz", diff --git a/package.json b/package.json index bb4ae3c2..ccd2d5c8 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@vue/eslint-config-typescript": "^11.0.3", "@vue/test-utils": "^1.3.6", "@vue/vue2-jest": "^29.2.6", + "@wikimedia/codex": "^0.20.0", + "@wikimedia/codex-design-tokens": "^0.20.0", + "@wikimedia/codex-icons": "^0.20.0", "@wikimedia/language-data": "^1.1.4", "axios": "^1.5.0", "axios-mock-adapter": "^1.21.4", @@ -53,5 +56,10 @@ "vue": "^2.6.14", "vue-banana-i18n": "1.5.0", "vuex": "^3.6.2" + }, + "overrides": { + "@wikimedia/codex": { + "vue": "^2.6.14" + } } } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index e8ce1fa5..6f8b4772 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,5 +1,6 @@ { "/js/app.js": "/js/app.js", + "/css/noscript.css": "/css/noscript.css", "/css/app.css": "/css/app.css", "/images/clear.svg": "/images/clear.svg", "/images/close.svg": "/images/close.svg", diff --git a/resources/sass/noscript.scss b/resources/sass/noscript.scss new file mode 100644 index 00000000..0b767961 --- /dev/null +++ b/resources/sass/noscript.scss @@ -0,0 +1,65 @@ +@import '~@wikimedia/codex/dist/codex.style.css'; +@import '~@wikimedia/codex/dist/codex.style-rtl.css'; +@import '~@wikimedia/codex-design-tokens/theme-wikimedia-ui.scss'; + +$spacing-layout-50: 0.5rem; +$spacing-layout-100: 1rem; +$spacing-layout-150: 1.5rem; +$spacing-layout-200: 2rem; +$spacing-layout-900: 9rem; + +main { + font-size: $font-size-medium; + line-height: $line-height-medium; + font-family: $font-family-system-sans; + font-weight: $font-weight-normal; + color: $color-base; + padding: 10vw $spacing-layout-150 $spacing-layout-150 $spacing-layout-150; + max-width: 680px; + + @media (min-width: $min-width-breakpoint-tablet) { + padding: 10vw $spacing-layout-200 $spacing-layout-200 $spacing-layout-200; + } + @media (min-width: $min-width-breakpoint-desktop) { + padding: $spacing-layout-900 0 $spacing-layout-150 0; + } + p { + margin-block-end: 0; + } + .h5 { + margin: $spacing-layout-150 0; + font-size: $font-size-medium; + line-height: $line-height-xxx-small; + font-family: $font-family-system-sans; + font-weight: $font-weight-bold; + color: $color-emphasized; + } + .message-wrapper { + padding: $spacing-layout-50 0; + @media (min-width: $min-width-breakpoint-tablet) { + padding: $spacing-layout-100 0; + } + } + .description { + padding-block-end: $spacing-layout-150; + } + header { + .logo-link { + width: $size-full; + } + .mismatch-finder-logo { + background-image: url('/images/mismatch-finder-logo_mobile.svg'); + width: $size-full; + height: 24px; + background-size: contain; + + @media (min-width: $min-width-breakpoint-tablet) { + background-image: url('/images/mismatch-finder-logo.svg'); + max-width: 384px; + height: 24px; + } + } + justify-content: center; + } +} + diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index 6068057e..49ac1872 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -5,6 +5,10 @@ + + @inertia diff --git a/resources/views/noscript.blade.php b/resources/views/noscript.blade.php new file mode 100644 index 00000000..b395196b --- /dev/null +++ b/resources/views/noscript.blade.php @@ -0,0 +1,20 @@ +Mismatch Finder + +
+
+ +
+
+ +
+
+

About Mismatch Finder

+

Mismatch Finder shows you data in Wikidata that differs from the data in other databases, catalogs or websites. You can use this tool to review and correct said mismatches. More information

+
+
diff --git a/webpack.mix.js b/webpack.mix.js index 88faf288..4b16bf8d 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -14,5 +14,6 @@ const mix = require('laravel-mix'); mix.ts('resources/js/app.ts', 'public/js') .vue({ version: 2 }) .sass('resources/sass/app.scss', 'public/css') + .sass('resources/sass/noscript.scss', 'public/css') .copyDirectory('resources/img', 'public/images') .sourceMaps(false); // False prevents source maps in production From 8188cecfeacbe4031b229aaba48d973dabad7ae8 Mon Sep 17 00:00:00 2001 From: Guergana Tzatchkova Date: Mon, 9 Oct 2023 15:46:00 +0530 Subject: [PATCH 10/28] Add concurrency to production workflow (#708) Bug: T345857 --- .github/workflows/deploy-app.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy-app.yml b/.github/workflows/deploy-app.yml index b7e1b35c..af83e834 100644 --- a/.github/workflows/deploy-app.yml +++ b/.github/workflows/deploy-app.yml @@ -5,6 +5,10 @@ on: branches: - main +concurrency: + group: '${{ github.workflow }}' + cancel-in-progress: true + jobs: build-deploy: name: Ship and Deploy From 72f172182c7fefa95043d7748ed72ee28ec2e7b2 Mon Sep 17 00:00:00 2001 From: Guergana Tzatchkova Date: Mon, 9 Oct 2023 18:43:33 +0530 Subject: [PATCH 11/28] Add type column gui (#687) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: T313467 --- public/i18n/ban.json | 2 +- public/i18n/bn.json | 2 +- public/i18n/ca.json | 2 +- public/i18n/de.json | 2 +- public/i18n/en.json | 4 ++- public/i18n/es.json | 2 +- public/i18n/fr.json | 2 +- public/i18n/gl.json | 2 +- public/i18n/he.json | 2 +- public/i18n/ia.json | 2 +- public/i18n/id.json | 2 +- public/i18n/it.json | 2 +- public/i18n/lt.json | 2 +- public/i18n/mk.json | 2 +- public/i18n/ms.json | 2 +- public/i18n/nb.json | 2 +- public/i18n/pl.json | 2 +- public/i18n/qqq.json | 4 ++- public/i18n/ru.json | 2 +- public/i18n/sl.json | 2 +- public/i18n/sr-ec.json | 2 +- public/i18n/sv.json | 2 +- public/i18n/tr.json | 2 +- public/i18n/zh-hant.json | 2 +- resources/js/Components/MismatchRow.vue | 10 +++++++- resources/js/Components/MismatchesTable.vue | 12 +++++---- tests/Vue/Components/MismatchRow.spec.js | 28 +++++++++++++++++++++ 27 files changed, 72 insertions(+), 30 deletions(-) diff --git a/public/i18n/ban.json b/public/i18n/ban.json index 5da24784..c97999fa 100644 --- a/public/i18n/ban.json +++ b/public/i18n/ban.json @@ -9,7 +9,7 @@ "item-form-id-input-placeholder": "Sekadi:\nQ80378\nQ33602\nQ1459\nQ4524", "log-in": "Manjing log", "log-out": "Medal log", - "column-property": "Atribut", + "column-mismatch": "Atribut", "column-wikidata-value": "Aji ring Wikidata", "column-external-value": "Aji ring wit jaba", "column-review-status": "Status", diff --git a/public/i18n/bn.json b/public/i18n/bn.json index ed846de6..00e56a52 100644 --- a/public/i18n/bn.json +++ b/public/i18n/bn.json @@ -10,7 +10,7 @@ "log-out": "প্রস্থান করুন", "language-selector-options-menu-aria-label": "ভাষা", "language-selector-mobile-header": "একটি ভাষা নির্বাচন করুন", - "column-property": "বৈশিষ্ট্য", + "column-mismatch": "বৈশিষ্ট্য", "column-review-status": "স্থিতি", "column-upload-info": "আপলোডের তথ্য", "column-external-source": "বহিঃউৎস", diff --git a/public/i18n/ca.json b/public/i18n/ca.json index f490a125..c8c28730 100644 --- a/public/i18n/ca.json +++ b/public/i18n/ca.json @@ -18,7 +18,7 @@ "language-selector-close-button-label": "Tanca el selector d'idiomes", "language-selector-input-placeholder": "Cerca idiomes", "language-selector-no-results": "Idioma no disponible", - "column-property": "Propietat", + "column-mismatch": "Propietat", "column-wikidata-value": "Valor a Wikidata", "column-external-value": "Valor a la font externa", "column-review-status": "Estat", diff --git a/public/i18n/de.json b/public/i18n/de.json index 0ce368cb..724c6a5e 100644 --- a/public/i18n/de.json +++ b/public/i18n/de.json @@ -19,7 +19,7 @@ "item-form-error-message-max": "Bitte reduziere die Anzahl der Positionsbezeichnungen auf das Limit ($1)", "item-form-error-message-invalid": "Ein oder mehrere Positionsbezeichner konnten nicht verarbeitet werden. Achte bitte darauf, dass du nur eine Kennung pro Zeile angibst, ohne Leerzeichen oder Kommas. Die Positionsbezeichner sollten nur aus einer Reihe gültiger Zahlen bestehen, denen der Buchstabe Q vorangestellt wird (zum Beispiel: Q80378).", "server-error": "Der Server ist auf einen temporären Fehler gestoßen und konnte deine Anfrage nicht abschließen. Bitte versuche es noch einmal.", - "column-property": "Eigenschaft", + "column-mismatch": "Eigenschaft", "column-wikidata-value": "Wert auf Wikidata", "column-external-value": "Wert in externer Quelle", "column-review-status": "Status", diff --git a/public/i18n/en.json b/public/i18n/en.json index 093f77e2..e318bfc8 100644 --- a/public/i18n/en.json +++ b/public/i18n/en.json @@ -27,7 +27,8 @@ "item-form-error-message-max": "Please reduce the number of Item identifiers to fit the limit ($1)", "item-form-error-message-invalid": "One or more Item identifiers couldn't be processed. Please make sure to add only one identifier per line, without spaces or commas. Item identifiers should only be a set of valid numbers preceded by the letter Q (for example: Q80378).", "server-error": "The server encountered a temporary error and could not complete your request. Please try again.", - "column-property": "Property", + "column-mismatch": "Mismatch", + "column-type": "Type", "column-wikidata-value": "Value on Wikidata", "column-external-value": "Value on external source", "column-review-status": "Status", @@ -36,6 +37,7 @@ "no-mismatches-found-message": "No mismatches have been found for:", "random-mismatches": "Random mismatches", "empty-value": "None", + "statement": "statement", "no-mismatches-available-for-review": "There are currently no mismatches available for review.", "review-status-pending": "Awaiting review", "review-status-wikidata": "Wrong data on Wikidata", diff --git a/public/i18n/es.json b/public/i18n/es.json index 50669c7c..c9d43809 100644 --- a/public/i18n/es.json +++ b/public/i18n/es.json @@ -9,7 +9,7 @@ "item-form-submit": "Comprobar elementos", "log-in": "Acceder", "log-out": "Salir", - "column-property": "Propiedad", + "column-mismatch": "Propiedad", "column-wikidata-value": "Valor en Wikidata", "column-external-value": "Valor en la fuente externa", "column-review-status": "Estado", diff --git a/public/i18n/fr.json b/public/i18n/fr.json index e3252a19..08cb7e66 100644 --- a/public/i18n/fr.json +++ b/public/i18n/fr.json @@ -25,7 +25,7 @@ "item-form-error-message-max": "Veuillez réduire le nombre d’identifiants d’élément pour respecter la limite ($1)", "item-form-error-message-invalid": "Au moins un des identifiants d’élément n’a pas pu être traité. Assurez-vous d’ajouter un seul identifiant par ligne, sans espaces ni virgules. Les identifiants d’élément doivent être uniquement un ensemble de nombres valides précédés de la lettre Q (par exemple : Q80378).", "server-error": "Le serveur a rencontré une erreur temporaire et n’a pas pu exécuter votre requête. Veuillez essayer à nouveau.", - "column-property": "Propriété", + "column-mismatch": "Propriété", "column-wikidata-value": "Valeur sur Wikidata", "column-external-value": "Valeur sur la source externe", "column-review-status": "État", diff --git a/public/i18n/gl.json b/public/i18n/gl.json index 59eeb206..a53fc9d9 100644 --- a/public/i18n/gl.json +++ b/public/i18n/gl.json @@ -24,7 +24,7 @@ "item-form-error-message-max": "Reduza o número de identificadores de elementos para respectar o límite ($1)", "item-form-error-message-invalid": "Non se puideron procesar un ou máis identificadores de elementos. Asegúrese de engadir só un identificador por liña, sen espazos nin comas. Os identificadores de elementos son un conxunto de números válidos precedidos da letra Q (por exemplo, Q80378).", "server-error": "O servidor atopou un erro temporal e non puido completar a súa solicitude. Por favor, inténteo de novo.", - "column-property": "Propiedade", + "column-mismatch": "Propiedade", "column-wikidata-value": "Valor en Wikidata", "column-external-value": "Valor na fonte externa", "column-review-status": "Estado", diff --git a/public/i18n/he.json b/public/i18n/he.json index 944c587f..0da06c55 100644 --- a/public/i18n/he.json +++ b/public/i18n/he.json @@ -24,7 +24,7 @@ "item-form-error-message-max": "נא לצמצם את מספר מזהי הפריטים כך שיתאימו למגבלה ($1)", "item-form-error-message-invalid": "לא היה אפשר לעבד מזהה פריט אחד או יותר. נא להקפיד להוסיף רק מזהה אחד בכל שורה, ללא רווחים או פסיקים. מזהי פריט צריכים להיות רק קבוצה של מספרים תקינים שלפניהם האות Q (לדוגמה: Q80378).", "server-error": "השרת נתקל השגיאה זמנית ואינו יכול להשלים את הבקשה שלך. נא לנסות שוב.", - "column-property": "מאפיין", + "column-mismatch": "מאפיין", "column-wikidata-value": "ערך בוויקינתונים", "column-external-value": "ערך במקור חיצוני", "column-review-status": "מצב", diff --git a/public/i18n/ia.json b/public/i18n/ia.json index b31be127..749a2cc8 100644 --- a/public/i18n/ia.json +++ b/public/i18n/ia.json @@ -24,7 +24,7 @@ "item-form-error-message-max": "Per favor reduce le numero de identificatores de elemento pro respectar le limite ($1)", "item-form-error-message-invalid": "Un o plus identificatores de elemento non poteva esser processate. Per favor assecura te de adder solmente un identificator per linea, sin spatios o commas. Identificatores de elemento debe esser un sequentia de cifras precedite per le littera Q (per exemplo: Q80378).", "server-error": "Le servitor incontrava un error temporari e non poteva completar tu requesta. Per favor, prova lo de novo.", - "column-property": "Proprietate", + "column-mismatch": "Proprietate", "column-wikidata-value": "Valor sur Wikidata", "column-external-value": "Valor sur le fonte externe", "column-review-status": "Stato", diff --git a/public/i18n/id.json b/public/i18n/id.json index e776610b..72012b84 100644 --- a/public/i18n/id.json +++ b/public/i18n/id.json @@ -11,7 +11,7 @@ "item-form-submit": "Cek Butir", "log-in": "Masuk log", "log-out": "Keluar log", - "column-property": "Atribut", + "column-mismatch": "Atribut", "column-wikidata-value": "Nilai di Wikidata", "column-external-value": "Nilai di sumber luar", "column-review-status": "Status", diff --git a/public/i18n/it.json b/public/i18n/it.json index 74d40758..f825d847 100644 --- a/public/i18n/it.json +++ b/public/i18n/it.json @@ -16,7 +16,7 @@ "language-selector-close-button-label": "Chiudi il selettore della lingua", "language-selector-input-placeholder": "Cerca lingue", "language-selector-no-results": "Lingua non disponibile", - "column-property": "Proprietà", + "column-mismatch": "Proprietà", "column-wikidata-value": "Valore su Wikidata", "column-review-status": "Stato", "empty-value": "Nessuno", diff --git a/public/i18n/lt.json b/public/i18n/lt.json index 7239cc28..7d7e9f36 100644 --- a/public/i18n/lt.json +++ b/public/i18n/lt.json @@ -16,7 +16,7 @@ "item-form-error-message-max": "Prašome sumažinti elementų identifikatorių skaičių iki limito ($1)", "item-form-error-message-invalid": "Vienas ar daugiau elementų indentifikatorų negali būti apdorotas. Prašome užtikrnti, kad pridėjote po vieną identifikatorių eilutėje be tarpų ar kablelių. Elementų identifikatoriais turėtų būti tinkamų skaičių rinkiniai su Q raidės priešdėliu (pvz.: Q80378).", "server-error": "Serveris susidūrė su laikina klaida ir negalėjo įvykdyti jūsų užklausos. Prašome pabandyti dar kartą.", - "column-property": "Savybė", + "column-mismatch": "Savybė", "column-wikidata-value": "Reikmė Vikiduomenyse", "column-external-value": "Reikšmė išorės šaltinyje", "column-review-status": "Būsena", diff --git a/public/i18n/mk.json b/public/i18n/mk.json index 95098e66..91344f30 100644 --- a/public/i18n/mk.json +++ b/public/i18n/mk.json @@ -24,7 +24,7 @@ "item-form-error-message-max": "Смалете го бројот на предмети. Ограничени сте на $1.", "item-form-error-message-invalid": "Не можев да обработам една или повеќе назнаки на предмети. Погрижете се секоја да стои самостојно во нов ред, без празни места или запирки. Назнаката треба да се состои само од важечки цифри со буквата Q пред нив (на пример: Q80378).", "server-error": "Опслужувачот наиде на привремена грешка и затоа не можеше да го исполни вашето барање. Обидете се повторно.", - "column-property": "Својство", + "column-mismatch": "Својство", "column-wikidata-value": "Вредност на Википодатоците", "column-external-value": "Вредност на надворешниот извор", "column-review-status": "Состојба", diff --git a/public/i18n/ms.json b/public/i18n/ms.json index 3d27d169..66eed230 100644 --- a/public/i18n/ms.json +++ b/public/i18n/ms.json @@ -25,7 +25,7 @@ "item-form-error-message-max": "Sila kurangkan bilangan pengecam Item agar sesuai dengan had ($1)", "item-form-error-message-invalid": "Satu atau lebih pengecam Item tidak dapat diproses. Sila pastikan anda menambah hanya satu pengecam untuk setiap baris, tanpa ruang atau koma. Pengecam item hendaklah hanya satu set nombor yang sah didahului oleh huruf Q (contohnya: Q80378).", "server-error": "Pelayan mengalami ralat sementara dan tidak dapat menyelesaikan permintaan anda. Sila cuba lagi.", - "column-property": "Sifat", + "column-mismatch": "Sifat", "column-wikidata-value": "Nilai di Wikidata", "column-external-value": "Nilai di sumber luar", "column-review-status": "Status", diff --git a/public/i18n/nb.json b/public/i18n/nb.json index 00a75ff1..86e58f81 100644 --- a/public/i18n/nb.json +++ b/public/i18n/nb.json @@ -24,7 +24,7 @@ "item-form-error-message-max": "Reduser antallet elementidentifikatorer for å passe grensen ($1)", "item-form-error-message-invalid": "En eller flere elementidentifikatorer kunne ikke sjekkes. Dobbeltsjekk at det kun er én identifikator per linje, uten mellomrom eller komma. Elementidentifikatorene burde kun være et sett gyldige tall med Q-prefiksen (for eksempel: Q80378).", "server-error": "Tjeneren støtte på en midlertidig feil og kunne ikke fullføre forespørselen din. Prøv igjen.", - "column-property": "Egenskap", + "column-mismatch": "Egenskap", "column-wikidata-value": "Verdi på Wikidata", "column-external-value": "Verdi i ekstern kilde", "column-review-status": "Status", diff --git a/public/i18n/pl.json b/public/i18n/pl.json index f94693c5..df81b72f 100644 --- a/public/i18n/pl.json +++ b/public/i18n/pl.json @@ -21,7 +21,7 @@ "language-selector-input-placeholder": "Szukaj języków", "language-selector-no-results": "Język nie jest dostępny", "server-error": "Serwer napotkał problem i nie mógł zrealizować Twojego żądania. Proszę spróbować ponownie.", - "column-property": "Właściwość", + "column-mismatch": "Właściwość", "column-wikidata-value": "Wartość w Wikidanych", "column-external-value": "Wartość z zewnętrznego źródła", "column-review-status": "Status", diff --git a/public/i18n/qqq.json b/public/i18n/qqq.json index a6ca99cc..f6706796 100644 --- a/public/i18n/qqq.json +++ b/public/i18n/qqq.json @@ -25,7 +25,8 @@ "item-form-error-message-max": "An error message when too many item ids are provided", "item-form-error-message-invalid": "An error message when invalid Item ids are provided", "server-error": "An error message when the server encountered an error retrieving results", - "column-property": "Property column on mismatches table", + "column-mismatch": "Mismatch column on mismatches table", + "column-type": "Type column on mismatches table", "column-wikidata-value": "Wikidata value column on mismatches table", "column-external-value": "External source column on mismatches table", "column-review-status": "The mismatch review decision column on mismatches table", @@ -34,6 +35,7 @@ "no-mismatches-found-message": "A message when no mismatches have been found for the provided Item Ids", "random-mismatches": "The call to action for retrieving random mismatches", "empty-value": "Label for empty value in Mismatch Row column 'Value on Wikidata'", + "statement": "Label for statement when value is empty in database in Mismatch Row column 'Type'", "no-mismatches-available-for-review": "A message when no unreviewed mismatches have been found. This message can be displayed when searching for random mismatches", "review-status-pending": "Label for pending review status. Default value for all un-reviewed mismatches", "review-status-wikidata": "Label that indicates that the mismatch is due to wrong data on Wikidata. Used as an option in the review decision dropdown", diff --git a/public/i18n/ru.json b/public/i18n/ru.json index 334b885f..d95c6ada 100644 --- a/public/i18n/ru.json +++ b/public/i18n/ru.json @@ -18,7 +18,7 @@ "language-selector-clear-button-label": "Очистить поле ввода", "language-selector-input-placeholder": "Поиск языков", "language-selector-no-results": "Язык недоступен", - "column-property": "Свойство", + "column-mismatch": "Свойство", "column-wikidata-value": "Значение в Викиданных", "column-external-value": "Значение во внешнем источнике", "column-review-status": "Состояние", diff --git a/public/i18n/sl.json b/public/i18n/sl.json index 65a1f385..fdd2ef8e 100644 --- a/public/i18n/sl.json +++ b/public/i18n/sl.json @@ -24,7 +24,7 @@ "item-form-error-message-max": "Zmanjšajte število identifikatorjev predmetov, da bodo ustrezali omejitvi ($1)", "item-form-error-message-invalid": "Enega ali več identifikatorjev predmeta ni bilo mogoče obdelati. Zagotovite, da je v vsaki vrstici naveden samo en identifikator brez presledkov ali vejic. Identifikatorji predmetov so lahko samo nabor veljavnih številk, pred katerimi je črka Q (na primer: Q80378).", "server-error": "Strežnik je naletel na prehodno napako in ni mogel izvesti vašega zahtevka. Prosimo, poskusite znova.", - "column-property": "Lastnost", + "column-mismatch": "Lastnost", "column-wikidata-value": "Vrednost v Wikipodatkih", "column-external-value": "Vrednost v zunanjem viru", "column-review-status": "Stanje", diff --git a/public/i18n/sr-ec.json b/public/i18n/sr-ec.json index 040d79f7..612b7fe7 100644 --- a/public/i18n/sr-ec.json +++ b/public/i18n/sr-ec.json @@ -14,7 +14,7 @@ "language-selector-clear-button-label": "Очисти поље", "language-selector-input-placeholder": "Претрага језика", "language-selector-no-results": "Језик није доступан", - "column-property": "Својство", + "column-mismatch": "Својство", "column-wikidata-value": "Вредност на Википодацима", "column-external-value": "Вредност у спољном извору", "column-review-status": "Статус", diff --git a/public/i18n/sv.json b/public/i18n/sv.json index 69dc88c3..f73e3fb2 100644 --- a/public/i18n/sv.json +++ b/public/i18n/sv.json @@ -22,7 +22,7 @@ "item-form-error-message-max": "Minska antalet objektidentifierare för att vara inom gränsen ($1)", "item-form-error-message-invalid": "En eller fler objektidentifierare kunde inte bearbetats. Se till att bara lägga till en identifierare per rad, utan mellanslag eller komma. Objektidentifierare borde bara vara en uppsättning giltiga siffror som föregås av Q (exempelvis: Q80378).", "server-error": "Servern stötte på ett tillfälligt fel och kunde inte slutföra din begäran.", - "column-property": "Egenskap", + "column-mismatch": "Egenskap", "column-wikidata-value": "Värde på Wikidata", "column-external-value": "Värde på extern källa", "column-review-status": "Status", diff --git a/public/i18n/tr.json b/public/i18n/tr.json index a27ae8e5..d219b55a 100644 --- a/public/i18n/tr.json +++ b/public/i18n/tr.json @@ -25,7 +25,7 @@ "item-form-error-message-max": "Lütfen öge tanımlayıcılarının sayısını sınıra ($1) uyacak şekilde azaltın", "item-form-error-message-invalid": "Bir veya daha fazla öge tanımlayıcı işlenemedi. Lütfen her satıra boşluk veya virgül olmadan yalnızca bir tanımlayıcı eklediğinizden emin olun. Öge tanımlayıcıları yalnızca önünde Q harfi bulunan bir dizi geçerli sayı olmalıdır (örneğin: Q80378).", "server-error": "Sunucu geçici bir hatayla karşılaştı ve isteğinizi tamamlayamadı. Lütfen yeniden deneyin.", - "column-property": "Özellik", + "column-mismatch": "Özellik", "column-wikidata-value": "Vikiveri'deki değer", "column-external-value": "Dış kaynaktaki değer", "column-review-status": "Durum", diff --git a/public/i18n/zh-hant.json b/public/i18n/zh-hant.json index c283977f..0faa1959 100644 --- a/public/i18n/zh-hant.json +++ b/public/i18n/zh-hant.json @@ -24,7 +24,7 @@ "item-form-error-message-max": "請減少項目識別碼的數量避免超過限制（$1）", "item-form-error-message-invalid": "無法處理一個或多個項目識別碼。請確認每行只添加一個識別碼，並且沒有空格或逗號。項目識別碼只能是一組以字母 Q 為開頭的有效數字（例如：Q80378）。", "server-error": "伺服器臨時出現錯誤，無法完成您的請求。請再試一次。", - "column-property": "屬性", + "column-mismatch": "屬性", "column-wikidata-value": "在維基數據的值", "column-external-value": "在外部來源的值", "column-review-status": "狀態", diff --git a/resources/js/Components/MismatchRow.vue b/resources/js/Components/MismatchRow.vue index 9cbe7e05..40508ab9 100644 --- a/resources/js/Components/MismatchRow.vue +++ b/resources/js/Components/MismatchRow.vue @@ -1,6 +1,6 @@