mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24057 from nextcloud/fix/stabl19/fix-php-cs-fixer 

[stable19] Fix php-cs-fixer on stable19 by updating to a new minor version
This commit is contained in:
Roeland Jago Douma 2020-11-11 18:04:56 +01:00 committed by GitHub
parent 742ac0f4fe a1fff88b64
commit edcbab5c5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1197 additions and 1187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/dav/tests/unit/Files/FileSearchBackendTest.php
View File

@ -44,7 +44,6 @@ use OCP\Share\IManager;
use SearchDAV\Backend\SearchPropertyDefinition;
use SearchDAV\Query\Limit;
use SearchDAV\Query\Query;
use SearchDAV\XML\Operator;
use Test\TestCase;
class FileSearchBackendTest extends TestCase {

44
composer.lock generated
View File

@ -250,27 +250,27 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v2.16.1",
"version": "v2.16.7",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "c8afb599858876e95e8ebfcd97812d383fa23f02"
"reference": "4e35806a6d7d8510d6842ae932e8832363d22c87"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c8afb599858876e95e8ebfcd97812d383fa23f02",
"reference": "c8afb599858876e95e8ebfcd97812d383fa23f02",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/4e35806a6d7d8510d6842ae932e8832363d22c87",
"reference": "4e35806a6d7d8510d6842ae932e8832363d22c87",
"shasum": ""
},
"require": {
"composer/semver": "^1.4",
"composer/semver": "^1.4 || ^2.0 || ^3.0",
"composer/xdebug-handler": "^1.2",
"doctrine/annotations": "^1.2",
"ext-json": "*",
"ext-tokenizer": "*",
"php": "^5.6 || ^7.0",
"php": "^7.1",
"php-cs-fixer/diff": "^1.3",
"symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
"symfony/console": "^3.4.43 || ^4.1.6 || ^5.0",
"symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
"symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
"symfony/finder": "^3.0 || ^4.0 || ^5.0",
@ -283,19 +283,20 @@
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"justinrainbow/json-schema": "^5.0",
"keradus/cli-executor": "^1.2",
"keradus/cli-executor": "^1.4",
"mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.1",
"php-coveralls/php-coveralls": "^2.4.1",
"php-cs-fixer/accessible-object": "^1.0",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
"phpunitgoodpractices/traits": "^1.8",
"symfony/phpunit-bridge": "^4.3 || ^5.0",
"phpunitgoodpractices/traits": "^1.9.1",
"symfony/phpunit-bridge": "^5.1",
"symfony/yaml": "^3.0 || ^4.0 || ^5.0"
},
"suggest": {
"ext-mbstring": "For handling non-UTF8 characters in cache signature.",
"ext-dom": "For handling output formats in XML",
"ext-mbstring": "For handling non-UTF8 characters.",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
"symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
@ -317,6 +318,7 @@
"tests/Test/IntegrationCaseFactory.php",
"tests/Test/IntegrationCaseFactoryInterface.php",
"tests/Test/InternalIntegrationCaseFactory.php",
"tests/Test/IsIdenticalConstraint.php",
"tests/TestCase.php"
]
},
@ -335,7 +337,17 @@
}
],
"description": "A tool to automatically fix PHP code style",
"time": "2019-11-25T22:10:32+00:00"
"support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.16.7"
},
"funding": [
{
"url": "https://github.com/keradus",
"type": "github"
}
],
"time": "2020-10-27T22:44:27+00:00"
},
{
"name": "jakub-onderka/php-console-color",
@ -1713,5 +1725,5 @@
"prefer-lowest": false,
"platform": [],
"platform-dev": [],
"plugin-api-version": "1.1.0"
"plugin-api-version": "2.0.0"
}

1
tests/lib/Files/Node/HookConnectorTest.php
View File

@ -13,7 +13,6 @@ use OC\Files\Node\HookConnector;
use OC\Files\Node\Root;
use OC\Files\Storage\Temporary;
use OC\Files\View;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\GenericEvent as APIGenericEvent;
use OCP\Files\Node;
use OCP\ILogger;