Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Convert Doctrine specific code to camel case

Browse Source 
[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
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/API/JSON/v1/CustomFields.php
View File

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

2
lib/Config/Populator.php
View File

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

6
lib/Cron/Workers/SendingQueue/Tasks/Mailer.php
View File

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

6
lib/Cron/Workers/StatsNotifications/StatsNotificationsRepository.php
View File

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

2
lib/Newsletter/NewslettersRepository.php
View File

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

4
lib/Newsletter/Statistics/NewsletterStatisticsRepository.php
View File

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

4
lib/Router/Endpoints/Track.php
View File

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

6
lib/Settings/UserFlagsController.php
View File

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

2
lib/Subscribers/SubscribersRepository.php
View File

@ -25,7 +25,7 @@ class SubscribersRepository extends Repository {
->createQueryBuilder()
->select('count(n.id)')
->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', [
SubscriberEntity::STATUS_SUBSCRIBED,
SubscriberEntity::STATUS_UNCONFIRMED,

4
lib/Subscription/Pages.php
View File

@ -132,10 +132,10 @@ class Pages {
$subscriberData = $this->subscriber->getUnconfirmedData();
$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('last_subscribed_at', 'NOW()');
$this->subscriber->unconfirmed_data = null;
$this->subscriber->unconfirmedData = null;
$this->subscriber->save();
if ($this->subscriber->getErrors() === false) {

6
lib/Tasks/Sending.php
View File

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

2
tests/DataFactories/UserFlags.php
View File

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

6
tests/integration/Settings/UserFlagsControllerTest.php
View File

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