Fixing usage of correct Interface

.php-version

@@ -0,0 +1 @@
+8.1

Tests/Integration/AbstractTestCase.php

@@ -2,8 +2,8 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration;
 
-use Akeneo\Bundle\BatchBundle\Command\BatchCommand;
 use Akeneo\Test\Integration\TestCase;
+use Akeneo\Tool\Bundle\BatchBundle\Command\BatchCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;

Tests/Integration/Attribute/TextCollectionAttributeTest.php

@@ -2,11 +2,11 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\Attribute;
 
+use Akeneo\Pim\Structure\Component\Model\FamilyInterface;
 use Akeneo\Tool\Component\StorageUtils\Exception\InvalidPropertyTypeException;
 use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
 use Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\AbstractTestCase;
 use Akeneo\Pim\Structure\Component\Model\AttributeInterface;
-use Akeneo\Channel\Component\Model\FamilyInterface;
 
 /**
  * @author    Mathias METAYER <mathias.metayer@akeneo.com>

Tests/Integration/DataLoader.php

@@ -2,12 +2,12 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration;
 
-use Akeneo\Component\Batch\Model\JobInstance;
+use Akeneo\Channel\Infrastructure\Component\Model\ChannelInterface;
+use Akeneo\Channel\Infrastructure\Component\Repository\ChannelRepositoryInterface;
+use Akeneo\Pim\Enrichment\Component\Product\Model\ProductInterface;
 use Akeneo\Pim\Structure\Component\Model\AttributeInterface;
-use Akeneo\Channel\Component\Model\ChannelInterface;
-use Akeneo\Channel\Component\Model\FamilyInterface;
-use Akeneo\Channel\Component\Model\ProductInterface;
-use Pim\Component\Catalog\Repository\ChannelRepositoryInterface;
+use Akeneo\Pim\Structure\Component\Model\FamilyInterface;
+use Akeneo\Tool\Component\Batch\Model\JobInstance;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

Tests/Integration/Elasticsearch/ProductProposalTextCollectionFilterTest.php

@@ -2,12 +2,12 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\Elasticsearch;
 
-use Akeneo\Bundle\ElasticsearchBundle\Client;
+use Akeneo\Pim\Enrichment\Component\Product\Query\ProductQueryBuilderFactoryInterface;
+use Akeneo\Tool\Bundle\ElasticsearchBundle\Client;
 use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
 use Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\AbstractTestCase;
 use Akeneo\Pim\Structure\Component\Model\AttributeInterface;
 use Akeneo\Pim\Enrichment\Component\Product\Query\Filter\Operators;
-use Pim\Component\Catalog\Query\ProductQueryBuilderFactoryInterface;
 
 /**
  * @author    Mathias METAYER <mathias.metayer@akeneo.com>

Tests/Integration/Elasticsearch/TextCollectionFilterTest.php

@@ -2,11 +2,11 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\Elasticsearch;
 
+use Akeneo\Pim\Enrichment\Component\Product\Model\ProductInterface;
+use Akeneo\Pim\Enrichment\Component\Product\Query\ProductQueryBuilderFactoryInterface;
 use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
 use Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\AbstractTestCase;
-use Akeneo\Channel\Component\Model\ProductInterface;
 use Akeneo\Pim\Enrichment\Component\Product\Query\Filter\Operators;
-use Pim\Component\Catalog\Query\ProductQueryBuilderFactoryInterface;
 
 /**
  * @author    Mathias METAYER <mathias.metayer@akeneo.com>
@@ -18,7 +18,7 @@ class TextCollectionFilterTest extends AbstractTestCase
     /** @var ProductQueryBuilderFactoryInterface */
     private $pqbFactory;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->loadData();

Tests/Integration/Job/AbstractImportExportTestCase.php

@@ -2,9 +2,9 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\Job;
 
+use Akeneo\Pim\Structure\Component\AttributeTypes;
 use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
 use Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\AbstractTestCase;
