⬆️ 💥 Replace dependency tightenco/collect by illuminate/collect…

UPGRADING.md

@@ -0,0 +1,5 @@
+# From Bolt 5.2
+
+## Use `illuminate/collections` instead of `tightenco/collect`
+
+The namespace has changed from `Tightenco\Collect\Support\*` to `Illuminate\Support\*`.

composer.json

@@ -27,6 +27,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",
@@ -77,7 +78,6 @@
         "symfony/webpack-encore-bundle": "^2.2",
         "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",

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
 {

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
 {

src/Collection/DeepCollection.php

@@ -4,7 +4,7 @@
 
 namespace Bolt\Collection;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class DeepCollection extends Collection
 {

src/Configuration/Config.php

@@ -14,12 +14,12 @@
 use Bolt\Configuration\Parser\TaxonomyParser;
 use Bolt\Configuration\Parser\ThemeParser;
 use Bolt\Controller\Backend\ClearCacheController;
+use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
-use Tightenco\Collect\Support\Collection;
 use Webimpress\SafeWriter\FileWriter;
 
 class Config

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
 {

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
 {

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
 {

src/Configuration/Parser/BaseParser.php

@@ -5,10 +5,10 @@
 namespace Bolt\Configuration\Parser;
 
 use Bolt\Configuration\PathResolver;
+use Illuminate\Support\Collection;
 use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Yaml\Yaml;
-use Tightenco\Collect\Support\Collection;
 
 abstract class BaseParser
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

src/Configuration/PathResolver.php

@@ -5,8 +5,8 @@
 namespace Bolt\Configuration;
 
 use Bolt\Exception\ConfigurationException;
+use Illuminate\Support\Collection;
 use Symfony\Component\Filesystem\Path;
-use Tightenco\Collect\Support\Collection;
 
 /**
  * A class to resolve and manage paths. Paths defined here are allowed to have variables within them.

src/Controller/Backend/Async/SelectOptionsController.php

@@ -6,12 +6,12 @@
 
 use Bolt\Configuration\Config;
 use Bolt\Twig\FieldExtension;
+use Illuminate\Support\Collection;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
-use Tightenco\Collect\Support\Collection;
 
 /**
  * @Security("is_granted('upload')")

src/Controller/Backend/ContentEditController.php

@@ -31,6 +31,7 @@
 use Carbon\Carbon;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\ORMInvalidArgumentException;
+use Illuminate\Support\Collection;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Entity;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -40,7 +41,6 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Tightenco\Collect\Support\Collection;
 
 /**
  * CRUD + status, duplicate, for content - note that listing is handled by ListingController.php

src/Controller/TwigAwareController.php

@@ -14,6 +14,7 @@
 use Bolt\TemplateChooser;
 use Bolt\Twig\CommonExtension;
 use Bolt\Utils\Sanitiser;
+use Illuminate\Support\Collection;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Asset\Packages;
 use Symfony\Component\Asset\PathPackage;
@@ -22,7 +23,6 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Tightenco\Collect\Support\Collection;
 use Twig\Environment;
 use Twig\Loader\ChainLoader;
 use Twig\Loader\FilesystemLoader;

src/DataFixtures/BaseFixture.php

@@ -5,9 +5,9 @@
 namespace Bolt\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
+use Illuminate\Support\Collection;
 use Symfony\Component\Filesystem\Path;
 use Symfony\Component\Finder\Finder;
-use Tightenco\Collect\Support\Collection;
 
 abstract class BaseFixture extends Fixture
 {

src/DataFixtures/ContentFixtures.php

@@ -20,8 +20,8 @@
 use Doctrine\Persistence\ObjectManager;
 use Faker\Factory;
 use Faker\Generator;
+use Illuminate\Support\Collection;
 use Symfony\Contracts\Cache\TagAwareCacheInterface;
-use Tightenco\Collect\Support\Collection;
 
 class ContentFixtures extends BaseFixture implements DependentFixtureInterface, FixtureGroupInterface
 {

src/Entity/Content.php

@@ -21,9 +21,9 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Illuminate\Support\Collection as LaravelCollection;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\MaxDepth;
-use Tightenco\Collect\Support\Collection as LaravelCollection;
 
 /**
  * @ApiResource(

src/Entity/ContentLocalizeTrait.php

@@ -4,7 +4,7 @@
 
 namespace Bolt\Entity;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * @see \Bolt\Entity\Content

src/Entity/Field.php

@@ -12,11 +12,11 @@
 use Bolt\Event\Listener\FieldFillListener;
 use Bolt\Utils\Sanitiser;
 use Doctrine\ORM\Mapping as ORM;
+use Illuminate\Support\Collection;
 use Knp\DoctrineBehaviors\Contract\Entity\TranslatableInterface;
 use Knp\DoctrineBehaviors\Model\Translatable\TranslatableTrait;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\SerializedName;
-use Tightenco\Collect\Support\Collection;
 use Twig\Environment;
 use Twig\Error\LoaderError;
 use Twig\Error\SyntaxError;

src/Entity/Field/SelectField.php

@@ -8,8 +8,8 @@
 use Bolt\Entity\FieldInterface;
 use Bolt\Entity\IterableFieldTrait;
 use Doctrine\ORM\Mapping as ORM;
+use Illuminate\Support\Collection;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Tightenco\Collect\Support\Collection;
 
 /**
  * @ORM\Entity

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

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.

src/Entity/Taxonomy.php

@@ -9,8 +9,8 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Illuminate\Support\Collection as LaravelCollection;
 use Symfony\Component\Serializer\Annotation\Groups;
-use Tightenco\Collect\Support\Collection as LaravelCollection;
 
 /**
  * @ORM\Entity(repositoryClass="Bolt\Repository\TaxonomyRepository")

src/Enum/Statuses.php

@@ -4,7 +4,7 @@
 
 namespace Bolt\Enum;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class Statuses
 {

src/Enum/UserStatus.php

@@ -4,7 +4,7 @@
 
 namespace Bolt\Enum;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class UserStatus
 {

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
 {

src/Extension/ConfigTrait.php

@@ -5,9 +5,9 @@
 namespace Bolt\Extension;
 
 use Cocur\Slugify\Slugify;
+use Illuminate\Support\Collection;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Yaml\Parser;
-use Tightenco\Collect\Support\Collection;
 
 trait ConfigTrait
 {

src/Extension/ServicesTrait.php

@@ -8,14 +8,14 @@
 use Bolt\Storage\Query;
 use Bolt\Widgets;
 use Doctrine\ORM\EntityManagerInterface;
+use Illuminate\Support\Collection;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
-use Tightenco\Collect\Support\Collection;
 use Twig\Environment;
 
 trait ServicesTrait

src/Factory/MediaFactory.php

@@ -10,13 +10,13 @@
 use Bolt\Entity\Media;
 use Bolt\Repository\MediaRepository;
 use Carbon\Carbon;
+use Illuminate\Support\Collection;
 use PHPExif\Exif;
 use PHPExif\Reader\Reader;
 use Symfony\Component\Filesystem\Path;
 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;
 
 class MediaFactory
 {

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
 {

src/Kernel.php

@@ -8,6 +8,7 @@
 use Bolt\Configuration\Parser\TaxonomyParser;
 use Bolt\Extension\ExtensionCompilerPass;
 use Bolt\Extension\ExtensionInterface;
+use Illuminate\Support\Collection;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\Config\Exception\LoaderLoadException;
 use Symfony\Component\Config\FileLocator;
@@ -17,7 +18,6 @@
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 use Symfony\Component\Yaml\Yaml;
-use Tightenco\Collect\Support\Collection;
 
 class Kernel extends BaseKernel
 {