Merge pull request #56 from api-platform/fix_43

Allow to generate all properties again

Author: dunglas

src/TypesGenerator.php

@@ -113,8 +113,10 @@ public function __construct(\Twig_Environment $twig, LoggerInterface $logger, ar
 
     /**
      * Generates files.
+     *
+     * @param array $config
      */
-    public function generate($config)
+    public function generate(array $config)
     {
         $baseClass = [
             'constants' => [],
@@ -226,11 +228,9 @@ public function generate($config)
             // Fields
             foreach ($propertiesMap[$type->getUri()] as $property) {
                 // Ignore properties not set if using a config file
-                if (isset($typeConfig['properties']) && is_array($typeConfig['properties']) && !array_key_exists($property->localName(), $typeConfig['properties'])) {
-                    continue;
+                if ($typeConfig['allProperties'] || (is_array($typeConfig['properties']) && array_key_exists($property->localName(), $typeConfig['properties']))) {
+                    $class = $this->generateField($config, $class, $type, $typeName, $property->localName(), $property);
                 }
-
-                $class = $this->generateField($config, $class, $type, $typeName, $property->localName(), $property);
             }
 
             // Add custom fields (non schema.org)
@@ -266,8 +266,7 @@ public function generate($config)
             }
 
             // When including all properties, ignore properties already set on parent
-            $typeConfig = isset($config['types'][$class['name']]) ? $config['types'][$class['name']] : null;
-            if ((!isset($typeConfig['properties']) || !is_array($typeConfig['properties'])) && $class['parent']) {
+            if (isset($config['types'][$class['name']]['allProperties']) && $config['types'][$class['name']]['allProperties'] && $class['parent']) {
                 $type = $class['resource'];
 
                 foreach ($propertiesMap[$type->getUri()] as $property) {

src/TypesGeneratorConfiguration.php

@@ -58,9 +58,7 @@ function ($rdfa) {
                 ->end()
                 ->arrayNode('relations')
                     ->info('OWL relation files to use')
-                    ->defaultValue([
-                        self::GOOD_RELATIONS_OWL_URL,
-                    ])
+                    ->defaultValue([self::GOOD_RELATIONS_OWL_URL])
                     ->prototype('scalar')->end()
                 ->end()
                 ->booleanNode('debug')->defaultFalse()->info('Debug mode')->end()
@@ -88,6 +86,18 @@ function ($rdfa) {
                 ->scalarNode('author')->defaultFalse()->info('The value of the phpDoc\'s @author annotation')->example('Kévin Dunglas <[email protected]>')->end()
                 ->enumNode('fieldVisibility')->values(['private', 'protected', 'public'])->defaultValue('private')->cannotBeEmpty()->info('Visibility of entities fields')->end()
                 ->arrayNode('types')
+                    ->beforeNormalization()
+                        ->always()
+                        ->then(function ($v) {
+                            foreach ($v as $key => $type) {
+                                if (!isset($type['properties'])) {
+                                    $v[$key]['allProperties'] = true;
+                                }
+                            }
+
+                            return $v;
+                        })
+                    ->end()
                     ->info('Schema.org\'s types to use')
                     ->useAttributeAsKey('id')
                     ->prototype('array')
@@ -111,6 +121,7 @@ function ($rdfa) {
                             ->end()
                             ->scalarNode('parent')->defaultNull()->info('The parent class, set to false for a top level class')->end()
                             ->scalarNode('guessFrom')->defaultValue('Thing')->info('If declaring a custom class, this will be the class from which properties type will be guessed')->end()
+                            ->booleanNode('allProperties')->defaultFalse()->info('Import all existing properties')->end()
                             ->arrayNode('properties')
                                 ->info('Properties of this type to use')
                                 ->useAttributeAsKey('id')

tests/TypesGeneratorTest.php

@@ -31,10 +31,6 @@ public function testGenerate()
         $twigProphecy->render('class.php.twig', Argument::type('array'))->willReturn();
         $twig = $twigProphecy->reveal();
 
-        $logger = new NullLogger();
-
-        $graphs = $this->getGraphs();
-
         $cardinalitiesExtractorProphecy = $this->prophesize('ApiPlatform\SchemaGenerator\CardinalitiesExtractor');
         $cardinalities = $this->getCardinalities();
         $cardinalitiesExtractorProphecy->extract()->willReturn($cardinalities)->shouldBeCalled();
@@ -43,7 +39,7 @@ public function testGenerate()
         $goodRelationsBridgeProphecy = $this->prophesize('ApiPlatform\SchemaGenerator\GoodRelationsBridge');
         $goodRelationsBridge = $goodRelationsBridgeProphecy->reveal();
 
-        $typesGenerator = new TypesGenerator($twig, $logger, $graphs, $cardinalitiesExtractor, $goodRelationsBridge);
+        $typesGenerator = new TypesGenerator($twig, new NullLogger(), $this->getGraphs(), $cardinalitiesExtractor, $goodRelationsBridge);
 
         $typesGenerator->generate($this->getConfig());
     }
@@ -132,13 +128,15 @@ private function getConfig()
             'output' => 'build/type-generator-test',
             'types' => [
                 'Article' => [
+                    'allProperties' => false,
                     'properties' => [
                         'articleBody' => null,
                         'articleSection' => null,
                     ],
                     'vocabularyNamespace' => TypesGenerator::SCHEMA_ORG_NAMESPACE,
                 ],
                 'CreativeWork' => [
+                    'allProperties' => false,
                     'properties' => [
                         'author' => [
                             'cardinality' => CardinalitiesExtractor::CARDINALITY_N_0,
@@ -151,22 +149,21 @@ private function getConfig()
                     'vocabularyNamespace' => TypesGenerator::SCHEMA_ORG_NAMESPACE,
                 ],
                 'BlogPosting' => [
+                    'allProperties' => true,
                     'properties' => null,
                     'vocabularyNamespace' => TypesGenerator::SCHEMA_ORG_NAMESPACE,
                 ],
                 'Person' => [
-                    'properties' => [
-                    ],
+                    'allProperties' => false,
+                    'properties' => [],
                     'vocabularyNamespace' => TypesGenerator::SCHEMA_ORG_NAMESPACE,
                 ],
                 'SocialMediaPosting' => [
-                    'properties' => null,
+                    'allProperties' => true,
                     'vocabularyNamespace' => TypesGenerator::SCHEMA_ORG_NAMESPACE,
                 ],
                 'Thing' => [
-                    'properties' => [
-                        'name' => null,
-                    ],
+                    'allProperties' => true,
                     'vocabularyNamespace' => TypesGenerator::SCHEMA_ORG_NAMESPACE,
                 ],
             ],