- migrationi to Symfony 7

.env

@@ -1,5 +1,5 @@
 # In all environments, the following files are loaded if they exist,
-# the later taking precedence over the former:
+# the latter taking precedence over the former:
 #
 #  * .env                contains default values for the environment variables needed by the app
 #  * .env.local          uncommitted file with local overrides
@@ -9,13 +9,13 @@
 # Real environment variables win over .env files.
 #
 # DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+# https://symfony.com/doc/current/configuration/secrets.html
 #
 # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
-# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
+# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 ###> symfony/framework-bundle ###
 APP_ENV=dev
 APP_SECRET=7189792ca5da6b84aff72ec1c63d95ae
-#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
-#TRUSTED_HOSTS='^localhost|example\.com$'
 ###< symfony/framework-bundle ###
+

bin/console

@@ -3,40 +3,19 @@
 
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
 
-if (false === in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
+if (!is_dir(dirname(__DIR__).'/vendor')) {
-    echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.\PHP_SAPI.' SAPI'.\PHP_EOL;
+    throw new LogicException('Dependencies are missing. Try running "composer install".');
 }
 
-set_time_limit(0);
+if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
-
+    throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
-require dirname(__DIR__).'/vendor/autoload.php';
-
-if (!class_exists(Application::class)) {
-    throw new RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
 }
 
-$input = new ArgvInput();
+require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
-if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
-    putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
-}
 
-if ($input->hasParameterOption('--no-debug', true)) {
+return function (array $context) {
-    putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
+    $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
-}
 
-require dirname(__DIR__).'/config/bootstrap.php';
+    return new Application($kernel);
-
+};
-if ($_SERVER['APP_DEBUG']) {
-    umask(0000);
-
-    if (class_exists(Debug::class)) {
-        Debug::enable();
-    }
-}
-
-$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
-$application = new Application($kernel);
-$application->run($input);

composer.json

@@ -1,41 +1,55 @@
 {
     "type": "project",
     "license": "proprietary",
+    "minimum-stability": "stable",
+    "prefer-stable": true,
     "require": {
-        "php": "^7.1.3",
+        "php": ">=8.2",
         "ext-ctype": "*",
-        "ext-iconv": "*",
-        "craue/formflow-bundle": "^3.2",
-        "doctrine/collections": "^1.6",
-        "friendsofsymfony/jsrouting-bundle": "^2.4",
-        "sensio/framework-extra-bundle": "^5.4",
-        "symfony/asset": "4.3.*",
-        "symfony/console": "4.3.*",
-        "symfony/debug": "4.3.*",
-        "symfony/dotenv": "4.3.*",
-        "symfony/flex": "^1.3.1",
-        "symfony/framework-bundle": "4.3.*",
-        "symfony/polyfill-intl-messageformatter": "^1.15",
-        "symfony/security-bundle": "4.3.*",
-        "symfony/translation": "4.3.*",
-        "symfony/twig-bundle": "4.3.*",
-        "symfony/yaml": "4.3.*",
-        "twig/extensions": "^1.5",
         "ext-curl": "*",
-        "ext-json": "*"
+        "ext-iconv": "*",
-    },
+        "craue/formflow-bundle": "*",
-    "require-dev": {
+        "curl/curl": "^2.5",
-        "symfony/phpunit-bridge": "^7.0",
+        "friendsofsymfony/jsrouting-bundle": "*",
-        "symfony/web-server-bundle": "4.3.*"
+        "phpdocumentor/reflection-docblock": "^5.4",
+        "phpstan/phpdoc-parser": "^1.29",
+        "symfony/asset": "7.0.*",
+        "symfony/asset-mapper": "7.0.*",
+        "symfony/console": "7.0.*",
+        "symfony/dotenv": "7.0.*",
+        "symfony/expression-language": "7.0.*",
+        "symfony/flex": "^2",
+        "symfony/form": "7.0.*",
+        "symfony/framework-bundle": "7.0.*",
+        "symfony/http-client": "7.0.*",
+        "symfony/intl": "7.0.*",
+        "symfony/mime": "7.0.*",
+        "symfony/monolog-bundle": "^3.0",
+        "symfony/notifier": "7.0.*",
+        "symfony/process": "7.0.*",
+        "symfony/property-access": "7.0.*",
+        "symfony/property-info": "7.0.*",
+        "symfony/runtime": "7.0.*",
+        "symfony/security-bundle": "7.0.*",
+        "symfony/serializer": "7.0.*",
+        "symfony/stimulus-bundle": "^2.17",
+        "symfony/string": "7.0.*",
+        "symfony/translation": "7.0.*",
+        "symfony/twig-bundle": "7.0.*",
+        "symfony/ux-turbo": "^2.17",
+        "symfony/validator": "7.0.*",
+        "symfony/web-link": "7.0.*",
+        "symfony/yaml": "7.0.*",
+        "twig/extra-bundle": "^2.12|^3.0",
+        "twig/twig": "^2.12|^3.0"
     },
     "config": {
-        "preferred-install": {
-            "*": "dist"
-        },
-        "sort-packages": true,
         "allow-plugins": {
-            "symfony/flex": true
+            "php-http/discovery": true,
-        }
+            "symfony/flex": true,
+            "symfony/runtime": true
+        },
+        "sort-packages": true
     },
     "autoload": {
         "psr-4": {
@@ -48,17 +62,20 @@
         }
     },
     "replace": {
-        "paragonie/random_compat": "2.*",
         "symfony/polyfill-ctype": "*",
         "symfony/polyfill-iconv": "*",
-        "symfony/polyfill-php71": "*",
+        "symfony/polyfill-php72": "*",
-        "symfony/polyfill-php70": "*",
+        "symfony/polyfill-php73": "*",
-        "symfony/polyfill-php56": "*"
+        "symfony/polyfill-php74": "*",
+        "symfony/polyfill-php80": "*",
+        "symfony/polyfill-php81": "*",
+        "symfony/polyfill-php82": "*"
     },
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
-            "assets:install %PUBLIC_DIR%": "symfony-cmd"
+            "assets:install %PUBLIC_DIR%": "symfony-cmd",
+            "importmap:install": "symfony-cmd"
         },
         "post-install-cmd": [
             "@auto-scripts"
@@ -73,7 +90,17 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "4.3.*"
+            "require": "7.0.*"
-        }
+        }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5",
+        "symfony/browser-kit": "7.0.*",
+        "symfony/css-selector": "7.0.*",
+        "symfony/debug-bundle": "7.0.*",
+        "symfony/maker-bundle": "^1.0",
+        "symfony/phpunit-bridge": "^7.0",
+        "symfony/stopwatch": "7.0.*",
+        "symfony/web-profiler-bundle": "7.0.*"
     }
 }

