diff --git a/composer.lock b/composer.lock index bb3b43a947e9d5ae9ca52339fea83b4c2f276a44..ca49c52e24e341b0fbeaf1568a8efd8a0b99fb5c 100755 --- a/composer.lock +++ b/composer.lock @@ -6,21 +6,72 @@ ], "content-hash": "6149fa962bfbf28dd7b2918ee48b35c0", "packages": [ + { + "name": "aws/aws-crt-php", + "version": "v1.0.2", + "source": { + "type": "git", + "url": "https://github.com/awslabs/aws-crt-php.git", + "reference": "3942776a8c99209908ee0b287746263725685732" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732", + "reference": "3942776a8c99209908ee0b287746263725685732", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35|^5.4.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "AWS SDK Common Runtime Team", + "email": "aws-sdk-common-runtime@amazon.com" + } + ], + "description": "AWS Common Runtime for PHP", + "homepage": "http://aws.amazon.com/sdkforphp", + "keywords": [ + "amazon", + "aws", + "crt", + "sdk" + ], + "support": { + "issues": "https://github.com/awslabs/aws-crt-php/issues", + "source": "https://github.com/awslabs/aws-crt-php/tree/v1.0.2" + }, + "time": "2021-09-03T22:57:30+00:00" + }, { "name": "aws/aws-sdk-php", - "version": "3.191.3", + "version": "3.195.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "6176504bc51ae5ac3a5276e05da0fa6abf71540b" + "reference": "7e0cdfe30ee3cfa2a1494f8e3b4fa5277f118102" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6176504bc51ae5ac3a5276e05da0fa6abf71540b", - "reference": "6176504bc51ae5ac3a5276e05da0fa6abf71540b", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7e0cdfe30ee3cfa2a1494f8e3b4fa5277f118102", + "reference": "7e0cdfe30ee3cfa2a1494f8e3b4fa5277f118102", "shasum": "" }, "require": { + "aws/aws-crt-php": "^1.0.2", "ext-json": "*", "ext-pcre": "*", "ext-simplexml": "*", @@ -92,9 +143,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.191.3" + "source": "https://github.com/aws/aws-sdk-php/tree/3.195.2" }, - "time": "2021-08-24T18:18:22+00:00" + "time": "2021-09-29T18:17:19+00:00" }, { "name": "doctrine/annotations", @@ -545,12 +596,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "a3a20779541ca1ae73d0d3766a83c33d14468f9e" + "reference": "e38c668f3b565bf9d045f20460a9bdf415073bf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a3a20779541ca1ae73d0d3766a83c33d14468f9e", - "reference": "a3a20779541ca1ae73d0d3766a83c33d14468f9e", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/e38c668f3b565bf9d045f20460a9bdf415073bf8", + "reference": "e38c668f3b565bf9d045f20460a9bdf415073bf8", "shasum": "" }, "require": { @@ -596,19 +647,43 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "Jeremy Lindblom", + "email": "jeremeamia@gmail.com", + "homepage": "https://github.com/jeremeamia" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, { "name": "Márk Sági-Kazár", "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", "keywords": [ "client", "curl", @@ -634,15 +709,11 @@ "type": "github" }, { - "url": "https://github.com/alexeyshockov", - "type": "github" - }, - { - "url": "https://github.com/gmponos", - "type": "github" + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", + "type": "tidelift" } ], - "time": "2021-07-17T23:05:34+00:00" + "time": "2021-09-05T19:58:29+00:00" }, { "name": "guzzlehttp/promises", @@ -650,12 +721,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d" + "reference": "c1dd809c8f51a477701052f4b9e5b4bb5c1061aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d", + "url": "https://api.github.com/repos/guzzle/promises/zipball/c1dd809c8f51a477701052f4b9e5b4bb5c1061aa", + "reference": "c1dd809c8f51a477701052f4b9e5b4bb5c1061aa", "shasum": "" }, "require": { @@ -684,10 +755,25 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle promises library", @@ -696,9 +782,23 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.4.1" + "source": "https://github.com/guzzle/promises/tree/master" }, - "time": "2021-03-07T09:25:29+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2021-09-05T15:38:28+00:00" }, { "name": "guzzlehttp/psr7", @@ -706,12 +806,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91" + "reference": "9d006741ba865a45adccfac45d8e1053086a5a3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/9d006741ba865a45adccfac45d8e1053086a5a3f", + "reference": "9d006741ba865a45adccfac45d8e1053086a5a3f", "shasum": "" }, "require": { @@ -748,13 +848,34 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" } ], @@ -773,7 +894,7 @@ "issues": "https://github.com/guzzle/psr7/issues", "source": "https://github.com/guzzle/psr7/tree/1.x" }, - "time": "2021-04-26T09:17:50+00:00" + "time": "2021-09-05T19:11:18+00:00" }, { "name": "jetbrains/phpstorm-stubs", @@ -893,12 +1014,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "bf371f55d8137fec4ff096bd45ff19e2db02ac4c" + "reference": "a682e33e8d3811c8b7a6c5b2f92e05855f69edd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/bf371f55d8137fec4ff096bd45ff19e2db02ac4c", - "reference": "bf371f55d8137fec4ff096bd45ff19e2db02ac4c", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/a682e33e8d3811c8b7a6c5b2f92e05855f69edd5", + "reference": "a682e33e8d3811c8b7a6c5b2f92e05855f69edd5", "shasum": "" }, "require": { @@ -907,7 +1028,7 @@ "doctrine/lexer": "^1.1", "jms/metadata": "^2.0", "php": "^7.2||^8.0", - "phpstan/phpdoc-parser": "^0.4 || ^0.5" + "phpstan/phpdoc-parser": "^0.4 || ^0.5 || ^1.0" }, "require-dev": { "doctrine/coding-standard": "^8.1", @@ -920,13 +1041,13 @@ "phpstan/phpstan": "^0.12.65", "phpunit/phpunit": "^8.0||^9.0", "psr/container": "^1.0", - "symfony/dependency-injection": "^3.0|^4.0|^5.0", - "symfony/expression-language": "^3.0|^4.0|^5.0", - "symfony/filesystem": "^3.0|^4.0|^5.0", - "symfony/form": "^3.0|^4.0|^5.0", - "symfony/translation": "^3.0|^4.0|^5.0", - "symfony/validator": "^3.1.9|^4.0|^5.0", - "symfony/yaml": "^3.3|^4.0|^5.0", + "symfony/dependency-injection": "^3.0|^4.0|^5.0|^6.0", + "symfony/expression-language": "^3.0|^4.0|^5.0|^6.0", + "symfony/filesystem": "^3.0|^4.0|^5.0|^6.0", + "symfony/form": "^3.0|^4.0|^5.0|^6.0", + "symfony/translation": "^3.0|^4.0|^5.0|^6.0", + "symfony/validator": "^3.1.9|^4.0|^5.0|^6.0", + "symfony/yaml": "^3.3|^4.0|^5.0|^6.0", "twig/twig": "~1.34|~2.4|^3.0" }, "suggest": { @@ -971,7 +1092,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/serializer/issues", - "source": "https://github.com/schmittjoh/serializer/tree/3.14.0" + "source": "https://github.com/schmittjoh/serializer/tree/master" }, "funding": [ { @@ -979,7 +1100,7 @@ "type": "github" } ], - "time": "2021-08-06T12:10:02+00:00" + "time": "2021-09-21T13:34:06+00:00" }, { "name": "jms/serializer-bundle", @@ -1351,16 +1472,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3" + "reference": "b38b25d7b372e9fddb00335400467b223349fd7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", - "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b38b25d7b372e9fddb00335400467b223349fd7e", + "reference": "b38b25d7b372e9fddb00335400467b223349fd7e", "shasum": "" }, "require": { @@ -1391,7 +1512,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.7.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.8.0" }, "funding": [ { @@ -1403,7 +1524,7 @@ "type": "tidelift" } ], - "time": "2021-01-18T20:58:21+00:00" + "time": "2021-09-25T08:23:19+00:00" }, { "name": "michelf/php-markdown", @@ -1726,16 +1847,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.12.0", + "version": "v4.13.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "6608f01670c3cc5079e18c1dab1104e002579143" + "reference": "50953a2691a922aa1769461637869a0a2faa3f53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143", - "reference": "6608f01670c3cc5079e18c1dab1104e002579143", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53", + "reference": "50953a2691a922aa1769461637869a0a2faa3f53", "shasum": "" }, "require": { @@ -1776,9 +1897,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0" }, - "time": "2021-07-21T10:44:31+00:00" + "time": "2021-09-20T12:20:58+00:00" }, { "name": "oneup/flysystem-bundle", @@ -2010,12 +2131,12 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "c5ac781da36459457837159b308fe88912e07a78" + "reference": "0f36fa483bc30d0032f700a38b40141cfa383910" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/c5ac781da36459457837159b308fe88912e07a78", - "reference": "c5ac781da36459457837159b308fe88912e07a78", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/0f36fa483bc30d0032f700a38b40141cfa383910", + "reference": "0f36fa483bc30d0032f700a38b40141cfa383910", "shasum": "" }, "require": { @@ -2060,7 +2181,7 @@ "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" }, - "time": "2021-08-13T09:13:23+00:00" + "time": "2021-09-27T19:30:08+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -2068,12 +2189,12 @@ "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "7b2df704cbe99a7b0522c7d5d7b7c5ea61b196bb" + "reference": "4b3579fc931524f60874ecee67600d5c80c7b505" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7b2df704cbe99a7b0522c7d5d7b7c5ea61b196bb", - "reference": "7b2df704cbe99a7b0522c7d5d7b7c5ea61b196bb", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/4b3579fc931524f60874ecee67600d5c80c7b505", + "reference": "4b3579fc931524f60874ecee67600d5c80c7b505", "shasum": "" }, "require": { @@ -2111,20 +2232,20 @@ "issues": "https://github.com/phpDocumentor/TypeResolver/issues", "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.x" }, - "time": "2021-08-20T10:47:25+00:00" + "time": "2021-09-26T07:37:33+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "dev-master", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "ea0b17460ec38e20d7eb64e7ec49b5d44af5d28c" + "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/ea0b17460ec38e20d7eb64e7ec49b5d44af5d28c", - "reference": "ea0b17460ec38e20d7eb64e7ec49b5d44af5d28c", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/dbc093d7af60eff5cd575d2ed761b15ed40bd08e", + "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e", "shasum": "" }, "require": { @@ -2133,16 +2254,15 @@ "require-dev": { "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.87", - "phpstan/phpstan-strict-rules": "^0.12.5", + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^9.5", "symfony/process": "^5.2" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.5-dev" + "dev-master": "1.0-dev" } }, "autoload": { @@ -2159,9 +2279,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/0.5.5" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.2.0" }, - "time": "2021-06-11T13:24:46+00:00" + "time": "2021-09-16T20:46:02+00:00" }, { "name": "psr/cache", @@ -2648,26 +2768,26 @@ }, { "name": "roave/signature", - "version": "1.5.x-dev", + "version": "1.6.x-dev", "source": { "type": "git", "url": "https://github.com/Roave/Signature.git", - "reference": "5b5bb9499cfbcc78d9f472e03af1e97e4341ec7c" + "reference": "b100e2c40e51f3c56a0b29faf3e7ca75c33df60b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/Signature/zipball/5b5bb9499cfbcc78d9f472e03af1e97e4341ec7c", - "reference": "5b5bb9499cfbcc78d9f472e03af1e97e4341ec7c", + "url": "https://api.github.com/repos/Roave/Signature/zipball/b100e2c40e51f3c56a0b29faf3e7ca75c33df60b", + "reference": "b100e2c40e51f3c56a0b29faf3e7ca75c33df60b", "shasum": "" }, "require": { - "php": "7.4.*|8.0.*" + "php": "7.4.*|8.0.*|8.1.*" }, "require-dev": { - "doctrine/coding-standard": "^8.2", - "infection/infection": "^0.20.2", - "phpunit/phpunit": "^9.5.1", - "vimeo/psalm": "^4.4" + "doctrine/coding-standard": "^9.0", + "infection/infection": "^0.25.1", + "phpunit/phpunit": "^9.5.9", + "vimeo/psalm": "^4.10.1" }, "default-branch": true, "type": "library", @@ -2683,9 +2803,9 @@ "description": "Sign and verify stuff", "support": { "issues": "https://github.com/Roave/Signature/issues", - "source": "https://github.com/Roave/Signature/tree/1.4.0" + "source": "https://github.com/Roave/Signature/tree/1.5.0" }, - "time": "2021-01-25T09:39:37+00:00" + "time": "2021-09-18T13:37:44+00:00" }, { "name": "solarium/solarium", @@ -2756,12 +2876,12 @@ "source": { "type": "git", "url": "https://github.com/subugoe/EMOBundle.git", - "reference": "68fba103176c8ab55cd8ae09d368f08f89ca5af9" + "reference": "1f53b0478df9b83cf4dae5fff28dddc251027258" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/subugoe/EMOBundle/zipball/68fba103176c8ab55cd8ae09d368f08f89ca5af9", - "reference": "68fba103176c8ab55cd8ae09d368f08f89ca5af9", + "url": "https://api.github.com/repos/subugoe/EMOBundle/zipball/1f53b0478df9b83cf4dae5fff28dddc251027258", + "reference": "1f53b0478df9b83cf4dae5fff28dddc251027258", "shasum": "" }, "require": { @@ -2793,7 +2913,7 @@ "issues": "https://github.com/subugoe/EMOBundle/issues", "source": "https://github.com/subugoe/EMOBundle/tree/master" }, - "time": "2021-08-24T20:46:12+00:00" + "time": "2021-09-29T23:51:12+00:00" }, { "name": "symfony/asset", @@ -2870,12 +2990,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "b85a5424d28d155dfd4c82e25b8e1d8b5eb7c228" + "reference": "4d9074f2777dfde2b78c5c60affa66c5e7518117" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/b85a5424d28d155dfd4c82e25b8e1d8b5eb7c228", - "reference": "b85a5424d28d155dfd4c82e25b8e1d8b5eb7c228", + "url": "https://api.github.com/repos/symfony/cache/zipball/4d9074f2777dfde2b78c5c60affa66c5e7518117", + "reference": "4d9074f2777dfde2b78c5c60affa66c5e7518117", "shasum": "" }, "require": { @@ -2883,12 +3003,13 @@ "psr/cache": "^1.0|^2.0", "psr/log": "^1|^2|^3", "symfony/cache-contracts": "^1.1.7|^2", + "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2", "symfony/var-exporter": "^4.2|^5.0" }, "conflict": { - "doctrine/dbal": "<2.6", + "doctrine/dbal": "<2.7", "symfony/dependency-injection": "<3.4", "symfony/http-kernel": "<4.4|>=5.0", "symfony/var-dumper": "<4.4" @@ -2901,7 +3022,7 @@ "require-dev": { "cache/integration-tests": "dev-master", "doctrine/cache": "^1.6|^2.0", - "doctrine/dbal": "^2.6|^3.0", + "doctrine/dbal": "^2.7|^3.0", "predis/predis": "^1.1", "psr/simple-cache": "^1.0", "symfony/config": "^4.2|^5.0", @@ -2956,7 +3077,7 @@ "type": "tidelift" } ], - "time": "2021-08-06T10:35:20+00:00" + "time": "2021-09-25T11:31:41+00:00" }, { "name": "symfony/cache-contracts", @@ -3121,12 +3242,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "9a4fcecbcccf4b55f4c28e1c71e3cd83d7be99b8" + "reference": "a3f7189a0665ee33b50e9e228c46f50f5acbed22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/9a4fcecbcccf4b55f4c28e1c71e3cd83d7be99b8", - "reference": "9a4fcecbcccf4b55f4c28e1c71e3cd83d7be99b8", + "url": "https://api.github.com/repos/symfony/console/zipball/a3f7189a0665ee33b50e9e228c46f50f5acbed22", + "reference": "a3f7189a0665ee33b50e9e228c46f50f5acbed22", "shasum": "" }, "require": { @@ -3203,7 +3324,7 @@ "type": "tidelift" } ], - "time": "2021-08-04T20:31:23+00:00" + "time": "2021-08-25T19:27:26+00:00" }, { "name": "symfony/debug", @@ -3211,12 +3332,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "2f9160e92eb64c95da7368c867b663a8e34e980c" + "reference": "43ede438d4cb52cd589ae5dc070e9323866ba8e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/2f9160e92eb64c95da7368c867b663a8e34e980c", - "reference": "2f9160e92eb64c95da7368c867b663a8e34e980c", + "url": "https://api.github.com/repos/symfony/debug/zipball/43ede438d4cb52cd589ae5dc070e9323866ba8e0", + "reference": "43ede438d4cb52cd589ae5dc070e9323866ba8e0", "shasum": "" }, "require": { @@ -3256,7 +3377,7 @@ "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.27" + "source": "https://github.com/symfony/debug/tree/v4.4.31" }, "funding": [ { @@ -3272,7 +3393,7 @@ "type": "tidelift" } ], - "time": "2021-07-22T07:21:39+00:00" + "time": "2021-09-24T13:30:14+00:00" }, { "name": "symfony/dependency-injection", @@ -3280,12 +3401,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "52866e2cb314972ff36c5b3d405ba8f523e56f6e" + "reference": "75dd7094870feaa5be9ed2b6b1efcfc2b7d3b9b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/52866e2cb314972ff36c5b3d405ba8f523e56f6e", - "reference": "52866e2cb314972ff36c5b3d405ba8f523e56f6e", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/75dd7094870feaa5be9ed2b6b1efcfc2b7d3b9b4", + "reference": "75dd7094870feaa5be9ed2b6b1efcfc2b7d3b9b4", "shasum": "" }, "require": { @@ -3358,7 +3479,7 @@ "type": "tidelift" } ], - "time": "2021-07-23T15:41:52+00:00" + "time": "2021-09-21T06:20:06+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3434,12 +3555,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "16ac2be1c0f49d6d9eb9d3ce9324bde268717905" + "reference": "51f98f7aa99f00f3b1da6bafe934e67ae6ba6dc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/16ac2be1c0f49d6d9eb9d3ce9324bde268717905", - "reference": "16ac2be1c0f49d6d9eb9d3ce9324bde268717905", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/51f98f7aa99f00f3b1da6bafe934e67ae6ba6dc5", + "reference": "51f98f7aa99f00f3b1da6bafe934e67ae6ba6dc5", "shasum": "" }, "require": { @@ -3494,7 +3615,7 @@ "type": "tidelift" } ], - "time": "2021-07-23T15:41:52+00:00" + "time": "2021-08-27T17:42:48+00:00" }, { "name": "symfony/event-dispatcher", @@ -3849,16 +3970,16 @@ }, { "name": "symfony/flex", - "version": "v1.14.4", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "ddddba0343a225ba5fa638b64b132fc8754a9579" + "reference": "f05406b33681409b83285f4d2ff4efbca7c55b03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/ddddba0343a225ba5fa638b64b132fc8754a9579", - "reference": "ddddba0343a225ba5fa638b64b132fc8754a9579", + "url": "https://api.github.com/repos/symfony/flex/zipball/f05406b33681409b83285f4d2ff4efbca7c55b03", + "reference": "f05406b33681409b83285f4d2ff4efbca7c55b03", "shasum": "" }, "require": { @@ -3869,13 +3990,14 @@ "composer/composer": "^1.0.2|^2.0", "symfony/dotenv": "^4.4|^5.0", "symfony/filesystem": "^4.4|^5.0", - "symfony/phpunit-bridge": "^4.4|^5.0", + "symfony/phpunit-bridge": "^4.4.12|^5.0", "symfony/process": "^3.4|^4.4|^5.0" }, + "default-branch": true, "type": "composer-plugin", "extra": { "branch-alias": { - "dev-main": "1.13-dev" + "dev-main": "1.16-dev" }, "class": "Symfony\\Flex\\Flex" }, @@ -3897,7 +4019,7 @@ "description": "Composer plugin for Symfony", "support": { "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v1.14.4" + "source": "https://github.com/symfony/flex/tree/v1.16.3" }, "funding": [ { @@ -3913,7 +4035,7 @@ "type": "tidelift" } ], - "time": "2021-08-24T18:59:38+00:00" + "time": "2021-09-28T17:00:52+00:00" }, { "name": "symfony/form", @@ -3921,12 +4043,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "361a133fc451966277b2242990c0009f6cfdf3e0" + "reference": "e5aca09fd609cffa1c3470acca2c6f49ae53a5b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/361a133fc451966277b2242990c0009f6cfdf3e0", - "reference": "361a133fc451966277b2242990c0009f6cfdf3e0", + "url": "https://api.github.com/repos/symfony/form/zipball/e5aca09fd609cffa1c3470acca2c6f49ae53a5b9", + "reference": "e5aca09fd609cffa1c3470acca2c6f49ae53a5b9", "shasum": "" }, "require": { @@ -4011,7 +4133,7 @@ "type": "tidelift" } ], - "time": "2021-08-20T06:41:23+00:00" + "time": "2021-09-19T13:16:36+00:00" }, { "name": "symfony/framework-bundle", @@ -4019,12 +4141,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "6779ca2360be278a50afd1c88045b9f063ed3b2b" + "reference": "cc936cd733d94e4752a26cfc25a4825724571765" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/6779ca2360be278a50afd1c88045b9f063ed3b2b", - "reference": "6779ca2360be278a50afd1c88045b9f063ed3b2b", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/cc936cd733d94e4752a26cfc25a4825724571765", + "reference": "cc936cd733d94e4752a26cfc25a4825724571765", "shasum": "" }, "require": { @@ -4079,7 +4201,7 @@ "symfony/browser-kit": "^4.3|^5.0", "symfony/console": "^4.4.21|^5.0", "symfony/css-selector": "^3.4|^4.0|^5.0", - "symfony/dom-crawler": "^4.3|^5.0", + "symfony/dom-crawler": "^4.4.30|^5.3.7", "symfony/dotenv": "^4.3.6|^5.0", "symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/form": "^4.3.5|^5.0", @@ -4157,7 +4279,7 @@ "type": "tidelift" } ], - "time": "2021-08-06T09:57:11+00:00" + "time": "2021-09-23T07:45:14+00:00" }, { "name": "symfony/http-client-contracts", @@ -4243,12 +4365,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "2773deb55590bc55a73c3576ef15b362bd700ece" + "reference": "09b3202651ab23ac8dcf455284a48a3500e56731" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/2773deb55590bc55a73c3576ef15b362bd700ece", - "reference": "2773deb55590bc55a73c3576ef15b362bd700ece", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/09b3202651ab23ac8dcf455284a48a3500e56731", + "reference": "09b3202651ab23ac8dcf455284a48a3500e56731", "shasum": "" }, "require": { @@ -4303,7 +4425,7 @@ "type": "tidelift" } ], - "time": "2021-08-18T06:02:56+00:00" + "time": "2021-08-26T15:51:23+00:00" }, { "name": "symfony/http-kernel", @@ -4311,12 +4433,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "2956b4270e79dc8ef54a3b1133dee391f01fddc7" + "reference": "801b925e308518ddf821ba91952c41ae77c77507" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2956b4270e79dc8ef54a3b1133dee391f01fddc7", - "reference": "2956b4270e79dc8ef54a3b1133dee391f01fddc7", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/801b925e308518ddf821ba91952c41ae77c77507", + "reference": "801b925e308518ddf821ba91952c41ae77c77507", "shasum": "" }, "require": { @@ -4325,7 +4447,7 @@ "symfony/error-handler": "^4.4", "symfony/event-dispatcher": "^4.4", "symfony/http-client-contracts": "^1.1|^2", - "symfony/http-foundation": "^4.4|^5.0", + "symfony/http-foundation": "^4.4.30|^5.3.7", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.16" @@ -4407,7 +4529,7 @@ "type": "tidelift" } ], - "time": "2021-08-18T08:44:44+00:00" + "time": "2021-09-28T10:23:32+00:00" }, { "name": "symfony/inflector", @@ -4487,12 +4609,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "dded56f7a6d560c692f962e16175794fb2d798ee" + "reference": "37c8fb0a3d4ccb7df5b9acf432bcf3fe6fbc7675" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/dded56f7a6d560c692f962e16175794fb2d798ee", - "reference": "dded56f7a6d560c692f962e16175794fb2d798ee", + "url": "https://api.github.com/repos/symfony/intl/zipball/37c8fb0a3d4ccb7df5b9acf432bcf3fe6fbc7675", + "reference": "37c8fb0a3d4ccb7df5b9acf432bcf3fe6fbc7675", "shasum": "" }, "require": { @@ -4567,7 +4689,7 @@ "type": "tidelift" } ], - "time": "2021-08-09T08:09:12+00:00" + "time": "2021-09-14T15:48:39+00:00" }, { "name": "symfony/mime", @@ -4575,12 +4697,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "6ab91e811439360339ebde803630c8d74223fa77" + "reference": "c4fd68f54f608c639ddebecfc61746a86134bf4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/6ab91e811439360339ebde803630c8d74223fa77", - "reference": "6ab91e811439360339ebde803630c8d74223fa77", + "url": "https://api.github.com/repos/symfony/mime/zipball/c4fd68f54f608c639ddebecfc61746a86134bf4a", + "reference": "c4fd68f54f608c639ddebecfc61746a86134bf4a", "shasum": "" }, "require": { @@ -4643,7 +4765,7 @@ "type": "tidelift" } ], - "time": "2021-07-21T12:19:41+00:00" + "time": "2021-09-10T10:18:20+00:00" }, { "name": "symfony/options-resolver", @@ -4718,12 +4840,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "4a80a521d6176870b6445cfb469c130f9cae1dda" + "reference": "1238dac6f2f90e9095e70716a265da436f115a5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/4a80a521d6176870b6445cfb469c130f9cae1dda", - "reference": "4a80a521d6176870b6445cfb469c130f9cae1dda", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/1238dac6f2f90e9095e70716a265da436f115a5b", + "reference": "1238dac6f2f90e9095e70716a265da436f115a5b", "shasum": "" }, "require": { @@ -4782,7 +4904,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-icu/tree/main" }, "funding": [ { @@ -4798,7 +4920,7 @@ "type": "tidelift" } ], - "time": "2021-05-24T10:04:56+00:00" + "time": "2021-09-14T09:48:58+00:00" }, { "name": "symfony/polyfill-intl-idn", @@ -4806,12 +4928,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65" + "reference": "749045c69efb97c70d25d7463abba812e91f3a44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", + "reference": "749045c69efb97c70d25d7463abba812e91f3a44", "shasum": "" }, "require": { @@ -4870,7 +4992,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/main" }, "funding": [ { @@ -4886,7 +5008,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-09-14T14:02:44+00:00" }, { "name": "symfony/polyfill-intl-normalizer", @@ -4979,12 +5101,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" + "reference": "344e456152e22a1bce3048c6c311059ea14bde47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/344e456152e22a1bce3048c6c311059ea14bde47", + "reference": "344e456152e22a1bce3048c6c311059ea14bde47", "shasum": "" }, "require": { @@ -5036,7 +5158,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/main" }, "funding": [ { @@ -5052,7 +5174,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-09-13T13:54:24+00:00" }, { "name": "symfony/polyfill-php73", @@ -5060,12 +5182,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", "shasum": "" }, "require": { @@ -5116,7 +5238,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php73/tree/main" }, "funding": [ { @@ -5132,7 +5254,7 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-06-05T21:20:04+00:00" }, { "name": "symfony/polyfill-php80", @@ -5140,12 +5262,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", "shasum": "" }, "require": { @@ -5200,7 +5322,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-php80/tree/main" }, "funding": [ { @@ -5216,7 +5338,7 @@ "type": "tidelift" } ], - "time": "2021-07-28T13:41:28+00:00" + "time": "2021-09-13T13:58:33+00:00" }, { "name": "symfony/polyfill-php81", @@ -5224,12 +5346,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "e66119f3de95efc359483f810c4c3e6436279436" + "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436", - "reference": "e66119f3de95efc359483f810c4c3e6436279436", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", + "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", "shasum": "" }, "require": { @@ -5280,7 +5402,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php81/tree/main" }, "funding": [ { @@ -5296,7 +5418,7 @@ "type": "tidelift" } ], - "time": "2021-05-21T13:25:03+00:00" + "time": "2021-09-13T13:58:11+00:00" }, { "name": "symfony/polyfill-uuid", @@ -5553,12 +5675,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "ca5689054f012fec2fb01040b4566d185b62e72e" + "reference": "99ae75e257d5a4fd8537464d98d1dede0180b611" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/ca5689054f012fec2fb01040b4566d185b62e72e", - "reference": "ca5689054f012fec2fb01040b4566d185b62e72e", + "url": "https://api.github.com/repos/symfony/security-core/zipball/99ae75e257d5a4fd8537464d98d1dede0180b611", + "reference": "99ae75e257d5a4fd8537464d98d1dede0180b611", "shasum": "" }, "require": { @@ -5632,7 +5754,7 @@ "type": "tidelift" } ], - "time": "2021-08-13T11:41:55+00:00" + "time": "2021-09-20T16:52:24+00:00" }, { "name": "symfony/security-csrf", @@ -5708,16 +5830,16 @@ }, { "name": "symfony/serializer", - "version": "5.4.x-dev", + "version": "5.3.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "04a239124bb71d3515413fadc62597d131f39324" + "reference": "61cf72466172b1d222d6b9ba419740a51add034d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/04a239124bb71d3515413fadc62597d131f39324", - "reference": "04a239124bb71d3515413fadc62597d131f39324", + "url": "https://api.github.com/repos/symfony/serializer/zipball/61cf72466172b1d222d6b9ba419740a51add034d", + "reference": "61cf72466172b1d222d6b9ba419740a51add034d", "shasum": "" }, "require": { @@ -5738,22 +5860,22 @@ "require-dev": { "doctrine/annotations": "^1.12", "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0", - "symfony/cache": "^4.4|^5.0|^6.0", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/filesystem": "^4.4|^5.0|^6.0", - "symfony/form": "^4.4|^5.0|^6.0", - "symfony/http-foundation": "^4.4|^5.0|^6.0", - "symfony/http-kernel": "^4.4|^5.0|^6.0", - "symfony/mime": "^4.4|^5.0|^6.0", - "symfony/property-access": "^4.4.9|^5.0.9|^6.0", - "symfony/property-info": "^5.3|^6.0", - "symfony/uid": "^5.1|^6.0", - "symfony/validator": "^4.4|^5.0|^6.0", - "symfony/var-dumper": "^4.4|^5.0|^6.0", - "symfony/var-exporter": "^4.4|^5.0|^6.0", - "symfony/yaml": "^4.4|^5.0|^6.0" + "symfony/cache": "^4.4|^5.0", + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/error-handler": "^4.4|^5.0", + "symfony/filesystem": "^4.4|^5.0", + "symfony/form": "^4.4|^5.0", + "symfony/http-foundation": "^4.4|^5.0", + "symfony/http-kernel": "^4.4|^5.0", + "symfony/mime": "^4.4|^5.0", + "symfony/property-access": "^4.4.9|^5.0.9", + "symfony/property-info": "^5.3", + "symfony/uid": "^5.1", + "symfony/validator": "^4.4|^5.0", + "symfony/var-dumper": "^4.4|^5.0", + "symfony/var-exporter": "^4.4|^5.0", + "symfony/yaml": "^4.4|^5.0" }, "suggest": { "psr/cache-implementation": "For using the metadata cache.", @@ -5764,6 +5886,7 @@ "symfony/var-exporter": "For using the metadata compiler.", "symfony/yaml": "For using the default YAML mapping loader." }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -5790,7 +5913,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/5.4" + "source": "https://github.com/symfony/serializer/tree/5.3" }, "funding": [ { @@ -5806,7 +5929,7 @@ "type": "tidelift" } ], - "time": "2021-08-23T08:46:55+00:00" + "time": "2021-09-29T06:27:16+00:00" }, { "name": "symfony/service-contracts", @@ -5958,12 +6081,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "c90130d75c1b764b79eadc640502b409c762fbaf" + "reference": "db0ba1e85280d8ff11e38d53c70f8814d4d740f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/c90130d75c1b764b79eadc640502b409c762fbaf", - "reference": "c90130d75c1b764b79eadc640502b409c762fbaf", + "url": "https://api.github.com/repos/symfony/translation/zipball/db0ba1e85280d8ff11e38d53c70f8814d4d740f5", + "reference": "db0ba1e85280d8ff11e38d53c70f8814d4d740f5", "shasum": "" }, "require": { @@ -6023,7 +6146,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/4.4" + "source": "https://github.com/symfony/translation/tree/v4.4.30" }, "funding": [ { @@ -6039,7 +6162,7 @@ "type": "tidelift" } ], - "time": "2021-08-13T14:07:59+00:00" + "time": "2021-08-26T05:57:13+00:00" }, { "name": "symfony/translation-contracts", @@ -6330,12 +6453,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "7f65c44c2ce80d3a0fcdb6385ee0ad535e45660c" + "reference": "1f12cc0c2e880a5f39575c19af81438464717839" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7f65c44c2ce80d3a0fcdb6385ee0ad535e45660c", - "reference": "7f65c44c2ce80d3a0fcdb6385ee0ad535e45660c", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1f12cc0c2e880a5f39575c19af81438464717839", + "reference": "1f12cc0c2e880a5f39575c19af81438464717839", "shasum": "" }, "require": { @@ -6411,7 +6534,7 @@ "type": "tidelift" } ], - "time": "2021-08-04T20:31:23+00:00" + "time": "2021-09-24T15:30:11+00:00" }, { "name": "symfony/var-exporter", @@ -6419,12 +6542,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "67d0cbfac22a7f21bf6b94dd85de35df7b8a435e" + "reference": "ae5e31445bef9e27d0999ba2354dc04049508ede" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/67d0cbfac22a7f21bf6b94dd85de35df7b8a435e", - "reference": "67d0cbfac22a7f21bf6b94dd85de35df7b8a435e", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/ae5e31445bef9e27d0999ba2354dc04049508ede", + "reference": "ae5e31445bef9e27d0999ba2354dc04049508ede", "shasum": "" }, "require": { @@ -6484,7 +6607,7 @@ "type": "tidelift" } ], - "time": "2021-08-04T22:42:04+00:00" + "time": "2021-08-30T16:02:49+00:00" }, { "name": "symfony/webpack-encore-bundle", @@ -6635,12 +6758,12 @@ "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "50a41e48d0e3571a5fc4c031eef4458a82a69f12" + "reference": "a7d0568c90c3fb4ffe40193e3b8641ec11f455b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/50a41e48d0e3571a5fc4c031eef4458a82a69f12", - "reference": "50a41e48d0e3571a5fc4c031eef4458a82a69f12", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/a7d0568c90c3fb4ffe40193e3b8641ec11f455b9", + "reference": "a7d0568c90c3fb4ffe40193e3b8641ec11f455b9", "shasum": "" }, "require": { @@ -6706,7 +6829,7 @@ "type": "tidelift" } ], - "time": "2021-08-11T07:52:09+00:00" + "time": "2021-09-29T12:16:58+00:00" }, { "name": "webmozart/assert", @@ -7121,12 +7244,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "5b8af50f9b830295e45075f878fe8fa1092dcd7b" + "reference": "103c42bf9dc74838d86a4fa416308f9ab7cad353" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/5b8af50f9b830295e45075f878fe8fa1092dcd7b", - "reference": "5b8af50f9b830295e45075f878fe8fa1092dcd7b", + "url": "https://api.github.com/repos/doctrine/collections/zipball/103c42bf9dc74838d86a4fa416308f9ab7cad353", + "reference": "103c42bf9dc74838d86a4fa416308f9ab7cad353", "shasum": "" }, "require": { @@ -7182,7 +7305,7 @@ "issues": "https://github.com/doctrine/collections/issues", "source": "https://github.com/doctrine/collections/tree/1.7.x" }, - "time": "2021-08-11T08:07:00+00:00" + "time": "2021-09-20T21:22:09+00:00" }, { "name": "doctrine/common", @@ -7659,16 +7782,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "2.19.x-dev", + "version": "v2.19.2", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "c4bdd91c245321b45a2b6f371d0c9fcb7706b28b" + "reference": "d5c737c2e18ba502b75b44832b31fe627f82e307" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c4bdd91c245321b45a2b6f371d0c9fcb7706b28b", - "reference": "c4bdd91c245321b45a2b6f371d0c9fcb7706b28b", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d5c737c2e18ba502b75b44832b31fe627f82e307", + "reference": "d5c737c2e18ba502b75b44832b31fe627f82e307", "shasum": "" }, "require": { @@ -7756,7 +7879,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/2.19" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.2" }, "funding": [ { @@ -7764,7 +7887,7 @@ "type": "github" } ], - "time": "2021-08-18T19:53:08+00:00" + "time": "2021-08-18T19:55:46+00:00" }, { "name": "fzaninotto/faker", @@ -8131,33 +8254,34 @@ }, { "name": "phpspec/prophecy", - "version": "1.13.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea" + "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea", - "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", + "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.1", + "php": "^7.2 || ~8.0, <8.2", "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0", "sebastian/recursion-context": "^3.0 || ^4.0" }, "require-dev": { - "phpspec/phpspec": "^6.0", + "phpspec/phpspec": "^6.0 || ^7.0", "phpunit/phpunit": "^8.0 || ^9.0" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -8192,9 +8316,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/1.13.0" + "source": "https://github.com/phpspec/prophecy/tree/1.14.0" }, - "time": "2021-03-17T13:42:18+00:00" + "time": "2021-09-10T09:02:12+00:00" }, { "name": "phpunit/php-code-coverage", @@ -8202,19 +8326,19 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "d96981c0d2718c56aea9eeb254d3159b808156c3" + "reference": "7cecb7bed123949b840aacbca504d248a3537754" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d96981c0d2718c56aea9eeb254d3159b808156c3", - "reference": "d96981c0d2718c56aea9eeb254d3159b808156c3", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7cecb7bed123949b840aacbca504d248a3537754", + "reference": "7cecb7bed123949b840aacbca504d248a3537754", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.10.2", + "nikic/php-parser": "^4.13.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -8271,7 +8395,7 @@ "type": "github" } ], - "time": "2021-08-17T14:56:04+00:00" + "time": "2021-09-20T14:22:28+00:00" }, { "name": "phpunit/php-file-iterator", @@ -8520,12 +8644,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0979089082b2506ad2e75fb221268018b9bb79eb" + "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0979089082b2506ad2e75fb221268018b9bb79eb", - "reference": "0979089082b2506ad2e75fb221268018b9bb79eb", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c814a05837f2edb0d1471d6e3f4ab3501ca3899a", + "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a", "shasum": "" }, "require": { @@ -8541,7 +8665,7 @@ "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2.3", + "phpunit/php-code-coverage": "^9.2.7", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -8603,7 +8727,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.10" }, "funding": [ { @@ -8615,7 +8739,7 @@ "type": "github" } ], - "time": "2021-08-20T05:38:37+00:00" + "time": "2021-09-25T07:38:51+00:00" }, { "name": "sebastian/cli-parser", @@ -9531,7 +9655,7 @@ }, { "name": "sebastian/version", - "version": "3.0.2", + "version": "3.0.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", @@ -9805,12 +9929,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "37dea6cfc83aa6a47d4bc911a5701f17e0fb67ff" + "reference": "4632ae3567746c7e915c33c67a2fb6ab746090c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/37dea6cfc83aa6a47d4bc911a5701f17e0fb67ff", - "reference": "37dea6cfc83aa6a47d4bc911a5701f17e0fb67ff", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4632ae3567746c7e915c33c67a2fb6ab746090c4", + "reference": "4632ae3567746c7e915c33c67a2fb6ab746090c4", "shasum": "" }, "require": { @@ -9871,7 +9995,7 @@ "type": "tidelift" } ], - "time": "2021-08-04T20:31:23+00:00" + "time": "2021-08-28T15:40:01+00:00" }, { "name": "symfony/dotenv", @@ -9944,21 +10068,21 @@ }, { "name": "symfony/maker-bundle", - "version": "v1.33.0", + "version": "v1.34.0", "source": { "type": "git", "url": "https://github.com/symfony/maker-bundle.git", - "reference": "f093d906c667cba7e3f74487d9e5e55aaf25a031" + "reference": "c1ead8581cddeb4b2b9dcc8a3f00910093c4e5e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/f093d906c667cba7e3f74487d9e5e55aaf25a031", - "reference": "f093d906c667cba7e3f74487d9e5e55aaf25a031", + "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/c1ead8581cddeb4b2b9dcc8a3f00910093c4e5e8", + "reference": "c1ead8581cddeb4b2b9dcc8a3f00910093c4e5e8", "shasum": "" }, "require": { "doctrine/inflector": "^1.2|^2.0", - "nikic/php-parser": "^4.0", + "nikic/php-parser": "^4.11", "php": ">=7.1.3", "symfony/config": "^4.0|^5.0", "symfony/console": "^4.0|^5.0", @@ -10012,7 +10136,7 @@ ], "support": { "issues": "https://github.com/symfony/maker-bundle/issues", - "source": "https://github.com/symfony/maker-bundle/tree/v1.33.0" + "source": "https://github.com/symfony/maker-bundle/tree/v1.34.0" }, "funding": [ { @@ -10028,7 +10152,7 @@ "type": "tidelift" } ], - "time": "2021-07-01T00:28:30+00:00" + "time": "2021-09-27T14:29:38+00:00" }, { "name": "symfony/phpunit-bridge", @@ -10036,12 +10160,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "48b0bbcb49c13ae19417a924e550df3127df02d6" + "reference": "12ba881a8e0e8df45788906199a8cd2fe74f9769" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/48b0bbcb49c13ae19417a924e550df3127df02d6", - "reference": "48b0bbcb49c13ae19417a924e550df3127df02d6", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/12ba881a8e0e8df45788906199a8cd2fe74f9769", + "reference": "12ba881a8e0e8df45788906199a8cd2fe74f9769", "shasum": "" }, "require": { @@ -10111,7 +10235,7 @@ "type": "tidelift" } ], - "time": "2021-08-17T15:35:52+00:00" + "time": "2021-09-14T13:57:43+00:00" }, { "name": "symfony/process", @@ -10291,12 +10415,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "be142cf26bb81ff31f7a482c22b1e58b93719f00" + "reference": "24227617a4ddbdf78f8ab12ce2b76dfb54a7d851" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/be142cf26bb81ff31f7a482c22b1e58b93719f00", - "reference": "be142cf26bb81ff31f7a482c22b1e58b93719f00", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/24227617a4ddbdf78f8ab12ce2b76dfb54a7d851", + "reference": "24227617a4ddbdf78f8ab12ce2b76dfb54a7d851", "shasum": "" }, "require": { @@ -10362,7 +10486,7 @@ "type": "tidelift" } ], - "time": "2021-07-26T19:30:25+00:00" + "time": "2021-09-16T11:24:03+00:00" }, { "name": "symfony/web-server-bundle", diff --git a/solr/gfl/conf/schema.xml b/solr/gfl/conf/schema.xml index 5e61f3c0f331a463c9641b3cf980291800ad3eaa..c9c6b332e48d92db0a0d3a5ba798f4bb4698443f 100755 --- a/solr/gfl/conf/schema.xml +++ b/solr/gfl/conf/schema.xml @@ -57,7 +57,7 @@ - + @@ -107,6 +107,9 @@ + + + diff --git a/solr/gfloffline/conf/schema.xml b/solr/gfloffline/conf/schema.xml index 95b7a8aae832429bd431d1d011d05893f11eef50..d7a689dee3bda15ae0f4a88c4c42aa1f0d9445c4 100755 --- a/solr/gfloffline/conf/schema.xml +++ b/solr/gfloffline/conf/schema.xml @@ -56,7 +56,7 @@ - + @@ -106,6 +106,9 @@ + + + diff --git a/src/Controller/Tei2SolrController.php b/src/Controller/Tei2SolrController.php index 6153f58c0388231526004cf2d7b3a354fa42a00f..e46df83b80f7fdbc2d1b7870f34594c04407fb4a 100755 --- a/src/Controller/Tei2SolrController.php +++ b/src/Controller/Tei2SolrController.php @@ -527,298 +527,323 @@ class Tei2SolrController extends AbstractController if (!libxml_get_errors()) { $xpath = new DOMXPath($doc); $xpath->registerNamespace('tei', 'http://www.tei-c.org/ns/1.0'); - $id = $this->getId($xpath); - $docType = 'article'; - $shortTitle = $this->getShortTitle($xpath); - $title = $this->getTitle($xpath); + $this->indexDocument($doc, $file->getRealPath()); - $originPlaceGNDNode = $xpath->query('//tei:name[@type="place" and @subtype="orn"]/@ref'); + $entities = $this->getEntities($xpath); + $doctypeNotes = $this->getDoctypeNotes($xpath, $id); - if ($originPlaceGNDNode->item(0)) { - $originPlaceGND = $originPlaceGNDNode->item(0)->nodeValue; + if (isset($doctypeNotes) && is_iterable($doctypeNotes)) { + $this->indexNotes($doctypeNotes); } - $originPlace = $this->getOriginPlace($xpath); - $author = $this->getAuthor($xpath); - $recipient = $this->getRecipient($xpath); - $destinationPlace = $this->getDestinationPlace($xpath); - $originDate = $this->getOriginDate($xpath); - $license = $this->getLicense($xpath); - $language = $this->getLanguage($xpath); - $reference = $this->getReference($xpath); - $response = $this->getResponse($xpath); - $relatedItems = $this->getRelatedItems($xpath); - $repository = $this->getRepository($xpath); - $institution = $this->getInstitution($xpath); - $settlement = $this->getSettlement($xpath); - $country = $this->getCountry($xpath); - if (isset($repository) && isset($institution) && isset($settlement) && isset($country)) { - $institution = $repository . ', ' . $institution . ', ' . $settlement . ' (' . $country . ')'; - $institution = trim(preg_replace('/\s+/', ' ', $institution)); + if (isset($entities) && is_iterable($entities)) { + $this->indexEntities($entities); } + } else { + $filesystem = new Filesystem(); + $teiImportLogFile = './data/log/teiImportLogs.txt'; - $sourceDescription = $this->getSourceDescription($xpath); - $publicationDate = $this->getPublicationDate($xpath); - $fulltext = $this->getFulltext($xpath); - $numberOfPages = $this->getNumberOfPages($xpath); - $gndKeywords = $this->getGndKeywords($xpath); - $freeKeywords = $this->getFreeKeywords($xpath); - $shelfmark = $this->getShelfmark($xpath); - $scriptSource = $this->getScriptSource($xpath); - $writers = $this->getWriters($xpath); - $imageIds = $this->getImageIds($xpath); - $imageUrls = $this->getImageUrls($xpath); - $graphics = $this->getGraphics($imageIds, $imageUrls); - $entities = $this->getEntities($xpath); - $doctypeNotes = $this->getDoctypeNotes($xpath, $id); + if (!$filesystem->exists($teiImportLogFile)) { + $filesystem->mkdir('./data/log'); + $filesystem->touch($teiImportLogFile); + } - $solrDocument = $this->getTextVersions($file->getRealPath(), $graphics); - $transcription = $solrDocument->getTranscriptedText(); - $pagesTranscription = $solrDocument->getTranscriptedTextArr(); - $editedText = $solrDocument->getEditedText(); - $pagesEdited = $solrDocument->getEditedTextArr(); - $gndsUuids = $solrDocument->getGndsUuids(); - $pagesGndsUuids = $solrDocument->getPagesGndsUuids(); - - $update = $this->client->createUpdate(); - $doc = $update->createDocument(); - - if (!empty($id)) { - $doc->id = $id; - $doc->doctype = $docType; - $doc->short_title = $shortTitle; - $doc->title = $title; - - if (isset($originPlace) && !empty($originPlace)) { - $doc->origin_place = $originPlace; + $errors = []; + foreach (libxml_get_errors() as $key => $error) { + if (0 === $key) { + $errors[] = explode('/', $error->file)[4].PHP_EOL; + $errors[] = '--------------------'.PHP_EOL; } - $doc->author = $author; + $errors[] = $error->message; + } - if (isset($recipient) && !empty($recipient)) { - $doc->recipient = $recipient; - } + $filesystem->appendToFile($teiImportLogFile, implode('', $errors)); - if (isset($originDate) && !empty($originDate)) { - $doc->origin_date = $originDate; - } + libxml_clear_errors(); + } + } + } - if (isset($destinationPlace) && !empty($destinationPlace)) { - $doc->destination_place = $destinationPlace; - } + private function indexDocument(DOMDocument $doc, string $file): void + { + $xpath = new DOMXPath($doc); + $xpath->registerNamespace('tei', 'http://www.tei-c.org/ns/1.0'); - $doc->license = $license; - $doc->language = $language; + $id = $this->getId($xpath); + $docType = 'article'; + $shortTitle = $this->getShortTitle($xpath); + $title = $this->getTitle($xpath); - if (isset($reference) && !empty($reference)) { - $doc->reference = $reference; - } + $originPlaceGNDNode = $xpath->query('//tei:name[@type="place" and @subtype="orn"]/@ref'); - if (isset($response) && !empty($response)) { - $doc->response = $response; - } + if ($originPlaceGNDNode->item(0)) { + $originPlaceGND = $originPlaceGNDNode->item(0)->nodeValue; + } - if (isset($relatedItem) && !empty($relatedItem)) { - $doc->related_items = $relatedItems; - } + $originPlace = $this->getOriginPlace($xpath); + $author = $this->getAuthor($xpath); + $recipient = $this->getRecipient($xpath); + $destinationPlace = $this->getDestinationPlace($xpath); + $originDate = $this->getOriginDate($xpath); + $license = $this->getLicense($xpath); + $language = $this->getLanguage($xpath); + $reference = $this->getReference($xpath); + $response = $this->getResponse($xpath); + $relatedItems = $this->getRelatedItems($xpath); + $repository = $this->getRepository($xpath); + $institution = $this->getInstitution($xpath); + $settlement = $this->getSettlement($xpath); + $country = $this->getCountry($xpath); + if (isset($repository) && isset($institution) && isset($settlement) && isset($country)) { + $institution = $repository . ', ' . $institution . ', ' . $settlement . ' (' . $country . ')'; + $institution = trim(preg_replace('/\s+/', ' ', $institution)); + } - if (isset($institution) && !empty($institution)) { - $doc->institution = $institution; - } + $sourceDescription = $this->getSourceDescription($xpath); + $publicationDate = $this->getPublicationDate($xpath); + $fulltext = $this->getFulltext($xpath); + $numberOfPages = $this->getNumberOfPages($xpath); + $gndKeywords = $this->getGndKeywords($xpath); + $freeKeywords = $this->getFreeKeywords($xpath); + $shelfmark = $this->getShelfmark($xpath); + $scriptSource = $this->getScriptSource($xpath); + $writers = $this->getWriters($xpath); + $imageIds = $this->getImageIds($xpath); + $imageUrls = $this->getImageUrls($xpath); + $graphics = $this->getGraphics($imageIds, $imageUrls); + $solrDocument = $this->getTextVersions($file, $graphics); + $transcription = $solrDocument->getTranscriptedText(); + $pagesTranscription = $solrDocument->getTranscriptedTextArr(); + $editedText = $solrDocument->getEditedText(); + $pagesEdited = $solrDocument->getEditedTextArr(); + $pagesGndsUuids = $solrDocument->getPagesGndsUuids(); + $pagesNotesUuids = $solrDocument->getPagesNotesUuids(); + $pagesSegs = $solrDocument->getPagesSegs(); - if (isset($sourceDescription) && !empty($sourceDescription)) { - $doc->source_description = $sourceDescription; - } + $update = $this->client->createUpdate(); + $doc = $update->createDocument(); - if (isset($publicationDate) && !empty($publicationDate)) { - $doc->article_pub_date = $publicationDate; - } + if (!empty($id)) { + $doc->id = $id; + $doc->doctype = $docType; + $doc->short_title = $shortTitle; + $doc->title = $title; - if (isset($fulltext) && !empty($fulltext)) { - $doc->fulltext = $fulltext; - } + if (isset($originPlace) && !empty($originPlace)) { + $doc->origin_place = $originPlace; + } - if (isset($numberOfPages) && !empty($numberOfPages)) { - $doc->number_of_pages = $numberOfPages; - } + $doc->author = $author; - if (isset($gndKeywords) && !empty($gndKeywords)) { - $doc->gnd_keyword = $gndKeywords; - } + if (isset($recipient) && !empty($recipient)) { + $doc->recipient = $recipient; + } - if (isset($freeKeywords) && !empty($freeKeywords)) { - $doc->free_keyword = $freeKeywords; - } + if (isset($originDate) && !empty($originDate)) { + $doc->origin_date = $originDate; + } - if (isset($shelfmark) && !empty($shelfmark)) { - $doc->shelfmark = $shelfmark; - } + if (isset($destinationPlace) && !empty($destinationPlace)) { + $doc->destination_place = $destinationPlace; + } - if (isset($scriptSource) && !empty($scriptSource)) { - $doc->script_source = $scriptSource; - } + $doc->license = $license; + $doc->language = $language; - if (isset($writers) && !empty($writers)) { - $doc->writer = $writers; - } + if (isset($reference) && !empty($reference)) { + $doc->reference = $reference; + } - if (isset($imageIds) && !empty($imageIds)) { - $doc->image_ids = $imageIds; - } + if (isset($response) && !empty($response)) { + $doc->response = $response; + } - if (isset($imageUrls) && !empty($imageUrls)) { - $doc->image_urls = $imageUrls; - } + if (isset($relatedItem) && !empty($relatedItem)) { + $doc->related_items = $relatedItems; + } - if (isset($documentEntities) && !empty($documentEntities)) { - $doc->entities = $documentEntities; - } + if (isset($institution) && !empty($institution)) { + $doc->institution = $institution; + } - if (isset($notes) && !empty($notes)) { - $doc->notes = $notes; - } + if (isset($sourceDescription) && !empty($sourceDescription)) { + $doc->source_description = $sourceDescription; + } - if (isset($transcription) && !empty($transcription)) { - $doc->transcripted_text = $transcription; - $doc->edited_text = $editedText; - } + if (isset($publicationDate) && !empty($publicationDate)) { + $doc->article_pub_date = $publicationDate; + } - if (!empty($numberOfPages) && intval($numberOfPages)) { - for ($i = 1; $i <= $numberOfPages; $i++) { - $update1 = $this->client->createUpdate(); - $childDoc = $update1->createDocument(); - $childDoc->id = $id . '_page' . $i; - $childDoc->article_id = $id; - $childDoc->article_title = $title; - $childDoc->doctype = 'page'; - $childDoc->page_number = $i; - $childDoc->language = $language; - - if (isset($imageUrls[$i - 1]) && !empty($imageUrls[$i - 1])) { - $childDoc->image_url = $imageUrls[$i - 1]; - } + if (isset($fulltext) && !empty($fulltext)) { + $doc->fulltext = $fulltext; + } - if (isset($pagesTranscription[$i - 1]) && !empty($pagesTranscription[$i - 1])) { - $childDoc->transcripted_text = $pagesTranscription[$i - 1]; - } + if (isset($numberOfPages) && !empty($numberOfPages)) { + $doc->number_of_pages = $numberOfPages; + } - if (isset($pagesEdited[$i - 1]) && !empty($pagesEdited[$i - 1])) { - $childDoc->edited_text = $pagesEdited[$i - 1]; - } + if (isset($gndKeywords) && !empty($gndKeywords)) { + $doc->gnd_keyword = $gndKeywords; + } - if (isset($pagesGndsUuids[$i - 1]) && !empty(($pagesGndsUuids[$i - 1]))) { - $childDoc->entities = array_values($pagesGndsUuids[$i - 1]); - $childDoc->annotation_ids = array_keys($pagesGndsUuids[$i - 1]); - } + if (isset($freeKeywords) && !empty($freeKeywords)) { + $doc->free_keyword = $freeKeywords; + } - $update->addDocument($childDoc); - } - } + if (isset($shelfmark) && !empty($shelfmark)) { + $doc->shelfmark = $shelfmark; + } - $update->addDocument($doc); - $update->addCommit(); - $this->client->execute($update); + if (isset($scriptSource) && !empty($scriptSource)) { + $doc->script_source = $scriptSource; + } - if (isset($doctypeNotes) && is_iterable($doctypeNotes)) { - foreach ($doctypeNotes as $doctypeNoteArr) { - foreach ($doctypeNoteArr as $doctypeNote) { - if (!empty($doctypeNote['id'])) { - $update = $this->client->createUpdate(); - $doc = $update->createDocument(); - $doc->id = $doctypeNote['id']; - $doc->article_id = $doctypeNote['article_id']; - $doc->doctype = $doctypeNote['doctype']; - $doc->note = $doctypeNote['note']; - - $update->addDocument($doc); - $update->addCommit(); - - $this->client->execute($update); - } - } - } - } - } + if (isset($writers) && !empty($writers)) { + $doc->writer = $writers; + } - if (isset($entities) && is_iterable($entities)) { - foreach ($entities as $entity) { - if (!empty($entity['gnd'])) { - $localFilePath = './data/gnd-files/' . $entity['gnd'] . '.json'; - if (!file_exists($localFilePath)) { + if (isset($imageIds) && !empty($imageIds)) { + $doc->image_ids = $imageIds; + } - $remoteFilePath = 'https://lobid.org/gnd/' . $entity['gnd'] . '.json'; + if (isset($imageUrls) && !empty($imageUrls)) { + $doc->image_urls = $imageUrls; + } - try { - $fileContent = @file_get_contents($remoteFilePath, true); + if (isset($documentEntities) && !empty($documentEntities)) { + $doc->entities = $documentEntities; + } - if ($fileContent == false) { - throw new Exception($localFilePath); - } - } catch (Exception $e) { - echo $e->getMessage(); - } + if (isset($notes) && !empty($notes)) { + $doc->notes = $notes; + } - $filesystem = new Filesystem(); - $filesystem->dumpFile($localFilePath, $fileContent); + if (isset($transcription) && !empty($transcription)) { + $doc->transcripted_text = $transcription; + $doc->edited_text = $editedText; + } - $gndArr = json_decode($fileContent); - } else { - $gndArr = json_decode(file_get_contents($localFilePath)); - } + if (!empty($numberOfPages) && intval($numberOfPages)) { + for ($i = 1; $i <= $numberOfPages; $i++) { + $update1 = $this->client->createUpdate(); + $childDoc = $update1->createDocument(); + $childDoc->id = $id . '_page' . $i; + $childDoc->article_id = $id; + $childDoc->article_title = $title; + $childDoc->doctype = 'page'; + $childDoc->page_number = $i; + $childDoc->language = $language; + + if (isset($imageUrls[$i - 1]) && !empty($imageUrls[$i - 1])) { + $childDoc->image_url = $imageUrls[$i - 1]; + } - if (isset($gndArr->preferredName) && !empty($gndArr->preferredName)) { - $preferredName = $gndArr->preferredName; - } + if (isset($pagesTranscription[$i - 1]) && !empty($pagesTranscription[$i - 1])) { + $childDoc->transcripted_text = $pagesTranscription[$i - 1]; + } - if (isset($gndArr->variantName) && !empty($gndArr->variantName)) { - $variantNames = $gndArr->variantName; - } + if (isset($pagesEdited[$i - 1]) && !empty($pagesEdited[$i - 1])) { + $childDoc->edited_text = $pagesEdited[$i - 1]; + } + + if (isset($pagesGndsUuids[$i - 1]) && !empty(($pagesGndsUuids[$i - 1]))) { + $childDoc->entities = array_values($pagesGndsUuids[$i - 1]); + $childDoc->annotation_ids = array_keys($pagesGndsUuids[$i - 1]); + } - $update = $this->client->createUpdate(); - $doc = $update->createDocument(); - $doc->id = $entity['gnd']; - $doc->entity_name = $entity['name']; - $doc->doctype = $entity['doctype']; - $doc->entitytype = $entity['entity_type']; + if (isset($pagesNotesUuids[$i - 1]) && !empty(($pagesNotesUuids[$i - 1]))) { + $childDoc->page_notes = array_values($pagesNotesUuids[$i - 1]); + $childDoc->page_notes_ids = array_keys($pagesNotesUuids[$i - 1]); + } - if (isset($preferredName) && !empty($preferredName)) { - $doc->mostly_use_name = $preferredName; - } + if (isset($pagesSegs[$i - 1]) && !empty(($pagesSegs[$i - 1]))) { + $childDoc->page_segs = array_values($pagesSegs[$i - 1]); + } - if (is_iterable($variantNames) && !empty($variantNames)) { - $doc->alternatively_name = $variantNames; - } + $update->addDocument($childDoc); + } + } - $update->addDocument($doc); - $update->addCommit(); + $update->addDocument($doc); + $update->addCommit(); + $this->client->execute($update); + } + } - $this->client->execute($update); + private function indexEntities(array $entities): void + { + if (isset($entities) && is_iterable($entities)) { + foreach ($entities as $entity) { + if (!empty($entity['gnd'])) { + $localFilePath = './data/gnd-files/' . $entity['gnd'] . '.json'; + if (!file_exists($localFilePath)) { + $remoteFilePath = 'https://lobid.org/gnd/' . $entity['gnd'] . '.json'; + try { + $fileContent = @file_get_contents($remoteFilePath, true); + + if ($fileContent == false) { + throw new Exception($localFilePath); + } + } catch (Exception $e) { + echo $e->getMessage(); } + $filesystem = new Filesystem(); + $filesystem->dumpFile($localFilePath, $fileContent); + $gndArr = json_decode($fileContent); + } else { + $gndArr = json_decode(file_get_contents($localFilePath)); } - } - } else { - $filesystem = new Filesystem(); - $teiImportLogFile = './data/log/teiImportLogs.txt'; - if (!$filesystem->exists($teiImportLogFile)) { - $filesystem->mkdir('./data/log'); - $filesystem->touch($teiImportLogFile); - } + if (isset($gndArr->preferredName) && !empty($gndArr->preferredName)) { + $preferredName = $gndArr->preferredName; + } - $errors = []; - foreach (libxml_get_errors() as $key => $error) { - if (0 === $key) { - $errors[] = explode('/', $error->file)[4].PHP_EOL; - $errors[] = '--------------------'.PHP_EOL; + if (isset($gndArr->variantName) && !empty($gndArr->variantName)) { + $variantNames = $gndArr->variantName; } - $errors[] = $error->message; - } + $update = $this->client->createUpdate(); + $doc = $update->createDocument(); + $doc->id = $entity['gnd']; + $doc->entity_name = $entity['name']; + $doc->doctype = $entity['doctype']; + $doc->entitytype = $entity['entity_type']; - $filesystem->appendToFile($teiImportLogFile, implode('', $errors)); + if (isset($preferredName) && !empty($preferredName)) { + $doc->mostly_used_name = $preferredName; + } - libxml_clear_errors(); + if (isset($variantNames) && !empty($variantNames)) { + $doc->alternatively_name = $variantNames; + } + + $update->addDocument($doc); + $update->addCommit(); + $this->client->execute($update); + } + } + } + } + + private function indexNotes(array $doctypeNotes): void + { + if (isset($doctypeNotes) && is_iterable($doctypeNotes)) { + foreach ($doctypeNotes as $doctypeNoteArr) { + foreach ($doctypeNoteArr as $doctypeNote) { + if (!empty($doctypeNote['id'])) { + $update = $this->client->createUpdate(); + $doc = $update->createDocument(); + $doc->id = $doctypeNote['id']; + $doc->article_id = $doctypeNote['article_id']; + $doc->doctype = $doctypeNote['doctype']; + $doc->note = $doctypeNote['note']; + $update->addDocument($doc); + $update->addCommit(); + $this->client->execute($update); + } + } } } } @@ -855,17 +880,11 @@ class Tei2SolrController extends AbstractController public function getNodeChilds($pagesNode, &$ele) { if (isset($pagesNode->childNodes)) { - foreach ($pagesNode->childNodes as $childNode) { - $ele[] = $childNode; - if ($childNode->childNodes) { - foreach ($childNode->childNodes as $childChildNode) { - $ele[] = $childChildNode; - $this->getNodeChilds($childChildNode, $ele); } } @@ -875,7 +894,10 @@ class Tei2SolrController extends AbstractController return $ele; } - public function getTextVersions(string $filePath, array $graphics): SolrDocument + /** + * @Route("tido/getTextVersions") + */ + public function getTextVersions(string $filePath = './../data/gitlab/Z_1822-02-20_k.xml', array $graphics = []): SolrDocument { $doc = new DOMDocument(); $doc->load($filePath); @@ -884,22 +906,25 @@ class Tei2SolrController extends AbstractController $xpath->registerNamespace('tei', 'http://www.tei-c.org/ns/1.0'); $pagesNodes = $xpath->query('//tei:body'); - $elements = []; + $allElements = []; foreach ($pagesNodes as $pagesNode) { - $elements = $this->getPagesNodes($pagesNode, $elements); + $allElements = $this->getPagesNodes($pagesNode, $allElements); } $editedTextArr = []; $transcriptedTextArr = []; $gndsUuids = []; $pagesGndsUuids = []; + $pagesSegs = []; + $pagesNotesUuids = []; + $notesUuids = []; - foreach ($elements as $k => $myelement) { + foreach ($allElements as $k => $elements) { $renditions = []; $myeditedText = ''; $mytranscriptedText = ''; - foreach ($myelement as $element) { + foreach ($elements as $element) { if (isset($element->nodeName) && ( ($element->nodeName === 'p' && $element->firstChild->nodeName !== 'address') || ($element->nodeName === 'dateline' && 'closer' !== $element->parentNode->nodeName) || @@ -919,7 +944,7 @@ class Tei2SolrController extends AbstractController foreach ($el as $e) { if ($e->nodeName === '#text' && ($e->parentNode->nodeName !== 'abbr' && ($e->nodeName !== 'del' || $e->parentNode->nodeName !== 'add')) - && $e->parentNode->nodeName !== 'note' + && $e->parentNode->nodeName !== 'note' && $e->parentNode->nodeName !== 'seg' ) { if (isset($add) && !empty($add)) { @@ -960,6 +985,10 @@ class Tei2SolrController extends AbstractController $eText .= ''; $tText .= ''; $gnd = false; + } elseif (isset($note) && true === $note) { + $eText .= ''; + $tText .= ''; + $note = false; } else { $eText .= $e->data; @@ -996,6 +1025,37 @@ class Tei2SolrController extends AbstractController } } + } elseif ($e->nodeName === "seg") { + $noteUuid = $this->getUuid(); + $segText = ''; + foreach ($e->childNodes as $childNode) { + if (!empty($childNode->data)) { + $segText .= ' '.trim(preg_replace('/\s+/', ' ', $childNode->data)); + } + } + + $eText .= ''.$segText; + $tText .= $segText; + + $note = true; + + if (!empty($segText)) { + $pagesSegs[$k][$noteUuid] = trim($segText); + } + } elseif ($e->nodeName === "note") { + $noteText = ''; + foreach ($e->childNodes as $childNode) { + if (!empty($childNode->data)) { + $noteText .= ' '.trim(preg_replace('/\s+/', ' ', $childNode->data)); + } + } + + if ((isset($noteUuid) && !empty($noteUuid)) && !empty($noteText)) { + $notesUuids[$noteUuid] = trim($noteText); + $pagesNotesUuids[$k][$noteUuid] = trim($noteText); + + unset($noteUuid); + } } elseif ('item' === $e->nodeName) { if ($liNumber++ === 1) { $li = '
  • '; @@ -1183,6 +1243,8 @@ class Tei2SolrController extends AbstractController $solrDocument->setEditedTextArr($editedTextArr); $solrDocument->setGndsUuids($gndsUuids); $solrDocument->setPagesGndsUuids($pagesGndsUuids); + $solrDocument->setPagesNotesUuids($pagesNotesUuids); + $solrDocument->setPagesSegs($pagesSegs); return $solrDocument; } @@ -1195,15 +1257,10 @@ class Tei2SolrController extends AbstractController for ($i = 1; $i <= 100; $i++) { try { $files = file_get_contents('https://gitlab.gwdg.de/api/v4/projects/3451/repository/tree?access_token=ordUT8XGFzf-HMsXvCXU&path=TEI_doc_bearb&per_page=10&page=' . $i); - $files = json_decode($files, true); - foreach ($files as $file) { - $fileData = file_get_contents('https://gitlab.gwdg.de/api/v4/projects/3451/repository/files/TEI_doc_bearb%2F' . $file['name'] . '?access_token=ordUT8XGFzf-HMsXvCXU&ref=master'); - $fileData = json_decode($fileData, true); - $filesystem = new Filesystem(); try { @@ -1211,13 +1268,10 @@ class Tei2SolrController extends AbstractController } catch (FileException $exception) { echo $file['name'] . ' could not be imported.'; } - } - } catch (FileException $exception) { echo 'Files could not be imported from gitlab'; } } } - } diff --git a/src/Model/SolrDocument.php b/src/Model/SolrDocument.php index 2812546be8beed412884480d17b54506a30bbf89..5cdff0b37d113b8c12e2b988739d0b001b03fe1e 100755 --- a/src/Model/SolrDocument.php +++ b/src/Model/SolrDocument.php @@ -10,6 +10,8 @@ class SolrDocument private array $editedTextArr; private array $gndsUuids; private array $pagesGndsUuids; + private array $pagesNotesUuids; + private array $pagesSegs; public function getTranscriptedText(): string { @@ -82,4 +84,28 @@ class SolrDocument return $this; } + + public function getPagesNotesUuids(): ?array + { + return $this->pagesNotesUuids; + } + + public function setPagesNotesUuids(?array $pagesNotesUuids): SolrDocument + { + $this->pagesNotesUuids = $pagesNotesUuids; + + return $this; + } + + public function getPagesSegs(): ?array + { + return $this->pagesSegs; + } + + public function setPagesSegs(?array $pagesSegs): SolrDocument + { + $this->pagesSegs = $pagesSegs; + + return $this; + } } diff --git a/symfony.lock b/symfony.lock index 3fd7dc85c1761300e306345bf1e1c150d46de641..a9542dfa05b126dc7ea380fb803de9d7f3c9919e 100644 --- a/symfony.lock +++ b/symfony.lock @@ -1,4 +1,7 @@ { + "aws/aws-crt-php": { + "version": "v1.0.2" + }, "aws/aws-sdk-php": { "version": "3.178.4" },