Merge pull request #1614 from nextcloud/dependabot/composer/nextcloud…

…/coding-standard-1.1.0
nextcloud · May 16, 2023 · f4ca6f6 · f4ca6f6
2 parents a46d985 + e498d52
commit f4ca6f6
Show file tree

Hide file tree

Showing 77 changed files with 432 additions and 427 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;