mirror of
https://github.com/danog/psalm.git
synced 2024-12-02 17:52:45 +01:00
Daniil Gentili
1986c8b4a8
* Immutable CodeLocation * Remove excess clones * Remove external clones * Remove leftover clones * Fix final clone issue * Immutable storages * Refactoring * Fixes * Fixes * Fix * Fix * Fixes * Simplify * Fixes * Fix * Fixes * Update * Fix * Cache global types * Fix * Update * Update * Fixes * Fixes * Refactor * Fixes * Fix * Fix * More caching * Fix * Fix * Update * Update * Fix * Fixes * Update * Refactor * Update * Fixes * Break one more test * Fix * FIx * Fix * Fix * Fix * Fix * Improve performance and readability * Equivalent logic * Fixes * Revert * Revert "Revert" This reverts commit f9175100c8452c80559234200663fd4c4f4dd889. * Fix * Fix reference bug * Make default TypeVisitor immutable * Bugfix * Remove clones * Partial refactoring * Refactoring * Fixes * Fix * Fixes * Fixes * cs-fix * Fix final bugs * Add test * Misc fixes * Update * Fixes * Experiment with removing different property * revert "Experiment with removing different property" This reverts commit ac1156e077fc4ea633530d51096d27b6e88bfdf9. * Uniform naming * Uniform naming * Hack hotfix * Clean up $_FILES ref #8621 * Undo hack, try fixing properly * Helper method * Remove redundant call * Partially fix bugs * Cleanup * Change defaults * Fix bug * Fix (?, hope this doesn't break anything else) * cs-fix * Review fixes * Bugfix * Bugfix * Improve logic * Add support for list{} and callable-list{} types, properly implement array_is_list assertions (fixes #8389) * Default to sealed arrays * Fix array_merge bug * Fixes * Fix * Sealed type checks * Properly infer properties-of and get_object_vars on final classes * Fix array_map zipping * Fix tests * Fixes * Fixes * Fix more stuff * Recursively resolve type aliases * Fix typo * Fixes * Fix array_is_list assertion on keyed array * Add BC docs * Fixes * fix * Update * Update * Update * Update * Seal arrays with count assertions * Fix #8528 * Fix * Update * Improve sealed array foreach logic * get_object_vars on template properties * Fix sealed array assertion reconciler logic * Improved reconciler * Add tests * Single source of truth for test types * Fix tests * Fixup tests * Fixup tests * Fixup tests * Update * Fix tests * Fix tests * Final fixes * Fixes * Use list syntax only when needed * Fix tests * Cs-fix * Update docs * Update docs * Update docs * Update docs * Update docs * Document missing types * Update docs * Improve class-string-map docs * Update * Update * I love working on psalm :) * Keep arrays unsealed by default * Fixup tests * Fix syntax mistake * cs-fix * Fix typo * Re-import missing types * Keep strict types only in return types * argc/argv fixes * argc/argv fixes * Fix test * Comment-out valinor code, pinging @romm pls merge https://github.com/CuyZ/Valinor/pull/246 so we can add valinor to the psalm docs :)
169 lines
5.5 KiB
PHP
169 lines
5.5 KiB
PHP
<?php
|
|
|
|
namespace Psalm\Tests\Template;
|
|
|
|
use Psalm\Tests\TestCase;
|
|
use Psalm\Tests\Traits\InvalidCodeAnalysisTestTrait;
|
|
use Psalm\Tests\Traits\ValidCodeAnalysisTestTrait;
|
|
|
|
class NestedTemplateTest extends TestCase
|
|
{
|
|
use InvalidCodeAnalysisTestTrait;
|
|
use ValidCodeAnalysisTestTrait;
|
|
|
|
/**
|
|
*
|
|
*/
|
|
public function providerValidCodeParse(): iterable
|
|
{
|
|
return [
|
|
'nestedTemplateExtends' => [
|
|
'code' => '<?php
|
|
namespace Foo;
|
|
|
|
interface IBaseViewData {}
|
|
|
|
/**
|
|
* @template TViewData
|
|
*/
|
|
class BaseModel {}
|
|
|
|
/**
|
|
* @template TViewData as IBaseViewData
|
|
* @template TModel as BaseModel<TViewData>
|
|
*/
|
|
abstract class BaseRepository {}
|
|
|
|
class StudentViewData implements IBaseViewData {}
|
|
class TeacherViewData implements IBaseViewData {}
|
|
|
|
/** @extends BaseModel<StudentViewData> */
|
|
class StudentModel extends BaseModel {}
|
|
|
|
/** @extends BaseModel<TeacherViewData> */
|
|
class TeacherModel extends BaseModel {}
|
|
|
|
/** @extends BaseRepository<StudentViewData, StudentModel> */
|
|
class StudentRepository extends BaseRepository {}
|
|
|
|
/** @extends BaseRepository<TeacherViewData, TeacherModel> */
|
|
class TeacherRepository extends BaseRepository {}'
|
|
],
|
|
'unwrapIndirectGenericTemplated' => [
|
|
'code' => '<?php
|
|
/**
|
|
* @template TInner
|
|
*/
|
|
interface Wrapper {
|
|
/** @return TInner */
|
|
public function unwrap() : object;
|
|
}
|
|
|
|
/**
|
|
* @template TInner2
|
|
* @template TWrapper2 of Wrapper<TInner2>
|
|
* @param TWrapper2 $wrapper
|
|
* @return TInner2
|
|
*/
|
|
function indirectUnwrap(Wrapper $wrapper) : object {
|
|
return unwrapGeneric($wrapper);
|
|
}
|
|
|
|
/**
|
|
* @template TInner1
|
|
* @template TWrapper1 of Wrapper<TInner1>
|
|
* @param TWrapper1 $wrapper
|
|
* @return TInner1
|
|
*/
|
|
function unwrapGeneric(Wrapper $wrapper) {
|
|
return $wrapper->unwrap();
|
|
}'
|
|
],
|
|
'unwrapFromTemplatedClassString' => [
|
|
'code' => '<?php
|
|
/**
|
|
* @template TInner
|
|
*/
|
|
interface Wrapper {
|
|
/** @return TInner */
|
|
public function unwrap();
|
|
}
|
|
|
|
/**
|
|
* @implements Wrapper<string>
|
|
*/
|
|
class StringWrapper implements Wrapper {
|
|
public function unwrap() {
|
|
return "hello";
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @template TInner
|
|
* @template TWrapper of Wrapper<TInner>
|
|
*
|
|
* @param class-string<TWrapper> $class
|
|
* @return TInner
|
|
*/
|
|
function load(string $class) {
|
|
$package = new $class();
|
|
return $package->unwrap();
|
|
}
|
|
|
|
$result = load(StringWrapper::class);'
|
|
],
|
|
'unwrapNestedTemplateWithReset' => [
|
|
'code' => '<?php
|
|
/**
|
|
* @template TValue
|
|
* @template TArray of non-empty-array<TValue>
|
|
* @param TArray $arr
|
|
* @return TValue
|
|
*/
|
|
function toList(array $arr): array {
|
|
return reset($arr);
|
|
}'
|
|
],
|
|
];
|
|
}
|
|
|
|
/**
|
|
*
|
|
*/
|
|
public function providerInvalidCodeParse(): iterable
|
|
{
|
|
return [
|
|
'nestedTemplateExtendsInvalid' => [
|
|
'code' => '<?php
|
|
namespace Foo;
|
|
|
|
interface IBaseViewData {}
|
|
|
|
/**
|
|
* @template TViewData
|
|
*/
|
|
class BaseModel {}
|
|
|
|
/**
|
|
* @template TViewData as IBaseViewData
|
|
* @template TModel as BaseModel<TViewData>
|
|
*/
|
|
abstract class BaseRepository {}
|
|
|
|
class StudentViewData implements IBaseViewData {}
|
|
class TeacherViewData implements IBaseViewData {}
|
|
|
|
/** @extends BaseModel<StudentViewData> */
|
|
class StudentModel extends BaseModel {}
|
|
|
|
/** @extends BaseModel<TeacherViewData> */
|
|
class TeacherModel extends BaseModel {}
|
|
|
|
/** @extends BaseRepository<StudentViewData, TeacherModel> */
|
|
class StudentRepository extends BaseRepository {}',
|
|
'error_message' => 'InvalidTemplateParam'
|
|
],
|
|
];
|
|
}
|
|
}
|