Updated to match changes in the latest credentials package

demonchung · Jan 3, 2015 · 56a7600 · 56a7600
1 parent 1bff03f
commit 56a7600
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 247 deletions.
diff --git a/app/Models/Comment.php b/app/Models/Comment.php
@@ -16,13 +16,10 @@
 
 namespace GrahamCampbell\BootstrapCMS\Models;
 
-use GrahamCampbell\BootstrapCMS\Models\Relations\Common\BelongsToPostTrait;
-use GrahamCampbell\BootstrapCMS\Models\Relations\Interfaces\BelongsToPostInterface;
+use GrahamCampbell\BootstrapCMS\Models\Relations\BelongsToPostTrait;
 use GrahamCampbell\Credentials\Models\AbstractModel;
-use GrahamCampbell\Credentials\Models\Relations\Common\BelongsToUserTrait;
-use GrahamCampbell\Credentials\Models\Relations\Common\RevisionableTrait;
-use GrahamCampbell\Credentials\Models\Relations\Interfaces\BelongsToUserInterface;
-use GrahamCampbell\Credentials\Models\Relations\Interfaces\RevisionableInterface;
+use GrahamCampbell\Credentials\Models\Relations\BelongsToUserTrait;
+use GrahamCampbell\Credentials\Models\Relations\RevisionableTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use McCool\LaravelAutoPresenter\HasPresenter;
 
@@ -33,7 +30,7 @@
  * @copyright 2013-2014 Graham Campbell
  * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
  */
