Skip to content

Move to typed properties and IInitialState #4282

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.

Sign up for GitHub

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

Open
tcitworld wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Move to typed properties and IInitialState #4282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83aa281
Move to typed properties and IInitialState
tcitworld Jun 13, 2022
278b562
fixup! Move to typed properties and IInitialState
miaulalala Apr 4, 2024
386c226
fixup! Move to typed properties and IInitialState
miaulalala Apr 4, 2024
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
14 changes: 3 additions & 11 deletions lib/BackgroundJob/CleanUpOutdatedBookingsJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,10 @@
use function method_exists;

class CleanUpOutdatedBookingsJob extends TimedJob {
/** @var LoggerInterface */
private LoggerInterface $logger;

/** @var BookingService */
private $service;

public function __construct(ITimeFactory $time,
BookingService $service,
LoggerInterface $logger) {
public function __construct(protected ITimeFactory $time,
private BookingService $service,
private LoggerInterface $logger) {
parent::__construct($time);
$this->service = $service;
$this->logger = $logger;

$this->setInterval(24 * 60 * 60);
/**
Expand Down
18 changes: 3 additions & 15 deletions lib/Controller/AppointmentConfigController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,11 @@
use function array_values;

class AppointmentConfigController extends Controller {
/** @var AppointmentConfigService */
private $appointmentConfigService;

/** @var string|null */
private $userId;

/** @var LoggerInterface */
private $logger;

public function __construct(IRequest $request,
AppointmentConfigService $appointmentService,
LoggerInterface $logger,
?string $userId) {
private AppointmentConfigService $appointmentConfigService,
private LoggerInterface $logger,
private ?string $userId) {
parent::__construct(Application::APP_ID, $request);
$this->appointmentConfigService = $appointmentService;
$this->userId = $userId;
$this->logger = $logger;
}

/**
Expand Down
27 changes: 5 additions & 22 deletions lib/Controller/AppointmentController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,13 @@
use RuntimeException;

class AppointmentController extends Controller {
/** @var IUserManager */
private $userManager;

/** @var AppointmentConfigService */
private $configService;

/** @var IInitialState */
private $initialState;

/** @var string|null */
private $userId;

public function __construct(IRequest $request,
IUserManager $userManager,
AppointmentConfigService $configService,
IInitialState $initialState,
?string $userId
) {
private IUserManager $userManager,
private AppointmentConfigService $configService,
private IInitialState $initialState,
private ?string $userId
) {
parent::__construct(Application::APP_ID, $request);

$this->userManager = $userManager;
$this->configService = $configService;
$this->initialState = $initialState;
$this->userId = $userId;
}

/**
Expand Down
47 changes: 8 additions & 39 deletions lib/Controller/BookingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,48 +32,17 @@
use Psr\Log\LoggerInterface;

class BookingController extends Controller {
/** @var BookingService */
private $bookingService;

/** @var ITimeFactory */
private $timeFactory;

/** @var AppointmentConfigService */
private $appointmentConfigService;

/** @var IInitialState */
private $initialState;

/** @var IURLGenerator */
private $urlGenerator;

/** @var LoggerInterface */
private $logger;

/** @var IMailer */
private $mailer;
private IConfig $systemConfig;

public function __construct(string $appName,
IRequest $request,
ITimeFactory $timeFactory,
IInitialState $initialState,
BookingService $bookingService,
AppointmentConfigService $appointmentConfigService,
IURLGenerator $urlGenerator,
LoggerInterface $logger,
IMailer $mailer,
IConfig $systemConfig) {
private ITimeFactory $timeFactory,
private IInitialState $initialState,
private BookingService $bookingService,
private AppointmentConfigService $appointmentConfigService,
private IURLGenerator $urlGenerator,
private LoggerInterface $logger,
private IMailer $mailer,
private IConfig $systemConfig) {
parent::__construct($appName, $request);

$this->bookingService = $bookingService;
$this->timeFactory = $timeFactory;
$this->appointmentConfigService = $appointmentConfigService;
$this->initialState = $initialState;
$this->urlGenerator = $urlGenerator;
$this->logger = $logger;
$this->mailer = $mailer;
$this->systemConfig = $systemConfig;
}

/**
Expand Down
37 changes: 10 additions & 27 deletions lib/Controller/ContactController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,21 @@
use OCP\Contacts\IManager;
use OCP\IRequest;
use OCP\IUserManager;
use function is_array;
use function is_string;

/**
* Class ContactController
*
* @package OCA\Calendar\Controller
*/
class ContactController extends Controller {
/** @var IManager */
private $contactsManager;

/** @var IAppManager */
private $appManager;

/** @var IUserManager */
private $userManager;

/**
* ContactController constructor.
*
* @param string $appName
* @param IRequest $request
* @param IManager $contacts
*/
public function __construct(string $appName,
IRequest $request,
IManager $contacts,
IAppManager $appManager,
IUserManager $userManager) {
private IManager $contactsManager,
private IAppManager $appManager,
private IUserManager $userManager) {
parent::__construct($appName, $request);
$this->contactsManager = $contacts;
$this->appManager = $appManager;
$this->userManager = $userManager;
}

/**
Expand Down Expand Up @@ -78,7 +61,7 @@ public function searchLocation(string $search):JSONResponse {
}

$name = $this->getNameFromContact($r);
if (\is_string($r['ADR'])) {
if (is_string($r['ADR'])) {
$r['ADR'] = [$r['ADR']];
}

Expand Down Expand Up @@ -129,7 +112,7 @@ public function searchAttendee(string $search):JSONResponse {
}

$name = $this->getNameFromContact($r);
if (\is_string($r['EMAIL'])) {
if (is_string($r['EMAIL'])) {
$r['EMAIL'] = [$r['EMAIL']];
}

Expand All @@ -139,7 +122,7 @@ public function searchAttendee(string $search):JSONResponse {

$lang = null;
if (isset($r['LANG'])) {
if (\is_array($r['LANG'])) {
if (is_array($r['LANG'])) {
$lang = $r['LANG'][0];
} else {
$lang = $r['LANG'];
Expand All @@ -148,7 +131,7 @@ public function searchAttendee(string $search):JSONResponse {

$timezoneId = null;
if (isset($r['TZ'])) {
if (\is_array($r['TZ'])) {
if (is_array($r['TZ'])) {
$timezoneId = $r['TZ'][0];
} else {
$timezoneId = $r['TZ'];
Expand Down Expand Up @@ -247,7 +230,7 @@ public function searchPhoto(string $search):JSONResponse {
continue;
}

if (\is_string($r['EMAIL'])) {
if (is_string($r['EMAIL'])) {
$r['EMAIL'] = [$r['EMAIL']];
}

Expand Down
58 changes: 9 additions & 49 deletions lib/Controller/EmailController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/
namespace OCA\Calendar\Controller;

use Exception;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse;
Expand All @@ -27,57 +28,16 @@
* @package OCA\Calendar\Controller
*/
class EmailController extends Controller {
/** @var IConfig */
private $config;

/** @var Defaults */
private $defaults;

/** @var IL10N */
private $l10n;

/** @var IMailer */
private $mailer;

/** @var IUserSession */
private $userSession;

/** @var IURLGenerator */
private $urlGenerator;

/** @var IUserManager */
private $userManager;

/**
* EmailController constructor.
*
* @param $appName
* @param IRequest $request
* @param IUserSession $userSession
* @param IConfig $config
* @param IMailer $mailer
* @param IL10N $l10N
* @param Defaults $defaults
* @param IURLGenerator $urlGenerator
* @param IUserManager $userManager
*/
public function __construct(string $appName,
IRequest $request,
IUserSession $userSession,
IConfig $config,
IMailer $mailer,
IL10N $l10N,
Defaults $defaults,
IURLGenerator $urlGenerator,
IUserManager $userManager) {
private IUserSession $userSession,
private IConfig $config,
private IMailer $mailer,
private IL10N $l10n,
private Defaults $defaults,
private IURLGenerator $urlGenerator,
private IUserManager $userManager) {
parent::__construct($appName, $request);
$this->config = $config;
$this->userSession = $userSession;
$this->mailer = $mailer;
$this->l10n = $l10N;
$this->defaults = $defaults;
$this->urlGenerator = $urlGenerator;
$this->userManager = $userManager;
}

/**
Expand Down Expand Up @@ -121,7 +81,7 @@ public function sendEmailPublicLink(string $recipient,

try {
$this->mailer->send($message);
} catch (\Exception $ex) {
} catch (Exception $ex) {
return new JSONResponse([
'message' => $this->l10n->t('Unexpected error sending email. Please contact your administrator.'),
], Http::STATUS_INTERNAL_SERVER_ERROR);
Expand Down
32 changes: 4 additions & 28 deletions lib/Controller/PublicViewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\Template\PublicTemplateResponse;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IInitialStateService;
use OCP\IRequest;
Expand All @@ -23,37 +24,12 @@
* @package OCA\Calendar\Controller
*/
class PublicViewController extends Controller {
/**
* @var IConfig
*/
private $config;

/**
* @var IInitialStateService
*/
private $initialStateService;

/**
* @var IURLGenerator
*/
private $urlGenerator;

/**
* @param string $appName
* @param IRequest $request an instance of the request
* @param IConfig $config
* @param IInitialStateService $initialStateService
* @param IURLGenerator $urlGenerator
*/
public function __construct(string $appName,
IRequest $request,
IConfig $config,
IInitialStateService $initialStateService,
IURLGenerator $urlGenerator) {
private IConfig $config,
private IInitialStateService $initialStateService,
private IURLGenerator $urlGenerator) {
parent::__construct($appName, $request);
$this->config = $config;
$this->initialStateService = $initialStateService;
$this->urlGenerator = $urlGenerator;
}


Expand Down
Loading