Skip to content
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 @@ -17,6 +17,8 @@
[#672](https://github.com/nextcloud/cookbook/pull/672) @christianlupus
- Really only show recipe-reference popup on '#'
[#676](https://github.com/nextcloud/cookbook/pull/676) @seyfeb
- Correct styling of PHP files accoring to php-cs-fixer
[#692](https://github.com/nextcloud/cookbook/pull/692) @christianlupus

## 0.8.4 - 2021-03-08

Expand Down
6 changes: 2 additions & 4 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
// IBootstrap requies NC >= 20
// Remove conditional once we end support for NC 19
if (Util::getVersion()[0] >= 20) {
class Application extends App implements IBootstrap
{
class Application extends App implements IBootstrap {
public const APP_ID = 'cookbook';

public function __construct(array $urlParams = []) {
Expand All @@ -28,8 +27,7 @@ public function boot(IBootContext $context): void {
}
}
} else {
class Application extends App
{
class Application extends App {
public const APP_ID = 'cookbook';

public function __construct(array $urlParams = []) {
Expand Down
3 changes: 1 addition & 2 deletions lib/Controller/ConfigController.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
use OCA\Cookbook\Service\DbCacheService;
use OCA\Cookbook\Helper\RestParameterParser;

class ConfigController extends Controller
{
class ConfigController extends Controller {
/**
* @var RecipeService
*/
Expand Down
3 changes: 1 addition & 2 deletions lib/Controller/MainController.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
use OCA\Cookbook\Helper\RestParameterParser;
use OCA\Cookbook\Exception\UserFolderNotWritableException;

class MainController extends Controller
{
class MainController extends Controller {
protected $appName;

/**
Expand Down
3 changes: 1 addition & 2 deletions lib/Controller/RecipeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
use OCA\Cookbook\Service\DbCacheService;
use OCA\Cookbook\Helper\RestParameterParser;

class RecipeController extends Controller
{
class RecipeController extends Controller {
/**
* @var RecipeService
*/
Expand Down
3 changes: 1 addition & 2 deletions lib/Db/DbTypesPolyfillHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

use OCP\Util;

class DbTypesPolyfillHelper
{
class DbTypesPolyfillHelper {
/**
* @var String
*/
Expand Down
3 changes: 1 addition & 2 deletions lib/Db/RecipeDb.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
use OCP\IDBConnection;
use OCP\AppFramework\Db\DoesNotExistException;

class RecipeDb
{
class RecipeDb {
private const DB_TABLE_RECIPES = 'cookbook_names';
private const DB_TABLE_KEYWORDS = 'cookbook_keywords';
private const DB_TABLE_CATEGORIES = 'cookbook_categories';
Expand Down
3 changes: 1 addition & 2 deletions lib/Exception/InvalidJSONFileException.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

namespace OCA\Cookbook\Exception;

class InvalidJSONFileException extends \Exception
{
class InvalidJSONFileException extends \Exception {
public function __construct($message = null, $code = null, $previous = null) {
parent::__construct($message, $code, $previous);
}
Expand Down
3 changes: 1 addition & 2 deletions lib/Exception/UserFolderNotWritableException.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

namespace OCA\Cookbook\Exception;

class UserFolderNotWritableException extends \Exception
{
class UserFolderNotWritableException extends \Exception {
public function __construct($message = null, $code = null, $previous = null) {
parent::__construct($message, $code, $previous);
}
Expand Down
3 changes: 1 addition & 2 deletions lib/Helper/RestParameterParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
use function GuzzleHttp\json_decode;
use OCP\IL10N;

class RestParameterParser
{
class RestParameterParser {
private const CHARSET = 'charset';
private const CONTENT_TYPE = 'CONTENT_TYPE';
private const REQUEST_METHOD = 'REQUEST_METHOD';
Expand Down
3 changes: 1 addition & 2 deletions lib/Migration/Version000000Date20190312140601.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;

class Version000000Date20190312140601 extends SimpleMigrationStep
{
class Version000000Date20190312140601 extends SimpleMigrationStep {

/**
* @param IOutput $output
Expand Down
3 changes: 1 addition & 2 deletions lib/Migration/Version000000Date20190910100911.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;

class Version000000Date20190910100911 extends SimpleMigrationStep
{
class Version000000Date20190910100911 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
Expand Down
3 changes: 1 addition & 2 deletions lib/Migration/Version000000Date20190910223344.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;

class Version000000Date20190910223344 extends SimpleMigrationStep
{
class Version000000Date20190910223344 extends SimpleMigrationStep {
/**
* @param IOutput $output
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
Expand Down
3 changes: 1 addition & 2 deletions lib/Migration/Version000000Date20200315121603.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
use OCP\Migration\SimpleMigrationStep;
use OCP\Migration\IOutput;

class Version000000Date20200315121603 extends SimpleMigrationStep
{
class Version000000Date20200315121603 extends SimpleMigrationStep {

/**
* @param IOutput $output
Expand Down
6 changes: 2 additions & 4 deletions lib/Search/Provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
// IProvider requies NC >= 20
// Remove conditional once we end support for NC 19
if (Util::getVersion()[0] >= 20) {
class Provider implements IProvider
{
class Provider implements IProvider {

/** @var IL10N */
private $l;
Expand Down Expand Up @@ -90,7 +89,6 @@ function (array $recipe) use ($user) : SearchResultEntry {
}
}
} else {
class Provider
{
class Provider {
}
}
3 changes: 1 addition & 2 deletions lib/Service/DbCacheService.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
use OCP\IConfig;
use OCA\Cookbook\Exception\InvalidJSONFileException;

class DbCacheService
{
class DbCacheService {
private $userId;
// var $root;

Expand Down
3 changes: 1 addition & 2 deletions lib/Service/JsonService.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
* @author Christian Wolf <[email protected]>
*
*/
class JsonService
{
class JsonService {

/**
* Check if an object is a JSON representation of a schema.org object
Expand Down
3 changes: 1 addition & 2 deletions lib/Service/RecipeService.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
*
* @package OCA\Cookbook\Service
*/
class RecipeService
{
class RecipeService {
private $root;
private $user_id;
private $db;
Expand Down
3 changes: 1 addition & 2 deletions tests/Integration/AppTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
* directly from the container, only pass in mocks if needed and run your tests
* against the database
*/
class AppTest extends TestCase
{
class AppTest extends TestCase {
private $container;

public function setUp(): void {
Expand Down
3 changes: 1 addition & 2 deletions tests/Unit/Service/JsonServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
use PHPUnit\Framework\TestCase;
use OCA\Cookbook\Service\JsonService;

class JsonServiceTest extends TestCase
{
class JsonServiceTest extends TestCase {

/**
* @var JsonService
Expand Down
3 changes: 1 addition & 2 deletions tests/Unit/Service/ValidateDurationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
*
* @package OCA\Cookbook\Tests\Unit\Service
*/
class ValidateDurationTest extends TestCase
{
class ValidateDurationTest extends TestCase {
/**
* @var RecipeService
*/
Expand Down