config/bundles.php

@@ -2,10 +2,15 @@
 
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true],
-    Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
+    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
+    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true],
     Craue\FormFlowBundle\CraueFormFlowBundle::class => ['all' => true],
+    Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
+    Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true],
+    Symfony\UX\Turbo\TurboBundle::class => ['all' => true],
+    Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
+    Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
 ];

config/packages/asset_mapper.yaml

@@ -0,0 +1,5 @@
+framework:
+    asset_mapper:
+        # The paths to make available to the asset mapper.
+        paths:
+            - assets/

config/packages/debug.yaml

@@ -0,0 +1,5 @@
+when@dev:
+    debug:
+        # Forwards VarDumper Data clones to a centralized server allowing to inspect dumps on CLI or in your browser.
+        # See the "server:dump" command to start a new server.
+        dump_destination: "tcp://%env(VAR_DUMPER_SERVER)%"

config/packages/dev/routing.yaml

@@ -1,3 +0,0 @@
-framework:
-    router:
-        strict_requirements: true

config/packages/framework.yaml

@@ -1,16 +1,16 @@
+# see https://symfony.com/doc/current/reference/configuration/framework.html
 framework:
     secret: '%env(APP_SECRET)%'
     #csrf_protection: true
-    #http_method_override: true
 
-    # Enables session support. Note that the session will ONLY be started if you read or write from it.
+    # Note that the session will be started ONLY if you read or write from it.
-    # Remove or comment this section to explicitly disable session support.
+    session: true
-    session:
-        handler_id: null
-        cookie_secure: auto
-        cookie_samesite: lax
 
     #esi: true
     #fragments: true
-    php_errors:
+
-        log: true
+when@test:
+    framework:
+        test: true
+        session:
+            storage_factory_id: session.storage.factory.mock_file

config/packages/routing.yaml

@@ -1,4 +1,10 @@
+framework:
+    router:
+    # Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
+    # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
+    #default_uri: http://localhost
+
+when@prod:
     framework:
         router:
             strict_requirements: null
-        utf8: true

config/packages/security.yaml

@@ -1,13 +1,17 @@
 security:
+    # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
+    password_hashers:
+        Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
     # https://symfony.com/doc/current/security.html#where-do-users-come-from-user-providers
     providers:
-        in_memory: { memory: ~ }
+        users_in_memory: { memory: null }
     firewalls:
         dev:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
         main:
-            anonymous: ~
+            lazy: true
+            provider: users_in_memory
             logout:
                 path:   logout
 
@@ -23,3 +27,16 @@ security:
         # - { path: ^/admin, roles: ROLE_ADMIN }
          - { path: ^/(%languages%)?/schedule, roles: ROLE_USER }
          - { path: ^/(%languages%)?/scheduled, roles: ROLE_USER }
