danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 20:34:47 +01:00
Code Issues Projects Releases Wiki Activity

Additional test and fix when comparing nested templates (vimeo#9094).

Browse Source
This commit is contained in:
Emmanuel GUITON 2023-01-11 13:17:06 +01:00
parent 9366c5ed32
commit 7b212954a9
2 changed files with 134 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/Psalm/Internal/Type/Comparator/ObjectComparator.php
View File

@ -17,6 +17,7 @@ use function current;
use function in_array;
use function strpos;
use function strtolower;
use function substr;
/**
* @internal
@ -37,22 +38,43 @@ class ObjectComparator
if ($container_type_part instanceof TTemplateParam
&& $input_type_part instanceof TTemplateParam
&& $container_type_part->defining_class != $input_type_part->defining_class
&& strpos($container_type_part->defining_class, 'fn-') !== 0
&& strpos($input_type_part->defining_class, 'fn-') !== 0
&& 1 == count($container_type_part->as->getAtomicTypes())
&& 1 == count($input_type_part->as->getAtomicTypes())) {
$containerAs = current($container_type_part->as->getAtomicTypes());
$inputAs = current($input_type_part->as->getAtomicTypes());
if ($containerAs instanceof TNamedObject && $inputAs instanceof TNamedObject) {
return self::isShallowlyContainedBy(
$codebase,
$inputAs,
$containerAs,
$allow_interface_equality,
$atomic_comparison_result,
);
} elseif ($containerAs instanceof TMixed && $inputAs instanceof TMixed) {
return true;
$containerDefinedInFunction = strpos($container_type_part->defining_class, 'fn-') === 0;
$inputDefinedInFunction = strpos($input_type_part->defining_class, 'fn-') === 0;
if ($inputDefinedInFunction) {
$separatorPos = strpos($input_type_part->defining_class, '::');
if ($separatorPos === false) {
// Is that possible ? Falling back to default definition.
$inputDefiningClass = $input_type_part->defining_class;
} else {
$inputDefiningClass = substr($input_type_part->defining_class, 3, $separatorPos - 3);
}
} else {
$inputDefiningClass = $input_type_part->defining_class;
}
// FIXME Missing analysis for additional cases, for example :
// - input from a parameter in a static function that is defined in the container class
// - input and container are both defined on function parameters
if ((!$inputDefinedInFunction
&& !$containerDefinedInFunction)
|| ($inputDefinedInFunction
&& !$containerDefinedInFunction
&& strtolower($inputDefiningClass) != strtolower($container_type_part->defining_class))) {
$containerAs = current($container_type_part->as->getAtomicTypes());
$inputAs = current($input_type_part->as->getAtomicTypes());
if ($containerAs instanceof TNamedObject && $inputAs instanceof TNamedObject) {
return self::isShallowlyContainedBy(
$codebase,
$inputAs,
$containerAs,
$allow_interface_equality,
$atomic_comparison_result,
);
} elseif ($containerAs instanceof TMixed && $inputAs instanceof TMixed) {
return true;
}
}
}

98
tests/Template/NestedTemplateTest.php
View File

@ -244,6 +244,104 @@ class NestedTemplateTest extends TestCase
abstract class AnObjectDbRepositoryWrapper
extends DbRepositoryWrapper {}',
],
'4levelNestedTemplateAsFunctionParameter' => [
'code' => '<?php
/**
* Interface for all DB entities that map to some data-model object.
*
* @template T
*/
interface DbEntity
{
/**
* Maps this entity to a data-model entity
*
* @return T Data-model entity to which this DB entity maps.
*/
public function toCore();
}
/**
* @template T of object
*/
abstract class EntityRepository {}
/**
* Base entity repository with common tooling.
*
* @template T of object
* @extends EntityRepository<T>
*/
abstract class DbEntityRepository
extends EntityRepository {}
interface ObjectId {}
/**
* @template I of ObjectId
*/
interface AnObject {}
/**
* Base entity repository with common tooling.
*
* @template I of ObjectId
* @template O of AnObject<I>
* @template E of DbEntity<O>
* @extends DbEntityRepository<E>
*/
abstract class AnObjectEntityRepository
extends DbEntityRepository
{}
/**
* Base repository implementation backed by a Db repository.
*
* @template T
* @template E of DbEntity<T>
* @template R of DbEntityRepository<E>
*/
abstract class DbRepositoryWrapper
{
/** @var R $repo Db repository */
private DbEntityRepository $repo;
/**
* Getter for the Db repository.
*
* @return DbEntityRepository The Db repository.
* @psalm-return R
*/
protected function getDbRepo(): DbEntityRepository
{
return $this->repo;
}
}
/**
* Base implementation for all custom repositories that map to Core objects.
*
* @template I of ObjectId
* @template O of AnObject<I>
* @template E of DbEntity<O>
* @template R of AnObjectEntityRepository<I, O, E>
* @extends DbRepositoryWrapper<O, E, R>
*/
abstract class AnObjectDbRepositoryWrapper
extends DbRepositoryWrapper {}
abstract class Utilities {
/**
* @template I of ObjectId
* @template O of AnObject<I>
* @template E of DbEntity<O>
* @template R of AnObjectEntityRepository<I, O, E>
* @psalm-param AnObjectDbRepositoryWrapper<I, O, E, R> $repo
* @return void
*/
abstract public static function doSomething(AnObjectDbRepositoryWrapper $repo): void;
}',
],
];
}