diff options
Diffstat (limited to 'main/app/sprinkles/extend-user/src/Database')
4 files changed, 16 insertions, 24 deletions
diff --git a/main/app/sprinkles/extend-user/src/Database/Migrations/v400/MembersTable.php b/main/app/sprinkles/extend-user/src/Database/Migrations/v400/MembersTable.php index a27d485..fe5aa93 100644 --- a/main/app/sprinkles/extend-user/src/Database/Migrations/v400/MembersTable.php +++ b/main/app/sprinkles/extend-user/src/Database/Migrations/v400/MembersTable.php @@ -1,4 +1,5 @@ <?php + namespace UserFrosting\Sprinkle\ExtendUser\Database\Migrations\v400; use UserFrosting\System\Bakery\Migration; @@ -11,8 +12,7 @@ class MembersTable extends Migration '\UserFrosting\Sprinkle\Account\Database\Migrations\v400\UsersTable' ]; - public function up() - { + public function up() { if (!$this->schema->hasTable('members')) { $this->schema->create('members', function (Blueprint $table) { $table->increments('id'); @@ -27,8 +27,7 @@ class MembersTable extends Migration } } - public function down() - { + public function down() { $this->schema->drop('members'); } } diff --git a/main/app/sprinkles/extend-user/src/Database/Models/Member.php b/main/app/sprinkles/extend-user/src/Database/Models/Member.php index 98d9d70..094d14c 100644 --- a/main/app/sprinkles/extend-user/src/Database/Models/Member.php +++ b/main/app/sprinkles/extend-user/src/Database/Models/Member.php @@ -1,4 +1,5 @@ <?php + namespace UserFrosting\Sprinkle\ExtendUser\Database\Models; use UserFrosting\Sprinkle\Account\Database\Models\User; @@ -12,8 +13,7 @@ trait LinkMemberAux * * @return void */ - protected static function bootLinkMemberAux() - { + protected static function bootLinkMemberAux() { /** * Create a new MemberAux if necessary, and save the associated member data every time. */ @@ -59,12 +59,11 @@ class Member extends User * Required to be able to access the `aux` relationship in Twig without needing to do eager loading. * @see http://stackoverflow.com/questions/29514081/cannot-access-eloquent-attributes-on-twig/35908957#35908957 */ - public function __isset($name) - { + public function __isset($name) { if (in_array($name, [ 'aux' ])) { - return true; + return TRUE; } else { return parent::__isset($name); } @@ -73,8 +72,7 @@ class Member extends User /** * Globally joins the `members` table to access additional properties. */ - protected static function boot() - { + protected static function boot() { parent::boot(); static::addGlobalScope(new MemberAuxScope); @@ -83,8 +81,7 @@ class Member extends User /** * Custom mutator for Member property */ - public function setCityAttribute($value) - { + public function setCityAttribute($value) { $this->createAuxIfNotExists(); $this->aux->city = $value; @@ -93,8 +90,7 @@ class Member extends User /** * Custom mutator for Member property */ - public function setCountryAttribute($value) - { + public function setCountryAttribute($value) { $this->createAuxIfNotExists(); $this->aux->country = $value; @@ -103,16 +99,14 @@ class Member extends User /** * Relationship for interacting with aux model (`members` table). */ - public function aux() - { + public function aux() { return $this->hasOne($this->auxType, 'id'); } /** * If this instance doesn't already have a related aux model (either in the db on in the current object), then create one */ - protected function createAuxIfNotExists() - { + protected function createAuxIfNotExists() { if ($this->auxType && !count($this->aux)) { // Create aux model and set primary key to be the same as the main user's $aux = new $this->auxType; diff --git a/main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php b/main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php index c826409..6612586 100644 --- a/main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php +++ b/main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php @@ -6,7 +6,7 @@ use UserFrosting\Sprinkle\Core\Database\Models\Model; class MemberAux extends Model { - public $timestamps = false; + public $timestamps = FALSE; /** * @var string The name of the table for the current model. diff --git a/main/app/sprinkles/extend-user/src/Database/Scopes/MemberAuxScope.php b/main/app/sprinkles/extend-user/src/Database/Scopes/MemberAuxScope.php index c732147..624c4f6 100644 --- a/main/app/sprinkles/extend-user/src/Database/Scopes/MemberAuxScope.php +++ b/main/app/sprinkles/extend-user/src/Database/Scopes/MemberAuxScope.php @@ -11,12 +11,11 @@ class MemberAuxScope implements Scope /** * Apply the scope to a given Eloquent query builder. * - * @param \Illuminate\Database\Eloquent\Builder $builder - * @param \Illuminate\Database\Eloquent\Model $model + * @param \Illuminate\Database\Eloquent\Builder $builder + * @param \Illuminate\Database\Eloquent\Model $model * @return void */ - public function apply(Builder $builder, Model $model) - { + public function apply(Builder $builder, Model $model) { $baseTable = $model->getTable(); // Hardcode the table name here, or you can access it using the classMapper and `getTable` $auxTable = 'members'; |