Allow schema generator to use labels for naming

API resources and PHP classes

Author: Angatar

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.2.3
+
+* feat: Allow schema generator to use labels for naming API resources and PHP classes
+
 ## 5.2.2
 
 * fix: detect enum detection when an ancestor is an enum

src/CardinalitiesExtractor.php

@@ -13,8 +13,8 @@
 
 namespace ApiPlatform\SchemaGenerator;
 
-use EasyRdf\Graph as RdfGraph;
-use EasyRdf\Resource as RdfResource;
+use ApiPlatform\SchemaGenerator\Schema\Rdf\RdfGraph;
+use ApiPlatform\SchemaGenerator\Schema\Rdf\RdfResource;
 
 /**
  * Extracts cardinalities from the OWL definition, from GoodRelations or from Schema.org's comments.
@@ -104,7 +104,7 @@ private function extractForProperty(RdfResource $property): string
             return self::CARDINALITY_UNKNOWN;
         }
 
-        $fromGoodRelations = $this->goodRelationsBridge->extractCardinality($localName);
+        $fromGoodRelations = $this->goodRelationsBridge->extractCardinality($property->localId());
         if (false !== $fromGoodRelations) {
             return $fromGoodRelations;
         }

src/ClassMutator/AnnotationsAppender.php

@@ -16,7 +16,7 @@
 use ApiPlatform\SchemaGenerator\AnnotationGenerator\AnnotationGeneratorInterface;
 use ApiPlatform\SchemaGenerator\Model\Class_;
 use ApiPlatform\SchemaGenerator\Model\Use_;
-use EasyRdf\Resource as RdfResource;
+use ApiPlatform\SchemaGenerator\Schema\Rdf\RdfResource;
 
 final class AnnotationsAppender implements ClassMutatorInterface
 {

src/ClassMutator/ClassPropertiesAppender.php

@@ -16,8 +16,8 @@
 use ApiPlatform\SchemaGenerator\Model\Class_;
 use ApiPlatform\SchemaGenerator\PropertyGenerator\PropertyGeneratorInterface;
 use ApiPlatform\SchemaGenerator\Schema\Model\Class_ as SchemaClass;
-use EasyRdf\Graph as RdfGraph;
-use EasyRdf\Resource as RdfResource;
+use ApiPlatform\SchemaGenerator\Schema\Rdf\RdfGraph;
+use ApiPlatform\SchemaGenerator\Schema\Rdf\RdfResource;
 use Psr\Log\LoggerAwareTrait;
 
 final class ClassPropertiesAppender implements ClassMutatorInterface

src/Command/ExtractCardinalitiesCommand.php

@@ -16,7 +16,7 @@
 use ApiPlatform\SchemaGenerator\CardinalitiesExtractor;
 use ApiPlatform\SchemaGenerator\GoodRelationsBridge;
 use ApiPlatform\SchemaGenerator\SchemaGeneratorConfiguration;
-use EasyRdf\Graph as RdfGraph;
+use ApiPlatform\SchemaGenerator\Schema\Rdf\RdfGraph;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;

src/Schema/ClassMutator/EnumClassMutator.php

@@ -17,7 +17,7 @@
 use ApiPlatform\SchemaGenerator\Model\Class_;
 use ApiPlatform\SchemaGenerator\PhpTypeConverterInterface;
 use ApiPlatform\SchemaGenerator\Schema\Model\Constant as SchemaConstant;
-use EasyRdf\Graph as RdfGraph;
+use ApiPlatform\SchemaGenerator\Schema\Rdf\RdfGraph;
 
 final class EnumClassMutator extends BaseEnumClassMutator
 {

src/Schema/Generator.php

@@ -20,7 +20,7 @@
 use ApiPlatform\SchemaGenerator\Printer;
 use ApiPlatform\SchemaGenerator\TwigBuilder;
 use ApiPlatform\SchemaGenerator\TypesGenerator;
-use EasyRdf\Graph as RdfGraph;
+use ApiPlatform\SchemaGenerator\Schema\Rdf\RdfGraph;
 use Symfony\Component\Console\Logger\ConsoleLogger;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;

src/Schema/Model/Class_.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\SchemaGenerator\Schema\Model;
 
 use ApiPlatform\SchemaGenerator\Model\Class_ as BaseClass_;
-use EasyRdf\Resource as RdfResource;
+use ApiPlatform\SchemaGenerator\Schema\Rdf\RdfResource;
 
 final class Class_ extends BaseClass_
 {

src/Schema/Model/Constant.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\SchemaGenerator\Schema\Model;
 
 use ApiPlatform\SchemaGenerator\Model\Constant as BaseConstant;
-use EasyRdf\Resource as RdfResource;
+use ApiPlatform\SchemaGenerator\Schema\Rdf\RdfResource;
 
 final class Constant extends BaseConstant
 {

src/Schema/Model/Property.php

@@ -14,7 +14,7 @@
 namespace ApiPlatform\SchemaGenerator\Schema\Model;
 
 use ApiPlatform\SchemaGenerator\Model\Property as BaseProperty;
-use EasyRdf\Resource as RdfResource;
+use ApiPlatform\SchemaGenerator\Schema\Rdf\RdfResource;
 
 final class Property extends BaseProperty
 {