Various code cleanup.

This commit is contained in:
James Cole
2018-07-26 06:10:17 +02:00
parent e8c9554dd6
commit 6bcfea1de4
37 changed files with 351 additions and 185 deletions

View File

@@ -31,6 +31,7 @@ use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Collection;
use Log;
@@ -200,7 +201,7 @@ class Account extends Model
* @codeCoverageIgnore
* Get all of the notes.
*/
public function notes()
public function notes(): MorphMany
{
return $this->morphMany(Note::class, 'noteable');
}

View File

@@ -27,6 +27,7 @@ use Crypt;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Database\Eloquent\SoftDeletes;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -180,7 +181,7 @@ class Attachment extends Model
* @codeCoverageIgnore
* Get all of the notes.
*/
public function notes()
public function notes(): MorphMany
{
return $this->morphMany(Note::class, 'noteable');
}

View File

@@ -28,6 +28,7 @@ use FireflyIII\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Collection;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -155,7 +156,7 @@ class Bill extends Model
* @codeCoverageIgnore
* Get all of the notes.
*/
public function notes()
public function notes(): MorphMany
{
return $this->morphMany(Note::class, 'noteable');
}

View File

@@ -24,6 +24,7 @@ namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Database\Eloquent\SoftDeletes;
/**
@@ -58,7 +59,7 @@ class Note extends Model
*
* Get all of the owning noteable models.
*/
public function noteable()
public function noteable(): MorphTo
{
return $this->morphTo();
}

View File

@@ -26,6 +26,7 @@ use Carbon\Carbon;
use Crypt;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -123,7 +124,7 @@ class PiggyBank extends Model
* @codeCoverageIgnore
* Get all of the piggy bank's notes.
*/
public function notes()
public function notes(): MorphMany
{
return $this->morphMany(Note::class, 'noteable');
}

View File

@@ -28,6 +28,7 @@ use FireflyIII\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -112,7 +113,7 @@ class Recurrence extends Model
* @codeCoverageIgnore
* Get all of the notes.
*/
public function notes()
public function notes(): MorphMany
{
return $this->morphMany(Note::class, 'noteable');
}

View File

@@ -30,6 +30,7 @@ use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Collection;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -59,6 +60,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @property string period_marker
* @property Carbon $date
* @property string $transaction_type_type
* @property int $id
* @property TransactionType $transactionType
*
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -248,7 +251,7 @@ class TransactionJournal extends Model
* @codeCoverageIgnore
* Get all of the notes.
*/
public function notes()
public function notes(): MorphMany
{
return $this->morphMany(Note::class, 'noteable');
}

View File

@@ -26,6 +26,7 @@ use Carbon\Carbon;
use Crypt;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
@@ -111,7 +112,7 @@ class TransactionJournalLink extends Model
* @codeCoverageIgnore
* Get all of the notes.
*/
public function notes()
public function notes(): MorphMany
{
return $this->morphMany(Note::class, 'noteable');
}