nextcloud
/
bookmarks
mirror of https://github.com/nextcloud/bookmarks
0
0
Fork 0
Code Issues Releases Wiki Activity

Upgrade nc requirements (#1845)

This commit is contained in:
Marcel Klehr 2022-07-11 14:58:56 +02:00 committed by GitHub
parent 51ce5e1bef
commit 944d31c8fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 156 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/lint.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
strategy: strategy:
matrix: matrix:
php-versions: ['7.3', '7.4'] php-versions: ['7.4', '8.0', '8.1']
name: php${{ matrix.php-versions }} name: php${{ matrix.php-versions }}
steps: steps:

11
.github/workflows/phpunit.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
matrix: matrix:
php-versions: ['7.4'] php-versions: ['7.4']
databases: ['sqlite'] databases: ['sqlite']
server-versions: ['stable21'] server-versions: ['stable22']
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} + codecov name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} + codecov
@ -85,14 +85,9 @@ jobs:
# do not stop on another job's failure # do not stop on another job's failure
fail-fast: false fail-fast: false
matrix: matrix:
php-versions: ['7.3', '7.4', '8.0'] php-versions: ['7.4', '8.0']
databases: ['sqlite', 'mysql', 'pgsql'] databases: ['sqlite', 'mysql', 'pgsql']
server-versions: ['stable20', 'stable21', 'stable22', 'stable23', 'stable24'] server-versions: ['stable22', 'stable23', 'stable24']
exclude:
- server-versions: stable20
php-versions: '8.0'
- server-versions: stable24
php-versions: '7.3'
include: include:
- server-versions: stable24 - server-versions: stable24
databases: 'mysql' databases: 'mysql'

4
.github/workflows/psalm.yml vendored
View File

@ -16,11 +16,13 @@ jobs:
strategy: strategy:
matrix: matrix:
ocp-version: [ 'v20.0.7', 'v21.0.0', 'v22.1.1', 'v23.0.2'] ocp-version: [ 'v22.1.1', 'v23.0.2', 'v24.0.0']
php-version: [ '7.4' ] php-version: [ '7.4' ]
include: include:
- ocp-version: 'v23.0.2' - ocp-version: 'v23.0.2'
php-version: '8.0' php-version: '8.0'
- ocp-version: 'v24.0.0'
php-version: '8.1'
name: Nextcloud ${{ matrix.ocp-version }} name: Nextcloud ${{ matrix.ocp-version }}

4
.github/workflows/repair.yml vendored
View File

@ -21,9 +21,9 @@ jobs:
# do not stop on another job's failure # do not stop on another job's failure
fail-fast: false fail-fast: false
matrix: matrix:
php-versions: ['7.3'] php-versions: ['7.4']
databases: ['sqlite', 'mysql', 'pgsql'] databases: ['sqlite', 'mysql', 'pgsql']
server-versions: ['stable20', 'stable21', 'stable22', 'stable23'] server-versions: ['stable22', 'stable23', 'stable24']
name: Repair step on ${{ matrix.databases }}-${{ matrix.server-versions }} name: Repair step on ${{ matrix.databases }}-${{ matrix.server-versions }}

16
.github/workflows/upgrade.yml vendored
View File

@ -21,19 +21,13 @@ jobs:
# do not stop on another job's failure # do not stop on another job's failure
fail-fast: false fail-fast: false
matrix: matrix:
php-versions: ['7.3', '7.4'] php-versions: ['7.4']
databases: ['sqlite', 'mysql', 'pgsql'] databases: ['sqlite', 'mysql', 'pgsql']
server-versions: ['stable20', 'stable21', 'stable22', 'stable23'] server-versions: ['stable22', 'stable23', 'stable24']
prev-version: ['stable', 'stable4', 'stable3'] prev-version: ['stable', 'stable4']
exclude: exclude:
- prev-version: 'stable3' - prev-version: stable4
server-versions: 'stable21' server-versions: stable24
- prev-version: 'stable3'
server-versions: 'stable22'
- prev-version: 'stable3'
server-versions: 'stable23'
- php-versions: '7.3'
server-versions: 'v24.0.0beta2'
name: Update from ${{ matrix.prev-version }} on ${{ matrix.databases }}-${{ matrix.server-versions }} name: Update from ${{ matrix.prev-version }} on ${{ matrix.databases }}-${{ matrix.server-versions }}