-class Comment extends AbstractModel implements BelongsToPostInterface, BelongsToUserInterface, RevisionableInterface, HasPresenter
+class Comment extends AbstractModel implements HasPresenter
 {
     use BelongsToPostTrait, BelongsToUserTrait, RevisionableTrait, SoftDeletes;
 

diff --git a/app/Models/Event.php b/app/Models/Event.php
@@ -17,10 +17,8 @@
 namespace GrahamCampbell\BootstrapCMS\Models;
 
 use GrahamCampbell\Credentials\Models\AbstractModel;
-use GrahamCampbell\Credentials\Models\Relations\Common\BelongsToUserTrait;
-use GrahamCampbell\Credentials\Models\Relations\Common\RevisionableTrait;
-use GrahamCampbell\Credentials\Models\Relations\Interfaces\BelongsToUserInterface;
-use GrahamCampbell\Credentials\Models\Relations\Interfaces\RevisionableInterface;
+use GrahamCampbell\Credentials\Models\Relations\BelongsToUserTrait;
+use GrahamCampbell\Credentials\Models\Relations\RevisionableTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use McCool\LaravelAutoPresenter\HasPresenter;
 
@@ -31,7 +29,7 @@
  * @copyright 2013-2014 Graham Campbell
  * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
  */
-class Event extends AbstractModel implements BelongsToUserInterface, RevisionableInterface, HasPresenter
+class Event extends AbstractModel implements HasPresenter
 {
     use BelongsToUserTrait, RevisionableTrait, SoftDeletes;
 

diff --git a/app/Models/Page.php b/app/Models/Page.php
@@ -17,10 +17,8 @@
 namespace GrahamCampbell\BootstrapCMS\Models;
 
 use GrahamCampbell\Credentials\Models\AbstractModel;
-use GrahamCampbell\Credentials\Models\Relations\Common\BelongsToUserTrait;
-use GrahamCampbell\Credentials\Models\Relations\Common\RevisionableTrait;
-use GrahamCampbell\Credentials\Models\Relations\Interfaces\BelongsToUserInterface;
-use GrahamCampbell\Credentials\Models\Relations\Interfaces\RevisionableInterface;
+use GrahamCampbell\Credentials\Models\Relations\BelongsToUserTrait;
+use GrahamCampbell\Credentials\Models\Relations\RevisionableTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use McCool\LaravelAutoPresenter\HasPresenter;
 
@@ -31,7 +29,7 @@
  * @copyright 2013-2014 Graham Campbell
  * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
  */
-class Page extends AbstractModel implements BelongsToUserInterface, RevisionableInterface, HasPresenter
+class Page extends AbstractModel implements HasPresenter
 {
     use BelongsToUserTrait, RevisionableTrait, SoftDeletes;
 

diff --git a/app/Models/Post.php b/app/Models/Post.php
@@ -16,13 +16,10 @@
 
 namespace GrahamCampbell\BootstrapCMS\Models;
 
-use GrahamCampbell\BootstrapCMS\Models\Relations\Common\HasManyCommentsTrait;
-use GrahamCampbell\BootstrapCMS\Models\Relations\Interfaces\HasManyCommentsInterface;
+use GrahamCampbell\BootstrapCMS\Models\Relations\HasManyCommentsTrait;
 use GrahamCampbell\Credentials\Models\AbstractModel;
-use GrahamCampbell\Credentials\Models\Relations\Common\BelongsToUserTrait;
-use GrahamCampbell\Credentials\Models\Relations\Common\RevisionableTrait;
-use GrahamCampbell\Credentials\Models\Relations\Interfaces\BelongsToUserInterface;
-use GrahamCampbell\Credentials\Models\Relations\Interfaces\RevisionableInterface;
+use GrahamCampbell\Credentials\Models\Relations\BelongsToUserTrait;
+use GrahamCampbell\Credentials\Models\Relations\RevisionableTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use McCool\LaravelAutoPresenter\HasPresenter;
 
@@ -33,7 +30,7 @@
  * @copyright 2013-2014 Graham Campbell
  * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
  */
-class Post extends AbstractModel implements HasManyCommentsInterface, BelongsToUserInterface, RevisionableInterface, HasPresenter
+class Post extends AbstractModel implements HasPresenter
 {
     use HasManyCommentsTrait, BelongsToUserTrait, RevisionableTrait, SoftDeletes;
 

diff --git a/...s/Relations/Common/BelongsToPostTrait.php → app/Models/Relations/BelongsToPostTrait.php b/...s/Relations/Common/BelongsToPostTrait.php → app/Models/Relations/BelongsToPostTrait.php
@@ -14,7 +14,7 @@
  * GNU Affero General Public License for more details.
  */
 
-namespace GrahamCampbell\BootstrapCMS\Models\Relations\Common;
+namespace GrahamCampbell\BootstrapCMS\Models\Relations;
 
 /**
  * This is the belongs to post trait.

diff --git a/...Relations/Common/HasManyCommentsTrait.php → ...Models/Relations/HasManyCommentsTrait.php b/...Relations/Common/HasManyCommentsTrait.php → ...Models/Relations/HasManyCommentsTrait.php
@@ -14,7 +14,7 @@
  * GNU Affero General Public License for more details.
  */
 
-namespace GrahamCampbell\BootstrapCMS\Models\Relations\Common;
+namespace GrahamCampbell\BootstrapCMS\Models\Relations;
 
 /**
  * This is the has many comments trait.

diff --git a/...s/Relations/Common/HasManyEventsTrait.php → app/Models/Relations/HasManyEventsTrait.php b/...s/Relations/Common/HasManyEventsTrait.php → app/Models/Relations/HasManyEventsTrait.php
@@ -14,7 +14,7 @@
  * GNU Affero General Public License for more details.
  */
 
-namespace GrahamCampbell\BootstrapCMS\Models\Relations\Common;
+namespace GrahamCampbell\BootstrapCMS\Models\Relations;
 
 /**
  * This is the has many events trait.

diff --git a/...ls/Relations/Common/HasManyPagesTrait.php → app/Models/Relations/HasManyPagesTrait.php b/...ls/Relations/Common/HasManyPagesTrait.php → app/Models/Relations/HasManyPagesTrait.php
@@ -14,7 +14,7 @@
  * GNU Affero General Public License for more details.
  */
 
-namespace GrahamCampbell\BootstrapCMS\Models\Relations\Common;
+namespace GrahamCampbell\BootstrapCMS\Models\Relations;
 
 /**
  * This is the has many pages trait.

diff --git a/...ls/Relations/Common/HasManyPostsTrait.php → app/Models/Relations/HasManyPostsTrait.php b/...ls/Relations/Common/HasManyPostsTrait.php → app/Models/Relations/HasManyPostsTrait.php
@@ -14,7 +14,7 @@
  * GNU Affero General Public License for more details.
  */
 
-namespace GrahamCampbell\BootstrapCMS\Models\Relations\Common;
+namespace GrahamCampbell\BootstrapCMS\Models\Relations;
 
 /**
  * This is the has many posts trait.

diff --git a/app/Models/Relations/Interfaces/BelongsToPostInterface.php b/app/Models/Relations/Interfaces/BelongsToPostInterface.php
diff --git a/app/Models/Relations/Interfaces/HasManyCommentsInterface.php b/app/Models/Relations/Interfaces/HasManyCommentsInterface.php
diff --git a/app/Models/Relations/Interfaces/HasManyEventsInterface.php b/app/Models/Relations/Interfaces/HasManyEventsInterface.php
diff --git a/app/Models/Relations/Interfaces/HasManyPagesInterface.php b/app/Models/Relations/Interfaces/HasManyPagesInterface.php
diff --git a/app/Models/Relations/Interfaces/HasManyPostsInterface.php b/app/Models/Relations/Interfaces/HasManyPostsInterface.php
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -16,14 +16,10 @@
 
 namespace GrahamCampbell\BootstrapCMS\Models;
 
-use GrahamCampbell\BootstrapCMS\Models\Relations\Common\HasManyCommentsTrait;
-use GrahamCampbell\BootstrapCMS\Models\Relations\Common\HasManyEventsTrait;
-use GrahamCampbell\BootstrapCMS\Models\Relations\Common\HasManyPagesTrait;
-use GrahamCampbell\BootstrapCMS\Models\Relations\Common\HasManyPostsTrait;
-use GrahamCampbell\BootstrapCMS\Models\Relations\Interfaces\HasManyCommentsInterface;
-use GrahamCampbell\BootstrapCMS\Models\Relations\Interfaces\HasManyEventsInterface;
-use GrahamCampbell\BootstrapCMS\Models\Relations\Interfaces\HasManyPagesInterface;
-use GrahamCampbell\BootstrapCMS\Models\Relations\Interfaces\HasManyPostsInterface;
+use GrahamCampbell\BootstrapCMS\Models\Relations\HasManyCommentsTrait;
+use GrahamCampbell\BootstrapCMS\Models\Relations\HasManyEventsTrait;
+use GrahamCampbell\BootstrapCMS\Models\Relations\HasManyPagesTrait;
+use GrahamCampbell\BootstrapCMS\Models\Relations\HasManyPostsTrait;
 use GrahamCampbell\Credentials\Models\User as CredentialsUser;
 
 /**
@@ -33,7 +29,7 @@
  * @copyright 2013-2014 Graham Campbell
  * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
  */
-class User extends CredentialsUser implements HasManyPagesInterface, HasManyPostsInterface, HasManyEventsInterface, HasManyCommentsInterface
+class User extends CredentialsUser
 {
     use HasManyPagesTrait, HasManyPostsTrait, HasManyEventsTrait, HasManyCommentsTrait;
 

diff --git a/app/Repositories/EventRepository.php b/app/Repositories/EventRepository.php
@@ -17,8 +17,7 @@
 namespace GrahamCampbell\BootstrapCMS\Repositories;
 
 use GrahamCampbell\Credentials\Repositories\AbstractRepository;
-use GrahamCampbell\Credentials\Repositories\Common\PaginateRepositoryTrait;
-use GrahamCampbell\Credentials\Repositories\Interfaces\PaginateRepositoryInterface;
+use GrahamCampbell\Credentials\Repositories\PaginateRepositoryTrait;
 
 /**
  * This is the event repository class.
@@ -27,7 +26,7 @@
  * @copyright 2013-2014 Graham Campbell
  * @license   <https://github.com/GrahamCampbell/Bootstrap-CMS/blob/master/LICENSE.md> AGPL 3.0
  */
-class EventRepository extends AbstractRepository implements PaginateRepositoryInterface
+class EventRepository extends AbstractRepository
 {
     use PaginateRepositoryTrait;
 }