Compare commits

..

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

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

@ -5,20 +5,14 @@ declare(strict_types=1);
namespace Kartierung\Analyze;
use Kartierung\Analyze\Exception\InvalidEntity;
use Kartierung\Analyze\Exception\InvalidRepository;
use Kartierung\Analyze\Result\ClassType;
use Kartierung\Analyze\Result\EntityField;
use Kartierung\Analyze\Result\EntityResult;
use Kartierung\Analyze\Result\FieldAccess;
use Kartierung\Analyze\Result\PrimitiveType;
use Kartierung\Attribute\Column;
use Kartierung\Attribute\Id;
use Kartierung\Attribute\Table;
use ReflectionClass;
use ReflectionIntersectionType;
use ReflectionNamedType;
use ReflectionParameter;
use ReflectionUnionType;
/**
* @template E of object
@ -67,7 +61,7 @@ readonly class EntityAnalyzer
/**
* @param ReflectionClass<E> $refClass
* @return list<EntityField>
* @return list<EntityField<E>>
*/
private function fields(ReflectionClass $refClass): array
{
@ -85,8 +79,8 @@ readonly class EntityAnalyzer
}
/**
* @param list<EntityField> $fields
* @return EntityField
* @param list<EntityField<E>> $fields
* @return EntityField<E>
*/
private function idField(array $fields): EntityField
{
@ -103,7 +97,7 @@ readonly class EntityAnalyzer
}
/**
* @return EntityField
* @return EntityField<E>
*/
private function fieldFromParameter(ReflectionParameter $param): EntityField
{
@ -123,47 +117,18 @@ readonly class EntityAnalyzer
return new EntityField(
name: $param->name,
type: $this->parameterType($param),
fqcn: $this->entity,
columnName: $name,
isIdField: count($param->getAttributes(Id::class)) > 0,
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
* @return FieldAccess
*/
private function readAccess(ReflectionClass $refClass, ReflectionParameter $param): FieldAccess
public function readAccess(ReflectionClass $refClass, ReflectionParameter $param): FieldAccess
{
$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;
/**
* @template P of object
*/
readonly class EntityField
{
/**
* @param class-string<P> $fqcn
*/
public function __construct(
public string $name,
public PrimitiveType|ClassType $type,
public string $fqcn,
public string $columnName,
public bool $isIdField,
public FieldAccess $readAccess,

@ -11,9 +11,8 @@ readonly class EntityResult
{
/**
* @param class-string<E> $classFqcn
* @param string $tableName
* @param list<EntityField> $fields
* @param EntityField $idField
* @param EntityField $fields
* @param EntityField<E> $idField
*/
public function __construct(
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\Result\EntityField;
use Kartierung\Analyze\Result\FieldAccess;
use Kartierung\Analyze\Result\PrimitiveType;
use Kartierung\EntityWithoutId;
use Kartierung\EntityWithoutTableAttribute;
use Kartierung\EntityWithTwoIds;
use Kartierung\FullEntity;
use Kartierung\PropertyPropagatedEntity;
use PHPUnit\Framework\TestCase;
@ -39,7 +41,7 @@ class EntityAnalyzerTest extends TestCase
$this->assertContainsEquals(
new EntityField(
name: 'intField',
type: PrimitiveType::INTEGER,
fqcn: $entity,
columnName: 'int-field',
isIdField: false,
readAccess: FieldAccess::GETTER
@ -49,7 +51,7 @@ class EntityAnalyzerTest extends TestCase
$this->assertContainsEquals(
new EntityField(
name: 'idField',
type: PrimitiveType::INTEGER,
fqcn: $entity,
columnName: 'renamed-id-field',
isIdField: true,
readAccess: FieldAccess::PUBLIC
@ -70,7 +72,7 @@ class EntityAnalyzerTest extends TestCase
$this->assertEquals(
new EntityField(
name: 'idField',
type: PrimitiveType::INTEGER,
fqcn: $entity,
columnName: 'renamed-id-field',
isIdField: true,
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;
use Kartierung\Analyze\Exception\InvalidRepository;
use Kartierung\Analyze\InvalidListResultOfRepository;
use Kartierung\Analyze\Repository;
use Kartierung\Analyze\RepositoryAnalyzer;
use Kartierung\Analyze\Result\RepositoryMethodParameter;
use Kartierung\FullEntity;
use Kartierung\InvalidListResultOfRepository;
use Kartierung\Repository;
use Kartierung\Repository\ResolutionStrategy\ResolutionStrategyFactory;
use PHPUnit\Framework\TestCase;

@ -2,9 +2,11 @@
declare(strict_types=1);
namespace Kartierung\Analyze;
namespace Kartierung;
use Kartierung\Attribute\Column;
use Kartierung\Attribute\Id;
use Kartierung\Attribute\Table;
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);
namespace Kartierung\Analyze;
namespace Kartierung;
use Kartierung\Attribute\Id;
@ -10,6 +10,6 @@ class EntityWithoutTableAttribute
{
public function __construct(
#[Id]
public int $id
public $id
) {}
}

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

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

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

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