Skip to content

Commit ed77cc7

Browse files
edmondscommerceedmondscommerce
authored
Merge pull request #227 from edmondscommerce/DoctrineUpdateFixes
Doctrine update fixes
2 parents 1b9af1c + 6fd2cb2 commit ed77cc7

File tree

56 files changed

+1152
-796
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1152
-796
lines changed

‎.phpstorm.meta.php/container.meta.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
'\EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Creation\Src\Validation\Constraints\PropertyConstraintValidatorCreator'=>\EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Creation\Src\Validation\Constraints\PropertyConstraintValidatorCreator::class,
103103
'\EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\ReflectionHelper'=>\EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\ReflectionHelper::class,
104104
'\EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Generator\RelationsGenerator'=>\EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Generator\RelationsGenerator::class,
105+
'\EdmondsCommerce\DoctrineStaticMeta\RelationshipHelper'=>\EdmondsCommerce\DoctrineStaticMeta\RelationshipHelper::class,
105106
'\EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Command\RemoveUnusedRelationsCommand'=>\EdmondsCommerce\DoctrineStaticMeta\CodeGeneration\Command\RemoveUnusedRelationsCommand::class,
106107
'\EdmondsCommerce\DoctrineStaticMeta\Entity\Repositories\RepositoryFactory'=>\EdmondsCommerce\DoctrineStaticMeta\Entity\Repositories\RepositoryFactory::class,
107108
'\EdmondsCommerce\DoctrineStaticMeta\Schema\Schema'=>\EdmondsCommerce\DoctrineStaticMeta\Schema\Schema::class,

‎codeTemplates/src/Entity/Relations/TemplateEntity/Traits/HasRequiredTemplateEntities/HasRequiredTemplateEntitiesInverseManyToMany.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// phpcs:disable
33
namespace TemplateNamespace\Entity\Relations\TemplateEntity\Traits\HasRequiredTemplateEntities;
44

