Convert Doctrine specific code to camel case

[MAILPOET-1796]
This commit is contained in:
Jan Jakeš
2020-01-09 10:15:17 +01:00
committed by Jan Jakeš
parent 71d623f915
commit fbcaeaadbc
13 changed files with 26 additions and 26 deletions

View File

@ -32,7 +32,7 @@ class CustomFields extends APIEndpoint {
} }
public function getAll() { public function getAll() {
$collection = $this->customFieldsRepository->findBy([], ['created_at' => 'asc']); $collection = $this->customFieldsRepository->findBy([], ['createdAt' => 'asc']);
return $this->successResponse($this->customFieldsResponseBuilder->buildBatch($collection)); return $this->successResponse($this->customFieldsResponseBuilder->buildBatch($collection));
} }

View File

@ -314,7 +314,7 @@ class Populator {
private function createOrUpdateUserFlag($userId, $name, $value) { private function createOrUpdateUserFlag($userId, $name, $value) {
$userFlagsRepository = \MailPoet\DI\ContainerWrapper::getInstance(WP_DEBUG)->get(UserFlagsRepository::class); $userFlagsRepository = \MailPoet\DI\ContainerWrapper::getInstance(WP_DEBUG)->get(UserFlagsRepository::class);
$flag = $userFlagsRepository->findOneBy([ $flag = $userFlagsRepository->findOneBy([
'user_id' => $userId, 'userId' => $userId,
'name' => $name, 'name' => $name,
]); ]);

View File

@ -45,7 +45,7 @@ class Mailer {
} }
public function getProcessingMethod() { public function getProcessingMethod() {
return ($this->mailer->mailer_config['method'] === MailerFactory::METHOD_MAILPOET) ? return ($this->mailer->mailerConfig['method'] === MailerFactory::METHOD_MAILPOET) ?
'bulk' : 'bulk' :
'individual'; 'individual';
} }
@ -58,7 +58,7 @@ class Mailer {
if ($this->getProcessingMethod() === 'individual') { if ($this->getProcessingMethod() === 'individual') {
throw new \LogicException('Trying to send a batch with individual processing method'); throw new \LogicException('Trying to send a batch with individual processing method');
} }
return $this->mailer->mailer_instance->send( return $this->mailer->mailerInstance->send(
$preparedNewsletters, $preparedNewsletters,
$preparedSubscribers, $preparedSubscribers,
$extraParams $extraParams
@ -69,7 +69,7 @@ class Mailer {
if ($this->getProcessingMethod() === 'bulk') { if ($this->getProcessingMethod() === 'bulk') {
throw new \LogicException('Trying to send an individual email with a bulk processing method'); throw new \LogicException('Trying to send an individual email with a bulk processing method');
} }
return $this->mailer->mailer_instance->send( return $this->mailer->mailerInstance->send(
$preparedNewsletter, $preparedNewsletter,
$preparedSubscriber, $preparedSubscriber,
$extraParams $extraParams

View File

@ -40,11 +40,11 @@ class StatsNotificationsRepository extends Repository {
->addSelect('tasks') ->addSelect('tasks')
->addSelect('n') ->addSelect('n')
->addOrderBy('tasks.priority') ->addOrderBy('tasks.priority')
->addOrderBy('tasks.updated_at') ->addOrderBy('tasks.updatedAt')
->where('tasks.deleted_at IS NULL') ->where('tasks.deletedAt IS NULL')
->andWhere('tasks.status = :status') ->andWhere('tasks.status = :status')
->setParameter('status', ScheduledTaskEntity::STATUS_SCHEDULED) ->setParameter('status', ScheduledTaskEntity::STATUS_SCHEDULED)
->andWhere('tasks.scheduled_at < :date') ->andWhere('tasks.scheduledAt < :date')
->setParameter('date', $date) ->setParameter('date', $date)
->andWhere('tasks.type = :workerType') ->andWhere('tasks.type = :workerType')
->setParameter('workerType', Worker::TASK_TYPE); ->setParameter('workerType', Worker::TASK_TYPE);

View File

@ -28,7 +28,7 @@ class NewslettersRepository extends Repository {
->from(NewsletterEntity::class, 'n') ->from(NewsletterEntity::class, 'n')
->where('n.status = :status') ->where('n.status = :status')
->setParameter(':status', NewsletterEntity::STATUS_ACTIVE) ->setParameter(':status', NewsletterEntity::STATUS_ACTIVE)
->andWhere('n.deleted_at is null') ->andWhere('n.deletedAt is null')
->andWhere('n.type IN (:types)') ->andWhere('n.type IN (:types)')
->setParameter('types', $types) ->setParameter('types', $types)
->orderBy('n.subject') ->orderBy('n.subject')

View File

@ -25,7 +25,7 @@ class NewsletterStatisticsRepository extends Repository {
->createQueryBuilder('n') ->createQueryBuilder('n')
->join('n.queues', 'q') ->join('n.queues', 'q')
->join('q.task', 't') ->join('q.task', 't')
->select('SUM(q.count_processed)') ->select('SUM(q.countProcessed)')
->where('t.status = :status') ->where('t.status = :status')
->setParameter('status', ScheduledTaskEntity::STATUS_COMPLETED) ->setParameter('status', ScheduledTaskEntity::STATUS_COMPLETED)
->andWhere('q.newsletter = :newsletter') ->andWhere('q.newsletter = :newsletter')
@ -78,7 +78,7 @@ class NewsletterStatisticsRepository extends Repository {
try { try {
$qb = $this->entityManager $qb = $this->entityManager
->createQueryBuilder(); ->createQueryBuilder();
return $qb->select('COUNT(DISTINCT stats.subscriber_id) as cnt') return $qb->select('COUNT(DISTINCT stats.subscriberId) as cnt')
->from($statisticsEntityName, 'stats') ->from($statisticsEntityName, 'stats')
->where('stats.newsletter = :newsletter') ->where('stats.newsletter = :newsletter')
->setParameter('newsletter', $newsletter) ->setParameter('newsletter', $newsletter)

View File

@ -62,8 +62,8 @@ class Track {
$data->queue = SendingTask::createFromQueue($data->queue); $data->queue = SendingTask::createFromQueue($data->queue);
} }
$data->subscriber = Subscriber::findOne($data->subscriberId) ?: null; $data->subscriber = Subscriber::findOne($data->subscriberId) ?: null;
$data->newsletter = (!empty($data->queue->newsletter_id)) ? $data->newsletter = (!empty($data->queue->newsletterId)) ?
Newsletter::findOne($data->queue->newsletter_id) : Newsletter::findOne($data->queue->newsletterId) :
false; false;
if (!empty($data->linkHash)) { if (!empty($data->linkHash)) {
$data->link = NewsletterLink::where('hash', $data->linkHash) $data->link = NewsletterLink::where('hash', $data->linkHash)

View File

@ -44,7 +44,7 @@ class UserFlagsController {
public function set($name, $value) { public function set($name, $value) {
$currentUserId = WPFunctions::get()->getCurrentUserId(); $currentUserId = WPFunctions::get()->getCurrentUserId();
$flag = $this->userFlagsRepository->findOneBy([ $flag = $this->userFlagsRepository->findOneBy([
'user_id' => $currentUserId, 'userId' => $currentUserId,
'name' => $name, 'name' => $name,
]); ]);
@ -65,7 +65,7 @@ class UserFlagsController {
public function delete($name) { public function delete($name) {
$currentUserId = WPFunctions::get()->getCurrentUserId(); $currentUserId = WPFunctions::get()->getCurrentUserId();
$flag = $this->userFlagsRepository->findOneBy([ $flag = $this->userFlagsRepository->findOneBy([
'user_id' => $currentUserId, 'userId' => $currentUserId,
'name' => $name, 'name' => $name,
]); ]);
@ -83,7 +83,7 @@ class UserFlagsController {
private function load() { private function load() {
$currentUserId = WPFunctions::get()->getCurrentUserId(); $currentUserId = WPFunctions::get()->getCurrentUserId();
$flags = $this->userFlagsRepository->findBy(['user_id' => $currentUserId]); $flags = $this->userFlagsRepository->findBy(['userId' => $currentUserId]);
$this->data = []; $this->data = [];
foreach ($flags as $flag) { foreach ($flags as $flag) {
$this->data[$flag->getName()] = $flag->getValue(); $this->data[$flag->getName()] = $flag->getValue();

View File

@ -25,7 +25,7 @@ class SubscribersRepository extends Repository {
->createQueryBuilder() ->createQueryBuilder()
->select('count(n.id)') ->select('count(n.id)')
->from(SubscriberEntity::class, 'n') ->from(SubscriberEntity::class, 'n')
->where('n.deleted_at IS NULL AND n.status IN (:statuses)') ->where('n.deletedAt IS NULL AND n.status IN (:statuses)')
->setParameter('statuses', [ ->setParameter('statuses', [
SubscriberEntity::STATUS_SUBSCRIBED, SubscriberEntity::STATUS_SUBSCRIBED,
SubscriberEntity::STATUS_UNCONFIRMED, SubscriberEntity::STATUS_UNCONFIRMED,

View File

@ -132,10 +132,10 @@ class Pages {
$subscriberData = $this->subscriber->getUnconfirmedData(); $subscriberData = $this->subscriber->getUnconfirmedData();
$this->subscriber->status = Subscriber::STATUS_SUBSCRIBED; $this->subscriber->status = Subscriber::STATUS_SUBSCRIBED;
$this->subscriber->confirmed_ip = Helpers::getIP(); $this->subscriber->confirmedIp = Helpers::getIP();
$this->subscriber->setExpr('confirmed_at', 'NOW()'); $this->subscriber->setExpr('confirmed_at', 'NOW()');
$this->subscriber->setExpr('last_subscribed_at', 'NOW()'); $this->subscriber->setExpr('last_subscribed_at', 'NOW()');
$this->subscriber->unconfirmed_data = null; $this->subscriber->unconfirmedData = null;
$this->subscriber->save(); $this->subscriber->save();
if ($this->subscriber->getErrors() === false) { if ($this->subscriber->getErrors() === false) {

View File

@ -200,9 +200,9 @@ class Sending {
} }
public function updateCount() { public function updateCount() {
$this->queue->count_processed = ScheduledTaskSubscriber::getProcessedCount($this->task->id); $this->queue->countProcessed = ScheduledTaskSubscriber::getProcessedCount($this->task->id);
$this->queue->count_to_process = ScheduledTaskSubscriber::getUnprocessedCount($this->task->id); $this->queue->countToProcess = ScheduledTaskSubscriber::getUnprocessedCount($this->task->id);
$this->queue->count_total = $this->queue->count_processed + $this->queue->count_to_process; $this->queue->countTotal = $this->queue->countProcessed + $this->queue->countToProcess;
return $this->queue->save(); return $this->queue->save();
} }

View File

@ -29,7 +29,7 @@ class UserFlags {
public function withFlag($name, $value) { public function withFlag($name, $value) {
$userFlag = $this->userFlagsRepository->findOneBy([ $userFlag = $this->userFlagsRepository->findOneBy([
'user_id' => $this->userId, 'userId' => $this->userId,
'name' => $name, 'name' => $name,
]); ]);

View File

@ -68,7 +68,7 @@ class UserFlagsControllerTest extends \MailPoetTest {
$this->userFlags->set('flag_1', 'updated_value'); $this->userFlags->set('flag_1', 'updated_value');
expect($this->userFlags->get('flag_1'))->equals('updated_value'); expect($this->userFlags->get('flag_1'))->equals('updated_value');
$flag = $this->userFlagsRepository->findOneBy([ $flag = $this->userFlagsRepository->findOneBy([
'user_id' => $this->currentUserId, 'userId' => $this->currentUserId,
'name' => 'flag_1', 'name' => 'flag_1',
]); ]);
expect($flag->getValue())->equals('updated_value'); expect($flag->getValue())->equals('updated_value');
@ -79,7 +79,7 @@ class UserFlagsControllerTest extends \MailPoetTest {
$this->userFlags->delete('flag_1'); $this->userFlags->delete('flag_1');
expect($this->userFlags->get('flag_1'))->equals('default_value_1'); expect($this->userFlags->get('flag_1'))->equals('default_value_1');
$flag = $this->userFlagsRepository->findOneBy([ $flag = $this->userFlagsRepository->findOneBy([
'user_id' => $this->currentUserId, 'userId' => $this->currentUserId,
'name' => 'flag_1', 'name' => 'flag_1',
]); ]);
expect($flag)->null(); expect($flag)->null();
@ -102,7 +102,7 @@ class UserFlagsControllerTest extends \MailPoetTest {
private function updateUserFlag($userId, $name, $value) { private function updateUserFlag($userId, $name, $value) {
$flag = $this->userFlagsRepository->findOneBy([ $flag = $this->userFlagsRepository->findOneBy([
'user_id' => $userId, 'userId' => $userId,
'name' => $name, 'name' => $name,
]); ]);
if (!$flag) { if (!$flag) {