Skip to content

Commit ace1a21

Browse files
webhdxViniTou
andauthored
EZP-31220: Migrated codebase to Symfony 5 (#63)
* Updated version constraints * Forced usage of Symfony\Contracts\Translation\TranslatorInterface * Changed jms/translation-bundle version constraint to ^1.5 * Added symfony-cmf/routing fork * EZP-31496: Fixed removed getLocaleBundle() method from Intl Component * Prepared composer.json for release * Removed obsolete repositories Co-authored-by: Dawid Parafiński <dawid.parafinski@ez.no>
1 parent b7d091b commit ace1a21

File tree

8 files changed

+35
-37
lines changed

8 files changed

+35
-37
lines changed

composer.json

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,25 @@
1515
"EzSystems\\EzPlatformUser\\Tests\\": "tests/lib/"
1616
}
1717
},
18-
"minimum-stability": "dev",
19-
"prefer-stable": true,
2018
"require": {
2119
"php": "^7.3",
2220
"ezsystems/ezpublish-kernel": "^8.0@dev",
2321
"ezsystems/ezplatform-admin-ui": "^2.0@dev",
24-
"jms/translation-bundle": "^1.4",
25-
"symfony/dependency-injection": "^4.3",
26-
"symfony/http-kernel": "^4.3",
27-
"symfony/translation": "^4.3",
28-
"symfony/security": "^4.3",
29-
"symfony/http-foundation": "^4.3",
30-
"symfony/config": "^4.3",
31-
"symfony/options-resolver": "^4.3",
32-
"symfony/event-dispatcher": "^4.3",
33-
"symfony/intl": "^4.3",
34-
"symfony/validator": "^4.3",
35-
"symfony/form": "^4.3",
36-
"symfony/routing": "^4.3",
37-
"symfony/swiftmailer-bundle": "^3.2",
38-
"twig/twig": "^2.11"
22+
"jms/translation-bundle": "^1.5",
23+
"symfony/dependency-injection": "^5.0",
24+
"symfony/http-kernel": "^5.0",
25+
"symfony/translation": "^5.0",
26+
"symfony/security-core": "^5.0",
27+
"symfony/http-foundation": "^5.0",
28+
"symfony/config": "^5.0",
29+
"symfony/options-resolver": "^5.0",
30+
"symfony/event-dispatcher": "^5.0",
31+
"symfony/intl": "^5.0",
32+
"symfony/validator": "^5.0",
33+
"symfony/form": "^5.0",
34+
"symfony/routing": "^5.0",
35+
"symfony/swiftmailer-bundle": "^3.4",
36+
"twig/twig": "^3.0"
3937
},
4038
"require-dev": {
4139
"friendsofphp/php-cs-fixer": "^2.16.0",

src/lib/Form/ChoiceList/Loader/AvailableLocaleChoiceLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
use eZ\Publish\Core\MVC\ConfigResolverInterface;
1212
use EzSystems\EzPlatformAdminUi\Form\Type\ChoiceList\Loader\BaseChoiceLoader;
13+
use Symfony\Component\Intl\Locales;
1314
use Symfony\Component\Validator\Constraints\Locale;
1415
use Symfony\Component\Validator\Validator\ValidatorInterface;
15-
use Symfony\Component\Intl\Intl;
1616

1717
class AvailableLocaleChoiceLoader extends BaseChoiceLoader
1818
{
@@ -52,7 +52,7 @@ public function getChoiceList(): array
5252

5353
foreach ($availableLocales as $locale) {
5454
if (0 === $this->validator->validate($locale, new Locale())->count()) {
55-
$choices[Intl::getLocaleBundle()->getLocaleName($locale)] = $locale;
55+
$choices[Locales::getName($locale)] = $locale;
5656
}
5757
}
5858

src/lib/UserSetting/Setting/CharacterCounter.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException;
1414
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
1515
use Symfony\Component\Form\FormBuilderInterface;
16-
use Symfony\Component\Translation\TranslatorInterface;
16+
use Symfony\Contracts\Translation\TranslatorInterface;
1717

1818
class CharacterCounter implements ValueDefinitionInterface, FormMapperInterface
1919
{
2020
public const ENABLED_OPTION = 'enabled';
2121
public const DISABLED_OPTION = 'disabled';
2222

23-
/** @var \Symfony\Component\Translation\TranslatorInterface */
23+
/** @var \Symfony\Contracts\Translation\TranslatorInterface */
2424
private $translator;
2525

2626
/**
27-
* @param \Symfony\Component\Translation\TranslatorInterface $translator
27+
* @param \Symfony\Contracts\Translation\TranslatorInterface $translator
2828
*/
2929
public function __construct(TranslatorInterface $translator)
3030
{

src/lib/UserSetting/Setting/FullDateTimeFormat.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
use EzSystems\EzPlatformUser\UserSetting\DateTimeFormat\FormatterInterface;
1616
use EzSystems\EzPlatformUser\UserSetting\ValueDefinitionInterface;
1717
use Symfony\Component\Form\FormBuilderInterface;
18-
use Symfony\Component\Translation\TranslatorInterface;
18+
use Symfony\Contracts\Translation\TranslatorInterface;
1919

2020
class FullDateTimeFormat extends AbstractDateTimeFormat
2121
{
22-
/** @var \Symfony\Component\Translation\TranslatorInterface */
22+
/** @var \Symfony\Contracts\Translation\TranslatorInterface */
2323
private $translator;
2424

2525
/** @var \eZ\Publish\Core\MVC\ConfigResolverInterface */
2626
private $configResolver;
2727

2828
/**
2929
* @param \EzSystems\EzPlatformUser\UserSetting\Setting\DateTimeFormatSerializer $serializer
30-
* @param \Symfony\Component\Translation\TranslatorInterface $translator
30+
* @param \Symfony\Contracts\Translation\TranslatorInterface $translator
3131
* @param \eZ\Publish\Core\MVC\ConfigResolverInterface $configResolver
3232
* @param \EzSystems\EzPlatformUser\UserSetting\DateTimeFormat\FormatterInterface $formatter
3333
*/

src/lib/UserSetting/Setting/Language.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
use EzSystems\EzPlatformUser\UserSetting\ValueDefinitionInterface;
1515
use Symfony\Component\Form\Extension\Core\Type\LocaleType;
1616
use Symfony\Component\Form\FormBuilderInterface;
17-
use Symfony\Component\Translation\TranslatorInterface;
17+
use Symfony\Contracts\Translation\TranslatorInterface;
1818

1919
class Language implements ValueDefinitionInterface, FormMapperInterface
2020
{
21-
/** @var \Symfony\Component\Translation\TranslatorInterface */
21+
/** @var \Symfony\Contracts\Translation\TranslatorInterface */
2222
private $translator;
2323

2424
/** @var \eZ\Publish\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface */
@@ -28,7 +28,7 @@ class Language implements ValueDefinitionInterface, FormMapperInterface
2828
private $availableLocaleChoiceLoader;
2929

3030
/**
31-
* @param \Symfony\Component\Translation\TranslatorInterface $translator
31+
* @param \Symfony\Contracts\Translation\TranslatorInterface $translator
3232
* @param \eZ\Publish\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface $userLanguagePreferenceProvider
3333
* @param \EzSystems\EzPlatformUser\Form\ChoiceList\Loader\AvailableLocaleChoiceLoader $availableLocaleChoiceLoader
3434
*/

src/lib/UserSetting/Setting/ShortDateTimeFormat.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
use EzSystems\EzPlatformUser\UserSetting\DateTimeFormat\FormatterInterface;
1616
use EzSystems\EzPlatformUser\UserSetting\ValueDefinitionInterface;
1717
use Symfony\Component\Form\FormBuilderInterface;
18-
use Symfony\Component\Translation\TranslatorInterface;
18+
use Symfony\Contracts\Translation\TranslatorInterface;
1919

2020
class ShortDateTimeFormat extends AbstractDateTimeFormat
2121
{
22-
/** @var \Symfony\Component\Translation\TranslatorInterface */
22+
/** @var \Symfony\Contracts\Translation\TranslatorInterface */
2323
private $translator;
2424

2525
/** @var \eZ\Publish\Core\MVC\ConfigResolverInterface */
2626
private $configResolver;
2727

2828
/**
2929
* @param \EzSystems\EzPlatformUser\UserSetting\Setting\DateTimeFormatSerializer $serializer
30-
* @param \Symfony\Component\Translation\TranslatorInterface $translator
30+
* @param \Symfony\Contracts\Translation\TranslatorInterface $translator
3131
* @param \eZ\Publish\Core\MVC\ConfigResolverInterface $configResolver
3232
* @param \EzSystems\EzPlatformUser\UserSetting\DateTimeFormat\FormatterInterface $formatter
3333
*/

src/lib/UserSetting/Setting/SubitemsLimit.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
use EzSystems\EzPlatformUser\UserSetting\ValueDefinitionInterface;
1313
use Symfony\Component\Form\Extension\Core\Type\NumberType;
1414
use Symfony\Component\Form\FormBuilderInterface;
15-
use Symfony\Component\Translation\TranslatorInterface;
15+
use Symfony\Contracts\Translation\TranslatorInterface;
1616

1717
class SubitemsLimit implements ValueDefinitionInterface, FormMapperInterface
1818
{
19-
/** @var \Symfony\Component\Translation\TranslatorInterface */
19+
/** @var \Symfony\Contracts\Translation\TranslatorInterface */
2020
private $translator;
2121

2222
/** @var int */
2323
private $subitemsLimit;
2424

2525
/**
26-
* @param \Symfony\Component\Translation\TranslatorInterface $translator
26+
* @param \Symfony\Contracts\Translation\TranslatorInterface $translator
2727
* @param int $subitemsLimit
2828
*/
2929
public function __construct(TranslatorInterface $translator, int $subitemsLimit)

src/lib/UserSetting/Setting/Timezone.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
use EzSystems\EzPlatformUser\UserSetting\ValueDefinitionInterface;
1313
use Symfony\Component\Form\Extension\Core\Type\TimezoneType;
1414
use Symfony\Component\Form\FormBuilderInterface;
15-
use Symfony\Component\Translation\TranslatorInterface;
15+
use Symfony\Contracts\Translation\TranslatorInterface;
1616

1717
class Timezone implements ValueDefinitionInterface, FormMapperInterface
1818
{
19-
/** @var \Symfony\Component\Translation\TranslatorInterface */
19+
/** @var \Symfony\Contracts\Translation\TranslatorInterface */
2020
private $translator;
2121

2222
/**
23-
* @param \Symfony\Component\Translation\TranslatorInterface $translator
23+
* @param \Symfony\Contracts\Translation\TranslatorInterface $translator
2424
*/
2525
public function __construct(TranslatorInterface $translator)
2626
{

0 commit comments

Comments
 (0)