diff --git a/CHANGELOG.md b/CHANGELOG.md index 81ed53fdf..b3aab706e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ [#1598](https://github.com/nextcloud/cookbook/pull/1598) @rakekniven - Fix webpack dev server settings to allow for docker dev environment [#1607](https://github.com/nextcloud/cookbook/pull/1607) @christianlupus +- Fix alphabetical ordering of PHP imports + [#1614](https://github.com/nextcloud/cookbook/pull/1614) @dependabot @christianlupus ## 0.10.2 - 2023-03-24 diff --git a/composer.lock b/composer.lock index 287c47307..74126a4ef 100644 --- a/composer.lock +++ b/composer.lock @@ -54,16 +54,16 @@ }, { "name": "composer/pcre", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd" + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd", - "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd", + "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", "shasum": "" }, "require": { @@ -105,7 +105,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.0.0" + "source": "https://github.com/composer/pcre/tree/3.1.0" }, "funding": [ { @@ -121,7 +121,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T20:21:48+00:00" + "time": "2022-11-17T09:50:14+00:00" }, { "name": "composer/semver", @@ -272,32 +272,35 @@ }, { "name": "doctrine/annotations", - "version": "1.13.3", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "648b0343343565c4a056bfc8392201385e8d89f0" + "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0", - "reference": "648b0343343565c4a056bfc8392201385e8d89f0", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", + "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", "shasum": "" }, "require": { - "doctrine/lexer": "1.*", + "doctrine/lexer": "^2 || ^3", "ext-tokenizer": "*", - "php": "^7.1 || ^8.0", + "php": "^7.2 || ^8.0", "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { - "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^1.4.10 || ^1.8.0", - "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", - "symfony/cache": "^4.4 || ^5.2", + "doctrine/cache": "^2.0", + "doctrine/coding-standard": "^10", + "phpstan/phpstan": "^1.8.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "symfony/cache": "^5.4 || ^6", "vimeo/psalm": "^4.10" }, + "suggest": { + "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" + }, "type": "library", "autoload": { "psr-4": { @@ -339,9 +342,52 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.13.3" + "source": "https://github.com/doctrine/annotations/tree/2.0.1" }, - "time": "2022-07-02T10:48:51+00:00" + "time": "2023-02-02T22:02:53+00:00" + }, + { + "name": "doctrine/deprecations", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/deprecations.git", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5|^8.5|^9.5", + "psr/log": "^1|^2|^3" + }, + "suggest": { + "psr/log": "Allows logging deprecations via PSR-3 logger implementation" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", + "homepage": "https://www.doctrine-project.org/", + "support": { + "issues": "https://github.com/doctrine/deprecations/issues", + "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + }, + "time": "2022-05-02T15:47:09+00:00" }, { "name": "doctrine/instantiator", @@ -415,31 +461,33 @@ }, { "name": "doctrine/lexer", - "version": "1.2.3", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229" + "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229", - "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", + "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.0", "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9.0", + "doctrine/coding-standard": "^9 || ^10", "phpstan/phpstan": "^1.3", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.11" + "psalm/plugin-phpunit": "^0.18.3", + "vimeo/psalm": "^4.11 || ^5.0" }, "type": "library", "autoload": { "psr-4": { - "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" + "Doctrine\\Common\\Lexer\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -471,7 +519,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.3" + "source": "https://github.com/doctrine/lexer/tree/2.1.0" }, "funding": [ { @@ -487,55 +535,56 @@ "type": "tidelift" } ], - "time": "2022-02-28T11:07:21+00:00" + "time": "2022-12-14T08:49:07+00:00" }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.9.4", + "version": "v3.16.0", "source": { "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "093466b1c3ff3e3b469bdbc9827bb2362de6b2fa" + "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", + "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/093466b1c3ff3e3b469bdbc9827bb2362de6b2fa", - "reference": "093466b1c3ff3e3b469bdbc9827bb2362de6b2fa", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d40f9436e1c448d309fa995ab9c14c5c7a96f2dc", + "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc", "shasum": "" }, "require": { - "composer/semver": "^3.2", + "composer/semver": "^3.3", "composer/xdebug-handler": "^3.0.3", - "doctrine/annotations": "^1.13", + "doctrine/annotations": "^2", + "doctrine/lexer": "^2 || ^3", "ext-json": "*", "ext-tokenizer": "*", "php": "^7.4 || ^8.0", - "php-cs-fixer/diff": "^2.0", + "sebastian/diff": "^4.0 || ^5.0", "symfony/console": "^5.4 || ^6.0", "symfony/event-dispatcher": "^5.4 || ^6.0", "symfony/filesystem": "^5.4 || ^6.0", "symfony/finder": "^5.4 || ^6.0", "symfony/options-resolver": "^5.4 || ^6.0", - "symfony/polyfill-mbstring": "^1.23", - "symfony/polyfill-php80": "^1.25", - "symfony/polyfill-php81": "^1.25", + "symfony/polyfill-mbstring": "^1.27", + "symfony/polyfill-php80": "^1.27", + "symfony/polyfill-php81": "^1.27", "symfony/process": "^5.4 || ^6.0", "symfony/stopwatch": "^5.4 || ^6.0" }, "require-dev": { "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^1.5", - "mikey179/vfsstream": "^1.6.10", - "php-coveralls/php-coveralls": "^2.5.2", + "keradus/cli-executor": "^2.0", + "mikey179/vfsstream": "^1.6.11", + "php-coveralls/php-coveralls": "^2.5.3", "php-cs-fixer/accessible-object": "^1.1", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", - "phpspec/prophecy": "^1.15", + "phpspec/prophecy": "^1.16", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "phpunitgoodpractices/polyfill": "^1.5", - "phpunitgoodpractices/traits": "^1.9.1", - "symfony/phpunit-bridge": "^6.0", + "phpunitgoodpractices/polyfill": "^1.6", + "phpunitgoodpractices/traits": "^1.9.2", + "symfony/phpunit-bridge": "^6.2.3", "symfony/yaml": "^5.4 || ^6.0" }, "suggest": { @@ -566,9 +615,15 @@ } ], "description": "A tool to automatically fix PHP code style", + "keywords": [ + "Static code analysis", + "fixer", + "standards", + "static analysis" + ], "support": { - "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.9.4" + "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.16.0" }, "funding": [ { @@ -576,7 +631,7 @@ "type": "github" } ], - "time": "2022-07-15T21:04:49+00:00" + "time": "2023-04-02T19:30:06+00:00" }, { "name": "myclabs/deep-copy", @@ -639,20 +694,20 @@ }, { "name": "nextcloud/coding-standard", - "version": "v1.0.0", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/nextcloud/coding-standard.git", - "reference": "f3d1f9375e89c605deb1734f59a9f51ecbe80578" + "reference": "20efa30db5240a5f078e03b04c685735a89dfc9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/f3d1f9375e89c605deb1734f59a9f51ecbe80578", - "reference": "f3d1f9375e89c605deb1734f59a9f51ecbe80578", + "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/20efa30db5240a5f078e03b04c685735a89dfc9e", + "reference": "20efa30db5240a5f078e03b04c685735a89dfc9e", "shasum": "" }, "require": { - "friendsofphp/php-cs-fixer": "^3.2", + "friendsofphp/php-cs-fixer": "^3.9", "php": "^7.3|^8.0" }, "type": "library", @@ -674,9 +729,9 @@ "description": "Nextcloud coding standards for the php cs fixer", "support": { "issues": "https://github.com/nextcloud/coding-standard/issues", - "source": "https://github.com/nextcloud/coding-standard/tree/v1.0.0" + "source": "https://github.com/nextcloud/coding-standard/tree/v1.1.0" }, - "time": "2021-11-10T08:44:10+00:00" + "time": "2023-04-13T10:52:46+00:00" }, { "name": "nikic/php-parser", @@ -845,58 +900,6 @@ }, "time": "2022-02-21T01:04:05+00:00" }, - { - "name": "php-cs-fixer/diff", - "version": "v2.0.2", - "source": { - "type": "git", - "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3", - "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", - "symfony/process": "^3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - } - ], - "description": "sebastian/diff v3 backport support for PHP 5.6+", - "homepage": "https://github.com/PHP-CS-Fixer", - "keywords": [ - "diff" - ], - "support": { - "issues": "https://github.com/PHP-CS-Fixer/diff/issues", - "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2" - }, - "time": "2020-10-14T08:32:19+00:00" - }, { "name": "php-webdriver/webdriver", "version": "1.12.1", @@ -2541,16 +2544,16 @@ }, { "name": "symfony/console", - "version": "v5.4.10", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000" + "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4d671ab4ddac94ee439ea73649c69d9d200b5000", - "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000", + "url": "https://api.github.com/repos/symfony/console/zipball/3cd51fd2e6c461ca678f84d419461281bd87a0a8", + "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8", "shasum": "" }, "require": { @@ -2615,12 +2618,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.10" + "source": "https://github.com/symfony/console/tree/v5.4.22" }, "funding": [ { @@ -2636,7 +2639,7 @@ "type": "tidelift" } ], - "time": "2022-06-26T13:00:04+00:00" + "time": "2023-03-25T09:27:28+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2707,16 +2710,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v5.4.9", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc" + "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", - "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1df20e45d56da29a4b1d8259dd6e950acbf1b13f", + "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f", "shasum": "" }, "require": { @@ -2772,7 +2775,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/v5.4.9" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.22" }, "funding": [ { @@ -2788,7 +2791,7 @@ "type": "tidelift" } ], - "time": "2022-05-05T16:45:39+00:00" + "time": "2023-03-17T11:31:58+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -2871,16 +2874,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.9", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba" + "reference": "e75960b1bbfd2b8c9e483e0d74811d555ca3de9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba", - "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/e75960b1bbfd2b8c9e483e0d74811d555ca3de9f", + "reference": "e75960b1bbfd2b8c9e483e0d74811d555ca3de9f", "shasum": "" }, "require": { @@ -2915,7 +2918,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.9" + "source": "https://github.com/symfony/filesystem/tree/v5.4.21" }, "funding": [ { @@ -2931,20 +2934,20 @@ "type": "tidelift" } ], - "time": "2022-05-20T13:55:35+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/finder", - "version": "v5.4.8", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9" + "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9", + "url": "https://api.github.com/repos/symfony/finder/zipball/078e9a5e1871fcfe6a5ce421b539344c21afef19", + "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19", "shasum": "" }, "require": { @@ -2978,7 +2981,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.8" + "source": "https://github.com/symfony/finder/tree/v5.4.21" }, "funding": [ { @@ -2994,20 +2997,20 @@ "type": "tidelift" } ], - "time": "2022-04-15T08:07:45+00:00" + "time": "2023-02-16T09:33:00+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.4.3", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8" + "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8", - "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", + "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", "shasum": "" }, "require": { @@ -3047,7 +3050,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.3" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.21" }, "funding": [ { @@ -3063,20 +3066,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { @@ -3091,7 +3094,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3129,7 +3132,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -3145,20 +3148,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "433d05519ce6990bf3530fba6957499d327395c2" + "reference": "511a08c03c1960e08a883f4cffcacd219b758354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", - "reference": "433d05519ce6990bf3530fba6957499d327395c2", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", + "reference": "511a08c03c1960e08a883f4cffcacd219b758354", "shasum": "" }, "require": { @@ -3170,7 +3173,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3210,7 +3213,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" }, "funding": [ { @@ -3226,20 +3229,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd" + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { @@ -3251,7 +3254,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3294,7 +3297,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" }, "funding": [ { @@ -3310,20 +3313,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { @@ -3338,7 +3341,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3377,7 +3380,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -3393,20 +3396,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", "shasum": "" }, "require": { @@ -3415,7 +3418,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3456,7 +3459,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" }, "funding": [ { @@ -3472,20 +3475,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { @@ -3494,7 +3497,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3539,7 +3542,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -3555,20 +3558,20 @@ "type": "tidelift" } ], - "time": "2022-05-10T07:21:04+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", "shasum": "" }, "require": { @@ -3577,7 +3580,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3618,7 +3621,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" }, "funding": [ { @@ -3634,20 +3637,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", - "version": "v5.4.8", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3" + "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", - "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", + "url": "https://api.github.com/repos/symfony/process/zipball/4b850da0cc3a2a9181c1ed407adbca4733dc839b", + "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b", "shasum": "" }, "require": { @@ -3680,7 +3683,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.8" + "source": "https://github.com/symfony/process/tree/v5.4.22" }, "funding": [ { @@ -3696,7 +3699,7 @@ "type": "tidelift" } ], - "time": "2022-04-08T05:07:18+00:00" + "time": "2023-03-06T21:29:33+00:00" }, { "name": "symfony/service-contracts", @@ -3783,16 +3786,16 @@ }, { "name": "symfony/stopwatch", - "version": "v5.4.5", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30" + "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", - "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f83692cd869a6f2391691d40a01e8acb89e76fee", + "reference": "f83692cd869a6f2391691d40a01e8acb89e76fee", "shasum": "" }, "require": { @@ -3825,7 +3828,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.5" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.21" }, "funding": [ { @@ -3841,20 +3844,20 @@ "type": "tidelift" } ], - "time": "2022-02-18T16:06:09+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/string", - "version": "v5.4.10", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097" + "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/4432bc7df82a554b3e413a8570ce2fea90e94097", - "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097", + "url": "https://api.github.com/repos/symfony/string/zipball/8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", + "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", "shasum": "" }, "require": { @@ -3911,7 +3914,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.10" + "source": "https://github.com/symfony/string/tree/v5.4.22" }, "funding": [ { @@ -3927,7 +3930,7 @@ "type": "tidelift" } ], - "time": "2022-06-26T15:57:47+00:00" + "time": "2023-03-14T06:11:53+00:00" }, { "name": "theseer/tokenizer", diff --git a/lib/Controller/CategoryController.php b/lib/Controller/CategoryController.php index da5234329..f28d86f7b 100644 --- a/lib/Controller/CategoryController.php +++ b/lib/Controller/CategoryController.php @@ -2,10 +2,10 @@ namespace OCA\Cookbook\Controller; -use OCP\IRequest; +use OCA\Cookbook\Controller\Implementation\CategoryImplementation; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\JSONResponse; -use OCA\Cookbook\Controller\Implementation\CategoryImplementation; +use OCP\IRequest; class CategoryController extends Controller { /** @var CategoryImplementation */ diff --git a/lib/Controller/ConfigApiController.php b/lib/Controller/ConfigApiController.php index 1f0711387..4d0e3be72 100644 --- a/lib/Controller/ConfigApiController.php +++ b/lib/Controller/ConfigApiController.php @@ -3,9 +3,9 @@ namespace OCA\Cookbook\Controller; use OCA\Cookbook\Controller\Implementation\ConfigImplementation; -use OCP\IRequest; use OCP\AppFramework\ApiController; use OCP\AppFramework\Http\JSONResponse; +use OCP\IRequest; class ConfigApiController extends ApiController { /** @var ConfigImplementation */ diff --git a/lib/Controller/ConfigController.php b/lib/Controller/ConfigController.php index 6e8ef7693..2eb6bfef7 100644 --- a/lib/Controller/ConfigController.php +++ b/lib/Controller/ConfigController.php @@ -2,10 +2,10 @@ namespace OCA\Cookbook\Controller; -use OCP\IRequest; +use OCA\Cookbook\Controller\Implementation\ConfigImplementation; use OCP\AppFramework\Controller; -use OCA\Cookbook\Controller\Implementation\ConfigImplementation; +use OCP\IRequest; class ConfigController extends Controller { /** @var ConfigImplementation */ diff --git a/lib/Controller/Implementation/CategoryImplementation.php b/lib/Controller/Implementation/CategoryImplementation.php index 9ed7c72de..11f98c0ce 100644 --- a/lib/Controller/Implementation/CategoryImplementation.php +++ b/lib/Controller/Implementation/CategoryImplementation.php @@ -2,11 +2,11 @@ namespace OCA\Cookbook\Controller\Implementation; -use OCP\AppFramework\Http; +use OCA\Cookbook\Helper\RestParameterParser; +use OCA\Cookbook\Service\DbCacheService; use OCA\Cookbook\Service\RecipeService; +use OCP\AppFramework\Http; use OCP\AppFramework\Http\JSONResponse; -use OCA\Cookbook\Service\DbCacheService; -use OCA\Cookbook\Helper\RestParameterParser; class CategoryImplementation { /** @var RecipeService */ diff --git a/lib/Controller/Implementation/ConfigImplementation.php b/lib/Controller/Implementation/ConfigImplementation.php index d9da0b617..354f39052 100644 --- a/lib/Controller/Implementation/ConfigImplementation.php +++ b/lib/Controller/Implementation/ConfigImplementation.php @@ -2,12 +2,12 @@ namespace OCA\Cookbook\Controller\Implementation; -use OCP\AppFramework\Http; +use OCA\Cookbook\Helper\RestParameterParser; +use OCA\Cookbook\Helper\UserFolderHelper; +use OCA\Cookbook\Service\DbCacheService; use OCA\Cookbook\Service\RecipeService; +use OCP\AppFramework\Http; use OCP\AppFramework\Http\JSONResponse; -use OCA\Cookbook\Service\DbCacheService; -use OCA\Cookbook\Helper\UserFolderHelper; -use OCA\Cookbook\Helper\RestParameterParser; class ConfigImplementation { /** @var RecipeService */ diff --git a/lib/Controller/Implementation/KeywordImplementation.php b/lib/Controller/Implementation/KeywordImplementation.php index 35254e07f..4030bc64b 100644 --- a/lib/Controller/Implementation/KeywordImplementation.php +++ b/lib/Controller/Implementation/KeywordImplementation.php @@ -2,9 +2,9 @@ namespace OCA\Cookbook\Controller\Implementation; +use OCA\Cookbook\Service\DbCacheService; use OCA\Cookbook\Service\RecipeService; use OCP\AppFramework\Http\JSONResponse; -use OCA\Cookbook\Service\DbCacheService; class KeywordImplementation { /** @var RecipeService */ diff --git a/lib/Controller/Implementation/RecipeImplementation.php b/lib/Controller/Implementation/RecipeImplementation.php index 19068bcc6..7000c96d2 100644 --- a/lib/Controller/Implementation/RecipeImplementation.php +++ b/lib/Controller/Implementation/RecipeImplementation.php @@ -2,20 +2,20 @@ namespace OCA\Cookbook\Controller\Implementation; -use OCP\IL10N; -use OCP\IURLGenerator; -use OCP\AppFramework\Http; -use OCA\Cookbook\Service\RecipeService; -use OCP\AppFramework\Http\JSONResponse; -use OCA\Cookbook\Service\DbCacheService; -use OCA\Cookbook\Helper\RestParameterParser; -use OCP\AppFramework\Http\DataDisplayResponse; -use OCP\AppFramework\Http\FileDisplayResponse; +use OCA\Cookbook\Exception\NoRecipeNameGivenException; use OCA\Cookbook\Exception\RecipeExistsException; use OCA\Cookbook\Helper\AcceptHeaderParsingHelper; -use OCA\Cookbook\Exception\NoRecipeNameGivenException; use OCA\Cookbook\Helper\Filter\RecipeJSONOutputFilter; +use OCA\Cookbook\Helper\RestParameterParser; +use OCA\Cookbook\Service\DbCacheService; +use OCA\Cookbook\Service\RecipeService; +use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataDisplayResponse; +use OCP\AppFramework\Http\FileDisplayResponse; +use OCP\AppFramework\Http\JSONResponse; +use OCP\IL10N; use OCP\IRequest; +use OCP\IURLGenerator; class RecipeImplementation { /** @var RecipeService */ diff --git a/lib/Controller/KeywordController.php b/lib/Controller/KeywordController.php index a2c1815dc..f5ac9ff64 100644 --- a/lib/Controller/KeywordController.php +++ b/lib/Controller/KeywordController.php @@ -2,10 +2,10 @@ namespace OCA\Cookbook\Controller; -use OCP\IRequest; +use OCA\Cookbook\Controller\Implementation\KeywordImplementation; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\JSONResponse; -use OCA\Cookbook\Controller\Implementation\KeywordImplementation; +use OCP\IRequest; class KeywordController extends Controller { /** @var KeywordImplementation */ diff --git a/lib/Controller/MainController.php b/lib/Controller/MainController.php index 2cd5d147f..9a7206a4f 100755 --- a/lib/Controller/MainController.php +++ b/lib/Controller/MainController.php @@ -2,14 +2,14 @@ namespace OCA\Cookbook\Controller; -use OCP\IRequest; -use OCP\Util; -use OCP\AppFramework\Http\TemplateResponse; -use OCP\AppFramework\Controller; -use OCA\Cookbook\Service\DbCacheService; use OCA\Cookbook\Exception\UserFolderNotWritableException; use OCA\Cookbook\Exception\UserNotLoggedInException; use OCA\Cookbook\Helper\UserFolderHelper; +use OCA\Cookbook\Service\DbCacheService; +use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\TemplateResponse; +use OCP\IRequest; +use OCP\Util; class MainController extends Controller { /** @var string */ diff --git a/lib/Controller/RecipeApiController.php b/lib/Controller/RecipeApiController.php index 5f5e88d15..116cec579 100644 --- a/lib/Controller/RecipeApiController.php +++ b/lib/Controller/RecipeApiController.php @@ -3,11 +3,11 @@ namespace OCA\Cookbook\Controller; use OCA\Cookbook\Controller\Implementation\RecipeImplementation; -use OCP\IRequest; use OCP\AppFramework\ApiController; -use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\DataDisplayResponse; use OCP\AppFramework\Http\FileDisplayResponse; +use OCP\AppFramework\Http\JSONResponse; +use OCP\IRequest; class RecipeApiController extends ApiController { /** @var RecipeImplementation */ diff --git a/lib/Controller/RecipeController.php b/lib/Controller/RecipeController.php index 99c16f38a..0302c3f0f 100755 --- a/lib/Controller/RecipeController.php +++ b/lib/Controller/RecipeController.php @@ -3,8 +3,8 @@ namespace OCA\Cookbook\Controller; use OCA\Cookbook\Controller\Implementation\RecipeImplementation; -use OCP\IRequest; use OCP\AppFramework\Controller; +use OCP\IRequest; class RecipeController extends Controller { /** @var RecipeImplementation */ diff --git a/lib/Db/RecipeDb.php b/lib/Db/RecipeDb.php index c9f5a971b..3fe305ee6 100755 --- a/lib/Db/RecipeDb.php +++ b/lib/Db/RecipeDb.php @@ -3,10 +3,10 @@ namespace OCA\Cookbook\Db; use DateTimeImmutable; -use OCP\DB\QueryBuilder\IQueryBuilder; -use OCP\IDBConnection; use OCP\AppFramework\Db\DoesNotExistException; +use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\Types; +use OCP\IDBConnection; use OCP\IL10N; class RecipeDb { diff --git a/lib/Helper/Filter/JSON/FixDescriptionFilter.php b/lib/Helper/Filter/JSON/FixDescriptionFilter.php index a6fa7c29d..64a043a92 100644 --- a/lib/Helper/Filter/JSON/FixDescriptionFilter.php +++ b/lib/Helper/Filter/JSON/FixDescriptionFilter.php @@ -2,10 +2,10 @@ namespace OCA\Cookbook\Helper\Filter\JSON; -use OCP\IL10N; -use Psr\Log\LoggerInterface; use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; use OCA\Cookbook\Helper\TextCleanupHelper; +use OCP\IL10N; +use Psr\Log\LoggerInterface; /** * Fix the description of a recipe. diff --git a/lib/Helper/Filter/JSON/FixDurationsFilter.php b/lib/Helper/Filter/JSON/FixDurationsFilter.php index b5444ecea..91713a3e6 100644 --- a/lib/Helper/Filter/JSON/FixDurationsFilter.php +++ b/lib/Helper/Filter/JSON/FixDurationsFilter.php @@ -3,10 +3,10 @@ namespace OCA\Cookbook\Helper\Filter\JSON; use OCA\Cookbook\Exception\InvalidDurationException; -use OCP\IL10N; -use Psr\Log\LoggerInterface; use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; use OCA\Cookbook\Helper\ISO8601DurationHelper; +use OCP\IL10N; +use Psr\Log\LoggerInterface; /** * Fix the durations of a recipe. diff --git a/lib/Helper/Filter/JSON/FixIngredientsFilter.php b/lib/Helper/Filter/JSON/FixIngredientsFilter.php index 516f805cc..8c5927879 100644 --- a/lib/Helper/Filter/JSON/FixIngredientsFilter.php +++ b/lib/Helper/Filter/JSON/FixIngredientsFilter.php @@ -3,10 +3,10 @@ namespace OCA\Cookbook\Helper\Filter\JSON; use OCA\Cookbook\Exception\InvalidRecipeException; -use OCP\IL10N; -use Psr\Log\LoggerInterface; use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; use OCA\Cookbook\Helper\TextCleanupHelper; +use OCP\IL10N; +use Psr\Log\LoggerInterface; /** * Fix the ingredients list. diff --git a/lib/Helper/Filter/JSON/FixInstructionsFilter.php b/lib/Helper/Filter/JSON/FixInstructionsFilter.php index 49f04a23b..5c5a969a2 100644 --- a/lib/Helper/Filter/JSON/FixInstructionsFilter.php +++ b/lib/Helper/Filter/JSON/FixInstructionsFilter.php @@ -3,11 +3,11 @@ namespace OCA\Cookbook\Helper\Filter\JSON; use OCA\Cookbook\Exception\InvalidRecipeException; -use OCP\IL10N; -use Psr\Log\LoggerInterface; use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; use OCA\Cookbook\Helper\TextCleanupHelper; use OCA\Cookbook\Service\JsonService; +use OCP\IL10N; +use Psr\Log\LoggerInterface; /** * Fix the instructions list. diff --git a/lib/Helper/Filter/JSON/FixKeywordsFilter.php b/lib/Helper/Filter/JSON/FixKeywordsFilter.php index 1dd92a9b5..34e357160 100644 --- a/lib/Helper/Filter/JSON/FixKeywordsFilter.php +++ b/lib/Helper/Filter/JSON/FixKeywordsFilter.php @@ -2,10 +2,10 @@ namespace OCA\Cookbook\Helper\Filter\JSON; -use OCP\IL10N; -use Psr\Log\LoggerInterface; use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; use OCA\Cookbook\Helper\TextCleanupHelper; +use OCP\IL10N; +use Psr\Log\LoggerInterface; /** * Fix the keyword list. diff --git a/lib/Helper/Filter/JSON/FixNutritionFilter.php b/lib/Helper/Filter/JSON/FixNutritionFilter.php index efef04333..c013e770c 100644 --- a/lib/Helper/Filter/JSON/FixNutritionFilter.php +++ b/lib/Helper/Filter/JSON/FixNutritionFilter.php @@ -2,9 +2,9 @@ namespace OCA\Cookbook\Helper\Filter\JSON; +use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; use OCP\IL10N; use Psr\Log\LoggerInterface; -use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; /** * Fix the nutrition information of a recipe. diff --git a/lib/Helper/Filter/JSON/FixRecipeYieldFilter.php b/lib/Helper/Filter/JSON/FixRecipeYieldFilter.php index 35259a228..24972fa56 100644 --- a/lib/Helper/Filter/JSON/FixRecipeYieldFilter.php +++ b/lib/Helper/Filter/JSON/FixRecipeYieldFilter.php @@ -2,9 +2,9 @@ namespace OCA\Cookbook\Helper\Filter\JSON; +use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; use OCP\IL10N; use Psr\Log\LoggerInterface; -use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; /** * Fix the recipe yield field. diff --git a/lib/Helper/Filter/JSON/FixToolsFilter.php b/lib/Helper/Filter/JSON/FixToolsFilter.php index b579b7819..570838da8 100644 --- a/lib/Helper/Filter/JSON/FixToolsFilter.php +++ b/lib/Helper/Filter/JSON/FixToolsFilter.php @@ -3,10 +3,10 @@ namespace OCA\Cookbook\Helper\Filter\JSON; use OCA\Cookbook\Exception\InvalidRecipeException; -use OCP\IL10N; -use Psr\Log\LoggerInterface; use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; use OCA\Cookbook\Helper\TextCleanupHelper; +use OCP\IL10N; +use Psr\Log\LoggerInterface; /** * Fix the tools list. diff --git a/lib/Helper/Filter/JSON/FixUrlFilter.php b/lib/Helper/Filter/JSON/FixUrlFilter.php index 02e4359f2..a0dc78041 100644 --- a/lib/Helper/Filter/JSON/FixUrlFilter.php +++ b/lib/Helper/Filter/JSON/FixUrlFilter.php @@ -2,9 +2,9 @@ namespace OCA\Cookbook\Helper\Filter\JSON; +use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; use OCP\IL10N; use Psr\Log\LoggerInterface; -use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; /** * Fix the URL of a recipe. diff --git a/lib/Helper/Filter/Output/EnsureNutritionPresentFilter.php b/lib/Helper/Filter/Output/EnsureNutritionPresentFilter.php index 3a263e5d5..d8c7accdf 100644 --- a/lib/Helper/Filter/Output/EnsureNutritionPresentFilter.php +++ b/lib/Helper/Filter/Output/EnsureNutritionPresentFilter.php @@ -2,9 +2,9 @@ namespace OCA\Cookbook\Helper\Filter\Output; +use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; use OCP\IL10N; use Psr\Log\LoggerInterface; -use OCA\Cookbook\Helper\Filter\AbstractJSONFilter; /** * Ensure the nutrition field can be detected as a schema.org object diff --git a/lib/Helper/HTMLParser/HttpJsonLdParser.php b/lib/Helper/HTMLParser/HttpJsonLdParser.php index b1ff0ec54..5f5b8f020 100644 --- a/lib/Helper/HTMLParser/HttpJsonLdParser.php +++ b/lib/Helper/HTMLParser/HttpJsonLdParser.php @@ -3,8 +3,8 @@ namespace OCA\Cookbook\Helper\HTMLParser; use OCA\Cookbook\Exception\HtmlParsingException; -use OCP\IL10N; use OCA\Cookbook\Service\JsonService; +use OCP\IL10N; /** * This class is an AbstractHtmlParser which tries to extract a JSON+LD script from the HTML page. diff --git a/lib/Helper/HTMLParser/HttpMicrodataParser.php b/lib/Helper/HTMLParser/HttpMicrodataParser.php index 3405aed8f..6a5d92643 100644 --- a/lib/Helper/HTMLParser/HttpMicrodataParser.php +++ b/lib/Helper/HTMLParser/HttpMicrodataParser.php @@ -2,12 +2,12 @@ namespace OCA\Cookbook\Helper\HTMLParser; -use DOMNode; -use DOMXPath; -use OCP\IL10N; use DOMDocument; +use DOMNode; use DOMNodeList; +use DOMXPath; use OCA\Cookbook\Exception\HtmlParsingException; +use OCP\IL10N; /** * This class is an AbstractHtmlParser which tries to extract micro data from the HTML page. diff --git a/lib/Helper/HtmlToDomParser.php b/lib/Helper/HtmlToDomParser.php index ce318f17a..0de9ae0a6 100644 --- a/lib/Helper/HtmlToDomParser.php +++ b/lib/Helper/HtmlToDomParser.php @@ -2,12 +2,12 @@ namespace OCA\Cookbook\Helper; -use Exception; -use OCP\IL10N; use DOMDocument; +use Exception; use LibXMLError; -use Psr\Log\LoggerInterface; use OCA\Cookbook\Exception\ImportException; +use OCP\IL10N; +use Psr\Log\LoggerInterface; /** * This class allows to parse an HTML document into a DOMDocument. diff --git a/lib/Helper/ISO8601DurationHelper.php b/lib/Helper/ISO8601DurationHelper.php index cf7b18e41..73803a4e8 100644 --- a/lib/Helper/ISO8601DurationHelper.php +++ b/lib/Helper/ISO8601DurationHelper.php @@ -2,8 +2,8 @@ namespace OCA\Cookbook\Helper; -use OCP\IL10N; use OCA\Cookbook\Exception\InvalidDurationException; +use OCP\IL10N; /** * Parser for ISO8601 and similar time spans. diff --git a/lib/Helper/ImageService/ImageFileHelper.php b/lib/Helper/ImageService/ImageFileHelper.php index 8a4609f3f..42bcd362e 100644 --- a/lib/Helper/ImageService/ImageFileHelper.php +++ b/lib/Helper/ImageService/ImageFileHelper.php @@ -2,12 +2,12 @@ namespace OCA\Cookbook\Helper\ImageService; -use OCP\IL10N; +use OCA\Cookbook\Exception\RecipeImageExistsException; use OCP\Files\File; use OCP\Files\Folder; use OCP\Files\NotFoundException; -use OCA\Cookbook\Exception\RecipeImageExistsException; use OCP\Files\NotPermittedException; +use OCP\IL10N; class ImageFileHelper { private const NAME_MAIN = ImageSize::NAME_MAP[ImageSize::PRIMARY_IMAGE]; diff --git a/lib/Helper/ImageService/ImageGenerationHelper.php b/lib/Helper/ImageService/ImageGenerationHelper.php index e8777acbd..0cfd98a79 100644 --- a/lib/Helper/ImageService/ImageGenerationHelper.php +++ b/lib/Helper/ImageService/ImageGenerationHelper.php @@ -3,9 +3,9 @@ namespace OCA\Cookbook\Helper\ImageService; use OCA\Cookbook\Exception\InvalidThumbnailTypeException; +use OCA\Cookbook\Service\ThumbnailService; use OCP\Files\File; use OCP\Files\Folder; -use OCA\Cookbook\Service\ThumbnailService; use OCP\Files\GenericFileException; use OCP\Files\InvalidPathException; use OCP\Files\NotFoundException; diff --git a/lib/Helper/ImageService/ThumbnailFileHelper.php b/lib/Helper/ImageService/ThumbnailFileHelper.php index b158191f7..baaa568dc 100644 --- a/lib/Helper/ImageService/ThumbnailFileHelper.php +++ b/lib/Helper/ImageService/ThumbnailFileHelper.php @@ -2,12 +2,12 @@ namespace OCA\Cookbook\Helper\ImageService; -use OCP\IL10N; +use OCA\Cookbook\Exception\NoRecipeImageFoundException; use OCP\Files\File; use OCP\Files\Folder; use OCP\Files\NotFoundException; -use OCA\Cookbook\Exception\NoRecipeImageFoundException; use OCP\Files\NotPermittedException; +use OCP\IL10N; /** * This class allows to handle the files of the thumbnails diff --git a/lib/Helper/UserFolderHelper.php b/lib/Helper/UserFolderHelper.php index e961ea8e4..e278bb0f6 100644 --- a/lib/Helper/UserFolderHelper.php +++ b/lib/Helper/UserFolderHelper.php @@ -2,16 +2,16 @@ namespace OCA\Cookbook\Helper; -use OCP\IL10N; -use OCP\Files\Node; -use OCP\Files\Folder; -use OCP\Files\NotPermittedException; use OCA\Cookbook\Exception\UserFolderNotValidException; use OCA\Cookbook\Exception\UserFolderNotWritableException; use OCA\Cookbook\Exception\UserNotLoggedInException; use OCP\Files\FileInfo; +use OCP\Files\Folder; use OCP\Files\IRootFolder; +use OCP\Files\Node; use OCP\Files\NotFoundException; +use OCP\Files\NotPermittedException; +use OCP\IL10N; /** * This class caches the access to the user folder throughout the app. diff --git a/lib/Migration/Version000000Date20190312140601.php b/lib/Migration/Version000000Date20190312140601.php index 0f41b3484..25d4465a9 100644 --- a/lib/Migration/Version000000Date20190312140601.php +++ b/lib/Migration/Version000000Date20190312140601.php @@ -4,8 +4,8 @@ use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version000000Date20190312140601 extends SimpleMigrationStep { /** diff --git a/lib/Migration/Version000000Date20190910100911.php b/lib/Migration/Version000000Date20190910100911.php index e169f482f..ec403f482 100644 --- a/lib/Migration/Version000000Date20190910100911.php +++ b/lib/Migration/Version000000Date20190910100911.php @@ -4,8 +4,8 @@ use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version000000Date20190910100911 extends SimpleMigrationStep { /** diff --git a/lib/Migration/Version000000Date20190910223344.php b/lib/Migration/Version000000Date20190910223344.php index 27f3c23e7..e99f957fc 100644 --- a/lib/Migration/Version000000Date20190910223344.php +++ b/lib/Migration/Version000000Date20190910223344.php @@ -4,8 +4,8 @@ use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version000000Date20190910223344 extends SimpleMigrationStep { /** diff --git a/lib/Migration/Version000000Date20200315121603.php b/lib/Migration/Version000000Date20200315121603.php index 0831fa80a..566712fc5 100644 --- a/lib/Migration/Version000000Date20200315121603.php +++ b/lib/Migration/Version000000Date20200315121603.php @@ -4,8 +4,8 @@ use Closure; use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; class Version000000Date20200315121603 extends SimpleMigrationStep { /** diff --git a/lib/Migration/Version000000Date20210701093123.php b/lib/Migration/Version000000Date20210701093123.php index 378683e29..65d473b99 100644 --- a/lib/Migration/Version000000Date20210701093123.php +++ b/lib/Migration/Version000000Date20210701093123.php @@ -4,12 +4,12 @@ namespace OCA\Cookbook\Migration; -use OCP\IDBConnection; +use Closure; use OCP\DB\ISchemaWrapper; +use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\IDBConnection; use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; -use Closure; -use OCP\DB\QueryBuilder\IQueryBuilder; /** * Auto-generated migration step: Please modify to your needs! diff --git a/lib/Search/Provider.php b/lib/Search/Provider.php index 445696453..6b57ae022 100644 --- a/lib/Search/Provider.php +++ b/lib/Search/Provider.php @@ -5,8 +5,8 @@ use OCA\Cookbook\AppInfo\Application; use OCA\Cookbook\Service\RecipeService; use OCP\IL10N; -use OCP\IUser; use OCP\IURLGenerator; +use OCP\IUser; use OCP\Search\IProvider; use OCP\Search\ISearchQuery; use OCP\Search\SearchResult; diff --git a/lib/Service/DbCacheService.php b/lib/Service/DbCacheService.php index f3926c731..b73cc8a3b 100644 --- a/lib/Service/DbCacheService.php +++ b/lib/Service/DbCacheService.php @@ -3,11 +3,11 @@ namespace OCA\Cookbook\Service; use OCA\Cookbook\Db\RecipeDb; -use OCP\Files\File; -use OCP\AppFramework\Db\DoesNotExistException; use OCA\Cookbook\Exception\InvalidJSONFileException; use OCA\Cookbook\Helper\Filter\NormalizeRecipeFileFilter; use OCA\Cookbook\Helper\UserConfigHelper; +use OCP\AppFramework\Db\DoesNotExistException; +use OCP\Files\File; use OCP\IL10N; class DbCacheService { diff --git a/lib/Service/RecipeExtractionService.php b/lib/Service/RecipeExtractionService.php index 086b517fb..f11a1a4e8 100644 --- a/lib/Service/RecipeExtractionService.php +++ b/lib/Service/RecipeExtractionService.php @@ -2,10 +2,10 @@ namespace OCA\Cookbook\Service; +use OCA\Cookbook\Exception\HtmlParsingException; use OCA\Cookbook\Helper\HTMLParser\AbstractHtmlParser; use OCA\Cookbook\Helper\HTMLParser\HttpJsonLdParser; use OCA\Cookbook\Helper\HTMLParser\HttpMicrodataParser; -use OCA\Cookbook\Exception\HtmlParsingException; use OCP\IL10N; class RecipeExtractionService { diff --git a/lib/Service/RecipeService.php b/lib/Service/RecipeService.php index 0ec4c44c9..4580c559f 100755 --- a/lib/Service/RecipeService.php +++ b/lib/Service/RecipeService.php @@ -3,25 +3,25 @@ namespace OCA\Cookbook\Service; use Exception; -use OCP\Files\NotFoundException; -use OCP\Image; -use OCP\IL10N; -use OCP\Files\IRootFolder; -use OCP\Files\File; -use OCP\Files\Folder; use OCA\Cookbook\Db\RecipeDb; +use OCA\Cookbook\Exception\HtmlParsingException; +use OCA\Cookbook\Exception\ImportException; use OCA\Cookbook\Exception\NoRecipeNameGivenException; -use OCP\PreConditionNotMetException; -use Psr\Log\LoggerInterface; -use OCA\Cookbook\Exception\UserFolderNotWritableException; use OCA\Cookbook\Exception\RecipeExistsException; +use OCA\Cookbook\Exception\UserFolderNotWritableException; +use OCA\Cookbook\Helper\FileSystem\RecipeNameHelper; +use OCA\Cookbook\Helper\Filter\JSONFilter; use OCA\Cookbook\Helper\ImageService\ImageSize; use OCA\Cookbook\Helper\UserConfigHelper; use OCA\Cookbook\Helper\UserFolderHelper; -use OCA\Cookbook\Exception\HtmlParsingException; -use OCA\Cookbook\Exception\ImportException; -use OCA\Cookbook\Helper\FileSystem\RecipeNameHelper; -use OCA\Cookbook\Helper\Filter\JSONFilter; +use OCP\Files\File; +use OCP\Files\Folder; +use OCP\Files\IRootFolder; +use OCP\Files\NotFoundException; +use OCP\IL10N; +use OCP\Image; +use OCP\PreConditionNotMetException; +use Psr\Log\LoggerInterface; /** * Main service class for the cookbook app. diff --git a/tests/Integration/AbstractDatabaseTestCase.php b/tests/Integration/AbstractDatabaseTestCase.php index edc081ef9..a7c240ddb 100644 --- a/tests/Integration/AbstractDatabaseTestCase.php +++ b/tests/Integration/AbstractDatabaseTestCase.php @@ -2,8 +2,8 @@ namespace OCA\Cookbook\Tests\Integration; -use ChristophWurst\Nextcloud\Testing\TestCase; use ChristophWurst\Nextcloud\Testing\DatabaseTransaction; +use ChristophWurst\Nextcloud\Testing\TestCase; use Exception; use OCA\Cookbook\AppInfo\Application; use Psr\Container\ContainerInterface; diff --git a/tests/Integration/Helper/Filter/JSON/FixIngredientsFilterTest.php b/tests/Integration/Helper/Filter/JSON/FixIngredientsFilterTest.php index c8567a125..d94fa5eb7 100644 --- a/tests/Integration/Helper/Filter/JSON/FixIngredientsFilterTest.php +++ b/tests/Integration/Helper/Filter/JSON/FixIngredientsFilterTest.php @@ -2,13 +2,13 @@ namespace OCA\Cookbook\tests\Integration\Helper\Filter\JSON; -use OCP\IL10N; -use Psr\Log\LoggerInterface; -use PHPUnit\Framework\TestCase; -use PHPUnit\Framework\MockObject\Stub; -use OCA\Cookbook\Helper\TextCleanupHelper; use OCA\Cookbook\Exception\InvalidRecipeException; use OCA\Cookbook\Helper\Filter\JSON\FixIngredientsFilter; +use OCA\Cookbook\Helper\TextCleanupHelper; +use OCP\IL10N; +use PHPUnit\Framework\MockObject\Stub; +use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class FixIngredientsFilterTest extends TestCase { /** @var FixIngredientsFilter */ diff --git a/tests/Integration/Helper/Filter/JSON/FixInstructionsFilterTest.php b/tests/Integration/Helper/Filter/JSON/FixInstructionsFilterTest.php index aee538130..1bd8b3332 100644 --- a/tests/Integration/Helper/Filter/JSON/FixInstructionsFilterTest.php +++ b/tests/Integration/Helper/Filter/JSON/FixInstructionsFilterTest.php @@ -2,13 +2,13 @@ namespace OCA\Cookbook\tests\Integration\Helper\Filter\JSON; -use OCP\IL10N; -use Psr\Log\LoggerInterface; -use PHPUnit\Framework\TestCase; +use OCA\Cookbook\Helper\Filter\JSON\FixInstructionsFilter; +use OCA\Cookbook\Helper\TextCleanupHelper; use OCA\Cookbook\Service\JsonService; +use OCP\IL10N; use PHPUnit\Framework\MockObject\Stub; -use OCA\Cookbook\Helper\TextCleanupHelper; -use OCA\Cookbook\Helper\Filter\JSON\FixInstructionsFilter; +use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; /** * @covers OCA\Cookbook\Helper\Filter\JSON\FixInstructionsFilter diff --git a/tests/Integration/Helper/Filter/JSON/FixToolsFilterTest.php b/tests/Integration/Helper/Filter/JSON/FixToolsFilterTest.php index 6b276744a..3e4148240 100644 --- a/tests/Integration/Helper/Filter/JSON/FixToolsFilterTest.php +++ b/tests/Integration/Helper/Filter/JSON/FixToolsFilterTest.php @@ -2,12 +2,12 @@ namespace OCA\Cookbook\tests\Integration\Helper\Filter\JSON; +use OCA\Cookbook\Helper\Filter\JSON\FixToolsFilter; +use OCA\Cookbook\Helper\TextCleanupHelper; use OCP\IL10N; -use Psr\Log\LoggerInterface; -use PHPUnit\Framework\TestCase; use PHPUnit\Framework\MockObject\Stub; -use OCA\Cookbook\Helper\TextCleanupHelper; -use OCA\Cookbook\Helper\Filter\JSON\FixToolsFilter; +use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class FixToolsFilterTest extends TestCase { /** @var FixToolsFilter */ diff --git a/tests/Migration/Setup/Migrations/AbstractMigrationTestCase.php b/tests/Migration/Setup/Migrations/AbstractMigrationTestCase.php index b8ccc3d4b..5852ad841 100644 --- a/tests/Migration/Setup/Migrations/AbstractMigrationTestCase.php +++ b/tests/Migration/Setup/Migrations/AbstractMigrationTestCase.php @@ -3,14 +3,14 @@ namespace OCA\Cookbook\tests\Migration\Setup\Migrations; use Doctrine\DBAL\Schema\Table; -use OCP\IDBConnection; -use OCP\Util; use OC\DB\Connection; +use OC\DB\MigrationService; use OC\DB\SchemaWrapper; -use PHPUnit\Framework\TestCase; use OCP\AppFramework\App; -use OC\DB\MigrationService; use OCP\AppFramework\IAppContainer; +use OCP\IDBConnection; +use OCP\Util; +use PHPUnit\Framework\TestCase; /** * @runTestsInSeparateProcesses diff --git a/tests/Unit/Controller/Implementation/CategoryImplementationTest.php b/tests/Unit/Controller/Implementation/CategoryImplementationTest.php index 75ed10667..e93997b12 100644 --- a/tests/Unit/Controller/Implementation/CategoryImplementationTest.php +++ b/tests/Unit/Controller/Implementation/CategoryImplementationTest.php @@ -4,15 +4,15 @@ use Exception; use OCA\Cookbook\Controller\Implementation\CategoryImplementation; -use OCP\IURLGenerator; -use ReflectionProperty; -use PHPUnit\Framework\TestCase; +use OCA\Cookbook\Helper\RestParameterParser; +use OCA\Cookbook\Helper\UserFolderHelper; +use OCA\Cookbook\Service\DbCacheService; use OCA\Cookbook\Service\RecipeService; use OCP\AppFramework\Http\DataResponse; -use OCA\Cookbook\Service\DbCacheService; -use OCA\Cookbook\Helper\RestParameterParser; +use OCP\IURLGenerator; use PHPUnit\Framework\MockObject\MockObject; -use OCA\Cookbook\Helper\UserFolderHelper; +use PHPUnit\Framework\TestCase; +use ReflectionProperty; /** * @covers \OCA\Cookbook\Controller\Implementation\CategoryImplementation diff --git a/tests/Unit/Controller/Implementation/ConfigImplementationTest.php b/tests/Unit/Controller/Implementation/ConfigImplementationTest.php index 212dd6243..88fd73211 100644 --- a/tests/Unit/Controller/Implementation/ConfigImplementationTest.php +++ b/tests/Unit/Controller/Implementation/ConfigImplementationTest.php @@ -2,16 +2,16 @@ namespace OCA\Cookbook\tests\Unit\Controller\Implementation; -use ReflectionProperty; -use PHPUnit\Framework\TestCase; -use OCP\AppFramework\Http\Response; +use OCA\Cookbook\Controller\Implementation\ConfigImplementation; +use OCA\Cookbook\Helper\RestParameterParser; +use OCA\Cookbook\Helper\UserFolderHelper; +use OCA\Cookbook\Service\DbCacheService; use OCA\Cookbook\Service\RecipeService; use OCP\AppFramework\Http\DataResponse; -use OCA\Cookbook\Service\DbCacheService; -use OCA\Cookbook\Helper\UserFolderHelper; -use OCA\Cookbook\Helper\RestParameterParser; +use OCP\AppFramework\Http\Response; use PHPUnit\Framework\MockObject\MockObject; -use OCA\Cookbook\Controller\Implementation\ConfigImplementation; +use PHPUnit\Framework\TestCase; +use ReflectionProperty; /** * @covers OCA\Cookbook\Controller\Implementation\ConfigImplementation diff --git a/tests/Unit/Controller/Implementation/KeywordImplementationTest.php b/tests/Unit/Controller/Implementation/KeywordImplementationTest.php index 8e8f48c41..fe810a4fc 100644 --- a/tests/Unit/Controller/Implementation/KeywordImplementationTest.php +++ b/tests/Unit/Controller/Implementation/KeywordImplementationTest.php @@ -3,10 +3,10 @@ namespace OCA\Cookbook\tests\Unit\Controller\Implementation; use OCA\Cookbook\Controller\Implementation\KeywordImplementation; -use PHPUnit\Framework\TestCase; -use OCA\Cookbook\Service\RecipeService; use OCA\Cookbook\Service\DbCacheService; +use OCA\Cookbook\Service\RecipeService; use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\TestCase; /** * @covers \OCA\Cookbook\Controller\Implementation\KeywordImplementation diff --git a/tests/Unit/Controller/Implementation/RecipeImplementationTest.php b/tests/Unit/Controller/Implementation/RecipeImplementationTest.php index 0054f0d35..a8d73d92f 100644 --- a/tests/Unit/Controller/Implementation/RecipeImplementationTest.php +++ b/tests/Unit/Controller/Implementation/RecipeImplementationTest.php @@ -3,24 +3,24 @@ namespace OCA\Cookbook\tests\Unit\Controller\Implementation; use Exception; -use OCP\IL10N; -use OCP\IRequest; -use OCP\Files\File; -use OCP\IURLGenerator; +use OCA\Cookbook\Controller\Implementation\RecipeImplementation; +use OCA\Cookbook\Exception\NoRecipeNameGivenException; +use OCA\Cookbook\Exception\RecipeExistsException; +use OCA\Cookbook\Helper\AcceptHeaderParsingHelper; +use OCA\Cookbook\Helper\Filter\RecipeJSONOutputFilter; +use OCA\Cookbook\Helper\RestParameterParser; +use OCA\Cookbook\Service\DbCacheService; +use OCA\Cookbook\Service\RecipeService; use OCP\AppFramework\Http; -use PHPUnit\Framework\TestCase; use OCP\AppFramework\Http\IOutput; -use PHPUnit\Framework\MockObject\Stub; -use OCA\Cookbook\Service\RecipeService; use OCP\AppFramework\Http\JSONResponse; -use OCA\Cookbook\Service\DbCacheService; -use OCA\Cookbook\Helper\RestParameterParser; +use OCP\Files\File; +use OCP\IL10N; +use OCP\IRequest; +use OCP\IURLGenerator; use PHPUnit\Framework\MockObject\MockObject; -use OCA\Cookbook\Exception\RecipeExistsException; -use OCA\Cookbook\Helper\AcceptHeaderParsingHelper; -use OCA\Cookbook\Exception\NoRecipeNameGivenException; -use OCA\Cookbook\Helper\Filter\RecipeJSONOutputFilter; -use OCA\Cookbook\Controller\Implementation\RecipeImplementation; +use PHPUnit\Framework\MockObject\Stub; +use PHPUnit\Framework\TestCase; /** * @covers \OCA\Cookbook\Controller\Implementation\RecipeImplementation diff --git a/tests/Unit/Controller/MainControllerTest.php b/tests/Unit/Controller/MainControllerTest.php index f7f352aea..90704a25e 100644 --- a/tests/Unit/Controller/MainControllerTest.php +++ b/tests/Unit/Controller/MainControllerTest.php @@ -2,14 +2,14 @@ namespace OCA\Cookbook\tests\Unit\Controller; -use OCP\IRequest; -use PHPUnit\Framework\TestCase; -use OCA\Cookbook\Service\DbCacheService; use OCA\Cookbook\Controller\MainController; -use PHPUnit\Framework\MockObject\MockObject; use OCA\Cookbook\Exception\UserFolderNotWritableException; use OCA\Cookbook\Helper\UserFolderHelper; +use OCA\Cookbook\Service\DbCacheService; use OCP\Files\Folder; +use OCP\IRequest; +use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\TestCase; /** * @covers \OCA\Cookbook\Controller\MainController diff --git a/tests/Unit/Controller/RecipeApiControllerTest.php b/tests/Unit/Controller/RecipeApiControllerTest.php index 74b97ca74..1a6002582 100644 --- a/tests/Unit/Controller/RecipeApiControllerTest.php +++ b/tests/Unit/Controller/RecipeApiControllerTest.php @@ -6,8 +6,8 @@ namespace OCA\Cookbook\tests\Unit\Controller; -use OCA\Cookbook\Controller\RecipeApiController; use OCA\Cookbook\Controller\Implementation\RecipeImplementation; +use OCA\Cookbook\Controller\RecipeApiController; /** * @covers \OCA\Cookbook\Controller\RecipeApiController diff --git a/tests/Unit/Controller/UtilApiControllerTest.php b/tests/Unit/Controller/UtilApiControllerTest.php index 4b8f0395d..815cb58c7 100644 --- a/tests/Unit/Controller/UtilApiControllerTest.php +++ b/tests/Unit/Controller/UtilApiControllerTest.php @@ -2,9 +2,9 @@ namespace OCA\Cookbook\tests\Unit\Controller; +use OCA\Cookbook\Controller\UtilApiController; use OCP\IRequest; use PHPUnit\Framework\TestCase; -use OCA\Cookbook\Controller\UtilApiController; /** * @covers \OCA\Cookbook\Controller\UtilApiController diff --git a/tests/Unit/Helper/Filter/JSON/CleanCategoryFilterTest.php b/tests/Unit/Helper/Filter/JSON/CleanCategoryFilterTest.php index 70a09faf5..c379b0774 100644 --- a/tests/Unit/Helper/Filter/JSON/CleanCategoryFilterTest.php +++ b/tests/Unit/Helper/Filter/JSON/CleanCategoryFilterTest.php @@ -2,11 +2,11 @@ namespace OCA\Cookbook\tests\Unit\Helper\Filter\JSON; -use PHPUnit\Framework\TestCase; -use PHPUnit\Framework\MockObject\Stub; use OCA\Cookbook\Helper\Filter\JSON\CleanCategoryFilter; use OCA\Cookbook\Helper\TextCleanupHelper; use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\MockObject\Stub; +use PHPUnit\Framework\TestCase; class CleanCategoryFilterTest extends TestCase { /** @var CleanCategoryFilter */ diff --git a/tests/Unit/Helper/Filter/JSON/ExtractImageUrlFilterTest.php b/tests/Unit/Helper/Filter/JSON/ExtractImageUrlFilterTest.php index 5a4fcf849..90619cc99 100644 --- a/tests/Unit/Helper/Filter/JSON/ExtractImageUrlFilterTest.php +++ b/tests/Unit/Helper/Filter/JSON/ExtractImageUrlFilterTest.php @@ -5,9 +5,9 @@ use OCA\Cookbook\Helper\Filter\JSON\ExtractImageUrlFilter; use OCA\Cookbook\Helper\Filter\JSON\SchemaConformityFilter; use OCP\IL10N; -use Psr\Log\LoggerInterface; use PHPUnit\Framework\MockObject\Stub; use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class ExtractImageUrlFilterTest extends TestCase { /** @var SchemaConformityFilter */ diff --git a/tests/Unit/Helper/Filter/JSON/FixDescriptionFilterTest.php b/tests/Unit/Helper/Filter/JSON/FixDescriptionFilterTest.php index dcc9fa05d..bff9eea33 100644 --- a/tests/Unit/Helper/Filter/JSON/FixDescriptionFilterTest.php +++ b/tests/Unit/Helper/Filter/JSON/FixDescriptionFilterTest.php @@ -5,10 +5,10 @@ use OCA\Cookbook\Helper\Filter\JSON\FixDescriptionFilter; use OCA\Cookbook\Helper\TextCleanupHelper; use OCP\IL10N; -use Psr\Log\LoggerInterface; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\Stub; use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class FixDescriptionFilterTest extends TestCase { /** @var FixDescriptionFilter */ diff --git a/tests/Unit/Helper/Filter/JSON/FixDurationsFilterTest.php b/tests/Unit/Helper/Filter/JSON/FixDurationsFilterTest.php index d362c13f8..fca3f6f60 100644 --- a/tests/Unit/Helper/Filter/JSON/FixDurationsFilterTest.php +++ b/tests/Unit/Helper/Filter/JSON/FixDurationsFilterTest.php @@ -3,13 +3,13 @@ namespace OCA\Cookbook\tests\Unit\Helper\Filter\JSON; use OCA\Cookbook\Exception\InvalidDurationException; -use OCP\IL10N; -use Psr\Log\LoggerInterface; -use PHPUnit\Framework\TestCase; -use PHPUnit\Framework\MockObject\Stub; -use PHPUnit\Framework\MockObject\MockObject; use OCA\Cookbook\Helper\Filter\JSON\FixDurationsFilter; use OCA\Cookbook\Helper\ISO8601DurationHelper; +use OCP\IL10N; +use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\MockObject\Stub; +use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class FixDurationsFilterTest extends TestCase { /** @var FixDurationsFilter */ diff --git a/tests/Unit/Helper/Filter/JSON/FixIngredientsFilterTest.php b/tests/Unit/Helper/Filter/JSON/FixIngredientsFilterTest.php index c093943eb..9b51b0bef 100644 --- a/tests/Unit/Helper/Filter/JSON/FixIngredientsFilterTest.php +++ b/tests/Unit/Helper/Filter/JSON/FixIngredientsFilterTest.php @@ -2,13 +2,13 @@ namespace OCA\Cookbook\tests\Unit\Helper\Filter\JSON; -use OCP\IL10N; -use Psr\Log\LoggerInterface; -use PHPUnit\Framework\TestCase; -use PHPUnit\Framework\MockObject\Stub; -use OCA\Cookbook\Helper\TextCleanupHelper; use OCA\Cookbook\Exception\InvalidRecipeException; use OCA\Cookbook\Helper\Filter\JSON\FixIngredientsFilter; +use OCA\Cookbook\Helper\TextCleanupHelper; +use OCP\IL10N; +use PHPUnit\Framework\MockObject\Stub; +use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class FixIngredientsFilterTest extends TestCase { /** @var FixIngredientsFilter */ diff --git a/tests/Unit/Helper/Filter/JSON/FixInstructionsFilterTest.php b/tests/Unit/Helper/Filter/JSON/FixInstructionsFilterTest.php index a68678d3f..71ca13622 100644 --- a/tests/Unit/Helper/Filter/JSON/FixInstructionsFilterTest.php +++ b/tests/Unit/Helper/Filter/JSON/FixInstructionsFilterTest.php @@ -2,14 +2,14 @@ namespace OCA\Cookbook\tests\Unit\Helper\Filter\JSON; -use OCP\IL10N; -use Psr\Log\LoggerInterface; -use PHPUnit\Framework\TestCase; -use OCA\Cookbook\Service\JsonService; -use PHPUnit\Framework\MockObject\Stub; -use OCA\Cookbook\Helper\TextCleanupHelper; use OCA\Cookbook\Exception\InvalidRecipeException; use OCA\Cookbook\Helper\Filter\JSON\FixInstructionsFilter; +use OCA\Cookbook\Helper\TextCleanupHelper; +use OCA\Cookbook\Service\JsonService; +use OCP\IL10N; +use PHPUnit\Framework\MockObject\Stub; +use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; /** * @covers OCA\Cookbook\Helper\Filter\JSON\FixInstructionsFilter diff --git a/tests/Unit/Helper/Filter/JSON/FixKeywordsFilterTest.php b/tests/Unit/Helper/Filter/JSON/FixKeywordsFilterTest.php index a88e19cef..b971a93de 100644 --- a/tests/Unit/Helper/Filter/JSON/FixKeywordsFilterTest.php +++ b/tests/Unit/Helper/Filter/JSON/FixKeywordsFilterTest.php @@ -2,13 +2,13 @@ namespace OCA\Cookbook\tests\Unit\Helper\Filter\JSON; -use OCP\IL10N; -use Psr\Log\LoggerInterface; -use PHPUnit\Framework\TestCase; -use PHPUnit\Framework\MockObject\Stub; +use OCA\Cookbook\Helper\Filter\JSON\FixKeywordsFilter; use OCA\Cookbook\Helper\TextCleanupHelper; +use OCP\IL10N; use PHPUnit\Framework\MockObject\MockObject; -use OCA\Cookbook\Helper\Filter\JSON\FixKeywordsFilter; +use PHPUnit\Framework\MockObject\Stub; +use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class FixKeywordsFilterTest extends TestCase { /** @var FixKeywordsFilter */ diff --git a/tests/Unit/Helper/Filter/JSON/FixNutritionFilterTest.php b/tests/Unit/Helper/Filter/JSON/FixNutritionFilterTest.php index cff9ff42d..ad24ba044 100644 --- a/tests/Unit/Helper/Filter/JSON/FixNutritionFilterTest.php +++ b/tests/Unit/Helper/Filter/JSON/FixNutritionFilterTest.php @@ -2,11 +2,11 @@ namespace OCA\Cookbook\tests\Unit\Helper\Filter\JSON; +use OCA\Cookbook\Helper\Filter\JSON\FixNutritionFilter; use OCP\IL10N; -use Psr\Log\LoggerInterface; -use PHPUnit\Framework\TestCase; use PHPUnit\Framework\MockObject\Stub; -use OCA\Cookbook\Helper\Filter\JSON\FixNutritionFilter; +use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class FixNutritionFilterTest extends TestCase { /** @var FixNutritionFilter */ diff --git a/tests/Unit/Helper/Filter/JSON/FixRecipeYieldFilterTest.php b/tests/Unit/Helper/Filter/JSON/FixRecipeYieldFilterTest.php index 178266f2e..665c17b06 100644 --- a/tests/Unit/Helper/Filter/JSON/FixRecipeYieldFilterTest.php +++ b/tests/Unit/Helper/Filter/JSON/FixRecipeYieldFilterTest.php @@ -4,9 +4,9 @@ use OCA\Cookbook\Helper\Filter\JSON\FixRecipeYieldFilter; use OCP\IL10N; -use Psr\Log\LoggerInterface; use PHPUnit\Framework\MockObject\Stub; use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class FixRecipeYieldFilterTest extends TestCase { /** @var FixRecipeYieldFilter */ diff --git a/tests/Unit/Helper/Filter/JSON/FixToolsFilterTest.php b/tests/Unit/Helper/Filter/JSON/FixToolsFilterTest.php index d146a20df..392ee5f9e 100644 --- a/tests/Unit/Helper/Filter/JSON/FixToolsFilterTest.php +++ b/tests/Unit/Helper/Filter/JSON/FixToolsFilterTest.php @@ -3,12 +3,12 @@ namespace OCA\Cookbook\tests\Unit\Helper\Filter\JSON; use OCA\Cookbook\Exception\InvalidRecipeException; +use OCA\Cookbook\Helper\Filter\JSON\FixToolsFilter; +use OCA\Cookbook\Helper\TextCleanupHelper; use OCP\IL10N; -use Psr\Log\LoggerInterface; -use PHPUnit\Framework\TestCase; use PHPUnit\Framework\MockObject\Stub; -use OCA\Cookbook\Helper\TextCleanupHelper; -use OCA\Cookbook\Helper\Filter\JSON\FixToolsFilter; +use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class FixToolsFilterTest extends TestCase { /** @var FixToolsFilter */ diff --git a/tests/Unit/Helper/Filter/JSON/FixUrlFilterTest.php b/tests/Unit/Helper/Filter/JSON/FixUrlFilterTest.php index 91487d2a4..12299ab13 100644 --- a/tests/Unit/Helper/Filter/JSON/FixUrlFilterTest.php +++ b/tests/Unit/Helper/Filter/JSON/FixUrlFilterTest.php @@ -5,10 +5,10 @@ use OCA\Cookbook\Helper\Filter\JSON\FixUrlFilter; use OCA\Cookbook\Helper\TextCleanupHelper; use OCP\IL10N; -use Psr\Log\LoggerInterface; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\Stub; use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class FixUrlFilterTest extends TestCase { /** @var FixUrlFilter */ diff --git a/tests/Unit/Helper/Filter/NormalizeRecipeFileFilterTest.php b/tests/Unit/Helper/Filter/NormalizeRecipeFileFilterTest.php index d7143434d..cb60fcc54 100644 --- a/tests/Unit/Helper/Filter/NormalizeRecipeFileFilterTest.php +++ b/tests/Unit/Helper/Filter/NormalizeRecipeFileFilterTest.php @@ -2,11 +2,11 @@ namespace OCA\Cookbook\tests\Unit\Helper\Filter; -use OCP\Files\File; -use PHPUnit\Framework\TestCase; -use PHPUnit\Framework\MockObject\MockObject; use OCA\Cookbook\Helper\Filter\DB\RecipeDatesFilter; use OCA\Cookbook\Helper\Filter\NormalizeRecipeFileFilter; +use OCP\Files\File; +use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\TestCase; /** * @covers OCA\Cookbook\Helper\Filter\NormalizeRecipeFileFilter diff --git a/tests/Unit/Helper/Filter/Output/EnsureNutritionPresentFilterTest.php b/tests/Unit/Helper/Filter/Output/EnsureNutritionPresentFilterTest.php index d452d22f3..0da9d2d1f 100644 --- a/tests/Unit/Helper/Filter/Output/EnsureNutritionPresentFilterTest.php +++ b/tests/Unit/Helper/Filter/Output/EnsureNutritionPresentFilterTest.php @@ -2,11 +2,11 @@ namespace OCA\Cookbook\tests\Unit\Helper\Filter\Output; +use OCA\Cookbook\Helper\Filter\Output\EnsureNutritionPresentFilter; use OCP\IL10N; -use Psr\Log\LoggerInterface; -use PHPUnit\Framework\TestCase; use PHPUnit\Framework\MockObject\Stub; -use OCA\Cookbook\Helper\Filter\Output\EnsureNutritionPresentFilter; +use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; class EnsureNutritionPresentFilterTest extends TestCase { /** @var EnsureNutritionPresentFilter */ diff --git a/tests/Unit/Helper/Filter/RecipeJSONOutputFilterTest.php b/tests/Unit/Helper/Filter/RecipeJSONOutputFilterTest.php index 18531a5fd..43bd6c829 100644 --- a/tests/Unit/Helper/Filter/RecipeJSONOutputFilterTest.php +++ b/tests/Unit/Helper/Filter/RecipeJSONOutputFilterTest.php @@ -2,9 +2,9 @@ namespace OCA\Cookbook\tests\Unit\Helper\Filter; -use PHPUnit\Framework\TestCase; -use OCA\Cookbook\Helper\Filter\RecipeJSONOutputFilter; use OCA\Cookbook\Helper\Filter\Output\EnsureNutritionPresentFilter; +use OCA\Cookbook\Helper\Filter\RecipeJSONOutputFilter; +use PHPUnit\Framework\TestCase; class RecipeJSONOutputFilterTest extends TestCase { /** @var RecipeJSONOutputFilter */ diff --git a/tests/Unit/Helper/HTMLParser/HttpJsonLdParserTest.php b/tests/Unit/Helper/HTMLParser/HttpJsonLdParserTest.php index 3bd7a0c3f..e3657a4f0 100644 --- a/tests/Unit/Helper/HTMLParser/HttpJsonLdParserTest.php +++ b/tests/Unit/Helper/HTMLParser/HttpJsonLdParserTest.php @@ -2,11 +2,11 @@ namespace OCA\Cookbook\tests\Unit\Helper\HTMLParser; -use PHPUnit\Framework\TestCase; +use OCA\Cookbook\Exception\HtmlParsingException; +use OCA\Cookbook\Helper\HTMLParser\HttpJsonLdParser; use OCA\Cookbook\Service\JsonService; use OCP\IL10N; -use OCA\Cookbook\Helper\HTMLParser\HttpJsonLdParser; -use OCA\Cookbook\Exception\HtmlParsingException; +use PHPUnit\Framework\TestCase; /** * @coversDefaultClass \OCA\Cookbook\Helper\HTMLParser\HttpJsonLdParser diff --git a/tests/Unit/Helper/HTMLParser/HttpMicrodataParserTest.php b/tests/Unit/Helper/HTMLParser/HttpMicrodataParserTest.php index f96dfc295..958c930c2 100644 --- a/tests/Unit/Helper/HTMLParser/HttpMicrodataParserTest.php +++ b/tests/Unit/Helper/HTMLParser/HttpMicrodataParserTest.php @@ -2,10 +2,10 @@ namespace OCA\Cookbook\tests\Unit\Helper\HTMLParser; -use PHPUnit\Framework\TestCase; use OCA\Cookbook\Exception\HtmlParsingException; use OCA\Cookbook\Helper\HTMLParser\HttpMicrodataParser; use OCP\IL10N; +use PHPUnit\Framework\TestCase; /** * @coversDefaultClass \OCA\Cookbook\Helper\HTMLParser\HttpMicrodataParser diff --git a/tests/Unit/Helper/HtmlToDomParserTest.php b/tests/Unit/Helper/HtmlToDomParserTest.php index 16d0ed30f..b21623d99 100644 --- a/tests/Unit/Helper/HtmlToDomParserTest.php +++ b/tests/Unit/Helper/HtmlToDomParserTest.php @@ -18,16 +18,16 @@ function libxml_clear_errors() { namespace OCA\Cookbook\tests\Unit\Helper; -use OCP\IL10N; use DOMDocument; use Exception; use LibXMLError; use OCA\Cookbook\Exception\ImportException; -use Psr\Log\LoggerInterface; -use ReflectionProperty; -use PHPUnit\Framework\TestCase; use OCA\Cookbook\Helper\HtmlToDomParser; +use OCP\IL10N; use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; +use ReflectionProperty; class XMLMocking { public function useInternalErrors(bool $prev): bool { diff --git a/tests/Unit/Helper/ImageService/ImageFileHelperTest.php b/tests/Unit/Helper/ImageService/ImageFileHelperTest.php index ecdae658a..aeadbb73b 100644 --- a/tests/Unit/Helper/ImageService/ImageFileHelperTest.php +++ b/tests/Unit/Helper/ImageService/ImageFileHelperTest.php @@ -3,14 +3,14 @@ namespace OCA\Cookbook\tests\unit\Helper\ImageService; use OCA\Cookbook\Exception\RecipeImageExistsException; -use OCP\IL10N; +use OCA\Cookbook\Helper\ImageService\ImageFileHelper; use OCP\Files\File; use OCP\Files\Folder; -use PHPUnit\Framework\TestCase; -use PHPUnit\Framework\MockObject\Stub; -use PHPUnit\Framework\MockObject\MockObject; -use OCA\Cookbook\Helper\ImageService\ImageFileHelper; use OCP\Files\NotFoundException; +use OCP\IL10N; +use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\MockObject\Stub; +use PHPUnit\Framework\TestCase; /** * @covers OCA\Cookbook\Helper\ImageService\ImageFileHelper diff --git a/tests/Unit/Helper/ImageService/ImageGenerationHelperTest.php b/tests/Unit/Helper/ImageService/ImageGenerationHelperTest.php index 20e87a706..01190ce07 100644 --- a/tests/Unit/Helper/ImageService/ImageGenerationHelperTest.php +++ b/tests/Unit/Helper/ImageService/ImageGenerationHelperTest.php @@ -3,7 +3,6 @@ namespace OCA\Cookbook\tests\Unit\Helper\ImageService; use OCA\Cookbook\Helper\ImageService\ImageGenerationHelper; -use PHPUnit\Framework\TestCase; use OCA\Cookbook\Helper\ImageService\ImageSize; use OCA\Cookbook\Service\ThumbnailService; use OCP\Files\File; @@ -11,6 +10,7 @@ use OCP\Files\NotFoundException; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\Stub; +use PHPUnit\Framework\TestCase; /** * @covers OCA\Cookbook\Helper\ImageService\ImageGenerationHelper diff --git a/tests/Unit/Helper/ImageService/ThumbnailFileHelperTest.php b/tests/Unit/Helper/ImageService/ThumbnailFileHelperTest.php index 92dc1c7ca..ebd3fa37a 100644 --- a/tests/Unit/Helper/ImageService/ThumbnailFileHelperTest.php +++ b/tests/Unit/Helper/ImageService/ThumbnailFileHelperTest.php @@ -3,17 +3,17 @@ namespace OCA\Cookbook\tests\unit\Helper\ImageService; use OCA\Cookbook\Exception\NoRecipeImageFoundException; -use OCP\IL10N; -use OCP\Files\File; -use OCP\Files\Folder; -use PHPUnit\Framework\TestCase; -use PHPUnit\Framework\MockObject\Stub; -use PHPUnit\Framework\MockObject\MockObject; -use OCA\Cookbook\Helper\ImageService\ImageSize; use OCA\Cookbook\Helper\ImageService\ImageFileHelper; -use OCA\Cookbook\Helper\ImageService\ThumbnailFileHelper; use OCA\Cookbook\Helper\ImageService\ImageGenerationHelper; +use OCA\Cookbook\Helper\ImageService\ImageSize; +use OCA\Cookbook\Helper\ImageService\ThumbnailFileHelper; +use OCP\Files\File; +use OCP\Files\Folder; use OCP\Files\NotFoundException; +use OCP\IL10N; +use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\MockObject\Stub; +use PHPUnit\Framework\TestCase; /** * @covers OCA\Cookbook\Helper\ImageService\ThumbnailFileHelper diff --git a/tests/Unit/Service/HtmlDownloadServiceTest.php b/tests/Unit/Service/HtmlDownloadServiceTest.php index 2c165d4a9..2b85a6e95 100644 --- a/tests/Unit/Service/HtmlDownloadServiceTest.php +++ b/tests/Unit/Service/HtmlDownloadServiceTest.php @@ -4,18 +4,18 @@ use DOMDocument; use OCA\Cookbook\Exception\CouldNotGuessEncodingException; -use OCP\IL10N; -use PHPUnit\Framework\TestCase; -use OCA\Cookbook\Helper\HtmlToDomParser; use OCA\Cookbook\Exception\ImportException; use OCA\Cookbook\Exception\NoDownloadWasCarriedOutException; use OCA\Cookbook\Helper\DownloadEncodingHelper; use OCA\Cookbook\Helper\DownloadHelper; use OCA\Cookbook\Helper\EncodingGuessingHelper; use OCA\Cookbook\Helper\HTMLFilter\HtmlEncodingFilter; -use PHPUnit\Framework\MockObject\MockObject; -use OCA\Cookbook\Service\HtmlDownloadService; use OCA\Cookbook\Helper\HTMLFilter\HtmlEntityDecodeFilter; +use OCA\Cookbook\Helper\HtmlToDomParser; +use OCA\Cookbook\Service\HtmlDownloadService; +use OCP\IL10N; +use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; /** diff --git a/tests/Unit/Service/ImageServiceTest.php b/tests/Unit/Service/ImageServiceTest.php index c5d78c8e5..ce427b01a 100644 --- a/tests/Unit/Service/ImageServiceTest.php +++ b/tests/Unit/Service/ImageServiceTest.php @@ -5,12 +5,12 @@ use OCA\Cookbook\Helper\ImageService\ImageFileHelper; use OCA\Cookbook\Helper\ImageService\ImageSize; use OCA\Cookbook\Helper\ImageService\ThumbnailFileHelper; +use OCA\Cookbook\Service\ImageService; use OCP\Files\File; use OCP\Files\Folder; -use PHPUnit\Framework\TestCase; -use OCA\Cookbook\Service\ImageService; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\Stub; +use PHPUnit\Framework\TestCase; /** * @covers \OCA\Cookbook\Service\ImageService diff --git a/tests/Unit/Service/JsonServiceTest.php b/tests/Unit/Service/JsonServiceTest.php index 90cd0d8df..16efbf4af 100644 --- a/tests/Unit/Service/JsonServiceTest.php +++ b/tests/Unit/Service/JsonServiceTest.php @@ -2,8 +2,8 @@ namespace OCA\Cookbook\tests\Unit\Service; -use PHPUnit\Framework\TestCase; use OCA\Cookbook\Service\JsonService; +use PHPUnit\Framework\TestCase; class JsonServiceTest extends TestCase { /** diff --git a/tests/Unit/Service/RecipeExtractionServiceTest.php b/tests/Unit/Service/RecipeExtractionServiceTest.php index a29017f52..10f155fc4 100644 --- a/tests/Unit/Service/RecipeExtractionServiceTest.php +++ b/tests/Unit/Service/RecipeExtractionServiceTest.php @@ -2,13 +2,13 @@ namespace OCA\Cookbook\tests\Unit\Service; -use PHPUnit\Framework\TestCase; +use OCA\Cookbook\Exception\HtmlParsingException; use OCA\Cookbook\Helper\HTMLParser\HttpJsonLdParser; use OCA\Cookbook\Helper\HTMLParser\HttpMicrodataParser; -use OCA\Cookbook\Exception\HtmlParsingException; -use OCP\IL10N; use OCA\Cookbook\Service\RecipeExtractionService; +use OCP\IL10N; use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\TestCase; class RecipeExtractionServiceTest extends TestCase { /**