From 74b58cbd92f5cf68819fb6342ebdea7d23b968d0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 21:17:05 +0000 Subject: [PATCH 001/293] build(deps): bump npm-asset/lodash from 4.17.20-patch1 to 4.17.21 Bumps [npm-asset/lodash](https://github.com/lodash/lodash) from 4.17.20-patch1 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/commits/4.17.21) Signed-off-by: dependabot-preview[bot] --- composer.lock | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index bb1743de5..d871f2738 100644 --- a/composer.lock +++ b/composer.lock @@ -4541,16 +4541,10 @@ }, { "name": "npm-asset/lodash", - "version": "4.17.20-patch1", - "source": { - "type": "git", - "url": "https://github.com/lodash/lodash.git", - "reference": "f2e7063ee409ff40a60b14370c58dceee1a2efd4" - }, + "version": "4.17.21", "dist": { - "type": "zip", - "url": "https://api.github.com/repos/lodash/lodash/zipball/f2e7063ee409ff40a60b14370c58dceee1a2efd4", - "reference": "f2e7063ee409ff40a60b14370c58dceee1a2efd4" + "type": "tar", + "url": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" }, "type": "npm-asset", "license": [ From d3080326ff42a3a5891b72a6117ef40eb52fc335 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 21:19:00 +0000 Subject: [PATCH 002/293] build(deps-dev): bump mockery/mockery from 1.3.3 to 1.3.4 Bumps [mockery/mockery](https://github.com/mockery/mockery) from 1.3.3 to 1.3.4. - [Release notes](https://github.com/mockery/mockery/releases) - [Changelog](https://github.com/mockery/mockery/blob/master/CHANGELOG.md) - [Commits](https://github.com/mockery/mockery/compare/1.3.3...1.3.4) Signed-off-by: dependabot-preview[bot] --- composer.lock | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index bb1743de5..10e6df0a6 100644 --- a/composer.lock +++ b/composer.lock @@ -9107,20 +9107,24 @@ "keywords": [ "test" ], + "support": { + "issues": "https://github.com/hamcrest/hamcrest-php/issues", + "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1" + }, "time": "2020-07-09T08:09:16+00:00" }, { "name": "mockery/mockery", - "version": "1.3.3", + "version": "1.3.4", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "60fa2f67f6e4d3634bb4a45ff3171fa52215800d" + "reference": "31467aeb3ca3188158613322d66df81cedd86626" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/60fa2f67f6e4d3634bb4a45ff3171fa52215800d", - "reference": "60fa2f67f6e4d3634bb4a45ff3171fa52215800d", + "url": "https://api.github.com/repos/mockery/mockery/zipball/31467aeb3ca3188158613322d66df81cedd86626", + "reference": "31467aeb3ca3188158613322d66df81cedd86626", "shasum": "" }, "require": { @@ -9172,7 +9176,11 @@ "test double", "testing" ], - "time": "2020-08-11T18:10:21+00:00" + "support": { + "issues": "https://github.com/mockery/mockery/issues", + "source": "https://github.com/mockery/mockery/tree/1.3.4" + }, + "time": "2021-02-24T09:51:00+00:00" }, { "name": "myclabs/deep-copy", From fb5513b362019ae63d9bdc625d1d63911ec88957 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 2 Mar 2021 21:14:39 +0000 Subject: [PATCH 003/293] build(deps): [security] bump phpoffice/phpspreadsheet Bumps [phpoffice/phpspreadsheet](https://github.com/PHPOffice/PhpSpreadsheet) from 1.15.0 to 1.17.1. **This update includes a security fix.** - [Release notes](https://github.com/PHPOffice/PhpSpreadsheet/releases) - [Changelog](https://github.com/PHPOffice/PhpSpreadsheet/blob/master/CHANGELOG.md) - [Commits](https://github.com/PHPOffice/PhpSpreadsheet/compare/1.15.0...1.17.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 283 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 194 insertions(+), 89 deletions(-) diff --git a/composer.lock b/composer.lock index bb1743de5..6c7048844 100644 --- a/composer.lock +++ b/composer.lock @@ -299,6 +299,10 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", + "support": { + "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", + "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" + }, "time": "2019-12-04T15:06:13+00:00" }, { @@ -1071,6 +1075,10 @@ "keywords": [ "html" ], + "support": { + "issues": "https://github.com/ezyang/htmlpurifier/issues", + "source": "https://github.com/ezyang/htmlpurifier/tree/master" + }, "time": "2020-06-29T00:56:53+00:00" }, { @@ -3608,6 +3616,10 @@ "stream", "zip" ], + "support": { + "issues": "https://github.com/maennchen/ZipStream-PHP/issues", + "source": "https://github.com/maennchen/ZipStream-PHP/tree/master" + }, "funding": [ { "url": "https://opencollective.com/zipstream", @@ -3709,24 +3721,28 @@ "complex", "mathematics" ], + "support": { + "issues": "https://github.com/MarkBaker/PHPComplex/issues", + "source": "https://github.com/MarkBaker/PHPComplex/tree/PHP8" + }, "time": "2020-08-26T10:42:07+00:00" }, { "name": "markbaker/matrix", - "version": "2.0.0", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPMatrix.git", - "reference": "9567d9c4c519fbe40de01dbd1e4469dbbb66f46a" + "reference": "361c0f545c3172ee26c3d596a0aa03f0cef65e6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/9567d9c4c519fbe40de01dbd1e4469dbbb66f46a", - "reference": "9567d9c4c519fbe40de01dbd1e4469dbbb66f46a", + "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/361c0f545c3172ee26c3d596a0aa03f0cef65e6a", + "reference": "361c0f545c3172ee26c3d596a0aa03f0cef65e6a", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", @@ -3744,22 +3760,22 @@ "Matrix\\": "classes/src/" }, "files": [ - "classes/src/functions/adjoint.php", - "classes/src/functions/antidiagonal.php", - "classes/src/functions/cofactors.php", - "classes/src/functions/determinant.php", - "classes/src/functions/diagonal.php", - "classes/src/functions/identity.php", - "classes/src/functions/inverse.php", - "classes/src/functions/minors.php", - "classes/src/functions/trace.php", - "classes/src/functions/transpose.php", - "classes/src/operations/add.php", - "classes/src/operations/directsum.php", - "classes/src/operations/subtract.php", - "classes/src/operations/multiply.php", - "classes/src/operations/divideby.php", - "classes/src/operations/divideinto.php" + "classes/src/Functions/adjoint.php", + "classes/src/Functions/antidiagonal.php", + "classes/src/Functions/cofactors.php", + "classes/src/Functions/determinant.php", + "classes/src/Functions/diagonal.php", + "classes/src/Functions/identity.php", + "classes/src/Functions/inverse.php", + "classes/src/Functions/minors.php", + "classes/src/Functions/trace.php", + "classes/src/Functions/transpose.php", + "classes/src/Operations/add.php", + "classes/src/Operations/directsum.php", + "classes/src/Operations/subtract.php", + "classes/src/Operations/multiply.php", + "classes/src/Operations/divideby.php", + "classes/src/Operations/divideinto.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -3779,7 +3795,11 @@ "matrix", "vector" ], - "time": "2020-08-28T17:11:00+00:00" + "support": { + "issues": "https://github.com/MarkBaker/PHPMatrix/issues", + "source": "https://github.com/MarkBaker/PHPMatrix/tree/2.1.2" + }, + "time": "2021-01-23T16:37:31+00:00" }, { "name": "mews/purifier", @@ -3951,26 +3971,26 @@ }, { "name": "myclabs/php-enum", - "version": "1.7.7", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/myclabs/php-enum.git", - "reference": "d178027d1e679832db9f38248fcc7200647dc2b7" + "reference": "46cf3d8498b095bd33727b13fd5707263af99421" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/php-enum/zipball/d178027d1e679832db9f38248fcc7200647dc2b7", - "reference": "d178027d1e679832db9f38248fcc7200647dc2b7", + "url": "https://api.github.com/repos/myclabs/php-enum/zipball/46cf3d8498b095bd33727b13fd5707263af99421", + "reference": "46cf3d8498b095bd33727b13fd5707263af99421", "shasum": "" }, "require": { "ext-json": "*", - "php": ">=7.1" + "php": "^7.3 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^7", + "phpunit/phpunit": "^9.5", "squizlabs/php_codesniffer": "1.*", - "vimeo/psalm": "^3.8" + "vimeo/psalm": "^4.5.1" }, "type": "library", "autoload": { @@ -3993,6 +4013,10 @@ "keywords": [ "enum" ], + "support": { + "issues": "https://github.com/myclabs/php-enum/issues", + "source": "https://github.com/myclabs/php-enum/tree/1.8.0" + }, "funding": [ { "url": "https://github.com/mnapoli", @@ -4003,7 +4027,7 @@ "type": "tidelift" } ], - "time": "2020-11-14T18:14:52+00:00" + "time": "2021-02-15T16:11:48+00:00" }, { "name": "nelexa/zip", @@ -4162,16 +4186,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.10.3", + "version": "v4.10.4", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984" + "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984", - "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e", + "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e", "shasum": "" }, "require": { @@ -4210,7 +4234,11 @@ "parser", "php" ], - "time": "2020-12-03T17:45:45+00:00" + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" + }, + "time": "2020-12-20T10:01:03+00:00" }, { "name": "njuptaaa/moss", @@ -5173,16 +5201,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.15.0", + "version": "1.17.1", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "a8e8068b31b8119e1daa5b1eb5715a3a8ea8305f" + "reference": "c55269cb06911575a126dc225a05c0e4626e5fb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a8e8068b31b8119e1daa5b1eb5715a3a8ea8305f", - "reference": "a8e8068b31b8119e1daa5b1eb5715a3a8ea8305f", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/c55269cb06911575a126dc225a05c0e4626e5fb4", + "reference": "c55269cb06911575a126dc225a05c0e4626e5fb4", "shasum": "" }, "require": { @@ -5199,21 +5227,22 @@ "ext-xmlwriter": "*", "ext-zip": "*", "ext-zlib": "*", + "ezyang/htmlpurifier": "^4.13", "maennchen/zipstream-php": "^2.1", - "markbaker/complex": "^1.5|^2.0", - "markbaker/matrix": "^1.2|^2.0", - "php": "^7.2|^8.0", + "markbaker/complex": "^1.5||^2.0", + "markbaker/matrix": "^1.2||^2.0", + "php": "^7.2||^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", "psr/simple-cache": "^1.0" }, "require-dev": { "dompdf/dompdf": "^0.8.5", - "friendsofphp/php-cs-fixer": "^2.16", + "friendsofphp/php-cs-fixer": "^2.18", "jpgraph/jpgraph": "^4.0", "mpdf/mpdf": "^8.0", "phpcompatibility/php-compatibility": "^9.3", - "phpunit/phpunit": "^8.5|^9.3", + "phpunit/phpunit": "^8.5||^9.3", "squizlabs/php_codesniffer": "^3.5", "tecnickcom/tcpdf": "^6.3" }, @@ -5265,7 +5294,11 @@ "xls", "xlsx" ], - "time": "2020-10-11T13:20:59+00:00" + "support": { + "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.17.1" + }, + "time": "2021-03-02T17:54:11+00:00" }, { "name": "phpoption/phpoption", @@ -5559,6 +5592,10 @@ "container-interop", "psr" ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/master" + }, "time": "2017-02-14T16:28:37+00:00" }, { @@ -5608,6 +5645,9 @@ "psr", "psr-18" ], + "support": { + "source": "https://github.com/php-fig/http-client/tree/master" + }, "time": "2020-06-29T06:28:15+00:00" }, { @@ -5660,6 +5700,9 @@ "request", "response" ], + "support": { + "source": "https://github.com/php-fig/http-factory/tree/master" + }, "time": "2019-04-30T12:38:16+00:00" }, { @@ -5710,6 +5753,9 @@ "request", "response" ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/master" + }, "time": "2016-08-06T14:39:51+00:00" }, { @@ -5757,6 +5803,9 @@ "psr", "psr-3" ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.3" + }, "time": "2020-03-23T09:12:05+00:00" }, { @@ -5805,6 +5854,9 @@ "psr-16", "simple-cache" ], + "support": { + "source": "https://github.com/php-fig/simple-cache/tree/master" + }, "time": "2017-10-23T01:57:42+00:00" }, { @@ -6406,16 +6458,16 @@ }, { "name": "symfony/console", - "version": "v4.4.17", + "version": "v4.4.19", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c8e37f6928c19816437a4dd7bf16e3bd79941470" + "reference": "24026c44fc37099fa145707fecd43672831b837a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c8e37f6928c19816437a4dd7bf16e3bd79941470", - "reference": "c8e37f6928c19816437a4dd7bf16e3bd79941470", + "url": "https://api.github.com/repos/symfony/console/zipball/24026c44fc37099fa145707fecd43672831b837a", + "reference": "24026c44fc37099fa145707fecd43672831b837a", "shasum": "" }, "require": { @@ -6472,8 +6524,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Console Component", + "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/console/tree/v4.4.19" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6488,7 +6543,7 @@ "type": "tidelift" } ], - "time": "2020-11-28T10:15:42+00:00" + "time": "2021-01-27T09:09:26+00:00" }, { "name": "symfony/css-selector", @@ -6554,16 +6609,16 @@ }, { "name": "symfony/debug", - "version": "v4.4.17", + "version": "v4.4.19", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "65fe7b49868378319b82da3035fb30801b931c47" + "reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/65fe7b49868378319b82da3035fb30801b931c47", - "reference": "65fe7b49868378319b82da3035fb30801b931c47", + "url": "https://api.github.com/repos/symfony/debug/zipball/af4987aa4a5630e9615be9d9c3ed1b0f24ca449c", + "reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c", "shasum": "" }, "require": { @@ -6600,8 +6655,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Debug Component", + "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/debug/tree/v4.4.19" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6616,7 +6674,7 @@ "type": "tidelift" } ], - "time": "2020-10-28T20:42:29+00:00" + "time": "2021-01-27T09:09:26+00:00" }, { "name": "symfony/deprecation-contracts", @@ -6959,6 +7017,9 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.9" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7093,6 +7154,9 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/http-client-contracts/tree/v2.3.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7353,16 +7417,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", "shasum": "" }, "require": { @@ -7374,7 +7438,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7411,6 +7475,9 @@ "polyfill", "portable" ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7425,7 +7492,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-iconv", @@ -7590,16 +7657,16 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "727d1096295d807c309fb01a851577302394c897" + "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897", - "reference": "727d1096295d807c309fb01a851577302394c897", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", + "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", "shasum": "" }, "require": { @@ -7611,7 +7678,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7653,6 +7720,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7667,20 +7737,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" + "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", + "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", "shasum": "" }, "require": { @@ -7692,7 +7762,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7730,6 +7800,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7744,7 +7817,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-php72", @@ -7821,16 +7894,16 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed" + "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/8ff431c517be11c78c48a39a66d37431e26a6bed", - "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", "shasum": "" }, "require": { @@ -7839,7 +7912,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7879,6 +7952,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7893,20 +7969,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de" + "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/e70aa8b064c5b72d3df2abd5ab1e90464ad009de", - "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91", + "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91", "shasum": "" }, "require": { @@ -7915,7 +7991,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7959,6 +8035,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7973,7 +8052,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/process", @@ -8256,6 +8335,9 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/master" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8416,6 +8498,9 @@ "interoperability", "standards" ], + "support": { + "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -9394,6 +9479,10 @@ "reflection", "static analysis" ], + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", + "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" + }, "time": "2020-06-27T09:03:43+00:00" }, { @@ -9446,6 +9535,10 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + }, "time": "2020-09-03T19:13:55+00:00" }, { @@ -9491,6 +9584,10 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "support": { + "issues": "https://github.com/phpDocumentor/TypeResolver/issues", + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0" + }, "time": "2020-09-17T18:55:26+00:00" }, { @@ -10086,6 +10183,10 @@ "unidiff", "unified diff" ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" + }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -10539,12 +10640,12 @@ "version": "1.9.1", "source": { "type": "git", - "url": "https://github.com/webmozart/assert.git", + "url": "https://github.com/webmozarts/assert.git", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", "shasum": "" }, @@ -10581,6 +10682,10 @@ "check", "validate" ], + "support": { + "issues": "https://github.com/webmozarts/assert/issues", + "source": "https://github.com/webmozarts/assert/tree/1.9.1" + }, "time": "2020-07-08T17:02:28+00:00" } ], From 0bfe0afd2ff45a8eedc3a391f87c9ea53fb32d18 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 2 Mar 2021 21:18:08 +0000 Subject: [PATCH 004/293] build(deps): bump npm-asset/jquery from 3.5.1 to 3.6.0 Bumps npm-asset/jquery from 3.5.1 to 3.6.0. Signed-off-by: dependabot-preview[bot] --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index bb1743de5..bfa21a4fe 100644 --- a/composer.lock +++ b/composer.lock @@ -4491,10 +4491,10 @@ }, { "name": "npm-asset/jquery", - "version": "3.5.1", + "version": "3.6.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz" + "url": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz" }, "type": "npm-asset", "license": [ From d037d6f94ac64a71935bd53f655a74b104cb8f19 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Mar 2021 21:17:32 +0000 Subject: [PATCH 005/293] build(deps): bump npm-asset/codemirror from 5.58.3 to 5.59.4 Bumps npm-asset/codemirror from 5.58.3 to 5.59.4. Signed-off-by: dependabot-preview[bot] --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index bb1743de5..1d79d3034 100644 --- a/composer.lock +++ b/composer.lock @@ -4374,10 +4374,10 @@ }, { "name": "npm-asset/codemirror", - "version": "5.58.3", + "version": "5.59.4", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/codemirror/-/codemirror-5.58.3.tgz" + "url": "https://registry.npmjs.org/codemirror/-/codemirror-5.59.4.tgz" }, "type": "npm-asset", "license": [ From 579a4f012b22ed4a571927aceb9681605be96943 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 16 Mar 2021 21:19:40 +0000 Subject: [PATCH 006/293] build(deps-dev): bump filp/whoops from 2.9.1 to 2.10.0 Bumps [filp/whoops](https://github.com/filp/whoops) from 2.9.1 to 2.10.0. - [Release notes](https://github.com/filp/whoops/releases) - [Changelog](https://github.com/filp/whoops/blob/master/CHANGELOG.md) - [Commits](https://github.com/filp/whoops/compare/2.9.1...2.10.0) Signed-off-by: dependabot-preview[bot] --- composer.lock | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index bb1743de5..eeeb9cbc7 100644 --- a/composer.lock +++ b/composer.lock @@ -5757,6 +5757,9 @@ "psr", "psr-3" ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.3" + }, "time": "2020-03-23T09:12:05+00:00" }, { @@ -8952,16 +8955,16 @@ }, { "name": "filp/whoops", - "version": "2.9.1", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "307fb34a5ab697461ec4c9db865b20ff2fd40771" + "reference": "6ecda5217bf048088b891f7403b262906be5a957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/307fb34a5ab697461ec4c9db865b20ff2fd40771", - "reference": "307fb34a5ab697461ec4c9db865b20ff2fd40771", + "url": "https://api.github.com/repos/filp/whoops/zipball/6ecda5217bf048088b891f7403b262906be5a957", + "reference": "6ecda5217bf048088b891f7403b262906be5a957", "shasum": "" }, "require": { @@ -9009,7 +9012,17 @@ "throwable", "whoops" ], - "time": "2020-11-01T12:00:00+00:00" + "support": { + "issues": "https://github.com/filp/whoops/issues", + "source": "https://github.com/filp/whoops/tree/2.10.0" + }, + "funding": [ + { + "url": "https://github.com/denis-sokolov", + "type": "github" + } + ], + "time": "2021-03-16T12:00:00+00:00" }, { "name": "fzaninotto/faker", From 3fd642e7b73cb09cdb91528cbc3b841b6aa08dde Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 17 Mar 2021 10:14:17 +0000 Subject: [PATCH 007/293] build(deps): [security] bump laravel/framework from 6.20.7 to 6.20.19 Bumps [laravel/framework](https://github.com/laravel/framework) from 6.20.7 to 6.20.19. **This update includes security fixes.** - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/8.x/CHANGELOG-6.x.md) - [Commits](https://github.com/laravel/framework/compare/v6.20.7...v6.20.19) Signed-off-by: dependabot-preview[bot] --- composer.lock | 468 +++++++++++++++++++++++++++++++------------------- 1 file changed, 296 insertions(+), 172 deletions(-) diff --git a/composer.lock b/composer.lock index 3a26b7a93..299950038 100644 --- a/composer.lock +++ b/composer.lock @@ -673,6 +673,10 @@ "uppercase", "words" ], + "support": { + "issues": "https://github.com/doctrine/inflector/issues", + "source": "https://github.com/doctrine/inflector/tree/2.0.x" + }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -749,6 +753,10 @@ "parser", "php" ], + "support": { + "issues": "https://github.com/doctrine/lexer/issues", + "source": "https://github.com/doctrine/lexer/tree/1.2.1" + }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -885,6 +893,10 @@ "cron", "schedule" ], + "support": { + "issues": "https://github.com/dragonmantank/cron-expression/issues", + "source": "https://github.com/dragonmantank/cron-expression/tree/v2.3.1" + }, "funding": [ { "url": "https://github.com/dragonmantank", @@ -895,16 +907,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.24", + "version": "2.1.25", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "ca90a3291eee1538cd48ff25163240695bd95448" + "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ca90a3291eee1538cd48ff25163240695bd95448", - "reference": "ca90a3291eee1538cd48ff25163240695bd95448", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4", + "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4", "shasum": "" }, "require": { @@ -949,13 +961,17 @@ "validation", "validator" ], + "support": { + "issues": "https://github.com/egulias/EmailValidator/issues", + "source": "https://github.com/egulias/EmailValidator/tree/2.1.25" + }, "funding": [ { "url": "https://github.com/egulias", "type": "github" } ], - "time": "2020-11-14T15:56:27+00:00" + "time": "2020-12-29T14:50:06+00:00" }, { "name": "encore/laravel-admin", @@ -2490,16 +2506,16 @@ }, { "name": "laravel/framework", - "version": "v6.20.7", + "version": "v6.20.19", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "bdc79701b567c5f8ed44d212dd4a261b8300b9c3" + "reference": "c25308a00c7bbd38401a6254ab403146da9cfd69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/bdc79701b567c5f8ed44d212dd4a261b8300b9c3", - "reference": "bdc79701b567c5f8ed44d212dd4a261b8300b9c3", + "url": "https://api.github.com/repos/laravel/framework/zipball/c25308a00c7bbd38401a6254ab403146da9cfd69", + "reference": "c25308a00c7bbd38401a6254ab403146da9cfd69", "shasum": "" }, "require": { @@ -2635,7 +2651,11 @@ "framework", "laravel" ], - "time": "2020-12-08T15:31:27+00:00" + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2021-03-16T14:18:55+00:00" }, { "name": "laravel/passport", @@ -3041,6 +3061,12 @@ "md", "parser" ], + "support": { + "docs": "https://commonmark.thephpleague.com/", + "issues": "https://github.com/thephpleague/commonmark/issues", + "rss": "https://github.com/thephpleague/commonmark/releases.atom", + "source": "https://github.com/thephpleague/commonmark" + }, "funding": [ { "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", @@ -3270,6 +3296,10 @@ "sftp", "storage" ], + "support": { + "issues": "https://github.com/thephpleague/flysystem/issues", + "source": "https://github.com/thephpleague/flysystem/tree/1.x" + }, "funding": [ { "url": "https://offset.earth/frankdejonge", @@ -3280,16 +3310,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.5.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa" + "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/353f66d7555d8a90781f6f5e7091932f9a4250aa", - "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", + "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", "shasum": "" }, "require": { @@ -3297,8 +3327,9 @@ "php": "^7.2 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.36", - "phpunit/phpunit": "^8.5.8" + "friendsofphp/php-cs-fixer": "^2.18", + "phpstan/phpstan": "^0.12.68", + "phpunit/phpunit": "^8.5.8 || ^9.3" }, "type": "library", "autoload": { @@ -3317,6 +3348,10 @@ } ], "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" + }, "funding": [ { "url": "https://github.com/frankdejonge", @@ -3327,7 +3362,7 @@ "type": "tidelift" } ], - "time": "2020-10-18T11:50:25+00:00" + "time": "2021-01-18T20:58:21+00:00" }, { "name": "league/oauth1-client", @@ -3880,16 +3915,16 @@ }, { "name": "monolog/monolog", - "version": "2.1.1", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f9eee5cec93dfb313a38b6b288741e84e53f02d5" + "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f9eee5cec93dfb313a38b6b288741e84e53f02d5", - "reference": "f9eee5cec93dfb313a38b6b288741e84e53f02d5", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084", + "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084", "shasum": "" }, "require": { @@ -3902,16 +3937,17 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "elasticsearch/elasticsearch": "^6.0", + "elasticsearch/elasticsearch": "^7", "graylog2/gelf-php": "^1.4.2", + "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "php-parallel-lint/php-parallel-lint": "^1.0", "phpspec/prophecy": "^1.6.1", + "phpstan/phpstan": "^0.12.59", "phpunit/phpunit": "^8.5", "predis/predis": "^1.1", "rollbar/rollbar": "^1.3", - "ruflin/elastica": ">=0.90 <3.0", + "ruflin/elastica": ">=0.90 <7.0.1", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { @@ -3931,7 +3967,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-main": "2.x-dev" } }, "autoload": { @@ -3947,16 +3983,20 @@ { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "description": "Sends your logs to files, sockets, inboxes, databases and various web services", - "homepage": "http://github.com/Seldaek/monolog", + "homepage": "https://github.com/Seldaek/monolog", "keywords": [ "log", "logging", "psr-3" ], + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/2.2.0" + }, "funding": [ { "url": "https://github.com/Seldaek", @@ -3967,7 +4007,7 @@ "type": "tidelift" } ], - "time": "2020-07-23T08:41:23+00:00" + "time": "2020-12-14T13:15:25+00:00" }, { "name": "myclabs/php-enum", @@ -4097,16 +4137,16 @@ }, { "name": "nesbot/carbon", - "version": "2.42.0", + "version": "2.46.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "d0463779663437392fe42ff339ebc0213bd55498" + "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d0463779663437392fe42ff339ebc0213bd55498", - "reference": "d0463779663437392fe42ff339ebc0213bd55498", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4", + "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4", "shasum": "" }, "require": { @@ -4122,7 +4162,7 @@ "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^0.12.54", - "phpunit/phpunit": "^7.5 || ^8.0", + "phpunit/phpunit": "^7.5.20 || ^8.5.14", "squizlabs/php_codesniffer": "^3.4" }, "bin": [ @@ -4172,6 +4212,10 @@ "datetime", "time" ], + "support": { + "issues": "https://github.com/briannesbitt/Carbon/issues", + "source": "https://github.com/briannesbitt/Carbon" + }, "funding": [ { "url": "https://opencollective.com/Carbon", @@ -4182,7 +4226,7 @@ "type": "tidelift" } ], - "time": "2020-11-28T14:25:28+00:00" + "time": "2021-02-24T17:30:44+00:00" }, { "name": "nikic/php-parser", @@ -4913,6 +4957,10 @@ "serialization", "serialize" ], + "support": { + "issues": "https://github.com/opis/closure/issues", + "source": "https://github.com/opis/closure/tree/3.6.1" + }, "time": "2020-11-07T02:01:34+00:00" }, { @@ -5017,6 +5065,11 @@ "pseudorandom", "random" ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" + }, "time": "2018-07-02T15:55:56+00:00" }, { @@ -5347,6 +5400,10 @@ "php", "type" ], + "support": { + "issues": "https://github.com/schmittjoh/php-option/issues", + "source": "https://github.com/schmittjoh/php-option/tree/1.7.5" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -5541,27 +5598,22 @@ }, { "name": "psr/container", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.2.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -5574,7 +5626,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common Container Interface (PHP FIG PSR-11)", @@ -5588,9 +5640,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" + "source": "https://github.com/php-fig/container/tree/1.1.1" }, - "time": "2017-02-14T16:28:37+00:00" + "time": "2021-03-05T17:36:06+00:00" }, { "name": "psr/http-client", @@ -6052,6 +6104,12 @@ "identifier", "uuid" ], + "support": { + "issues": "https://github.com/ramsey/uuid/issues", + "rss": "https://github.com/ramsey/uuid/releases.atom", + "source": "https://github.com/ramsey/uuid", + "wiki": "https://github.com/ramsey/uuid/wiki" + }, "time": "2020-02-21T04:36:14+00:00" }, { @@ -6381,20 +6439,20 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.4", + "version": "v6.2.7", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e" + "reference": "15f7faf8508e04471f666633addacf54c0ab5933" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", - "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933", + "reference": "15f7faf8508e04471f666633addacf54c0ab5933", "shasum": "" }, "require": { - "egulias/email-validator": "^2.0", + "egulias/email-validator": "^2.0|^3.1", "php": ">=7.0.0", "symfony/polyfill-iconv": "^1.0", "symfony/polyfill-intl-idn": "^1.10", @@ -6438,6 +6496,10 @@ "mail", "mailer" ], + "support": { + "issues": "https://github.com/swiftmailer/swiftmailer/issues", + "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7" + }, "funding": [ { "url": "https://github.com/fabpot", @@ -6448,20 +6510,20 @@ "type": "tidelift" } ], - "time": "2020-12-08T18:02:06+00:00" + "time": "2021-03-09T12:30:35+00:00" }, { "name": "symfony/console", - "version": "v4.4.19", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "24026c44fc37099fa145707fecd43672831b837a" + "reference": "c98349bda966c70d6c08b4cd8658377c94166492" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/24026c44fc37099fa145707fecd43672831b837a", - "reference": "24026c44fc37099fa145707fecd43672831b837a", + "url": "https://api.github.com/repos/symfony/console/zipball/c98349bda966c70d6c08b4cd8658377c94166492", + "reference": "c98349bda966c70d6c08b4cd8658377c94166492", "shasum": "" }, "require": { @@ -6521,7 +6583,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.19" + "source": "https://github.com/symfony/console/tree/v4.4.20" }, "funding": [ { @@ -6537,20 +6599,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T09:09:26+00:00" + "time": "2021-02-22T18:44:15+00:00" }, { "name": "symfony/css-selector", - "version": "v5.2.0", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256" + "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256", - "reference": "b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/f65f217b3314504a1ec99c2d6ef69016bb13490f", + "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f", "shasum": "" }, "require": { @@ -6583,8 +6645,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony CssSelector Component", + "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/css-selector/tree/v5.2.4" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6599,20 +6664,20 @@ "type": "tidelift" } ], - "time": "2020-10-28T21:31:18+00:00" + "time": "2021-01-27T10:01:46+00:00" }, { "name": "symfony/debug", - "version": "v4.4.19", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c" + "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/af4987aa4a5630e9615be9d9c3ed1b0f24ca449c", - "reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c", + "url": "https://api.github.com/repos/symfony/debug/zipball/157bbec4fd773bae53c5483c50951a5530a2cc16", + "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16", "shasum": "" }, "require": { @@ -6652,7 +6717,7 @@ "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.19" + "source": "https://github.com/symfony/debug/tree/v4.4.20" }, "funding": [ { @@ -6668,7 +6733,7 @@ "type": "tidelift" } ], - "time": "2021-01-27T09:09:26+00:00" + "time": "2021-01-28T16:54:48+00:00" }, { "name": "symfony/deprecation-contracts", @@ -6718,6 +6783,9 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/master" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6807,16 +6875,16 @@ }, { "name": "symfony/error-handler", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "b0887cf8fc692eef2a4cf11cee3c5f5eb93fcfdf" + "reference": "a191550d46b73a527b9d244f185fef439d41cf15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/b0887cf8fc692eef2a4cf11cee3c5f5eb93fcfdf", - "reference": "b0887cf8fc692eef2a4cf11cee3c5f5eb93fcfdf", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/a191550d46b73a527b9d244f185fef439d41cf15", + "reference": "a191550d46b73a527b9d244f185fef439d41cf15", "shasum": "" }, "require": { @@ -6853,8 +6921,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony ErrorHandler Component", + "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/error-handler/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6869,20 +6940,20 @@ "type": "tidelift" } ], - "time": "2020-10-28T20:42:29+00:00" + "time": "2021-02-11T08:19:35+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "f029d6f21eac61ab23198e7aca40e7638e8c8924" + "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f029d6f21eac61ab23198e7aca40e7638e8c8924", - "reference": "f029d6f21eac61ab23198e7aca40e7638e8c8924", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c352647244bd376bf7d31efbd5401f13f50dad0c", + "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c", "shasum": "" }, "require": { @@ -6933,8 +7004,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "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/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6949,7 +7023,7 @@ "type": "tidelift" } ], - "time": "2020-10-31T22:44:29+00:00" + "time": "2021-01-27T09:09:26+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -7032,16 +7106,16 @@ }, { "name": "symfony/finder", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9f1d1d883b79a91ef320c0c6e803494e042ef36e" + "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9f1d1d883b79a91ef320c0c6e803494e042ef36e", - "reference": "9f1d1d883b79a91ef320c0c6e803494e042ef36e", + "url": "https://api.github.com/repos/symfony/finder/zipball/2543795ab1570df588b9bbd31e1a2bd7037b94f6", + "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6", "shasum": "" }, "require": { @@ -7070,8 +7144,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Finder Component", + "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7086,7 +7163,7 @@ "type": "tidelift" } ], - "time": "2020-11-17T19:45:34+00:00" + "time": "2021-02-12T10:48:09+00:00" }, { "name": "symfony/http-client-contracts", @@ -7169,22 +7246,23 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "9eeb37ec0ff3049c782ca67041648e28ddd75a94" + "reference": "02d968647fe61b2f419a8dc70c468a9d30a48d3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9eeb37ec0ff3049c782ca67041648e28ddd75a94", - "reference": "9eeb37ec0ff3049c782ca67041648e28ddd75a94", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/02d968647fe61b2f419a8dc70c468a9d30a48d3a", + "reference": "02d968647fe61b2f419a8dc70c468a9d30a48d3a", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/mime": "^4.3|^5.0", - "symfony/polyfill-mbstring": "~1.1" + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php80": "^1.15" }, "require-dev": { "predis/predis": "~1.0", @@ -7213,8 +7291,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony HttpFoundation Component", + "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/http-foundation/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7229,20 +7310,20 @@ "type": "tidelift" } ], - "time": "2020-11-03T11:58:18+00:00" + "time": "2021-02-25T17:11:33+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "9f5605ee05406d8afa40dc4f2954c6a61de3a984" + "reference": "4f36548465489f293b05406f1770492f6efb8adb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9f5605ee05406d8afa40dc4f2954c6a61de3a984", - "reference": "9f5605ee05406d8afa40dc4f2954c6a61de3a984", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4f36548465489f293b05406f1770492f6efb8adb", + "reference": "4f36548465489f293b05406f1770492f6efb8adb", "shasum": "" }, "require": { @@ -7262,13 +7343,13 @@ "symfony/console": ">=5", "symfony/dependency-injection": "<4.3", "symfony/translation": "<4.2", - "twig/twig": "<1.34|<2.4,>=2" + "twig/twig": "<1.43|<2.13,>=2" }, "provide": { "psr/log-implementation": "1.0" }, "require-dev": { - "psr/cache": "~1.0", + "psr/cache": "^1.0|^2.0|^3.0", "symfony/browser-kit": "^4.3|^5.0", "symfony/config": "^3.4|^4.0|^5.0", "symfony/console": "^3.4|^4.0", @@ -7283,7 +7364,7 @@ "symfony/templating": "^3.4|^4.0|^5.0", "symfony/translation": "^4.2|^5.0", "symfony/translation-contracts": "^1.1|^2", - "twig/twig": "^1.34|^2.4|^3.0" + "twig/twig": "^1.43|^2.13|^3.0.4" }, "suggest": { "symfony/browser-kit": "", @@ -7314,8 +7395,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony HttpKernel Component", + "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/http-kernel/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7330,20 +7414,20 @@ "type": "tidelift" } ], - "time": "2020-11-29T09:23:08+00:00" + "time": "2021-03-04T18:00:27+00:00" }, { "name": "symfony/mime", - "version": "v5.2.0", + "version": "v5.2.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "05f667e8fa029568964fd3bec6bc17765b853cc5" + "reference": "554ba128f1955038b45db5e1fa7e93bfc683b139" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/05f667e8fa029568964fd3bec6bc17765b853cc5", - "reference": "05f667e8fa029568964fd3bec6bc17765b853cc5", + "url": "https://api.github.com/repos/symfony/mime/zipball/554ba128f1955038b45db5e1fa7e93bfc683b139", + "reference": "554ba128f1955038b45db5e1fa7e93bfc683b139", "shasum": "" }, "require": { @@ -7354,10 +7438,13 @@ "symfony/polyfill-php80": "^1.15" }, "conflict": { + "egulias/email-validator": "~3.0.0", + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<4.4" }, "require-dev": { - "egulias/email-validator": "^2.1.10", + "egulias/email-validator": "^2.1.10|^3.1", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/dependency-injection": "^4.4|^5.0", "symfony/property-access": "^4.4|^5.1", @@ -7387,12 +7474,15 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "A library to manipulate MIME messages", + "description": "Allows manipulating MIME messages", "homepage": "https://symfony.com", "keywords": [ "mime", "mime-type" ], + "support": { + "source": "https://github.com/symfony/mime/tree/v5.2.5" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7407,7 +7497,7 @@ "type": "tidelift" } ], - "time": "2020-10-30T14:55:39+00:00" + "time": "2021-03-07T16:08:20+00:00" }, { "name": "symfony/polyfill-ctype", @@ -7490,16 +7580,16 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024" + "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c536646fdb4f29104dd26effc2fdcb9a5b085024", - "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342", + "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342", "shasum": "" }, "require": { @@ -7511,7 +7601,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7549,6 +7639,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7563,20 +7656,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117" + "reference": "2d63434d922daf7da8dd863e7907e67ee3031483" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483", + "reference": "2d63434d922daf7da8dd863e7907e67ee3031483", "shasum": "" }, "require": { @@ -7590,7 +7683,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7633,6 +7726,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7647,7 +7743,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-intl-normalizer", @@ -7815,16 +7911,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", "shasum": "" }, "require": { @@ -7833,7 +7929,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7870,6 +7966,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7884,7 +7983,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php73", @@ -8050,16 +8149,16 @@ }, { "name": "symfony/process", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "ec1482f13d53911a8a32e54ba6f9a3b43a57d943" + "reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/ec1482f13d53911a8a32e54ba6f9a3b43a57d943", - "reference": "ec1482f13d53911a8a32e54ba6f9a3b43a57d943", + "url": "https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a", + "reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a", "shasum": "" }, "require": { @@ -8088,8 +8187,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Process Component", + "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8104,7 +8206,7 @@ "type": "tidelift" } ], - "time": "2020-11-02T15:10:16+00:00" + "time": "2021-01-27T09:09:26+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -8186,16 +8288,16 @@ }, { "name": "symfony/routing", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "08712c5dd5041c03e997e13892f45884faccd868" + "reference": "69919991c845b34626664ddc9b3aef9d09d2a5df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/08712c5dd5041c03e997e13892f45884faccd868", - "reference": "08712c5dd5041c03e997e13892f45884faccd868", + "url": "https://api.github.com/repos/symfony/routing/zipball/69919991c845b34626664ddc9b3aef9d09d2a5df", + "reference": "69919991c845b34626664ddc9b3aef9d09d2a5df", "shasum": "" }, "require": { @@ -8207,7 +8309,7 @@ "symfony/yaml": "<3.4" }, "require-dev": { - "doctrine/annotations": "~1.2", + "doctrine/annotations": "^1.10.4", "psr/log": "~1.0", "symfony/config": "^4.2|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", @@ -8245,7 +8347,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Routing Component", + "description": "Maps an HTTP request to a set of configuration variables", "homepage": "https://symfony.com", "keywords": [ "router", @@ -8253,6 +8355,9 @@ "uri", "url" ], + "support": { + "source": "https://github.com/symfony/routing/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8267,7 +8372,7 @@ "type": "tidelift" } ], - "time": "2020-11-24T13:31:32+00:00" + "time": "2021-02-22T15:37:04+00:00" }, { "name": "symfony/service-contracts", @@ -8350,16 +8455,16 @@ }, { "name": "symfony/translation", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "84821e6a14a637e817f25d11147388695b6f790a" + "reference": "2271b6d577018a7dea75a9162a08ac84f8234deb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/84821e6a14a637e817f25d11147388695b6f790a", - "reference": "84821e6a14a637e817f25d11147388695b6f790a", + "url": "https://api.github.com/repos/symfony/translation/zipball/2271b6d577018a7dea75a9162a08ac84f8234deb", + "reference": "2271b6d577018a7dea75a9162a08ac84f8234deb", "shasum": "" }, "require": { @@ -8374,7 +8479,7 @@ "symfony/yaml": "<3.4" }, "provide": { - "symfony/translation-implementation": "1.0" + "symfony/translation-implementation": "1.0|2.0" }, "require-dev": { "psr/log": "~1.0", @@ -8415,8 +8520,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Translation Component", + "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/translation/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8431,7 +8539,7 @@ "type": "tidelift" } ], - "time": "2020-11-27T06:35:49+00:00" + "time": "2021-02-26T13:53:48+00:00" }, { "name": "symfony/translation-contracts", @@ -8513,16 +8621,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "65c6f1e848cda840ef7278686c8e30a7cc353c93" + "reference": "a1eab2f69906dc83c5ddba4632180260d0ab4f7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/65c6f1e848cda840ef7278686c8e30a7cc353c93", - "reference": "65c6f1e848cda840ef7278686c8e30a7cc353c93", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a1eab2f69906dc83c5ddba4632180260d0ab4f7f", + "reference": "a1eab2f69906dc83c5ddba4632180260d0ab4f7f", "shasum": "" }, "require": { @@ -8539,7 +8647,7 @@ "ext-iconv": "*", "symfony/console": "^3.4|^4.0|^5.0", "symfony/process": "^4.4|^5.0", - "twig/twig": "^1.34|^2.4|^3.0" + "twig/twig": "^1.43|^2.13|^3.0.4" }, "suggest": { "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", @@ -8575,12 +8683,15 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony mechanism for exploring and dumping PHP variables", + "description": "Provides mechanisms for walking through any arbitrary PHP variable", "homepage": "https://symfony.com", "keywords": [ "debug", "dump" ], + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8595,7 +8706,7 @@ "type": "tidelift" } ], - "time": "2020-11-24T09:55:37+00:00" + "time": "2021-01-27T09:09:26+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8644,20 +8755,24 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", + "support": { + "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.3" + }, "time": "2020-07-13T06:12:54+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v3.6.7", + "version": "v3.6.8", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "2065beda6cbe75e2603686907b2e45f6f3a5ad82" + "reference": "5e679f7616db829358341e2d5cccbd18773bdab8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2065beda6cbe75e2603686907b2e45f6f3a5ad82", - "reference": "2065beda6cbe75e2603686907b2e45f6f3a5ad82", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/5e679f7616db829358341e2d5cccbd18773bdab8", + "reference": "5e679f7616db829358341e2d5cccbd18773bdab8", "shasum": "" }, "require": { @@ -8668,7 +8783,7 @@ "require-dev": { "ext-filter": "*", "ext-pcre": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0" + "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20" }, "suggest": { "ext-filter": "Required to use the boolean validator.", @@ -8707,6 +8822,10 @@ "env", "environment" ], + "support": { + "issues": "https://github.com/vlucas/phpdotenv/issues", + "source": "https://github.com/vlucas/phpdotenv/tree/v3.6.8" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -8717,7 +8836,7 @@ "type": "tidelift" } ], - "time": "2020-07-14T19:04:52+00:00" + "time": "2021-01-20T14:39:46+00:00" }, { "name": "x3zvawq/noj_simplemde", @@ -10639,30 +10758,35 @@ }, { "name": "webmozart/assert", - "version": "1.9.1", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0 || ^8.0", + "php": "^7.2 || ^8.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<3.9.1" + "vimeo/psalm": "<4.6.1 || 4.6.2" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^7.5.13" + "phpunit/phpunit": "^8.5.13" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, "autoload": { "psr-4": { "Webmozart\\Assert\\": "src/" @@ -10686,9 +10810,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.9.1" + "source": "https://github.com/webmozarts/assert/tree/1.10.0" }, - "time": "2020-07-08T17:02:28+00:00" + "time": "2021-03-09T10:59:23+00:00" } ], "aliases": [], From 217ddc6f9c8b50a005c95c179d10ec0fd388de3f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 17 Mar 2021 10:14:17 +0000 Subject: [PATCH 008/293] build(deps): bump maatwebsite/excel from 3.1.26 to 3.1.29 Bumps [maatwebsite/excel](https://github.com/Maatwebsite/Laravel-Excel) from 3.1.26 to 3.1.29. - [Release notes](https://github.com/Maatwebsite/Laravel-Excel/releases) - [Changelog](https://github.com/Maatwebsite/Laravel-Excel/blob/3.1/CHANGELOG.md) - [Commits](https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.26...3.1.29) Signed-off-by: dependabot-preview[bot] --- composer.lock | 498 +++++++++++++++++++++++++++++++------------------- 1 file changed, 313 insertions(+), 185 deletions(-) diff --git a/composer.lock b/composer.lock index 3a26b7a93..705e40ccf 100644 --- a/composer.lock +++ b/composer.lock @@ -673,6 +673,10 @@ "uppercase", "words" ], + "support": { + "issues": "https://github.com/doctrine/inflector/issues", + "source": "https://github.com/doctrine/inflector/tree/2.0.x" + }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -749,6 +753,10 @@ "parser", "php" ], + "support": { + "issues": "https://github.com/doctrine/lexer/issues", + "source": "https://github.com/doctrine/lexer/tree/1.2.1" + }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -885,6 +893,10 @@ "cron", "schedule" ], + "support": { + "issues": "https://github.com/dragonmantank/cron-expression/issues", + "source": "https://github.com/dragonmantank/cron-expression/tree/v2.3.1" + }, "funding": [ { "url": "https://github.com/dragonmantank", @@ -895,16 +907,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.24", + "version": "2.1.25", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "ca90a3291eee1538cd48ff25163240695bd95448" + "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ca90a3291eee1538cd48ff25163240695bd95448", - "reference": "ca90a3291eee1538cd48ff25163240695bd95448", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4", + "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4", "shasum": "" }, "require": { @@ -949,13 +961,17 @@ "validation", "validator" ], + "support": { + "issues": "https://github.com/egulias/EmailValidator/issues", + "source": "https://github.com/egulias/EmailValidator/tree/2.1.25" + }, "funding": [ { "url": "https://github.com/egulias", "type": "github" } ], - "time": "2020-11-14T15:56:27+00:00" + "time": "2020-12-29T14:50:06+00:00" }, { "name": "encore/laravel-admin", @@ -2490,16 +2506,16 @@ }, { "name": "laravel/framework", - "version": "v6.20.7", + "version": "v6.20.19", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "bdc79701b567c5f8ed44d212dd4a261b8300b9c3" + "reference": "c25308a00c7bbd38401a6254ab403146da9cfd69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/bdc79701b567c5f8ed44d212dd4a261b8300b9c3", - "reference": "bdc79701b567c5f8ed44d212dd4a261b8300b9c3", + "url": "https://api.github.com/repos/laravel/framework/zipball/c25308a00c7bbd38401a6254ab403146da9cfd69", + "reference": "c25308a00c7bbd38401a6254ab403146da9cfd69", "shasum": "" }, "require": { @@ -2635,7 +2651,11 @@ "framework", "laravel" ], - "time": "2020-12-08T15:31:27+00:00" + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2021-03-16T14:18:55+00:00" }, { "name": "laravel/passport", @@ -3041,6 +3061,12 @@ "md", "parser" ], + "support": { + "docs": "https://commonmark.thephpleague.com/", + "issues": "https://github.com/thephpleague/commonmark/issues", + "rss": "https://github.com/thephpleague/commonmark/releases.atom", + "source": "https://github.com/thephpleague/commonmark" + }, "funding": [ { "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", @@ -3270,6 +3296,10 @@ "sftp", "storage" ], + "support": { + "issues": "https://github.com/thephpleague/flysystem/issues", + "source": "https://github.com/thephpleague/flysystem/tree/1.x" + }, "funding": [ { "url": "https://offset.earth/frankdejonge", @@ -3280,16 +3310,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.5.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa" + "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/353f66d7555d8a90781f6f5e7091932f9a4250aa", - "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", + "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", "shasum": "" }, "require": { @@ -3297,8 +3327,9 @@ "php": "^7.2 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.36", - "phpunit/phpunit": "^8.5.8" + "friendsofphp/php-cs-fixer": "^2.18", + "phpstan/phpstan": "^0.12.68", + "phpunit/phpunit": "^8.5.8 || ^9.3" }, "type": "library", "autoload": { @@ -3317,6 +3348,10 @@ } ], "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" + }, "funding": [ { "url": "https://github.com/frankdejonge", @@ -3327,7 +3362,7 @@ "type": "tidelift" } ], - "time": "2020-10-18T11:50:25+00:00" + "time": "2021-01-18T20:58:21+00:00" }, { "name": "league/oauth1-client", @@ -3485,23 +3520,23 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.26", + "version": "3.1.29", "source": { "type": "git", "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "66f7c9584304ad0b6a267a5d8ffbfa2ff4272e85" + "reference": "1e567e6e19a04fd65b5876d5bc92f4015f09fab4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/66f7c9584304ad0b6a267a5d8ffbfa2ff4272e85", - "reference": "66f7c9584304ad0b6a267a5d8ffbfa2ff4272e85", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/1e567e6e19a04fd65b5876d5bc92f4015f09fab4", + "reference": "1e567e6e19a04fd65b5876d5bc92f4015f09fab4", "shasum": "" }, "require": { "ext-json": "*", "illuminate/support": "5.8.*|^6.0|^7.0|^8.0", "php": "^7.0|^8.0", - "phpoffice/phpspreadsheet": "^1.15" + "phpoffice/phpspreadsheet": "1.16.*" }, "require-dev": { "orchestra/testbench": "^6.0", @@ -3545,6 +3580,10 @@ "php", "phpspreadsheet" ], + "support": { + "issues": "https://github.com/Maatwebsite/Laravel-Excel/issues", + "source": "https://github.com/Maatwebsite/Laravel-Excel/tree/3.1.29" + }, "funding": [ { "url": "https://laravel-excel.com/commercial-support", @@ -3555,7 +3594,7 @@ "type": "github" } ], - "time": "2020-11-27T16:17:38+00:00" + "time": "2021-03-16T11:56:39+00:00" }, { "name": "maennchen/zipstream-php", @@ -3880,16 +3919,16 @@ }, { "name": "monolog/monolog", - "version": "2.1.1", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f9eee5cec93dfb313a38b6b288741e84e53f02d5" + "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f9eee5cec93dfb313a38b6b288741e84e53f02d5", - "reference": "f9eee5cec93dfb313a38b6b288741e84e53f02d5", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084", + "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084", "shasum": "" }, "require": { @@ -3902,16 +3941,17 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "elasticsearch/elasticsearch": "^6.0", + "elasticsearch/elasticsearch": "^7", "graylog2/gelf-php": "^1.4.2", + "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "php-parallel-lint/php-parallel-lint": "^1.0", "phpspec/prophecy": "^1.6.1", + "phpstan/phpstan": "^0.12.59", "phpunit/phpunit": "^8.5", "predis/predis": "^1.1", "rollbar/rollbar": "^1.3", - "ruflin/elastica": ">=0.90 <3.0", + "ruflin/elastica": ">=0.90 <7.0.1", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { @@ -3931,7 +3971,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-main": "2.x-dev" } }, "autoload": { @@ -3947,16 +3987,20 @@ { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "description": "Sends your logs to files, sockets, inboxes, databases and various web services", - "homepage": "http://github.com/Seldaek/monolog", + "homepage": "https://github.com/Seldaek/monolog", "keywords": [ "log", "logging", "psr-3" ], + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/2.2.0" + }, "funding": [ { "url": "https://github.com/Seldaek", @@ -3967,7 +4011,7 @@ "type": "tidelift" } ], - "time": "2020-07-23T08:41:23+00:00" + "time": "2020-12-14T13:15:25+00:00" }, { "name": "myclabs/php-enum", @@ -4097,16 +4141,16 @@ }, { "name": "nesbot/carbon", - "version": "2.42.0", + "version": "2.46.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "d0463779663437392fe42ff339ebc0213bd55498" + "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d0463779663437392fe42ff339ebc0213bd55498", - "reference": "d0463779663437392fe42ff339ebc0213bd55498", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4", + "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4", "shasum": "" }, "require": { @@ -4122,7 +4166,7 @@ "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^0.12.54", - "phpunit/phpunit": "^7.5 || ^8.0", + "phpunit/phpunit": "^7.5.20 || ^8.5.14", "squizlabs/php_codesniffer": "^3.4" }, "bin": [ @@ -4172,6 +4216,10 @@ "datetime", "time" ], + "support": { + "issues": "https://github.com/briannesbitt/Carbon/issues", + "source": "https://github.com/briannesbitt/Carbon" + }, "funding": [ { "url": "https://opencollective.com/Carbon", @@ -4182,7 +4230,7 @@ "type": "tidelift" } ], - "time": "2020-11-28T14:25:28+00:00" + "time": "2021-02-24T17:30:44+00:00" }, { "name": "nikic/php-parser", @@ -4913,6 +4961,10 @@ "serialization", "serialize" ], + "support": { + "issues": "https://github.com/opis/closure/issues", + "source": "https://github.com/opis/closure/tree/3.6.1" + }, "time": "2020-11-07T02:01:34+00:00" }, { @@ -5017,6 +5069,11 @@ "pseudorandom", "random" ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" + }, "time": "2018-07-02T15:55:56+00:00" }, { @@ -5195,16 +5252,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.17.1", + "version": "1.16.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "c55269cb06911575a126dc225a05c0e4626e5fb4" + "reference": "76d4323b85129d0c368149c831a07a3e258b2b50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/c55269cb06911575a126dc225a05c0e4626e5fb4", - "reference": "c55269cb06911575a126dc225a05c0e4626e5fb4", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/76d4323b85129d0c368149c831a07a3e258b2b50", + "reference": "76d4323b85129d0c368149c831a07a3e258b2b50", "shasum": "" }, "require": { @@ -5232,7 +5289,7 @@ }, "require-dev": { "dompdf/dompdf": "^0.8.5", - "friendsofphp/php-cs-fixer": "^2.18", + "friendsofphp/php-cs-fixer": "^2.16", "jpgraph/jpgraph": "^4.0", "mpdf/mpdf": "^8.0", "phpcompatibility/php-compatibility": "^9.3", @@ -5290,9 +5347,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.17.1" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.16.0" }, - "time": "2021-03-02T17:54:11+00:00" + "time": "2020-12-31T18:03:49+00:00" }, { "name": "phpoption/phpoption", @@ -5347,6 +5404,10 @@ "php", "type" ], + "support": { + "issues": "https://github.com/schmittjoh/php-option/issues", + "source": "https://github.com/schmittjoh/php-option/tree/1.7.5" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -5541,27 +5602,22 @@ }, { "name": "psr/container", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.2.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -5574,7 +5630,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common Container Interface (PHP FIG PSR-11)", @@ -5588,9 +5644,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" + "source": "https://github.com/php-fig/container/tree/1.1.1" }, - "time": "2017-02-14T16:28:37+00:00" + "time": "2021-03-05T17:36:06+00:00" }, { "name": "psr/http-client", @@ -6052,6 +6108,12 @@ "identifier", "uuid" ], + "support": { + "issues": "https://github.com/ramsey/uuid/issues", + "rss": "https://github.com/ramsey/uuid/releases.atom", + "source": "https://github.com/ramsey/uuid", + "wiki": "https://github.com/ramsey/uuid/wiki" + }, "time": "2020-02-21T04:36:14+00:00" }, { @@ -6381,20 +6443,20 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.4", + "version": "v6.2.7", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e" + "reference": "15f7faf8508e04471f666633addacf54c0ab5933" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", - "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933", + "reference": "15f7faf8508e04471f666633addacf54c0ab5933", "shasum": "" }, "require": { - "egulias/email-validator": "^2.0", + "egulias/email-validator": "^2.0|^3.1", "php": ">=7.0.0", "symfony/polyfill-iconv": "^1.0", "symfony/polyfill-intl-idn": "^1.10", @@ -6438,6 +6500,10 @@ "mail", "mailer" ], + "support": { + "issues": "https://github.com/swiftmailer/swiftmailer/issues", + "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7" + }, "funding": [ { "url": "https://github.com/fabpot", @@ -6448,20 +6514,20 @@ "type": "tidelift" } ], - "time": "2020-12-08T18:02:06+00:00" + "time": "2021-03-09T12:30:35+00:00" }, { "name": "symfony/console", - "version": "v4.4.19", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "24026c44fc37099fa145707fecd43672831b837a" + "reference": "c98349bda966c70d6c08b4cd8658377c94166492" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/24026c44fc37099fa145707fecd43672831b837a", - "reference": "24026c44fc37099fa145707fecd43672831b837a", + "url": "https://api.github.com/repos/symfony/console/zipball/c98349bda966c70d6c08b4cd8658377c94166492", + "reference": "c98349bda966c70d6c08b4cd8658377c94166492", "shasum": "" }, "require": { @@ -6521,7 +6587,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.19" + "source": "https://github.com/symfony/console/tree/v4.4.20" }, "funding": [ { @@ -6537,20 +6603,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T09:09:26+00:00" + "time": "2021-02-22T18:44:15+00:00" }, { "name": "symfony/css-selector", - "version": "v5.2.0", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256" + "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256", - "reference": "b8d8eb06b0942e84a69e7acebc3e9c1e6e6e7256", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/f65f217b3314504a1ec99c2d6ef69016bb13490f", + "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f", "shasum": "" }, "require": { @@ -6583,8 +6649,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony CssSelector Component", + "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/css-selector/tree/v5.2.4" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6599,20 +6668,20 @@ "type": "tidelift" } ], - "time": "2020-10-28T21:31:18+00:00" + "time": "2021-01-27T10:01:46+00:00" }, { "name": "symfony/debug", - "version": "v4.4.19", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c" + "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/af4987aa4a5630e9615be9d9c3ed1b0f24ca449c", - "reference": "af4987aa4a5630e9615be9d9c3ed1b0f24ca449c", + "url": "https://api.github.com/repos/symfony/debug/zipball/157bbec4fd773bae53c5483c50951a5530a2cc16", + "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16", "shasum": "" }, "require": { @@ -6652,7 +6721,7 @@ "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.19" + "source": "https://github.com/symfony/debug/tree/v4.4.20" }, "funding": [ { @@ -6668,7 +6737,7 @@ "type": "tidelift" } ], - "time": "2021-01-27T09:09:26+00:00" + "time": "2021-01-28T16:54:48+00:00" }, { "name": "symfony/deprecation-contracts", @@ -6718,6 +6787,9 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/master" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6807,16 +6879,16 @@ }, { "name": "symfony/error-handler", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "b0887cf8fc692eef2a4cf11cee3c5f5eb93fcfdf" + "reference": "a191550d46b73a527b9d244f185fef439d41cf15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/b0887cf8fc692eef2a4cf11cee3c5f5eb93fcfdf", - "reference": "b0887cf8fc692eef2a4cf11cee3c5f5eb93fcfdf", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/a191550d46b73a527b9d244f185fef439d41cf15", + "reference": "a191550d46b73a527b9d244f185fef439d41cf15", "shasum": "" }, "require": { @@ -6853,8 +6925,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony ErrorHandler Component", + "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/error-handler/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6869,20 +6944,20 @@ "type": "tidelift" } ], - "time": "2020-10-28T20:42:29+00:00" + "time": "2021-02-11T08:19:35+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "f029d6f21eac61ab23198e7aca40e7638e8c8924" + "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f029d6f21eac61ab23198e7aca40e7638e8c8924", - "reference": "f029d6f21eac61ab23198e7aca40e7638e8c8924", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c352647244bd376bf7d31efbd5401f13f50dad0c", + "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c", "shasum": "" }, "require": { @@ -6933,8 +7008,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "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/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -6949,7 +7027,7 @@ "type": "tidelift" } ], - "time": "2020-10-31T22:44:29+00:00" + "time": "2021-01-27T09:09:26+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -7032,16 +7110,16 @@ }, { "name": "symfony/finder", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9f1d1d883b79a91ef320c0c6e803494e042ef36e" + "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9f1d1d883b79a91ef320c0c6e803494e042ef36e", - "reference": "9f1d1d883b79a91ef320c0c6e803494e042ef36e", + "url": "https://api.github.com/repos/symfony/finder/zipball/2543795ab1570df588b9bbd31e1a2bd7037b94f6", + "reference": "2543795ab1570df588b9bbd31e1a2bd7037b94f6", "shasum": "" }, "require": { @@ -7070,8 +7148,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Finder Component", + "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7086,7 +7167,7 @@ "type": "tidelift" } ], - "time": "2020-11-17T19:45:34+00:00" + "time": "2021-02-12T10:48:09+00:00" }, { "name": "symfony/http-client-contracts", @@ -7169,22 +7250,23 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "9eeb37ec0ff3049c782ca67041648e28ddd75a94" + "reference": "02d968647fe61b2f419a8dc70c468a9d30a48d3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9eeb37ec0ff3049c782ca67041648e28ddd75a94", - "reference": "9eeb37ec0ff3049c782ca67041648e28ddd75a94", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/02d968647fe61b2f419a8dc70c468a9d30a48d3a", + "reference": "02d968647fe61b2f419a8dc70c468a9d30a48d3a", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/mime": "^4.3|^5.0", - "symfony/polyfill-mbstring": "~1.1" + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php80": "^1.15" }, "require-dev": { "predis/predis": "~1.0", @@ -7213,8 +7295,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony HttpFoundation Component", + "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/http-foundation/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7229,20 +7314,20 @@ "type": "tidelift" } ], - "time": "2020-11-03T11:58:18+00:00" + "time": "2021-02-25T17:11:33+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "9f5605ee05406d8afa40dc4f2954c6a61de3a984" + "reference": "4f36548465489f293b05406f1770492f6efb8adb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9f5605ee05406d8afa40dc4f2954c6a61de3a984", - "reference": "9f5605ee05406d8afa40dc4f2954c6a61de3a984", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4f36548465489f293b05406f1770492f6efb8adb", + "reference": "4f36548465489f293b05406f1770492f6efb8adb", "shasum": "" }, "require": { @@ -7262,13 +7347,13 @@ "symfony/console": ">=5", "symfony/dependency-injection": "<4.3", "symfony/translation": "<4.2", - "twig/twig": "<1.34|<2.4,>=2" + "twig/twig": "<1.43|<2.13,>=2" }, "provide": { "psr/log-implementation": "1.0" }, "require-dev": { - "psr/cache": "~1.0", + "psr/cache": "^1.0|^2.0|^3.0", "symfony/browser-kit": "^4.3|^5.0", "symfony/config": "^3.4|^4.0|^5.0", "symfony/console": "^3.4|^4.0", @@ -7283,7 +7368,7 @@ "symfony/templating": "^3.4|^4.0|^5.0", "symfony/translation": "^4.2|^5.0", "symfony/translation-contracts": "^1.1|^2", - "twig/twig": "^1.34|^2.4|^3.0" + "twig/twig": "^1.43|^2.13|^3.0.4" }, "suggest": { "symfony/browser-kit": "", @@ -7314,8 +7399,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony HttpKernel Component", + "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/http-kernel/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7330,20 +7418,20 @@ "type": "tidelift" } ], - "time": "2020-11-29T09:23:08+00:00" + "time": "2021-03-04T18:00:27+00:00" }, { "name": "symfony/mime", - "version": "v5.2.0", + "version": "v5.2.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "05f667e8fa029568964fd3bec6bc17765b853cc5" + "reference": "554ba128f1955038b45db5e1fa7e93bfc683b139" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/05f667e8fa029568964fd3bec6bc17765b853cc5", - "reference": "05f667e8fa029568964fd3bec6bc17765b853cc5", + "url": "https://api.github.com/repos/symfony/mime/zipball/554ba128f1955038b45db5e1fa7e93bfc683b139", + "reference": "554ba128f1955038b45db5e1fa7e93bfc683b139", "shasum": "" }, "require": { @@ -7354,10 +7442,13 @@ "symfony/polyfill-php80": "^1.15" }, "conflict": { + "egulias/email-validator": "~3.0.0", + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<4.4" }, "require-dev": { - "egulias/email-validator": "^2.1.10", + "egulias/email-validator": "^2.1.10|^3.1", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/dependency-injection": "^4.4|^5.0", "symfony/property-access": "^4.4|^5.1", @@ -7387,12 +7478,15 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "A library to manipulate MIME messages", + "description": "Allows manipulating MIME messages", "homepage": "https://symfony.com", "keywords": [ "mime", "mime-type" ], + "support": { + "source": "https://github.com/symfony/mime/tree/v5.2.5" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7407,7 +7501,7 @@ "type": "tidelift" } ], - "time": "2020-10-30T14:55:39+00:00" + "time": "2021-03-07T16:08:20+00:00" }, { "name": "symfony/polyfill-ctype", @@ -7490,16 +7584,16 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024" + "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c536646fdb4f29104dd26effc2fdcb9a5b085024", - "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342", + "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342", "shasum": "" }, "require": { @@ -7511,7 +7605,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7549,6 +7643,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7563,20 +7660,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117" + "reference": "2d63434d922daf7da8dd863e7907e67ee3031483" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483", + "reference": "2d63434d922daf7da8dd863e7907e67ee3031483", "shasum": "" }, "require": { @@ -7590,7 +7687,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7633,6 +7730,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7647,7 +7747,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-intl-normalizer", @@ -7815,16 +7915,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.20.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", "shasum": "" }, "require": { @@ -7833,7 +7933,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7870,6 +7970,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -7884,7 +7987,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php73", @@ -8050,16 +8153,16 @@ }, { "name": "symfony/process", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "ec1482f13d53911a8a32e54ba6f9a3b43a57d943" + "reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/ec1482f13d53911a8a32e54ba6f9a3b43a57d943", - "reference": "ec1482f13d53911a8a32e54ba6f9a3b43a57d943", + "url": "https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a", + "reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a", "shasum": "" }, "require": { @@ -8088,8 +8191,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Process Component", + "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8104,7 +8210,7 @@ "type": "tidelift" } ], - "time": "2020-11-02T15:10:16+00:00" + "time": "2021-01-27T09:09:26+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -8186,16 +8292,16 @@ }, { "name": "symfony/routing", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "08712c5dd5041c03e997e13892f45884faccd868" + "reference": "69919991c845b34626664ddc9b3aef9d09d2a5df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/08712c5dd5041c03e997e13892f45884faccd868", - "reference": "08712c5dd5041c03e997e13892f45884faccd868", + "url": "https://api.github.com/repos/symfony/routing/zipball/69919991c845b34626664ddc9b3aef9d09d2a5df", + "reference": "69919991c845b34626664ddc9b3aef9d09d2a5df", "shasum": "" }, "require": { @@ -8207,7 +8313,7 @@ "symfony/yaml": "<3.4" }, "require-dev": { - "doctrine/annotations": "~1.2", + "doctrine/annotations": "^1.10.4", "psr/log": "~1.0", "symfony/config": "^4.2|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", @@ -8245,7 +8351,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Routing Component", + "description": "Maps an HTTP request to a set of configuration variables", "homepage": "https://symfony.com", "keywords": [ "router", @@ -8253,6 +8359,9 @@ "uri", "url" ], + "support": { + "source": "https://github.com/symfony/routing/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8267,7 +8376,7 @@ "type": "tidelift" } ], - "time": "2020-11-24T13:31:32+00:00" + "time": "2021-02-22T15:37:04+00:00" }, { "name": "symfony/service-contracts", @@ -8350,16 +8459,16 @@ }, { "name": "symfony/translation", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "84821e6a14a637e817f25d11147388695b6f790a" + "reference": "2271b6d577018a7dea75a9162a08ac84f8234deb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/84821e6a14a637e817f25d11147388695b6f790a", - "reference": "84821e6a14a637e817f25d11147388695b6f790a", + "url": "https://api.github.com/repos/symfony/translation/zipball/2271b6d577018a7dea75a9162a08ac84f8234deb", + "reference": "2271b6d577018a7dea75a9162a08ac84f8234deb", "shasum": "" }, "require": { @@ -8374,7 +8483,7 @@ "symfony/yaml": "<3.4" }, "provide": { - "symfony/translation-implementation": "1.0" + "symfony/translation-implementation": "1.0|2.0" }, "require-dev": { "psr/log": "~1.0", @@ -8415,8 +8524,11 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Translation Component", + "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/translation/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8431,7 +8543,7 @@ "type": "tidelift" } ], - "time": "2020-11-27T06:35:49+00:00" + "time": "2021-02-26T13:53:48+00:00" }, { "name": "symfony/translation-contracts", @@ -8513,16 +8625,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.17", + "version": "v4.4.20", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "65c6f1e848cda840ef7278686c8e30a7cc353c93" + "reference": "a1eab2f69906dc83c5ddba4632180260d0ab4f7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/65c6f1e848cda840ef7278686c8e30a7cc353c93", - "reference": "65c6f1e848cda840ef7278686c8e30a7cc353c93", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a1eab2f69906dc83c5ddba4632180260d0ab4f7f", + "reference": "a1eab2f69906dc83c5ddba4632180260d0ab4f7f", "shasum": "" }, "require": { @@ -8539,7 +8651,7 @@ "ext-iconv": "*", "symfony/console": "^3.4|^4.0|^5.0", "symfony/process": "^4.4|^5.0", - "twig/twig": "^1.34|^2.4|^3.0" + "twig/twig": "^1.43|^2.13|^3.0.4" }, "suggest": { "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", @@ -8575,12 +8687,15 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony mechanism for exploring and dumping PHP variables", + "description": "Provides mechanisms for walking through any arbitrary PHP variable", "homepage": "https://symfony.com", "keywords": [ "debug", "dump" ], + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v4.4.20" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -8595,7 +8710,7 @@ "type": "tidelift" } ], - "time": "2020-11-24T09:55:37+00:00" + "time": "2021-01-27T09:09:26+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8644,20 +8759,24 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", + "support": { + "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.3" + }, "time": "2020-07-13T06:12:54+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v3.6.7", + "version": "v3.6.8", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "2065beda6cbe75e2603686907b2e45f6f3a5ad82" + "reference": "5e679f7616db829358341e2d5cccbd18773bdab8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2065beda6cbe75e2603686907b2e45f6f3a5ad82", - "reference": "2065beda6cbe75e2603686907b2e45f6f3a5ad82", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/5e679f7616db829358341e2d5cccbd18773bdab8", + "reference": "5e679f7616db829358341e2d5cccbd18773bdab8", "shasum": "" }, "require": { @@ -8668,7 +8787,7 @@ "require-dev": { "ext-filter": "*", "ext-pcre": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0" + "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20" }, "suggest": { "ext-filter": "Required to use the boolean validator.", @@ -8707,6 +8826,10 @@ "env", "environment" ], + "support": { + "issues": "https://github.com/vlucas/phpdotenv/issues", + "source": "https://github.com/vlucas/phpdotenv/tree/v3.6.8" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -8717,7 +8840,7 @@ "type": "tidelift" } ], - "time": "2020-07-14T19:04:52+00:00" + "time": "2021-01-20T14:39:46+00:00" }, { "name": "x3zvawq/noj_simplemde", @@ -10639,30 +10762,35 @@ }, { "name": "webmozart/assert", - "version": "1.9.1", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", + "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0 || ^8.0", + "php": "^7.2 || ^8.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<3.9.1" + "vimeo/psalm": "<4.6.1 || 4.6.2" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^7.5.13" + "phpunit/phpunit": "^8.5.13" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, "autoload": { "psr-4": { "Webmozart\\Assert\\": "src/" @@ -10686,9 +10814,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.9.1" + "source": "https://github.com/webmozarts/assert/tree/1.10.0" }, - "time": "2020-07-08T17:02:28+00:00" + "time": "2021-03-09T10:59:23+00:00" } ], "aliases": [], From fffc88f41052d5c9a76af0ae027fdbbf656dde15 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 17 Mar 2021 18:44:23 +0800 Subject: [PATCH 009/293] remove -static compile option for NOJ --- app/Babel/Extension/noj/Languages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Babel/Extension/noj/Languages.php b/app/Babel/Extension/noj/Languages.php index b3e11dbcf..7dab771df 100644 --- a/app/Babel/Extension/noj/Languages.php +++ b/app/Babel/Extension/noj/Languages.php @@ -14,7 +14,7 @@ public static function get() 'max_cpu_time' => 3000, 'max_real_time' => 10000, 'max_memory' => 1024 * 1024 * 1024, - 'compile_command' => '/usr/bin/gcc -DONLINE_JUDGE -O2 -w -fmax-errors=3 -std=c99 -static {src_path} -lm -o {exe_path}', + 'compile_command' => '/usr/bin/gcc -DONLINE_JUDGE -O2 -w -fmax-errors=3 -std=c99 {src_path} -lm -o {exe_path}', ], 'run' => [ 'command' => '{exe_path}', From f479fe41278d9bd1a36588c1a3f3e2037daf042d Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 17 Mar 2021 19:02:55 +0800 Subject: [PATCH 010/293] fixed AC score 1 bug --- app/Babel/Extension/noj/Submitter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Babel/Extension/noj/Submitter.php b/app/Babel/Extension/noj/Submitter.php index 1306cd7cd..16b6c3dfd 100644 --- a/app/Babel/Extension/noj/Submitter.php +++ b/app/Babel/Extension/noj/Submitter.php @@ -177,7 +177,7 @@ public function submit() $tempTime=max($tempTime, $t["cpu_time"]); } $this->sub['verdict']="Accepted"; - $this->sub['score']=1; + // $this->sub['score']=1; $this->sub['time']=$tempTime; $this->sub['memory']=round($tempMemory / 1024); } From 976c0492d969d087ddb3a368b0461b432b275140 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 17 Mar 2021 19:10:47 +0800 Subject: [PATCH 011/293] fixed contest status ncode filter bug --- app/Models/ContestModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/ContestModel.php b/app/Models/ContestModel.php index 5ba63f957..2068b0679 100644 --- a/app/Models/ContestModel.php +++ b/app/Models/ContestModel.php @@ -1041,8 +1041,8 @@ public function getContestRecord($filter, $cid) $contestEnd=time()>$end_time; $filter['pid'] = array_search($filter['ncode'], array_column($problemSet_temp, 'ncode')); - if($filter['pid']==false){ - $filter['pid'] = null; + if($filter['pid']===false){ + $filter['pid'] = is_null($filter['ncode'])?null:-1; }else{ $filter['pid'] = $problemSet_temp[$filter['pid']]['pid']; } From af7cf91b3e7f0f611fa4f0ef5b9fa1e757ee946b Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 17 Mar 2021 19:21:11 +0800 Subject: [PATCH 012/293] fixed redirection error when login as contest account --- resources/views/layouts/app.blade.php | 2 +- resources/views/layouts/errors.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index eddb0bbd1..f1f684563 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -253,7 +253,7 @@ @endif
  • @guest - {{__('navigation.account')}} + {{__('navigation.account')}} @else
  • diff --git a/resources/views/layouts/errors.blade.php b/resources/views/layouts/errors.blade.php index bcb139214..f1c56efbb 100644 --- a/resources/views/layouts/errors.blade.php +++ b/resources/views/layouts/errors.blade.php @@ -213,7 +213,7 @@
  • @guest - Account + Account @else
  • From 11d28a73d651b83ddfa15cd361da60975e9d1c5f Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 17 Mar 2021 19:22:51 +0800 Subject: [PATCH 013/293] remove console log --- resources/views/contest/board/addition.blade.php | 2 +- resources/views/contest/board/admin.blade.php | 6 +++--- resources/views/contest/board/analysis.blade.php | 2 +- resources/views/contest/board/clarification.blade.php | 6 +++--- resources/views/contest/board/status.blade.php | 2 +- resources/views/contest/detail.blade.php | 2 +- resources/views/group/detail.blade.php | 10 +++++----- resources/views/group/settings/contest.blade.php | 2 +- resources/views/group/settings/general.blade.php | 2 +- resources/views/group/settings/member.blade.php | 4 ++-- resources/views/js/common/abuse.blade.php | 2 +- resources/views/js/submission/detail.blade.php | 8 ++++---- resources/views/problem/discussion.blade.php | 2 +- resources/views/problem/discussion_post.blade.php | 2 +- resources/views/problem/editor.blade.php | 6 +++--- resources/views/problem/solution.blade.php | 8 ++++---- resources/views/status/index.blade.php | 2 +- resources/views/tool/pastebin/create.blade.php | 2 +- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/resources/views/contest/board/addition.blade.php b/resources/views/contest/board/addition.blade.php index d8b4a57bc..1f7e30be6 100644 --- a/resources/views/contest/board/addition.blade.php +++ b/resources/views/contest/board/addition.blade.php @@ -14,7 +14,7 @@ function fetchClarification() { headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if(ret.ret==200){ if(ret.data){ var clarification_ed = localStorage.clarification_ed == null ? [] : JSON.parse(localStorage.clarification_ed); diff --git a/resources/views/contest/board/admin.blade.php b/resources/views/contest/board/admin.blade.php index 5db05788c..b13907a8c 100644 --- a/resources/views/contest/board/admin.blade.php +++ b/resources/views/contest/board/admin.blade.php @@ -355,7 +355,7 @@ function generateAccount(){ 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ $("#generateAccountBtn > i").addClass("d-none"); - console.log(ret); + // console.log(ret); if (ret.ret==200) { for(let item of ret.data){ $('#account_table').append(`${item.name}${item.email}${item.password}`); @@ -403,7 +403,7 @@ function generatePDF(){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { alert("PDF generating in background, check status later."); $('#generatePDF_actions').html(``); @@ -441,7 +441,7 @@ function anticheat(){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { alert("Code plagiarism detection currently in background, check status later."); $('#anticheated button[data-role="action"]').addClass('d-none'); diff --git a/resources/views/contest/board/analysis.blade.php b/resources/views/contest/board/analysis.blade.php index bbe0ba6d3..9ec47e5cc 100644 --- a/resources/views/contest/board/analysis.blade.php +++ b/resources/views/contest/board/analysis.blade.php @@ -106,7 +106,7 @@ 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ if(ret.ret == '200'){ - console.log(ret); + // console.log(ret); data = ret.data; displayTable(); ajaxing = false; diff --git a/resources/views/contest/board/clarification.blade.php b/resources/views/contest/board/clarification.blade.php index 04593257e..5a1f44dfc 100644 --- a/resources/views/contest/board/clarification.blade.php +++ b/resources/views/contest/board/clarification.blade.php @@ -295,7 +295,7 @@ function post(type){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { alert("Success!"); location.reload(); @@ -345,7 +345,7 @@ function replyClarification(ccid){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { alert("Success!"); location.reload(); @@ -388,7 +388,7 @@ function setToPublic(ccid){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { //alert("Success!"); } else { diff --git a/resources/views/contest/board/status.blade.php b/resources/views/contest/board/status.blade.php index 456f5e130..dd633ee91 100644 --- a/resources/views/contest/board/status.blade.php +++ b/resources/views/contest/board/status.blade.php @@ -231,7 +231,7 @@ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if(ret.ret==200){ // submitted $(that).siblings().text("Pending"); diff --git a/resources/views/contest/detail.blade.php b/resources/views/contest/detail.blade.php index d893d90dd..93f204af2 100644 --- a/resources/views/contest/detail.blade.php +++ b/resources/views/contest/detail.blade.php @@ -355,7 +355,7 @@ function registContest(){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if(ret.ret==200){ location.reload(); }else{ diff --git a/resources/views/group/detail.blade.php b/resources/views/group/detail.blade.php index 5f0fa5974..c3a48b0eb 100644 --- a/resources/views/group/detail.blade.php +++ b/resources/views/group/detail.blade.php @@ -1171,7 +1171,7 @@ function removeMember(uid,operation){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { location.reload(); } else { @@ -1240,7 +1240,7 @@ function removeMember(uid,operation){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { confirm({ content: "{{__('group.contest.successArrange')}}", @@ -1297,7 +1297,7 @@ function removeMember(uid,operation){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { alert(ret.desc); //location.reload(); @@ -1333,7 +1333,7 @@ function removeMember(uid,operation){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { alert(ret.desc); setTimeout(function(){ @@ -1368,7 +1368,7 @@ function addProblem(){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { var sameFlag=false; $("#contestProblemSet td:first-of-type").each(function(){ diff --git a/resources/views/group/settings/contest.blade.php b/resources/views/group/settings/contest.blade.php index c6ceec52a..42a775827 100644 --- a/resources/views/group/settings/contest.blade.php +++ b/resources/views/group/settings/contest.blade.php @@ -621,7 +621,7 @@ function addProblem(){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { var sameFlag=false; $("#contestProblemSet td:first-of-type").each(function(){ diff --git a/resources/views/group/settings/general.blade.php b/resources/views/group/settings/general.blade.php index 2f66758e3..ef383b007 100644 --- a/resources/views/group/settings/general.blade.php +++ b/resources/views/group/settings/general.blade.php @@ -470,7 +470,7 @@ function approveMember(uid){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { location.reload(); } else { diff --git a/resources/views/group/settings/member.blade.php b/resources/views/group/settings/member.blade.php index b4c017c19..aee6610ea 100644 --- a/resources/views/group/settings/member.blade.php +++ b/resources/views/group/settings/member.blade.php @@ -323,7 +323,7 @@ function prompt_changeSubgroup(uid,name,sub_group) headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') },success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { $('#'+uid).text(text); alert("Success!"); @@ -575,7 +575,7 @@ function prompt_changeSubgroup(uid,name,sub_group) headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { location.reload(); } else { diff --git a/resources/views/js/common/abuse.blade.php b/resources/views/js/common/abuse.blade.php index 9bee9d28c..d38f71e50 100644 --- a/resources/views/js/common/abuse.blade.php +++ b/resources/views/js/common/abuse.blade.php @@ -30,7 +30,7 @@ function reportAbuse(){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { alert("Your report has been submitted successfully."); } else { diff --git a/resources/views/js/submission/detail.blade.php b/resources/views/js/submission/detail.blade.php index bd68ad2d5..f3fef9e81 100644 --- a/resources/views/js/submission/detail.blade.php +++ b/resources/views/js/submission/detail.blade.php @@ -38,7 +38,7 @@ function fetchSubmissionDetail(sid){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret) { - console.log(ret); + // console.log(ret); if(ret.ret==200){ var id = new Date().getTime(); $('body').append(` @@ -142,7 +142,7 @@ function prepareShare(sid){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret) { - console.log(ret); + // console.log(ret); if(ret.ret==200){ var id = new Date().getTime(); $('body').append(` @@ -192,7 +192,7 @@ function share(sid,id){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret) { - console.log(ret); + // console.log(ret); if(ret.ret==200){ $(`#submission_share${id}`).modal('toggle'); location.reload(); @@ -221,7 +221,7 @@ function sharePB(sid,id){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret) { - console.log(ret); + // console.log(ret); if(ret.ret==200){ $(`#submission_share${id}`).modal('toggle'); location.href="/pb/"+ret.data.code; diff --git a/resources/views/problem/discussion.blade.php b/resources/views/problem/discussion.blade.php index d40ad524e..718130dbd 100644 --- a/resources/views/problem/discussion.blade.php +++ b/resources/views/problem/discussion.blade.php @@ -483,7 +483,7 @@ function postDiscussion() { headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { location.href = "/discussion/" + ret.data; } else { diff --git a/resources/views/problem/discussion_post.blade.php b/resources/views/problem/discussion_post.blade.php index 142d129c4..bc527b76f 100644 --- a/resources/views/problem/discussion_post.blade.php +++ b/resources/views/problem/discussion_post.blade.php @@ -601,7 +601,7 @@ function postComment() { headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { location.reload(); } else { diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index 78424520c..87d469985 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -1010,7 +1010,7 @@ function adjustAppearance(){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if(ret.ret==200){ $("#history_container").html(""); ret.data.history.forEach(ele => { @@ -1080,7 +1080,7 @@ function adjustAppearance(){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if(ret.ret==200){ // submitted $("#verdict_info").popover('dispose'); @@ -1099,7 +1099,7 @@ function adjustAppearance(){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if(ret.ret==200){ if(ret.data.verdict=="Compile Error"){ $("#verdict_info").attr('title',"Compile Info"); diff --git a/resources/views/problem/solution.blade.php b/resources/views/problem/solution.blade.php index bc2954fdd..b650f0ef0 100644 --- a/resources/views/problem/solution.blade.php +++ b/resources/views/problem/solution.blade.php @@ -630,7 +630,7 @@ function submitSolutionDiscussion() { headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { alert("Your Solution Has Been Recieved."); localStorage.removeItem('{{$detail["pcode"]}}') @@ -673,7 +673,7 @@ function voteSolutionDiscussion(psoid,type) { headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { $(`#vote_${psoid}`).text(ret.data.votes); $(`#poll_${psoid} .btn-group div`).removeClass(); @@ -719,7 +719,7 @@ function updateSolutionDiscussion() { headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { alert("Your Solution Has Been Updated."); location.reload(); @@ -760,7 +760,7 @@ function deleteSolutionDiscussion() { headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if (ret.ret==200) { alert("Your Solution Has Been Deleted."); location.reload(); diff --git a/resources/views/status/index.blade.php b/resources/views/status/index.blade.php index a75ad95ce..450c08302 100644 --- a/resources/views/status/index.blade.php +++ b/resources/views/status/index.blade.php @@ -239,7 +239,7 @@ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if(ret.ret==200){ // submitted $(that).siblings().text("Pending"); diff --git a/resources/views/tool/pastebin/create.blade.php b/resources/views/tool/pastebin/create.blade.php index da5f917f0..9ebaee04c 100644 --- a/resources/views/tool/pastebin/create.blade.php +++ b/resources/views/tool/pastebin/create.blade.php @@ -176,7 +176,7 @@ function generate(){ headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(ret){ - console.log(ret); + // console.log(ret); if(ret.ret==200){ location.href="/pb/"+ret.data.code; }else{ From 785de7a4506b441cf7d1d9d553a2e32907ee5cfc Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 17 Mar 2021 19:25:04 +0800 Subject: [PATCH 014/293] remove counter that cause 500 at beginning of a match --- resources/views/contest/detail.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/contest/detail.blade.php b/resources/views/contest/detail.blade.php index 93f204af2..e7563b9df 100644 --- a/resources/views/contest/detail.blade.php +++ b/resources/views/contest/detail.blade.php @@ -427,11 +427,11 @@ function registContest(){ @if(strtotime($detail['begin_time']) > time()) - var remaining={{strtotime($detail['begin_time']) - time()}}; - setInterval(()=>{ - remaining--; - if(!remaining) location.reload(); - },1000); + // var remaining={{strtotime($detail['begin_time']) - time()}}; + // setInterval(()=>{ + // remaining--; + // if(!remaining) location.reload(); + // },1000); @endif From a18f0716c004e60c1991bd7700c861dc18802981 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 18 Mar 2021 00:27:05 +0800 Subject: [PATCH 015/293] update go interface --- app/Babel/Extension/noj/Languages.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Babel/Extension/noj/Languages.php b/app/Babel/Extension/noj/Languages.php index 7dab771df..9738c1089 100644 --- a/app/Babel/Extension/noj/Languages.php +++ b/app/Babel/Extension/noj/Languages.php @@ -50,6 +50,7 @@ public static function get() 'run' => [ 'command' => '{exe_path}', 'seccomp_rule' => 'c_cpp', + 'env' => $default_env, 'memory_limit_check_only' => 1 ] ], @@ -64,7 +65,7 @@ public static function get() 'compile_command' => '/usr/bin/javac {src_path} -d {exe_dir} -encoding UTF8' ], 'run' => [ - 'command' => '/usr/bin/java -cp {exe_dir} -Xss1M -Xms16M -Xmx{max_memory}k -Djava.security.manager -Djava.security.policy==/etc/java_policy -Djava.awt.headless=true Main', + 'command' => '/usr/bin/java -cp {exe_dir} -XX:MaxRAM={max_memory}k -Djava.security.manager -Dfile.encoding=UTF-8 -Djava.security.policy==/etc/java_policy -Djava.awt.headless=true Main', 'seccomp_rule' => null, 'env' => $default_env, 'memory_limit_check_only' => 1 @@ -81,7 +82,7 @@ public static function get() ], 'run' => [ 'command' => '/usr/bin/python {exe_path}', - 'seccomp_rule' => null, + 'seccomp_rule' => 'general', 'env' => $default_env ] ], @@ -97,7 +98,7 @@ public static function get() 'run' => [ 'command' => '/usr/bin/python3.7 {exe_path}', 'seccomp_rule' => 'general', - 'env' => array_merge(['MALLOC_ARENA_MAX=1'], $default_env) + 'env' => array_merge(['MALLOC_ARENA_MAX=1','PYTHONIOENCODING=UTF-8'], $default_env) ] ], 'php7_lang_config' => [ @@ -120,7 +121,6 @@ public static function get() ] ], 'go_lang_config' => [ - 'name' => 'go', 'compile' => [ 'src_name' => 'main.go', 'exe_name' => 'main', @@ -128,11 +128,13 @@ public static function get() 'max_real_time' => 10000, 'max_memory' => 1024 * 1024 * 1024, 'compile_command' => '/usr/bin/go build -o {exe_path} {src_path}', + 'env' => ["GOCACHE=/tmp"] ], 'run' => [ 'command' => '{exe_path}', - 'seccomp_rule' => null, - 'env' => $default_env + 'seccomp_rule' => "", + 'env' => array_merge(["GODEBUG=madvdontneed=1", "GOCACHE=off"],$default_env), + 'memory_limit_check_only' => 1 ] ] ]; From b0fe91100990c3117a0702c07149ade9c2094253 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 18 Mar 2021 01:51:34 +0800 Subject: [PATCH 016/293] fixed go memory limit compile error --- app/Babel/Extension/noj/Languages.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Babel/Extension/noj/Languages.php b/app/Babel/Extension/noj/Languages.php index 9738c1089..7ca29c9ab 100644 --- a/app/Babel/Extension/noj/Languages.php +++ b/app/Babel/Extension/noj/Languages.php @@ -126,14 +126,14 @@ public static function get() 'exe_name' => 'main', 'max_cpu_time' => 3000, 'max_real_time' => 10000, - 'max_memory' => 1024 * 1024 * 1024, + 'max_memory' => -1, 'compile_command' => '/usr/bin/go build -o {exe_path} {src_path}', - 'env' => ["GOCACHE=/tmp"] + 'env' => ["GOCACHE=/tmp","GOPATH=/root/go"] ], 'run' => [ 'command' => '{exe_path}', 'seccomp_rule' => "", - 'env' => array_merge(["GODEBUG=madvdontneed=1", "GOCACHE=off"],$default_env), + 'env' => array_merge(["GODEBUG=madvdontneed=1", "GOCACHE=off"], $default_env), 'memory_limit_check_only' => 1 ] ] From 810c5a8580adc01c3ecb0c4df9383fcc9d4a5c0d Mon Sep 17 00:00:00 2001 From: ZsgsDesign Date: Thu, 18 Mar 2021 16:39:25 +0800 Subject: [PATCH 017/293] add sample copy locale --- resources/lang/en/problem.php | 10 +++++++--- resources/lang/zh-CN/problem.php | 10 +++++++--- resources/views/problem/detail.blade.php | 4 ++-- resources/views/problem/editor.blade.php | 16 ++++++++-------- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/resources/lang/en/problem.php b/resources/lang/en/problem.php index 7a5bb7e8e..d6f2b0af2 100644 --- a/resources/lang/en/problem.php +++ b/resources/lang/en/problem.php @@ -17,9 +17,13 @@ "description" => "Description", "input" => "Input", "output" => "Output", - "sampleinput" => "Sample Input", - "sampleoutput" => "Sample Output", - "samplecopy" => "Copy", + "sample" => [ + "input" => "Sample Input", + "output" => "Sample Output", + "copy" => "Copy", + "copied" => "Copied", + "failed" => "Failed", + ], "note" => "Note", ], "action" => [ diff --git a/resources/lang/zh-CN/problem.php b/resources/lang/zh-CN/problem.php index e0218a803..c8b0bd4c7 100644 --- a/resources/lang/zh-CN/problem.php +++ b/resources/lang/zh-CN/problem.php @@ -17,9 +17,13 @@ "description" => "描述", "input" => "输入", "output" => "输出", - "sampleinput" => "样例输入", - "sampleoutput" => "样例输出", - "samplecopy" => "复制", + "sample" => [ + "input" => "样例输入", + "output" => "样例输出", + "copy" => "复制", + "copied" => "已复制", + "failed" => "复制失败", + ], "note" => "注释", ], "action" => [ diff --git a/resources/views/problem/detail.blade.php b/resources/views/problem/detail.blade.php index 7e618f744..769641bbb 100644 --- a/resources/views/problem/detail.blade.php +++ b/resources/views/problem/detail.blade.php @@ -318,12 +318,12 @@ @foreach($detail["samples"] as $ps) @if (!is_null($ps['sample_input']) && $ps['sample_input'] !== '') -

    {{__("problem.section.sampleinput")}}:

    +

    {{__("problem.section.sample.input")}}:

    {!!$ps['sample_input']!!}
    @endif @if (!is_null($ps['sample_output']) && $ps['sample_output'] !== '') -

    {{__("problem.section.sampleoutput")}}:

    +

    {{__("problem.section.sample.output")}}:

    {!!$ps['sample_output']!!}
    @endif diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index 87d469985..a835369b0 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -715,13 +715,13 @@ @foreach($detail["samples"] as $ps) @if (!is_null($ps['sample_input']) && $ps['sample_input'] !== '') -

    {{__("problem.section.sampleinput")}}:

    - 
    {!!$ps['sample_input']!!}
    +

    {{__("problem.section.sample.input")}}:

    + 
    {!!$ps['sample_input']!!}
    @endif @if (!is_null($ps['sample_output']) && $ps['sample_output'] !== '') -

    {{__("problem.section.sampleoutput")}}:

    - 
    {!!$ps['sample_output']!!}
    +

    {{__("problem.section.sample.output")}}:

    + 
    {!!$ps['sample_output']!!}
    @endif @unless (blank($ps['sample_note'])) {!!$ps['sample_note']!!} @endunless @@ -853,17 +853,17 @@ var clipboard = new ClipboardJS('.cm-copy-snippet'); clipboard.on('success', function(e) { - $(e.trigger).text("Copied"); + $(e.trigger).text("{{__("problem.section.sample.copied")}}"); e.clearSelection(); setTimeout(()=>{ - $(e.trigger).text("Copy"); + $(e.trigger).text("{{__("problem.section.sample.copy")}}"); }, 2000); }); clipboard.on('error', function(e) { - $(e.trigger).text("Failed"); + $(e.trigger).text("{{__("problem.section.sample.failed")}}"); setTimeout(()=>{ - $(e.trigger).text("Copy"); + $(e.trigger).text("{{__("problem.section.sample.copy")}}"); }, 2000); }); From 87085b6bdcd7cc8a133b85b28db3f53463af1484 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Fri, 19 Mar 2021 14:18:07 +0800 Subject: [PATCH 018/293] update x3zvawq/noj_simplemde --- composer.lock | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 39eaa472a..6e0958e62 100644 --- a/composer.lock +++ b/composer.lock @@ -8848,19 +8848,13 @@ "source": { "type": "git", "url": "https://github.com/X3ZvaWQ/NOJ_simpleMDE.git", - "reference": "077f2c81601138f86477f4f5a03bb347a29972a4" + "reference": "395d93af3ab2c3e8cc92013036d187fa73140e18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/X3ZvaWQ/NOJ_simpleMDE/zipball/077f2c81601138f86477f4f5a03bb347a29972a4", - "reference": "077f2c81601138f86477f4f5a03bb347a29972a4", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://api.github.com/repos/X3ZvaWQ/NOJ_simpleMDE/zipball/395d93af3ab2c3e8cc92013036d187fa73140e18", + "reference": "395d93af3ab2c3e8cc92013036d187fa73140e18", + "shasum": "" }, "require": { "encore/laravel-admin": "~1.6", @@ -8898,7 +8892,7 @@ "issues": "https://github.com/X3ZvaWQ/NOJ_simpleMDE/issues", "source": "https://github.com/X3ZvaWQ/NOJ_simpleMDE/tree/main" }, - "time": "2020-12-13T14:46:33+00:00" + "time": "2021-02-23T07:46:05+00:00" }, { "name": "zsgsdesign/noj-admin-clike-editor", From 4c276a2d32468ebe76a2a8f58b6e13f1f888f5e2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 19 Mar 2021 21:16:37 +0000 Subject: [PATCH 019/293] build(deps-dev): bump filp/whoops from 2.10.0 to 2.11.0 Bumps [filp/whoops](https://github.com/filp/whoops) from 2.10.0 to 2.11.0. - [Release notes](https://github.com/filp/whoops/releases) - [Changelog](https://github.com/filp/whoops/blob/master/CHANGELOG.md) - [Commits](https://github.com/filp/whoops/compare/2.10.0...2.11.0) Signed-off-by: dependabot-preview[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 6e0958e62..1e0599df3 100644 --- a/composer.lock +++ b/composer.lock @@ -9148,16 +9148,16 @@ }, { "name": "filp/whoops", - "version": "2.10.0", + "version": "2.11.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "6ecda5217bf048088b891f7403b262906be5a957" + "reference": "f6e14679f948d8a5cfb866fa7065a30c66bd64d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/6ecda5217bf048088b891f7403b262906be5a957", - "reference": "6ecda5217bf048088b891f7403b262906be5a957", + "url": "https://api.github.com/repos/filp/whoops/zipball/f6e14679f948d8a5cfb866fa7065a30c66bd64d3", + "reference": "f6e14679f948d8a5cfb866fa7065a30c66bd64d3", "shasum": "" }, "require": { @@ -9207,7 +9207,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.10.0" + "source": "https://github.com/filp/whoops/tree/2.11.0" }, "funding": [ { @@ -9215,7 +9215,7 @@ "type": "github" } ], - "time": "2021-03-16T12:00:00+00:00" + "time": "2021-03-19T12:00:00+00:00" }, { "name": "fzaninotto/faker", From 11bd3cb9092876d24f961659cde6ac0d3c116b7c Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Sat, 20 Mar 2021 23:09:12 +0800 Subject: [PATCH 020/293] add csharp support --- app/Babel/Extension/noj/Languages.php | 17 +++++++++++++++++ .../Extension/noj/compiler/1616243142.json | 10 ++++++++++ 2 files changed, 27 insertions(+) create mode 100644 app/Babel/Extension/noj/compiler/1616243142.json diff --git a/app/Babel/Extension/noj/Languages.php b/app/Babel/Extension/noj/Languages.php index 7ca29c9ab..224988c20 100644 --- a/app/Babel/Extension/noj/Languages.php +++ b/app/Babel/Extension/noj/Languages.php @@ -136,6 +136,23 @@ public static function get() 'env' => array_merge(["GODEBUG=madvdontneed=1", "GOCACHE=off"], $default_env), 'memory_limit_check_only' => 1 ] + ], + 'csharp_lang_config' => [ + 'compile' => [ + 'src_name' => 'main.cs', + 'exe_name' => 'main', + 'max_cpu_time' => 3000, + 'max_real_time' => 10000, + 'max_memory' => -1, + 'compile_command' => '/usr/bin/mcs -optimize+ -out:{exe_path} {src_path}', + 'env' => ["GOCACHE=/tmp","GOPATH=/root/go"] + ], + 'run' => [ + 'command' => '/usr/bin/mono {exe_path}', + 'seccomp_rule' => "", + 'env' => $default_env, + 'memory_limit_check_only' => 1 + ] ] ]; } diff --git a/app/Babel/Extension/noj/compiler/1616243142.json b/app/Babel/Extension/noj/compiler/1616243142.json new file mode 100644 index 000000000..34fc8b7b3 --- /dev/null +++ b/app/Babel/Extension/noj/compiler/1616243142.json @@ -0,0 +1,10 @@ +{ + "modifications":[{ + "code":"csharp", + "compability":"csharp", + "language":"csharp", + "icon":"devicon-csharp-plain", + "display":"C#", + "method":"add" + }] +} From 4c11544fd40bc27faaf3e773c4bb92c9ded34708 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Sat, 20 Mar 2021 23:11:38 +0800 Subject: [PATCH 021/293] remove go env that csharp would not require --- app/Babel/Extension/noj/Languages.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Babel/Extension/noj/Languages.php b/app/Babel/Extension/noj/Languages.php index 224988c20..b246101be 100644 --- a/app/Babel/Extension/noj/Languages.php +++ b/app/Babel/Extension/noj/Languages.php @@ -144,8 +144,7 @@ public static function get() 'max_cpu_time' => 3000, 'max_real_time' => 10000, 'max_memory' => -1, - 'compile_command' => '/usr/bin/mcs -optimize+ -out:{exe_path} {src_path}', - 'env' => ["GOCACHE=/tmp","GOPATH=/root/go"] + 'compile_command' => '/usr/bin/mcs -optimize+ -out:{exe_path} {src_path}' ], 'run' => [ 'command' => '/usr/bin/mono {exe_path}', From ff78cd37548c660fb1bb18e8e33ad2336aca1f84 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Sun, 21 Mar 2021 00:19:05 +0800 Subject: [PATCH 022/293] add cm-scrollable-menu background --- resources/views/problem/editor.blade.php | 1 + resources/views/tool/pastebin/create.blade.php | 1 + resources/views/tool/pastebin/view.blade.php | 1 + 3 files changed, 3 insertions(+) diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index a835369b0..877df5844 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -469,6 +469,7 @@ height: auto; max-height: 61.8vh; overflow-x: hidden; + background: #fff; } .btn-group .dropdown-menu { diff --git a/resources/views/tool/pastebin/create.blade.php b/resources/views/tool/pastebin/create.blade.php index 9ebaee04c..7958f3905 100644 --- a/resources/views/tool/pastebin/create.blade.php +++ b/resources/views/tool/pastebin/create.blade.php @@ -43,6 +43,7 @@ overflow-x: hidden; width: 100%; max-width:16rem; + background: #fff; }
    diff --git a/resources/views/tool/pastebin/view.blade.php b/resources/views/tool/pastebin/view.blade.php index a20877cb8..75e55a72b 100644 --- a/resources/views/tool/pastebin/view.blade.php +++ b/resources/views/tool/pastebin/view.blade.php @@ -40,6 +40,7 @@ overflow-x: hidden; width: 100%; max-width:16rem; + background: #fff; } user-section{ From e342c14498f699a5fbb2deb13f87ce9603c7d353 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Sun, 21 Mar 2021 20:33:04 +0800 Subject: [PATCH 023/293] update devicon package --- composer.lock | 14 +++++++++----- resources/views/layouts/app.blade.php | 2 +- resources/views/layouts/errors.blade.php | 2 +- resources/views/problem/editor.blade.php | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 6e0958e62..e2256f4b3 100644 --- a/composer.lock +++ b/composer.lock @@ -1203,16 +1203,16 @@ }, { "name": "fonts-asset/devicon", - "version": "1.0.0", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/ZsgsDesign/fonts-asset-Devicon.git", - "reference": "14381087a09512236b8471b3aea144f03a61914e" + "reference": "60b758649dac34cb7498fc450e8f4eec120e78df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ZsgsDesign/fonts-asset-Devicon/zipball/14381087a09512236b8471b3aea144f03a61914e", - "reference": "14381087a09512236b8471b3aea144f03a61914e", + "url": "https://api.github.com/repos/ZsgsDesign/fonts-asset-Devicon/zipball/60b758649dac34cb7498fc450e8f4eec120e78df", + "reference": "60b758649dac34cb7498fc450e8f4eec120e78df", "shasum": "" }, "type": "fonts-asset", @@ -1227,7 +1227,11 @@ } ], "description": "Devicon for composer.", - "time": "2020-12-10T16:02:19+00:00" + "support": { + "issues": "https://github.com/ZsgsDesign/fonts-asset-Devicon/issues", + "source": "https://github.com/ZsgsDesign/fonts-asset-Devicon/tree/1.0.3" + }, + "time": "2021-03-21T12:24:52+00:00" }, { "name": "fonts-asset/mdi-wxss", diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index f1f684563..7b272ec18 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -167,7 +167,7 @@ - +
    diff --git a/resources/views/layouts/errors.blade.php b/resources/views/layouts/errors.blade.php index f1c56efbb..36132f40e 100644 --- a/resources/views/layouts/errors.blade.php +++ b/resources/views/layouts/errors.blade.php @@ -151,7 +151,7 @@ - +
    diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index 877df5844..bc113ff6e 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -137,7 +137,7 @@ - +
    -

    General

    +

    {{__('admin.home_infos.general')}}

    + +
    +
    + + +
    +
    + + @foreach($dependencies as $dependency => $version) + + + + + @endforeach +
    {{ $dependency }}{{ $version }}
    +
    + +
    + +
    + + diff --git a/resources/views/admin/dashboard/environment.blade.php b/resources/views/admin/dashboard/environment.blade.php new file mode 100644 index 000000000..3b46926d7 --- /dev/null +++ b/resources/views/admin/dashboard/environment.blade.php @@ -0,0 +1,27 @@ +
    +
    +

    {{__('admin.home.environment')}}

    + +
    + + +
    +
    + + +
    +
    + + @foreach($envs as $env) + + + + + @endforeach +
    {{ $env['name'] }} {{ $env['value'] }}
    +
    + +
    + +
    diff --git a/resources/views/admin/dashboard/general.blade.php b/resources/views/admin/dashboard/general.blade.php index 0e850119d..444701175 100644 --- a/resources/views/admin/dashboard/general.blade.php +++ b/resources/views/admin/dashboard/general.blade.php @@ -28,7 +28,7 @@
    -

    {{__('admin.home_infos.general')}}

    +

    {{__('admin.home.general')}}

    + @else - + @endif @if($anticheat['status']=='failed') - + @endif @if($anticheat['status']=='finished') - + @endif @if(in_array($anticheat['status'], ['finished','failed'])) - + @endif @if($anticheat['status']=='empty') - + @endif
    @@ -443,7 +443,7 @@ function anticheat(){ }, success: function(ret){ // console.log(ret); if (ret.ret==200) { - alert("Code plagiarism detection currently in background, check status later."); + alert("{{__("contest.inside.admin.anticheat.alert")}}"); $('#anticheated button[data-role="action"]').addClass('d-none'); $('#anticheated button[data-role="progress"]').removeClass('d-none'); $('#anticheated button[data-role="report"]').addClass('d-none'); From f9ff5dba1611e36db7684cae9ccc715b34f64de9 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Tue, 27 Jul 2021 06:26:31 +0800 Subject: [PATCH 114/293] remove MOSS --- .env.example | 2 -- app/Jobs/AntiCheat.php | 7 +++---- config/moss.php | 15 --------------- 3 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 config/moss.php diff --git a/.env.example b/.env.example index b4e168c5d..5b87c1154 100644 --- a/.env.example +++ b/.env.example @@ -59,8 +59,6 @@ GITHUB_KEY= GITHUB_SECRET= GITHUB_CALLBACK_URL= -MOSS_USERID= - CONTACT_EMAIL="noj@njupt.edu.cn" CONTACT_QQ="Group 668108264" CONTACT_TEL= diff --git a/app/Jobs/AntiCheat.php b/app/Jobs/AntiCheat.php index 3b5522680..812110873 100644 --- a/app/Jobs/AntiCheat.php +++ b/app/Jobs/AntiCheat.php @@ -14,7 +14,6 @@ use Symfony\Component\Process\Process; use KubAT\PhpSimple\HtmlDomParser; use PhpZip\ZipFile; -use MOSS\MOSS; use Storage; use Str; use Log; @@ -68,7 +67,7 @@ public function handle() Storage::deleteDirectory("contest/anticheat/$cid/"); sleep(1); $this->setProgressNow(20); - $totMOSS=0; + $totProb=0; $probLangs=[]; @@ -81,12 +80,12 @@ public function handle() Storage::put("contest/anticheat/$cid/raw/$prob/$lang/[$submission->uid][$submission->sid].$ext", $submission->solution); if(!isset($probLangs[$prob][$lang])) $probLangs[$prob][$lang]=1; else $probLangs[$prob][$lang]++; - $totMOSS++; + $totProb++; } } $this->setProgressNow(40); - $this->stepVal=50/($totMOSS*2); + $this->stepVal=50/($totProb*2); $this->progressVal=40; foreach($probLangs as $prob=>$langs){ diff --git a/config/moss.php b/config/moss.php deleted file mode 100644 index 6262a9748..000000000 --- a/config/moss.php +++ /dev/null @@ -1,15 +0,0 @@ - env('MOSS_USERID', ''), -]; From cbe9ed15316f347b4f0ae689c56dd6fc099c5bd1 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Tue, 27 Jul 2021 11:59:28 +0800 Subject: [PATCH 115/293] add ProcessFailedException --- app/Jobs/AntiCheat.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Jobs/AntiCheat.php b/app/Jobs/AntiCheat.php index 812110873..5909c0f45 100644 --- a/app/Jobs/AntiCheat.php +++ b/app/Jobs/AntiCheat.php @@ -8,6 +8,7 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; +use Symfony\Component\Process\Exception\ProcessFailedException; use App\Models\Eloquent\Contest as EloquentContestModel; use App\Models\Eloquent\UserModel as EloquentUserModel; use Imtigger\LaravelJobStatus\Trackable; @@ -134,7 +135,8 @@ private function detectPlagiarism($config) $process->setWorkingDirectory(Storage::path('contest'.DIRECTORY_SEPARATOR.'anticheat'.DIRECTORY_SEPARATOR.$cid.DIRECTORY_SEPARATOR.'raw'.DIRECTORY_SEPARATOR.$prob.DIRECTORY_SEPARATOR.$lang)); $process->run(); if (!$process->isSuccessful()) { - Log::error("Cannot Compare $lang $cid $prob"); + Log::error("Cannot Compare Problem $prob of Contest $cid, Languages $lang"); + throw new ProcessFailedException($process); } // Log::debug($process->getOutput()); $this->incProgress($count); From 8e87a1d1c0a76aa118656aab01d46ca3a3204cc8 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Tue, 27 Jul 2021 12:19:19 +0800 Subject: [PATCH 116/293] add process output --- app/Jobs/AntiCheat.php | 4 ++-- app/Models/ContestModel.php | 46 ++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/app/Jobs/AntiCheat.php b/app/Jobs/AntiCheat.php index 5909c0f45..12655b13b 100644 --- a/app/Jobs/AntiCheat.php +++ b/app/Jobs/AntiCheat.php @@ -138,7 +138,7 @@ private function detectPlagiarism($config) Log::error("Cannot Compare Problem $prob of Contest $cid, Languages $lang"); throw new ProcessFailedException($process); } - // Log::debug($process->getOutput()); + Log::info($process->getOutput()); $this->incProgress($count); //afterWork $this->afterWork($cid, $prob, $lang, $process->getOutput()); @@ -167,7 +167,7 @@ private function afterWork($cid,$prob,$lang, $rawContent) 'prob'=>$prob, 'lang'=>$lang, ]; - Log::debug($line); + Log::info($line); } } diff --git a/app/Models/ContestModel.php b/app/Models/ContestModel.php index 656238941..d8010574b 100644 --- a/app/Models/ContestModel.php +++ b/app/Models/ContestModel.php @@ -701,15 +701,19 @@ public function contestRankCache($cid) $totScore+=$prob_stat["solved"]; } } + + $nickName=DB::table("group_member")->where([ + "uid" => $s["uid"], + "gid" => $contest_info["gid"] + ])->where("role", ">", 0)->first(); + + $nickName=is_null($nickName)?null:$nickName["nick_name"]; $ret[]=[ "uid" => $s["uid"], "name" => DB::table("users")->where([ "id"=>$s["uid"] ])->first()["name"], - "nick_name" => DB::table("group_member")->where([ - "uid" => $s["uid"], - "gid" => $contest_info["gid"] - ])->where("role", ">", 0)->first()["nick_name"], + "nick_name" => $nickName, "score" => $totScore, "penalty" => $totPen, "problem_detail" => $prob_detail @@ -748,15 +752,19 @@ public function contestRankCache($cid) $totSolved+=$prob_stat["solved"]; $totScore+=intval($prob_stat["score_parsed"]); } + + $nickName=DB::table("group_member")->where([ + "uid" => $s["uid"], + "gid" => $contest_info["gid"] + ])->where("role", ">", 0)->first(); + + $nickName=is_null($nickName)?null:$nickName["nick_name"]; $ret[]=[ "uid" => $s["uid"], "name" => DB::table("users")->where([ "id"=>$s["uid"] ])->first()["name"], - "nick_name" => DB::table("group_member")->where([ - "uid" => $s["uid"], - "gid" => $contest_info["gid"] - ])->where("role", ">", 0)->first()["nick_name"], + "nick_name" => $nickName, "score" => $totScore, "solved" => $totSolved, "problem_detail" => $prob_detail @@ -1699,15 +1707,18 @@ public function updateContestRankDetail($contest_info,$problem,$cid,$uid,$ret) $totScore+=$prob_stat["solved"]; } + $nickName=DB::table("group_member")->where([ + "uid" => $uid, + "gid" => $contest_info["gid"] + ])->where("role", ">", 0)->first(); + $nickName=is_null($nickName)?null:$nickName["nick_name"]; + $ret[$id]=[ "uid" => $uid, "name" => DB::table("users")->where([ "id"=>$uid ])->first()["name"], - "nick_name" => DB::table("group_member")->where([ - "uid" => $uid, - "gid" => $contest_info["gid"] - ])->where("role", ">", 0)->first()["nick_name"], + "nick_name" => $nickName, "score" => $totScore, "penalty" => $totPen, "problem_detail" => $prob_detail @@ -1736,15 +1747,18 @@ public function updateContestRankDetail($contest_info,$problem,$cid,$uid,$ret) $totSolved+=$prob_stat["solved"]; $totScore+=intval($prob_stat["score_parsed"]); + $nickName=DB::table("group_member")->where([ + "uid" => $uid, + "gid" => $contest_info["gid"] + ])->where("role", ">", 0)->first(); + $nickName=is_null($nickName)?null:$nickName["nick_name"]; + $ret[$id]=[ "uid" => $uid, "name" => DB::table("users")->where([ "id"=> $uid ])->first()["name"], - "nick_name" => DB::table("group_member")->where([ - "uid" => $uid, - "gid" => $contest_info["gid"] - ])->where("role", ">", 0)->first()["nick_name"], + "nick_name" => $nickName, "score" => $totScore, "solved" => $totSolved, "problem_detail" => $prob_detail From 6a438bb3a5e2a550ffd2a2849ec1caf6d5fbb6e5 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Tue, 27 Jul 2021 12:30:12 +0800 Subject: [PATCH 117/293] using assembled command for anticheat --- app/Jobs/AntiCheat.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/AntiCheat.php b/app/Jobs/AntiCheat.php index 12655b13b..f2e87cb9d 100644 --- a/app/Jobs/AntiCheat.php +++ b/app/Jobs/AntiCheat.php @@ -126,10 +126,10 @@ private function detectPlagiarism($config) $exe=base_path('binary'.DIRECTORY_SEPARATOR.'linux'.DIRECTORY_SEPARATOR.'sim_'.$lang); } - $exec=[$exe, '-p']; + $exec=escapeshellarg($exe).' -p '; // wildcardly add all files - $exec[]='*.'.$lang; + $exec.='*.'.$lang; $process = new Process($exec); $process->setWorkingDirectory(Storage::path('contest'.DIRECTORY_SEPARATOR.'anticheat'.DIRECTORY_SEPARATOR.$cid.DIRECTORY_SEPARATOR.'raw'.DIRECTORY_SEPARATOR.$prob.DIRECTORY_SEPARATOR.$lang)); From 3c24572af25f9a9cb860c8e84a2b1c1ae16a5132 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Tue, 27 Jul 2021 12:36:51 +0800 Subject: [PATCH 118/293] fixed frozen_time ELoquent belongsto bug --- app/Models/Eloquent/ContestProblem.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Eloquent/ContestProblem.php b/app/Models/Eloquent/ContestProblem.php index 00f6f33e4..4a4be734c 100644 --- a/app/Models/Eloquent/ContestProblem.php +++ b/app/Models/Eloquent/ContestProblem.php @@ -69,7 +69,7 @@ public function userStatus($user) public function ac_record($user) { - $frozen_time=$this->contest()->frozen_time; + $frozen_time=$this->contest->frozen_time; $user_ac = $this->submissions()->where([ 'uid' => $user->id, 'verdict' => 'Accepted' From c6ee075eca1aed1df92e41b7ac76be46eced57e2 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Tue, 27 Jul 2021 13:04:45 +0800 Subject: [PATCH 119/293] update npm-asset/pdfobject fitting Chromium based Edge --- composer.json | 2 +- composer.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 8f490b059..eea8131fe 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,7 @@ "fzaninotto/faker": "^1.4", "mockery/mockery": "^1.0", "nunomaduro/collision": "^2.0", - "phpunit/phpunit": "^9.0" + "phpunit/phpunit": "^7.5" }, "config": { "optimize-autoloader": true, diff --git a/composer.lock b/composer.lock index 3b400f41c..b9694297c 100644 --- a/composer.lock +++ b/composer.lock @@ -4805,10 +4805,10 @@ }, { "name": "npm-asset/pdfobject", - "version": "2.2.3", + "version": "2.2.6", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/pdfobject/-/pdfobject-2.2.3.tgz" + "url": "https://registry.npmjs.org/pdfobject/-/pdfobject-2.2.6.tgz" }, "type": "npm-asset", "license": [ @@ -10979,5 +10979,5 @@ "php": "^7.3" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.0.0" } From 437bf80c188fdaa1af4ea908fc7676a9ad144231 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Tue, 27 Jul 2021 13:43:32 +0800 Subject: [PATCH 120/293] fixed method not allowed bug --- .../account/components/settingView.blade.php | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/resources/views/account/components/settingView.blade.php b/resources/views/account/components/settingView.blade.php index 72229efa2..16af9c79d 100644 --- a/resources/views/account/components/settingView.blade.php +++ b/resources/views/account/components/settingView.blade.php @@ -314,7 +314,27 @@ }, success : function(result){ if(result.data === 0){ - window.location = "{{ route('verification.resend') }}"; + // window.location = "{{ route('verification.resend') }}"; + $.ajax({ + url : '{{route('verification.resend')}}', + type : 'POST', + headers: { + 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') + }, + success : function(result){ + alert('Email Sent'); + }, + error: function(xhr, type){ + switch(xhr.status) { + case 422: + alert(xhr.responseJSON.errors[Object.keys(xhr.responseJSON.errors)[0]][0], xhr.responseJSON.message); + break; + default: + alert("Server Connection Error"); + } + } + }); + //end }else{ error_tip('#email-tip','#email-tip-text','{{__('dashboard.setting.errorEmailFast')}}'); $('#send-email').attr('data-cooldown',result.data); From 285d936447908cf0a1033c8a11272d131fa86609 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 21:05:49 +0000 Subject: [PATCH 121/293] build(deps): bump npm-asset/codemirror from 5.61.1 to 5.62.2 Bumps npm-asset/codemirror from 5.61.1 to 5.62.2. --- updated-dependencies: - dependency-name: npm-asset/codemirror dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.lock b/composer.lock index b9694297c..b94579f29 100644 --- a/composer.lock +++ b/composer.lock @@ -4566,10 +4566,10 @@ }, { "name": "npm-asset/codemirror", - "version": "5.61.1", + "version": "5.62.2", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.1.tgz" + "url": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz" }, "type": "npm-asset", "license": [ @@ -10979,5 +10979,5 @@ "php": "^7.3" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } From cbb22d196d37d0881438fc8a6001eef6c0e56a4b Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 28 Jul 2021 13:37:31 +0800 Subject: [PATCH 122/293] add code tester admin menu --- app/Admin/menu.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/Admin/menu.json b/app/Admin/menu.json index 8cb8a88f4..93982ee77 100644 --- a/app/Admin/menu.json +++ b/app/Admin/menu.json @@ -209,6 +209,18 @@ "updated_at": "2019-04-10 17:01:18", "roles": [] }, + { + "id": 34, + "parent_id": 0, + "order": 12, + "title": "admin.menu_titles.tester", + "icon": "MDI test-tube", + "uri": "\/codetester", + "permission": null, + "created_at": "2019-04-10 17:00:09", + "updated_at": "2019-04-10 17:01:18", + "roles": [] + }, { "id": 13, "parent_id": 0, From c9b789e791ebe7bd47167e2d04d526b4e59cd7d4 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 28 Jul 2021 13:38:18 +0800 Subject: [PATCH 123/293] update NOJ babel extension --- app/Babel/Extension/noj/Monitor.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Babel/Extension/noj/Monitor.php b/app/Babel/Extension/noj/Monitor.php index a4de7d096..2eee6ef4d 100644 --- a/app/Babel/Extension/noj/Monitor.php +++ b/app/Babel/Extension/noj/Monitor.php @@ -5,6 +5,7 @@ use App\Models\OJModel; use App\Models\JudgerModel; use Exception; +use Log; class Monitor extends MonitorBase { @@ -79,7 +80,7 @@ private function ping($url, $port, $token) curl_close($curl); if ($err) { - \Log::error($err); + Log::error($err); return []; } else { return [ From 259e5b31984ce4a1ef76ccf387072e5dd54cc679 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 28 Jul 2021 13:38:39 +0800 Subject: [PATCH 124/293] NOJ babel extension PHP 7.4 fix --- app/Babel/Extension/noj/JudgeClient.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Babel/Extension/noj/JudgeClient.php b/app/Babel/Extension/noj/JudgeClient.php index 66da13e1d..52ea1fc7e 100644 --- a/app/Babel/Extension/noj/JudgeClient.php +++ b/app/Babel/Extension/noj/JudgeClient.php @@ -43,8 +43,8 @@ public function judge($src, $language, $testCaseId, $config=[]) 'language_config' => $languageConfig, 'src' => $src, 'test_case_id' => $testCaseId, - 'max_cpu_time' => $languageConfig['compile']['max_cpu_time'], - 'max_memory' => $languageConfig['compile']['max_memory'], + 'max_cpu_time' => is_null($languageConfig['compile'])?null:$languageConfig['compile']['max_cpu_time'], + 'max_memory' => is_null($languageConfig['compile'])?null:$languageConfig['compile']['max_memory'], 'spj_version' => null, 'spj_config' => null, 'spj_compile_config' => null, From 8c34fee28c10ba7413b2cd4b0cffb72a95f51fcc Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 28 Jul 2021 13:39:13 +0800 Subject: [PATCH 125/293] add TestRun Babel API --- app/Babel/Babel.php | 6 +++++ app/Babel/TestRun/TestRunner.php | 39 ++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 app/Babel/TestRun/TestRunner.php diff --git a/app/Babel/Babel.php b/app/Babel/Babel.php index a49ace487..67f6aec23 100644 --- a/app/Babel/Babel.php +++ b/app/Babel/Babel.php @@ -6,6 +6,7 @@ use App\Babel\Judge\Judger; use App\Babel\Synchronize\Synchronizer; use App\Babel\Monit\Monitor; +use App\Babel\TestRun\TestRunner; class Babel { @@ -33,4 +34,9 @@ public function monitor($conf) { return new Monitor($conf); } + + public function testrun($conf) + { + return new TestRunner($conf); + } } diff --git a/app/Babel/TestRun/TestRunner.php b/app/Babel/TestRun/TestRunner.php new file mode 100644 index 000000000..fbb58321f --- /dev/null +++ b/app/Babel/TestRun/TestRunner.php @@ -0,0 +1,39 @@ +verdict=$runner->run(); + } + } + + public static function create($conf) + { + $name=$conf["name"]; + $runnerProvider="TestRunner"; + try { + $BabelConfig=json_decode(file_get_contents(babel_path("Extension/$name/babel.json")), true); + $runnerProvider=$BabelConfig["provider"]["testrunner"]; + } catch (Throwable $e) { + } catch (ErrorException $e) { + } catch (Exception $e) { + } + $className = "App\\Babel\\Extension\\$name\\$runnerProvider"; + if (class_exists($className)) { + return new $className($conf); + } else { + return null; + } + } +} From 3a039f725f34cfa9bb01001d6b29735a3b6c5da0 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 28 Jul 2021 13:39:38 +0800 Subject: [PATCH 126/293] add TestRun NOJ babel extension support --- app/Babel/Extension/noj/TestRunner.php | 120 +++++++++++++++++++++++++ app/Babel/Extension/noj/babel.json | 3 +- 2 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 app/Babel/Extension/noj/TestRunner.php diff --git a/app/Babel/Extension/noj/TestRunner.php b/app/Babel/Extension/noj/TestRunner.php new file mode 100644 index 000000000..25b5a2a0a --- /dev/null +++ b/app/Babel/Extension/noj/TestRunner.php @@ -0,0 +1,120 @@ + "Compile Error", + -1 => "Wrong Answer", + 0 => "Accepted", + 1 => "Time Limit Exceed", + 2 => "Real Time Limit Exceed", + 3 => "Memory Limit Exceed", + 4 => "Runtime Error", + 5 => "System Error", + 6 => "Pending", + 7 => "Judging", + 8 => "Partially Accepted" + ]; + + public function __construct($config) + { + $this->oid=OJModel::oid($this->ocode); + $this->pid=$config['pid']; + $this->coid=$config['coid']; + $this->solution=$config['solution']; + } + + public function run() + { + $judgerModel=new JudgerModel(); + $compilerModel=new CompilerModel(); + $problemModel=new ProblemModel(); + $language=$compilerModel->detail($this->coid)['lcode']; + $bestServer=$judgerModel->server($this->oid); + if (is_null($bestServer)) { + $this->verdict=[ + "verdict"=>"Compile Error", + "compile_info"=>"No Available Judger.", + "data"=>[] + ]; + return; + } + $probBasic=$problemModel->basic($this->pid); + $submitURL="http://".$bestServer["host"].":".$bestServer["port"]; + $submit_data=[ + "solution" => $this->solution, + "language" => $language, + "max_cpu_time" => $probBasic["time_limit"] * ($language=="java" ? 3 : 1), + "max_memory" => $probBasic["memory_limit"] * 1024, + "test_case_id" => $probBasic["pcode"], + "token" => $bestServer["token"], + "spj_version" => null, + "spj_config" => null, + "spj_compile_config" => null, + "spj_src" => null + ]; + if($probBasic["spj"] && $probBasic["spj_version"]){ + $submit_data["spj_version"]=$probBasic["spj_version"]; + $submit_data["spj_config"]=$probBasic["spj_lang"]; + $submit_data["spj_compile_config"]=[ + "src_name" => "spj-{spj_version}.c", + "exe_name" => "spj-{spj_version}", + "max_cpu_time" => 3000, + "max_real_time" => 5000, + "max_memory" => 1073741824, + "compile_command" => "/usr/bin/gcc -DONLINE_JUDGE -O2 -w -fmax-errors=3 -std=c99 {src_path} -lm -o {exe_path}" + ]; // fixed at C99, future linked with spj_lang + $submit_data["spj_src"]=$probBasic["spj_src"]; + } + $judgeClient=new JudgeClient($submit_data["token"], $submitURL); + $temp = $judgeClient->judge($submit_data["solution"], $submit_data["language"], $submit_data["test_case_id"], [ + 'output' => false, + 'max_cpu_time'=>$submit_data['max_cpu_time'], + 'max_memory'=>$submit_data['max_memory'], + 'spj_version'=>$submit_data['spj_version'], + 'spj_config'=>$submit_data['spj_config'], + 'spj_compile_config'=>$submit_data['spj_compile_config'], + 'spj_src'=>$submit_data['spj_src'] + ]); + if (!is_null($temp["err"])) { + if (strpos($temp["data"], 'Compiler runtime error, info: ')!==false) { + $tempRes=json_decode(explode('Compiler runtime error, info: ', $temp["data"])[1], true); + $this->verdict['verdict']=$this->verdictDict[$tempRes["result"]]; + $this->verdict['compile_info']=null; + } else { + $this->verdict['verdict']=$this->verdictDict["-2"]; + $this->verdict['compile_info']=$temp["data"]; + } + $this->verdict['data']=[]; + return $this->verdict; + } + + $this->verdict['verdict']="Accepted"; + foreach ($temp["data"] as $record) { + if ($record["result"]) { + // well... WA or anyway + $this->verdict['verdict']=$this->verdictDict[$record["result"]]; + break; + } + } + + $this->verdict['data']=$temp["data"]; + $this->verdict['compile_info']=null; + foreach ($this->verdict['data'] as &$record) { + $record["result"]=$this->verdictDict[$record["result"]]; + } + return $this->verdict; + } +} diff --git a/app/Babel/Extension/noj/babel.json b/app/Babel/Extension/noj/babel.json index 01aa616a6..0d7c44412 100644 --- a/app/Babel/Extension/noj/babel.json +++ b/app/Babel/Extension/noj/babel.json @@ -14,7 +14,8 @@ "provider": { "submitter": "Submitter", "installer": "Installer", - "monitor": "Monitor" + "monitor": "Monitor", + "testrunner": "TestRunner" }, "require": { "NOJ": "__cur__" From dc4cbff109a16fae79bfed9535adb31e992c2815 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 28 Jul 2021 13:39:59 +0800 Subject: [PATCH 127/293] add code tester admin portal support --- .../Controllers/CodeTesterController.php | 109 ++++++++++++++++++ app/Admin/routes.php | 2 + resources/lang/en/admin.php | 17 +++ resources/lang/zh-CN/admin.php | 17 +++ 4 files changed, 145 insertions(+) create mode 100644 app/Admin/Controllers/CodeTesterController.php diff --git a/app/Admin/Controllers/CodeTesterController.php b/app/Admin/Controllers/CodeTesterController.php new file mode 100644 index 000000000..93068263a --- /dev/null +++ b/app/Admin/Controllers/CodeTesterController.php @@ -0,0 +1,109 @@ +isMethod('post')) { + return $content + ->header(__('admin.tester.tester.header')) + ->description(__('admin.tester.tester.description')) + ->body($this->run()); + } + return $content + ->header(__('admin.tester.tester.header')) + ->description(__('admin.tester.tester.description')) + ->body($this->form()); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + $OJ=OJ::where(["ocode"=>"noj"])->get(); + $box = new Box(__('admin.tester.tester.title')); + if(blank($OJ)) { + $box->style('danger'); + $box->content(__('admin.tester.help.installfirst')); + return $box; + } + $oid=$OJ->first()->oid; + $box->style('success'); + $form=new Form(); + $form->select('oid', __('admin.tester.oj'))->options($OJ->pluck('name', 'oid'))->help(__('admin.tester.help.onlinejudge'))->rules('required'); + $form->select('pid', __('admin.tester.pid'))->options(Problem::where(["OJ"=>$oid])->get()->sortBy('readable_name')->pluck('readable_name', 'pid'))->rules('required'); + $form->select('coid', __('admin.tester.coid'))->options(Compiler::where(["oid"=>$oid])->get()->pluck('display_name', 'coid'))->rules('required'); + $form->textarea('solution', __('admin.tester.solution'))->rows(20)->rules('required'); + $form->action(route('admin.codetester.tester')); + $form->method('POST'); + $box->content($form); + return $box; + } + + /** + * Running Test. + * + * @return Response + */ + protected function run() + { + $babel=new Babel(); + request()->validate([ + 'oid' => 'required|integer', + 'pid' => 'required|integer', + 'coid' => 'required|integer', + 'solution' => 'required', + ]); + $runner=$babel->testrun([ + 'name' => 'noj', + 'pid' => request()->pid, + 'coid' => request()->coid, + 'solution' => request()->solution, + ]); + $verdict=$runner->verdict; + $boxRun = new Box(__('admin.tester.tester.run')); + $boxRun->style('success'); + $verdictData=[]; + foreach($verdict['data'] as $v){ + $verdictData[]=[ + $v["test_case"], + $v["cpu_time"], + $v["real_time"], + $v["memory"], + $v["signal"], + $v["exit_code"], + $v["error"], + $v["result"], + ]; + } + $table = new Table(['Test Case', 'CPU Time(ms)', 'Real Time(ms)', 'Memory(byte)', 'Signal', 'Exit Code', 'Error', 'Result'], $verdictData); + $output="

    Verdict: {$verdict['verdict']}

    "; + if (!blank($verdict['compile_info'])) { + $output.="

    Compiler Info:

    ".htmlspecialchars($verdict['compile_info'])."
    "; + } + $output.=$table->render(); + $boxRun->content($output); + return $boxRun; + } +} diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 9b28a5cbd..88502224e 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -25,6 +25,8 @@ $router->resource('judger', JudgerController::class); $router->resource('abuses', AbuseController::class); + Route::match(['GET','POST'],'codetester', 'CodeTesterController@tester')->name('admin.codetester.tester'); + Route::group(['prefix' => 'babel'], function (Router $router) { $router->get('/', 'BabelController@index')->name('admin.babel.index'); $router->get('installed', 'BabelController@installed')->name('admin.babel.installed'); diff --git a/resources/lang/en/admin.php b/resources/lang/en/admin.php index dd7a7e79f..8a1595389 100644 --- a/resources/lang/en/admin.php +++ b/resources/lang/en/admin.php @@ -117,6 +117,7 @@ 'groups' => 'Groups', 'judgeserver' => 'Judge Servers', 'judger' => 'Judge Agents', + 'tester' => 'Code Tester', 'dojoCatg' => 'Dojos', 'dojos' => 'Dojo Tasks', 'dojophases' => 'Dojo Phases', @@ -368,4 +369,20 @@ 'markdown' => 'Only a few Markdown syntax are supported here, like font styles.', ], ], + 'tester' => [ + 'oj' => 'OJ Platform', + 'pid' => 'Problem', + 'coid' => 'Compiler', + 'solution' => 'Solution', + 'tester' => [ + 'header' => 'Code Tester', + 'description' => 'write solution and get code test results', + 'title' => 'Submit Solution', + 'run' => 'Submission Verdict', + ], + 'help' => [ + 'onlinejudge' => 'Only BABEL Extension NOJ can be choosen.', + 'installfirst' => 'Please install BABEL Extension NOJ first.', + ], + ], ]; diff --git a/resources/lang/zh-CN/admin.php b/resources/lang/zh-CN/admin.php index ec500579b..efa905f8c 100644 --- a/resources/lang/zh-CN/admin.php +++ b/resources/lang/zh-CN/admin.php @@ -117,6 +117,7 @@ 'groups' => '群组', 'judgeserver' => '评测机', 'judger' => '评测代理', + 'tester' => '代码测试器', 'dojoCatg' => '训练场', 'dojos' => '训练任务', 'dojophases' => '训练阶层', @@ -368,4 +369,20 @@ 'markdown' => '此处只有一小部分Markdown语法可用，如字体字形。', ], ], + 'tester' => [ + 'oj' => 'OJ平台', + 'pid' => '题目', + 'coid' => '编译器', + 'solution' => '代码', + 'tester' => [ + 'header' => '代码测试器', + 'description' => '编写代码并通过代码测试器获取调试结果', + 'title' => '提交代码', + 'run' => '测试结果', + ], + 'help' => [ + 'onlinejudge' => '仅可选择BABEL拓展包NOJ。', + 'installfirst' => '请首先安装BABEL拓展包NOJ。', + ], + ], ]; From 9c31c3c9dce698b5f3dae75a6aa0afb824ccbf03 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 28 Jul 2021 22:05:39 +0800 Subject: [PATCH 128/293] make submit form shown when code tester running --- .../Controllers/CodeTesterController.php | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/Admin/Controllers/CodeTesterController.php b/app/Admin/Controllers/CodeTesterController.php index 93068263a..0227df258 100644 --- a/app/Admin/Controllers/CodeTesterController.php +++ b/app/Admin/Controllers/CodeTesterController.php @@ -22,16 +22,12 @@ class CodeTesterController extends Controller */ public function tester(Content $content) { + $content=$content->header(__('admin.tester.tester.header')); + $content=$content->description(__('admin.tester.tester.description')); if (request()->isMethod('post')) { - return $content - ->header(__('admin.tester.tester.header')) - ->description(__('admin.tester.tester.description')) - ->body($this->run()); + $content=$content->body($this->run()); } - return $content - ->header(__('admin.tester.tester.header')) - ->description(__('admin.tester.tester.description')) - ->body($this->form()); + return $content->body($this->form()); } /** @@ -56,6 +52,12 @@ protected function form() $form->select('coid', __('admin.tester.coid'))->options(Compiler::where(["oid"=>$oid])->get()->pluck('display_name', 'coid'))->rules('required'); $form->textarea('solution', __('admin.tester.solution'))->rows(20)->rules('required'); $form->action(route('admin.codetester.tester')); + $form->fill([ + 'oid'=>request()->oid, + 'pid'=>request()->pid, + 'coid'=>request()->coid, + 'solution'=>request()->solution, + ]); $form->method('POST'); $box->content($form); return $box; @@ -83,7 +85,7 @@ protected function run() ]); $verdict=$runner->verdict; $boxRun = new Box(__('admin.tester.tester.run')); - $boxRun->style('success'); + $boxRun->style('info'); $verdictData=[]; foreach($verdict['data'] as $v){ $verdictData[]=[ From c468a57ea2e07debc8d14f78d635cc73ab8ed833 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 28 Jul 2021 22:06:46 +0800 Subject: [PATCH 129/293] fixed APP_MULTI_DOMAIN caused admin portal image shown bugs --- .env.example | 4 ++-- app/Providers/AppServiceProvider.php | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 5b87c1154..b351dfce6 100644 --- a/.env.example +++ b/.env.example @@ -3,8 +3,8 @@ APP_DISPLAY_NAME="NJUPT Online Judge" #Display Name APP_ENV=local #Current Environment Name APP_KEY=base64:6KvSj1hj/VJCNXnHECU16OVbcHk7h20O5TbsyOz5WuA= #App Key APP_DEBUG=true #Debug Mode -APP_URL=http://ojsystem.com/ -APP_MULTI_DOMAIN=false # Multi Domain Mode, Automatic match APP_URL +APP_URL=http://ojsystem.com +APP_MULTI_DOMAIN=false # Multi Domain Mode, Automatic match APP_URL, note that you still need to set APP_URL for console command proper running APP_LOCALE=en APP_BACKUP=false #Enable Scheduling Backup APP_LOGO="" #URL for site logo diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 273296def..fd7137144 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -16,6 +16,8 @@ public function boot() // if(config('app.multidomain')) { config(['app.url' => request()->root()]); + config(['filesystems.disks.public.url' => request()->root().'/storage']); + config(['filesystems.disks.NOJPublic.url' => request()->root()]); } } From e1d52f93039a8459d676e4487b8ae424be2330e1 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 28 Jul 2021 22:06:57 +0800 Subject: [PATCH 130/293] fixed vscode APP_MULTI_DOMAIN bugs --- resources/views/problem/editor.blade.php | 4 ++-- resources/views/tool/pastebin/create.blade.php | 4 ++-- resources/views/tool/pastebin/view.blade.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index d6799d894..830ceb378 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -1217,9 +1217,9 @@ function adjustAppearance(){ getWorkerUrl: function(workerId, label) { return `data:text/javascript;charset=utf-8,${encodeURIComponent(` self.MonacoEnvironment = { - baseUrl: '{{env('APP_URL')}}/static/library/monaco-editor/min/' + baseUrl: '{{config('app.url')}}/static/library/monaco-editor/min/' }; - importScripts('{{env('APP_URL')}}/static/library/monaco-editor/min/vs/base/worker/workerMain.js');` + importScripts('{{config('app.url')}}/static/library/monaco-editor/min/vs/base/worker/workerMain.js');` )}`; } }; diff --git a/resources/views/tool/pastebin/create.blade.php b/resources/views/tool/pastebin/create.blade.php index 1f4c3a3ba..01f5982a5 100644 --- a/resources/views/tool/pastebin/create.blade.php +++ b/resources/views/tool/pastebin/create.blade.php @@ -127,9 +127,9 @@ getWorkerUrl: function(workerId, label) { return `data:text/javascript;charset=utf-8,${encodeURIComponent(` self.MonacoEnvironment = { - baseUrl: '{{env('APP_URL')}}/static/library/monaco-editor/min/' + baseUrl: '{{config('app.url')}}/static/library/monaco-editor/min/' }; - importScripts('{{env('APP_URL')}}/static/library/monaco-editor/min/vs/base/worker/workerMain.js');` + importScripts('{{config('app.url')}}/static/library/monaco-editor/min/vs/base/worker/workerMain.js');` )}`; } }; diff --git a/resources/views/tool/pastebin/view.blade.php b/resources/views/tool/pastebin/view.blade.php index df7c562e9..44b9c97f0 100644 --- a/resources/views/tool/pastebin/view.blade.php +++ b/resources/views/tool/pastebin/view.blade.php @@ -125,9 +125,9 @@ getWorkerUrl: function(workerId, label) { return `data:text/javascript;charset=utf-8,${encodeURIComponent(` self.MonacoEnvironment = { - baseUrl: '{{env('APP_URL')}}/static/library/monaco-editor/min/' + baseUrl: '{{config('app.url')}}/static/library/monaco-editor/min/' }; - importScripts('{{env('APP_URL')}}/static/library/monaco-editor/min/vs/base/worker/workerMain.js');` + importScripts('{{config('app.url')}}/static/library/monaco-editor/min/vs/base/worker/workerMain.js');` )}`; } }; From cd7a27067c1b49981017a4925aa288e360358e32 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 28 Jul 2021 22:44:45 +0800 Subject: [PATCH 131/293] modify APP_MULTI_DOMAIN default example value --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index b351dfce6..aa79283bc 100644 --- a/.env.example +++ b/.env.example @@ -4,7 +4,7 @@ APP_ENV=local #Current Environment Name APP_KEY=base64:6KvSj1hj/VJCNXnHECU16OVbcHk7h20O5TbsyOz5WuA= #App Key APP_DEBUG=true #Debug Mode APP_URL=http://ojsystem.com -APP_MULTI_DOMAIN=false # Multi Domain Mode, Automatic match APP_URL, note that you still need to set APP_URL for console command proper running +APP_MULTI_DOMAIN=true # Multi Domain Mode, Automatic match APP_URL, note that you still need to set APP_URL for console command proper running APP_LOCALE=en APP_BACKUP=false #Enable Scheduling Backup APP_LOGO="" #URL for site logo From 6e09825988266e4150dbebe87b3244e4885ef06a Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 29 Jul 2021 01:26:20 +0800 Subject: [PATCH 132/293] componentify vscode frontend --- resources/views/js/common/vscode.blade.php | 76 +++++++++++ resources/views/problem/editor.blade.php | 94 ++----------- .../views/tool/pastebin/create.blade.php | 128 ++++-------------- 3 files changed, 119 insertions(+), 179 deletions(-) create mode 100644 resources/views/js/common/vscode.blade.php diff --git a/resources/views/js/common/vscode.blade.php b/resources/views/js/common/vscode.blade.php new file mode 100644 index 000000000..fca9743c7 --- /dev/null +++ b/resources/views/js/common/vscode.blade.php @@ -0,0 +1,76 @@ + diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index 830ceb378..be0d2970a 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -891,6 +891,19 @@ @include('components.congratulation') @endif + @component('js.common.vscode') + editor = monaco.editor.create(document.getElementById('monaco'), { + value: "{!!$submit_code!!}", + language: "@if(isset($compiler_list[$pref])){{$compiler_list[$pref]['lang']}}@else{{'plaintext'}}@endif", + theme: "vs-dark", + fontSize: 16, + formatOnPaste: true, + formatOnType: true, + automaticLayout: true + }); + $("#vscode_container").css("opacity",1); + @endcomponent + diff --git a/resources/views/tool/pastebin/create.blade.php b/resources/views/tool/pastebin/create.blade.php index 01f5982a5..d3b99ed4b 100644 --- a/resources/views/tool/pastebin/create.blade.php +++ b/resources/views/tool/pastebin/create.blade.php @@ -101,109 +101,41 @@ @section('additionJS') + + @component('js.common.vscode') + editor = monaco.editor.create(document.getElementById('monaco'), { + value: "", + language: "plaintext", + theme: "vs-light", + fontSize: 16, + formatOnPaste: true, + formatOnType: true, + automaticLayout: true, + }); + $("#vscode_container").css("opacity",1); + var all_lang=monaco.languages.getLanguages(); + all_lang.forEach(function (lang_conf) { + aval_lang.push(lang_conf.id); + $("#pb_lang_option").append(""); + // console.log(lang_conf.id); + }); + $('#pb_lang_option button').click(function(){ + targ_lang=$(this).attr("data-value"); + $("#pb_lang").text($(this).text()); + monaco.editor.setModelLanguage(editor.getModel(), targ_lang); + }); + $('#pb_time_option button').click(function(){ + targ_expire=$(this).attr("data-value"); + $("#pb_time").text($(this).text()); + }); + // monaco.editor.setModelLanguage(editor.getModel(), "plaintext"); + @endcomponent + - @component('js.common.vscode') editor = monaco.editor.create(document.getElementById('monaco'), { From 91c5095becb56b0384ae15c35227b05a4a09a1d8 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 29 Jul 2021 01:32:33 +0800 Subject: [PATCH 134/293] add component to pastebin view --- resources/views/tool/pastebin/view.blade.php | 72 +------------------- 1 file changed, 3 insertions(+), 69 deletions(-) diff --git a/resources/views/tool/pastebin/view.blade.php b/resources/views/tool/pastebin/view.blade.php index 44b9c97f0..8ae833e35 100644 --- a/resources/views/tool/pastebin/view.blade.php +++ b/resources/views/tool/pastebin/view.blade.php @@ -107,75 +107,9 @@ @endsection @section('additionJS') - - @endsection From a634cdc7b663faef099a051fea4d9b1c2051a2ef Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 29 Jul 2021 03:10:57 +0800 Subject: [PATCH 135/293] fixed editor css --- resources/views/problem/editor.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index 2ef2428bb..7efc9d34d 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -371,7 +371,7 @@ left-side{ overflow-y: scroll; - box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 40px; + /* box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 40px; */ padding: 3rem; padding-top: 0; } From 8841a9d7b0b8a2b47d53e0c6c44a99c79238adcc Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 29 Jul 2021 03:11:11 +0800 Subject: [PATCH 136/293] add monaco editor themes --- composer.json | 1 + composer.lock | 29 +++++++++++++++++++++- resources/views/js/common/vscode.blade.php | 21 +++++++++++++++- 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index eea8131fe..43c98e5df 100644 --- a/composer.json +++ b/composer.json @@ -59,6 +59,7 @@ "npm-asset/mathjax": "^2.7", "npm-asset/monaco-ace-tokenizer": "^0.2.1", "npm-asset/monaco-editor": "0.23.0", + "npm-asset/monaco-themes": "^0.3.3", "npm-asset/pdfobject": "^2.1", "npm-asset/perfect-scrollbar": "^1.4", "npm-asset/popper.js": "^1.5", diff --git a/composer.lock b/composer.lock index b9694297c..b13f7b506 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": "5985efb17ff961529e0c48f786ac9fdb", + "content-hash": "226cddfdfe204ea99b02d20bb3ba4144", "packages": [ { "name": "barryvdh/laravel-dompdf", @@ -4642,6 +4642,18 @@ "MPL-2.0 OR Apache-2.0" ] }, + { + "name": "npm-asset/fast-plist", + "version": "0.1.2", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/fast-plist/-/fast-plist-0.1.2.tgz" + }, + "type": "npm-asset", + "license": [ + "MIT" + ] + }, { "name": "npm-asset/fileicon-svg", "version": "1.0.0", @@ -4803,6 +4815,21 @@ "MIT" ] }, + { + "name": "npm-asset/monaco-themes", + "version": "0.3.3", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/monaco-themes/-/monaco-themes-0.3.3.tgz" + }, + "require": { + "npm-asset/fast-plist": ">=0.1.2,<0.2.0" + }, + "type": "npm-asset", + "license": [ + "MIT" + ] + }, { "name": "npm-asset/pdfobject", "version": "2.2.6", diff --git a/resources/views/js/common/vscode.blade.php b/resources/views/js/common/vscode.blade.php index 50d53d55f..feff71649 100644 --- a/resources/views/js/common/vscode.blade.php +++ b/resources/views/js/common/vscode.blade.php @@ -1,4 +1,5 @@ - + + @include("js.common.markdownEditor") - - + @include("js.common.mathjax") @include("js.common.markdownEditor") - - + @include("js.common.mathjax") @include("js.common.markdownEditor") - - + @include("js.common.mathjax") + diff --git a/resources/views/problem/detail.blade.php b/resources/views/problem/detail.blade.php index 769641bbb..9fbe52bc1 100644 --- a/resources/views/problem/detail.blade.php +++ b/resources/views/problem/detail.blade.php @@ -396,14 +396,5 @@ location.href="/problem/{{$detail["pcode"]}}/discussion"; },false) - - +@include("js.common.mathjax") @endsection diff --git a/resources/views/problem/discussion.blade.php b/resources/views/problem/discussion.blade.php index 718130dbd..a9901f5fc 100644 --- a/resources/views/problem/discussion.blade.php +++ b/resources/views/problem/discussion.blade.php @@ -445,16 +445,7 @@ @section("additionJS") @include("js.common.hljsLight") @include("js.common.markdownEditor") - - +@include("js.common.mathjax") - +@include("js.common.mathjax") - - + @include("js.common.mathjax") @include('layouts.primaryJS') @include('js.submission.detail') diff --git a/resources/views/problem/solution.blade.php b/resources/views/problem/solution.blade.php index b650f0ef0..c06ec77fb 100644 --- a/resources/views/problem/solution.blade.php +++ b/resources/views/problem/solution.blade.php @@ -590,16 +590,7 @@ @section("additionJS") @include("js.common.hljsLight") @include("js.common.markdownEditor") - - +@include("js.common.mathjax") From a338b6adea4507a04c707f4d5e05ebad8f74b78a Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 4 Aug 2021 03:41:14 +0800 Subject: [PATCH 157/293] fixed data refresh bug --- resources/views/problem/editor.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index ed685356f..543699adc 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -1009,7 +1009,7 @@ $( "#verdict_info" ).click(function() { if($("#verdict_text").hasClass('cm-popover-decoration')){ - alert('
    '+$("#verdict_info").data('content')+'
    ', $("#verdict_info").attr('title'),'bug'); + alert('
    '+$("#verdict_info").attr('data-content')+'
    ', $("#verdict_info").attr('title'),'bug'); } }); From ec22c27ffc127da2445468fce64c11051aa68229 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 4 Aug 2021 03:41:55 +0800 Subject: [PATCH 158/293] add highlight for compile error --- resources/views/problem/editor.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index 543699adc..c7aa29eb7 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -1009,7 +1009,7 @@ $( "#verdict_info" ).click(function() { if($("#verdict_text").hasClass('cm-popover-decoration')){ - alert('
    '+$("#verdict_info").attr('data-content')+'
    ', $("#verdict_info").attr('title'),'bug'); + alert('
    '+hljs.highlight('accesslog',$("#verdict_info").attr('data-content')).value+'
    ', $("#verdict_info").attr('title'),'bug',"true"); } }); From 192e63cbc0481703c92bbed6d66d217082dd95b2 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 4 Aug 2021 03:42:38 +0800 Subject: [PATCH 159/293] add cursor pointer for cm-popover-decoration --- resources/views/problem/editor.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index c7aa29eb7..14c233e06 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -578,6 +578,7 @@ border-bottom: dashed 1px currentColor; position: relative; top: -1px; + cursor: pointer; } @-webkit-keyframes cm-rotate{ From adb55dc4f0344576908e852addca503bc1885efa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Aug 2021 21:03:21 +0000 Subject: [PATCH 160/293] build(deps): bump laravel/framework from 6.20.30 to 6.20.31 Bumps [laravel/framework](https://github.com/laravel/framework) from 6.20.30 to 6.20.31. - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/8.x/CHANGELOG-6.x.md) - [Commits](https://github.com/laravel/framework/compare/v6.20.30...v6.20.31) --- updated-dependencies: - dependency-name: laravel/framework dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 254 ++++++++++++++++++++++++++------------------------ 1 file changed, 130 insertions(+), 124 deletions(-) diff --git a/composer.lock b/composer.lock index 78e469d08..bc8a6e330 100644 --- a/composer.lock +++ b/composer.lock @@ -2619,16 +2619,16 @@ }, { "name": "laravel/framework", - "version": "v6.20.30", + "version": "v6.20.31", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "a6402599a517b2f15f4ada6b3b20df33a5895e1e" + "reference": "15cd96b48fb4f652ba996041cdb9a2a3b03e00f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/a6402599a517b2f15f4ada6b3b20df33a5895e1e", - "reference": "a6402599a517b2f15f4ada6b3b20df33a5895e1e", + "url": "https://api.github.com/repos/laravel/framework/zipball/15cd96b48fb4f652ba996041cdb9a2a3b03e00f5", + "reference": "15cd96b48fb4f652ba996041cdb9a2a3b03e00f5", "shasum": "" }, "require": { @@ -2768,7 +2768,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2021-07-06T14:06:00+00:00" + "time": "2021-08-03T14:36:18+00:00" }, { "name": "laravel/passport", @@ -4253,22 +4253,23 @@ }, { "name": "nesbot/carbon", - "version": "2.50.0", + "version": "2.51.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb" + "reference": "8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f47f17d17602b2243414a44ad53d9f8b9ada5fdb", - "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922", + "reference": "8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922", "shasum": "" }, "require": { "ext-json": "*", "php": "^7.1.8 || ^8.0", "symfony/polyfill-mbstring": "^1.0", + "symfony/polyfill-php80": "^1.16", "symfony/translation": "^3.4 || ^4.0 || ^5.0" }, "require-dev": { @@ -4287,8 +4288,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev", - "dev-3.x": "3.x-dev" + "dev-3.x": "3.x-dev", + "dev-master": "2.x-dev" }, "laravel": { "providers": [ @@ -4342,7 +4343,7 @@ "type": "tidelift" } ], - "time": "2021-06-28T22:38:45+00:00" + "time": "2021-07-28T13:16:28+00:00" }, { "name": "nikic/php-parser", @@ -6686,36 +6687,37 @@ }, { "name": "symfony/console", - "version": "v4.4.26", + "version": "v4.4.29", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576" + "reference": "8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/9aa1eb46c1b12fada74dc0c529e93d1ccef22576", - "reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576", + "url": "https://api.github.com/repos/symfony/console/zipball/8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b", + "reference": "8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", - "symfony/polyfill-php80": "^1.15", + "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2" }, "conflict": { + "psr/log": ">=3", "symfony/dependency-injection": "<3.4", "symfony/event-dispatcher": "<4.3|>=5", "symfony/lock": "<4.4", "symfony/process": "<3.3" }, "provide": { - "psr/log-implementation": "1.0" + "psr/log-implementation": "1.0|2.0" }, "require-dev": { - "psr/log": "~1.0", + "psr/log": "^1|^2", "symfony/config": "^3.4|^4.0|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", "symfony/event-dispatcher": "^4.3", @@ -6755,7 +6757,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.26" + "source": "https://github.com/symfony/console/tree/v4.4.29" }, "funding": [ { @@ -6771,24 +6773,25 @@ "type": "tidelift" } ], - "time": "2021-06-06T09:12:27+00:00" + "time": "2021-07-27T19:04:53+00:00" }, { "name": "symfony/css-selector", - "version": "v5.3.0", + "version": "v5.3.4", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "fcd0b29a7a0b1bb5bfbedc6231583d77fea04814" + "reference": "7fb120adc7f600a59027775b224c13a33530dd90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/fcd0b29a7a0b1bb5bfbedc6231583d77fea04814", - "reference": "fcd0b29a7a0b1bb5bfbedc6231583d77fea04814", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/7fb120adc7f600a59027775b224c13a33530dd90", + "reference": "7fb120adc7f600a59027775b224c13a33530dd90", "shasum": "" }, "require": { - "php": ">=7.2.5" + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -6820,7 +6823,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.3.0" + "source": "https://github.com/symfony/css-selector/tree/v5.3.4" }, "funding": [ { @@ -6836,26 +6839,25 @@ "type": "tidelift" } ], - "time": "2021-05-26T17:40:38+00:00" + "time": "2021-07-21T12:38:00+00:00" }, { "name": "symfony/debug", - "version": "v4.4.25", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "a8d2d5c94438548bff9f998ca874e202bb29d07f" + "reference": "2f9160e92eb64c95da7368c867b663a8e34e980c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/a8d2d5c94438548bff9f998ca874e202bb29d07f", - "reference": "a8d2d5c94438548bff9f998ca874e202bb29d07f", + "url": "https://api.github.com/repos/symfony/debug/zipball/2f9160e92eb64c95da7368c867b663a8e34e980c", + "reference": "2f9160e92eb64c95da7368c867b663a8e34e980c", "shasum": "" }, "require": { "php": ">=7.1.3", - "psr/log": "~1.0", - "symfony/polyfill-php80": "^1.15" + "psr/log": "^1|^2|^3" }, "conflict": { "symfony/http-kernel": "<3.4" @@ -6889,7 +6891,7 @@ "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.25" + "source": "https://github.com/symfony/debug/tree/v4.4.27" }, "funding": [ { @@ -6905,7 +6907,7 @@ "type": "tidelift" } ], - "time": "2021-05-26T17:39:37+00:00" + "time": "2021-07-22T07:21:39+00:00" }, { "name": "symfony/deprecation-contracts", @@ -7051,23 +7053,22 @@ }, { "name": "symfony/error-handler", - "version": "v4.4.26", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "4001f01153d0eb5496fe11d8c76d1e56b47fdb88" + "reference": "16ac2be1c0f49d6d9eb9d3ce9324bde268717905" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/4001f01153d0eb5496fe11d8c76d1e56b47fdb88", - "reference": "4001f01153d0eb5496fe11d8c76d1e56b47fdb88", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/16ac2be1c0f49d6d9eb9d3ce9324bde268717905", + "reference": "16ac2be1c0f49d6d9eb9d3ce9324bde268717905", "shasum": "" }, "require": { "php": ">=7.1.3", - "psr/log": "~1.0", + "psr/log": "^1|^2|^3", "symfony/debug": "^4.4.5", - "symfony/polyfill-php80": "^1.15", "symfony/var-dumper": "^4.4|^5.0" }, "require-dev": { @@ -7100,7 +7101,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/v4.4.26" + "source": "https://github.com/symfony/error-handler/tree/v4.4.27" }, "funding": [ { @@ -7116,25 +7117,26 @@ "type": "tidelift" } ], - "time": "2021-06-24T07:57:22+00:00" + "time": "2021-07-23T15:41:52+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.25", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f" + "reference": "958a128b184fcf0ba45ec90c0e88554c9327c2e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/047773e7016e4fd45102cedf4bd2558ae0d0c32f", - "reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/958a128b184fcf0ba45ec90c0e88554c9327c2e9", + "reference": "958a128b184fcf0ba45ec90c0e88554c9327c2e9", "shasum": "" }, "require": { "php": ">=7.1.3", - "symfony/event-dispatcher-contracts": "^1.1" + "symfony/event-dispatcher-contracts": "^1.1", + "symfony/polyfill-php80": "^1.16" }, "conflict": { "symfony/dependency-injection": "<3.4" @@ -7144,7 +7146,7 @@ "symfony/event-dispatcher-implementation": "1.1" }, "require-dev": { - "psr/log": "~1.0", + "psr/log": "^1|^2|^3", "symfony/config": "^3.4|^4.0|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", "symfony/error-handler": "~3.4|~4.4", @@ -7183,7 +7185,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/v4.4.25" + "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.27" }, "funding": [ { @@ -7199,7 +7201,7 @@ "type": "tidelift" } ], - "time": "2021-05-26T17:39:37+00:00" + "time": "2021-07-23T15:41:52+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -7282,20 +7284,21 @@ }, { "name": "symfony/finder", - "version": "v4.4.25", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ed33314396d968a8936c95f5bd1b88bd3b3e94a3" + "reference": "42414d7ac96fc2880a783b872185789dea0d4262" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ed33314396d968a8936c95f5bd1b88bd3b3e94a3", - "reference": "ed33314396d968a8936c95f5bd1b88bd3b3e94a3", + "url": "https://api.github.com/repos/symfony/finder/zipball/42414d7ac96fc2880a783b872185789dea0d4262", + "reference": "42414d7ac96fc2880a783b872185789dea0d4262", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.1.3", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -7323,7 +7326,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v4.4.25" + "source": "https://github.com/symfony/finder/tree/v4.4.27" }, "funding": [ { @@ -7339,7 +7342,7 @@ "type": "tidelift" } ], - "time": "2021-05-26T11:20:16+00:00" + "time": "2021-07-23T15:41:52+00:00" }, { "name": "symfony/http-client-contracts", @@ -7421,23 +7424,23 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.26", + "version": "v4.4.29", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "8759ed5c27c2a8a47cb60f367f4be6727f08d58b" + "reference": "7016057b01f0ed3ec3ba1f31a580b6661667c2e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8759ed5c27c2a8a47cb60f367f4be6727f08d58b", - "reference": "8759ed5c27c2a8a47cb60f367f4be6727f08d58b", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7016057b01f0ed3ec3ba1f31a580b6661667c2e1", + "reference": "7016057b01f0ed3ec3ba1f31a580b6661667c2e1", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/mime": "^4.3|^5.0", "symfony/polyfill-mbstring": "~1.1", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "require-dev": { "predis/predis": "~1.0", @@ -7469,7 +7472,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.26" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.29" }, "funding": [ { @@ -7485,32 +7488,32 @@ "type": "tidelift" } ], - "time": "2021-06-26T21:56:04+00:00" + "time": "2021-07-27T14:32:23+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.26", + "version": "v4.4.29", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "e08b2fb8a6eedd81c70522e514bad9b2c1fff881" + "reference": "752b170e1ba0dd4104e7fa17c1cef1ec8a7fc506" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e08b2fb8a6eedd81c70522e514bad9b2c1fff881", - "reference": "e08b2fb8a6eedd81c70522e514bad9b2c1fff881", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/752b170e1ba0dd4104e7fa17c1cef1ec8a7fc506", + "reference": "752b170e1ba0dd4104e7fa17c1cef1ec8a7fc506", "shasum": "" }, "require": { "php": ">=7.1.3", - "psr/log": "~1.0", + "psr/log": "^1|^2", "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/polyfill-ctype": "^1.8", "symfony/polyfill-php73": "^1.9", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "conflict": { "symfony/browser-kit": "<4.3", @@ -7521,7 +7524,7 @@ "twig/twig": "<1.43|<2.13,>=2" }, "provide": { - "psr/log-implementation": "1.0" + "psr/log-implementation": "1.0|2.0" }, "require-dev": { "psr/cache": "^1.0|^2.0|^3.0", @@ -7573,7 +7576,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.26" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.29" }, "funding": [ { @@ -7589,20 +7592,20 @@ "type": "tidelift" } ], - "time": "2021-06-30T08:18:06+00:00" + "time": "2021-07-29T06:45:05+00:00" }, { "name": "symfony/mime", - "version": "v5.3.2", + "version": "v5.3.4", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "47dd7912152b82d0d4c8d9040dbc93d6232d472a" + "reference": "633e4e8afe9e529e5599d71238849a4218dd497b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/47dd7912152b82d0d4c8d9040dbc93d6232d472a", - "reference": "47dd7912152b82d0d4c8d9040dbc93d6232d472a", + "url": "https://api.github.com/repos/symfony/mime/zipball/633e4e8afe9e529e5599d71238849a4218dd497b", + "reference": "633e4e8afe9e529e5599d71238849a4218dd497b", "shasum": "" }, "require": { @@ -7610,7 +7613,7 @@ "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "conflict": { "egulias/email-validator": "~3.0.0", @@ -7656,7 +7659,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.3.2" + "source": "https://github.com/symfony/mime/tree/v5.3.4" }, "funding": [ { @@ -7672,7 +7675,7 @@ "type": "tidelift" } ], - "time": "2021-06-09T10:58:01+00:00" + "time": "2021-07-21T12:40:44+00:00" }, { "name": "symfony/polyfill-ctype", @@ -8006,16 +8009,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", "shasum": "" }, "require": { @@ -8066,7 +8069,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" }, "funding": [ { @@ -8082,7 +8085,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-05-27T12:26:48+00:00" }, { "name": "symfony/polyfill-php72", @@ -8241,16 +8244,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", "shasum": "" }, "require": { @@ -8304,7 +8307,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" }, "funding": [ { @@ -8320,24 +8323,25 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-07-28T13:41:28+00:00" }, { "name": "symfony/process", - "version": "v4.4.26", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "7e812c84c3f2dba173d311de6e510edf701685a8" + "reference": "0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/7e812c84c3f2dba173d311de6e510edf701685a8", - "reference": "7e812c84c3f2dba173d311de6e510edf701685a8", + "url": "https://api.github.com/repos/symfony/process/zipball/0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f", + "reference": "0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.1.3", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -8365,7 +8369,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v4.4.26" + "source": "https://github.com/symfony/process/tree/v4.4.27" }, "funding": [ { @@ -8381,7 +8385,7 @@ "type": "tidelift" } ], - "time": "2021-06-09T14:57:04+00:00" + "time": "2021-07-23T15:41:52+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -8463,20 +8467,21 @@ }, { "name": "symfony/routing", - "version": "v4.4.25", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "3a3c2f197ad0846ac6413225fc78868ba1c61434" + "reference": "244609821beece97167fa7ba4eef49d2a31862db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/3a3c2f197ad0846ac6413225fc78868ba1c61434", - "reference": "3a3c2f197ad0846ac6413225fc78868ba1c61434", + "url": "https://api.github.com/repos/symfony/routing/zipball/244609821beece97167fa7ba4eef49d2a31862db", + "reference": "244609821beece97167fa7ba4eef49d2a31862db", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.1.3", + "symfony/polyfill-php80": "^1.16" }, "conflict": { "symfony/config": "<4.2", @@ -8485,7 +8490,7 @@ }, "require-dev": { "doctrine/annotations": "^1.10.4", - "psr/log": "~1.0", + "psr/log": "^1|^2|^3", "symfony/config": "^4.2|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", "symfony/expression-language": "^3.4|^4.0|^5.0", @@ -8531,7 +8536,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v4.4.25" + "source": "https://github.com/symfony/routing/tree/v4.4.27" }, "funding": [ { @@ -8547,7 +8552,7 @@ "type": "tidelift" } ], - "time": "2021-05-26T17:39:37+00:00" + "time": "2021-07-23T15:41:52+00:00" }, { "name": "symfony/service-contracts", @@ -8630,21 +8635,22 @@ }, { "name": "symfony/translation", - "version": "v4.4.26", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "2f7fa60b8d10ca71c30dc46b0870143183a8f131" + "reference": "2e3c0f2bf704d635ba862e7198d72331a62d82ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/2f7fa60b8d10ca71c30dc46b0870143183a8f131", - "reference": "2f7fa60b8d10ca71c30dc46b0870143183a8f131", + "url": "https://api.github.com/repos/symfony/translation/zipball/2e3c0f2bf704d635ba862e7198d72331a62d82ba", + "reference": "2e3c0f2bf704d635ba862e7198d72331a62d82ba", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.16", "symfony/translation-contracts": "^1.1.6|^2" }, "conflict": { @@ -8657,7 +8663,7 @@ "symfony/translation-implementation": "1.0|2.0" }, "require-dev": { - "psr/log": "~1.0", + "psr/log": "^1|^2|^3", "symfony/config": "^3.4|^4.0|^5.0", "symfony/console": "^3.4|^4.0|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", @@ -8698,7 +8704,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v4.4.26" + "source": "https://github.com/symfony/translation/tree/v4.4.27" }, "funding": [ { @@ -8714,7 +8720,7 @@ "type": "tidelift" } ], - "time": "2021-06-06T08:51:46+00:00" + "time": "2021-07-21T13:12:00+00:00" }, { "name": "symfony/translation-contracts", @@ -8796,23 +8802,23 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.26", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "a586efdf2aa832d05b9249e9115d24f6a2691160" + "reference": "391d6d0e7a06ab54eb7c38fab29b8d174471b3ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a586efdf2aa832d05b9249e9115d24f6a2691160", - "reference": "a586efdf2aa832d05b9249e9115d24f6a2691160", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/391d6d0e7a06ab54eb7c38fab29b8d174471b3ba", + "reference": "391d6d0e7a06ab54eb7c38fab29b8d174471b3ba", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php72": "~1.5", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.16" }, "conflict": { "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", @@ -8865,7 +8871,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.26" + "source": "https://github.com/symfony/var-dumper/tree/v4.4.27" }, "funding": [ { @@ -8881,7 +8887,7 @@ "type": "tidelift" } ], - "time": "2021-06-17T06:35:48+00:00" + "time": "2021-07-23T15:41:52+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -11006,5 +11012,5 @@ "php": "^7.3" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } From 07183663a6081a1baf88939c6a3667ddc37c24ab Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 4 Aug 2021 13:19:19 +0800 Subject: [PATCH 161/293] add compiler info for submission dialogs --- resources/views/js/submission/detail.blade.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/resources/views/js/submission/detail.blade.php b/resources/views/js/submission/detail.blade.php index f3fef9e81..f03338e10 100644 --- a/resources/views/js/submission/detail.blade.php +++ b/resources/views/js/submission/detail.blade.php @@ -19,6 +19,12 @@ .modal-dialog-submission .table tbody tr:hover{ background:transparent; } +.modal-dialog-submission .cm-ce-decoration{ + border-bottom: dashed 1px currentColor; + position: relative; + top: -1px; + cursor: pointer; +} + @endsection +@endif diff --git a/routes/web.php b/routes/web.php index 6ce896275..c3fbca644 100644 --- a/routes/web.php +++ b/routes/web.php @@ -139,10 +139,17 @@ Route::get('/create', 'PastebinController@create')->middleware('auth')->name('tool.pastebin.create'); Route::get('/view/{$code}', 'PastebinController@view')->name('tool.pastebin.view'); }); + Route::group(['prefix' => 'imagehosting'], function () { + Route::redirect('/', '/tool/imagehosting/create', 301); + Route::get('/create', 'ImageHostingController@create')->middleware('auth')->name('tool.imagehosting.create'); + }); Route::group(['prefix' => 'ajax', 'namespace' => 'Ajax'], function () { Route::group(['prefix' => 'pastebin'], function () { Route::post('generate', 'PastebinController@generate')->middleware('auth')->name('tool.ajax.pastebin.generate'); }); + Route::group(['prefix' => 'imagehosting'], function () { + Route::post('generate', 'ImageHostingController@generate')->middleware('auth')->name('tool.ajax.imagehosting.generate'); + }); }); }); Route::get('/pb/{code}', 'PastebinController@view')->name('tool.pastebin.view.shortlink'); From 9c74203fd1303208e8e1a32f6dc0d175417989bf Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 5 Aug 2021 07:35:36 +0800 Subject: [PATCH 184/293] add image hosting to navigations --- resources/lang/en/navigation.php | 41 ++++++++++++------------ resources/lang/zh-CN/navigation.php | 41 ++++++++++++------------ resources/views/layouts/app.blade.php | 2 ++ resources/views/layouts/errors.blade.php | 1 + 4 files changed, 45 insertions(+), 40 deletions(-) diff --git a/resources/lang/en/navigation.php b/resources/lang/en/navigation.php index 5c8bce13f..e77facf86 100644 --- a/resources/lang/en/navigation.php +++ b/resources/lang/en/navigation.php @@ -1,27 +1,28 @@ 'Home', - 'problem' => 'Problem', - 'dojo' => 'Dojo', - 'status' => 'Status', - 'rank' => 'Rank', - 'contest' => 'Contest', - 'group' => 'Group', - 'search' => 'Omni Search', - 'dashboard' => 'Dashboard', - 'settings' => 'Settings', - 'pastebin' => 'PasteBin', - 'systeminfo' => 'System Info', - 'report' => 'Report BUG', - 'logout' => 'Logout', - 'account' => 'Account', - 'emailverify'=> 'Boost your security! You have not verified your email address, please verify it in your Settings Page.', + 'home' => 'Home', + 'problem' => 'Problem', + 'dojo' => 'Dojo', + 'status' => 'Status', + 'rank' => 'Rank', + 'contest' => 'Contest', + 'group' => 'Group', + 'search' => 'Omni Search', + 'dashboard' => 'Dashboard', + 'settings' => 'Settings', + 'pastebin' => 'PasteBin', + 'imagehosting' => 'Image Hosting', + 'systeminfo' => 'System Info', + 'report' => 'Report BUG', + 'logout' => 'Logout', + 'account' => 'Account', + 'emailverify' => 'Boost your security! You have not verified your email address, please verify it in your Settings Page.', // 'message' => '{0}You have no messages.|{1} You have 1 new message.|[2,*] You have :count new messages.', - 'message' => [ - 'empty' => 'You have no messages.', - 'tip_head' => 'You have ', - 'tip_foot' => ' new messages.' + 'message' => [ + 'empty' => 'You have no messages.', + 'tip_head' => 'You have ', + 'tip_foot' => ' new messages.' ], 'greeting' => [ 'morning' => 'Good morning', diff --git a/resources/lang/zh-CN/navigation.php b/resources/lang/zh-CN/navigation.php index 1c8c87e9c..e26f482ed 100644 --- a/resources/lang/zh-CN/navigation.php +++ b/resources/lang/zh-CN/navigation.php @@ -1,26 +1,27 @@ '主页', - 'problem' => '题库', - 'dojo' => '训练场', - 'status' => '状态', - 'rank' => '排行榜', - 'contest' => '比赛', - 'group' => '群组', - 'search' => '站内搜索', - 'dashboard' => '个人主页', - 'settings' => '设置', - 'pastebin' => '剪切板', - 'systeminfo' => '系统信息', - 'report' => '反馈BUG', - 'logout' => '注销', - 'account' => '登录/注册', - 'emailverify'=> '注意您的账号安全! 你还没有验证您的邮箱，请在个人设置界面进行邮箱验证。', - 'message' => [ - 'empty' => '你没有新的消息。', - 'tip_head' => '你有 ', - 'tip_foot' => ' 条未读消息。' + 'home' => '主页', + 'problem' => '题库', + 'dojo' => '训练场', + 'status' => '状态', + 'rank' => '排行榜', + 'contest' => '比赛', + 'group' => '群组', + 'search' => '站内搜索', + 'dashboard' => '个人主页', + 'settings' => '设置', + 'pastebin' => '剪切板', + 'imagehosting' => '图片托管', + 'systeminfo' => '系统信息', + 'report' => '反馈BUG', + 'logout' => '注销', + 'account' => '登录/注册', + 'emailverify' => '注意您的账号安全! 你还没有验证您的邮箱，请在个人设置界面进行邮箱验证。', + 'message' => [ + 'empty' => '你没有新的消息。', + 'tip_head' => '你有 ', + 'tip_foot' => ' 条未读消息。' ], 'greeting' => [ 'morning' => '早上好', diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 3b53bf459..4d2394281 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -275,6 +275,7 @@ @endif
    {{__('navigation.pastebin')}} + {{__('navigation.imagehosting')}}
    {{__('navigation.systeminfo')}} {{__('navigation.report')}} @@ -333,6 +334,7 @@

    {{__('footer.queue')}}

    {{__('navigation.systeminfo')}}

    {{__('navigation.pastebin')}}

    +

    {{__('navigation.imagehosting')}}

    diff --git a/resources/views/layouts/errors.blade.php b/resources/views/layouts/errors.blade.php index 8e4f8637b..a215ca335 100644 --- a/resources/views/layouts/errors.blade.php +++ b/resources/views/layouts/errors.blade.php @@ -293,6 +293,7 @@

    {{__('footer.queue')}}

    {{__('navigation.systeminfo')}}

    {{__('navigation.pastebin')}}

    +

    {{__('navigation.imagehosting')}}

    From 5645f7765bcd4e204800a3d20e7e95c2546b084f Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 5 Aug 2021 07:42:38 +0800 Subject: [PATCH 185/293] fixed colon typo on localization --- resources/lang/en/problem.php | 12 ++++++------ resources/lang/zh-CN/problem.php | 12 ++++++------ resources/views/problem/detail.blade.php | 12 ++++++------ resources/views/problem/editor.blade.php | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/resources/lang/en/problem.php b/resources/lang/en/problem.php index aa4d39f0f..4fbc1a7f7 100644 --- a/resources/lang/en/problem.php +++ b/resources/lang/en/problem.php @@ -14,17 +14,17 @@ "memorylimit" => "Memory Limit", "download" => "Download", "section" => [ - "description" => "Description", - "input" => "Input", - "output" => "Output", + "description" => "Description:", + "input" => "Input:", + "output" => "Output:", "sample" => [ - "input" => "Sample Input", - "output" => "Sample Output", + "input" => "Sample Input:", + "output" => "Sample Output:", "copy" => "Copy", "copied" => "Copied", "failed" => "Failed", ], - "note" => "Note", + "note" => "Note:", ], "action" => [ "loginsubmit" => "Login & Submit", diff --git a/resources/lang/zh-CN/problem.php b/resources/lang/zh-CN/problem.php index cb57899c6..2937a7898 100644 --- a/resources/lang/zh-CN/problem.php +++ b/resources/lang/zh-CN/problem.php @@ -14,17 +14,17 @@ "memorylimit" => "内存限制", "download" => "下载", "section" => [ - "description" => "描述", - "input" => "输入", - "output" => "输出", + "description" => "描述：", + "input" => "输入：", + "output" => "输出：", "sample" => [ - "input" => "样例输入", - "output" => "样例输出", + "input" => "样例输入：", + "output" => "样例输出：", "copy" => "复制", "copied" => "已复制", "failed" => "复制失败", ], - "note" => "注释", + "note" => "注释：", ], "action" => [ "loginsubmit" => "登录并提交", diff --git a/resources/views/problem/detail.blade.php b/resources/views/problem/detail.blade.php index 9fbe52bc1..26f96802e 100644 --- a/resources/views/problem/detail.blade.php +++ b/resources/views/problem/detail.blade.php @@ -293,7 +293,7 @@ @unless(blank($detail["parsed"]["description"])) -

    {{__("problem.section.description")}}:

    +

    {{__("problem.section.description")}}

    {!!$detail["parsed"]["description"]!!} @@ -301,7 +301,7 @@ @unless(blank($detail["parsed"]["input"])) -

    {{__("problem.section.input")}}:

    +

    {{__("problem.section.input")}}

    {!!$detail["parsed"]["input"]!!} @@ -309,7 +309,7 @@ @unless(blank($detail["parsed"]["output"])) -

    {{__("problem.section.output")}}:

    +

    {{__("problem.section.output")}}

    {!!$detail["parsed"]["output"]!!} @@ -318,12 +318,12 @@ @foreach($detail["samples"] as $ps) @if (!is_null($ps['sample_input']) && $ps['sample_input'] !== '') -

    {{__("problem.section.sample.input")}}:

    +

    {{__("problem.section.sample.input")}}

    {!!$ps['sample_input']!!}
    @endif @if (!is_null($ps['sample_output']) && $ps['sample_output'] !== '') -

    {{__("problem.section.sample.output")}}:

    +

    {{__("problem.section.sample.output")}}

    {!!$ps['sample_output']!!}
    @endif @@ -333,7 +333,7 @@ @unless(blank($detail["parsed"]["note"])) -

    {{__("problem.section.note")}}:

    +

    {{__("problem.section.note")}}

    {!!$detail["parsed"]["note"]!!} diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index 14c233e06..c36705ad0 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -709,7 +709,7 @@ @unless(blank($detail["parsed"]["description"])) -

    {{__("problem.section.description")}}:

    +

    {{__("problem.section.description")}}

    {!!$detail["parsed"]["description"]!!} @@ -717,7 +717,7 @@ @unless(blank($detail["parsed"]["input"])) -

    {{__("problem.section.input")}}:

    +

    {{__("problem.section.input")}}

    {!!$detail["parsed"]["input"]!!} @@ -725,7 +725,7 @@ @unless(blank($detail["parsed"]["output"])) -

    {{__("problem.section.output")}}:

    +

    {{__("problem.section.output")}}

    {!!$detail["parsed"]["output"]!!} @@ -734,12 +734,12 @@ @foreach($detail["samples"] as $ps) @if (!is_null($ps['sample_input']) && $ps['sample_input'] !== '') -

    {{__("problem.section.sample.input")}}:

    +

    {{__("problem.section.sample.input")}}

    {!!$ps['sample_input']!!}
    @endif @if (!is_null($ps['sample_output']) && $ps['sample_output'] !== '') -

    {{__("problem.section.sample.output")}}:

    +

    {{__("problem.section.sample.output")}}

    {!!$ps['sample_output']!!}
    @endif @@ -749,7 +749,7 @@ @unless(blank($detail["parsed"]["note"])) -

    {{__("problem.section.note")}}:

    +

    {{__("problem.section.note")}}

    {!!$detail["parsed"]["note"]!!} From d5ad7260484feab30dad29f381db7a2024e906de Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 5 Aug 2021 07:45:24 +0800 Subject: [PATCH 186/293] fixed langicon padding bug --- resources/views/problem/editor.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/problem/editor.blade.php b/resources/views/problem/editor.blade.php index c36705ad0..32ceee69d 100644 --- a/resources/views/problem/editor.blade.php +++ b/resources/views/problem/editor.blade.php @@ -417,7 +417,7 @@ box-shadow: inset rgba(0, 0, 0, 0.25) 0px 0px 15px; } - [class^="devicon-"], [class*=" devicon-"] { + [class^="devicon-"], [class*=" devicon-"], [class^="langicon-"], [class*=" langicon-"] { display:inline-block; transform: scale(1.3); padding-right:1rem; From 4b1f565b4f347398a699e464bd7b9ff4492a938c Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 5 Aug 2021 08:03:03 +0800 Subject: [PATCH 187/293] add special effect --- resources/views/tool/imagehosting/create.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/tool/imagehosting/create.blade.php b/resources/views/tool/imagehosting/create.blade.php index 017924e09..0ec0ac3cf 100644 --- a/resources/views/tool/imagehosting/create.blade.php +++ b/resources/views/tool/imagehosting/create.blade.php @@ -68,7 +68,7 @@
    @if($permission) - +

    Drag & drop images here

    From e0dd31f857139b9c508dd007879a0eac1ec5bd84 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 5 Aug 2021 14:49:12 +0800 Subject: [PATCH 188/293] fixed pastebin router bug --- routes/web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index c3fbca644..023cf0eeb 100644 --- a/routes/web.php +++ b/routes/web.php @@ -137,7 +137,7 @@ Route::group(['prefix' => 'pastebin'], function () { Route::redirect('/', '/tool/pastebin/create', 301); Route::get('/create', 'PastebinController@create')->middleware('auth')->name('tool.pastebin.create'); - Route::get('/view/{$code}', 'PastebinController@view')->name('tool.pastebin.view'); + Route::get('/view/{code}', 'PastebinController@view')->name('tool.pastebin.view'); }); Route::group(['prefix' => 'imagehosting'], function () { Route::redirect('/', '/tool/imagehosting/create', 301); From b4dc7e55eae077bfe638c4d4e9227e398cfb2736 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 5 Aug 2021 15:35:08 +0800 Subject: [PATCH 189/293] add imagehosting icon --- public/static/img/icon/.gitignore | 1 + public/static/img/icon/icon-imagehosting.png | Bin 0 -> 36352 bytes 2 files changed, 1 insertion(+) create mode 100644 public/static/img/icon/icon-imagehosting.png diff --git a/public/static/img/icon/.gitignore b/public/static/img/icon/.gitignore index 0ea3f2841..334ae786a 100644 --- a/public/static/img/icon/.gitignore +++ b/public/static/img/icon/.gitignore @@ -4,3 +4,4 @@ !icon-blue.png !icon-white.png !icon-pastebin.png +!icon-imagehosting.png diff --git a/public/static/img/icon/icon-imagehosting.png b/public/static/img/icon/icon-imagehosting.png new file mode 100644 index 0000000000000000000000000000000000000000..c021087c2c5ce9fc977e3f1af55b693afd81f6f2 GIT binary patch literal 36352 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 literal 0 HcmV?d00001 From 9400d7b0d54bd48e09a7e8fe973e7d9a1c67fd57 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 5 Aug 2021 15:42:09 +0800 Subject: [PATCH 190/293] add image hosting detail page --- .../Tool/Ajax/ImageHostingController.php | 6 +- .../Tool/ImageHostingController.php | 22 ++ app/Models/Eloquent/Tool/ImageHosting.php | 5 + .../views/tool/imagehosting/create.blade.php | 11 +- .../views/tool/imagehosting/detail.blade.php | 197 ++++++++++++++++++ routes/web.php | 2 + 6 files changed, 231 insertions(+), 12 deletions(-) create mode 100644 resources/views/tool/imagehosting/detail.blade.php diff --git a/app/Http/Controllers/Tool/Ajax/ImageHostingController.php b/app/Http/Controllers/Tool/Ajax/ImageHostingController.php index 592944ffe..35c89b815 100644 --- a/app/Http/Controllers/Tool/Ajax/ImageHostingController.php +++ b/app/Http/Controllers/Tool/Ajax/ImageHostingController.php @@ -35,13 +35,15 @@ public function generate(Request $request) $allow_extension=['jpg', 'png', 'jpeg', 'gif', 'bmp']; if ($isValid && in_array($extension, $allow_extension)) { $path=$request->file('image')->store('/static/img/upload', 'NOJPublic'); - ImageHosting::create([ + $id = ImageHosting::create([ 'user_id' => $user->id, 'relative_path' => "/$path" - ]); + ])->id; return ResponseModel::success(200, null, [ 'relative_path' => "/$path", 'path' => url($path), + 'id' => $id, + 'redirect_url' => route('tool.imagehosting.detail', ['id'=>$id]), ]); } else { return ResponseModel::err(1005); diff --git a/app/Http/Controllers/Tool/ImageHostingController.php b/app/Http/Controllers/Tool/ImageHostingController.php index eac8aad5c..8e8596a7d 100644 --- a/app/Http/Controllers/Tool/ImageHostingController.php +++ b/app/Http/Controllers/Tool/ImageHostingController.php @@ -23,4 +23,26 @@ public function create() 'permission' => Auth::user()->hasPermission(26) ]); } + + /** + * Show the Image Hosting Detail Page. + * + * @return Response + */ + public function detail($id) + { + $image=ImageHosting::find($id); + if(is_null($image)) { + return abort('404'); + } + if(Auth::user()->id!=$image->user_id){ + return abort('403'); + } + return view('tool.imagehosting.detail', [ + 'page_title' => "Detail", + 'site_title' => "Image Hosting", + 'navigation' => "Image Hosting", + 'image' => $image, + ]); + } } diff --git a/app/Models/Eloquent/Tool/ImageHosting.php b/app/Models/Eloquent/Tool/ImageHosting.php index 51f85bd44..74b39a5e5 100644 --- a/app/Models/Eloquent/Tool/ImageHosting.php +++ b/app/Models/Eloquent/Tool/ImageHosting.php @@ -18,4 +18,9 @@ public function user() { return $this->belongsTo('App\Models\Eloquent\User', 'user_id'); } + + public function getAbsolutePathAttribute() + { + return url($this->relative_path); + } } diff --git a/resources/views/tool/imagehosting/create.blade.php b/resources/views/tool/imagehosting/create.blade.php index 0ec0ac3cf..d0e732f37 100644 --- a/resources/views/tool/imagehosting/create.blade.php +++ b/resources/views/tool/imagehosting/create.blade.php @@ -162,16 +162,7 @@ function upload(file){ success : function(result){ console.log(result); if(result.ret == 200){ - confirm({ - backdrop : "static", - content : `

    Image Absolute Address: ${result.data.path}

    Image Relative Address: ${result.data.relative_path}

    `, - title: "Image Hosting URL", - icon: "image-filter", - noText : "dismiss", - yesText : "ok" - },function(deny){ - - }); + location.href=result.data.redirect_url; }else{ alert(result.desc, "Oops!"); } diff --git a/resources/views/tool/imagehosting/detail.blade.php b/resources/views/tool/imagehosting/detail.blade.php new file mode 100644 index 000000000..835d69ac4 --- /dev/null +++ b/resources/views/tool/imagehosting/detail.blade.php @@ -0,0 +1,197 @@ +@extends('layouts.app') + +@section('template') + +
    +
    +
    +
    + + {{$image->relative_path}} + +
    + + + + +
    +
    +
    +
    +
    BBCode
    +
    + +
    +
    +
    +
    +
    +
    HTML
    +
    + +
    +
    +
    +
    +
    +
    Markdown
    +
    + +
    +
    +
    +
    +
    +
    Image URL
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    BBCode
    +
    + +
    +
    +
    +
    +
    +
    HTML
    +
    + +
    +
    +
    +
    +
    +
    Markdown
    +
    + +
    +
    +
    +
    +
    +
    Image URL
    +
    + +
    +
    +
    +     +     +
    +
    +
    +@endsection diff --git a/routes/web.php b/routes/web.php index 023cf0eeb..2ca4e6184 100644 --- a/routes/web.php +++ b/routes/web.php @@ -142,6 +142,8 @@ Route::group(['prefix' => 'imagehosting'], function () { Route::redirect('/', '/tool/imagehosting/create', 301); Route::get('/create', 'ImageHostingController@create')->middleware('auth')->name('tool.imagehosting.create'); + Route::redirect('/detail', '/tool/imagehosting/list', 301); + Route::get('/detail/{id}', 'ImageHostingController@detail')->middleware('auth')->name('tool.imagehosting.detail'); }); Route::group(['prefix' => 'ajax', 'namespace' => 'Ajax'], function () { Route::group(['prefix' => 'pastebin'], function () { From 98a99b8a7924201184ec50b4efbe82be6e35e567 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Thu, 5 Aug 2021 16:10:24 +0800 Subject: [PATCH 191/293] add shaders for image dragging --- .../views/tool/imagehosting/create.blade.php | 94 ++++++++++++++++++- 1 file changed, 91 insertions(+), 3 deletions(-) diff --git a/resources/views/tool/imagehosting/create.blade.php b/resources/views/tool/imagehosting/create.blade.php index d0e732f37..8f7b5a452 100644 --- a/resources/views/tool/imagehosting/create.blade.php +++ b/resources/views/tool/imagehosting/create.blade.php @@ -59,8 +59,31 @@ align-items: center; justify-content: center; cursor: pointer; + z-index: 999; + } + + #image_choser_tooltop i{ + font-size: inherit; + margin-right: 0.2rem; + } + + noj-shader{ + position: fixed; + top: 0; + bottom: 0; + right: 0; + left: 0; + display: block; + transition: .2s ease-out .0s; + z-index: 998; + pointer-events: none; + } + + .dragover noj-shader{ + background: rgba(0,0,0,0.42); } +

    @@ -68,10 +91,10 @@
    @if($permission) - + -

    Drag & drop images here

    +

    Drag & drop images here

         @@ -89,17 +112,71 @@ @section('additionJS') @endsection diff --git a/routes/web.php b/routes/web.php index faabb6af6..d3fb006a6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -35,9 +35,9 @@ }); Route::group(['prefix' => 'account','middleware' => ['user.banned','auth']], function () { - Route::get('/', 'AccountController@index')->name('account_index'); - Route::get('/dashboard', 'AccountController@dashboard')->name('account_dashboard'); - Route::get('/settings', 'AccountController@settings')->name('account_settings'); + Route::get('/', 'AccountController@index')->name('account.index'); + Route::get('/dashboard', 'AccountController@dashboard')->name('account.dashboard'); + Route::get('/settings', 'AccountController@settings')->name('account.settings'); }); Route::group(['prefix' => 'oauth', 'namespace' => 'OAuth', 'as' => 'oauth.', 'middleware' => ['user.banned','auth']], function () { From 5cf7ab42ea4e021c3c8ee004652acb190cde1fb5 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 11 Aug 2021 17:48:40 +0800 Subject: [PATCH 227/293] add allow_oauth_temp_account env switch --- config/app.php | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/config/app.php b/config/app.php index 8cd50e212..1aa8f1a89 100644 --- a/config/app.php +++ b/config/app.php @@ -81,6 +81,19 @@ 'ginger', 'espresso', 'enigma', ]) ? env('APP_THEME', 'default') : 'default', + /* + |-------------------------------------------------------------------------- + | Application OAuth Temp Account Allowance + |-------------------------------------------------------------------------- + | + | This OAuth Temp Account Allowance is used by the OAuth Controller to + | determine whether a user can login without a binding account + | established or not. + | + */ + + 'allow_oauth_temp_account' => env('APP_ALLOW_OAUTH_TEMP_ACCOUNT', false), + /* |-------------------------------------------------------------------------- | Application URL @@ -93,10 +106,20 @@ */ 'url' => env('APP_URL', 'http://localhost'), - 'multidomain' => env('APP_MULTI_DOMAIN', false), - 'asset_url' => env('ASSET_URL', null), + /* + |-------------------------------------------------------------------------- + | Application MultiDomain + |-------------------------------------------------------------------------- + | + | This Multi Domain is used by the Provider to determine whether this + | application should run on Mutli Domain mode or not. + | + */ + + 'multidomain' => env('APP_MULTI_DOMAIN', false), + /* |-------------------------------------------------------------------------- | Application Timezone @@ -212,6 +235,8 @@ Barryvdh\DomPDF\ServiceProvider::class, Intervention\Image\ImageServiceProvider::class, Imtigger\LaravelJobStatus\LaravelJobStatusServiceProvider::class, + + /* * Application Service Providers... */ From 696c7f62ede67b5417191eba55a65b73d185d5a5 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 11 Aug 2021 17:48:59 +0800 Subject: [PATCH 228/293] add isIndependent to User Model --- app/Models/Eloquent/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Eloquent/User.php b/app/Models/Eloquent/User.php index 08d828b43..f03bd8222 100644 --- a/app/Models/Eloquent/User.php +++ b/app/Models/Eloquent/User.php @@ -65,7 +65,7 @@ public function hasIndependentEmail(){ return !in_array(explode('@', $this->email)[1], ['temporarily.email']) && !$this->contest_account; } - public function hasEmailPassAccess(){ + public function isIndependent(){ return $this->hasIndependentPassword() && $this->hasIndependentEmail(); } From a1e5843099f317094ba8790571d33d606ee63c94 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 11 Aug 2021 17:53:12 +0800 Subject: [PATCH 229/293] add APP_ALLOW_OAUTH_TEMP_ACCOUNT example --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index 9229de3f9..d1c736957 100644 --- a/.env.example +++ b/.env.example @@ -10,6 +10,7 @@ APP_BACKUP=false #Enable Scheduling Backup APP_LOGO="" #URL for site logo APP_DESC= APP_THEME="default" # choose from https://njuptaaa.github.io/docs/#/noj/guide/theme +APP_ALLOW_OAUTH_TEMP_ACCOUNT=false FUNC_ENABLE_REGISTER=true From 1ea10c651a5dbbe5337b5fb2a445bf059c290009 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 11 Aug 2021 18:12:54 +0800 Subject: [PATCH 230/293] fixed typo --- app/Models/Eloquent/User.php | 2 +- app/Providers/AuthServiceProvider.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Eloquent/User.php b/app/Models/Eloquent/User.php index f03bd8222..c16c12e33 100644 --- a/app/Models/Eloquent/User.php +++ b/app/Models/Eloquent/User.php @@ -62,7 +62,7 @@ public function hasIndependentPassword(){ } public function hasIndependentEmail(){ - return !in_array(explode('@', $this->email)[1], ['temporarily.email']) && !$this->contest_account; + return !in_array(explode('@', $this->email)[1], ['temporary.email']) && !$this->contest_account; } public function isIndependent(){ diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 5fb85fba7..b80689288 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -21,7 +21,7 @@ class AuthServiceProvider extends ServiceProvider * * @var array */ - protected $forbiddenDomains=['temporarily.email']; + protected $forbiddenDomains=['temporary.email']; /** * Register any authentication / authorization services. From 34a83243411e262a849f3c3dff22fa5c765b8886 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 11 Aug 2021 18:17:31 +0800 Subject: [PATCH 231/293] complete auto register for OAuth --- .../Controllers/OAuth/GithubController.php | 101 ++++++++++++------ 1 file changed, 68 insertions(+), 33 deletions(-) diff --git a/app/Http/Controllers/OAuth/GithubController.php b/app/Http/Controllers/OAuth/GithubController.php index e07ee561c..931e97f59 100644 --- a/app/Http/Controllers/OAuth/GithubController.php +++ b/app/Http/Controllers/OAuth/GithubController.php @@ -6,37 +6,41 @@ use App\Models\Eloquent\User; use App\Models\Eloquent\UserExtra; use Laravel\Socialite\Facades\Socialite; +use Illuminate\Database\QueryException; use Auth; +use Str; class GithubController extends Controller { public function redirectTo() { + // 2 ways to access this page, you want to bind(logined), you want to login(not logined) if(Auth::check()){ - if(Auth::check() && Auth::user()->hasEmailPassAccess()){ + // logined user, only users with non-temp email & pass access and binded can unbind + if(!Auth::user()->isIndependent()){ return redirect()->route('account.settings'); } - } - if(Auth::check() && Auth::user()->getExtra('github_id')){ - return view('oauth.index',[ - 'page_title'=>"OAuth", - 'site_title'=>config("app.name"), - 'navigation'=>"OAuth", - 'platform' => 'Github', - 'display_html' => 'You\'re already tied to the github account : '.Auth::user()->getExtra('github_email').'
    - You can choose to unbind or go back to the homepage', - 'buttons' => [ - [ - 'text' => 'unbind', - 'href' => route('oauth.github.unbind'), - 'style' => 'btn-danger' - ], - [ - 'text' => 'home', - 'href' => route('home'), - ], - ] - ]); + if(Auth::user()->getExtra('github_id')){ + return view('oauth.index',[ + 'page_title'=>"OAuth", + 'site_title'=>config("app.name"), + 'navigation'=>"OAuth", + 'platform' => 'Github', + 'display_html' => 'You\'re already tied to the github account : '.Auth::user()->getExtra('github_email').'
    + You can choose to unbind or go back to the homepage', + 'buttons' => [ + [ + 'text' => 'unbind', + 'href' => route('oauth.github.unbind'), + 'style' => 'btn-danger' + ], + [ + 'text' => 'home', + 'href' => route('home'), + ], + ] + ]); + } } return Socialite::driver('github')->redirect(); } @@ -98,22 +102,53 @@ public function handleCallback() Auth::user()->setExtra('github_token', $github_user->token,101); return redirect('/'); }else{ + if(config('app.allow_oauth_temp_account')){ + try { + $createdUser=User::create([ + 'name' => Str::random(12), + 'email' => Str::random(16)."@temporary.email", + 'password' => '', + 'avatar' => '/static/img/avatar/default.png', + ]); + }catch(QueryException $exception){ + return view('oauth.index',[ + 'page_title'=>"OAuth", + 'site_title'=>config("app.name"), + 'navigation'=>"OAuth", + 'platform' => 'Github', + 'display_text' => 'Some wired things happened when registering your account, please contact site admin or simply retry again.', + 'buttons' => [ + [ + 'text' => 'retry login', + 'href' => route('login'), + ] + ] + ]); + } + Auth::loginUsingId($createdUser->id); + Auth::user()->setExtra('github_email', $github_user->email); + Auth::user()->setExtra('github_nickname', $github_user->nickname); + Auth::user()->setExtra('github_homepage', ($github_user->user)['html_url']); + Auth::user()->setExtra('github_token', $github_user->token, 101); + return redirect('/'); + } + $buttons=[[ + 'text' => 'login', + 'href' => route('login'), + ]]; + if(config('function.register')){ + $buttons[]=[ + 'text' => 'register', + 'href' => route('register'), + ]; + } return view('oauth.index',[ 'page_title'=>"OAuth", 'site_title'=>config("app.name"), 'navigation'=>"OAuth", 'platform' => 'Github', - 'display_text' => 'This github account doesn\'t seem to have a '.config("app.name").' account, please register or log in first', - 'buttons' => [ - [ - 'text' => 'login', - 'href' => route('login'), - ], - [ - 'text' => 'register', - 'href' => route('register'), - ], - ] + 'display_text' => 'This github account doesn\'t seem to have a '.config("app.name").' account, please have your account binded at first place.', + 'buttons' => $buttons ]); } } From fb169f1e1503a2a0552fa12d438cd3cfee0982dd Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 11 Aug 2021 18:41:32 +0800 Subject: [PATCH 232/293] replace outdated AnnouncementModel with Eloquent Model --- app/Http/Controllers/MainController.php | 6 ++--- app/Models/AnnouncementModel.php | 33 ------------------------- app/Models/Eloquent/Announcement.php | 10 ++++++++ resources/views/home.blade.php | 8 +++--- 4 files changed, 16 insertions(+), 41 deletions(-) delete mode 100644 app/Models/AnnouncementModel.php diff --git a/app/Http/Controllers/MainController.php b/app/Http/Controllers/MainController.php index f113baca2..d0f2424ff 100644 --- a/app/Http/Controllers/MainController.php +++ b/app/Http/Controllers/MainController.php @@ -11,7 +11,7 @@ */ namespace App\Http\Controllers; -use App\Models\AnnouncementModel; +use App\Models\Eloquent\Announcement; use App\Models\ProblemModel; use App\Models\CarouselModel; use App\Http\Controllers\Controller; @@ -40,8 +40,6 @@ class MainController extends Controller */ public function home(Request $request) { - $announcementModel=new AnnouncementModel(); - $announcements=$announcementModel->fetch(); $problem=new ProblemModel(); $ojs=$problem->ojs(); // Log::debug(["info"=>"User Viewed Home!"]); @@ -49,7 +47,7 @@ public function home(Request $request) 'page_title'=>"Home", 'site_title'=>config("app.name"), 'navigation' => "Home", - 'announcements' => $announcements, + 'announcements' => Announcement::orderBy('created_at', 'desc')->get(), 'ojs' => $ojs, 'carousel' => CarouselModel::list() ]); diff --git a/app/Models/AnnouncementModel.php b/app/Models/AnnouncementModel.php deleted file mode 100644 index cc6717535..000000000 --- a/app/Models/AnnouncementModel.php +++ /dev/null @@ -1,33 +0,0 @@ -table)->orderBy('created_at','desc')->get()->all(); - if (empty($list)) { - return []; - } - foreach ($list as &$item) { - $notice_author=DB::table("users")->where(["id"=>$item["uid"]])->first(); - $item["name"]=$notice_author["name"]; - $item["avatar"]=$notice_author["avatar"]; - $item["post_date_parsed"]=formatHumanReadableTime($item["created_at"]); - $item["content_parsed"]=clean(convertMarkdownToHtml($item["content"])); - } - return $list; - } -} diff --git a/app/Models/Eloquent/Announcement.php b/app/Models/Eloquent/Announcement.php index 34fde3ca1..5a1a686df 100644 --- a/app/Models/Eloquent/Announcement.php +++ b/app/Models/Eloquent/Announcement.php @@ -13,4 +13,14 @@ public function user() { return $this->belongsTo('App\Models\Eloquent\User', 'uid'); } + + public function getPostDateParsedAttribute() + { + return formatHumanReadableTime($this->created_at); + } + + public function getContentParsedAttribute() + { + return clean(convertMarkdownToHtml($this->content)); + } } diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index c025addc0..d5f887da5 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -155,12 +155,12 @@
    -
    {{$announcement["name"]}} ▸ {{$announcement["post_date_parsed"]}}
    -
    +
    {{$announcement->user->name}} ▸ {{$announcement->post_date_parsed}}
    +
    -
    {{$announcement["title"]}}
    -

    {!!$announcement["content_parsed"]!!}

    +
    {{$announcement->title}}
    +

    {!!$announcement->content_parsed!!}

         From ca1e3d10383fa8d8dced8149f7daca6501aa1996 Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 11 Aug 2021 18:49:41 +0800 Subject: [PATCH 233/293] add fillable and bug fixed for new announcement model --- app/Models/Eloquent/Announcement.php | 4 ++++ resources/views/home.blade.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Models/Eloquent/Announcement.php b/app/Models/Eloquent/Announcement.php index 5a1a686df..fed4dc0fc 100644 --- a/app/Models/Eloquent/Announcement.php +++ b/app/Models/Eloquent/Announcement.php @@ -9,6 +9,10 @@ class Announcement extends Model protected $table='announcement'; protected $primaryKey='anid'; + protected $fillable=[ + 'title', 'content' + ]; + public function user() { return $this->belongsTo('App\Models\Eloquent\User', 'uid'); diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index d5f887da5..10d62e6ff 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -150,7 +150,7 @@

    {{__('homepage.announcements.title')}}

    - @unless(empty($announcements)) + @unless(blank($announcements)) @foreach($announcements as $announcement) From 465a1f2036e77aedd0094fd1a0f35d0ade24d72e Mon Sep 17 00:00:00 2001 From: zsgsdesign Date: Wed, 11 Aug 2021 18:50:04 +0800 Subject: [PATCH 234/293] replace outdated CarouselModel with Eloquent Model --- app/Http/Controllers/MainController.php | 4 ++-- app/Models/CarouselModel.php | 14 -------------- app/Models/Eloquent/Carousel.php | 15 +++++++++++++++ resources/views/home.blade.php | 4 ++-- 4 files changed, 19 insertions(+), 18 deletions(-) delete mode 100644 app/Models/CarouselModel.php create mode 100644 app/Models/Eloquent/Carousel.php diff --git a/app/Http/Controllers/MainController.php b/app/Http/Controllers/MainController.php index d0f2424ff..7f27731cf 100644 --- a/app/Http/Controllers/MainController.php +++ b/app/Http/Controllers/MainController.php @@ -13,7 +13,7 @@ use App\Models\Eloquent\Announcement; use App\Models\ProblemModel; -use App\Models\CarouselModel; +use App\Models\Eloquent\Carousel; use App\Http\Controllers\Controller; use Illuminate\Http\Request; use Auth; @@ -49,7 +49,7 @@ public function home(Request $request) 'navigation' => "Home", 'announcements' => Announcement::orderBy('created_at', 'desc')->get(), 'ojs' => $ojs, - 'carousel' => CarouselModel::list() + 'carousel' => Carousel::where(["available"=>1])->get() ]); } diff --git a/app/Models/CarouselModel.php b/app/Models/CarouselModel.php deleted file mode 100644 index 072d2ec66..000000000 --- a/app/Models/CarouselModel.php +++ /dev/null @@ -1,14 +0,0 @@ -where(["available"=>1])->get()->all(); - } -} diff --git a/app/Models/Eloquent/Carousel.php b/app/Models/Eloquent/Carousel.php new file mode 100644 index 000000000..51b329996 --- /dev/null +++ b/app/Models/Eloquent/Carousel.php @@ -0,0 +1,15 @@ +{{__('homepage.version')}}{{version()}}
    - @unless(empty($carousel)) + @unless(blank($carousel))