⬆️ Replace dependency tightenco/collect by illuminate/collection - issue #3551

macintoshplus · macintoshplus · commit 8fc938c1629b · 2025-03-12T10:44:43.000+01:00
diff --git a/composer.json b/composer.json
@@ -26,6 +26,7 @@
         "erusev/parsedown": "^1.7",
         "erusev/parsedown-extra": "^0.8.1",
         "fakerphp/faker": "^1.16",
+        "illuminate/collections": "^10.48",
         "jasny/twig-extensions": "^1.3",
         "knplabs/doctrine-behaviors": "^2.1",
         "knplabs/knp-menu-bundle": "^3.1",
@@ -76,7 +77,6 @@
         "symfony/webpack-encore-bundle": "^1.12",
         "symfony/yaml": "^5.4",
         "symfonycasts/reset-password-bundle": "^1.9",
-        "tightenco/collect": "^v8.34",
         "twig/extra-bundle": "^3.3",
         "twig/html-extra": "^3.3",
         "twig/intl-extra": "^3.3",
diff --git a/src/Api/Extensions/ContentExtension.php b/src/Api/Extensions/ContentExtension.php
@@ -13,7 +13,7 @@
 use Bolt\Enum\Statuses;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 final class ContentExtension implements QueryCollectionExtensionInterface, QueryItemExtensionInterface
 {
diff --git a/src/Cache/FilesIndexCacher.php b/src/Cache/FilesIndexCacher.php
@@ -3,7 +3,7 @@
 namespace Bolt\Cache;
 
 use Bolt\Utils\FilesIndex;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class FilesIndexCacher extends FilesIndex implements CachingInterface
 {
diff --git a/src/Collection/DeepCollection.php b/src/Collection/DeepCollection.php
@@ -4,7 +4,7 @@
 
 namespace Bolt\Collection;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class DeepCollection extends Collection
 {
diff --git a/src/Configuration/Config.php b/src/Configuration/Config.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 use Webimpress\SafeWriter\FileWriter;
 
 class Config
diff --git a/src/Configuration/Content/ContentType.php b/src/Configuration/Content/ContentType.php
@@ -5,7 +5,7 @@
 namespace Bolt\Configuration\Content;
 
 use Bolt\Collection\DeepCollection;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class ContentType extends DeepCollection
 {
diff --git a/src/Configuration/Content/FieldType.php b/src/Configuration/Content/FieldType.php
@@ -4,7 +4,7 @@
 
 namespace Bolt\Configuration\Content;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class FieldType extends Collection
 {
diff --git a/src/Configuration/Content/TaxonomyType.php b/src/Configuration/Content/TaxonomyType.php
@@ -5,7 +5,7 @@
 namespace Bolt\Configuration\Content;
 
 use Bolt\Collection\DeepCollection;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class TaxonomyType extends DeepCollection
 {
diff --git a/src/Configuration/Parser/BaseParser.php b/src/Configuration/Parser/BaseParser.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Yaml\Yaml;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 abstract class BaseParser
 {
diff --git a/src/Configuration/Parser/ContentTypesParser.php b/src/Configuration/Parser/ContentTypesParser.php
@@ -10,7 +10,7 @@
 use Bolt\Configuration\Content\FieldType;
 use Bolt\Enum\Statuses;
 use Bolt\Exception\ConfigurationException;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class ContentTypesParser extends BaseParser
 {
diff --git a/src/Configuration/Parser/GeneralParser.php b/src/Configuration/Parser/GeneralParser.php
@@ -5,7 +5,7 @@
 namespace Bolt\Configuration\Parser;
 
 use Bolt\Common\Arr;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class GeneralParser extends BaseParser
 {
diff --git a/src/Configuration/Parser/MenuParser.php b/src/Configuration/Parser/MenuParser.php
@@ -4,7 +4,7 @@
 
 namespace Bolt\Configuration\Parser;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class MenuParser extends BaseParser
 {
diff --git a/src/Configuration/Parser/PermissionsParser.php b/src/Configuration/Parser/PermissionsParser.php
@@ -5,7 +5,7 @@
 namespace Bolt\Configuration\Parser;
 
 use Bolt\Common\Arr;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class PermissionsParser extends BaseParser
 {
diff --git a/src/Configuration/Parser/TaxonomyParser.php b/src/Configuration/Parser/TaxonomyParser.php
@@ -5,7 +5,7 @@
 namespace Bolt\Configuration\Parser;
 
 use Bolt\Common\Str;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class TaxonomyParser extends BaseParser
 {
diff --git a/src/Configuration/Parser/ThemeParser.php b/src/Configuration/Parser/ThemeParser.php
@@ -4,7 +4,7 @@
 
 namespace Bolt\Configuration\Parser;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class ThemeParser extends BaseParser
 {
diff --git a/src/Configuration/PathResolver.php b/src/Configuration/PathResolver.php
@@ -6,7 +6,7 @@
 
 use Bolt\Exception\ConfigurationException;
 use Symfony\Component\Filesystem\Path;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * A class to resolve and manage paths. Paths defined here are allowed to have variables within them.
diff --git a/src/Controller/Backend/Async/SelectOptionsController.php b/src/Controller/Backend/Async/SelectOptionsController.php
@@ -11,7 +11,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * @Security("is_granted('upload')")
diff --git a/src/Controller/Backend/ContentEditController.php b/src/Controller/Backend/ContentEditController.php
@@ -40,7 +40,7 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * CRUD + status, duplicate, for content - note that listing is handled by ListingController.php
diff --git a/src/Controller/TwigAwareController.php b/src/Controller/TwigAwareController.php
@@ -22,7 +22,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 use Twig\Environment;
 use Twig\Loader\ChainLoader;
 use Twig\Loader\FilesystemLoader;
diff --git a/src/DataFixtures/BaseFixture.php b/src/DataFixtures/BaseFixture.php
@@ -7,7 +7,7 @@
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Symfony\Component\Filesystem\Path;
 use Symfony\Component\Finder\Finder;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 abstract class BaseFixture extends Fixture
 {
diff --git a/src/DataFixtures/ContentFixtures.php b/src/DataFixtures/ContentFixtures.php
@@ -21,7 +21,7 @@
 use Faker\Factory;
 use Faker\Generator;
 use Symfony\Contracts\Cache\TagAwareCacheInterface;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class ContentFixtures extends BaseFixture implements DependentFixtureInterface, FixtureGroupInterface
 {
diff --git a/src/Entity/Content.php b/src/Entity/Content.php
@@ -23,7 +23,7 @@
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\MaxDepth;
-use Tightenco\Collect\Support\Collection as LaravelCollection;
+use Illuminate\Support\Collection as LaravelCollection;
 
 /**
  * @ApiResource(
diff --git a/src/Entity/ContentLocalizeTrait.php b/src/Entity/ContentLocalizeTrait.php
@@ -4,7 +4,7 @@
 
 namespace Bolt\Entity;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * @see \Bolt\Entity\Content
diff --git a/src/Entity/Field.php b/src/Entity/Field.php
@@ -16,7 +16,7 @@
 use Knp\DoctrineBehaviors\Model\Translatable\TranslatableTrait;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\SerializedName;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 use Twig\Environment;
 use Twig\Error\LoaderError;
 use Twig\Error\SyntaxError;
diff --git a/src/Entity/Field/SelectField.php b/src/Entity/Field/SelectField.php
@@ -9,7 +9,7 @@
 use Bolt\Entity\IterableFieldTrait;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * @ORM\Entity
diff --git a/src/Entity/Field/SetField.php b/src/Entity/Field/SetField.php
@@ -13,7 +13,7 @@
 use Bolt\Entity\ListFieldInterface;
 use Bolt\Repository\FieldRepository;
 use Doctrine\ORM\Mapping as ORM;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * @ORM\Entity
diff --git a/src/Entity/FieldParentTrait.php b/src/Entity/FieldParentTrait.php
@@ -4,7 +4,7 @@
 
 namespace Bolt\Entity;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * Implements the methods of the FieldParentInterface.
diff --git a/src/Entity/Taxonomy.php b/src/Entity/Taxonomy.php
@@ -10,7 +10,7 @@
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
-use Tightenco\Collect\Support\Collection as LaravelCollection;
+use Illuminate\Support\Collection as LaravelCollection;
 
 /**
  * @ORM\Entity(repositoryClass="Bolt\Repository\TaxonomyRepository")
diff --git a/src/Enum/Statuses.php b/src/Enum/Statuses.php
@@ -4,7 +4,7 @@
 
 namespace Bolt\Enum;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class Statuses
 {
diff --git a/src/Enum/UserStatus.php b/src/Enum/UserStatus.php
@@ -4,7 +4,7 @@
 
 namespace Bolt\Enum;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class UserStatus
 {
diff --git a/src/Event/UserEvent.php b/src/Event/UserEvent.php
@@ -5,7 +5,7 @@
 namespace Bolt\Event;
 
 use Bolt\Entity\User;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class UserEvent
 {
diff --git a/src/Extension/ConfigTrait.php b/src/Extension/ConfigTrait.php
@@ -7,7 +7,7 @@
 use Cocur\Slugify\Slugify;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Yaml\Parser;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 trait ConfigTrait
 {
diff --git a/src/Extension/ServicesTrait.php b/src/Extension/ServicesTrait.php
@@ -15,7 +15,7 @@
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 use Twig\Environment;
 
 trait ServicesTrait
diff --git a/src/Factory/MediaFactory.php b/src/Factory/MediaFactory.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Finder\SplFileInfo;
 use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class MediaFactory
 {
diff --git a/src/Factory/RelationFactory.php b/src/Factory/RelationFactory.php
@@ -8,7 +8,7 @@
 use Bolt\Entity\Relation;
 use Bolt\Repository\RelationRepository;
 use Doctrine\ORM\EntityManagerInterface;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class RelationFactory
 {
diff --git a/src/Kernel.php b/src/Kernel.php
@@ -17,7 +17,7 @@
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 use Symfony\Component\Yaml\Yaml;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class Kernel extends BaseKernel
 {
diff --git a/src/Menu/BackendMenuBuilder.php b/src/Menu/BackendMenuBuilder.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * Class BackendMenuBuilder
diff --git a/src/Repository/ContentRepository.php b/src/Repository/ContentRepository.php
@@ -15,7 +15,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Pagerfanta\Adapter\DoctrineORMAdapter;
 use Pagerfanta\Pagerfanta;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * @method Content|null find($id, $lockMode = null, $lockVersion = null)
diff --git a/src/Repository/FieldRepository.php b/src/Repository/FieldRepository.php
@@ -12,7 +12,7 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ManagerRegistry;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * @method Field|null find($id, $lockMode = null, $lockVersion = null)
diff --git a/src/Security/ContentVoter.php b/src/Security/ContentVoter.php
@@ -11,7 +11,7 @@
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class ContentVoter extends Voter
 {
diff --git a/src/Security/GlobalVoter.php b/src/Security/GlobalVoter.php
@@ -11,7 +11,7 @@
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class GlobalVoter extends Voter
 {
diff --git a/src/Storage/Directive/DirectiveHandler.php b/src/Storage/Directive/DirectiveHandler.php
@@ -5,7 +5,7 @@
 namespace Bolt\Storage\Directive;
 
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * Handles directives on behalf of
diff --git a/src/TemplateChooser.php b/src/TemplateChooser.php
@@ -8,7 +8,7 @@
 use Bolt\Configuration\Content\ContentType;
 use Bolt\Entity\Content;
 use Bolt\Twig\ContentExtension;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class TemplateChooser
 {
diff --git a/src/Twig/CommonExtension.php b/src/Twig/CommonExtension.php
diff --git a/src/Twig/ContentExtension.php b/src/Twig/ContentExtension.php
diff --git a/src/Twig/ExtensionExtension.php b/src/Twig/ExtensionExtension.php
diff --git a/src/Twig/FieldExtension.php b/src/Twig/FieldExtension.php
diff --git a/src/Twig/LocaleExtension.php b/src/Twig/LocaleExtension.php
diff --git a/src/Twig/RelatedExtension.php b/src/Twig/RelatedExtension.php
diff --git a/src/Utils/FilesIndex.php b/src/Utils/FilesIndex.php
diff --git a/src/Utils/ListFormatHelper.php b/src/Utils/ListFormatHelper.php
diff --git a/src/Utils/LocaleHelper.php b/src/Utils/LocaleHelper.php
diff --git a/src/Widget/Injector/QueueProcessor.php b/src/Widget/Injector/QueueProcessor.php
diff --git a/src/Widgets.php b/src/Widgets.php
diff --git a/symfony.lock b/symfony.lock

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`use Bolt\Enum\Statuses;`
`14`	`14`	`use Doctrine\ORM\Query\Expr\Join;`
`15`	`15`	`use Doctrine\ORM\QueryBuilder;`
`16`		`-use Tightenco\Collect\Support\Collection;`
	`16`	`+use Illuminate\Support\Collection;`
`17`	`17`
`18`	`18`	`final class ContentExtension implements QueryCollectionExtensionInterface, QueryItemExtensionInterface`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace Bolt\Cache;`
`4`	`4`
`5`	`5`	`use Bolt\Utils\FilesIndex;`
`6`		`-use Tightenco\Collect\Support\Collection;`
	`6`	`+use Illuminate\Support\Collection;`
`7`	`7`
`8`	`8`	`class FilesIndexCacher extends FilesIndex implements CachingInterface`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Bolt\Collection;`
`6`	`6`
`7`		`-use Tightenco\Collect\Support\Collection;`
	`7`	`+use Illuminate\Support\Collection;`
`8`	`8`
`9`	`9`	`class DeepCollection extends Collection`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Bolt\Configuration\Content;`
`6`	`6`
`7`	`7`	`use Bolt\Collection\DeepCollection;`
`8`		`-use Tightenco\Collect\Support\Collection;`
	`8`	`+use Illuminate\Support\Collection;`
`9`	`9`
`10`	`10`	`class ContentType extends DeepCollection`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException;`
`9`	`9`	`use Symfony\Component\Config\FileLocator;`
`10`	`10`	`use Symfony\Component\Yaml\Yaml;`
`11`		`-use Tightenco\Collect\Support\Collection;`
	`11`	`+use Illuminate\Support\Collection;`
`12`	`12`
`13`	`13`	`abstract class BaseParser`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Bolt\Configuration\Content\FieldType;`
`11`	`11`	`use Bolt\Enum\Statuses;`
`12`	`12`	`use Bolt\Exception\ConfigurationException;`
`13`		`-use Tightenco\Collect\Support\Collection;`
	`13`	`+use Illuminate\Support\Collection;`
`14`	`14`
`15`	`15`	`class ContentTypesParser extends BaseParser`
`16`	`16`	`{`