+
+when@test:
+    security:
+        password_hashers:
+            # By default, password hashers are resource intensive and take time. This is
+            # important to generate secure password hashes. In tests however, secure hashes
+            # are not important, waste resources and increase test times. The following
+            # reduces the work factor to the lowest possible values.
+            Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
+                algorithm: auto
+                cost: 4 # Lowest possible value for bcrypt
+                time_cost: 3 # Lowest possible value for argon
+                memory_cost: 10 # Lowest possible value for argon

config/packages/sensio_framework_extra.yaml

@@ -1,3 +0,0 @@
-sensio_framework_extra:
-    router:
-        annotations: false

config/packages/test/framework.yaml

@@ -1,4 +0,0 @@
-framework:
-    test: true
-    session:
-        storage_id: session.storage.mock_file

config/packages/test/routing.yaml

@@ -1,3 +0,0 @@
-framework:
-    router:
-        strict_requirements: true

config/packages/test/validator.yaml

@@ -1,3 +0,0 @@
-framework:
-    validation:
-        not_compromised_password: false

config/packages/twig.yaml

@@ -1,4 +1,6 @@
 twig:
-    default_path: '%kernel.project_dir%/templates'
+    file_name_pattern: '*.twig'
-    debug: '%kernel.debug%'
+
-    strict_variables: '%kernel.debug%'
+when@test:
+    twig:
+        strict_variables: true

config/packages/validator.yaml

@@ -1,8 +1,11 @@
 framework:
     validation:
-        email_validation_mode: html5
-
     # Enables validator auto-mapping support.
     # For instance, basic validation constraints will be inferred from Doctrine's metadata.
     #auto_mapping:
     #    App\Entity\: []
+
+when@test:
+    framework:
+        validation:
+            not_compromised_password: false

config/packages/web_profiler.yaml

@@ -0,0 +1,17 @@
+when@dev:
+    web_profiler:
+        toolbar: true
+        intercept_redirects: false
+
+    framework:
+        profiler:
+            only_exceptions: false
+            collect_serializer_data: true
+
+when@test:
+    web_profiler:
+        toolbar: false
+        intercept_redirects: false
+
+    framework:
+        profiler: { collect: false }

config/routes.yaml

@@ -1,3 +1,5 @@
-#index:
+controllers:
-#    path: /
+  resource:
-#    controller: App\Controller\DefaultController::index
+    path: ../src/Controller/
+    namespace: App\Controller
+  type: attribute

config/routes/annotations.yaml

@@ -1,3 +0,0 @@
-controllers:
-    resource: ../../src/Controller/
-    type: annotation

config/routes/dev/twig.yaml

@@ -1,3 +0,0 @@
-_errors:
-    resource: '@TwigBundle/Resources/config/routing/errors.xml'
-    prefix: /_error

config/routes/framework.yaml

@@ -0,0 +1,4 @@
+when@dev:
+    _errors:
+        resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
+        prefix: /_error

config/routes/security.yaml

@@ -0,0 +1,3 @@
+_security_logout:
+    resource: security.route_loader.logout
+    type: service

config/routes/web_profiler.yaml

@@ -0,0 +1,8 @@
+when@dev:
+    web_profiler_wdt:
+        resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
+        prefix: /_wdt
+
+    web_profiler_profiler:
+        resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
+        prefix: /_profiler

config/services.yaml

@@ -16,7 +16,10 @@ services:
     # this creates a service per class whose id is the fully-qualified class name
     App\:
         resource: '../src/*'
-        exclude: '../src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
+        exclude:
+            - '../src/DependencyInjection/'
+            - '../src/Entity/'
+            - '../src/Kernel.php'
 
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class

public/index.php

@@ -1,27 +1,9 @@
 <?php
 
 use App\Kernel;
-use Symfony\Component\Debug\Debug;
-use Symfony\Component\HttpFoundation\Request;
 
-require dirname(__DIR__).'/config/bootstrap.php';
+require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 
-if ($_SERVER['APP_DEBUG']) {
+return function (array $context) {
-    umask(0000);
+    return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
-
+};
-    Debug::enable();
-}
-
-if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
-    Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
-}
-
-if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {
-    Request::setTrustedHosts([$trustedHosts]);
-}
-
-$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
-$request = Request::createFromGlobals();
-$response = $kernel->handle($request);
-$response->send();
-$kernel->terminate($request, $response);

src/Controller/FediPlanController.php

