Fixed merge 4.5 into 4.6 (#1238)

ibexa · Apr 11, 2024 · b99be41 · b99be41
1 parent b805ec0
commit b99be41
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/lib/REST/Value/ContentTree/NodeExtendedInfo.php b/src/lib/REST/Value/ContentTree/NodeExtendedInfo.php
@@ -16,7 +16,6 @@
  *      restrictedContentTypeIds?: array<int>,
  *      restrictedLanguageCodes?: array<string>,
  * }
- *
  * @phpstan-type TPermissionRestrictions array{
  *      create: TRestrictions,
  *      edit: TRestrictions,

diff --git a/tests/integration/AdminUiIbexaTestKernel.php b/tests/integration/AdminUiIbexaTestKernel.php
@@ -39,7 +39,6 @@ public function registerBundles(): iterable
     {
         yield from parent::registerBundles();
 
-        yield new DAMADoctrineTestBundle();
         yield new HautelookTemplatedUriBundle();
         yield new KnpMenuBundle();
         yield new WebpackEncoreBundle();