-use Pim\Component\Catalog\AttributeTypes;
 
 /**
  * @author    Mathias METAYER <mathias.metayer@akeneo.com>
@@ -22,7 +22,7 @@ class AbstractImportExportTestCase extends AbstractTestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->loadData();

Tests/Integration/Job/ExportTest.php

@@ -2,8 +2,8 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\Job;
 
-use Akeneo\Bundle\BatchBundle\Command\BatchCommand;
 use Akeneo\Pim\Enrichment\Component\Product\Query\Filter\Operators;
+use Akeneo\Tool\Bundle\BatchBundle\Command\BatchCommand;
 use Symfony\Component\Finder\Finder;
 
 /**
@@ -16,7 +16,7 @@ class ExportTest extends AbstractImportExportTestCase
     /**
      * {@inheritdoc}
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         $finder = new Finder();
         $files = $finder->files()->name('*.csv')->in(static::$exportPath);

Tests/Integration/Job/ImportTest.php

@@ -2,10 +2,10 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\Job;
 
-use Akeneo\Bundle\BatchBundle\Command\BatchCommand;
-use Akeneo\Channel\Component\Model\ProductInterface;
+use Akeneo\Pim\Enrichment\Component\Product\Model\ProductInterface;
 use Akeneo\Pim\Enrichment\Component\Product\Query\Filter\Operators;
-use Pim\Component\Catalog\Query\ProductQueryBuilderInterface;
+use Akeneo\Pim\Enrichment\Component\Product\Query\ProductQueryBuilderInterface;
+use Akeneo\Tool\Bundle\BatchBundle\Command\BatchCommand;
 
 /**
  * @author    Mathias METAYER <mathias.metayer@akeneo.com>

Tests/Integration/Product/CompletenessTest.php

@@ -2,9 +2,9 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\Product;
 
+use Akeneo\Pim\Structure\Component\AttributeTypes;
 use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
 use Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\AbstractTestCase;
-use Pim\Component\Catalog\AttributeTypes;
 use Akeneo\Pim\Enrichment\Component\Product\Query\Filter\Operators;
 
 /**

Tests/Integration/Product/CreateProductTest.php

@@ -2,27 +2,28 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\Product;
 
+use Akeneo\Pim\Enrichment\Component\Product\Model\ProductInterface;
+use Akeneo\Pim\Enrichment\Component\Product\Repository\ProductRepositoryInterface;
+use Akeneo\Pim\Enrichment\Component\Product\Updater\ProductUpdater;
 use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
 use Pim\Bundle\ExtendedAttributeTypeBundle\Tests\Integration\AbstractTestCase;
-use Akeneo\Channel\Component\Model\ProductInterface;
-use Pim\Component\Catalog\Repository\ProductRepositoryInterface;
-use Pim\Component\Catalog\Updater\ProductUpdater;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * @author    Romain Monceau <romain@akeneo.com>
  * @copyright 2018 Akeneo SAS (http://www.akeneo.com)
  */
 class CreateProductTest extends AbstractTestCase
 {
-    /** @var ContainerInterface */
-    protected $container;
+    /**
+     * @var \Symfony\Component\DependencyInjection\ContainerInterface
+     */
+    private $testContainer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
-        $this->container = static::$kernel->getContainer();
+        $this->testContainer = static::$kernel->getContainer();
 
         $dataAttribute = ['code' => 'eans', 'type' => ExtendedAttributeTypes::TEXT_COLLECTION];
         $this->getDataLoader()->createAttribute($dataAttribute);
@@ -146,15 +147,15 @@ private function getProductRepository()
      */
     private function validate(ProductInterface $product)
     {
-        return $this->container->get('pim_catalog.validator.product')->validate($product);
+        return $this->testContainer->get('pim_catalog.validator.product')->validate($product);
     }
 
     /**
      * @param ProductInterface $product
      */
     private function saveProduct(ProductInterface $product)
     {
-        $this->container->get('pim_catalog.saver.product')->save($product);
+        $this->testContainer->get('pim_catalog.saver.product')->save($product);
         $this->clear();
     }
 }

UPGRADE.md

@@ -0,0 +1,12 @@
+## Upgrade der Dependencies
+
+### Abhängigkeiten updaten
+
+unter src/Elasticsearch/Filter/Attribute/ProductProposalTextCollectionFilter.php müssen noch einige Klassen ersetzt werden! 
+Die verwendeten Klassen kommen noch aus einer anderen früheren PIM Version
+
+Bitte dazu einmal mit https://github.com/akeneo/pim-community-dev/tree/v7.0.68/src vergleichen
+
+Ggf muss hier auch noch die Changelog studiert werden.
+
+Bitte die tests anpassen, so dass wir wissen das es weiterhin funktioniert.

composer.json

@@ -20,7 +20,8 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "@stable",
-        "phpspec/phpspec": "@stable"
+        "phpspec/phpspec": "@stable",
+        "phpunit/phpunit": "^10"
     },
     "autoload": {
         "psr-4": {
@@ -34,5 +35,10 @@
             "dev-2.0": "2.0.x-dev",
             "dev-master": "2.1.x-dev"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "symfony/flex": true
+        }
     }
 }

src/Completeness/Checker/TextCollectionCompleteChecker.php

