Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build(deps-dev): Bump nextcloud/coding-standard from 1.0.0 to 1.1.0 #1614

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
415 changes: 209 additions & 206 deletions composer.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/Controller/CategoryController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/ConfigApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions lib/Controller/ConfigController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
6 changes: 3 additions & 3 deletions lib/Controller/Implementation/CategoryImplementation.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
8 changes: 4 additions & 4 deletions lib/Controller/Implementation/ConfigImplementation.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/Implementation/KeywordImplementation.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
20 changes: 10 additions & 10 deletions lib/Controller/Implementation/RecipeImplementation.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions lib/Controller/KeywordController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
10 changes: 5 additions & 5 deletions lib/Controller/MainController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions lib/Controller/RecipeApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/RecipeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions lib/Db/RecipeDb.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions lib/Helper/Filter/JSON/FixDescriptionFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lib/Helper/Filter/JSON/FixDurationsFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lib/Helper/Filter/JSON/FixIngredientsFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lib/Helper/Filter/JSON/FixInstructionsFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lib/Helper/Filter/JSON/FixKeywordsFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/Helper/Filter/JSON/FixNutritionFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/Helper/Filter/JSON/FixRecipeYieldFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lib/Helper/Filter/JSON/FixToolsFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/Helper/Filter/JSON/FixUrlFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/Helper/Filter/Output/EnsureNutritionPresentFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/Helper/HTMLParser/HttpJsonLdParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions lib/Helper/HTMLParser/HttpMicrodataParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions lib/Helper/HtmlToDomParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/Helper/ISO8601DurationHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lib/Helper/ImageService/ImageFileHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion lib/Helper/ImageService/ImageGenerationHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading