Skip to content

Commit

Permalink
Apply fixes from StyleCI
Browse files Browse the repository at this point in the history
  • Loading branch information
nunomaduro authored and StyleCIBot committed Nov 10, 2019
1 parent db93ccf commit d3c776f
Show file tree
Hide file tree
Showing 66 changed files with 242 additions and 240 deletions.
10 changes: 5 additions & 5 deletions config/mixins.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
* file that was distributed with this source code.
*/

use Illuminate\Pagination\Paginator;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Contracts\Pagination\LengthAwarePaginator as LengthAwarePaginatorContract;
use Illuminate\Contracts\Pagination\Paginator as PaginatorContract;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Contracts\Pagination\Paginator as PaginatorContract;
use Illuminate\Contracts\Pagination\LengthAwarePaginator as LengthAwarePaginatorContract;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Pagination\Paginator;

return [

Expand Down
2 changes: 1 addition & 1 deletion config/statics.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* file that was distributed with this source code.
*/

use Illuminate\Support\Facades\Facade;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Facade;

return [

Expand Down
20 changes: 10 additions & 10 deletions src/Analyser/Scope.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@

namespace NunoMaduro\Larastan\Analyser;

use ReflectionClass;
use function gettype;
use PHPStan\Type\Type;
use function get_class;
use function gettype;
use Illuminate\Contracts\Container\Container;
use function is_object;
use PhpParser\Node\Expr;
use PHPStan\TrinaryLogic;
use PHPStan\Type\TypehintHelper;
use NunoMaduro\Larastan\Concerns;
use PHPStan\ShouldNotHappenException;
use PHPStan\Analyser\Scope as BaseScope;
use NunoMaduro\Larastan\Properties\ReflectionTypeContainer;
use NunoMaduro\Larastan\Types\TypeResolver;
use Illuminate\Contracts\Container\Container;
use PhpParser\Node\Expr;
use PHPStan\Analyser\Scope as BaseScope;
use PHPStan\ShouldNotHappenException;
use PHPStan\TrinaryLogic;
use PHPStan\Type\Constant\ConstantStringType;
use NunoMaduro\Larastan\Properties\ReflectionTypeContainer;
use PHPStan\Type\Type;
use PHPStan\Type\TypehintHelper;
use ReflectionClass;

/**
* @internal
Expand Down
2 changes: 1 addition & 1 deletion src/ApplicationResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

namespace NunoMaduro\Larastan;

use function in_array;
use Composer\Autoload\ClassMapGenerator;
use Illuminate\Contracts\Foundation\Application;
use function in_array;
use Orchestra\Testbench\Concerns\CreatesApplication;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Concerns/HasContainer.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@

namespace NunoMaduro\Larastan\Concerns;

use ReflectionException;
use Illuminate\Container\Container;
use Psr\Container\NotFoundExceptionInterface;
use Illuminate\Contracts\Container\BindingResolutionException;
use Illuminate\Contracts\Container\Container as ContainerContract;
use Psr\Container\NotFoundExceptionInterface;
use ReflectionException;

/**
* @internal
Expand Down
6 changes: 3 additions & 3 deletions src/Console/CodeAnalyseCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@

namespace NunoMaduro\Larastan\Console;

use Illuminate\Console\Application as Artisan;
use Illuminate\Console\Command;
use Illuminate\Support\Str;
use function implode;
use function is_array;
use Illuminate\Support\Str;
use Illuminate\Console\Command;
use Symfony\Component\Process\Process;
use Illuminate\Console\Application as Artisan;

/**
* @internal
Expand Down
2 changes: 1 addition & 1 deletion src/Console/OptionsResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
namespace NunoMaduro\Larastan\Console;

use PHPStan\Command\AnalyseCommand;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputDefinition;
use Symfony\Component\Console\Input\InputOption;

/**
* @internal
Expand Down
2 changes: 1 addition & 1 deletion src/Contracts/Methods/PassableContract.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

namespace NunoMaduro\Larastan\Contracts\Methods;

use Illuminate\Contracts\Container\Container as ContainerContract;
use PHPStan\Broker\Broker;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Reflection\Php\PhpMethodReflectionFactory;
use Illuminate\Contracts\Container\Container as ContainerContract;

/**
* @internal
Expand Down
2 changes: 1 addition & 1 deletion src/Methods/AnnotationExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
namespace NunoMaduro\Larastan\Methods;

use NunoMaduro\Larastan\Concerns;
use PHPStan\Reflection\Annotations\AnnotationsMethodsClassReflectionExtension;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Reflection\MethodsClassReflectionExtension;
use PHPStan\Reflection\Annotations\AnnotationsMethodsClassReflectionExtension;

/**
* @internal
Expand Down
18 changes: 9 additions & 9 deletions src/Methods/EloquentBuilderForwardsCallsExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@

namespace NunoMaduro\Larastan\Methods;

use PHPStan\Type\StringType;
use PHPStan\Type\CallableType;
use NunoMaduro\Larastan\Concerns;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Query\Builder;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Reflection\PassedByReference;
use NunoMaduro\Larastan\Concerns;
use NunoMaduro\Larastan\Reflection\EloquentBuilderMethodReflection;
use PHPStan\Reflection\BrokerAwareExtension;
use PHPStan\Reflection\ParametersAcceptorSelector;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\Dummy\DummyMethodReflection;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Reflection\MethodsClassReflectionExtension;
use PHPStan\Reflection\Native\NativeParameterReflection;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use NunoMaduro\Larastan\Reflection\EloquentBuilderMethodReflection;
use PHPStan\Reflection\ParametersAcceptorSelector;
use PHPStan\Reflection\PassedByReference;
use PHPStan\Type\CallableType;
use PHPStan\Type\StringType;

final class EloquentBuilderForwardsCallsExtension implements MethodsClassReflectionExtension, BrokerAwareExtension
{
Expand Down
4 changes: 2 additions & 2 deletions src/Methods/Extension.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
namespace NunoMaduro\Larastan\Methods;

use NunoMaduro\Larastan\Concerns;
use PHPStan\Reflection\BrokerAwareExtension;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Reflection\BrokerAwareExtension;
use PHPStan\Reflection\Php\PhpMethodReflectionFactory;
use PHPStan\Reflection\MethodsClassReflectionExtension;
use PHPStan\Reflection\Php\PhpMethodReflectionFactory;

/**
* @internal
Expand Down
4 changes: 2 additions & 2 deletions src/Methods/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@

namespace NunoMaduro\Larastan\Methods;

use PHPStan\Broker\Broker;
use Illuminate\Pipeline\Pipeline;
use NunoMaduro\Larastan\Concerns;
use NunoMaduro\Larastan\Contracts\Methods\PassableContract;
use PHPStan\Broker\Broker;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\Php\PhpMethodReflectionFactory;
use NunoMaduro\Larastan\Contracts\Methods\PassableContract;

/**
* @internal
Expand Down
4 changes: 2 additions & 2 deletions src/Methods/Macro.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
namespace NunoMaduro\Larastan\Methods;

use Closure;
use stdClass;
use ErrorException;
use PHPStan\Reflection\Php\BuiltinMethodReflection;
use ReflectionClass;
use ReflectionFunction;
use PHPStan\Reflection\Php\BuiltinMethodReflection;
use stdClass;

final class Macro implements BuiltinMethodReflection
{
Expand Down
20 changes: 10 additions & 10 deletions src/Methods/ModelForwardsCallsExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@

namespace NunoMaduro\Larastan\Methods;

use PHPStan\Type\ObjectType;
use PHPStan\Type\IntegerType;
use NunoMaduro\Larastan\Concerns;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Contracts\Pagination\Paginator;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Query\Builder as QueryBuilder;
use NunoMaduro\Larastan\Concerns;
use NunoMaduro\Larastan\Reflection\EloquentBuilderMethodReflection;
use PHPStan\Reflection\BrokerAwareExtension;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\MethodReflection;
use Illuminate\Database\Eloquent\Builder;
use PHPStan\Reflection\BrokerAwareExtension;
use Illuminate\Contracts\Pagination\Paginator;
use PHPStan\Reflection\ParametersAcceptorSelector;
use Illuminate\Database\Query\Builder as QueryBuilder;
use PHPStan\Reflection\MethodsClassReflectionExtension;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use NunoMaduro\Larastan\Reflection\EloquentBuilderMethodReflection;
use PHPStan\Reflection\ParametersAcceptorSelector;
use PHPStan\Type\IntegerType;
use PHPStan\Type\ObjectType;

final class ModelForwardsCallsExtension implements MethodsClassReflectionExtension, BrokerAwareExtension
{
Expand Down
12 changes: 6 additions & 6 deletions src/Methods/ModelTypeHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@

namespace NunoMaduro\Larastan\Methods;

use PHPStan\Type\Type;
use PHPStan\Type\UnionType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\TypeCombinator;
use PHPStan\Type\StaticResolvableType;
use Illuminate\Database\Eloquent\Model;
use PHPStan\Type\ObjectType;
use PHPStan\Type\ObjectWithoutClassType;
use PHPStan\Type\StaticResolvableType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use PHPStan\Type\UnionType;

final class ModelTypeHelper
{
Expand All @@ -32,7 +32,7 @@ public static function replaceStaticTypeWithModel(Type $type, string $modelClass
$types[$key] = new ObjectType($modelClass);
}
}

$type = new UnionType($types);
}

Expand Down
8 changes: 4 additions & 4 deletions src/Methods/Passable.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@

namespace NunoMaduro\Larastan\Methods;

use Mockery;
use Illuminate\Contracts\Pipeline\Pipeline;
use LogicException;
use PHPStan\Broker\Broker;
use Mockery;
use NunoMaduro\Larastan\Concerns;
use NunoMaduro\Larastan\Contracts\Methods\PassableContract;
use PHPStan\Broker\Broker;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\MethodReflection;
use Illuminate\Contracts\Pipeline\Pipeline;
use PHPStan\Reflection\Php\PhpMethodReflection;
use PHPStan\Reflection\Php\PhpMethodReflectionFactory;
use NunoMaduro\Larastan\Contracts\Methods\PassableContract;

/**
* @internal
Expand Down
6 changes: 3 additions & 3 deletions src/Methods/Pipes/Auths.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
namespace NunoMaduro\Larastan\Methods\Pipes;

use Closure;
use function in_array;
use NunoMaduro\Larastan\Concerns;
use Illuminate\Contracts\Auth\Access\Authorizable;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Contracts\Auth\CanResetPassword;
use Illuminate\Contracts\Auth\Access\Authorizable;
use function in_array;
use NunoMaduro\Larastan\Concerns;
use NunoMaduro\Larastan\Contracts\Methods\PassableContract;
use NunoMaduro\Larastan\Contracts\Methods\Pipes\PipeContract;

Expand Down
8 changes: 4 additions & 4 deletions src/Methods/Pipes/BuilderDynamicWheres.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
namespace NunoMaduro\Larastan\Methods\Pipes;

use Closure;
use Illuminate\Support\Str;
use PHPStan\Type\ObjectType;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Query\Builder;
use PHPStan\Reflection\ParametersAcceptorSelector;
use Illuminate\Support\Str;
use NunoMaduro\Larastan\Contracts\Methods\PassableContract;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use NunoMaduro\Larastan\Contracts\Methods\Pipes\PipeContract;
use NunoMaduro\Larastan\Reflection\EloquentBuilderMethodReflection;
use PHPStan\Reflection\ParametersAcceptorSelector;
use PHPStan\Type\ObjectType;

/**
* @internal
Expand Down
14 changes: 7 additions & 7 deletions src/Methods/Pipes/BuilderLocalMacros.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
namespace NunoMaduro\Larastan\Methods\Pipes;

use Closure;
use ReflectionClass;
use function in_array;
use ReflectionFunction;
use PHPStan\Type\ObjectType;
use NunoMaduro\Larastan\Concerns;
use NunoMaduro\Larastan\Methods\Macro;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Eloquent\SoftDeletingScope;
use function in_array;
use NunoMaduro\Larastan\Concerns;
use NunoMaduro\Larastan\Contracts\Methods\PassableContract;
use NunoMaduro\Larastan\Contracts\Methods\Pipes\PipeContract;
use NunoMaduro\Larastan\Methods\Macro;
use PHPStan\Type\ObjectType;
use ReflectionClass;
use ReflectionFunction;

/**
* @internal
Expand Down
2 changes: 1 addition & 1 deletion src/Methods/Pipes/Contracts.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
use Closure;
use function get_class;
use NunoMaduro\Larastan\Concerns;
use PHPStan\Reflection\ClassReflection;
use NunoMaduro\Larastan\Contracts\Methods\PassableContract;
use NunoMaduro\Larastan\Contracts\Methods\Pipes\PipeContract;
use PHPStan\Reflection\ClassReflection;

/**
* @internal
Expand Down
10 changes: 5 additions & 5 deletions src/Methods/Pipes/Facades.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
namespace NunoMaduro\Larastan\Methods\Pipes;

use Closure;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Facade;
use Illuminate\Support\Str;
use NunoMaduro\Larastan\Contracts\Methods\PassableContract;
use NunoMaduro\Larastan\Contracts\Methods\Pipes\PipeContract;

Expand All @@ -39,8 +39,8 @@ public function handle(PassableContract $passable, Closure $next): void
if ($concrete = $facadeClass::getFacadeRoot()) {
$found = $passable->sendToPipeline(get_class($concrete), true);
}
if (!$found && Str::startsWith($passable->getMethodName(), 'assert')) {

if (! $found && Str::startsWith($passable->getMethodName(), 'assert')) {
$found = $passable->sendToPipeline($this->getFake($classReflection->getName()), true);
}
}
Expand All @@ -49,11 +49,11 @@ public function handle(PassableContract $passable, Closure $next): void
$next($passable);
}
}

private function getFake(string $facade) : string
{
$shortClassName = substr($facade, strrpos($facade, '\\') + 1);

return sprintf("\Illuminate\Support\Testing\Fakes\%sFake", $shortClassName);
}
}
Loading

0 comments on commit d3c776f

Please sign in to comment.