Update Symfony to 5.2

api/composer.json

@@ -10,25 +10,24 @@
         "ext-json": "*",
         "baldinof/roadrunner-bundle": "^1.3",
         "cerbero/json-objects": "^1.1",
-        "doctrine/doctrine-cache-bundle": "^1.4",
         "jms/serializer-bundle": "^3.5",
         "kadet/functional": "dev-master",
         "nelmio/api-doc-bundle": "^3.5",
-        "nesbot/carbon": "^1.33",
+        "nesbot/carbon": "^2.46.0",
         "ocramius/proxy-manager": "^2.0",
         "sensio/framework-extra-bundle": "^5.2",
         "spiral/roadrunner": "^1.8",
-        "symfony/asset": "^4.4",
+        "symfony/asset": "^5.2",
-        "symfony/console": "^4.4",
+        "symfony/console": "^5.2",
-        "symfony/dotenv": "^4.4",
+        "symfony/dotenv": "^5.2",
         "symfony/flex": "^1.1",
-        "symfony/framework-bundle": "^4.4",
+        "symfony/framework-bundle": "^5.2",
         "symfony/monolog-bundle": "^3.3",
         "symfony/orm-pack": "^1.0",
         "symfony/profiler-pack": "^1.0",
-        "symfony/twig-bundle": "^4.4",
+        "symfony/twig-bundle": "^5.2",
-        "symfony/yaml": "^4.4",
+        "symfony/yaml": "^5.2",
-        "tightenco/collect": "^5.6"
+        "illuminate/collections": "^8.35"
     },
     "config": {
         "preferred-install": {
@@ -79,7 +78,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": true,
-            "require": "4.4.*"
+            "require": "5.2.*"
         }
     },
     "repositories": [

api/config/bundles.php

@@ -4,7 +4,6 @@ return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
-    Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
     Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],

api/src/Controller/Api/v1/StopsController.php

@@ -12,11 +12,11 @@ use App\Modifier\RelatedFilter;
 use App\Modifier\With;
 use App\Provider\StopRepository;
 use App\Provider\TrackRepository;
