Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmaicher
dmaicher committed Aug 28, 2020
1 parent cb81952 commit c0f7e33
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 35 deletions.
12 changes: 6 additions & 6 deletions src/Admin/AbstractAdmin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
use Symfony\Component\Routing\Generator\UrlGeneratorInterface as RoutingUrlGeneratorInterface;
use Symfony\Component\Security\Acl\Model\DomainObjectInterface;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslationInterface;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Component\Validator\Mapping\GenericMetadata;
use Symfony\Component\Validator\Validator\ValidatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
Expand Down Expand Up @@ -310,7 +310,7 @@ abstract class AbstractAdmin implements AdminInterface, DomainObjectInterface, A
*
* NEXT_MAJOR: remove this property
*
* @var TranslatorInterface|LegacyTranslationInterface
* @var TranslatorInterface|LegacyTranslatorInterface
*
* @deprecated since sonata-project/admin-bundle 3.9, to be removed with 4.0
*/
Expand Down Expand Up @@ -2466,7 +2466,7 @@ public function getTranslationDomain()
*
* NEXT_MAJOR: remove this method
*
* @param LegacyTranslationInterface|TranslatorInterface $translator
* @param LegacyTranslatorInterface|TranslatorInterface $translator
*
* @deprecated since sonata-project/admin-bundle 3.9, to be removed with 4.0
*/
Expand All @@ -2480,11 +2480,11 @@ public function setTranslator($translator)
), E_USER_DEPRECATED);
}

