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

Add public keyword to methods

Browse Source 
[MAILPOET-2413]
This commit is contained in:
Amine Ben hammou
2019-12-26 12:56:49 +01:00
committed by wxa
parent ec409042d5
commit 43df66d162
823 changed files with 4440 additions and 4440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/DynamicSegments/DynamicSegmentHooks.php
View File

@ -18,11 +18,11 @@ class DynamicSegmentHooks {
/** @var WPFunctions */
private $wp;
function __construct(WPFunctions $wp) {
public function __construct(WPFunctions $wp) {
$this->wp = $wp;
}
function init() {
public function init() {
$this->wp->addAction(
'mailpoet_segments_with_subscriber_count',
[$this, 'addSegmentsWithSubscribersCount']
@ -54,32 +54,32 @@ class DynamicSegmentHooks {
);
}
function addSegmentsWithSubscribersCount($initial_segments) {
public function addSegmentsWithSubscribersCount($initial_segments) {
$newsletters_add_segments = new AddToNewslettersSegments(new Loader(new DBMapper()), new SubscribersCount());
return $newsletters_add_segments->add($initial_segments);
}
function getSubscribersInSegmentsFinders(array $finders) {
public function getSubscribersInSegmentsFinders(array $finders) {
$finders[] = new SendingNewslettersSubscribersFinder(new SingleSegmentLoader(new DBMapper()), new SubscribersIds());
return $finders;
}
function getSubscribersListingsInSegmentsHandlers(array $handlers) {
public function getSubscribersListingsInSegmentsHandlers(array $handlers) {
$handlers[] = new SubscribersListingsHandlerFactory();
return $handlers;
}
function addDynamicFiltersToSubscribersListingsFilters($segment_filters) {
public function addDynamicFiltersToSubscribersListingsFilters($segment_filters) {
$newsletters_add_segments = new AddToSubscribersFilters(new Loader(new DBMapper()), new SubscribersCount());
return $newsletters_add_segments->add($segment_filters);
}
function applySubscriberBulkAction(array $handlers) {
public function applySubscriberBulkAction(array $handlers) {
$handlers[] = new SubscribersBulkActionHandler();
return $handlers;
}
function getSegmentFilters($segment_id) {
public function getSegmentFilters($segment_id) {
$single_segment_loader = new SingleSegmentLoader(new DBMapper());
return $single_segment_loader->load($segment_id)->getFilters();
}

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

@ -58,7 +58,7 @@ class EmailAction implements Filter {
$this->action = $action;
}
function toSql(ORM $orm) {
public function toSql(ORM $orm) {
if (($this->action === EmailAction::ACTION_CLICKED) || ($this->action === EmailAction::ACTION_NOT_CLICKED)) {
$table = StatisticsClicks::$_table;
} else {
@ -98,7 +98,7 @@ class EmailAction implements Filter {
return $clause;
}
function toArray() {
public function toArray() {
return [
'action' => $this->action,
'newsletter_id' => $this->newsletter_id,

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

@ -6,8 +6,8 @@ use MailPoetVendor\Idiorm\ORM;
interface Filter {
function toSql(ORM $orm);
public function toSql(ORM $orm);
function toArray();
public function toArray();
}

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

@ -23,7 +23,7 @@ class UserRole implements Filter {
$this->connect = $connect;
}
function toSql(ORM $orm) {
public function toSql(ORM $orm) {
global $wpdb;
$orm->join($wpdb->users, ['wpusers.id', '=', MP_SUBSCRIBERS_TABLE . '.wp_user_id'], 'wpusers')
->join($wpdb->usermeta, ['wpusers.ID', '=', 'wpusermeta.user_id'], 'wpusermeta')
@ -40,7 +40,7 @@ class UserRole implements Filter {
];
}
function getRole() {
public function getRole() {
return $this->role;
}
}

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

@ -27,7 +27,7 @@ class WooCommerceCategory implements Filter {
$this->connect = $connect;
}
function toSql(ORM $orm) {
public function toSql(ORM $orm) {
global $wpdb;
$orm->distinct();
$orm->rawJoin(
@ -45,8 +45,8 @@ class WooCommerceCategory implements Filter {
$orm->rawJoin(
'INNER JOIN ' . $wpdb->term_taxonomy,
'
term_taxonomy.term_taxonomy_id=term_relationships.term_taxonomy_id
AND
term_taxonomy.term_taxonomy_id=term_relationships.term_taxonomy_id
AND
term_taxonomy.term_id IN (' . join(',', $this->getAllCategoryIds()) . ')',
'term_taxonomy'
);
@ -64,7 +64,7 @@ class WooCommerceCategory implements Filter {
return $ids;
}
function toArray() {
public function toArray() {
return [
'action' => WooCommerceCategory::ACTION_CATEGORY,
'category_id' => $this->category_id,

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

@ -26,7 +26,7 @@ class WooCommerceProduct implements Filter {
$this->connect = $connect;
}
function toSql(ORM $orm) {
public function toSql(ORM $orm) {
global $wpdb;
$orm->distinct();
$orm->rawJoin(
@ -37,8 +37,8 @@ class WooCommerceProduct implements Filter {
$orm->join($wpdb->prefix . 'woocommerce_order_items', ['postmeta.post_id', '=', 'items.order_id'], 'items');
$orm->rawJoin(
'INNER JOIN ' . $wpdb->prefix . 'woocommerce_order_itemmeta',
"itemmeta.order_item_id=items.order_item_id
AND itemmeta.meta_key='_product_id'
"itemmeta.order_item_id=items.order_item_id
AND itemmeta.meta_key='_product_id'
AND itemmeta.meta_value=" . $this->product_id,
'itemmeta'
);
@ -46,7 +46,7 @@ class WooCommerceProduct implements Filter {
return $orm;
}
function toArray() {
public function toArray() {
return [
'action' => WooCommerceProduct::ACTION_PRODUCT,
'product_id' => $this->product_id,

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

@ -23,7 +23,7 @@ class AddToNewslettersSegments {
*
* @return array
*/
function add(array $initial_segments) {
public function add(array $initial_segments) {
$dynamic_segments = $this->getListings();
return array_merge($initial_segments, $dynamic_segments);
}

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

@ -23,7 +23,7 @@ class AddToSubscribersFilters {
*
* @return array
*/
function add(array $segment_filters) {
public function add(array $segment_filters) {
$dynamic_segments = $this->getListings();
return $this->sort(array_merge($segment_filters, $dynamic_segments));
}

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

@ -27,7 +27,7 @@ class SendingNewslettersSubscribersFinder {
*
* @return Subscriber[]
*/
function findSubscribersInSegment(Segment $segment, array $subscribers_to_process_ids) {
public function findSubscribersInSegment(Segment $segment, array $subscribers_to_process_ids) {
if ($segment->type !== DynamicSegment::TYPE_DYNAMIC) return [];
$dynamic_segment = $this->single_segment_loader->load($segment->id);
return $this->subscribers_ids_loader->load($dynamic_segment, $subscribers_to_process_ids);
@ -38,7 +38,7 @@ class SendingNewslettersSubscribersFinder {
*
* @return array
*/
function getSubscriberIdsInSegment(Segment $segment) {
public function getSubscriberIdsInSegment(Segment $segment) {
if ($segment->type !== DynamicSegment::TYPE_DYNAMIC) return [];
$dynamic_segment = $this->single_segment_loader->load($segment->id);
$result = $this->subscribers_ids_loader->load($dynamic_segment);

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

@ -16,7 +16,7 @@ class SubscribersBulkActionHandler {
* @return array
* @throws \Exception
*/
function apply(array $segment, array $data) {
public function apply(array $segment, array $data) {
if ($segment['type'] === DynamicSegment::TYPE_DYNAMIC) {
$bulkAction = new BulkActionController(new BulkActionFactory(), new Handler());
return $bulkAction->apply('\MailPoet\Models\SubscribersInDynamicSegment', $data);

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

@ -8,7 +8,7 @@ use MailPoet\Models\Segment;
class SubscribersListingsHandlerFactory {
function get(Segment $segment, $data) {
public function get(Segment $segment, $data) {
if ($segment->type === DynamicSegment::TYPE_DYNAMIC) {
$listing = new Handler();
return $listing_data = $listing->get('\MailPoet\Models\SubscribersInDynamicSegment', $data);

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

@ -19,7 +19,7 @@ class DBMapper {
*
* @return DynamicSegment
*/
function mapSegment(DynamicSegment $segment_data, array $filters_data) {
public function mapSegment(DynamicSegment $segment_data, array $filters_data) {
$filters = $this->getFilters($segment_data->id, $filters_data);
$segment_data->setFilters($filters);
return $segment_data;
@ -31,7 +31,7 @@ class DBMapper {
*
* @return DynamicSegment[]
*/
function mapSegments(array $segments_data, array $filters_data) {
public function mapSegments(array $segments_data, array $filters_data) {
$result = [];
foreach ($segments_data as $segment_data) {
$result[] = $this->mapSegment($segment_data, $filters_data);

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

@ -18,7 +18,7 @@ class FormDataMapper {
* @return DynamicSegment
* @throws InvalidSegmentTypeException
*/
function mapDataToDB(array $data) {
public function mapDataToDB(array $data) {
$filters = $this->getFilters($data);
$dynamic_segment = $this->createDynamicSegment($data);

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

@ -18,7 +18,7 @@ class Loader {
/**
* @return DynamicSegment[]
*/
function load() {
public function load() {
$segments = DynamicSegment::findAll();
return $this->loadFilters($segments);
}

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

@ -18,7 +18,7 @@ class SingleSegmentLoader {
* @param string|int $segment_id
* @return DynamicSegment
*/
function load($segment_id) {
public function load($segment_id) {
$segment = DynamicSegment::findOne($segment_id);
if (!$segment instanceof DynamicSegment) {

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

@ -12,7 +12,7 @@ class SubscribersCount {
/** @var RequirementsChecker */
private $requirements_checker;
function __construct(RequirementsChecker $requirements_checker = null) {
public function __construct(RequirementsChecker $requirements_checker = null) {
if (!$requirements_checker) {
$requirements_checker = new RequirementsChecker(new WooCommerceHelper());
}
@ -24,7 +24,7 @@ class SubscribersCount {
*
* @return int
*/
function getSubscribersCount(DynamicSegment $dynamic_segment) {
public function getSubscribersCount(DynamicSegment $dynamic_segment) {
$orm = Subscriber::selectExpr('count(distinct ' . Subscriber::$_table . '.id) as cnt');
if ($this->requirements_checker->shouldSkipSegment($dynamic_segment)) {
return 0;

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

@ -12,7 +12,7 @@ class SubscribersIds {
/** @var RequirementsChecker */
private $requirements_checker;
function __construct(RequirementsChecker $requirements_checker = null) {
public function __construct(RequirementsChecker $requirements_checker = null) {
if (!$requirements_checker) {
$requirements_checker = new RequirementsChecker(new WooCommerceHelper());
}
@ -27,7 +27,7 @@ class SubscribersIds {
*
* @return Subscriber[]
*/
function load(DynamicSegment $dynamic_segment, $limit_to_subscribers_ids = null) {
public function load(DynamicSegment $dynamic_segment, $limit_to_subscribers_ids = null) {
$orm = Subscriber::selectExpr(Subscriber::$_table . '.id');
if ($this->requirements_checker->shouldSkipSegment($dynamic_segment)) {
return [];

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

@ -17,7 +17,7 @@ class Saver {
* @return integer
* @throws ErrorSavingException
*/
function save(DynamicSegment $segment) {
public function save(DynamicSegment $segment) {
$db = ORM::get_db();
$db->beginTransaction();

4
lib/DynamicSegments/RequirementsChecker.php
View File

@ -11,14 +11,14 @@ class RequirementsChecker {
/** @var Helper */
private $woocommerce_helper;
function __construct(Helper $woocommerce_helper = null) {
public function __construct(Helper $woocommerce_helper = null) {
if (!$woocommerce_helper) {
$woocommerce_helper = new Helper();
}
$this->woocommerce_helper = $woocommerce_helper;
}
function shouldSkipSegment(DynamicSegment $segment) {
public function shouldSkipSegment(DynamicSegment $segment) {
foreach ($segment->getFilters() as $filter) {
if ($this->shouldSkipFilter($filter)) {
return true;