@@ -2,9 +2,9 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Completeness\Checker;
 
+use Akeneo\Channel\Infrastructure\Component\Model\ChannelInterface;
+use Akeneo\Channel\Infrastructure\Component\Model\LocaleInterface;
 use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
-use Akeneo\Channel\Component\Model\ChannelInterface;
-use Akeneo\Channel\Component\Model\LocaleInterface;
 
 /**
  * @author    JM Leroux <jean-marie.leroux@akeneo.com>

src/Completeness/MaskItemGenerator/TextCollectionMaskItemGenerator.php

@@ -5,7 +5,6 @@
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Completeness\MaskItemGenerator;
 
 use Akeneo\Pim\Enrichment\Component\Product\Completeness\MaskItemGenerator\MaskItemGeneratorForAttributeType;
-use Akeneo\Pim\Structure\Component\AttributeTypes;
 use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
 
 class TextCollectionMaskItemGenerator implements MaskItemGeneratorForAttributeType

src/DataGrid/Form/Type/Filter/TextCollectionFilterType.php

@@ -6,7 +6,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * TextCollectionFilterType to display the grid filter

src/Elasticsearch/Filter/Attribute/ProductProposalTextCollectionFilter.php

@@ -2,12 +2,11 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Elasticsearch\Filter\Attribute;
 
-use Akeneo\Component\StorageUtils\Exception\InvalidPropertyTypeException;
-use Pim\Component\Catalog\Exception\InvalidOperatorException;
-use Pim\Component\Catalog\Model\AttributeInterface;
-use Pim\Component\Catalog\Query\Filter\AttributeFilterInterface;
-use Pim\Component\Catalog\Query\Filter\Operators;
-use PimEnterprise\Bundle\WorkflowBundle\Elasticsearch\Filter\Attribute\AbstractAttributeFilter;
+use Akeneo\Tool\Component\StorageUtils\Exception\InvalidPropertyTypeException;
+use Akeneo\Pim\Enrichment\Bundle\Elasticsearch\Filter\Attribute\AbstractAttributeFilter;
+use Akeneo\Pim\Enrichment\Component\Product\Query\Filter\AttributeFilterInterface;
+use Akeneo\Pim\Enrichment\Component\Product\Query\Filter\Operators;
+use Akeneo\Pim\Enrichment\Component\Product\Exception\InvalidOperatorException;
 use PimEnterprise\Bundle\WorkflowBundle\Elasticsearch\Filter\Attribute\ProposalAttributePathResolver;
 
 /**

src/Factory/Value/TextCollectionValueFactory.php

@@ -3,6 +3,7 @@
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Factory\Value;
 
 use Akeneo\Pim\Enrichment\Component\Product\Factory\Value\ValueFactory;
+use Akeneo\Pim\Structure\Component\Model\AttributeInterface;
 use Akeneo\Tool\Component\StorageUtils\Exception\InvalidPropertyTypeException;
 use Akeneo\Pim\Structure\Component\Query\PublicApi\AttributeType\Attribute;
 use Akeneo\Pim\Enrichment\Component\Product\Model\ValueInterface;

src/Model/TextCollectionValue.php

@@ -3,8 +3,8 @@
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Model;
 
 use Akeneo\Pim\Enrichment\Component\Product\Model\AbstractValue;
-use Akeneo\Pim\Structure\Component\Model\AttributeInterface;
 use Akeneo\Pim\Enrichment\Component\Product\Model\ValueInterface;
+use Akeneo\Pim\Structure\Component\Model\AttributeInterface;
 use Akeneo\Pim\Structure\Component\Query\PublicApi\AttributeType\Attribute;
 
 /**

src/Normalizer/Flat/TextCollectionDenormalizerFlat.php

@@ -3,6 +3,8 @@
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\Normalizer\Flat;
 
 use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\TextCollectionType;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 /**
  * Denormalize flat text collection:
@@ -12,13 +14,16 @@
  * @author    JM Leroux <jean-marie.leroux@akeneo.com>
  * @copyright 2017 Akeneo SAS (http://www.akeneo.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @method array getSupportedTypes(?string $format)
  */
-class TextCollectionDenormalizerFlat extends Denormalizer
+class TextCollectionDenormalizerFlat implements DenormalizerInterface
 {
+    use DenormalizerAwareTrait;
+
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $class, $format = null, array $context = [])
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
         $data = ('' === $data) ? null : $data;
 
@@ -28,4 +33,9 @@ public function denormalize($data, $class, $format = null, array $context = [])
 
         return $data;
     }
+
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null)
+    {
+        return true;
+    }
 }