Ibexa 4 (#34)

* Update namespaces to new ibexa namespaces

* Made the bundle usable for all ibexa 4.x versions

* Fix incorect version definition

* Remove UnnecessaryVarAnnotation

* Fix namespaces

* Fix class names

* Fix config

* Fixed tests

---------

Co-authored-by: Hannes Giesenow <[email protected]>

.circleci/config.yml

@@ -58,7 +58,7 @@ jobs:
                           sleep 1
                         done
                         echo Failed waiting for MySQL && exit 1
-            - run: 'vendor/bin/phpunit --testsuite integration'
+            - run: 'php -d memory_limit=512M vendor/bin/phpunit --testsuite integration'
             - store_test_results:
                   path: 'build'
             - codecov/upload:

composer.json

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

docs/testing.md

@@ -13,7 +13,7 @@ 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 run php bash
+docker-compose run php sh
 vendor/bin/phpunit --testsuite integration
 ```
 

src/Data/Image.php

@@ -4,9 +4,9 @@
 
 namespace Elbformat\FieldHelperBundle\Data;
 
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\API\Repository\Values\Content\VersionInfo;
-use eZ\Publish\SPI\Variation\VariationHandler;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
+use Ibexa\Contracts\Core\Variation\VariationHandler;
 
 class Image
 {

src/Data/ImageFormatsProxy.php

@@ -5,10 +5,10 @@
 namespace Elbformat\FieldHelperBundle\Data;
 
 use ArrayAccess;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\API\Repository\Values\Content\VersionInfo;
-use eZ\Publish\Core\FieldType\Image\Value;
-use eZ\Publish\SPI\Variation\VariationHandler;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
+use Ibexa\Core\FieldType\Image\Value;
+use Ibexa\Contracts\Core\Variation\VariationHandler;
 
 /**
  * This proxy makes sure, that image formats will only be generated as soon as they are needed in the template.

src/Data/Url.php

@@ -4,7 +4,7 @@
 
 namespace Elbformat\FieldHelperBundle\Data;
 
-use eZ\Publish\Core\FieldType\Url\Value;
+use Ibexa\Core\FieldType\Url\Value;
 
 /**
  * @author Hannes Giesenow <[email protected]>

src/Exception/FieldNotFoundException.php

@@ -4,7 +4,7 @@
 
 namespace Elbformat\FieldHelperBundle\Exception;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 
 /**
  * Thrown, when a field by the given name was not found in this content object.

src/FieldHelper/AbstractFieldHelper.php

@@ -4,8 +4,8 @@
 
 namespace Elbformat\FieldHelperBundle\FieldHelper;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use Elbformat\FieldHelperBundle\Exception\FieldNotFoundException;
 
 /**

src/FieldHelper/AuthorFieldHelper.php

@@ -5,10 +5,10 @@
 namespace Elbformat\FieldHelperBundle\FieldHelper;
 
 use Elbformat\FieldHelperBundle\Exception\InvalidFieldTypeException;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\Core\FieldType\Author\Author;
-use eZ\Publish\Core\FieldType\Author\AuthorCollection;
-use eZ\Publish\Core\FieldType\Author\Value as AuthorValue;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Core\FieldType\Author\Author;
+use Ibexa\Core\FieldType\Author\AuthorCollection;
+use Ibexa\Core\FieldType\Author\Value as AuthorValue;
 
 class AuthorFieldHelper extends AbstractFieldHelper
 {
@@ -31,7 +31,6 @@ public function getNames(Content $content, string $fieldName): string
         $authors = $this->getValues($content, $fieldName);
 
         $names = [];
-        /** @var Author $author */
         foreach ($authors as $author) {
             $names[] = $author->name;
         }

src/FieldHelper/BoolFieldHelper.php

@@ -6,10 +6,10 @@
 
 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 eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\Checkbox\Value as CheckboxValue;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\Checkbox\Value as CheckboxValue;
 
 /**
  * @author Hannes Giesenow <[email protected]>

src/FieldHelper/DateTimeFieldHelper.php

@@ -9,12 +9,12 @@
 use DateTimeInterface;
 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 eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\Date\Value as DateValue;
-use eZ\Publish\Core\FieldType\DateAndTime\Value as DateTimeValue;
-use eZ\Publish\Core\FieldType\Time\Value as TimeValue;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\Date\Value as DateValue;
+use Ibexa\Core\FieldType\DateAndTime\Value as DateTimeValue;
+use Ibexa\Core\FieldType\Time\Value as TimeValue;
 
 /**
  * @author Hannes Giesenow <[email protected]>

src/FieldHelper/FileFieldHelper.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\Field;
-use eZ\Publish\Core\FieldType\BinaryFile\Value as BinaryValue;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\BinaryFile\Value as BinaryValue;
 
 class FileFieldHelper extends AbstractFieldHelper
 {

src/FieldHelper/ImageFieldHelper.php

@@ -6,16 +6,16 @@
 
 use Elbformat\FieldHelperBundle\Data\Image;
 use Elbformat\FieldHelperBundle\Exception\InvalidFieldTypeException;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
-use eZ\Publish\API\Repository\Repository;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\RelationList\Value as RelationValue;
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\RelationList\Value as RelationValue;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\Core\Variation\VariationHandler;
 use Ibexa\Contracts\HttpCache\ResponseTagger\ResponseTagger;
-use eZ\Publish\Core\FieldType\Image\Value as ImageValue;
-use eZ\Publish\Core\FieldType\ImageAsset\Value as ImageAssetValue;
+use Ibexa\Core\FieldType\Image\Value as ImageValue;
+use Ibexa\Core\FieldType\ImageAsset\Value as ImageAssetValue;
 
 /**
  * Create an image object from Image content object, or a filed with a relation

src/FieldHelper/NetgenTagsFieldHelper.php

@@ -6,8 +6,8 @@
 
 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\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use Netgen\TagsBundle\API\Repository\TagsService;
 use Netgen\TagsBundle\API\Repository\Values\Tags\Tag;
 use Netgen\TagsBundle\Core\FieldType\Tags\Value as NetgenTagsValue;

src/FieldHelper/NumberFieldHelper.php

@@ -6,11 +6,11 @@
 
 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 eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\FieldType\Integer\Value as IntValue;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\FieldType\Integer\Value as IntValue;
 
 /**
  * Helps reading, updating and comparing numeric field types.

src/FieldHelper/RelationFieldHelper.php

@@ -6,11 +6,11 @@
 
 use Elbformat\FieldHelperBundle\Exception\FieldNotFoundException;
 use Elbformat\FieldHelperBundle\Exception\InvalidFieldTypeException;
-use eZ\Publish\API\Repository\Repository;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\ContentStruct;
-use eZ\Publish\Core\FieldType\Relation\Value as RelationValue;
-use eZ\Publish\Core\FieldType\RelationList\Value as RelationListValue;
+use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\Core\FieldType\Relation\Value as RelationValue;
+use Ibexa\Core\FieldType\RelationList\Value as RelationListValue;
 use Ibexa\Contracts\HttpCache\ResponseTagger\ResponseTagger;
 use Psr\Log\LoggerInterface;
 

src/FieldHelper/RichtextFieldHelper.php

@@ -5,12 +5,12 @@
 namespace Elbformat\FieldHelperBundle\FieldHelper;
 
 use Elbformat\FieldHelperBundle\Exception\FieldNotFoundException;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\ContentStruct;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\Helper\FieldHelper;
-use EzSystems\EzPlatformRichText\eZ\FieldType\RichText\Value;
-use EzSystems\EzPlatformRichText\eZ\RichText\Converter as RichtextConverter;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\Helper\FieldHelper;
+use Ibexa\FieldTypeRichText\FieldType\RichText\Value;
+use Ibexa\Contracts\FieldTypeRichText\RichText\Converter as RichtextConverter;
 
 /**
  * Helps reading, updating and comparing richtext field types.

src/FieldHelper/SelectionFieldHelper.php

@@ -6,8 +6,8 @@
 
 use Elbformat\FieldHelperBundle\Exception\FieldNotFoundException;
 use Elbformat\FieldHelperBundle\Exception\InvalidFieldTypeException;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\Core\FieldType\Selection\Value as SelectionValue;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Core\FieldType\Selection\Value as SelectionValue;
 
 class SelectionFieldHelper extends AbstractFieldHelper
 {

src/FieldHelper/TextFieldHelper.php

@@ -6,12 +6,12 @@
 
 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 eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\EmailAddress\Value as MailValue;
-use eZ\Publish\Core\FieldType\TextBlock\Value as TextBlockValue;
-use eZ\Publish\Core\FieldType\TextLine\Value as TextLineValue;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\EmailAddress\Value as MailValue;
+use Ibexa\Core\FieldType\TextBlock\Value as TextBlockValue;
+use Ibexa\Core\FieldType\TextLine\Value as TextLineValue;
 
 /**
  * Handles ezstring,eztext and ezemail

src/FieldHelper/UrlFieldHelper.php

@@ -7,10 +7,10 @@
 use Elbformat\FieldHelperBundle\Data\Url;
 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 eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\Url\Value as UrlValue;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\Url\Value as UrlValue;
 
 /**
  * @author Hannes Giesenow <[email protected]>

tests/FieldHelper/AuthorFieldHelperTest.php

@@ -7,11 +7,11 @@
 use Elbformat\FieldHelperBundle\Exception\FieldNotFoundException;
 use Elbformat\FieldHelperBundle\Exception\InvalidFieldTypeException;
 use Elbformat\FieldHelperBundle\FieldHelper\AuthorFieldHelper;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\Author\Author;
-use eZ\Publish\Core\FieldType\Author\Value;
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\Author\Author;
+use Ibexa\Core\FieldType\Author\Value;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\Repository\Values\Content\Content;
 use PHPUnit\Framework\TestCase;
 
 /**

tests/FieldHelper/BoolFieldHelperTest.php

@@ -7,12 +7,12 @@
 use Elbformat\FieldHelperBundle\Exception\FieldNotFoundException;
 use Elbformat\FieldHelperBundle\Exception\InvalidFieldTypeException;
 use Elbformat\FieldHelperBundle\FieldHelper\BoolFieldHelper;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\Checkbox\Value as CheckboxValue;
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\Repository\Values\Content\Content;
-use eZ\Publish\Core\Repository\Values\Content\ContentCreateStruct;
-use eZ\Publish\Core\Repository\Values\Content\ContentUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\Checkbox\Value as CheckboxValue;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Repository\Values\Content\ContentCreateStruct;
+use Ibexa\Core\Repository\Values\Content\ContentUpdateStruct;
 use PHPUnit\Framework\TestCase;
 
 /**

tests/FieldHelper/DateTimeFieldHelperTest.php

@@ -7,15 +7,15 @@
 use Elbformat\FieldHelperBundle\Exception\FieldNotFoundException;
 use Elbformat\FieldHelperBundle\Exception\InvalidFieldTypeException;
 use Elbformat\FieldHelperBundle\FieldHelper\DateTimeFieldHelper;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\Date\Value as DateValue;
-use eZ\Publish\Core\FieldType\DateAndTime\Value as DateTimeValue;
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\FieldType\Time\Value as TimeValue;
-use eZ\Publish\Core\FieldType\Value;
-use eZ\Publish\Core\Repository\Values\Content\Content;
-use eZ\Publish\Core\Repository\Values\Content\ContentCreateStruct;
-use eZ\Publish\Core\Repository\Values\Content\ContentUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\Date\Value as DateValue;
+use Ibexa\Core\FieldType\DateAndTime\Value as DateTimeValue;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\FieldType\Time\Value as TimeValue;
+use Ibexa\Core\FieldType\Value;
+use Ibexa\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Repository\Values\Content\ContentCreateStruct;
+use Ibexa\Core\Repository\Values\Content\ContentUpdateStruct;
 use PHPUnit\Framework\TestCase;
 
 /**

tests/FieldHelper/FileFieldHelperTest.php

@@ -7,10 +7,10 @@
 use Elbformat\FieldHelperBundle\Exception\FieldNotFoundException;
 use Elbformat\FieldHelperBundle\Exception\InvalidFieldTypeException;
 use Elbformat\FieldHelperBundle\FieldHelper\FileFieldHelper;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\BinaryFile\Value;
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\BinaryFile\Value;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\Repository\Values\Content\Content;
 use PHPUnit\Framework\TestCase;
 
 /**