mirror of
https://github.com/wallabag/wallabag.git
synced 2025-09-30 19:22:12 +00:00
Merge branch 'master' into master
This commit is contained in:
commit
ec82e56fac
4 changed files with 33 additions and 35 deletions
|
@ -93,7 +93,7 @@
|
|||
"nelmio/api-doc-bundle": "^4.38.1",
|
||||
"nelmio/cors-bundle": "^2.5",
|
||||
"ocramius/proxy-manager": "^2.1.1",
|
||||
"pagerfanta/core": "^3.8",
|
||||
"pagerfanta/core": "^4.7",
|
||||
"pagerfanta/doctrine-orm-adapter": "^4.7",
|
||||
"pagerfanta/twig": "^4.7",
|
||||
"php-amqplib/php-amqplib": "^3.7.3",
|
||||
|
|
46
composer.lock
generated
46
composer.lock
generated
|
@ -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": "5ca96a07db4b52c436fe273e77abd135",
|
||||
"content-hash": "5a12372360ab0f0e62b5b8986af22a96",
|
||||
"packages": [
|
||||
{
|
||||
"name": "babdev/pagerfanta-bundle",
|
||||
|
@ -1473,16 +1473,16 @@
|
|||
},
|
||||
{
|
||||
"name": "doctrine/migrations",
|
||||
"version": "3.9.3",
|
||||
"version": "3.9.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/migrations.git",
|
||||
"reference": "cd12028853c418b454602e3fda89e519e9af947b"
|
||||
"reference": "1b88fcb812f2cd6e77c83d16db60e3cf1e35c66c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/migrations/zipball/cd12028853c418b454602e3fda89e519e9af947b",
|
||||
"reference": "cd12028853c418b454602e3fda89e519e9af947b",
|
||||
"url": "https://api.github.com/repos/doctrine/migrations/zipball/1b88fcb812f2cd6e77c83d16db60e3cf1e35c66c",
|
||||
"reference": "1b88fcb812f2cd6e77c83d16db60e3cf1e35c66c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -1556,7 +1556,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/doctrine/migrations/issues",
|
||||
"source": "https://github.com/doctrine/migrations/tree/3.9.3"
|
||||
"source": "https://github.com/doctrine/migrations/tree/3.9.4"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
@ -1572,7 +1572,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-08-13T22:04:47+00:00"
|
||||
"time": "2025-08-19T06:41:07+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/orm",
|
||||
|
@ -2828,16 +2828,16 @@
|
|||
},
|
||||
{
|
||||
"name": "guzzlehttp/psr7",
|
||||
"version": "2.7.1",
|
||||
"version": "2.8.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/psr7.git",
|
||||
"reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
|
||||
"reference": "21dc724a0583619cd1652f673303492272778051"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
|
||||
"reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
|
||||
"url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
|
||||
"reference": "21dc724a0583619cd1652f673303492272778051",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -2853,7 +2853,7 @@
|
|||
"require-dev": {
|
||||
"bamarni/composer-bin-plugin": "^1.8.2",
|
||||
"http-interop/http-factory-tests": "0.9.0",
|
||||
"phpunit/phpunit": "^8.5.39 || ^9.6.20"
|
||||
"phpunit/phpunit": "^8.5.44 || ^9.6.25"
|
||||
},
|
||||
"suggest": {
|
||||
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
|
||||
|
@ -2924,7 +2924,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/guzzle/psr7/issues",
|
||||
"source": "https://github.com/guzzle/psr7/tree/2.7.1"
|
||||
"source": "https://github.com/guzzle/psr7/tree/2.8.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
@ -2940,7 +2940,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-03-27T12:30:47+00:00"
|
||||
"time": "2025-08-23T21:21:41+00:00"
|
||||
},
|
||||
{
|
||||
"name": "hoa/compiler",
|
||||
|
@ -5685,26 +5685,24 @@
|
|||
},
|
||||
{
|
||||
"name": "pagerfanta/core",
|
||||
"version": "v3.8.0",
|
||||
"version": "v4.7.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Pagerfanta/core.git",
|
||||
"reference": "a995f69ff9af64a45c3dc3d8217100624ae214f2"
|
||||
"reference": "829eaa9737b3cfae1406f67a4e9ee36e0e37caf9"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Pagerfanta/core/zipball/a995f69ff9af64a45c3dc3d8217100624ae214f2",
|
||||
"reference": "a995f69ff9af64a45c3dc3d8217100624ae214f2",
|
||||
"url": "https://api.github.com/repos/Pagerfanta/core/zipball/829eaa9737b3cfae1406f67a4e9ee36e0e37caf9",
|
||||
"reference": "829eaa9737b3cfae1406f67a4e9ee36e0e37caf9",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-json": "*",
|
||||
"php": "^7.4 || ^8.0",
|
||||
"symfony/deprecation-contracts": "^2.1 || ^3.0",
|
||||
"symfony/polyfill-php80": "^1.15"
|
||||
"php": "^8.1"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^9.6 || ^10.0"
|
||||
"phpunit/phpunit": "^10.5"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
|
@ -5724,9 +5722,9 @@
|
|||
"pagerfanta"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/Pagerfanta/core/tree/v3.8.0"
|
||||
"source": "https://github.com/Pagerfanta/core/tree/v4.7.1"
|
||||
},
|
||||
"time": "2023-04-15T16:39:14+00:00"
|
||||
"time": "2024-12-13T15:05:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "pagerfanta/doctrine-orm-adapter",
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
"@symfony/webpack-encore": "^5.1.0",
|
||||
"autoprefixer": "^10.4.21",
|
||||
"babel-loader": "^10.0.0",
|
||||
"core-js": "^3.45.0",
|
||||
"core-js": "^3.45.1",
|
||||
"css-loader": "^7.1.2",
|
||||
"eslint": "^8.57.1",
|
||||
"eslint-config-airbnb-base": "^15.0.0",
|
||||
|
@ -69,7 +69,7 @@
|
|||
"stylelint-scss": "^5.3.2",
|
||||
"terser-webpack-plugin": "^5.3.14",
|
||||
"url-loader": "^4.1.1",
|
||||
"webpack": "^5.101.2",
|
||||
"webpack": "^5.101.3",
|
||||
"webpack-cli": "^5.1.4",
|
||||
"webpack-manifest-plugin": "^5.0.1",
|
||||
"webpack-merge": "^6.0.1",
|
||||
|
|
16
yarn.lock
16
yarn.lock
|
@ -2043,10 +2043,10 @@ core-js-compat@^3.43.0:
|
|||
dependencies:
|
||||
browserslist "^4.25.0"
|
||||
|
||||
core-js@^3.45.0:
|
||||
version "3.45.0"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.45.0.tgz#556c2af44a2d9c73ea7b49504392474a9f7c947e"
|
||||
integrity sha512-c2KZL9lP4DjkN3hk/an4pWn5b5ZefhRJnAc42n6LJ19kSnbeRbdQZE5dSeE2LBol1OwJD3X1BQvFTAsa8ReeDA==
|
||||
core-js@^3.45.1:
|
||||
version "3.45.1"
|
||||
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.45.1.tgz#5810e04a1b4e9bc5ddaa4dd12e702ff67300634d"
|
||||
integrity sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==
|
||||
|
||||
cosmiconfig@^8.2.0:
|
||||
version "8.3.6"
|
||||
|
@ -6260,10 +6260,10 @@ webpack-sources@^3.3.3:
|
|||
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.3.3.tgz#d4bf7f9909675d7a070ff14d0ef2a4f3c982c723"
|
||||
integrity sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==
|
||||
|
||||
webpack@^5.101.2:
|
||||
version "5.101.2"
|
||||
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.101.2.tgz#08c222b7acfce7da95c593e2f88ea1638a07b344"
|
||||
integrity sha512-4JLXU0tD6OZNVqlwzm3HGEhAHufSiyv+skb7q0d2367VDMzrU1Q/ZeepvkcHH0rZie6uqEtTQQe0OEOOluH3Mg==
|
||||
webpack@^5.101.3:
|
||||
version "5.101.3"
|
||||
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.101.3.tgz#3633b2375bb29ea4b06ffb1902734d977bc44346"
|
||||
integrity sha512-7b0dTKR3Ed//AD/6kkx/o7duS8H3f1a4w3BYpIriX4BzIhjkn4teo05cptsxvLesHFKK5KObnadmCHBwGc+51A==
|
||||
dependencies:
|
||||
"@types/eslint-scope" "^3.7.7"
|
||||
"@types/estree" "^1.0.8"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue