- Renamed Pivot to Relation as per Jo's comment :)

This commit is contained in:
MrCasual
2015-09-01 09:26:41 -04:00
parent 0015bdb617
commit f6f8f1390f
6 changed files with 10 additions and 10 deletions

View File

@ -3,7 +3,7 @@ namespace MailPoet\Models;
if(!defined('ABSPATH')) exit;
class PivotSubscriberList extends Model {
class RelationSubscriberList extends Model {
public static $_table = MP_PIVOT_SUBSCRIBER_LIST_TABLE;
function __construct() {

View File

@ -16,6 +16,6 @@ class Subscriber extends Model {
}
public function lists() {
return self::has_many_through(__NAMESPACE__ . '\SubscriberList', __NAMESPACE__ . '\PivotSubscriberList', 'subscriber_id', 'list_id');
return self::has_many_through(__NAMESPACE__ . '\SubscriberList', __NAMESPACE__ . '\RelationSubscriberList', 'subscriber_id', 'list_id');
}
}

View File

@ -30,6 +30,6 @@ class SubscriberList extends Model {
}
public function subscribers() {
return self::has_many_through(__NAMESPACE__ . '\Subscriber', __NAMESPACE__ . '\PivotSubscriberList', 'list_id', 'subscriber_id');
return self::has_many_through(__NAMESPACE__ . '\Subscriber', __NAMESPACE__ . '\RelationSubscriberList', 'list_id', 'subscriber_id');
}
}

View File

@ -11,7 +11,7 @@ $models = array(
"Setting",
"Newsletter",
"SubscriberList",
"PivotSubscriberList"
"RelationSubscriberList"
);
$destroy = function ($model) {
Model::factory("\MailPoet\Models\\" . $model)

View File

@ -1,7 +1,7 @@
<?php
use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberList;
use MailPoet\Models\PivotSubscriberList;
use MailPoet\Models\RelationSubscriberList;
class SubscriberCest {
@ -61,7 +61,7 @@ class SubscriberCest {
$list = SubscriberList::create();
$list->hydrate($listData);
$list->save();
$association = PivotSubscriberList::create();
$association = RelationSubscriberList::create();
$association->subscriber_id = $this->subscriber->id;
$association->list_id = $list->id;
$association->save();
@ -77,7 +77,7 @@ class SubscriberCest {
->delete_many();
ORM::for_table(SubscriberList::$_table)
->delete_many();
ORM::for_table(PivotSubscriberList::$_table)
ORM::for_table(RelationSubscriberList::$_table)
->delete_many();
}
}

View File

@ -1,6 +1,6 @@
<?php
use MailPoet\Models\PivotSubscriberList;
use MailPoet\Models\RelationSubscriberList;
use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberList;
@ -95,7 +95,7 @@ class SubscriberListCest {
$subscriber = Subscriber::create();
$subscriber->hydrate($subscriberData);
$subscriber->save();
$association = PivotSubscriberList::create();
$association = RelationSubscriberList::create();
$association->subscriber_id = $subscriber->id;
$association->list_id = $this->list->id;
$association->save();
@ -112,7 +112,7 @@ class SubscriberListCest {
->delete_many();
ORM::for_table(Subscriber::$_table)
->delete_many();
ORM::for_table(PivotSubscriberList::$_table)
ORM::for_table(RelationSubscriberList::$_table)
->delete_many();
}