ISSUE-337: update dependencies

Author: tatevikg1

bin/console

@@ -7,7 +7,7 @@ use PhpList\Core\Core\Bootstrap;
 use PhpList\Core\Core\Environment;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
+use Symfony\Component\ErrorHandler\ErrorHandler;
 
 set_time_limit(0);
 
@@ -19,7 +19,7 @@ $debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-d
     && $environment !== Environment::PRODUCTION;
 
 if ($debug) {
-    Debug::enable();
+    ErrorHandler::register();
 }
 
 Bootstrap::getInstance()->setEnvironment($environment)->configure();

composer.json

@@ -34,28 +34,26 @@
         "source": "https://github.com/phpList/core"
     },
     "require": {
-        "php": "^7.2|^8.0",
-        "doctrine/orm": "^2.5.0",
-        "doctrine/common": "^2.6.0",
-        "doctrine/doctrine-bundle": "^1.8.0",
-        "symfony/symfony": "^3.4.37",
-        "symfony/monolog-bundle": "^3.1.0",
-        "symfony/dependency-injection": "^3.4.37",
-        "symfony/config": "^3.4.37",
-        "symfony/yaml": "^3.4.37",
-        "jms/serializer-bundle": "^3.8.0",
-        "sensio/framework-extra-bundle": "^5.1.0",
-        "sensio/distribution-bundle": "^5.0.6"
+        "php": "^8.1",
+        "doctrine/orm": "^2.11",
+        "doctrine/common": "^3.3",
+        "doctrine/doctrine-bundle": "^2.7",
+        "symfony/symfony": "^4.4|^5.4",
+        "symfony/monolog-bundle": "^3.8|^4.0",
+        "symfony/dependency-injection": "^4.4|^5.4",
+        "symfony/config": "^4.4|^5.4",
+        "symfony/yaml": "^4.4|^5.4",
+        "doctrine/annotations": "*",
+        "symfony/error-handler": "*",
+        "symfony/serializer": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5.6",
-        "phpunit/phpunit-mock-objects": "^5.0.6",
-        "phpunit/dbunit": "^3.0.0",
+        "phpunit/phpunit": "^10.0",
         "guzzlehttp/guzzle": "^6.3.0",
         "squizlabs/php_codesniffer": "^3.2.0",
         "phpstan/phpstan": "^0.7.0|0.12.57",
         "nette/caching": "^2.5.0|^3.0.0",
-        "nikic/php-parser": "^3.1.0",
+        "nikic/php-parser": "^4.19.1",
         "phpmd/phpmd": "^2.6.0",
         "composer/composer": "^1.6.0",
         "doctrine/instantiator": "^1.0.5"
@@ -83,7 +81,7 @@
             "PhpList\\Core\\Composer\\ScriptHandler::createBundleConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::createRoutesConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::createParametersConfiguration",
-            "PhpList\\Core\\Composer\\ScriptHandler::clearAllCaches"
+            "php bin/console cache:clear"
         ],
         "post-install-cmd": [
             "@update-configuration"

config/services.yml

@@ -26,11 +26,24 @@ services:
         autowire: true
         autoconfigure: false
         public: true
-        factory: Doctrine\ORM\EntityManagerInterface:getRepository
+        factory: ['@doctrine.orm.entity_manager', getRepository]
 
     # controllers are imported separately to make sure they're public
     # and have a tag that allows actions to type-hint services
     PhpList\Core\EmptyStartPageBundle\Controller\:
         resource: '../src/EmptyStartPageBundle/Controller'
         public: true
         tags: [controller.service_arguments]
+
+    doctrine.orm.metadata.annotation_reader:
+        alias: doctrine.annotation_reader
+
+    doctrine.annotation_reader:
+        class: Doctrine\Common\Annotations\AnnotationReader
+        autowire: true
+
+    doctrine.orm.default_annotation_metadata_driver:
+        class: Doctrine\ORM\Mapping\Driver\AnnotationDriver
+        arguments:
+            - '@annotation_reader'
+            - '%kernel.project_dir%/src/Domain/Model/'

src/Composer/ScriptHandler.php

@@ -6,15 +6,14 @@
 use Composer\Package\PackageInterface;
 use Composer\Script\Event;
 use PhpList\Core\Core\ApplicationStructure;
-use Sensio\Bundle\DistributionBundle\Composer\ScriptHandler as SensioScriptHandler;
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * This class provides Composer-related functionality for setting up and managing phpList modules.
  *
  * @author Oliver Klee <[email protected]>
  */
-class ScriptHandler extends SensioScriptHandler
+class ScriptHandler
 {
     /**
      * @var string
@@ -262,23 +261,6 @@ public static function clearAllCaches()
         $fileSystem->remove(static::getApplicationRoot() . '/var/cache');
     }
 
-    /**
-     * Warms the production cache.
-     *
-     * @param Event $event
-     *
-     * @return void
-     */
-    public static function warmProductionCache(Event $event)
-    {
-        $consoleDir = static::getConsoleDir($event, 'warm the cache');
-        if ($consoleDir === null) {
-            return;
-        }
-
-        static::executeCommand($event, $consoleDir, 'cache:warm -e prod');
-    }
-
     /**
      * Creates config/parameters.yml (the parameters configuration file).
      *

src/Core/ApplicationKernel.php

@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\Core\Core;
 
-use Symfony\Bundle\WebServerBundle\WebServerBundle;
+use Exception;
+use RuntimeException;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -28,12 +30,7 @@ class ApplicationKernel extends Kernel
      */
     public function registerBundles(): array
     {
-        $bundles = $this->bundlesFromConfiguration();
-        if ($this->shouldHaveDevelopmentBundles()) {
-            $bundles[] = new WebServerBundle();
-        }
-
-        return $bundles;
+        return $this->bundlesFromConfiguration();
     }
 
     /**
@@ -117,7 +114,7 @@ protected function build(ContainerBuilder $container)
      *
      * @return void
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
@@ -162,13 +159,13 @@ private function bundlesFromConfiguration(): array
      *
      * @return string[][]
      *
-     * @throws \RuntimeException if the configuration file cannot be read
+     * @throws RuntimeException if the configuration file cannot be read
      */
     private function readBundleConfiguration(): array
     {
         $configurationFilePath = $this->getApplicationDir() . '/config/bundles.yml';
         if (!is_readable($configurationFilePath)) {
-            throw new \RuntimeException('The file "' . $configurationFilePath . '" could not be read.', 1504272377);
+            throw new RuntimeException('The file "' . $configurationFilePath . '" could not be read.', 1504272377);
         }
 
         return Yaml::parse(file_get_contents($configurationFilePath));

src/Core/Bootstrap.php

@@ -1,12 +1,16 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\Core\Core;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Debug\Debug;
+use Exception;
+use RuntimeException;
+use Symfony\Component\ErrorHandler\ErrorHandler;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
+use UnexpectedValueException;
 
 /**
  * This class bootstraps the phpList core system.
@@ -98,7 +102,7 @@ public static function purgeInstance()
      *
      * @return Bootstrap fluent interface
      *
-     * @throws \UnexpectedValueException
+     * @throws UnexpectedValueException
      */
     public function setEnvironment(string $environment): Bootstrap
     {
@@ -175,12 +179,12 @@ public function configure(): Bootstrap
      *
      * @return void
      *
-     * @throws \RuntimeException if configure has not been called before
+     * @throws RuntimeException if configure has not been called before
      */
     private function assertConfigureHasBeenCalled()
     {
         if (!$this->isConfigured) {
-            throw new \RuntimeException('Please call configure() first.', 1501170550);
+            throw new RuntimeException('Please call configure() first.', 1501170550);
         }
     }
 
@@ -191,8 +195,8 @@ private function assertConfigureHasBeenCalled()
      *
      * @return null
      *
-     * @throws \RuntimeException if configure has not been called before
-     * @throws \Exception
+     * @throws RuntimeException if configure has not been called before
+     * @throws Exception
      */
     public function dispatch()
     {
@@ -212,7 +216,7 @@ public function dispatch()
     private function configureDebugging(): Bootstrap
     {
         if ($this->isDebugEnabled()) {
-            Debug::enable();
+            ErrorHandler::register();
         }
 
         return $this;
@@ -234,7 +238,7 @@ private function configureApplicationKernel(): Bootstrap
     /**
      * @return ApplicationKernel
      *
-     * @throws \RuntimeException if configure has not been called before
+     * @throws RuntimeException if configure has not been called before
      */
     public function getApplicationKernel(): ApplicationKernel
     {
@@ -258,7 +262,7 @@ public function getContainer(): ContainerInterface
     /**
      * @return EntityManagerInterface
      *
-     * @throws \RuntimeException if configure has not been called before
+     * @throws RuntimeException if configure has not been called before
      */
     public function getEntityManager(): EntityManagerInterface
     {
@@ -278,7 +282,7 @@ public function getEntityManager(): EntityManagerInterface
      *
      * @return string the absolute path without the trailing slash.
      *
-     * @throws \RuntimeException if there is no composer.json in the application root
+     * @throws RuntimeException if there is no composer.json in the application root
      */
     public function getApplicationRoot(): string
     {

src/EmptyStartPageBundle/Controller/DefaultController.php

@@ -3,27 +3,25 @@
 
 namespace PhpList\Core\EmptyStartPageBundle\Controller;
 
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use InvalidArgumentException;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * This controller provides an empty start page.
  *
  * @author Oliver Klee <[email protected]>
  */
-class DefaultController extends Controller
+class DefaultController extends AbstractController
 {
     /**
-     * @Route("/")
-     * @Method("GET")
+     * An empty start page route.
      *
-     * @return Response
-     *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
-    public function indexAction(): Response
+    #[Route('/', name: 'empty_start_page', methods: ['GET'])]
+    public function index(): Response
     {
         return new Response('This page has been intentionally left empty.');
     }