@@ -1,8 +1,4 @@
-<?php /** @noinspection PhpUndefinedClassInspection */
+<?php
-/** @noinspection PhpDocSignatureInspection */
-/** @noinspection PhpUnused */
-/** @noinspection DuplicatedCode */
-/** @noinspection PhpTranslationKeyInspection */
 
 /**
  * Created by fediplan.
@@ -23,26 +19,31 @@ use App\SocialEntity\PollOption;
 use DateTime;
 use DateTimeZone;
 use Exception;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-
+use \Symfony\Component\HttpFoundation\RedirectResponse;
-
+use \Symfony\Component\HttpFoundation\Response;
 class FediPlanController extends AbstractController
 {
 
 
-    /**
+    #[Route(
-     * @Route("/{_locale}",name="index", defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"})
+        '/{_locale}',
-     */
+        name: 'index',
-    public function indexAction(Request $request, AuthorizationCheckerInterface $authorizationChecker, ConnectMastodonAccountFlow $flow, Mastodon_api $mastodon_api, TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher)
+        requirements: ['_locale' => '%allowed_language%'],
+        defaults: ['_locale'=>'en']
+    )]
+    public function index(Request $request, AuthorizationCheckerInterface $authorizationChecker, ConnectMastodonAccountFlow $flow, Mastodon_api $mastodon_api, TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher): RedirectResponse|Response
     {
 
         if ($authorizationChecker->isGranted('IS_AUTHENTICATED_FULLY')) {
@@ -72,16 +73,12 @@ class FediPlanController extends AbstractController
                         // form for the next step
                         $mastodon_api->set_client($createApp['response']['client_id'], $createApp['response']['client_secret']);
                         $urlToMastodon = $mastodon_api->getAuthorizationUrl();
-                        if (isset($createApp['error'])) {
-                            $form->get('host')->addError(new FormError($translator->trans('error.instance.mastodon_oauth_url', [], 'fediplan', 'en')));
-                        } else {
                         $flow->saveCurrentStepData($form);
                         $client_id = $createApp['response']['client_id'];
                         $client_secret = $createApp['response']['client_secret'];
                         $flow->nextStep();
                         $form = $flow->createForm();
                     }
-                    }
 
                 }
             } else if ($flow->getCurrentStep() == 2) {
@@ -102,14 +99,19 @@ class FediPlanController extends AbstractController
                     if (isset($accountReply['error'])) {
                         $form->get('code')->addError(new FormError($translator->trans('error.instance.mastodon_account', [], 'fediplan', 'en')));
                     } else {
-                        $Account = $mastodon_api->getSingleAccount($accountReply['response']);
+                        $account = $mastodon_api->getSingleAccount($accountReply['response']);
-                        $Account->setInstance($host);
+                        $account->setInstance($host);
-                        $Account->setToken($token_type . " " . $access_token);
+                        $account->setToken($token_type . " " . $access_token);
-                        $token = new UsernamePasswordToken($Account, null, 'main', array('ROLE_USER'));
+                        $token = new UsernamePasswordToken($account, null, array('ROLE_USER'));
-                        $this->get('security.token_storage')->setToken($token);
+                        try {
+                            $this->container->get('security.token_storage')->setToken($token);
                             $event = new InteractiveLoginEvent($request, $token);
                             $eventDispatcher->dispatch($event, "security.interactive_login");
                             return $this->redirectToRoute('schedule');
+                        } catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
+                            $form->get('code')->addError(new FormError($translator->trans('error.instance.mastodon_account', [], 'fediplan', 'en')));
+                        }
+
                     }
                 }
             }
@@ -128,10 +130,13 @@ class FediPlanController extends AbstractController
     }
 
 