2
appinfo/info.xml
View File

@ -42,7 +42,7 @@ Requirements:
<database>pgsql</database> <database>pgsql</database>
<lib>intl</lib> <lib>intl</lib>
<lib>mbstring</lib> <lib>mbstring</lib>
<nextcloud min-version="20" max-version="24" /> <nextcloud min-version="22" max-version="24" />
</dependencies> </dependencies>
<background-jobs> <background-jobs>
<job>OCA\Bookmarks\BackgroundJobs\CrawlJob</job> <job>OCA\Bookmarks\BackgroundJobs\CrawlJob</job>

2
composer.json
View File

@ -19,7 +19,7 @@
"phpunit/phpunit": "^8.5", "phpunit/phpunit": "^8.5",
"nextcloud/coding-standard": "^1.0.0", "nextcloud/coding-standard": "^1.0.0",
"vimeo/psalm": "^4", "vimeo/psalm": "^4",
"christophwurst/nextcloud": "v21.0.0" "christophwurst/nextcloud": "v24.0.0"
}, },
"config": { "config": {
"optimize-autoloader": true, "optimize-autoloader": true,

160
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "b21094ba602fc20f4b0d510a6d45e2e9", "content-hash": "97f69b3fee2dde398e6c05a122c17108",
"packages": [ "packages": [
{ {
"name": "brick/math", "name": "brick/math",
@ -164,16 +164,16 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "2.1.0", "version": "2.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" "reference": "13388f00956b1503577598873fffb5ae994b5737"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
"reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", "reference": "13388f00956b1503577598873fffb5ae994b5737",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -197,7 +197,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1-dev" "dev-master": "2.4-dev"
} }
}, },
"autoload": { "autoload": {
@ -259,7 +259,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.1.0" "source": "https://github.com/guzzle/psr7/tree/2.4.0"
}, },
"funding": [ "funding": [
{ {
@ -275,7 +275,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-10-06T17:43:30+00:00" "time": "2022-06-20T21:43:11+00:00"
}, },
{ {
"name": "illuminate/contracts", "name": "illuminate/contracts",
@ -1618,25 +1618,28 @@
}, },
{ {
"name": "christophwurst/nextcloud", "name": "christophwurst/nextcloud",
"version": "v21.0.0", "version": "v24.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ChristophWurst/nextcloud_composer.git", "url": "https://github.com/ChristophWurst/nextcloud_composer.git",
"reference": "41e1476b4aed5bce7371895054049eca353729c5" "reference": "6ce63c3d29c59dc17394c8967981fd9272681713"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/41e1476b4aed5bce7371895054049eca353729c5", "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/6ce63c3d29c59dc17394c8967981fd9272681713",
"reference": "41e1476b4aed5bce7371895054049eca353729c5", "reference": "6ce63c3d29c59dc17394c8967981fd9272681713",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.3 || ~8.0.0" "php": "^7.4 || ~8.0 || ~8.1",
"psr/container": "^1.0",
"psr/event-dispatcher": "^1.0",
"psr/log": "^1.1"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "21.0.0-dev" "dev-master": "24.0.0-dev"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -1652,9 +1655,9 @@
"description": "Composer package containing Nextcloud's public API (classes, interfaces)", "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
"support": { "support": {
"issues": "https://github.com/ChristophWurst/nextcloud_composer/issues", "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues",
"source": "https://github.com/ChristophWurst/nextcloud_composer/tree/v21.0.0" "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/v24.0.0"
}, },
"time": "2021-03-01T08:42:25+00:00" "time": "2022-05-09T13:50:27+00:00"
}, },
{ {
"name": "composer/package-versions-deprecated", "name": "composer/package-versions-deprecated",
@ -1986,16 +1989,16 @@
}, },
{ {
"name": "doctrine/annotations", "name": "doctrine/annotations",
"version": "1.13.2", "version": "1.13.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/annotations.git", "url": "https://github.com/doctrine/annotations.git",
"reference": "5b668aef16090008790395c02c893b1ba13f7e08" "reference": "648b0343343565c4a056bfc8392201385e8d89f0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0",
"reference": "5b668aef16090008790395c02c893b1ba13f7e08", "reference": "648b0343343565c4a056bfc8392201385e8d89f0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2007,9 +2010,10 @@
"require-dev": { "require-dev": {
"doctrine/cache": "^1.11 || ^2.0", "doctrine/cache": "^1.11 || ^2.0",
"doctrine/coding-standard": "^6.0 || ^8.1", "doctrine/coding-standard": "^6.0 || ^8.1",
"phpstan/phpstan": "^0.12.20", "phpstan/phpstan": "^1.4.10 || ^1.8.0",
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
"symfony/cache": "^4.4 || ^5.2" "symfony/cache": "^4.4 || ^5.2",
"vimeo/psalm": "^4.10"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -2052,9 +2056,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/annotations/issues", "issues": "https://github.com/doctrine/annotations/issues",
"source": "https://github.com/doctrine/annotations/tree/1.13.2" "source": "https://github.com/doctrine/annotations/tree/1.13.3"
}, },
"time": "2021-08-05T19:00:23+00:00" "time": "2022-07-02T10:48:51+00:00"
}, },
{ {
"name": "doctrine/instantiator", "name": "doctrine/instantiator",
@ -2128,16 +2132,16 @@
}, },
{ {
"name": "doctrine/lexer", "name": "doctrine/lexer",
"version": "1.2.2", "version": "1.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/lexer.git", "url": "https://github.com/doctrine/lexer.git",
"reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c" "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
"reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2145,7 +2149,7 @@
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^9.0", "doctrine/coding-standard": "^9.0",
"phpstan/phpstan": "1.3", "phpstan/phpstan": "^1.3",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"vimeo/psalm": "^4.11" "vimeo/psalm": "^4.11"
}, },
@ -2184,7 +2188,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/lexer/issues", "issues": "https://github.com/doctrine/lexer/issues",
"source": "https://github.com/doctrine/lexer/tree/1.2.2" "source": "https://github.com/doctrine/lexer/tree/1.2.3"
}, },
"funding": [ "funding": [
{ {
@ -2200,7 +2204,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-12T08:27:12+00:00" "time": "2022-02-28T11:07:21+00:00"
}, },
{ {
"name": "felixfbecker/advanced-json-rpc", "name": "felixfbecker/advanced-json-rpc",
@ -2305,21 +2309,21 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v3.6.0", "version": "v3.9.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "1975e4453eb2726d1f50da0ce7fa91295029a4fa" "reference": "94441633b80495464eb34eb3f7d63445221b2585"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1975e4453eb2726d1f50da0ce7fa91295029a4fa", "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/94441633b80495464eb34eb3f7d63445221b2585",
"reference": "1975e4453eb2726d1f50da0ce7fa91295029a4fa", "reference": "94441633b80495464eb34eb3f7d63445221b2585",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer/semver": "^3.2", "composer/semver": "^3.2",
"composer/xdebug-handler": "^3.0", "composer/xdebug-handler": "^3.0.3",
"doctrine/annotations": "^1.13", "doctrine/annotations": "^1.13",
"ext-json": "*", "ext-json": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
@ -2331,8 +2335,8 @@
"symfony/finder": "^5.4 || ^6.0", "symfony/finder": "^5.4 || ^6.0",
"symfony/options-resolver": "^5.4 || ^6.0", "symfony/options-resolver": "^5.4 || ^6.0",
"symfony/polyfill-mbstring": "^1.23", "symfony/polyfill-mbstring": "^1.23",
"symfony/polyfill-php80": "^1.23", "symfony/polyfill-php80": "^1.25",
"symfony/polyfill-php81": "^1.23", "symfony/polyfill-php81": "^1.25",
"symfony/process": "^5.4 || ^6.0", "symfony/process": "^5.4 || ^6.0",
"symfony/stopwatch": "^5.4 || ^6.0" "symfony/stopwatch": "^5.4 || ^6.0"
}, },
@ -2382,7 +2386,7 @@
"description": "A tool to automatically fix PHP code style", "description": "A tool to automatically fix PHP code style",
"support": { "support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.6.0" "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.9.1"
}, },
"funding": [ "funding": [
{ {
@ -2390,7 +2394,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-02-07T18:02:40+00:00" "time": "2022-07-11T08:51:43+00:00"
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
@ -4477,16 +4481,16 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v5.4.3", "version": "v5.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
"reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d" "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dec8a9f58d20df252b9cd89f1c6c1530f747685d", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
"reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d", "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4542,7 +4546,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/event-dispatcher/tree/v5.4.3" "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9"
}, },
"funding": [ "funding": [
{ {
@ -4558,7 +4562,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:53:40+00:00" "time": "2022-05-05T16:45:39+00:00"
}, },
{ {
"name": "symfony/event-dispatcher-contracts", "name": "symfony/event-dispatcher-contracts",
@ -4641,16 +4645,16 @@
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v5.4.3", "version": "v5.4.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
"reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b" "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/0f0c4bf1840420f4aef3f32044a9dbb24682731b", "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba",
"reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b", "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4685,7 +4689,7 @@
"description": "Provides basic utilities for the filesystem", "description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/filesystem/tree/v5.4.3" "source": "https://github.com/symfony/filesystem/tree/v5.4.9"
}, },
"funding": [ "funding": [
{ {
@ -4701,20 +4705,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:53:40+00:00" "time": "2022-05-20T13:55:35+00:00"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v5.4.3", "version": "v5.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d" "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d", "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9",
"reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d", "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4748,7 +4752,7 @@
"description": "Finds files and directories via an intuitive fluent interface", "description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/finder/tree/v5.4.3" "source": "https://github.com/symfony/finder/tree/v5.4.8"
}, },
"funding": [ "funding": [
{ {
@ -4764,7 +4768,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-26T16:34:36+00:00" "time": "2022-04-15T08:07:45+00:00"
}, },
{ {
"name": "symfony/options-resolver", "name": "symfony/options-resolver",
@ -5080,16 +5084,16 @@
}, },
{ {
"name": "symfony/polyfill-php81", "name": "symfony/polyfill-php81",
"version": "v1.24.0", "version": "v1.26.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php81.git", "url": "https://github.com/symfony/polyfill-php81.git",
"reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f" "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1",
"reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5098,7 +5102,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "1.23-dev" "dev-main": "1.26-dev"
}, },
"thanks": { "thanks": {
"name": "symfony/polyfill", "name": "symfony/polyfill",
@ -5139,7 +5143,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0" "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0"
}, },
"funding": [ "funding": [
{ {
@ -5155,20 +5159,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-09-13T13:58:11+00:00" "time": "2022-05-24T11:49:31+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v5.4.3", "version": "v5.4.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "553f50487389a977eb31cf6b37faae56da00f753" "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/553f50487389a977eb31cf6b37faae56da00f753", "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
"reference": "553f50487389a977eb31cf6b37faae56da00f753", "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5201,7 +5205,7 @@
"description": "Executes commands in sub-processes", "description": "Executes commands in sub-processes",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/process/tree/v5.4.3" "source": "https://github.com/symfony/process/tree/v5.4.8"
}, },
"funding": [ "funding": [
{ {
@ -5217,7 +5221,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-26T16:28:35+00:00" "time": "2022-04-08T05:07:18+00:00"
}, },
{ {
"name": "symfony/service-contracts", "name": "symfony/service-contracts",
@ -5304,16 +5308,16 @@
}, },
{ {
"name": "symfony/stopwatch", "name": "symfony/stopwatch",
"version": "v5.4.3", "version": "v5.4.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/stopwatch.git", "url": "https://github.com/symfony/stopwatch.git",
"reference": "395220730edceb6bd745236ccb5c9125c748f779" "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/395220730edceb6bd745236ccb5c9125c748f779", "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4d04b5c24f3c9a1a168a131f6cbe297155bc0d30",
"reference": "395220730edceb6bd745236ccb5c9125c748f779", "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5346,7 +5350,7 @@
"description": "Provides a way to profile code", "description": "Provides a way to profile code",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/stopwatch/tree/v5.4.3" "source": "https://github.com/symfony/stopwatch/tree/v5.4.5"
}, },
"funding": [ "funding": [
{ {
@ -5362,7 +5366,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:53:40+00:00" "time": "2022-02-18T16:06:09+00:00"
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
@ -5729,5 +5733,5 @@
"ext-pdo": "*" "ext-pdo": "*"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.3.0" "plugin-api-version": "2.0.0"
} }

14
lib/Activity/Provider.php
View File

@ -98,7 +98,7 @@ class Provider implements IProvider {
$subjectParameters['bookmark'] $subjectParameters['bookmark']
])); ]));
} }
break; break;
case 'bookmark_deleted': case 'bookmark_deleted':
if ($isAuthor) { if ($isAuthor) {
$event->setParsedSubject($this->l->t('You deleted "%s"', [ $event->setParsedSubject($this->l->t('You deleted "%s"', [
@ -114,7 +114,7 @@ class Provider implements IProvider {
$subjectParameters['bookmark'] $subjectParameters['bookmark']
])); ]));
} }
break; break;
case 'folder_created': case 'folder_created':
if ($isAuthor) { if ($isAuthor) {
$event->setParsedSubject($this->l->t('You created folder "%s"', [ $event->setParsedSubject($this->l->t('You created folder "%s"', [
@ -130,7 +130,7 @@ class Provider implements IProvider {
$subjectParameters['folder'] $subjectParameters['folder']
])); ]));
} }
break; break;
case 'folder_moved': case 'folder_moved':
if ($isAuthor) { if ($isAuthor) {
$event->setParsedSubject($this->l->t('You moved folder "%s"', [ $event->setParsedSubject($this->l->t('You moved folder "%s"', [
@ -146,7 +146,7 @@ class Provider implements IProvider {
$subjectParameters['folder'] $subjectParameters['folder']
])); ]));
} }
break; break;
case 'folder_deleted': case 'folder_deleted':
if ($isAuthor) { if ($isAuthor) {
$event->setParsedSubject($this->l->t('You deleted folder "%s"', [ $event->setParsedSubject($this->l->t('You deleted folder "%s"', [
@ -162,7 +162,7 @@ class Provider implements IProvider {
$subjectParameters['folder'] $subjectParameters['folder']
])); ]));
} }
break; break;
case 'share_created': case 'share_created':
if ($isAuthor && $shareeName !== null) { if ($isAuthor && $shareeName !== null) {
$event->setParsedSubject($this->l->t('You shared folder "%1$s" with %2$s', [ $event->setParsedSubject($this->l->t('You shared folder "%1$s" with %2$s', [
@ -183,7 +183,7 @@ class Provider implements IProvider {
$subjectParameters['folder'] $subjectParameters['folder']
])); ]));
} }
break; break;
case 'share_deleted': case 'share_deleted':
if ($isAuthor && $shareeName) { if ($isAuthor && $shareeName) {
$event->setParsedSubject($this->l->t('You unshared folder "%1$s" with %2$s', [ $event->setParsedSubject($this->l->t('You unshared folder "%1$s" with %2$s', [
@ -204,7 +204,7 @@ class Provider implements IProvider {
$subjectParameters['folder'] $subjectParameters['folder']
])); ]));
} }
break; break;
default: default:
throw new InvalidArgumentException(); throw new InvalidArgumentException();
} }

12
lib/Controller/SettingsController.php
View File

@ -98,9 +98,9 @@ class SettingsController extends ApiController {
return new JSONResponse(['status' => 'error'], Http::STATUS_BAD_REQUEST); return new JSONResponse(['status' => 'error'], Http::STATUS_BAD_REQUEST);
} }
return $this->setSetting( return $this->setSetting(
'sorting', 'sorting',
$sorting $sorting
); );
} }
/** /**
@ -128,9 +128,9 @@ class SettingsController extends ApiController {
return new JSONResponse(['status' => 'error'], Http::STATUS_BAD_REQUEST); return new JSONResponse(['status' => 'error'], Http::STATUS_BAD_REQUEST);
} }
return $this->setSetting( return $this->setSetting(
'viewMode', 'viewMode',
$viewMode $viewMode
); );
} }
/** /**

4
lib/Controller/WebViewController.php
View File

@ -202,13 +202,13 @@ class WebViewController extends Controller {
[ [
[ [
'src' => $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon', 'src' => $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon',
['app' => 'bookmarks']), ['app' => 'bookmarks']),
'type' => 'image/png', 'type' => 'image/png',
'sizes' => '512x512' 'sizes' => '512x512'
], ],
[ [
'src' => $this->urlGenerator->linkToRoute('theming.Icon.getFavicon', 'src' => $this->urlGenerator->linkToRoute('theming.Icon.getFavicon',
['app' => 'bookmark']), ['app' => 'bookmark']),
'type' => 'image/svg+xml', 'type' => 'image/svg+xml',
'sizes' => '128x128' 'sizes' => '128x128'
] ]

6
lib/Db/TreeMapper.php
View File

@ -520,9 +520,9 @@ class TreeMapper extends QBMapper {
$this->addToFolders($type, $itemId, $folders); $this->addToFolders($type, $itemId, $folders);
$this->removeFromFolders($type, $itemId, array_map(static function (Folder $f) { $this->removeFromFolders($type, $itemId, array_map(static function (Folder $f) {
return $f->getId(); return $f->getId();
}, array_filter($currentFolders, static function (Folder $folder) use ($folders) { }, array_filter($currentFolders, static function (Folder $folder) use ($folders) {
return !in_array($folder->getId(), $folders, true); return !in_array($folder->getId(), $folders, true);
}))); })));
} }
/** /**

6
lib/Migration/GroupSharesUpdateRepairStep.php
View File

@ -107,9 +107,9 @@ class GroupSharesUpdateRepairStep implements IRepairStep {
} }
$usersInGroup = array_filter(array_map(static function ($user) { $usersInGroup = array_filter(array_map(static function ($user) {
return $user->getUID(); return $user->getUID();
}, $group->getUsers()), static function ($userId) use ($groupShare) { }, $group->getUsers()), static function ($userId) use ($groupShare) {
return $userId !== $groupShare['owner']; return $userId !== $groupShare['owner'];
}); });
$notInShareUsers = array_diff($usersInGroup, $usersInShare); $notInShareUsers = array_diff($usersInGroup, $usersInShare);
$notInGroupUsers = array_diff($usersInShare, $usersInGroup); $notInGroupUsers = array_diff($usersInShare, $usersInGroup);

6
lib/Service/BookmarkService.php
View File

@ -325,9 +325,9 @@ class BookmarkService {
if ($bookmark->getUserId() !== $userId) { if ($bookmark->getUserId() !== $userId) {
$currentInaccessibleOwnFolders = array_map(static function ($f) { $currentInaccessibleOwnFolders = array_map(static function ($f) {
return $f->getId(); return $f->getId();
}, array_filter($currentOwnFolders, function ($folder) use ($userId) { }, array_filter($currentOwnFolders, function ($folder) use ($userId) {
return $this->folders->findShareByDescendantAndUser($folder, $userId) === null; return $this->folders->findShareByDescendantAndUser($folder, $userId) === null;
}) })
); );
} else { } else {
$currentInaccessibleOwnFolders = []; $currentInaccessibleOwnFolders = [];

4
lib/Service/BookmarksParser.php
View File

@ -153,7 +153,7 @@ class BookmarksParser {
if (count($this->folderDepth) > 1) { if (count($this->folderDepth) > 1) {
$this->closeFolder(); $this->closeFolder();
} }
break; break;
case 'a': case 'a':
$this->addBookmark($entry); $this->addBookmark($entry);
break; break;
@ -162,7 +162,7 @@ class BookmarksParser {
if ($entry->hasChildNodes()) { if ($entry->hasChildNodes()) {
$this->traverse($entry); $this->traverse($entry);
} }
break; break;
case 'h3': case 'h3':
$this->addFolder($entry); $this->addFolder($entry);
break; break;

14
tests/BackgroundJobTest.php
View File

@ -182,12 +182,12 @@ class BackgroundJobTest extends TestCase {
public function singleBookmarksProvider() { public function singleBookmarksProvider() {
return array_map(function ($props) { return array_map(function ($props) {
return Bookmark::fromArray($props); return Bookmark::fromArray($props);
}, [ }, [
'Simple URL with title and description' => ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'], 'Simple URL with title and description' => ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'],
'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'], 'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'],
'Simple URL' => ['url' => 'https://php.net/'], 'Simple URL' => ['url' => 'https://php.net/'],
'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C'], 'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C'],
'Non-existent URL' => ['url' => 'https://http://www.bllaala.com/'], 'Non-existent URL' => ['url' => 'https://http://www.bllaala.com/'],
]); ]);
} }
} }

12
tests/BookmarkMapperTest.php
View File

@ -133,11 +133,11 @@ class BookmarkMapperTest extends TestCase {
public function singleBookmarksProvider(): array { public function singleBookmarksProvider(): array {
return array_map(static function ($props) { return array_map(static function ($props) {
return [Db\Bookmark::fromArray($props)]; return [Db\Bookmark::fromArray($props)];
}, [ }, [
'Simple URL with title and description' => ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'], 'Simple URL with title and description' => ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'],
'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'], 'Simple URL with title' => ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'],
'Simple URL' => ['url' => 'https://php.net/'], 'Simple URL' => ['url' => 'https://php.net/'],
'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C'], 'URL with unicode' => ['url' => 'https://de.wikipedia.org/wiki/%C3%9C'],
]); ]);
} }
} }

12
tests/FindTest.php
View File

@ -119,11 +119,11 @@ class FindTest extends TestCase {
public function singleBookmarksProvider() { public function singleBookmarksProvider() {
return array_map(function ($data) { return array_map(function ($data) {
return [$data[0], Db\Bookmark::fromArray($data[1])]; return [$data[0], Db\Bookmark::fromArray($data[1])];
}, [ }, [
[['one'], ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine']], [['one'], ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine']],
[['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud']], [['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud']],
[['three', 'one'], ['url' => 'https://php.net/']], [['three', 'one'], ['url' => 'https://php.net/']],
[['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C']], [['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C']],
]); ]);
} }
} }

14
tests/HtmlImportExportTest.php
View File

@ -165,13 +165,13 @@ class HtmlImportExportTest extends TestCase {
return [ return [
array_map(function ($props) { array_map(function ($props) {
return Db\Bookmark::fromArray($props); return Db\Bookmark::fromArray($props);
}, [ }, [
['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'], ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine'],
['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud'],
['url' => 'https://php.net/'], ['url' => 'https://php.net/'],
['url' => 'https://de.wikipedia.org/wiki/%C3%9C'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C'],
['url' => 'https://github.com/nextcloud/bookmarks/projects/1'], ['url' => 'https://github.com/nextcloud/bookmarks/projects/1'],
]), ]),
]; ];
} }
} }

12
tests/TagMapperTest.php
View File

@ -170,11 +170,11 @@ class TagMapperTest extends TestCase {
public function singleBookmarksProvider() { public function singleBookmarksProvider() {
return array_map(function ($data) { return array_map(function ($data) {
return [$data[0], Db\Bookmark::fromArray($data[1])]; return [$data[0], Db\Bookmark::fromArray($data[1])];
}, [ }, [
[['one'], ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine']], [['one'], ['url' => 'https://google.com/', 'title' => 'Google', 'description' => 'Search engine']],
[['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud']], [['two'], ['url' => 'https://nextcloud.com/', 'title' => 'Nextcloud']],
[['three', 'one'], ['url' => 'https://php.net/']], [['three', 'one'], ['url' => 'https://php.net/']],
[['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C']], [['two', 'four', 'one'], ['url' => 'https://de.wikipedia.org/wiki/%C3%9C']],
]); ]);
} }
} }