Skip to content

Commit

Permalink
IBX-1853: Used rebranded Ibexa name in codebase (#31)
Browse files Browse the repository at this point in the history
* IBX-1853: Used rebranded Ibexa name in codebase

* fix: Code Review

* fix: Code Review

* fix: Code Review
  • Loading branch information
Nattfarinn authored Feb 3, 2022
1 parent c672531 commit acdda10
Show file tree
Hide file tree
Showing 177 changed files with 402 additions and 402 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
| Question | Answer
| ------------------ | ------------------
| **JIRA issue** | [EZP-XXXXX](https://jira.ez.no/browse/EZP-XXXXX)
| **JIRA issue** | [IBX-XXXXX](https://issues.ibexa.co/browse/IBX-XXXXX)
| **Bug/Improvement**| yes/no
| **New feature** | yes/no
| **Target version** | latest stable for bug fixes, master for new features
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
use Symfony\Component\Yaml\Yaml;

/**
* eZ Platform RichText Field Type Bundle extension.
* Ibexa RichText Field Type Bundle extension.
*/
class IbexaFieldTypeRichTextExtension extends Extension implements PrependExtensionInterface
{
Expand All @@ -38,7 +38,7 @@ public function getAlias()
}

/**
* Load eZ Platform RichText Field Type Bundle configuration.
* Load Ibexa RichText Field Type Bundle configuration.
*
* @param array $configs
* @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
Expand Down Expand Up @@ -129,13 +129,13 @@ private function registerRichTextConfiguration(array $config, ContainerBuilder $
*/
public function prepend(ContainerBuilder $container)
{
$this->prependEzPublishConfiguration($container);
$this->prependIbexaConfiguration($container);
$this->prependEzRichTextConfiguration($container);
$this->prependBazingaJsTranslationConfiguration($container);
$this->prependJMSTranslation($container);
}

private function prependEzPublishConfiguration(ContainerBuilder $container): void
private function prependIbexaConfiguration(ContainerBuilder $container): void
{
$coreExtensionConfigFile = realpath(__DIR__ . '/../Resources/config/prepend/ezpublish.yaml');
$container->prependExtensionConfig('ibexa', Yaml::parseFile($coreExtensionConfigFile));
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/IbexaFieldTypeRichTextBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use Symfony\Component\HttpKernel\Bundle\Bundle;

/**
* eZ Platform RichText FieldType Bundle.
* Ibexa RichText FieldType Bundle.
*/
class IbexaFieldTypeRichTextBundle extends Bundle
{
Expand Down
8 changes: 4 additions & 4 deletions src/bundle/Resources/config/fieldtype_services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ services:
class: Ibexa\FieldTypeRichText\RichText\Normalizer\DocumentTypeDefinition
arguments:
- 'section'
- 'http://ez.no/namespaces/ezpublish5/xhtml5/edit'
- 'http://ibexa.co/namespaces/ezpublish5/xhtml5/edit'
- '%ibexa.field_type.richtext.resources%/dtd/ezxhtml5_edit_html_character_entities.dtd'

Ibexa\FieldTypeRichText\RichText\ConverterDispatcher:
class: Ibexa\FieldTypeRichText\RichText\ConverterDispatcher
arguments:
-
http://docbook.org/ns/docbook: null
http://ez.no/namespaces/ezpublish5/xhtml5/edit: '@ibexa.richtext.converter.input.xhtml5'
http://ibexa.co/namespaces/ezpublish5/xhtml5/edit: '@ibexa.richtext.converter.input.xhtml5'

Ibexa\FieldTypeRichText\RichText\Renderer:
class: Ibexa\FieldTypeRichText\RichText\Renderer
Expand Down Expand Up @@ -100,8 +100,8 @@ services:
arguments:
-
http://docbook.org/ns/docbook: null
http://ez.no/namespaces/ezpublish5/xhtml5/edit: null
http://ez.no/namespaces/ezpublish5/xhtml5: '@ibexa.richtext.validator.output.ezxhtml5'
http://ibexa.co/namespaces/ezpublish5/xhtml5/edit: null
http://ibexa.co/namespaces/ezpublish5/xhtml5: '@ibexa.richtext.validator.output.ezxhtml5'

Ibexa\FieldTypeRichText\RichText\Validator\InternalLinkValidator:
class: Ibexa\FieldTypeRichText\RichText\Validator\InternalLinkValidator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const VIEWPORT_TOP_OFFSET = 102;
(function(global, doc, ibexa) {
class BaseRichText {
constructor(config) {
this.ezNamespace = 'http://ez.no/namespaces/ezpublish5/xhtml5/edit';
this.ezNamespace = 'http://ibexa.co/namespaces/ezpublish5/xhtml5/edit';
this.xhtmlNamespace = 'http://www.w3.org/1999/xhtml';

this.editor = null;
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/richtext/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Resources for the different formats for RichText.

RichText storage format is docbook (5), two other formats are supported for transformations to/from docbook:
- ezxml, _for input/output, however only main use case is [upgrade from eZ Publish](https://doc.ez.no/display/DEVELOPER/Upgrading+from+5.4.x+and+2014.11+to+16.xx)._
- ezxml, _for input/output, however only main use case is [upgrade from eZ Publish](https://doc.ibexa.co/display/DEVELOPER/Upgrading+from+5.4.x+and+2014.11+to+16.xx)._
- ezhtml5, _exists in two different representations:_
- "edit" a semantic version for UI use, for input/output.
- "output" for web view, for output only.
Expand Down
10 changes: 5 additions & 5 deletions src/bundle/Resources/richtext/schemas/docbook/ezpublish.rng
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
xmlns:db="http://docbook.org/ns/docbook"
xmlns:ez="http://ez.no/xmlns/ezpublish/docbook"
xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom"
xmlns:a="http://ez.no/xmlns/annotation"
xmlns:m="http://ez.no/xmlns/module"
xmlns:ez="http://ibexa.co/xmlns/ezpublish/docbook"
xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml"
xmlns:ezcustom="http://ibexa.co/xmlns/dxp/docbook/custom"
xmlns:a="http://ibexa.co/xmlns/annotation"
xmlns:m="http://ibexa.co/xmlns/module"
ns="http://docbook.org/ns/docbook"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@

<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://ez.no/namespaces/ezpublish5/xhtml5"
xmlns="http://ibexa.co/namespaces/ezpublish5/xhtml5"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:mml="http://www.w3.org/1998/Math/MathML"
targetNamespace="http://ez.no/namespaces/ezpublish5/xhtml5"
targetNamespace="http://ibexa.co/namespaces/ezpublish5/xhtml5"
elementFormDefault="qualified">

<xs:import namespace="http://www.w3.org/XML/1998/namespace"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:docbook="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom"
xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml"
xmlns:ezcustom="http://ibexa.co/xmlns/dxp/docbook/custom"
exclude-result-prefixes="docbook xlink ezxhtml ezcustom"
version="1.0">
<xsl:output indent="yes" encoding="UTF-8"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<xsl:output indent="yes" encoding="UTF-8"/>

<xsl:variable name="outputNamespace" select="'http://ez.no/namespaces/ezpublish5/xhtml5/edit'"/>
<xsl:variable name="outputNamespace" select="'http://ibexa.co/namespaces/ezpublish5/xhtml5/edit'"/>
<xsl:template match="/docbook:section">
<xsl:element name="section" namespace="{$outputNamespace}">
<xsl:apply-templates/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:docbook="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom"
xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml"
xmlns:ezcustom="http://ibexa.co/xmlns/dxp/docbook/custom"
exclude-result-prefixes="docbook xlink ezxhtml ezcustom"
version="1.0">
<xsl:output indent="yes" encoding="UTF-8"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<xsl:output indent="yes" encoding="UTF-8"/>

<xsl:variable name="outputNamespace" select="'http://ez.no/namespaces/ezpublish5/xhtml5'"/>
<xsl:variable name="outputNamespace" select="'http://ibexa.co/namespaces/ezpublish5/xhtml5'"/>
<xsl:template match="/docbook:section">
<xsl:element name="section" namespace="{$outputNamespace}">
<xsl:apply-templates/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:ezxhtml5="http://ez.no/namespaces/ezpublish5/xhtml5/edit"
xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
xmlns:ezxhtml5="http://ibexa.co/namespaces/ezpublish5/xhtml5/edit"
xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://docbook.org/ns/docbook"
exclude-result-prefixes="ezxhtml5"
Expand All @@ -12,8 +12,8 @@
<xsl:template match="/ezxhtml5:section">
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom"
xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml"
xmlns:ezcustom="http://ibexa.co/xmlns/dxp/docbook/custom"
version="5.0-variant ezpublish-1.0">
<xsl:apply-templates/>
</section>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:ezxhtml5="http://ez.no/namespaces/ezpublish5/xhtml5"
xmlns:ezxhtml5="http://ibexa.co/namespaces/ezpublish5/xhtml5"
version="1.0">

<xsl:output omit-xml-declaration="yes" indent="yes" encoding="UTF-8"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected function configureAndLoad(array $configurationValues = [])
// mock list of available bundles
$this->setParameter(
'kernel.bundles',
['EzPublishCoreBundle' => null, 'IbexaFieldTypeRichTextBundle' => null]
['IbexaCoreBundle' => null, 'IbexaFieldTypeRichTextBundle' => null]
);

$configs = array_merge_recursive($this->getMinimalConfiguration(), $configurationValues);
Expand Down Expand Up @@ -106,7 +106,7 @@ public function testDefaultContentSettings()
[
'template' => '@IbexaFieldTypeRichText/RichText/tag/default.html.twig',
],
'ezdemo_site'
'ibexa_demo_site'
);
$this->assertConfigResolverParameterValue(
'fieldtypes.ezrichtext.output_custom_xsl',
Expand All @@ -116,7 +116,7 @@ public function testDefaultContentSettings()
'priority' => 0,
],
],
'ezdemo_site'
'ibexa_demo_site'
);
}

Expand All @@ -132,7 +132,7 @@ public function testRichTextCustomTagsInvalidSettings()
[
'ibexa' => [
'system' => [
'ezdemo_site' => [
'ibexa_demo_site' => [
'fieldtypes' => [
'ezrichtext' => [
'custom_tags' => ['foo'],
Expand All @@ -146,7 +146,7 @@ public function testRichTextCustomTagsInvalidSettings()
$this->assertConfigResolverParameterValue(
'fieldtypes.ezrichtext.custom_tags',
['foo'],
'ezdemo_site'
'ibexa_demo_site'
);
}

Expand All @@ -171,7 +171,7 @@ public function testOnlineEditorInvalidSettingsThrowException(
[
'ibexa' => [
'system' => [
'ezdemo_site' => [
'ibexa_demo_site' => [
'fieldtypes' => [
'ezrichtext' => $config,
],
Expand Down Expand Up @@ -260,14 +260,14 @@ public function testRichTextSettings(array $config, array $expected)
[
'ibexa' => [
'system' => [
'ezdemo_site' => $config,
'ibexa_demo_site' => $config,
],
],
]
);

foreach ($expected as $key => $val) {
$this->assertConfigResolverParameterValue($key, $val, 'ezdemo_site');
$this->assertConfigResolverParameterValue($key, $val, 'ibexa_demo_site');
}
}

Expand Down
10 changes: 5 additions & 5 deletions tests/bundle/DependencyInjection/Fixtures/ibexa.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
siteaccess:
default_siteaccess: ezdemo_site
default_siteaccess: ibexa_demo_site
list:
- ezdemo_site
- ibexa_demo_site
groups:
ezdemo_group:
- ezdemo_site
ibexa_demo_group:
- ibexa_demo_site
match:
URIElement: 1
Map\URI:
the_front: ezdemo_site
the_front: ibexa_demo_site
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public function getFieldDefinitionData()
public function getInitialValue()
{
$xml = '<?xml version="1.0" encoding="UTF-8"?>
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml" xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml" xmlns:ezcustom="http://ibexa.co/xmlns/dxp/docbook/custom" version="5.0-variant ezpublish-1.0">
<title>This is a heading.</title>
<para>This is a paragraph.</para>
</section>
Expand All @@ -155,7 +155,7 @@ public function getInitialValue()
public function getUpdatedValue()
{
$xml = '<?xml version="1.0" encoding="UTF-8"?>
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml" xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0">
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml" xmlns:ezcustom="http://ibexa.co/xmlns/dxp/docbook/custom" version="5.0-variant ezpublish-1.0">
<title>This is an updated heading.</title>
<para>This is an updated paragraph.</para>
</section>
Expand Down
Loading

0 comments on commit acdda10

Please sign in to comment.