fix: manage lang string directly in range (#376)

Author: alanpoulain

src/PhpTypeConverter.php

@@ -21,6 +21,8 @@
 
 final class PhpTypeConverter implements PhpTypeConverterInterface
 {
+    private const RDF_LANG_STRING = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#langString';
+
     /**
      * Is this type a datatype?
      */
@@ -107,16 +109,17 @@ private function getNonArrayType(SchemaProperty $property, array $classes): ?str
     }
 
     /**
-     * This is a hack to detect internationalized strings in ActivityStreams.
+     * This is a hack to detect internationalized strings.
      *
      * @todo find something smarter to detect this kind of strings
      */
     private function isLangString(RdfResource $range): bool
     {
-        return $range->isBNode() &&
+        return self::RDF_LANG_STRING === $this->getUri($range)
+            || ($range->isBNode() &&
             null !== ($unionOf = $range->get('owl:unionOf')) &&
             null !== ($rdfFirst = $unionOf->get('rdf:first')) &&
-            'http://www.w3.org/1999/02/22-rdf-syntax-ns#langString' === $rdfFirst->getUri();
+            self::RDF_LANG_STRING === $rdfFirst->getUri());
     }
 
     private function getUri(RdfResource $range): string

tests/Command/GenerateCommandTest.php

@@ -424,6 +424,30 @@ public function testSupersededProperties(): void
         $this->assertStringNotContainsString('protected', $creativeWork);
     }
 
+    public function testActivityStreams(): void
+    {
+        $outputDir = __DIR__.'/../../build/activity-streams';
+        $config = __DIR__.'/../config/activity-streams.yaml';
+
+        $this->fs->mkdir($outputDir);
+
+        $commandTester = new CommandTester(new GenerateCommand());
+        $this->assertEquals(0, $commandTester->execute(['output' => $outputDir, 'config' => $config]));
+
+        $object = file_get_contents("$outputDir/App/Entity/Object_.php");
+
+        $this->assertStringContainsString(<<<'PHP'
+    /**
+     * The content of the object.
+     *
+     * @see http://www.w3.org/ns/activitystreams#content
+     */
+    #[ApiProperty(iri: 'http://www.w3.org/ns/activitystreams#content')]
+    private ?string $content = null;
+PHP
+            , $object);
+    }
+
     public function testGenerationWithoutConfigFileQuestion(): void
     {
         // No config file is given.

tests/TypesGeneratorTest.php

@@ -170,6 +170,14 @@ public function testGenerateAllResolveTypes(): void
 
         $finder = new Finder();
         self::assertSame(2, $finder->files()->in($this->outputDir)->count());
+
+        $competencyWorldEntity = file_get_contents("$this->outputDir/App/Entity/CompetencyWorldEntity.php");
+        $this->assertStringContainsString('class CompetencyWorldEntity extends Thing', $competencyWorldEntity);
+        $this->assertStringContainsString('private ?int $id = null;', $competencyWorldEntity);
+        $this->assertStringContainsString('private string $hasAppellation;', $competencyWorldEntity);
+        $this->assertStringContainsString('public function getId(): ?int', $competencyWorldEntity);
+        $this->assertStringContainsString('public function setHasAppellation(string $hasAppellation): void', $competencyWorldEntity);
+        $this->assertStringContainsString('public function getHasAppellation(): string', $competencyWorldEntity);
     }
 
     public function testGenerateVocabAllTypes(): void
@@ -228,6 +236,7 @@ private function getGraphs(): array
 
         $nodeGraph->addResource('https://gitlab.com/mmorg/nodefr-2/hasAppellation', 'rdf:type', 'rdf:Property');
         $nodeGraph->addResource('https://gitlab.com/mmorg/nodefr-2/hasAppellation', 'schema:domainIncludes', 'https://gitlab.com/mmorg/nodefr-2/CompetencyWorldEntity');
+        $nodeGraph->addResource('https://gitlab.com/mmorg/nodefr-2/hasAppellation', 'schema:rangeIncludes', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#langString');
         $nodeGraph->addResource('https://gitlab.com/mmorg/nodefr-2/hasAppellation', 'schema:rangeIncludes', 'https://schema.org/Text');
 
         $graph = new RdfGraph(SchemaGeneratorConfiguration::SCHEMA_ORG_URI);