Skip to content

Commit 2580f1c

Browse files
emodricPlopix
authored andcommitted
Switch all code to Ibexa nomenclature
1 parent 0b62b2e commit 2580f1c

Some content is hidden

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

47 files changed

+203
-197
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Documentation is available in this repository via `.md` files but also packaged
1515
[![Latest version](https://img.shields.io/github/release/Novactive/NovaeZSEOBundle.svg?style=flat-square)](https://github.com/Novactive/NovaeZSEOBundle/releases)
1616
[![License](https://img.shields.io/packagist/l/novactive/ezseobundle.svg?style=flat-square)](LICENSE)
1717

18-
Novactive eZ SEO Bundle is an eZPlatform bundle for SEO management simplifications.
18+
Novactive eZ SEO Bundle is an Ibexa Platform bundle for SEO management simplifications.
1919

2020
Presentation and documentation available here : [http://novactive.github.io/NovaeZSEOBundle](http://novactive.github.io/NovaeZSEOBundle)
2121

@@ -30,8 +30,8 @@ Presentation and documentation available here : [http://novactive.github.io/Nova
3030

3131
[Installation](documentation/INSTALL.md)
3232

33-
Changelog
34-
---------
33+
Change
34+
------
3535

3636
[Changelog](documentation/CHANGELOG.md)
3737

bundle/Command/AddNovaSEOMetasFieldTypeCommand.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
namespace Novactive\Bundle\eZSEOBundle\Command;
1414

15-
use eZ\Publish\API\Repository\Repository;
16-
use eZ\Publish\API\Repository\UserService;
17-
use eZ\Publish\API\Repository\Values\ContentType\ContentType;
18-
use eZ\Publish\Core\MVC\ConfigResolverInterface;
15+
use Ibexa\Contracts\Core\Repository\Repository;
16+
use Ibexa\Contracts\Core\Repository\UserService;
17+
use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
18+
use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
1919
use Novactive\Bundle\eZSEOBundle\Core\Converter\ContentTypesHelper;
2020
use Novactive\Bundle\eZSEOBundle\Core\Installer\Field as FieldInstaller;
2121
use Symfony\Component\Console\Command\Command;
@@ -95,7 +95,7 @@ protected function configure(): void
9595
)->setHelp(
9696
<<<EOT
9797
The command <info>%command.name%</info> add the FieldType 'novaseometas'.
98-
You can select the Content Type via the <info>identifier</info>, <info>identifiers</info>,
98+
You can select the Content Type via the <info>identifier</info>, <info>identifiers</info>,
9999
<info>group_identifier</info> option.
100100
- Identifier will be: <comment>%nova_ezseo.default.fieldtype_metas_identifier%</comment>
101101
- Name will be: <comment>Metas</comment>

bundle/Controller/Admin/RedirectController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
use Doctrine\ORM\EntityManagerInterface;
1616
use Exception;
17-
use eZ\Publish\API\Repository\PermissionResolver;
18-
use eZ\Publish\Core\Event\URLWildcardService;
19-
use EzSystems\EzPlatformAdminUiBundle\Controller\Controller;
17+
use Ibexa\Contracts\Core\Repository\PermissionResolver;
18+
use Ibexa\Core\Event\URLWildcardService;
19+
use Ibexa\Contracts\AdminUi\Controller\Controller;
2020
use Novactive\Bundle\eZSEOBundle\Core\Helper\ImportUrlsHelper;
2121
use Novactive\Bundle\eZSEOBundle\Entity\RedirectImportHistory;
2222
use Novactive\Bundle\eZSEOBundle\Form\Type\DeleteUrlType;

bundle/Controller/SEOController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Novactive\Bundle\eZSEOBundle\Controller;
1414

1515
use DOMDocument;
16-
use eZ\Bundle\EzPublishCoreBundle\Controller;
16+
use Ibexa\Bundle\Core\Controller;
1717
use Symfony\Component\HttpFoundation\Response;
1818
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
1919
use Symfony\Component\Routing\Annotation\Route;

bundle/Controller/SitemapController.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
use DateTime;
1616
use DOMDocument;
1717
use DOMElement;
18-
use eZ\Bundle\EzPublishCoreBundle\Controller;
19-
use eZ\Publish\API\Repository\Values\Content\Location;
20-
use eZ\Publish\API\Repository\Values\Content\Search\SearchHit;
21-
use eZ\Publish\API\Repository\Values\Content\Search\SearchResult;
22-
use eZ\Publish\Core\Helper\FieldHelper;
23-
use eZ\Publish\Core\Repository\Values\Content\VersionInfo;
24-
use eZ\Publish\SPI\Variation\VariationHandler;
18+
use Ibexa\Bundle\Core\Controller;
19+
use Ibexa\Contracts\Core\Repository\Values\Content\Location;
20+
use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit;
21+
use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult;
22+
use Ibexa\Core\Helper\FieldHelper;
23+
use Ibexa\Core\MVC\Symfony\Routing\UrlAliasRouter;
24+
use Ibexa\Core\Repository\Values\Content\VersionInfo;
25+
use Ibexa\Contracts\Core\Variation\VariationHandler;
2526
use Novactive\Bundle\eZSEOBundle\Core\Sitemap\QueryFactory;
2627
use Symfony\Component\HttpFoundation\Response;
2728
use Symfony\Component\Routing\Annotation\Route;
@@ -126,7 +127,7 @@ protected function fillSitemap(DOMDocument $sitemap, DOMElement $root, SearchRes
126127
$location = $searchHit->valueObject;
127128
try {
128129
$url = $this->generateUrl(
129-
'ez_urlalias',
130+
UrlAliasRouter::URL_ALIAS_ROUTE_NAME,
130131
['locationId' => $location->id],
131132
UrlGeneratorInterface::ABSOLUTE_URL
132133
);

bundle/Core/Converter/ContentTypesHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Novactive\Bundle\eZSEOBundle\Core\Converter;
44

5-
use eZ\Publish\API\Repository\ContentTypeService;
5+
use Ibexa\Contracts\Core\Repository\ContentTypeService;
66

77
class ContentTypesHelper
88
{

bundle/Core/CustomFallbackInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace Novactive\Bundle\eZSEOBundle\Core;
1414

15-
use eZ\Publish\API\Repository\Values\Content\ContentInfo;
15+
use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
1616

1717
interface CustomFallbackInterface
1818
{

bundle/Core/DummyCustomFallback.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace Novactive\Bundle\eZSEOBundle\Core;
1414

15-
use eZ\Publish\API\Repository\Values\Content\ContentInfo;
15+
use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
1616

1717
class DummyCustomFallback implements CustomFallbackInterface
1818
{

bundle/Core/FieldType/Metas/Converter.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
namespace Novactive\Bundle\eZSEOBundle\Core\FieldType\Metas;
1414

15-
use eZ\Publish\Core\FieldType\FieldSettings;
16-
use eZ\Publish\Core\Persistence\Legacy\Content\FieldValue\Converter as LegacyConverter;
17-
use eZ\Publish\Core\Persistence\Legacy\Content\StorageFieldDefinition;
18-
use eZ\Publish\Core\Persistence\Legacy\Content\StorageFieldValue;
19-
use eZ\Publish\SPI\Persistence\Content\FieldValue;
20-
use eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition;
15+
use Ibexa\Core\FieldType\FieldSettings;
16+
use Ibexa\Core\Persistence\Legacy\Content\FieldValue\Converter as LegacyConverter;
17+
use Ibexa\Core\Persistence\Legacy\Content\StorageFieldDefinition;
18+
use Ibexa\Core\Persistence\Legacy\Content\StorageFieldValue;
19+
use Ibexa\Contracts\Core\Persistence\Content\FieldValue;
20+
use Ibexa\Contracts\Core\Persistence\Content\Type\FieldDefinition;
2121

2222
class Converter implements LegacyConverter
2323
{

bundle/Core/FieldType/Metas/FormMapper.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
namespace Novactive\Bundle\eZSEOBundle\Core\FieldType\Metas;
1414

15-
use eZ\Publish\Core\MVC\ConfigResolverInterface;
16-
use EzSystems\EzPlatformAdminUi\FieldType\FieldDefinitionFormMapperInterface;
17-
use EzSystems\EzPlatformAdminUi\Form\Data\FieldDefinitionData;
18-
use EzSystems\EzPlatformContentForms\Data\Content\FieldData;
19-
use EzSystems\EzPlatformContentForms\FieldType\FieldValueFormMapperInterface;
15+
use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
16+
use Ibexa\AdminUi\FieldType\FieldDefinitionFormMapperInterface;
17+
use Ibexa\AdminUi\Form\Data\FieldDefinitionData;
18+
use Ibexa\Contracts\ContentForms\Data\Content\FieldData;
19+
use Ibexa\Contracts\ContentForms\FieldType\FieldValueFormMapperInterface;
2020
use Novactive\Bundle\eZSEOBundle\Core\Meta;
2121
use Novactive\Bundle\eZSEOBundle\Form\Type\MetasFieldType;
2222
use Symfony\Component\Form\Extension\Core\Type\CollectionType;

0 commit comments

Comments
 (0)