Skip to content

Commit

Permalink
Merge branch '2.1' into 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
andrerom committed Aug 23, 2018
2 parents 4b8b497 + 6acd7be commit e963031
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Rest/Field/TypeValue.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace EzSystems\RecommendationBundle\Rest\Field;

use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\ConfigResolver;
use eZ\Bundle\EzPublishCoreBundle\Imagine\PlaceholderAliasGenerator as ImageVariationService;
use eZ\Publish\SPI\Variation\VariationHandler as ImageVariationService;
use eZ\Publish\Core\FieldType\RichText\Converter as RichTextConverterInterface;
use eZ\Publish\Core\MVC\Exception\SourceImageNotFoundException;
use eZ\Publish\API\Repository\Values\Content\Content;
Expand All @@ -19,7 +19,7 @@ class TypeValue
/** @var \eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\ConfigResolver */
private $configResolver;

/** @var \eZ\Bundle\EzPublishCoreBundle\Imagine\AliasGenerator */
/** @var \eZ\Publish\SPI\Variation\VariationHandler */
protected $imageVariationService;

/** @var \eZ\Publish\Core\FieldType\RichText\Converter */
Expand All @@ -30,7 +30,7 @@ class TypeValue

/**
* @param \eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\ConfigResolver $configResolver
* @param \eZ\Bundle\EzPublishCoreBundle\Imagine\PlaceholderAliasGenerator $imageVariationService
* @param \eZ\Publish\SPI\Variation\VariationHandler $imageVariationService
* @param \eZ\Publish\Core\FieldType\RichText\Converter $richHtml5Converter
* @param \eZ\Publish\Core\FieldType\XmlText\Converter\Html5 $xmlHtml5Converter
*/
Expand Down

0 comments on commit e963031

Please sign in to comment.