Merge pull request #38 from elbformat/ibexa-4-finalize

Finalize ibexa4 upgrade

Author: hgiesenow

composer.json

@@ -31,7 +31,7 @@
   },
   "require": {
     "php": ">=8.1",
-    "ibexa/oss": "^4.0",
+    "ibexa/oss": "^4.6",
     "ext-dom": "*"
   },
   "require-dev": {

docs/changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v2.0.1
+Minimum version is Ibexa 4.6.
+* Added Matrix field Helper
+
+## v2.0.0
+Ibexa 4 support
+
 ## v1.2.2
 Added field helper for
 * Matrix

docs/testing.md

@@ -2,7 +2,7 @@
 
 To run the steps from circle ci locally, you can use the same docker image
 ```bash
-docker-compose run php sh
+docker compose run php sh
 composer install --dev
 vendor/bin/phpunit --testsuite unit
 vendor/bin/php-cs-fixer fix src
@@ -12,8 +12,8 @@ vendor/bin/psalm
 
 To run integration tests, you need to spin up a database first. To ease this, you can use the docker-compose setup provided
 ```bash
-docker-compose up -d
-docker-compose exec php sh
+docker compose up -d
+docker compose run php sh
 vendor/bin/phpunit --testsuite integration
 ```
 

src/FieldHelper/MatrixFieldHelper.php

@@ -6,9 +6,9 @@
 
 use Elbformat\FieldHelperBundle\Exception\FieldNotFoundException;
 use Elbformat\FieldHelperBundle\Exception\InvalidFieldTypeException;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\ContentStruct;
-use EzSystems\EzPlatformMatrixFieldtype\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\FieldTypeMatrix\FieldType\Value;
 
 /**
  * @author Hannes Giesenow <hannes.giesenow@elbformat.de>
@@ -31,7 +31,6 @@ public function getArray(Content $content, string $fieldName): array
     {
         $rows = $this->getValue($content, $fieldName)->getRows();
         $result = [];
-        /** @var Value\Row $row */
         foreach ($rows as $row) {
             /** @var string[] $cells */
             $cells = $row->getCells();
@@ -89,7 +88,6 @@ public function getKeyValue(Content $content, string $fieldName, ?string $key =
         }
 
         $result = [];
-        /** @var Value\Row $row */
         foreach ($rows as $row) {
             /** @var string[] $cells */
             $cells = $row->getCells();
@@ -112,7 +110,6 @@ public function getList(Content $content, string $fieldName, string $columnName
         }
         $rows = $this->getValue($content, $fieldName)->getRows();
         $result = [];
-        /** @var Value\Row $row */
         foreach ($rows as $row) {
             $cells = $row->getCells();
             $result[] = (string) $cells[$columnName];

src/FieldHelper/NumberFieldHelper.php

@@ -14,7 +14,7 @@
 
 /**
  * Helps reading, updating and comparing numeric field types.
- * https://doc.ezplatform.com/en/latest/api/field_type_reference.
+ * https://doc.ibexa.co/en/latest/content_management/field_types/field_type_reference/field_type_reference/
  *
  * @author Hannes Giesenow <hannes.giesenow@elbformat.de>
  */

src/FieldHelper/RelationFieldHelper.php

@@ -116,7 +116,7 @@ protected function getRelationIds(Content $content, string $fieldName): array
             foreach ($stringIds as $stringId) {
                 $ids[] = (int) $stringId;
             }
-        } elseif($field->value instanceof RelationValue) {
+        } elseif ($field->value instanceof RelationValue) {
             $ids = $field->value->destinationContentId ? [(int)$field->value->destinationContentId] : [];
         } else {
             /** @psalm-suppress DeprecatedClass */

src/FieldHelper/RichtextFieldHelper.php

@@ -14,7 +14,7 @@
 
 /**
  * Helps reading, updating and comparing richtext field types.
- * https://doc.ezplatform.com/en/latest/api/field_type_reference.
+ * https://doc.ibexa.co/en/latest/content_management/field_types/field_type_reference/field_type_reference/
  *
  * @author Ronny Gericke <ronny.gericke@elbformat.de>
  */

tests/FieldHelper/NetgenTagsFieldHelperTest.php

@@ -47,7 +47,7 @@ public function testGetFirstTag(): void
     protected function createContentFromTags(array $tags): Content
     {
         $tagObjs = [];
-        foreach($tags as $tag) {
+        foreach ($tags as $tag) {
             $tagObjs[] = new Tag(['keywords' => ['ger-DE' => $tag],'mainLanguageCode' => 'ger-DE']);
         }
         $field = new Field(['value' => new Value($tagObjs)]);