Skip to content
This repository has been archived by the owner on Jun 18, 2019. It is now read-only.

Commit

Permalink
revert auto phpstorm changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Gummibeer committed May 31, 2019
1 parent 2c9c57f commit 56fd95d
Showing 1 changed file with 29 additions and 31 deletions.
60 changes: 29 additions & 31 deletions src/Translatable/Translatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

namespace Dimsav\Translatable;

use Illuminate\Database\Eloquent\MassAssignmentException;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Database\Query\Builder as QueryBuilder;
Expand All @@ -23,7 +21,7 @@ trait Translatable
* @param string|null $locale
* @param bool $withFallback
*
* @return Model|null
* @return \Illuminate\Database\Eloquent\Model|null
*/
public function translate($locale = null, $withFallback = false)
{
Expand All @@ -35,7 +33,7 @@ public function translate($locale = null, $withFallback = false)
*
* @param string $locale
*
* @return Model|null
* @return \Illuminate\Database\Eloquent\Model|null
*/
public function translateOrDefault($locale = null)
{
Expand All @@ -47,7 +45,7 @@ public function translateOrDefault($locale = null)
*
* @param string $locale
*
* @return Model|null
* @return \Illuminate\Database\Eloquent\Model|null
*/
public function translateOrNew($locale = null)
{
Expand All @@ -58,7 +56,7 @@ public function translateOrNew($locale = null)
* @param string|null $locale
* @param bool $withFallback
*
* @return Model|null
* @return \Illuminate\Database\Eloquent\Model|null
*/
public function getTranslation($locale = null, $withFallback = null)
{
Expand Down Expand Up @@ -151,7 +149,7 @@ public function getLocaleKey()
}

/**
* @return HasMany
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function translations()
{
Expand Down Expand Up @@ -276,7 +274,7 @@ public function save(array $options = [])
/**
* @param string $locale
*
* @return Model
* @return \Illuminate\Database\Eloquent\Model
*/
protected function getTranslationOrNew($locale = null)
{
Expand All @@ -292,7 +290,7 @@ protected function getTranslationOrNew($locale = null)
/**
* @param array $attributes
*
* @throws MassAssignmentException
* @throws \Illuminate\Database\Eloquent\MassAssignmentException
* @return $this
*/
public function fill(array $attributes)
Expand Down Expand Up @@ -390,8 +388,8 @@ public function isTranslationAttribute($key)
/**
* @param string $key
*
* @throws \Dimsav\Translatable\Exception\LocalesNotDefinedException
* @return bool
* @throws LocalesNotDefinedException
*/
protected function isKeyALocale($key)
{
Expand All @@ -401,8 +399,8 @@ protected function isKeyALocale($key)
}

/**
* @throws \Dimsav\Translatable\Exception\LocalesNotDefinedException
* @return array
* @throws LocalesNotDefinedException
*/
protected function getLocales()
{
Expand Down Expand Up @@ -464,7 +462,7 @@ protected function saveTranslations()
/**
* @param array
*
* @return Model
* @return \Illuminate\Database\Eloquent\Model
*/
public function replicateWithTranslations(array $except = null)
{
Expand All @@ -480,7 +478,7 @@ public function replicateWithTranslations(array $except = null)
}

/**
* @param Model $translation
* @param \Illuminate\Database\Eloquent\Model $translation
*
* @return bool
*/
Expand All @@ -495,7 +493,7 @@ protected function isTranslationDirty(Model $translation)
/**
* @param string $locale
*
* @return Model
* @return \Illuminate\Database\Eloquent\Model
*/
public function getNewTranslation($locale)
{
Expand All @@ -518,10 +516,10 @@ public function __isset($key)
}

/**
* @param Builder $query
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $locale
*
* @return Builder|static
* @return \Illuminate\Database\Eloquent\Builder|static
*/
public function scopeTranslatedIn(Builder $query, $locale = null)
{
Expand All @@ -533,10 +531,10 @@ public function scopeTranslatedIn(Builder $query, $locale = null)
}

/**
* @param Builder $query
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $locale
*
* @return Builder|static
* @return \Illuminate\Database\Eloquent\Builder|static
*/
public function scopeNotTranslatedIn(Builder $query, $locale = null)
{
Expand All @@ -548,9 +546,9 @@ public function scopeNotTranslatedIn(Builder $query, $locale = null)
}

/**
* @param Builder $query
* @param \Illuminate\Database\Eloquent\Builder $query
*
* @return Builder|static
* @return \Illuminate\Database\Eloquent\Builder|static
*/
public function scopeTranslated(Builder $query)
{
Expand All @@ -566,7 +564,7 @@ public function scopeTranslated(Builder $query)
* 'name' => 'Griechenland' // The translated name
* ].
*
* @param Builder $query
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $translationField
*/
public function scopeListsTranslations(Builder $query, $translationField)
Expand Down Expand Up @@ -620,12 +618,12 @@ public function scopeWithTranslation(Builder $query)
/**
* This scope filters results by checking the translation fields.
*
* @param Builder $query
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $key
* @param string $value
* @param string $locale
*
* @return Builder|static
* @return \Illuminate\Database\Eloquent\Builder|static
*/
public function scopeWhereTranslation(Builder $query, $key, $value, $locale = null)
{
Expand All @@ -640,12 +638,12 @@ public function scopeWhereTranslation(Builder $query, $key, $value, $locale = nu
/**
* This scope filters results by checking the translation fields.
*
* @param Builder $query
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $key
* @param string $value
* @param string $locale
*
* @return Builder|static
* @return \Illuminate\Database\Eloquent\Builder|static
*/
public function scopeOrWhereTranslation(Builder $query, $key, $value, $locale = null)
{
Expand All @@ -660,12 +658,12 @@ public function scopeOrWhereTranslation(Builder $query, $key, $value, $locale =
/**
* This scope filters results by checking the translation fields.
*
* @param Builder $query
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $key
* @param string $value
* @param string $locale
*
* @return Builder|static
* @return \Illuminate\Database\Eloquent\Builder|static
*/
public function scopeWhereTranslationLike(Builder $query, $key, $value, $locale = null)
{
Expand All @@ -680,12 +678,12 @@ public function scopeWhereTranslationLike(Builder $query, $key, $value, $locale
/**
* This scope filters results by checking the translation fields.
*
* @param Builder $query
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $key
* @param string $value
* @param string $locale
*
* @return Builder|static
* @return \Illuminate\Database\Eloquent\Builder|static
*/
public function scopeOrWhereTranslationLike(Builder $query, $key, $value, $locale = null)
{
Expand All @@ -700,11 +698,11 @@ public function scopeOrWhereTranslationLike(Builder $query, $key, $value, $local
/**
* This scope sorts results by the given translation field.
*
* @param Builder $query
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $key
* @param string $sortmethod
*
* @return Builder|static
* @return \Illuminate\Database\Eloquent\Builder|static
*/
public function scopeOrderByTranslation(Builder $query, $key, $sortmethod = 'asc')
{
Expand Down

0 comments on commit 56fd95d

Please sign in to comment.