CXP-1300: Adds first product meta schema

components/catalogs/back/.php_cd.php

@@ -37,6 +37,7 @@
             'Akeneo\Catalogs\Application',
             'Akeneo\Catalogs\Infrastructure',
 
+            // Allowed dependencies in Infrastructure
             'Symfony\Component\Config',
             'Symfony\Component\Console',
             'Symfony\Component\DependencyInjection',
@@ -50,25 +51,32 @@
             'Symfony\Component\Validator',
             'Doctrine\DBAL',
             'Ramsey\Uuid\Uuid',
+            'League\Flysystem\Filesystem',
+            'Opis\JsonSchema',
+            'Psr\Log\LoggerInterface',
             'Akeneo\Platform\Bundle\InstallerBundle',
             'Akeneo\Platform\Bundle\FrameworkBundle\Security\SecurityFacadeInterface',
             'Akeneo\Tool\Component\Api',
-            'Akeneo\UserManagement\Component\Model\UserInterface',
-            'Akeneo\UserManagement\Component\Repository\UserRepositoryInterface',
             'Akeneo\Connectivity\Connection\ServiceApi',
-            'League\Flysystem\Filesystem',
+            'Akeneo\Tool\Bundle\MeasureBundle\ServiceApi',
+
+            /**********************************************************************************************************/
+            /* Below are dependencies that we have, but we shouldn't rely on them.
+            /* They are coupling exceptions that should be replaced by better alternatives, like ServiceAPIs.
+            /**********************************************************************************************************/
+
+            // This class is not clearly identified as public API
             'Akeneo\Connectivity\Connection\Infrastructure\Apps\Security\ScopeMapperInterface',
 
-            // used in Persistence\Measurement
-            'Akeneo\Tool\Bundle\MeasureBundle\ServiceApi\FindMeasurementFamilies',
+            // used in GetCurrentUsernameTrait
+            'Akeneo\UserManagement\Component\Model\UserInterface',
+            'Akeneo\UserManagement\Component\Repository\UserRepositoryInterface',
 
             // used in TemporaryEnrichmentBridge
             'Akeneo\Tool\Bundle\ElasticsearchBundle\Client',
             'Akeneo\Tool\Component\StorageUtils\Cursor\CursorFactoryInterface',
             'Symfony\Component\OptionsResolver',
 
-            // @todo replace next ones with the ones from service API when available
-
             // used in Persistence\Attribute
             'Akeneo\Pim\Structure\Component\Model\AttributeInterface',
             'Akeneo\Pim\Structure\Component\Repository\AttributeRepositoryInterface',

components/catalogs/back/src/Infrastructure/Validation/ProductSchemaValidator.php

@@ -35,7 +35,7 @@ public function validate($value, Constraint $constraint): void
         }
 
         $metaSchemaId = $value->{'$schema'} ?? null;
-        if (null === $metaSchemaId) {
+        if (null === $metaSchemaId || !\is_string($metaSchemaId)) {
             $this->context
                 ->buildViolation('You must provide a $schema reference.')
                 ->addViolation();
@@ -53,7 +53,9 @@ public function validate($value, Constraint $constraint): void
         }
 
         $validator = new Validator();
-        $validator->resolver()->registerFile($metaSchemaId, $metaSchemaPath);
+        $resolver = $validator->resolver();
+        \assert(null !== $resolver);
+        $resolver->registerFile($metaSchemaId, $metaSchemaPath);
 
         $result = $validator->validate($value, $metaSchemaId);
 

components/catalogs/back/tests/Integration/Infrastructure/Validation/ProductSchemaValidatorTest.php

@@ -56,7 +56,7 @@ public function validSchemaDataProvider(): array
     {
         return [
             '0.0.1 with valid schema' => [
-                'schema' => <<<'JSON'
+                'schema' => <<<'JSON_WRAP'
 {
   "$id": "https://example.com/product",
   "$schema": "https://api.akeneo.com/mapping/product/0.0.1/schema",
@@ -75,7 +75,7 @@ public function validSchemaDataProvider(): array
     }
   }
 }
-JSON,
+JSON_WRAP,
             ],
         ];
     }
@@ -84,7 +84,7 @@ public function invalidSchemaDataProvider(): array
     {
         return [
             '0.0.1 with invalid type number' => [
-                'schema' => <<<'JSON'
+                'schema' => <<<'JSON_WRAP'
 {
   "$schema": "https://api.akeneo.com/mapping/product/0.0.1/schema",
   "properties": {
@@ -93,17 +93,17 @@ public function invalidSchemaDataProvider(): array
     }
   }
 }
-JSON,
+JSON_WRAP,
             ],
             '0.0.1 with missing target type' => [
-                'schema' => <<<'JSON'
+                'schema' => <<<'JSON_WRAP'
 {
   "$schema": "https://api.akeneo.com/mapping/product/0.0.1/schema",
   "properties": {
     "price": {}
   }
 }
-JSON,
+JSON_WRAP,
             ],
         ];
     }

src/Akeneo/Channel/back/Infrastructure/Component/Repository/CurrencyRepositoryInterface.php

@@ -25,7 +25,7 @@ public function getActivatedCurrencies();
     /**
      * Return an array of currency codes
      *
-     * @return array
+     * @return array<string>
      */
     public function getActivatedCurrencyCodes();
 }