Skip to content

Commit

Permalink
Team package fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
georgemjohn committed Sep 18, 2019
1 parent b65eb91 commit 9f5e870
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 37 deletions.
4 changes: 2 additions & 2 deletions Model/Invite.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Lavalite\Team;
namespace Litepie\Team;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Config;
use Lavalite\Team\Traits\TeamInviteTrait;
use Litepie\Team\Traits\TeamInviteTrait;

class Invite extends Model
{
Expand Down
4 changes: 2 additions & 2 deletions Model/Team.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Lavalite\Team;
namespace Litepie\Team;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Config;
use Lavalite\Team\Traits\TeamTrait;
use Litepie\Team\Traits\TeamTrait;

class Team extends Model
{
Expand Down
4 changes: 2 additions & 2 deletions Team.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Lavalite\Team;
namespace Litepie\Team;

use Illuminate\Support\Facades\Config;
use Lavalite\Team\Events\UserInvitedToTeam;
use Litepie\Team\Events\UserInvitedToTeam;

/**
* This file is part of Teamwork.
Expand Down
27 changes: 1 addition & 26 deletions TeamServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Lavalite\Team;
namespace Litepie\Team;

/*
* This file is part of Team
Expand Down Expand Up @@ -51,8 +51,6 @@ public function register()
{
$this->mergeConfig();
$this->registerTeam();
$this->registerFacade();
$this->registerCommands();
}

/**
Expand All @@ -67,18 +65,6 @@ protected function registerTeam()
});
}

/**
* Register the vault facade without the user having to add it to the app.php file.
*
* @return void
*/
public function registerFacade()
{
$this->app->booting(function () {
$loader = \Illuminate\Foundation\AliasLoader::getInstance();
$loader->alias('Team', 'Lavalite\Team\Facades\Team');
});
}

/**
* Merges user's and teams's configs.
Expand All @@ -92,15 +78,4 @@ protected function mergeConfig()
);
}

/**
* Register scaffolding command.
*/
protected function registerCommands()
{
if ($this->app->runningInConsole()) {
$this->commands([
Commands\MakeTeam::class,
]);
}
}
}
2 changes: 1 addition & 1 deletion Traits/TeamInviteTrait.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Lavalite\Team\Traits;
namespace Litepie\Team\Traits;

/*
* This file is part of Team
Expand Down
2 changes: 1 addition & 1 deletion Traits/TeamTrait.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Mpociot\Teamwork\Traits;
namespace Litepie\Team\Traits;

/*
* This file is part of Teamwork
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
],
"require": {
"mpociot/teamwork": "~5.1"
"php": "^7.2"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
| the team if it is in a different namespace.
|
*/
'team_model' => Lavalite\Team\Model\Team::class,
'team_model' => Litepie\Team\Model\Team::class,

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -75,7 +75,7 @@
| Update the team if it is in a different namespace.
|
*/
'invite_model' => Lavalite\Team\Model\Invite::class,
'invite_model' => Litepie\Team\Model\Invite::class,

/*
|--------------------------------------------------------------------------
Expand Down

0 comments on commit 9f5e870

Please sign in to comment.