5-
use Doctrine\Common\Inflector\Inflector;
5+
use EdmondsCommerce\DoctrineStaticMeta\MappingHelper;
66
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
77
use EdmondsCommerce\DoctrineStaticMeta\Exception\DoctrineStaticMetaException;
88
use ReflectionException;
@@ -42,16 +42,18 @@ public static function metaForTemplateEntities(
4242
TemplateEntity::class
4343
);
4444
$manyToManyBuilder->mappedBy(self::getDoctrineStaticMeta()->getPlural());
45-
$fromTableName = Inflector::tableize(TemplateEntity::getDoctrineStaticMeta()->getPlural());
46-
$toTableName = Inflector::tableize(self::getDoctrineStaticMeta()->getPlural());
45+
$fromTableName = MappingHelper::getInflector()->tableize(TemplateEntity::getDoctrineStaticMeta()->getPlural());
46+
$toTableName = MappingHelper::getInflector()->tableize(self::getDoctrineStaticMeta()->getPlural());
4747
$manyToManyBuilder->setJoinTable($fromTableName . '_to_' . $toTableName);
4848
$manyToManyBuilder->addJoinColumn(
49-
Inflector::tableize(self::getDoctrineStaticMeta()->getSingular() . '_' . static::PROP_ID),
49+
MappingHelper::getInflector()->tableize(self::getDoctrineStaticMeta()->getSingular() .
50+
'_' .
51+
static::PROP_ID),
5052
static::PROP_ID,
5153
true
5254
);
5355
$manyToManyBuilder->addInverseJoinColumn(
54-
Inflector::tableize(
56+
MappingHelper::getInflector()->tableize(
5557
TemplateEntity::getDoctrineStaticMeta()->getSingular()
5658
) . '_' . TemplateEntity::PROP_ID,
5759
TemplateEntity::PROP_ID,

‎codeTemplates/src/Entity/Relations/TemplateEntity/Traits/HasRequiredTemplateEntities/HasRequiredTemplateEntitiesOwningManyToMany.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// phpcs:disable
33
namespace TemplateNamespace\Entity\Relations\TemplateEntity\Traits\HasRequiredTemplateEntities;
44

5-
use Doctrine\Common\Inflector\Inflector;
5+
use EdmondsCommerce\DoctrineStaticMeta\MappingHelper;
66
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
77
use EdmondsCommerce\DoctrineStaticMeta\Exception\DoctrineStaticMetaException;
88
use ReflectionException;
@@ -43,18 +43,18 @@ public static function metaForTemplateEntities(
4343
TemplateEntity::class
4444
);
4545
$manyToManyBuilder->inversedBy(self::getDoctrineStaticMeta()->getPlural());
46-
$fromTableName = Inflector::tableize(self::getDoctrineStaticMeta()->getPlural());
47-
$toTableName = Inflector::tableize(TemplateEntity::getDoctrineStaticMeta()->getPlural());
46+
$fromTableName = MappingHelper::getInflector()->tableize(self::getDoctrineStaticMeta()->getPlural());
47+
$toTableName = MappingHelper::getInflector()->tableize(TemplateEntity::getDoctrineStaticMeta()->getPlural());
4848
$manyToManyBuilder->setJoinTable($fromTableName . '_to_' . $toTableName);
4949
$manyToManyBuilder->addJoinColumn(
50-
Inflector::tableize(
50+
MappingHelper::getInflector()->tableize(
5151
self::getDoctrineStaticMeta()->getSingular()
5252
) . '_' . static::PROP_ID,
5353
static::PROP_ID,
5454
false
5555
);
5656
$manyToManyBuilder->addInverseJoinColumn(
57-
Inflector::tableize(
57+
MappingHelper::getInflector()->tableize(
5858
TemplateEntity::getDoctrineStaticMeta()->getSingular()
5959
) . '_' . TemplateEntity::PROP_ID,
6060
TemplateEntity::PROP_ID,

‎codeTemplates/src/Entity/Relations/TemplateEntity/Traits/HasRequiredTemplateEntities/HasRequiredTemplateEntitiesUnidirectionalOneToMany.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// phpcs:disable
33
namespace TemplateNamespace\Entity\Relations\TemplateEntity\Traits\HasRequiredTemplateEntities;
44

5-
use Doctrine\Common\Inflector\Inflector;
5+
use EdmondsCommerce\DoctrineStaticMeta\MappingHelper;
66
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
77
use EdmondsCommerce\DoctrineStaticMeta\Exception\DoctrineStaticMetaException;
88
use ReflectionException;
@@ -38,16 +38,16 @@ public static function metaForTemplateEntities(
3838
TemplateEntity::getDoctrineStaticMeta()->getPlural(),
3939
TemplateEntity::class
4040
);
41-
$fromTableName = Inflector::tableize(self::getDoctrineStaticMeta()->getSingular());
42-
$toTableName = Inflector::tableize(TemplateEntity::getDoctrineStaticMeta()->getPlural());
41+
$fromTableName = MappingHelper::getInflector()->tableize(self::getDoctrineStaticMeta()->getSingular());
42+
$toTableName = MappingHelper::getInflector()->tableize(TemplateEntity::getDoctrineStaticMeta()->getPlural());
4343
$manyToManyBuilder->setJoinTable($fromTableName . '_to_' . $toTableName);
4444
$manyToManyBuilder->addJoinColumn(
45-
Inflector::tableize(self::getDoctrineStaticMeta()->getSingular()) . '_' . static::PROP_ID,
45+
MappingHelper::getInflector()->tableize(self::getDoctrineStaticMeta()->getSingular()) . '_' . static::PROP_ID,
4646
static::PROP_ID,
4747
false
4848
);
4949
$manyToManyBuilder->addInverseJoinColumn(
50-
Inflector::tableize(
50+
MappingHelper::getInflector()->tableize(
5151
TemplateEntity::getDoctrineStaticMeta()->getSingular()
5252
) . '_' . TemplateEntity::PROP_ID,
5353
TemplateEntity::PROP_ID,

‎codeTemplates/src/Entity/Relations/TemplateEntity/Traits/HasRequiredTemplateEntity/HasRequiredTemplateEntityInverseOneToOne.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace TemplateNamespace\Entity\Relations\TemplateEntity\Traits\HasRequiredTemplateEntity;
55

6-
use Doctrine\Common\Inflector\Inflector;
6+
use EdmondsCommerce\DoctrineStaticMeta\MappingHelper;
77
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
88
use EdmondsCommerce\DoctrineStaticMeta\Entity\Fields\Interfaces\PrimaryKey\IdFieldInterface;
99
use EdmondsCommerce\DoctrineStaticMeta\Exception\DoctrineStaticMetaException;
@@ -46,7 +46,7 @@ public static function metaForTemplateEntity(
4646
$inverseOneToOne
4747
->mappedBy(self::getDoctrineStaticMeta()->getSingular())
4848
->addJoinColumn(
49-
Inflector::tableize(
49+
MappingHelper::getInflector()->tableize(
5050
TemplateEntity::getDoctrineStaticMeta()->getSingular()
5151
) . '_' . IdFieldInterface::PROP_ID,
5252
IdFieldInterface::PROP_ID,

‎codeTemplates/src/Entity/Relations/TemplateEntity/Traits/HasRequiredTemplateEntity/HasRequiredTemplateEntityManyToOne.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// phpcs:disable
33
namespace TemplateNamespace\Entity\Relations\TemplateEntity\Traits\HasRequiredTemplateEntity;
44

5-
use Doctrine\Common\Inflector\Inflector;
5+
use EdmondsCommerce\DoctrineStaticMeta\MappingHelper;
66
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
77
use EdmondsCommerce\DoctrineStaticMeta\Entity\Fields\Interfaces\PrimaryKey\IdFieldInterface;
88
use EdmondsCommerce\DoctrineStaticMeta\Exception\DoctrineStaticMetaException;
@@ -48,7 +48,7 @@ public static function metaForTemplateEntity(
4848
$manyToOne
4949
->inversedBy(self::getDoctrineStaticMeta()->getPlural())
5050
->addJoinColumn(
51-
Inflector::tableize(
51+
MappingHelper::getInflector()->tableize(
5252
TemplateEntity::getDoctrineStaticMeta()->getSingular()
5353
) . '_' . IdFieldInterface::PROP_ID,
5454
IdFieldInterface::PROP_ID,

‎codeTemplates/src/Entity/Relations/TemplateEntity/Traits/HasRequiredTemplateEntity/HasRequiredTemplateEntityOwningOneToOne.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// phpcs:disable
33
namespace TemplateNamespace\Entity\Relations\TemplateEntity\Traits\HasRequiredTemplateEntity;
44

5-
use Doctrine\Common\Inflector\Inflector;
5+
use EdmondsCommerce\DoctrineStaticMeta\MappingHelper;
66
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
77
use EdmondsCommerce\DoctrineStaticMeta\Entity\Fields\Interfaces\PrimaryKey\IdFieldInterface;
88
use EdmondsCommerce\DoctrineStaticMeta\Exception\DoctrineStaticMetaException;
@@ -45,7 +45,7 @@ public static function metaForTemplateEntity(
4545
->inversedBy(
4646
self::getDoctrineStaticMeta()->getSingular()
4747
)->addJoinColumn(
48-
Inflector::tableize(
48+
MappingHelper::getInflector()->tableize(
4949
TemplateEntity::getDoctrineStaticMeta()->getSingular()
5050
) . '_' . IdFieldInterface::PROP_ID,
5151
IdFieldInterface::PROP_ID,

‎codeTemplates/src/Entity/Relations/TemplateEntity/Traits/HasRequiredTemplateEntity/HasRequiredTemplateEntityUnidirectionalManyToOne.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// phpcs:disable
33
namespace TemplateNamespace\Entity\Relations\TemplateEntity\Traits\HasRequiredTemplateEntity;
44

5-
use Doctrine\Common\Inflector\Inflector;
5+
use EdmondsCommerce\DoctrineStaticMeta\MappingHelper;
66
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
77
use EdmondsCommerce\DoctrineStaticMeta\Entity\Fields\Interfaces\PrimaryKey\IdFieldInterface;
88
use EdmondsCommerce\DoctrineStaticMeta\Exception\DoctrineStaticMetaException;
@@ -41,7 +41,7 @@ public static function metaForTemplateEntity(
4141
TemplateEntity::class
4242
);
4343
$unidirectionalManyToOne->addJoinColumn(
44-
Inflector::tableize(
44+
MappingHelper::getInflector()->tableize(
4545
TemplateEntity::getDoctrineStaticMeta()->getSingular()
4646
) . '_' . IdFieldInterface::PROP_ID,
4747
IdFieldInterface::PROP_ID,

‎codeTemplates/src/Entity/Relations/TemplateEntity/Traits/HasRequiredTemplateEntity/HasRequiredTemplateEntityUnidirectionalOneToOne.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// phpcs:disable
33
namespace TemplateNamespace\Entity\Relations\TemplateEntity\Traits\HasRequiredTemplateEntity;
44

5-
use Doctrine\Common\Inflector\Inflector;
5+
use EdmondsCommerce\DoctrineStaticMeta\MappingHelper;
66
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
77
use EdmondsCommerce\DoctrineStaticMeta\Entity\Fields\Interfaces\PrimaryKey\IdFieldInterface;
88
use EdmondsCommerce\DoctrineStaticMeta\Exception\DoctrineStaticMetaException;
@@ -39,7 +39,7 @@ public static function metaForTemplateEntity(
3939
TemplateEntity::class
4040
);
4141
$unidirectionalOneToOn->addJoinColumn(
42-
Inflector::tableize(
42+
MappingHelper::getInflector()->tableize(
4343
TemplateEntity::getDoctrineStaticMeta()->getSingular()
4444
) . '_' . IdFieldInterface::PROP_ID,
4545
IdFieldInterface::PROP_ID,

‎codeTemplates/src/Entity/Relations/TemplateEntity/Traits/HasTemplateEntities/HasTemplateEntitiesInverseManyToMany.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// phpcs:disable
33
namespace TemplateNamespace\Entity\Relations\TemplateEntity\Traits\HasTemplateEntities;
44

5-
use Doctrine\Common\Inflector\Inflector;
5+
use EdmondsCommerce\DoctrineStaticMeta\MappingHelper;
66
use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
77
use EdmondsCommerce\DoctrineStaticMeta\Exception\DoctrineStaticMetaException;
88
use ReflectionException;
@@ -42,15 +42,15 @@ public static function metaForTemplateEntities(
4242
TemplateEntity::class
4343
);
4444
$manyToManyBuilder->mappedBy(self::getDoctrineStaticMeta()->getPlural());
45-
$fromTableName = Inflector::tableize(TemplateEntity::getDoctrineStaticMeta()->getPlural());
46-
$toTableName = Inflector::tableize(self::getDoctrineStaticMeta()->getPlural());
45+
$fromTableName = MappingHelper::getInflector()->tableize(TemplateEntity::getDoctrineStaticMeta()->getPlural());
46+
$toTableName = MappingHelper::getInflector()->tableize(self::getDoctrineStaticMeta()->getPlural());
4747
$manyToManyBuilder->setJoinTable($fromTableName . '_to_' . $toTableName);
4848
$manyToManyBuilder->addJoinColumn(
49-
Inflector::tableize(self::getDoctrineStaticMeta()->getSingular() . '_' . static::PROP_ID),
49+
MappingHelper::getInflector()->tableize(self::getDoctrineStaticMeta()->getSingular() . '_' . static::PROP_ID),
5050
static::PROP_ID
5151
);
5252
$manyToManyBuilder->addInverseJoinColumn(
53-
Inflector::tableize(
53+
MappingHelper::getInflector()->tableize(
5454
TemplateEntity::getDoctrineStaticMeta()->getSingular() . '_' . TemplateEntity::PROP_ID
5555
),
5656
TemplateEntity::PROP_ID

0 commit comments

Comments
 (0)