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

Remove Premium namespace from dynamic segments

Browse Source 
[MAILPOET-2382]
This commit is contained in:
Jan Jakeš
2019-10-03 09:50:46 +02:00
committed by Jack Kitterhing
parent 70a89b7939
commit d7d747b945
24 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/API/JSON/v1/DynamicSegments.php
View File

@ -1,21 +1,21 @@
<?php
namespace MailPoet\Premium\API\JSON\v1;
namespace MailPoet\API\JSON\v1;
use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\API\JSON\Error;
use MailPoet\API\JSON\Response;
use MailPoet\Config\AccessControl;
use MailPoet\DynamicSegments\Exceptions\ErrorSavingException;
use MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException;
use MailPoet\DynamicSegments\Mappers\DBMapper;
use MailPoet\DynamicSegments\Mappers\FormDataMapper;
use MailPoet\DynamicSegments\Persistence\Loading\SingleSegmentLoader;
use MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount;
use MailPoet\DynamicSegments\Persistence\Saver;
use MailPoet\Listing\BulkActionController;
use MailPoet\Listing\Handler;
use MailPoet\Models\Model;
use MailPoet\Premium\DynamicSegments\Exceptions\ErrorSavingException;
use MailPoet\Premium\DynamicSegments\Exceptions\InvalidSegmentTypeException;
use MailPoet\Premium\DynamicSegments\Mappers\DBMapper;
use MailPoet\Premium\DynamicSegments\Mappers\FormDataMapper;
use MailPoet\Premium\DynamicSegments\Persistence\Loading\SingleSegmentLoader;
use MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersCount;
use MailPoet\Premium\DynamicSegments\Persistence\Saver;
use MailPoet\WP\Functions as WPFunctions;
class DynamicSegments extends APIEndpoint {
@ -56,7 +56,7 @@ class DynamicSegments extends APIEndpoint {
$id = (int)$data['id'];
} else {
return $this->errorResponse([
Error::BAD_REQUEST => WPFunctions::get()->__('Missing mandatory argument `id`.', 'mailpoet-premium'),
Error::BAD_REQUEST => WPFunctions::get()->__('Missing mandatory argument `id`.', 'mailpoet'),
]);
}
@ -72,7 +72,7 @@ class DynamicSegments extends APIEndpoint {
], $filters[0]->toArray()));
} catch (\InvalidArgumentException $e) {
return $this->errorResponse([
Error::NOT_FOUND => WPFunctions::get()->__('This segment does not exist.', 'mailpoet-premium'),
Error::NOT_FOUND => WPFunctions::get()->__('This segment does not exist.', 'mailpoet'),
]);
}
}
@ -99,21 +99,21 @@ class DynamicSegments extends APIEndpoint {
private function getErrorString(InvalidSegmentTypeException $e) {
switch ($e->getCode()) {
case InvalidSegmentTypeException::MISSING_TYPE:
return WPFunctions::get()->__('Segment type is missing.', 'mailpoet-premium');
return WPFunctions::get()->__('Segment type is missing.', 'mailpoet');
case InvalidSegmentTypeException::INVALID_TYPE:
return WPFunctions::get()->__('Segment type is unknown.', 'mailpoet-premium');
return WPFunctions::get()->__('Segment type is unknown.', 'mailpoet');
case InvalidSegmentTypeException::MISSING_ROLE:
return WPFunctions::get()->__('Please select user role.', 'mailpoet-premium');
return WPFunctions::get()->__('Please select user role.', 'mailpoet');
case InvalidSegmentTypeException::MISSING_ACTION:
return WPFunctions::get()->__('Please select email action.', 'mailpoet-premium');
return WPFunctions::get()->__('Please select email action.', 'mailpoet');
case InvalidSegmentTypeException::MISSING_NEWSLETTER_ID:
return WPFunctions::get()->__('Please select an email.', 'mailpoet-premium');
return WPFunctions::get()->__('Please select an email.', 'mailpoet');
case InvalidSegmentTypeException::MISSING_PRODUCT_ID:
return WPFunctions::get()->__('Please select category.', 'mailpoet-premium');
return WPFunctions::get()->__('Please select category.', 'mailpoet');
case InvalidSegmentTypeException::MISSING_CATEGORY_ID:
return WPFunctions::get()->__('Please select product.', 'mailpoet-premium');
return WPFunctions::get()->__('Please select product.', 'mailpoet');
default:
return WPFunctions::get()->__('An error occurred while saving data.', 'mailpoet-premium');
return WPFunctions::get()->__('An error occurred while saving data.', 'mailpoet');
}
}
@ -122,7 +122,7 @@ class DynamicSegments extends APIEndpoint {
$id = (int)$data['id'];
} else {
return $this->errorResponse([
Error::BAD_REQUEST => WPFunctions::get()->__('Missing mandatory argument `id`.', 'mailpoet-premium'),
Error::BAD_REQUEST => WPFunctions::get()->__('Missing mandatory argument `id`.', 'mailpoet'),
]);
}
@ -135,7 +135,7 @@ class DynamicSegments extends APIEndpoint {
);
} catch (\InvalidArgumentException $e) {
return $this->errorResponse([
Error::NOT_FOUND => WPFunctions::get()->__('This segment does not exist.', 'mailpoet-premium'),
Error::NOT_FOUND => WPFunctions::get()->__('This segment does not exist.', 'mailpoet'),
]);
}
}
@ -145,7 +145,7 @@ class DynamicSegments extends APIEndpoint {
$id = (int)$data['id'];
} else {
return $this->errorResponse([
Error::BAD_REQUEST => WPFunctions::get()->__('Missing mandatory argument `id`.', 'mailpoet-premium'),
Error::BAD_REQUEST => WPFunctions::get()->__('Missing mandatory argument `id`.', 'mailpoet'),
]);
}
@ -158,7 +158,7 @@ class DynamicSegments extends APIEndpoint {
);
} catch (\InvalidArgumentException $e) {
return $this->errorResponse([
Error::NOT_FOUND => WPFunctions::get()->__('This segment does not exist.', 'mailpoet-premium'),
Error::NOT_FOUND => WPFunctions::get()->__('This segment does not exist.', 'mailpoet'),
]);
}
}
@ -168,7 +168,7 @@ class DynamicSegments extends APIEndpoint {
$id = (int)$data['id'];
} else {
return $this->errorResponse([
Error::BAD_REQUEST => WPFunctions::get()->__('Missing mandatory argument `id`.', 'mailpoet-premium'),
Error::BAD_REQUEST => WPFunctions::get()->__('Missing mandatory argument `id`.', 'mailpoet'),
]);
}
@ -178,13 +178,13 @@ class DynamicSegments extends APIEndpoint {
return $this->successResponse(null, ['count' => 1]);
} catch (\InvalidArgumentException $e) {
return $this->errorResponse([
Error::NOT_FOUND => WPFunctions::get()->__('This segment does not exist.', 'mailpoet-premium'),
Error::NOT_FOUND => WPFunctions::get()->__('This segment does not exist.', 'mailpoet'),
]);
}
}
function listing($data = []) {
$listing_data = $this->listing_handler->get('\MailPoet\Premium\Models\DynamicSegment', $data);
$listing_data = $this->listing_handler->get('\MailPoet\Models\DynamicSegment', $data);
$data = [];
foreach ($listing_data['items'] as $segment) {
@ -208,7 +208,7 @@ class DynamicSegments extends APIEndpoint {
function bulkAction($data = []) {
try {
$meta = $this->bulk_action->apply('\MailPoet\Premium\Models\DynamicSegment', $data);
$meta = $this->bulk_action->apply('\MailPoet\Models\DynamicSegment', $data);
return $this->successResponse(null, $meta);
} catch (\Exception $e) {
return $this->errorResponse([

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

@ -1,6 +1,6 @@
<?php
namespace MailPoet\Premium\API\JSON\v1;
namespace MailPoet\API\JSON\v1;
use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\Config\AccessControl;

2
lib/DynamicSegments/Exceptions/ErrorSavingException.php
View File

@ -1,6 +1,6 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Exceptions;
namespace MailPoet\DynamicSegments\Exceptions;
class ErrorSavingException extends \Exception {

2
lib/DynamicSegments/Exceptions/InvalidSegmentTypeException.php
View File

@ -1,6 +1,6 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Exceptions;
namespace MailPoet\DynamicSegments\Exceptions;
class InvalidSegmentTypeException extends \Exception {

2
lib/DynamicSegments/Filters/EmailAction.php
View File

@ -1,6 +1,6 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Filters;
namespace MailPoet\DynamicSegments\Filters;
use MailPoet\Models\StatisticsClicks;
use MailPoet\Models\StatisticsNewsletters;

2
lib/DynamicSegments/Filters/Filter.php
View File

@ -1,6 +1,6 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Filters;
namespace MailPoet\DynamicSegments\Filters;
interface Filter {

2
lib/DynamicSegments/Filters/UserRole.php
View File

@ -1,6 +1,6 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Filters;
namespace MailPoet\DynamicSegments\Filters;
class UserRole implements Filter {

2
lib/DynamicSegments/Filters/WooCommerceCategory.php
View File

@ -1,6 +1,6 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Filters;
namespace MailPoet\DynamicSegments\Filters;
use MailPoet\Models\Subscriber;
use MailPoet\WP\Functions as WPFunctions;

2
lib/DynamicSegments/Filters/WooCommerceProduct.php
View File

@ -1,6 +1,6 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Filters;
namespace MailPoet\DynamicSegments\Filters;
use MailPoet\Models\Subscriber;

8
lib/DynamicSegments/FreePluginConnectors/AddToNewslettersSegments.php
View File

@ -1,16 +1,16 @@
<?php
namespace MailPoet\Premium\DynamicSegments\FreePluginConnectors;
namespace MailPoet\DynamicSegments\FreePluginConnectors;
use MailPoet\Premium\DynamicSegments\Persistence\Loading\Loader;
use MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersCount;
use MailPoet\DynamicSegments\Persistence\Loading\Loader;
use MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount;
class AddToNewslettersSegments {
/** @var Loader */
private $loader;
/** @var \MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersCount */
/** @var SubscribersCount */
private $subscribersCountLoader;
public function __construct(Loader $loader, SubscribersCount $subscribersCountLoader) {

8
lib/DynamicSegments/FreePluginConnectors/AddToSubscribersFilters.php
View File

@ -1,13 +1,13 @@
<?php
namespace MailPoet\Premium\DynamicSegments\FreePluginConnectors;
namespace MailPoet\DynamicSegments\FreePluginConnectors;
use MailPoet\Premium\DynamicSegments\Persistence\Loading\Loader;
use MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersCount;
use MailPoet\DynamicSegments\Persistence\Loading\Loader;
use MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount;
class AddToSubscribersFilters {
/** @var \MailPoet\Premium\DynamicSegments\Persistence\Loading\Loader */
/** @var Loader */
private $loader;
/** @var SubscribersCount */

10
lib/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinder.php
View File

@ -1,19 +1,19 @@
<?php
namespace MailPoet\Premium\DynamicSegments\FreePluginConnectors;
namespace MailPoet\DynamicSegments\FreePluginConnectors;
use MailPoet\DynamicSegments\Persistence\Loading\SingleSegmentLoader;
use MailPoet\DynamicSegments\Persistence\Loading\SubscribersIds;
use MailPoet\Models\DynamicSegment;
use MailPoet\Models\Segment;
use MailPoet\Models\Subscriber;
use MailPoet\Premium\DynamicSegments\Persistence\Loading\SingleSegmentLoader;
use MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersIds;
use MailPoet\Premium\Models\DynamicSegment;
class SendingNewslettersSubscribersFinder {
/** @var SingleSegmentLoader */
private $single_segment_loader;
/** @var \MailPoet\Premium\DynamicSegments\Persistence\Loading\SubscribersIds */
/** @var SubscribersIds */
private $subscribers_ids_loader;
public function __construct(SingleSegmentLoader $single_segment_loader, SubscribersIds $subscribers_ids_loader) {

6
lib/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandler.php
View File

@ -1,11 +1,11 @@
<?php
namespace MailPoet\Premium\DynamicSegments\FreePluginConnectors;
namespace MailPoet\DynamicSegments\FreePluginConnectors;
use MailPoet\Listing\BulkActionController;
use MailPoet\Listing\BulkActionFactory;
use MailPoet\Listing\Handler;
use MailPoet\Premium\Models\DynamicSegment;
use MailPoet\Models\DynamicSegment;
class SubscribersBulkActionHandler {
@ -19,7 +19,7 @@ class SubscribersBulkActionHandler {
function apply(array $segment, array $data) {
if ($segment['type'] === DynamicSegment::TYPE_DYNAMIC) {
$bulkAction = new BulkActionController(new BulkActionFactory(), new Handler());
return $bulkAction->apply('\MailPoet\Premium\Models\SubscribersInDynamicSegment', $data);
return $bulkAction->apply('\MailPoet\Models\SubscribersInDynamicSegment', $data);
}
}

6
lib/DynamicSegments/FreePluginConnectors/SubscribersListingsHandlerFactory.php
View File

@ -1,17 +1,17 @@
<?php
namespace MailPoet\Premium\DynamicSegments\FreePluginConnectors;
namespace MailPoet\DynamicSegments\FreePluginConnectors;
use MailPoet\Listing\Handler;
use MailPoet\Models\DynamicSegment;
use MailPoet\Models\Segment;
use MailPoet\Premium\Models\DynamicSegment;
class SubscribersListingsHandlerFactory {
function get(Segment $segment, $data) {
if ($segment->type === DynamicSegment::TYPE_DYNAMIC) {
$listing = new Handler();
return $listing_data = $listing->get('\MailPoet\Premium\Models\SubscribersInDynamicSegment', $data);
return $listing_data = $listing->get('\MailPoet\Models\SubscribersInDynamicSegment', $data);
}
}
}

22
lib/DynamicSegments/Mappers/DBMapper.php
View File

@ -1,20 +1,20 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Mappers;
namespace MailPoet\DynamicSegments\Mappers;
use MailPoet\Premium\DynamicSegments\Exceptions\InvalidSegmentTypeException;
use MailPoet\Premium\DynamicSegments\Filters\EmailAction;
use MailPoet\Premium\DynamicSegments\Filters\Filter;
use MailPoet\Premium\DynamicSegments\Filters\UserRole;
use MailPoet\Premium\DynamicSegments\Filters\WooCommerceCategory;
use MailPoet\Premium\DynamicSegments\Filters\WooCommerceProduct;
use MailPoet\Premium\Models\DynamicSegment;
use MailPoet\Premium\Models\DynamicSegmentFilter;
use MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException;
use MailPoet\DynamicSegments\Filters\EmailAction;
use MailPoet\DynamicSegments\Filters\Filter;
use MailPoet\DynamicSegments\Filters\UserRole;
use MailPoet\DynamicSegments\Filters\WooCommerceCategory;
use MailPoet\DynamicSegments\Filters\WooCommerceProduct;
use MailPoet\Models\DynamicSegment;
use MailPoet\Models\DynamicSegmentFilter;
class DBMapper {
/**
* @param \MailPoet\Premium\Models\DynamicSegment $segment_data
* @param DynamicSegment $segment_data
* @param DynamicSegmentFilter[] $filters_data
*
* @return DynamicSegment
@ -26,7 +26,7 @@ class DBMapper {
}
/**
* @param \MailPoet\Premium\Models\DynamicSegment[] $segments_data
* @param DynamicSegment[] $segments_data
* @param DynamicSegmentFilter[] $filters_data
*
* @return DynamicSegment[]

16
lib/DynamicSegments/Mappers/FormDataMapper.php
View File

@ -1,14 +1,14 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Mappers;
namespace MailPoet\DynamicSegments\Mappers;
use MailPoet\Premium\DynamicSegments\Exceptions\InvalidSegmentTypeException;
use MailPoet\Premium\DynamicSegments\Filters\EmailAction;
use MailPoet\Premium\DynamicSegments\Filters\Filter;
use MailPoet\Premium\DynamicSegments\Filters\UserRole;
use MailPoet\Premium\DynamicSegments\Filters\WooCommerceCategory;
use MailPoet\Premium\DynamicSegments\Filters\WooCommerceProduct;
use MailPoet\Premium\Models\DynamicSegment;
use MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException;
use MailPoet\DynamicSegments\Filters\EmailAction;
use MailPoet\DynamicSegments\Filters\Filter;
use MailPoet\DynamicSegments\Filters\UserRole;
use MailPoet\DynamicSegments\Filters\WooCommerceCategory;
use MailPoet\DynamicSegments\Filters\WooCommerceProduct;
use MailPoet\Models\DynamicSegment;
class FormDataMapper {

8
lib/DynamicSegments/Persistence/Loading/Loader.php
View File

@ -1,10 +1,10 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Persistence\Loading;
namespace MailPoet\DynamicSegments\Persistence\Loading;
use MailPoet\Premium\DynamicSegments\Mappers\DBMapper;
use MailPoet\Premium\Models\DynamicSegment;
use MailPoet\Premium\Models\DynamicSegmentFilter;
use MailPoet\DynamicSegments\Mappers\DBMapper;
use MailPoet\Models\DynamicSegment;
use MailPoet\Models\DynamicSegmentFilter;
class Loader {

6
lib/DynamicSegments/Persistence/Loading/SingleSegmentLoader.php
View File

@ -1,9 +1,9 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Persistence\Loading;
namespace MailPoet\DynamicSegments\Persistence\Loading;
use MailPoet\Premium\DynamicSegments\Mappers\DBMapper;
use MailPoet\Premium\Models\DynamicSegment;
use MailPoet\DynamicSegments\Mappers\DBMapper;
use MailPoet\Models\DynamicSegment;
class SingleSegmentLoader {

4
lib/DynamicSegments/Persistence/Loading/SubscribersCount.php
View File

@ -1,9 +1,9 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Persistence\Loading;
namespace MailPoet\DynamicSegments\Persistence\Loading;
use MailPoet\Models\DynamicSegment;
use MailPoet\Models\Subscriber;
use MailPoet\Premium\Models\DynamicSegment;
class SubscribersCount {

4
lib/DynamicSegments/Persistence/Loading/SubscribersIds.php
View File

@ -1,9 +1,9 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Persistence\Loading;
namespace MailPoet\DynamicSegments\Persistence\Loading;
use MailPoet\Models\DynamicSegment;
use MailPoet\Models\Subscriber;
use MailPoet\Premium\Models\DynamicSegment;
class SubscribersIds {

10
lib/DynamicSegments/Persistence/Saver.php
View File

@ -1,12 +1,12 @@
<?php
namespace MailPoet\Premium\DynamicSegments\Persistence;
namespace MailPoet\DynamicSegments\Persistence;
use MailPoet\DynamicSegments\Exceptions\ErrorSavingException;
use MailPoet\DynamicSegments\Filters\Filter;
use MailPoet\Models\DynamicSegment;
use MailPoet\Models\DynamicSegmentFilter;
use MailPoet\Models\Model;
use MailPoet\Premium\DynamicSegments\Exceptions\ErrorSavingException;
use MailPoet\Premium\DynamicSegments\Filters\Filter;
use MailPoet\Premium\Models\DynamicSegment;
use MailPoet\Premium\Models\DynamicSegmentFilter;
class Saver {

8
lib/Models/DynamicSegment.php
View File

@ -1,9 +1,9 @@
<?php
namespace MailPoet\Premium\Models;
namespace MailPoet\Models;
use MailPoet\DynamicSegments\Filters\Filter;
use MailPoet\Models\Segment as MailPoetSegment;
use MailPoet\Premium\DynamicSegments\Filters\Filter;
use MailPoet\WP\Functions as WPFunctions;
/**
@ -66,12 +66,12 @@ class DynamicSegment extends MailPoetSegment {
return [
[
'name' => 'all',
'label' => WPFunctions::get()->__('All', 'mailpoet-premium'),
'label' => WPFunctions::get()->__('All', 'mailpoet'),
'count' => DynamicSegment::getPublished()->where('type', DynamicSegment::TYPE_DYNAMIC)->count(),
],
[
'name' => 'trash',
'label' => WPFunctions::get()->__('Trash', 'mailpoet-premium'),
'label' => WPFunctions::get()->__('Trash', 'mailpoet'),
'count' => parent::getTrashed()->where('type', DynamicSegment::TYPE_DYNAMIC)->count(),
],
];

2
lib/Models/DynamicSegmentFilter.php
View File

@ -1,6 +1,6 @@
<?php
namespace MailPoet\Premium\Models;
namespace MailPoet\Models;
use MailPoet\Models\Model;
use MailPoet\WP\Functions as WPFunctions;

6
lib/Models/SubscribersInDynamicSegment.php
View File

@ -1,10 +1,10 @@
<?php
namespace MailPoet\Premium\Models;
namespace MailPoet\Models;
use MailPoet\DynamicSegments\Mappers\DBMapper;
use MailPoet\DynamicSegments\Persistence\Loading\SingleSegmentLoader;
use MailPoet\Models\Subscriber;
use MailPoet\Premium\DynamicSegments\Mappers\DBMapper;
use MailPoet\Premium\DynamicSegments\Persistence\Loading\SingleSegmentLoader;
class SubscribersInDynamicSegment extends Subscriber {