fix simple schema merge (#1)

* fix simple schema merge

* update composer

* update test, update infection

* fix ci

Author: nick-zh

Makefile

@@ -24,7 +24,7 @@ fix-code-style:
 
 infection-testing:
 	make coverage
-	${INFECTION} --coverage=build/logs/phpunit --min-msi=68 --threads=`nproc`
+	${INFECTION} --coverage=build/logs/phpunit --min-msi=67 --threads=`nproc`
 
 static-analysis:
 	${PHPSTAN} analyse --memory-limit 256m --no-progress

composer.json

@@ -17,7 +17,7 @@
     "phpstan/phpstan": "^0.12",
     "squizlabs/php_codesniffer": "^3.4.2",
     "friendsofphp/php-cs-fixer": "^2.15",
-    "infection/infection": "^0.17",
+    "infection/infection": "^0.20",
     "rregeer/phpunit-coverage-check": "^0.3"
   },
   "bin": [

docker/dev/php/Dockerfile

@@ -1,7 +1,5 @@
 FROM php:7.4-cli-alpine3.12
 
-# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
-ENV COMPOSER_ALLOW_SUPERUSER 1
 ARG HOST_USER_ID
 ARG HOST_USER
 
@@ -25,9 +23,6 @@ RUN mkdir /phpIni && \
 # COMPOSER: install binary
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer
 
-# COMPOSER: install dependencies
-RUN composer global require hirak/prestissimo
-
 USER $HOST_USER
 
 WORKDIR /var/www/html

phpstan.neon

@@ -3,7 +3,6 @@ parameters:
     paths: [ src ]
     checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
-        - "#Strict comparison using === between array<int, mixed> and ',' will always evaluate to false.#"
-        - "#Strict comparison using === between array<int, mixed> and ';' will always evaluate to false.#"
-        - '#Parameter \#1 \$path of method PhpKafka\\PhpAvroSchemaGenerator\\Command\\SubSchemaMergeCommand::getPath\(\) expects string, array<string>\|string\|null given.#'
-        - '#Parameter \#1 \$path of method PhpKafka\\PhpAvroSchemaGenerator\\Command\\SchemaGenerateCommand::getPath\(\) expects string, array<string>\|string\|null given.#'
+        - "#Call to function token_get_all\\(\\) on a separate line has no effect.#"
+        - "#Strict comparison using === between array<int, mixed>&nonEmpty and ',' will always evaluate to false.#"
+        - "#Strict comparison using === between array<int, mixed>&nonEmpty and ';' will always evaluate to false.#"

src/Command/SchemaGenerateCommand.php

@@ -28,8 +28,13 @@ public function execute(InputInterface $input, OutputInterface $output): int
     {
         $output->writeln('Generating schema files');
 
-        $classDirectory = $this->getPath($input->getArgument('classDirectory'));
-        $outputDirectory = $this->getPath($input->getArgument('outputDirectory'));
+        /** @var string $classDirectoryArg */
+        $classDirectoryArg = $input->getArgument('classDirectory');
+        /** @var string $outputDirectoryArg */
+        $outputDirectoryArg = $input->getArgument('outputDirectory');
+
+        $classDirectory = $this->getPath($classDirectoryArg);
+        $outputDirectory = $this->getPath($outputDirectoryArg);
 
         $registry = (new ClassRegistry())
             ->addClassDirectory($classDirectory)

src/Command/SubSchemaMergeCommand.php

@@ -35,8 +35,14 @@ protected function configure(): void
     public function execute(InputInterface $input, OutputInterface $output): int
     {
         $output->writeln('Merging schema files');
-        $templateDirectory = $this->getPath($input->getArgument('templateDirectory'));
-        $outputDirectory = $this->getPath($input->getArgument('outputDirectory'));
+
+        /** @var string $templateDirectoryArg */
+        $templateDirectoryArg = $input->getArgument('templateDirectory');
+        /** @var string $outputDirectoryArg */
+        $outputDirectoryArg = $input->getArgument('outputDirectory');
+
+        $templateDirectory = $this->getPath($templateDirectoryArg);
+        $outputDirectory = $this->getPath($outputDirectoryArg);
 
         $registry = (new SchemaRegistry())
             ->addSchemaTemplateDirectory($templateDirectory)

src/Registry/SchemaRegistry.php

@@ -147,7 +147,7 @@ private function registerSchemaFile(\SplFileInfo $fileInfo): void
     public function getSchemaId(array $schemaData, SchemaTemplateInterface $template): string
     {
         if (true === $template->isPrimitive()) {
-            return $schemaData['type'];
+            return str_replace('.' . Avro::FILE_EXTENSION, '', $template->getFilename());
         }
 
         return $schemaData['namespace'] . '.' . $schemaData['name'];

tests/Integration/Registry/SchemaRegistryTest.php

@@ -32,7 +32,7 @@ public function testLoad()
             'com.example.Collection',
             'com.example.Page',
             'com.example.Library',
-            'string'
+            'primitive'
         ];
 
         $schemaDir = __DIR__ . '/../../../example/schemaTemplates';