if (!$translator instanceof LegacyTranslationInterface && !$translator instanceof TranslatorInterface) {
if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
throw new \TypeError(sprintf(
'Argument 1 passed to "%s()" must be an instance of "%s" or "%s", %s given.',
__METHOD__,
LegacyTranslationInterface::class,
LegacyTranslatorInterface::class,
TranslatorInterface::class,
\is_object($translator) ? 'instance of '.\get_class($translator) : \gettype($translator)
));
Expand All @@ -2500,7 +2500,7 @@ public function setTranslator($translator)
*
* @deprecated since sonata-project/admin-bundle 3.9, to be removed with 4.0
*
* @return LegacyTranslationInterface|TranslatorInterface
* @return LegacyTranslatorInterface|TranslatorInterface
*/
public function getTranslator()
{
Expand Down
8 changes: 4 additions & 4 deletions src/Form/Type/Filter/ChoiceType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use Symfony\Component\Form\Extension\Core\Type\ChoiceType as FormChoiceType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslationInterface;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;

/**
Expand Down Expand Up @@ -48,17 +48,17 @@ class ChoiceType extends AbstractType
*
* @deprecated since sonata-project/admin-bundle 3.5, to be removed with 4.0
*
* @var TranslatorInterface|LegacyTranslationInterface
* @var TranslatorInterface|LegacyTranslatorInterface
*/
protected $translator;

public function __construct($translator)
{
if (!$translator instanceof LegacyTranslationInterface && !$translator instanceof TranslatorInterface) {
if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
throw new \TypeError(sprintf(
'Argument 1 passed to "%s()" must be an instance of "%s" or "%s", %s given.',
__METHOD__,
LegacyTranslationInterface::class,
LegacyTranslatorInterface::class,
TranslatorInterface::class,
\is_object($translator) ? 'instance of '.\get_class($translator) : \gettype($translator)
));
Expand Down
8 changes: 4 additions & 4 deletions src/Form/Type/Filter/DateRangeType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslationInterface;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;

/**
Expand All @@ -43,17 +43,17 @@ class DateRangeType extends AbstractType
*
* @deprecated since sonata-project/admin-bundle 3.5, to be removed with 4.0
*
* @var TranslatorInterface|LegacyTranslationInterface
* @var TranslatorInterface|LegacyTranslatorInterface
*/
protected $translator;

public function __construct($translator)
{
if (!$translator instanceof LegacyTranslationInterface && !$translator instanceof TranslatorInterface) {
if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
throw new \TypeError(sprintf(
'Argument 1 passed to "%s()" must be an instance of "%s" or "%s", %s given.',
__METHOD__,
LegacyTranslationInterface::class,
LegacyTranslatorInterface::class,
TranslatorInterface::class,
\is_object($translator) ? 'instance of '.\get_class($translator) : \gettype($translator)
));
Expand Down
8 changes: 4 additions & 4 deletions src/Form/Type/Filter/DateTimeRangeType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslationInterface;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;

/**
Expand All @@ -43,17 +43,17 @@ class DateTimeRangeType extends AbstractType
*
* @deprecated since sonata-project/admin-bundle 3.5, to be removed with 4.0
*
* @var TranslatorInterface|LegacyTranslationInterface
* @var TranslatorInterface|LegacyTranslatorInterface
*/
protected $translator;

public function __construct($translator)
{
if (!$translator instanceof LegacyTranslationInterface && !$translator instanceof TranslatorInterface) {
if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
throw new \TypeError(sprintf(
'Argument 1 passed to "%s()" must be an instance of "%s" or "%s", %s given.',
__METHOD__,
LegacyTranslationInterface::class,
LegacyTranslatorInterface::class,
TranslatorInterface::class,
\is_object($translator) ? 'instance of '.\get_class($translator) : \gettype($translator)
));
Expand Down
8 changes: 4 additions & 4 deletions src/Form/Type/Filter/DateTimeType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use Symfony\Component\Form\Extension\Core\Type\DateTimeType as FormDateTimeType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslationInterface;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;

/**
Expand Down Expand Up @@ -68,17 +68,17 @@ class DateTimeType extends AbstractType
*
* @deprecated since sonata-project/admin-bundle 3.5, to be removed with 4.0
*
* @var TranslatorInterface|LegacyTranslationInterface
* @var TranslatorInterface|LegacyTranslatorInterface
*/
protected $translator;

public function __construct($translator)
{
if (!$translator instanceof LegacyTranslationInterface && !$translator instanceof TranslatorInterface) {
if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
throw new \TypeError(sprintf(
'Argument 1 passed to "%s()" must be an instance of "%s" or "%s", %s given.',
__METHOD__,
LegacyTranslationInterface::class,
LegacyTranslatorInterface::class,
TranslatorInterface::class,
\is_object($translator) ? 'instance of '.\get_class($translator) : \gettype($translator)
));
Expand Down
8 changes: 4 additions & 4 deletions src/Form/Type/Filter/DateType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use Symfony\Component\Form\Extension\Core\Type\DateType as FormDateType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslationInterface;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;

/**
Expand Down Expand Up @@ -68,17 +68,17 @@ class DateType extends AbstractType
*
* @deprecated since sonata-project/admin-bundle 3.5, to be removed with 4.0
*
* @var TranslatorInterface|LegacyTranslationInterface
* @var TranslatorInterface|LegacyTranslatorInterface
*/
protected $translator;

public function __construct($translator)
{
if (!$translator instanceof LegacyTranslationInterface && !$translator instanceof TranslatorInterface) {
if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
throw new \TypeError(sprintf(
'Argument 1 passed to "%s()" must be an instance of "%s" or "%s", %s given.',
__METHOD__,
LegacyTranslationInterface::class,
LegacyTranslatorInterface::class,
TranslatorInterface::class,
\is_object($translator) ? 'instance of '.\get_class($translator) : \gettype($translator)
));
Expand Down
8 changes: 4 additions & 4 deletions src/Form/Type/Filter/NumberType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use Symfony\Component\Form\Extension\Core\Type\NumberType as FormNumberType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslationInterface;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;

/**
Expand Down Expand Up @@ -58,17 +58,17 @@ class NumberType extends AbstractType
*
* @deprecated since sonata-project/admin-bundle 3.5, to be removed with 4.0
*
* @var TranslatorInterface|LegacyTranslationInterface
* @var TranslatorInterface|LegacyTranslatorInterface
*/
protected $translator;

public function __construct($translator)
{
if (!$translator instanceof LegacyTranslationInterface && !$translator instanceof TranslatorInterface) {
if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
throw new \TypeError(sprintf(
'Argument 1 passed to "%s()" must be an instance of "%s" or "%s", %s given.',
__METHOD__,
LegacyTranslationInterface::class,
LegacyTranslatorInterface::class,
TranslatorInterface::class,
\is_object($translator) ? 'instance of '.\get_class($translator) : \gettype($translator)
));
Expand Down
6 changes: 3 additions & 3 deletions src/Twig/Extension/SonataAdminExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
use Symfony\Component\Security\Acl\Voter\FieldVote;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslationInterface;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use Twig\Environment;
use Twig\Error\LoaderError;
Expand Down Expand Up @@ -104,11 +104,11 @@ public function __construct(
), E_USER_DEPRECATED);
}

if (!$translator instanceof TranslatorInterface && !$translator instanceof LegacyTranslationInterface) {
if (!$translator instanceof TranslatorInterface && !$translator instanceof LegacyTranslatorInterface) {
throw new \TypeError(sprintf(
'Argument 2 must be an instance of "%s" or preferably "%s", "%s given"',
TranslatorInterface::class,
LegacyTranslationInterface::class,
LegacyTranslatorInterface::class,
\get_class($translator)
));
}
Expand Down
4 changes: 2 additions & 2 deletions tests/Translator/Extractor/JMSTranslatorBundle/AdminExtractorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
use Sonata\AdminBundle\Admin\Pool;
use Sonata\AdminBundle\Translator\Extractor\JMSTranslatorBundle\AdminExtractor;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;

/**
* Test for AdminExtractor.
Expand Down Expand Up @@ -63,7 +63,7 @@ class AdminExtractorTest extends TestCase

protected function setUp(): void
{
if (!interface_exists(TranslatorInterface::class)) {
if (!interface_exists(LegacyTranslatorInterface::class)) {
$this->markTestSkipped('This test is only available using Symfony 4');
}

Expand Down

0 comments on commit c0f7e33

Please sign in to comment.