-    /**
+    #[Route(
-     * @Route("/{_locale}/schedule", name="schedule", defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"})
+        '/{_locale}/schedule',
-     */
+        name: 'schedule',
-    public function schedule(Request $request, Mastodon_api $mastodon_api, TranslatorInterface $translator)
+        requirements: ['_locale' => '%allowed_language%'],
+        defaults: ['_locale'=>'en']
+    )]
+    public function schedule(Request $request, Mastodon_api $mastodon_api, TranslatorInterface $translator): Response
     {
 
         $compose = new Compose();
@@ -142,13 +147,13 @@ class FediPlanController extends AbstractController
         $pollOption2 = new PollOption();
         $pollOption2->setTitle("");
         $compose->getPollOptions()->add($pollOption2);
-        $form = $this->createForm(ComposeType::class, $compose, ['user' => $this->getUser()]);
+        /* @var $user MastodonAccount */
+        $user = $this->getUser();
+        $form = $this->createForm(ComposeType::class, $compose, ['user' => $user]);
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
             /** @var $data Compose */
             $data = $form->getData();
-            /* @var $user MastodonAccount */
-            $user = $this->getUser();
             $mastodon_api->set_url("https://" . $user->getInstance());
             $token = explode(" ", $user->getToken())[1];
             $type = explode(" ", $user->getToken())[0];
@@ -157,8 +162,7 @@ class FediPlanController extends AbstractController
             //Update media description and store their id
             foreach ($_POST as $key => $value) {
                 if ($key != "compose") {
-
+                    if (str_contains($key, 'media_id_')) {
-                    if (strpos($key, 'media_id_') !== false) {
 
                         $mediaId = $value;
                         $description = $_POST['media_description_' . $mediaId];
@@ -249,20 +253,24 @@ class FediPlanController extends AbstractController
 
     }
 
-
+    #[Route(
-    /**
+        '/{_locale}/scheduled',
-     * @Route("/{_locale}/scheduled", name="scheduled", defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"})
+        name: 'scheduled',
-     */
+        requirements: ['_locale' => '%allowed_language%'],
-    public function scheduled()
+        defaults: ['_locale'=>'en']
+    )]
+    public function scheduled(): Response
     {
         return $this->render("fediplan/scheduled.html.twig");
     }
 
 
-    /**
+    #[Route(
-     * @Route("/{_locale}/scheduled/messages/{max_id}",  options={"expose"=true}, name="load_more")
+        '/{_locale}/scheduled/messages/{max_id}',
-     */
+        name: 'load_more',
-    public function loadMoreAction(Mastodon_api $mastodon_api, string $max_id = null)
+        options: ['expose' => true]
+    )]
+    public function loadMoreAction(Mastodon_api $mastodon_api, string $max_id = null): JsonResponse
     {
 
         $user = $this->getUser();
@@ -281,10 +289,15 @@ class FediPlanController extends AbstractController
         return new JsonResponse($data);
     }
 
-    /**
+    #[Route(
-     * @Route("/{_locale}/scheduled/delete/messages/{id}", options={"expose"=true}, name="delete_message", methods={"POST"}, defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"})
+        '/{_locale}/scheduled/delete/messages/{id}',
-     */
+        name: 'delete_message',
-    public function deleteMessage(Mastodon_api $mastodon_api, string $id = null)
+        requirements: ['_locale' => '%allowed_language%'],
+        options: ['expose' => true],
+        defaults: ['_locale'=>'en'],
+        methods: ['POST']
+    )]
+    public function deleteMessage(Mastodon_api $mastodon_api, string $id = null): JsonResponse
     {
         $user = $this->getUser();
         $mastodon_api->set_url("https://" . $user->getInstance());
@@ -295,19 +308,23 @@ class FediPlanController extends AbstractController
         return new JsonResponse($response);
     }
 
-    /**
+
-     * @Route("/about",defaults={"_locale"="en"})
+    #[Route(
-     * @Route("/{_locale}/about", name="about", defaults={"_locale":"en"}, requirements={"_locale": "%allowed_language%"})
+        '/{_locale}/about',
-     */
+        name: 'about',
-    public function about()
+        requirements: ['_locale' => '%allowed_language%'],
+        defaults: ['_locale'=>'en']
+    )]
+    public function about(): Response
     {
         return $this->render("fediplan/about.html.twig");
     }
 
-    /**
+    #[Route(
-     * @Route("/logout", name="logout")
+        '/logout',
-     */
+        name: 'logout'
-    public function logout()
+    )]
+    public function logout(): Response
     {
         return $this->render("fediplan/index.html.twig");
     }

src/EventSubscriber/LocaleSubscriber.php

