Compare commits

..

No commits in common. 'b10dfdf4116db55ca4714717bec0eabefd6981a0' and 'ee8253ba71fbb551fe3c1fc3eb7c88b12ea89286' have entirely different histories.

@ -14,13 +14,11 @@ return static function (DeptracConfig $config): void {
->paths('./src') ->paths('./src')
->excludeFiles('#.*test.*#') ->excludeFiles('#.*test.*#')
->layers( ->layers(
$analyzePublic = Layer::withName('AnalyzePublic') $analyzePublic = Layer::withName('AnalyzePublic')->collectors(
->collectors(
ClassLikeConfig::create('Kartierung\\Analyze\\Exception\\.+'), ClassLikeConfig::create('Kartierung\\Analyze\\Exception\\.+'),
ClassLikeConfig::create('Kartierung\\Analyze\\Result\\.+') ClassLikeConfig::create('Kartierung\\Analyze\\Result\\.+')
), ),
$analyze = Layer::withName('Analyze') $analyze = Layer::withName('Analyze')->collectors(
->collectors(
BoolConfig::create( BoolConfig::create(
must: [ClassLikeConfig::create('Kartierung\\Analyze\\.+')], must: [ClassLikeConfig::create('Kartierung\\Analyze\\.+')],
mustNot: [ mustNot: [
@ -28,8 +26,7 @@ return static function (DeptracConfig $config): void {
] ]
) )
), ),
$attribute = Layer::withName('Attribute') $attribute = Layer::withName('Attribute')->collectors(
->collectors(
ClassLikeConfig::create('Kartierung\\Attribute\\.*'), ClassLikeConfig::create('Kartierung\\Attribute\\.*'),
), ),
) )

@ -5,20 +5,14 @@ declare(strict_types=1);
namespace Kartierung\Analyze; namespace Kartierung\Analyze;
use Kartierung\Analyze\Exception\InvalidEntity; use Kartierung\Analyze\Exception\InvalidEntity;
use Kartierung\Analyze\Exception\InvalidRepository;
use Kartierung\Analyze\Result\ClassType;
use Kartierung\Analyze\Result\EntityField; use Kartierung\Analyze\Result\EntityField;
use Kartierung\Analyze\Result\EntityResult; use Kartierung\Analyze\Result\EntityResult;
use Kartierung\Analyze\Result\FieldAccess; use Kartierung\Analyze\Result\FieldAccess;
use Kartierung\Analyze\Result\PrimitiveType;
use Kartierung\Attribute\Column; use Kartierung\Attribute\Column;
use Kartierung\Attribute\Id; use Kartierung\Attribute\Id;
use Kartierung\Attribute\Table; use Kartierung\Attribute\Table;
use ReflectionClass; use ReflectionClass;
use ReflectionIntersectionType;
use ReflectionNamedType;
use ReflectionParameter; use ReflectionParameter;
use ReflectionUnionType;
/** /**
* @template E of object * @template E of object
@ -67,7 +61,7 @@ readonly class EntityAnalyzer
/** /**
* @param ReflectionClass<E> $refClass * @param ReflectionClass<E> $refClass
* @return list<EntityField> * @return list<EntityField<E>>
*/ */
private function fields(ReflectionClass $refClass): array private function fields(ReflectionClass $refClass): array
{ {
@ -85,8 +79,8 @@ readonly class EntityAnalyzer
} }
/** /**
* @param list<EntityField> $fields * @param list<EntityField<E>> $fields
* @return EntityField * @return EntityField<E>
*/ */
private function idField(array $fields): EntityField private function idField(array $fields): EntityField
{ {
@ -103,7 +97,7 @@ readonly class EntityAnalyzer
} }
/** /**
* @return EntityField * @return EntityField<E>
*/ */
private function fieldFromParameter(ReflectionParameter $param): EntityField private function fieldFromParameter(ReflectionParameter $param): EntityField
{ {
@ -123,47 +117,18 @@ readonly class EntityAnalyzer
return new EntityField( return new EntityField(
name: $param->name, name: $param->name,
type: $this->parameterType($param), fqcn: $this->entity,
columnName: $name, columnName: $name,
isIdField: count($param->getAttributes(Id::class)) > 0, isIdField: count($param->getAttributes(Id::class)) > 0,
readAccess: $readAccess readAccess: $readAccess
); );
} }
private function parameterType(ReflectionParameter $param): PrimitiveType|ClassType
{
if (!$param->hasType()) {
throw new InvalidEntity(
"Entity parameter $this->entity::$param->name has no type declaration. Add one."
);
}
$type = $param->getType();
if (!$type instanceof ReflectionNamedType) {
throw new InvalidRepository(
"Entity parameter $this->entity::$param->name has an invalid return type. "
. 'Simple type expected. Unions, Intersections or no type are not simple.'
);
}
// workaround for phpstan
/** @var class-string<object> $classType */
$classType = $type->getName();
return match ($type->getName()) {
"string" => PrimitiveType::STRING,
"bool" => PrimitiveType::BOOLEAN,
"int" => PrimitiveType::INTEGER,
"float" => PrimitiveType::FLOAT,
default => new ClassType($classType)
};
}
/** /**
* @param ReflectionClass<E> $refClass * @param ReflectionClass<E> $refClass
* @return FieldAccess * @return FieldAccess
*/ */
private function readAccess(ReflectionClass $refClass, ReflectionParameter $param): FieldAccess public function readAccess(ReflectionClass $refClass, ReflectionParameter $param): FieldAccess
{ {
$getter = 'get' . ucfirst($param->getName()); $getter = 'get' . ucfirst($param->getName());

@ -1,15 +0,0 @@
<?php
declare(strict_types=1);
namespace Kartierung\Analyze\Result;
readonly class ClassType
{
/**
* @param class-string<object> $fqcn
*/
public function __construct(
public string $fqcn
) {}
}

@ -4,11 +4,17 @@ declare(strict_types=1);
namespace Kartierung\Analyze\Result; namespace Kartierung\Analyze\Result;
/**
* @template P of object
*/
readonly class EntityField readonly class EntityField
{ {
/**
* @param class-string<P> $fqcn
*/
public function __construct( public function __construct(
public string $name, public string $name,
public PrimitiveType|ClassType $type, public string $fqcn,
public string $columnName, public string $columnName,
public bool $isIdField, public bool $isIdField,
public FieldAccess $readAccess, public FieldAccess $readAccess,

@ -11,9 +11,8 @@ readonly class EntityResult
{ {
/** /**
* @param class-string<E> $classFqcn * @param class-string<E> $classFqcn
* @param string $tableName * @param EntityField $fields
* @param list<EntityField> $fields * @param EntityField<E> $idField
* @param EntityField $idField
*/ */
public function __construct( public function __construct(
public string $classFqcn, public string $classFqcn,

@ -1,13 +0,0 @@
<?php
declare(strict_types=1);
namespace Kartierung\Analyze\Result;
enum PrimitiveType
{
case INTEGER;
case BOOLEAN;
case FLOAT;
case STRING;
}

@ -7,7 +7,9 @@ namespace Kartierung\Analyze;
use Kartierung\Analyze\Exception\InvalidEntity; use Kartierung\Analyze\Exception\InvalidEntity;
use Kartierung\Analyze\Result\EntityField; use Kartierung\Analyze\Result\EntityField;
use Kartierung\Analyze\Result\FieldAccess; use Kartierung\Analyze\Result\FieldAccess;
use Kartierung\Analyze\Result\PrimitiveType; use Kartierung\EntityWithoutId;
use Kartierung\EntityWithoutTableAttribute;
use Kartierung\EntityWithTwoIds;
use Kartierung\FullEntity; use Kartierung\FullEntity;
use Kartierung\PropertyPropagatedEntity; use Kartierung\PropertyPropagatedEntity;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
@ -39,7 +41,7 @@ class EntityAnalyzerTest extends TestCase
$this->assertContainsEquals( $this->assertContainsEquals(
new EntityField( new EntityField(
name: 'intField', name: 'intField',
type: PrimitiveType::INTEGER, fqcn: $entity,
columnName: 'int-field', columnName: 'int-field',
isIdField: false, isIdField: false,
readAccess: FieldAccess::GETTER readAccess: FieldAccess::GETTER
@ -49,7 +51,7 @@ class EntityAnalyzerTest extends TestCase
$this->assertContainsEquals( $this->assertContainsEquals(
new EntityField( new EntityField(
name: 'idField', name: 'idField',
type: PrimitiveType::INTEGER, fqcn: $entity,
columnName: 'renamed-id-field', columnName: 'renamed-id-field',
isIdField: true, isIdField: true,
readAccess: FieldAccess::PUBLIC readAccess: FieldAccess::PUBLIC
@ -70,7 +72,7 @@ class EntityAnalyzerTest extends TestCase
$this->assertEquals( $this->assertEquals(
new EntityField( new EntityField(
name: 'idField', name: 'idField',
type: PrimitiveType::INTEGER, fqcn: $entity,
columnName: 'renamed-id-field', columnName: 'renamed-id-field',
isIdField: true, isIdField: true,
readAccess: FieldAccess::PUBLIC readAccess: FieldAccess::PUBLIC

@ -1,10 +0,0 @@
<?php
declare(strict_types=1);
namespace Kartierung\Analyze;
class EntityWithoutId
{
public string $stringField;
}

@ -5,11 +5,11 @@ declare(strict_types=1);
namespace Analyze; namespace Analyze;
use Kartierung\Analyze\Exception\InvalidRepository; use Kartierung\Analyze\Exception\InvalidRepository;
use Kartierung\Analyze\InvalidListResultOfRepository;
use Kartierung\Analyze\Repository;
use Kartierung\Analyze\RepositoryAnalyzer; use Kartierung\Analyze\RepositoryAnalyzer;
use Kartierung\Analyze\Result\RepositoryMethodParameter; use Kartierung\Analyze\Result\RepositoryMethodParameter;
use Kartierung\FullEntity; use Kartierung\FullEntity;
use Kartierung\InvalidListResultOfRepository;
use Kartierung\Repository;
use Kartierung\Repository\ResolutionStrategy\ResolutionStrategyFactory; use Kartierung\Repository\ResolutionStrategy\ResolutionStrategyFactory;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;

@ -2,9 +2,11 @@
declare(strict_types=1); declare(strict_types=1);
namespace Kartierung\Analyze; namespace Kartierung;
use Kartierung\Attribute\Column;
use Kartierung\Attribute\Id; use Kartierung\Attribute\Id;
use Kartierung\Attribute\Table;
class EntityWithTwoIds class EntityWithTwoIds
{ {

@ -0,0 +1,14 @@
<?php
declare(strict_types=1);
namespace Kartierung;
use Kartierung\Attribute\Column;
use Kartierung\Attribute\Id;
use Kartierung\Attribute\Table;
class EntityWithoutId
{
public string $stringField;
}

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace Kartierung\Analyze; namespace Kartierung;
use Kartierung\Attribute\Id; use Kartierung\Attribute\Id;
@ -10,6 +10,6 @@ class EntityWithoutTableAttribute
{ {
public function __construct( public function __construct(
#[Id] #[Id]
public int $id public $id
) {} ) {}
} }

@ -2,7 +2,7 @@
declare(strict_types=1); declare(strict_types=1);
namespace Kartierung\Analyze; namespace Kartierung;
use Kartierung\Attribute\ListResultOf; use Kartierung\Attribute\ListResultOf;

@ -2,11 +2,10 @@
declare(strict_types=1); declare(strict_types=1);
namespace Kartierung\Analyze; namespace Kartierung;
use Kartierung\Attribute\ListResultOf; use Kartierung\Attribute\ListResultOf;
use Kartierung\Attribute\Query; use Kartierung\Attribute\Query;
use Kartierung\FullEntity;
interface Repository interface Repository
{ {

@ -7,10 +7,9 @@ namespace Kartierung\Sql;
use Kartierung\Analyze\Result\EntityField; use Kartierung\Analyze\Result\EntityField;
use Kartierung\Analyze\Result\EntityResult; use Kartierung\Analyze\Result\EntityResult;
use Kartierung\Analyze\Result\FieldAccess; use Kartierung\Analyze\Result\FieldAccess;
use Kartierung\Analyze\Result\PrimitiveType;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
class DataToEntityMapperTest extends TestCase class DateToEntityMapperTest extends TestCase
{ {
public function testMapsWithDifferentMethods(): void public function testMapsWithDifferentMethods(): void
{ {
@ -22,14 +21,14 @@ class DataToEntityMapperTest extends TestCase
fields: [ fields: [
new EntityField( new EntityField(
name: 'publicVal', name: 'publicVal',
type: PrimitiveType::INTEGER, fqcn: 'int',
columnName: 'public_val', columnName: 'public_val',
isIdField: false, isIdField: false,
readAccess: FieldAccess::PUBLIC readAccess: FieldAccess::PUBLIC
), ),
new EntityField( new EntityField(
name: 'setterVal', name: 'setterVal',
type: PrimitiveType::INTEGER, fqcn: 'int',
columnName: 'setter_val', columnName: 'setter_val',
isIdField: false, isIdField: false,
readAccess: FieldAccess::GETTER readAccess: FieldAccess::GETTER
@ -37,7 +36,7 @@ class DataToEntityMapperTest extends TestCase
], ],
idField: new EntityField( idField: new EntityField(
name: '', name: '',
type: PrimitiveType::INTEGER, fqcn: '',
columnName: '', columnName: '',
isIdField: false, isIdField: false,
readAccess: FieldAccess::GETTER readAccess: FieldAccess::GETTER

@ -0,0 +1,10 @@
<?php
declare(strict_types=1);
namespace Kartierung;
interface UnionReturnTypeRepository
{
public function returnsUnion(): int|string;
}
Loading…
Cancel
Save