+use Illuminate\Support\Collection;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use Swagger\Annotations as SWG;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
-use Tightenco\Collect\Support\Collection;
 
 /**
  * Class StopsController

api/src/Handler/Database/WithDestinationsDatabaseHandler.php

@@ -11,9 +11,9 @@ use App\Service\CacheableConverter;
 use App\Service\Converter;
 use App\Service\IdUtils;
 use Doctrine\ORM\EntityManagerInterface;
+use Illuminate\Support\Collection;
 use Kadet\Functional as f;
 use Kadet\Functional\Transforms as t;
-use Tightenco\Collect\Support\Collection;
 
 class WithDestinationsDatabaseHandler implements PostProcessingHandler
 {

api/src/Model/Destination.php

@@ -2,10 +2,10 @@
 
 namespace App\Model;
 
+use Illuminate\Support\Collection;
 use JMS\Serializer\Annotation as Serializer;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use Swagger\Annotations as SWG;
-use Tightenco\Collect\Support\Collection;
 
 class Destination implements Fillable
 {

api/src/Model/Line.php

@@ -2,10 +2,10 @@
 
 namespace App\Model;
 
+use Illuminate\Support\Collection;
 use JMS\Serializer\Annotation as Serializer;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use Swagger\Annotations as SWG;
-use Tightenco\Collect\Support\Collection;
 
 class Line implements Fillable, Referable
 {

api/src/Model/Stop.php

@@ -2,10 +2,10 @@
 
 namespace App\Model;
 
+use Illuminate\Support\Collection;
 use JMS\Serializer\Annotation as Serializer;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use Swagger\Annotations as SWG;
-use Tightenco\Collect\Support\Collection;
 
 /**
  * Class Stop

api/src/Model/StopGroup.php

@@ -2,11 +2,10 @@
 
 namespace App\Model;
 
+use Illuminate\Support\Collection;
 use JMS\Serializer\Annotation as Serializer;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use Swagger\Annotations as SWG;
-use Tightenco\Collect\Support\Collection;
-use App\Model\Stop;
 
 /**
  * Class StopGroup

api/src/Model/Track.php

@@ -2,10 +2,10 @@
 
 namespace App\Model;
 
+use Illuminate\Support\Collection;
 use JMS\Serializer\Annotation as Serializer;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use Swagger\Annotations as SWG;
-use Tightenco\Collect\Support\Collection;
 
 class Track implements Referable, Fillable
 {

api/src/Model/Trip.php

@@ -3,8 +3,8 @@
 namespace App\Model;
 
 use App\Serialization\SerializeAs;
+use Illuminate\Support\Collection;
 use JMS\Serializer\Annotation as Serializer;
-use Tightenco\Collect\Support\Collection;
 
 class Trip implements Referable, Fillable
 {

api/src/Provider/Database/GenericLineRepository.php

@@ -3,17 +3,10 @@
 namespace App\Provider\Database;
 
 use App\Entity\LineEntity;
-use App\Event\HandleDatabaseModifierEvent;
-use App\Handler\Database\LimitDatabaseHandler;
-use App\Handler\Database\IdFilterDatabaseHandler;
-use App\Handler\ModifierHandler;
 use App\Model\Line;
-use App\Modifier\Limit;
-use App\Modifier\IdFilter;
-use App\Provider\LineRepository;
 use App\Modifier\Modifier;
-use Tightenco\Collect\Support\Collection;
+use App\Provider\LineRepository;
-use Kadet\Functional as f;
+use Illuminate\Support\Collection;
 
 class GenericLineRepository extends DatabaseRepository implements LineRepository
 {

api/src/Provider/Database/GenericOperatorRepository.php

@@ -6,7 +6,7 @@ use App\Entity\OperatorEntity;
 use App\Model\Operator;
 use App\Modifier\Modifier;
 use App\Provider\OperatorRepository;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class GenericOperatorRepository extends DatabaseRepository implements OperatorRepository
 {

api/src/Provider/Database/GenericScheduleRepository.php

@@ -3,20 +3,15 @@
 namespace App\Provider\Database;
 
 use App\Entity\StopEntity;
-use App\Entity\TrackStopEntity;
 use App\Entity\TrackEntity;
-use App\Entity\TripEntity;
 use App\Entity\TripStopEntity;
 use App\Model\Departure;
-use App\Model\Line;
 use App\Model\ScheduledStop;
 use App\Model\Stop;
-use App\Model\Vehicle;
 use App\Modifier\Modifier;
 use App\Provider\ScheduleRepository;
 use Carbon\Carbon;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
-use function Kadet\Functional\ref;
 
 class GenericScheduleRepository extends DatabaseRepository implements ScheduleRepository
 {

api/src/Provider/Database/GenericStopRepository.php

@@ -9,7 +9,7 @@ use App\Model\Stop;
 use App\Modifier\Modifier;
 use App\Modifier\With;
 use App\Provider\StopRepository;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class GenericStopRepository extends DatabaseRepository implements StopRepository
 {

api/src/Provider/Database/GenericTrackRepository.php

@@ -2,13 +2,13 @@
 
 namespace App\Provider\Database;
 
-use App\Entity\TrackStopEntity;
 use App\Entity\TrackEntity;
+use App\Entity\TrackStopEntity;
+use App\Model\Track;
 use App\Model\TrackStop;
 use App\Modifier\Modifier;
-use App\Model\Track;
 use App\Provider\TrackRepository;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class GenericTrackRepository extends DatabaseRepository implements TrackRepository
 {

api/src/Provider/Database/GenericTripRepository.php

@@ -6,7 +6,7 @@ use App\Entity\TripEntity;
 use App\Model\Trip;
 use App\Modifier\Modifier;
 use App\Provider\TripRepository;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class GenericTripRepository extends DatabaseRepository implements TripRepository
 {

api/src/Provider/DepartureRepository.php

@@ -4,9 +4,7 @@
 namespace App\Provider;
 
 
-use App\Model\Stop;
 use App\Modifier\Modifier;
-use Tightenco\Collect\Support\Collection;
 
 interface DepartureRepository extends Repository
 {

api/src/Provider/Dummy/DummyDepartureRepository.php

@@ -4,13 +4,11 @@ namespace App\Provider\Dummy;
 
 use App\Model\Departure;
 use App\Model\Line;
-use App\Model\Stop;
 use App\Model\Vehicle;
 use App\Modifier\Modifier;
 use App\Provider\DepartureRepository;
 use App\Service\Proxy\ReferenceFactory;
 use Carbon\Carbon;
-use Tightenco\Collect\Support\Collection;
 
 class DummyDepartureRepository implements DepartureRepository
 {

api/src/Provider/Dummy/DummyMessageRepository.php

@@ -6,7 +6,7 @@ use App\Model\Message;
 use App\Model\Stop;
 use App\Provider\MessageRepository;
 use Carbon\Carbon;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 class DummyMessageRepository implements MessageRepository
 {
@@ -30,4 +30,4 @@ class DummyMessageRepository implements MessageRepository
     {
         return $this->getAll();
     }
-}
+}

api/src/Provider/Dummy/DummyStopRepository.php

@@ -6,7 +6,7 @@ use App\Model\Stop;
 use App\Modifier\Modifier;
 use App\Provider\StopRepository;
 use App\Service\Proxy\ReferenceFactory;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 use Kadet\Functional as f;
 
 class DummyStopRepository implements StopRepository

api/src/Provider/FluentRepository.php

@@ -3,7 +3,7 @@
 namespace App\Provider;
 
 use App\Modifier\Modifier;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 interface FluentRepository extends Repository
 {

api/src/Provider/MessageRepository.php

@@ -5,10 +5,10 @@ namespace App\Provider;
 
 
 use App\Model\Stop;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 interface MessageRepository
 {
     public function getAll(): Collection;
     public function getForStop(Stop $stop): Collection;
-}
+}

api/src/Provider/OperatorRepository.php

@@ -4,9 +4,6 @@
 namespace App\Provider;
 
 
-use App\Model\Operator;
-use Tightenco\Collect\Support\Collection;
-
 interface OperatorRepository extends FluentRepository
 {
 }

api/src/Provider/ScheduleRepository.php

@@ -4,7 +4,7 @@ namespace App\Provider;
 
 use App\Model\Stop;
 use Carbon\Carbon;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 interface ScheduleRepository extends FluentRepository
 {

api/src/Provider/StopRepository.php

@@ -4,9 +4,6 @@
 namespace App\Provider;
 
 
-use App\Model\Stop;
-use Tightenco\Collect\Support\Collection;
-
 interface StopRepository extends FluentRepository
 {
 }

api/src/Provider/TrackRepository.php

@@ -2,9 +2,8 @@
 
 namespace App\Provider;
 
-use App\Model\Track;
 use App\Modifier\Modifier;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 interface TrackRepository extends FluentRepository
 {

api/src/Provider/ZtmGdansk/ZtmGdanskDataUpdateSubscriber.php

@@ -6,8 +6,8 @@ use App\Entity\LineEntity;
 use App\Entity\OperatorEntity;
 use App\Entity\ProviderEntity;
 use App\Entity\StopEntity;
-use App\Entity\TrackStopEntity;
 use App\Entity\TrackEntity;
+use App\Entity\TrackStopEntity;
 use App\Entity\TripEntity;
 use App\Entity\TripStopEntity;
 use App\Event\DataUpdateEvent;
@@ -17,10 +17,10 @@ use App\Service\IdUtils;
 use Carbon\Carbon;
 use Cerbero\JsonObjects\JsonObjects;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Console\Helper\ProgressBar;
+use Illuminate\Support\Collection;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Tightenco\Collect\Support\Collection;
 use function Kadet\Functional\ref;
 use function Kadet\Functional\Transforms\property;
 

api/src/Provider/ZtmGdansk/ZtmGdanskDepartureRepository.php

@@ -13,7 +13,6 @@ use App\Modifier\Limit;
 use App\Modifier\Modifier;
 use App\Modifier\RelatedFilter;
 use App\Modifier\With;
-use App\Provider\Database\GenericScheduleRepository;
 use App\Provider\DepartureRepository;
 use App\Provider\LineRepository;
 use App\Provider\ScheduleRepository;
@@ -21,8 +20,7 @@ use App\Service\IterableUtils;
 use App\Service\ModifierUtils;
 use App\Service\Proxy\ReferenceFactory;
 use Carbon\Carbon;
-use JMS\Serializer\Tests\Fixtures\Discriminator\Car;
+use Illuminate\Support\Collection;
-use Tightenco\Collect\Support\Collection;
 use Kadet\Functional\Transforms as t;
 use function App\Functions\setup;
 use function Kadet\Functional\ref;

api/src/Provider/ZtmGdansk/ZtmGdanskMessageRepository.php

@@ -7,11 +7,9 @@ namespace App\Provider\ZtmGdansk;
 use App\Model\Message;
 use App\Model\Stop;
 use App\Provider\MessageRepository;
-use App\Provider\ZtmGdansk\ZtmGdanskProvider;
-use App\Service\IdUtils;
 use Carbon\Carbon;
+use Illuminate\Support\Collection;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
-use Tightenco\Collect\Support\Collection;
 
 class ZtmGdanskMessageRepository implements MessageRepository
 {
@@ -69,4 +67,4 @@ class ZtmGdanskMessageRepository implements MessageRepository
 
         return $item->get();
     }
-}
+}

api/src/Serialization/CarbonHandler.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Serialization;
 
 use Carbon\Carbon;
+use Illuminate\Support\Collection;
 use JMS\Serializer\DeserializationContext;
 use JMS\Serializer\GraphNavigatorInterface;
 use JMS\Serializer\Handler\DateHandler;
@@ -12,7 +13,6 @@ use JMS\Serializer\Handler\SubscribingHandlerInterface;
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\Visitor\DeserializationVisitorInterface;
 use JMS\Serializer\Visitor\SerializationVisitorInterface;
-use Tightenco\Collect\Support\Collection;
 
 /**
  * Class LaravelCollectionHandler

api/src/Serialization/LaravelCollectionHandler.php

@@ -4,13 +4,13 @@ declare(strict_types=1);
 
 namespace App\Serialization;
 
+use Illuminate\Support\Collection;
 use JMS\Serializer\DeserializationContext;
 use JMS\Serializer\GraphNavigatorInterface;
 use JMS\Serializer\Handler\SubscribingHandlerInterface;
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\Visitor\DeserializationVisitorInterface;
 use JMS\Serializer\Visitor\SerializationVisitorInterface;
-use Tightenco\Collect\Support\Collection;
 
 /**
  * Class LaravelCollectionHandler
@@ -84,4 +84,4 @@ final class LaravelCollectionHandler implements SubscribingHandlerInterface
 
         return new Collection($visitor->visitArray($data, $type));
     }
-}
+}

api/src/Service/AggregateConverter.php

@@ -2,7 +2,7 @@
 
 namespace App\Service;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 use function Kadet\Functional\Predicates\instance;
 
 class AggregateConverter implements Converter, CacheableConverter

api/src/Service/EntityReferenceFactory.php

@@ -12,7 +12,7 @@ use App\Model\Referable;
 use App\Model\Stop;
 use App\Model\Track;
 use Doctrine\ORM\EntityManagerInterface;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 use function Kadet\Functional\partial;
 use function Kadet\Functional\ref;
 use const Kadet\Functional\_;

api/src/Service/IterableUtils.php

@@ -3,7 +3,7 @@
 namespace App\Service;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 
 final class IterableUtils
 {

api/src/Service/ProviderResolver.php

@@ -6,9 +6,9 @@ namespace App\Service;
 use App\Exception\NonExistentServiceException;
 use App\Provider\Dummy\DummyProvider;
 use App\Provider\Provider;
+use Illuminate\Support\Collection;
 use Kadet\Functional\Predicates as p;
 use Kadet\Functional\Transforms as t;
-use Tightenco\Collect\Support\Collection;
 
 class ProviderResolver
 {

api/symfony.lock

@@ -59,9 +59,6 @@
             "src/Repository/.gitignore"
         ]
     },
-    "doctrine/doctrine-cache-bundle": {
-        "version": "1.3.3"
-    },
     "doctrine/doctrine-migrations-bundle": {
         "version": "2.2",
         "recipe": {
@@ -96,9 +93,6 @@
     "doctrine/persistence": {
         "version": "v1.0.0"
     },
-    "doctrine/reflection": {
-        "version": "v1.0.0"
-    },
     "doctrine/sql-formatter": {
         "version": "1.1.1"
     },
@@ -144,6 +138,15 @@
     "hoa/zformat": {
         "version": "1.17.01.10"
     },
+    "illuminate/collections": {
+        "version": "v8.35.1"
+    },
+    "illuminate/contracts": {
+        "version": "v8.35.1"
+    },
+    "illuminate/macroable": {
+        "version": "v8.35.1"
+    },
     "jdorn/sql-formatter": {
         "version": "v1.2.17"
     },
@@ -173,9 +176,6 @@
     "kadet/functional": {
         "version": "dev-master"
     },
-    "kylekatarnls/update-helper": {
-        "version": "1.2.0"
-    },
     "laminas/laminas-diactoros": {
         "version": "2.5.0"
     },
@@ -227,6 +227,9 @@
     "psr/container": {
         "version": "1.0.0"
     },
+    "psr/event-dispatcher": {
+        "version": "1.0.0"
+    },
     "psr/http-factory": {
         "version": "1.0.1"
     },
@@ -284,12 +287,12 @@
             "ref": "e3868d2f4a5104f19f844fe551099a00c6562527"
         }
     },
-    "symfony/debug": {
-        "version": "v4.1.3"
-    },
     "symfony/dependency-injection": {
         "version": "v4.1.3"
     },
+    "symfony/deprecation-contracts": {
+        "version": "v2.2.0"
+    },
     "symfony/doctrine-bridge": {
         "version": "v4.1.4"
     },
@@ -353,12 +356,6 @@
     "symfony/http-kernel": {
         "version": "v4.1.3"
     },
-    "symfony/inflector": {
-        "version": "v4.1.3"
-    },
-    "symfony/mime": {
-        "version": "v5.0.2"
-    },
     "symfony/monolog-bridge": {
         "version": "v4.1.4"
     },
@@ -377,8 +374,8 @@
     "symfony/orm-pack": {
         "version": "v1.0.5"
     },
-    "symfony/polyfill-intl-idn": {
+    "symfony/polyfill-intl-grapheme": {
-        "version": "v1.13.1"
+        "version": "v1.22.1"
     },
     "symfony/polyfill-intl-normalizer": {
         "version": "v1.20.0"
@@ -386,9 +383,6 @@
     "symfony/polyfill-mbstring": {
         "version": "v1.9.0"
     },
-    "symfony/polyfill-php72": {
-        "version": "v1.20.0"
-    },
     "symfony/polyfill-php73": {
         "version": "v1.13.1"
     },
@@ -428,6 +422,9 @@
     "symfony/stopwatch": {
         "version": "v4.1.12"
     },
+    "symfony/string": {
+        "version": "v5.2.6"
+    },
     "symfony/translation": {
         "version": "3.3",
         "recipe": {
@@ -480,9 +477,6 @@
     "symfony/yaml": {
         "version": "v4.1.3"
     },
-    "tightenco/collect": {
-        "version": "v5.6.33"
-    },
     "twig/twig": {
         "version": "v2.5.0"
     },