Idea to support symfony 4/5 (maybe 6? ) and php 8.0

Controller/EncodeController.php

@@ -2,41 +2,41 @@
 
 namespace Leopardd\Bundle\UrlShortenerBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Leopardd\Bundle\UrlShortenerBundle\Factory\ShortUrlFactory;
 use Leopardd\Bundle\UrlShortenerBundle\Service\EncodeService;
 use Leopardd\Bundle\UrlShortenerBundle\Exception\InvalidUrlException;
 
-class EncodeController extends Controller
+class EncodeController extends AbstractController
 {
+
+	public function __construct(private ShortUrlFactory $shortUrlFactory,private EncodeService $encodeService)
+	{
+
+	}
     /**
      * @param Request $request
      * @throws InvalidUrlException
      * @return JsonResponse
      */
     public function indexAction(Request $request)
     {
-        /** @var ShortUrlFactory $shortUrlFactory */
-        $shortUrlFactory = $this->get('leopardd_url_shortener.factory.short_url');
-
-        /** @var EncodeService $encodeService */
-        $encodeService = $this->get('leopardd_url_shortener.service.encode');
 
         $url = $request->request->get('url');
 
         // validate and sanitize
         if (filter_var($url, FILTER_VALIDATE_URL) === false) throw new InvalidUrlException();
         $url = rtrim($url, '/');
 
-        $shortUrl = $shortUrlFactory->create($url);
-        $shortUrl = $encodeService->process($shortUrl);
+        $shortUrl = $this->shortUrlFactory->create($url);
+        $shortUrl = $this->encodeService->process($shortUrl);
 
         return new JsonResponse([
             'url' => $shortUrl->getUrl(),
             'code' => $shortUrl->getCode()
         ]);
     }
-}
+}

Controller/RedirectController.php

@@ -2,26 +2,29 @@
 
 namespace Leopardd\Bundle\UrlShortenerBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Leopardd\Bundle\UrlShortenerBundle\Service\RedirectService;
 use Leopardd\Bundle\UrlShortenerBundle\Exception\InvalidCodeException;
 
-class RedirectController extends Controller
+class RedirectController extends AbstractController
 {
+
+	public function __construct(private RedirectService $redirectService)
+	{
+
+	}
     /**
      * @param string $code
      * @throws InvalidCodeException
      * @return RedirectResponse
      */
     public function indexAction($code)
     {
-        /** @var RedirectService $redirectService */
-        $redirectService = $this->get('leopardd_url_shortener.service.redirect');
 
-        $response = $redirectService->getRedirectResponse($code);
+        $response = $this->redirectService->getRedirectResponse($code);
         if ($response === null) throw new InvalidCodeException();
 
         return $response;
     }
-}
+}

DependencyInjection/Configuration.php

@@ -17,9 +17,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('leopardd_url_shortener');
-
+        $builder = new TreeBuilder('leopardd_url_shortener');
+	    $rootNode = $builder->getRootNode();
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for
         // more information on that topic.
@@ -34,6 +33,7 @@ public function getConfigTreeBuilder()
             ->end()
             ->end();
 
-        return $treeBuilder;
+
+        return $builder;
     }
-}
+}

DependencyInjection/LeoparddUrlShortenerExtension.php

@@ -14,30 +14,30 @@
  */
 class LeoparddUrlShortenerExtension extends Extension
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
+	/**
+	 * {@inheritdoc}
+	 */
+	public function load(array $configs, ContainerBuilder $container)
+	{
+		$configuration = new Configuration();
+		$config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-        $loader->load('services.yml');
+		$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+		$loader->load('services.yml');
 
-        // Hashids Config
-        if (isset($config['hashids'])) {
-            if (isset($config['hashids']['salt'])) {
-                $container->setParameter('leopardd_url_shortener.hashids.salt', $config['hashids']['salt']);
-            }
+		// Hashids Config
+		if (isset($config['hashids'])) {
+			if (isset($config['hashids']['salt'])) {
+				$container->setParameter('leopardd_url_shortener.hashids.salt', $config['hashids']['salt']);
+			}
 
-            if (isset($config['hashids']['min_length'])) {
-                $container->setParameter('leopardd_url_shortener.hashids.min_length', $config['hashids']['min_length']);
-            }
+			if (isset($config['hashids']['min_length'])) {
+				$container->setParameter('leopardd_url_shortener.hashids.min_length', $config['hashids']['min_length']);
+			}
 
-            if (isset($config['hashids']['alphabet'])) {
-                $container->setParameter('leopardd_url_shortener.hashids.alphabet', $config['hashids']['alphabet']);
-            }
-        }
-    }
-}
+			if (isset($config['hashids']['alphabet'])) {
+				$container->setParameter('leopardd_url_shortener.hashids.alphabet', $config['hashids']['alphabet']);
+			}
+		}
+	}
+}