danog/psalm-plugin
1
0
Fork 0
mirror of https://github.com/danog/psalm-plugin.git synced 2024-11-26 12:25:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove dependency on psl

Browse Source
This commit is contained in:
azjezz 2021-03-27 21:50:28 +01:00
parent af20829f44
commit 731323971d
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@ -11,7 +11,6 @@
],
"require": {
"php": "^7.4 || ^8.0",
"azjezz/psl": "^1.5",
"vimeo/psalm": "^4.6"
},
"require-dev": {
@ -51,5 +50,6 @@
"psalm": {
"pluginClass": "Psl\\Psalm\\Plugin"
}
}
}
},
"minimum-stability": "dev"
}

11
src/EventHandler/Type/Optional/FunctionReturnTypeProvider.php
View File

@ -7,12 +7,11 @@ namespace Psl\Psalm\EventHandler\Type\Optional;
use Psalm\Plugin\EventHandler\Event\FunctionReturnTypeProviderEvent;
use Psalm\Plugin\EventHandler\FunctionReturnTypeProviderInterface;
use Psalm\Type;
use Psl\Iter;
final class FunctionReturnTypeProvider implements FunctionReturnTypeProviderInterface
{
/**
* @return array<lowercase-string>
* @return non-empty-list<lowercase-string>
*/
public static function getFunctionIds(): array
{
@ -23,15 +22,15 @@ final class FunctionReturnTypeProvider implements FunctionReturnTypeProviderInte
public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $event): ?Type\Union
{
$argument = Iter\first($event->getCallArgs());
$argument = $event->getCallArgs()[0] ?? null;
if (null === $argument) {
return null;
}
$type = $event
->getStatementsSource()
->getNodeTypeProvider()
->getType($argument->value);
->getStatementsSource()
->getNodeTypeProvider()
->getType($argument->value);
if (null === $type) {
return null;

16
src/EventHandler/Type/Shape/FunctionReturnTypeProvider.php
View File

@ -7,13 +7,11 @@ namespace Psl\Psalm\EventHandler\Type\Shape;
use Psalm\Plugin\EventHandler\Event\FunctionReturnTypeProviderEvent;
use Psalm\Plugin\EventHandler\FunctionReturnTypeProviderInterface;
use Psalm\Type;
use Psl\Iter;
use Psl\Type\TypeInterface;
final class FunctionReturnTypeProvider implements FunctionReturnTypeProviderInterface
{
/**
* @return array<lowercase-string>
* @return non-empty-list<lowercase-string>
*/
public static function getFunctionIds(): array
{
@ -24,9 +22,9 @@ final class FunctionReturnTypeProvider implements FunctionReturnTypeProviderInte
public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $event): ?Type\Union
{
$argument = Iter\first($event->getCallArgs());
$argument = $event->getCallArgs()[0] ?? null;
if (null === $argument) {
return new Type\Union([new Type\Atomic\TGenericObject(TypeInterface::class, [
return new Type\Union([new Type\Atomic\TGenericObject('Psl\Type\TypeInterface', [
new Type\Union([
new Type\Atomic\TArray([
new Type\Union([new Type\Atomic\TArrayKey()]),
@ -39,7 +37,7 @@ final class FunctionReturnTypeProvider implements FunctionReturnTypeProviderInte
$statements_source = $event->getStatementsSource();
$type = $statements_source->getNodeTypeProvider()->getType($argument->value);
if (null === $type) {
return new Type\Union([new Type\Atomic\TGenericObject(TypeInterface::class, [
return new Type\Union([new Type\Atomic\TGenericObject('Psl\Type\TypeInterface', [
new Type\Union([
new Type\Atomic\TArray([
new Type\Union([new Type\Atomic\TArrayKey()]),
@ -52,7 +50,7 @@ final class FunctionReturnTypeProvider implements FunctionReturnTypeProviderInte
$atomic = $type->getAtomicTypes();
$argument_shape = $atomic['array'] ?? null;
if (!$argument_shape instanceof Type\Atomic\TKeyedArray) {
return new Type\Union([new Type\Atomic\TGenericObject(TypeInterface::class, [
return new Type\Union([new Type\Atomic\TGenericObject('Psl\Type\TypeInterface', [
new Type\Union([
new Type\Atomic\TArray([
new Type\Union([new Type\Atomic\TArrayKey()]),
@ -64,7 +62,7 @@ final class FunctionReturnTypeProvider implements FunctionReturnTypeProviderInte
$properties = [];
foreach ($argument_shape->properties as $name => $value) {
$type = Iter\first($value->getAtomicTypes());
$type = \array_values($value->getAtomicTypes())[0] ?? null;
if (!$type instanceof Type\Atomic\TGenericObject) {
return null;
}
@ -75,7 +73,7 @@ final class FunctionReturnTypeProvider implements FunctionReturnTypeProviderInte
$properties[$name] = $property_type;
}
return new Type\Union([new Type\Atomic\TGenericObject(TypeInterface::class, [
return new Type\Union([new Type\Atomic\TGenericObject('Psl\Type\TypeInterface', [
new Type\Union([
new Type\Atomic\TKeyedArray($properties)
])