@@ -15,14 +15,14 @@ use Symfony\Component\HttpKernel\KernelEvents;
 
 class LocaleSubscriber implements EventSubscriberInterface
 {
-    private $defaultLocale;
+    private string $defaultLocale;
 
     public function __construct($defaultLocale = 'en')
     {
         $this->defaultLocale = $defaultLocale;
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             // must be registered before (i.e. with a higher priority than) the default Locale listener
@@ -30,7 +30,7 @@ class LocaleSubscriber implements EventSubscriberInterface
         ];
     }
 
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
         $request = $event->getRequest();
         if (!$request->hasPreviousSession()) {

src/Form/ComposeType.php

@@ -13,6 +13,7 @@ namespace App\Form;
 use App\SocialEntity\Compose;
 use App\SocialEntity\MastodonAccount;
 use DateTime;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -24,7 +25,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\TimezoneType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Translation\Translator;
 
 class ComposeType extends AbstractType

src/Form/PollOptionType.php

@@ -8,11 +8,11 @@ namespace App\Form;
 
 
 use App\SocialEntity\PollOption;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Security;
 
 class PollOptionType extends AbstractType
 {

src/Kernel.php

@@ -3,52 +3,9 @@
 namespace App;
 
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\RouteCollectionBuilder;
-use function dirname;
 
 class Kernel extends BaseKernel
 {
     use MicroKernelTrait;
-
-    private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
-
-    public function registerBundles(): iterable
-    {
-        $contents = require $this->getProjectDir() . '/config/bundles.php';
-        foreach ($contents as $class => $envs) {
-            if ($envs[$this->environment] ?? $envs['all'] ?? false) {
-                yield new $class();
-            }
-        }
-    }
-
-    public function getProjectDir(): string
-    {
-        return dirname(__DIR__);
-    }
-
-    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
-    {
-        $container->addResource(new FileResource($this->getProjectDir() . '/config/bundles.php'));
-        $container->setParameter('container.dumper.inline_class_loader', true);
-        $confDir = $this->getProjectDir() . '/config';
-
-        $loader->load($confDir . '/{packages}/*' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{packages}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{services}' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{services}_' . $this->environment . self::CONFIG_EXTS, 'glob');
-    }
-
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
-    {
-        $confDir = $this->getProjectDir() . '/config';
-
-        $routes->import($confDir . '/{routes}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, '/', 'glob');
-        $routes->import($confDir . '/{routes}/*' . self::CONFIG_EXTS, '/', 'glob');
-        $routes->import($confDir . '/{routes}' . self::CONFIG_EXTS, '/', 'glob');
-    }
 }

src/Services/Mastodon_api.php

@@ -1166,7 +1166,6 @@ class Mastodon_api
         $url = "https://" . $host . "/.well-known/nodeinfo";
         $reply = $curl->get($url);
 
-
         $responseArray = json_decode($reply->response, true);
         if (empty($responseArray)) {
             $curl = new Curl();

src/SocialEntity/MastodonAccount.php

@@ -6,8 +6,9 @@ namespace App\SocialEntity;
 use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Security\Core\User\UserInterface;
 
-class MastodonAccount
+class MastodonAccount implements UserInterface
 {
 
     private $id;
@@ -420,4 +421,18 @@ class MastodonAccount
     }
 
 
+    public function getRoles(): array
+    {
+        // TODO: Implement getRoles() method.
+    }
+
+    public function eraseCredentials(): void
+    {
+        // TODO: Implement eraseCredentials() method.
+    }
+
+    public function getUserIdentifier(): string
+    {
+        // TODO: Implement getUserIdentifier() method.
+    }
 }

symfony.lock

@@ -1,166 +1,140 @@
 {
     "craue/formflow-bundle": {
-        "version": "3.2.0"
+        "version": "3.7.0"
-    },
-    "doctrine/annotations": {
-        "version": "1.0",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "master",
-            "version": "1.0",
-            "ref": "cb4152ebcadbe620ea2261da1a1c5a9b8cea7672"
-        },
-        "files": [
-            "config/routes/annotations.yaml"
-        ]
-    },
-    "doctrine/collections": {
-        "version": "1.6.4"
-    },
-    "doctrine/lexer": {
-        "version": "1.1.0"
     },
     "friendsofsymfony/jsrouting-bundle": {
-        "version": "2.3",
+        "version": "3.5",
         "recipe": {
             "repo": "github.com/symfony/recipes-contrib",
-            "branch": "master",
+            "branch": "main",
             "version": "2.3",
             "ref": "a9f2e49180f75cdc71ae279a929c4b2e0638de84"
+        }
     },
-        "files": [
+    "phpunit/phpunit": {
-            "config/routes/fos_js_routing.yaml"
+        "version": "9.6",
-        ]
-    },
-    "php": {
-        "version": "7.3"
-    },
-    "psr/cache": {
-        "version": "1.0.1"
-    },
-    "psr/container": {
-        "version": "1.0.0"
-    },
-    "psr/log": {
-        "version": "1.1.0"
-    },
-    "sensio/framework-extra-bundle": {
-        "version": "5.2",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "5.2",
+            "version": "9.6",
-            "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b"
+            "ref": "7364a21d87e658eb363c5020c072ecfdc12e2326"
         },
         "files": [
-            "config/packages/sensio_framework_extra.yaml"
+            "./.env.test",
+            "./phpunit.xml.dist",
+            "./tests/bootstrap.php"
         ]
     },
-    "symfony/asset": {
+    "symfony/asset-mapper": {
-        "version": "v4.3.3"
+        "version": "7.0",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "6.4",
+            "ref": "6c28c471640cc2c6e60812ebcb961c526ef8997f"
         },
-    "symfony/cache": {
+        "files": [
-        "version": "v4.3.3"
+            "./assets/app.js",
-    },
+            "./assets/styles/app.css",
-    "symfony/cache-contracts": {
+            "./config/packages/asset_mapper.yaml",
-        "version": "v1.1.5"
+            "./importmap.php"
-    },
+        ]
-    "symfony/config": {
-        "version": "v4.3.3"
     },
     "symfony/console": {
-        "version": "3.3",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "3.3",
+            "version": "5.3",
-            "ref": "482d233eb8de91ebd042992077bbd5838858890c"
+            "ref": "1781ff40d8a17d87cf53f8d4cf0c8346ed2bb461"
         },
         "files": [
-            "bin/console",
+            "./bin/console"
-            "config/bootstrap.php"
         ]
     },
-    "symfony/debug": {
+    "symfony/debug-bundle": {
-        "version": "v4.3.3"
+        "version": "7.0",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "5.3",
+            "ref": "5aa8aa48234c8eb6dbdd7b3cd5d791485d2cec4b"
         },
-    "symfony/dependency-injection": {
+        "files": [
-        "version": "v4.3.3"
+            "./config/packages/debug.yaml"
-    },
+        ]
-    "symfony/dotenv": {
-        "version": "v4.3.3"
-    },
-    "symfony/event-dispatcher": {
-        "version": "v4.3.3"
-    },
-    "symfony/event-dispatcher-contracts": {
-        "version": "v1.1.5"
-    },
-    "symfony/filesystem": {
-        "version": "v4.3.3"
-    },
-    "symfony/finder": {
-        "version": "v4.3.3"
     },
     "symfony/flex": {
-        "version": "1.0",
+        "version": "2.4",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
             "version": "1.0",
-            "ref": "dc3fc2e0334a4137c47cfd5a3ececc601fa61a0b"
+            "ref": "146251ae39e06a95be0fe3d13c807bcf3938b172"
         },
         "files": [
-            ".env"
+            "./.env"
         ]
     },
-    "symfony/form": {
-        "version": "v4.3.3"
-    },
     "symfony/framework-bundle": {
-        "version": "4.2",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "4.2",
+            "version": "7.0",
-            "ref": "61ad963f28c091b8bb9449507654b9c7d8bbb53c"
+            "ref": "6356c19b9ae08e7763e4ba2d9ae63043efc75db5"
         },
         "files": [
-            "config/bootstrap.php",
+            "./config/packages/cache.yaml",
-            "config/packages/cache.yaml",
+            "./config/packages/framework.yaml",
-            "config/packages/framework.yaml",
+            "./config/preload.php",
-            "config/packages/test/framework.yaml",
+            "./config/routes/framework.yaml",
-            "config/services.yaml",
+            "./config/services.yaml",
-            "public/index.php",
+            "./public/index.php",
-            "src/Controller/.gitignore",
+            "./src/Controller/.gitignore",
-            "src/Kernel.php"
+            "./src/Kernel.php"
         ]
     },
-    "symfony/http-foundation": {
+    "symfony/maker-bundle": {
-        "version": "v4.3.3"
+        "version": "1.59",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "1.0",
+            "ref": "fadbfe33303a76e25cb63401050439aa9b1a9c7f"
+        }
     },
-    "symfony/http-kernel": {
+    "symfony/monolog-bundle": {
-        "version": "v4.3.3"
+        "version": "3.10",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "3.7",
+            "ref": "aff23899c4440dd995907613c1dd709b6f59503f"
         },
-    "symfony/inflector": {
+        "files": [
-        "version": "v4.3.3"
+            "./config/packages/monolog.yaml"
+        ]
     },
-    "symfony/intl": {
+    "symfony/notifier": {
-        "version": "v4.3.3"
+        "version": "7.0",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "5.0",
+            "ref": "178877daf79d2dbd62129dd03612cb1a2cb407cc"
         },
-    "symfony/mime": {
+        "files": [
-        "version": "v4.3.3"
+            "./config/packages/notifier.yaml"
-    },
+        ]
-    "symfony/options-resolver": {
-        "version": "v4.3.3"
     },
     "symfony/phpunit-bridge": {
         "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "5.1",
+            "version": "6.3",
-            "ref": "2f91477d6efaed3fb857db87480f7d07d31cbb3e"
+            "ref": "a411a0480041243d97382cac7984f7dce7813c08"
         },
         "files": [
             "./.env.test",
@@ -169,152 +143,101 @@
             "./tests/bootstrap.php"
         ]
     },
-    "symfony/polyfill-intl-icu": {
-        "version": "v1.12.0"
-    },
-    "symfony/polyfill-intl-idn": {
-        "version": "v1.12.0"
-    },
-    "symfony/polyfill-intl-messageformatter": {
-        "version": "v1.15.0"
-    },
-    "symfony/polyfill-mbstring": {
-        "version": "v1.12.0"
-    },
-    "symfony/polyfill-php72": {
-        "version": "v1.12.0"
-    },
-    "symfony/polyfill-php73": {
-        "version": "v1.12.0"
-    },
-    "symfony/process": {
-        "version": "v4.3.3"
-    },
-    "symfony/property-access": {
-        "version": "v4.3.3"
-    },
     "symfony/routing": {
-        "version": "4.2",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "4.2",
+            "version": "7.0",
-            "ref": "4c107a8d23a16b997178fbd4103b8d2f54f688b7"
+            "ref": "21b72649d5622d8f7da329ffb5afb232a023619d"
         },
         "files": [
-            "config/packages/dev/routing.yaml",
+            "./config/packages/routing.yaml",
-            "config/packages/routing.yaml",
+            "./config/routes.yaml"
-            "config/packages/test/routing.yaml",
-            "config/routes.yaml"
         ]
     },
     "symfony/security-bundle": {
-        "version": "3.3",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "3.3",
+            "version": "6.4",
-            "ref": "e5a0228251d1dd2bca4c8ef918e14423c06db625"
+            "ref": "2ae08430db28c8eb4476605894296c82a642028f"
         },
         "files": [
-            "config/packages/security.yaml"
+            "./config/packages/security.yaml",
+            "./config/routes/security.yaml"
         ]
     },
