Skip to content

Commit 96fb728

Browse files
NattfarinnNattfarinn
authored
Merge pull request #6 from ibexa/ibx-1334-cross-rebranding
IBX-1334: Rebranded ibexa/fieldtype-richtext to use new namespaces
2 parents 8e450f6 + a7d648d commit 96fb728

File tree

90 files changed

+409
-407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+409
-407
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
php:
21-
- '7.3'
2221
- '7.4'
2322
composer_options: [ "" ]
2423
experimental: [false]

‎composer.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"ezsystems/ezplatform-richtext": "*"
77
},
88
"require": {
9-
"php": "^7.3",
9+
"php": "^7.4",
1010
"ext-xsl": "*",
1111
"ext-dom": "*",
1212
"ext-libxml": "*",
@@ -24,20 +24,20 @@
2424
"symfony/translation": "^5.0",
2525
"symfony/translation-contracts": "^2.0",
2626
"twig/twig": "^3.0",
27-
"ezsystems/ezplatform-kernel": "^4.0@dev",
28-
"ezsystems/ezplatform-content-forms": "^4.0@dev",
29-
"ezsystems/ezplatform-rest": "^4.0@dev",
30-
"ezsystems/ezplatform-http-cache": "^4.0@dev"
27+
"ibexa/core": "^4.0@dev",
28+
"ibexa/content-forms": "^4.0@dev",
29+
"ibexa/rest": "^4.0@dev",
30+
"ibexa/http-cache": "^4.0@dev"
3131
},
3232
"require-dev": {
3333
"ibexa/ci-scripts": "^0.2@dev",
34-
"ezsystems/doctrine-dbal-schema": "^4.0@dev",
34+
"ibexa/doctrine-schema": "^4.0@dev",
3535
"phpunit/phpunit": "^8.5",
3636
"symfony/finder": "^5.0",
3737
"matthiasnoback/symfony-config-test": "^4.1",
3838
"matthiasnoback/symfony-dependency-injection-test": "^4.1",
39-
"friendsofphp/php-cs-fixer": "^2.16",
40-
"ezsystems/ezplatform-code-style": "^1.0"
39+
"friendsofphp/php-cs-fixer": "^3.0",
40+
"ibexa/code-style": "^1.0"
4141
},
4242
"autoload": {
4343
"psr-4": {
@@ -57,7 +57,7 @@
5757
}
5858
},
5959
"scripts": {
60-
"fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php --show-progress=dots",
60+
"fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
6161
"check-cs": "@fix-cs --dry-run",
6262
"test": "phpunit -c phpunit.xml",
6363
"integration": [

‎phpunit-integration-legacy-solr.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
failOnWarning="true"
1010
>
1111
<php>
12-
<env name="setupFactory" value="EzSystems\IntegrationTests\EzPlatformRichText\eZ\API\SetupFactory\SolrLegacySetupFactory" />
12+
<env name="setupFactory" value="Ibexa\Tests\Integration\FieldTypeRichText\eZ\API\SetupFactory\SolrLegacySetupFactory" />
1313
<env name="backendVersion" value="5" />
1414
<env name="fixtureDir" value="Solr" />
1515
<env name="solrServer" value="http://localhost:8983/" />

‎src/bundle/DependencyInjection/Compiler/RichTextHtml5ConverterPass.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/**
1717
* Compiler pass for the RichText Aggregate converter tags.
1818
*
19-
* @see \EzSystems\EzPlatformRichText\eZ\RichText\Converter\Aggregate
19+
* @see \Ibexa\FieldTypeRichText\RichText\Converter\Aggregate
2020
*/
2121
class RichTextHtml5ConverterPass implements CompilerPassInterface
2222
{

‎src/bundle/DependencyInjection/Configuration.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
namespace Ibexa\Bundle\FieldTypeRichText\DependencyInjection;
1010

11-
use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\Configuration as SiteAccessConfiguration;
11+
use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\Configuration as SiteAccessConfiguration;
1212
use Symfony\Component\Config\Definition\Builder\NodeBuilder;
1313
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
1414

1515
class Configuration extends SiteAccessConfiguration
1616
{
17-
const CUSTOM_TAG_ATTRIBUTE_TYPES = ['number', 'string', 'boolean', 'choice', 'link'];
17+
public const CUSTOM_TAG_ATTRIBUTE_TYPES = ['number', 'string', 'boolean', 'choice', 'link'];
1818

1919
/**
2020
* Generates the configuration tree builder.

‎src/bundle/DependencyInjection/Configuration/Parser/FieldType/RichText.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
namespace Ibexa\Bundle\FieldTypeRichText\DependencyInjection\Configuration\Parser\FieldType;
1010

11-
use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\Parser\AbstractFieldTypeParser;
12-
use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\ContextualizerInterface;
11+
use Ibexa\Bundle\Core\DependencyInjection\Configuration\Parser\AbstractFieldTypeParser;
12+
use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ContextualizerInterface;
1313
use InvalidArgumentException;
1414
use Symfony\Component\Config\Definition\Builder\NodeBuilder;
1515
use Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition;

‎src/bundle/DependencyInjection/IbexaFieldTypeRichTextExtension.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class IbexaFieldTypeRichTextExtension extends Extension implements PrependExtens
2525
{
2626
public const EXTENSION_NAME = 'ibexa_fieldtype_richtext';
2727

28-
const RICHTEXT_CUSTOM_STYLES_PARAMETER = 'ezplatform.ezrichtext.custom_styles';
29-
const RICHTEXT_CUSTOM_TAGS_PARAMETER = 'ezplatform.ezrichtext.custom_tags';
30-
const RICHTEXT_ALLOY_EDITOR_PARAMETER = 'ezplatform.ezrichtext.alloy_editor';
28+
public const RICHTEXT_CUSTOM_STYLES_PARAMETER = 'ezplatform.ezrichtext.custom_styles';
29+
public const RICHTEXT_CUSTOM_TAGS_PARAMETER = 'ezplatform.ezrichtext.custom_tags';
30+
public const RICHTEXT_ALLOY_EDITOR_PARAMETER = 'ezplatform.ezrichtext.alloy_editor';
3131
public const RICHTEXT_CONFIGURATION_PROVIDER_TAG = 'ezplatform.ezrichtext.configuration.provider';
3232

3333
private const RICHTEXT_TEXT_TOOLBAR_NAME = 'text';
@@ -138,7 +138,7 @@ public function prepend(ContainerBuilder $container)
138138
private function prependEzPublishConfiguration(ContainerBuilder $container): void
139139
{
140140
$coreExtensionConfigFile = realpath(__DIR__ . '/../Resources/config/prepend/ezpublish.yaml');
141-
$container->prependExtensionConfig('ezpublish', Yaml::parseFile($coreExtensionConfigFile));
141+
$container->prependExtensionConfig('ibexa', Yaml::parseFile($coreExtensionConfigFile));
142142
$container->addResource(new FileResource($coreExtensionConfigFile));
143143
}
144144

‎src/bundle/IbexaFieldTypeRichTextBundle.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Ibexa\Bundle\FieldTypeRichText;
1010

11-
use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\EzPublishCoreExtension;
11+
use Ibexa\Bundle\Core\DependencyInjection\IbexaCoreExtension;
1212
use Ibexa\Bundle\FieldTypeRichText\DependencyInjection\Compiler\RichTextHtml5ConverterPass;
1313
use Ibexa\Bundle\FieldTypeRichText\DependencyInjection\Configuration\Parser\FieldType\RichText;
1414
use Ibexa\Bundle\FieldTypeRichText\DependencyInjection\IbexaFieldTypeRichTextExtension;
@@ -24,8 +24,8 @@ public function build(ContainerBuilder $container)
2424
{
2525
parent::build($container);
2626

27-
/** @var \eZ\Bundle\EzPublishCoreBundle\DependencyInjection\EzPublishCoreExtension $core */
28-
$core = $container->getExtension('ezpublish');
27+
/** @var \Ibexa\Bundle\Core\DependencyInjection\IbexaCoreExtension $core */
28+
$core = $container->getExtension('ibexa');
2929
$core->addDefaultSettings(__DIR__ . '/Resources/config', ['default_settings.yaml']);
3030

3131
$container->addCompilerPass(new RichTextHtml5ConverterPass());
@@ -40,11 +40,11 @@ public function registerConfigParser(ContainerBuilder $container)
4040
/**
4141
* @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
4242
*
43-
* @return \eZ\Bundle\EzPublishCoreBundle\DependencyInjection\EzPublishCoreExtension
43+
* @return \Ibexa\Bundle\Core\DependencyInjection\IbexaCoreExtension
4444
*/
45-
protected function getCoreExtension(ContainerBuilder $container): EzPublishCoreExtension
45+
protected function getCoreExtension(ContainerBuilder $container): IbexaCoreExtension
4646
{
47-
return $container->getExtension('ezpublish');
47+
return $container->getExtension('ibexa');
4848
}
4949

5050
public function getContainerExtension()

‎src/bundle/Templating/Twig/Extension/RichTextConfigurationExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
final class RichTextConfigurationExtension extends AbstractExtension implements GlobalsInterface
2121
{
22-
/** @var \EzSystems\EzPlatformRichText\API\Configuration\ProviderService */
22+
/** @var \Ibexa\Contracts\FieldTypeRichText\Configuration\ProviderService */
2323
private $configurationProvider;
2424

2525
public function __construct(ProviderService $configurationProvider)

‎src/bundle/Templating/Twig/Extension/RichTextConverterExtension.php‎

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

1616
class RichTextConverterExtension extends AbstractExtension
1717
{
18-
/** @var \EzSystems\EzPlatformRichText\eZ\RichText\Converter */
18+
/** @var \Ibexa\Contracts\FieldTypeRichText\RichText\Converter */
1919
private $richTextOutputConverter;
2020

21-
/** @var \EzSystems\EzPlatformRichText\eZ\RichText\Converter */
21+
/** @var \Ibexa\Contracts\FieldTypeRichText\RichText\Converter */
2222
private $richTextEditConverter;
2323

2424
public function __construct(

0 commit comments

Comments
 (0)