-    "symfony/security-core": {
+    "symfony/stimulus-bundle": {
-        "version": "v4.3.3"
+        "version": "2.17",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "2.13",
+            "ref": "6acd9ff4f7fd5626d2962109bd4ebab351d43c43"
         },
-    "symfony/security-csrf": {
+        "files": [
-        "version": "v4.3.3"
+            "./assets/bootstrap.js",
-    },
+            "./assets/controllers.json",
-    "symfony/security-guard": {
+            "./assets/controllers/hello_controller.js"
-        "version": "v4.3.3"
+        ]
-    },
-    "symfony/security-http": {
-        "version": "v4.3.3"
-    },
-    "symfony/serializer": {
-        "version": "v4.3.3"
-    },
-    "symfony/service-contracts": {
-        "version": "v1.1.5"
     },
     "symfony/translation": {
-        "version": "3.3",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "3.3",
+            "version": "6.3",
-            "ref": "2ad9d2545bce8ca1a863e50e92141f0b9d87ffcd"
+            "ref": "e28e27f53663cc34f0be2837aba18e3a1bef8e7b"
         },
         "files": [
-            "config/packages/translation.yaml",
+            "./config/packages/translation.yaml",
-            "translations/.gitignore"
+            "./translations/.gitignore"
         ]
     },
-    "symfony/translation-contracts": {
-        "version": "v1.1.5"
-    },
-    "symfony/twig-bridge": {
-        "version": "v4.3.3"
-    },
     "symfony/twig-bundle": {
-        "version": "3.3",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "3.3",
+            "version": "6.4",
-            "ref": "369b5b29dc52b2c190002825ae7ec24ab6f962dd"
+            "ref": "cab5fd2a13a45c266d45a7d9337e28dee6272877"
         },
         "files": [
-            "config/packages/twig.yaml",
+            "./config/packages/twig.yaml",
-            "config/routes/dev/twig.yaml",
+            "./templates/base.html.twig"
-            "templates/base.html.twig"
         ]
     },
+    "symfony/ux-turbo": {
+        "version": "v2.17.0"
+    },
     "symfony/validator": {
-        "version": "4.3",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "4.3",
+            "version": "7.0",
-            "ref": "d902da3e4952f18d3bf05aab29512eb61cabd869"
+            "ref": "8c1c4e28d26a124b0bb273f537ca8ce443472bfd"
         },
         "files": [
-            "config/packages/test/validator.yaml",
+            "./config/packages/validator.yaml"
-            "config/packages/validator.yaml"
         ]
     },
-    "symfony/var-exporter": {
+    "symfony/web-profiler-bundle": {
-        "version": "v4.3.3"
+        "version": "7.0",
-    },
-    "symfony/web-server-bundle": {
-        "version": "3.3",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "3.3",
+            "version": "6.1",
-            "ref": "dae9b39fd6717970be7601101ce5aa960bf53d9a"
+            "ref": "e42b3f0177df239add25373083a564e5ead4e13a"
-        }
-    },
-    "symfony/yaml": {
-        "version": "v4.3.3"
-    },
-    "twig/extensions": {
-        "version": "1.0",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "master",
-            "version": "1.0",
-            "ref": "a86723ee8d8b2f9437c8ce60a5546a1c267da5ed"
         },
         "files": [
-            "config/packages/twig_extensions.yaml"
+            "./config/packages/web_profiler.yaml",
+            "./config/routes/web_profiler.yaml"
         ]
     },
-    "twig/twig": {
+    "twig/extra-bundle": {
-        "version": "v2.11.3"
+        "version": "v3.9.3"
-    },
-    "willdurand/jsonp-callback-validator": {
-        "version": "v1.1.0"
     }
 }