[WIP] Update to support latest PHP and Symfony

composer.json

@@ -3,17 +3,16 @@
   "description": "A nice PHP microframework",
   "license": "MIT",
   "require": {
-    "php": ">=5.4.0",
-    "symfony/config": "~2.3",
-    "symfony/http-kernel": "~2.3",
-    "symfony/dependency-injection": "~2.3",
-    "nikic/fast-route": ">=0.6"
+    "php": ">=8.1",
+    "symfony/config": "~6.3",
+    "symfony/http-kernel": "~6.3",
+    "symfony/dependency-injection": "~6.3",
+    "symfony/yaml": "~6.3",
+    "nikic/fast-route": ">=1.3"
   },
   "require-dev": {
-    "symfony/debug": "~2.3",
-    "symfony/expression-language": "~2.4",
-    "phpunit/phpunit": "~3.7",
-    "codeclimate/php-test-reporter": "dev-master"
+    "symfony/expression-language": "~6.3",
+    "phpunit/phpunit": "~10.3"
   },
   "suggest": {
     "stack/builder": "Stack HttpKernel middlewares - http://stackphp.com",

src/Application.php

@@ -244,12 +244,12 @@ public function run(Request $request = null)
      *
      * @param Request $request A Request instance
      * @param int     $type    The type of the request
-     *                         (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
+     *                         (one of HttpKernelInterface::MAIN_REQUEST or HttpKernelInterface::SUB_REQUEST)
      * @param bool    $catch   Whether to catch exceptions or not
      *
      * @return Response A Response instance
      */
-    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    public function handle(Request $request, int $type = self::MAIN_REQUEST, bool $catch = true): Response
     {
         if (!$this->booted) {
             $this->boot();
@@ -361,13 +361,13 @@ public function getContainer()
      * @param object|callable $service The service instance
      * @param string          $scope   The scope of the service
      */
-    public function set($id, $service, $scope = ContainerInterface::SCOPE_CONTAINER)
+    public function set(string $id, ?object $service)
     {
         if (!$this->booted) {
             $this->boot();
         }
 
-        $this->container->set($id, $service, $scope);
+        $this->container->set($id, $service);
     }
 
     /**

src/DependencyInjection/ContainerInitializer/CachedInitializer.php

@@ -72,7 +72,7 @@ public function initializeContainer(Application $application, array $extensions
             $this->dumpContainer($cache, $container, $class, 'Container');
         }
 
-        require_once $cache;
+        require_once $cache->getPath();
 
         return new $class();
     }
@@ -97,6 +97,11 @@ protected function getContainerClass(Application $application)
      */
     protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container, $class, $baseClass)
     {
+        if (!$container->isCompiled()) {
+            // The container must be compiled before it can be dumped.
+            $container->compile();
+        }
+
         $dumper  = new PhpDumper($container);
         $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass));
 

src/DependencyInjection/ContainerInitializer/DefaultInitializer.php

@@ -19,8 +19,8 @@
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Scope;
+use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
 use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass;
-use Symfony\Component\HttpKernel\DependencyInjection\RegisterListenersPass;
 
 /**
  * Creates and initializes a Service Container, ready for use by the Application
@@ -62,18 +62,14 @@ public function initializeContainer(Application $application, array $extensions
         $container->setParameter('app.cache_dir', $application->getCacheDir());
         $container->setParameter('app.log_dir', $application->getLogDir());
 
-        $container->register('event_dispatcher', 'Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher')
-            ->setArguments(array(new Reference('service_container')));
+        $container->register('event_dispatcher', 'Symfony\Component\EventDispatcher\EventDispatcher')
+            ->setPublic(true);
 
         $container->register('app', 'Symfony\Component\HttpKernel\HttpKernelInterface')
             ->setSynthetic(true);
 
         $container->register('request', 'Symfony\Componenet\HttpKernel\Request')
-            ->setSynthetic(true)
-            ->setSynchronized(true)
-            ->setScope('request');
-
-        $container->addScope(new Scope('request'));
+            ->setSynthetic(true);
 
         $extensionAliases = array();
         foreach ($extensions as $extension) {

src/Extension/LogConfiguration.php

@@ -21,8 +21,8 @@ class LogConfiguration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('logging');
+        $treeBuilder = new TreeBuilder('logging');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()

src/Extension/LogExtension.php

@@ -97,7 +97,8 @@ private function configureStreamChannel(array $channelConfig, ContainerBuilder $
         $container->register($loggerService)
             ->setClass('Monolog\Logger')
             ->addArgument($name)
-            ->addMethodCall('pushHandler', array(new Reference($handlerService)));
+            ->addMethodCall('pushHandler', array(new Reference($handlerService)))
+            ->setPublic(true);
     }
 
     private function configureErrorLogChannel(array $channelConfig, ContainerBuilder $container)

src/Extension/RouterExtension.php

@@ -46,8 +46,7 @@ public function load(array $config, ContainerBuilder $container)
             ->addArgument(new Reference('router.collector'));
 
         $container->register('router.dispatcher', 'FastRoute\Dispatcher')
-            ->setFactoryService('router.dispatcher_factory')
-            ->setFactoryMethod('create');
+            ->setFactory(array(new Reference('router.dispatcher_factory'), 'create'));
 
         $container->register('router.dispatcher_subscriber', 'Nice\Router\RouterSubscriber')
             ->addArgument(new Reference('router.dispatcher'))
@@ -68,11 +67,12 @@ public function load(array $config, ContainerBuilder $container)
                     'request',
                     ContainerInterface::NULL_ON_INVALID_REFERENCE,
                     false
-                )));
+                )))
+            ->setPublic(true);
 
-        $container->register('http_kernel', 'Symfony\Component\HttpKernel\DependencyInjection\ContainerAwareHttpKernel')
+        $container->register('http_kernel', 'Symfony\Component\HttpKernel\HttpKernel')
             ->addArgument(new Reference('event_dispatcher'))
-            ->addArgument(new Reference('service_container'))
-            ->addArgument(new Reference('router.controller_resolver'));
+            ->addArgument(new Reference('router.controller_resolver'))
+            ->setPublic(true);
     }
 }

src/Extension/SessionExtension.php

@@ -26,7 +26,8 @@ class SessionExtension extends Extension
      */
     public function load(array $config, ContainerBuilder $container)
     {
-        $container->register('session', 'Symfony\Component\HttpFoundation\Session\Session');
+        $container->register('session', 'Symfony\Component\HttpFoundation\Session\Session')
+            ->setPublic(true);
 
         $container->register('session.session_subscriber', 'Nice\Session\SessionSubscriber')
             ->addArgument(new Reference('service_container'))

src/Router/ContainerAwareControllerResolver.php

@@ -40,7 +40,7 @@ public function setContainer(ContainerInterface $container = null)
      *
      * @return callable
      */
-    protected function createController($controller)
+    protected function createController(string $controller): callable
     {
         $parts = explode(':', $controller);
         if (count($parts) === 2) {

src/Router/RouteCollector/CachedCollector.php

@@ -65,7 +65,7 @@ public function getData()
             $cache->write('<?php return '.var_export($routes, true).';');
         }
 
-        return require $cache;
+        return require $cache->getPath();
     }
 
     /**

src/Router/RouterSubscriber.php

@@ -11,7 +11,7 @@
 
 use FastRoute\Dispatcher;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -42,7 +42,7 @@ public function __construct(Dispatcher $dispatcher)
      * @throws \Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    public function onKernelRequest(GetResponseEvent $event)
+    public function onKernelRequest(RequestEvent $event)
     {
         $request = $event->getRequest();
         if ($request->get('_controller')) {

src/Router/UrlGenerator/CachedDataGenerator.php

@@ -59,6 +59,6 @@ public function getData()
             $cache->write('<?php return '.var_export($routes, true).';');
         }
 
-        return require $cache;
+        return require $cache->getPath();
     }
 }

src/Router/WrappedHandlerSubscriber.php

@@ -10,7 +10,7 @@
 namespace Nice\Router;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
@@ -19,9 +19,9 @@
 class WrappedHandlerSubscriber implements EventSubscriberInterface
 {
     /**
-     * @param GetResponseEvent $event
+     * @param RequestEvent $event
      */
-    public function onKernelRequest(GetResponseEvent $event)
+    public function onKernelRequest(RequestEvent $event)
     {
         $request = $event->getRequest();
         $handler = $request->get('_controller');

src/Session/SessionSubscriber.php

@@ -11,7 +11,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -36,9 +36,9 @@ public function __construct(ContainerInterface $container)
     }
 
     /**
-     * @param GetResponseEvent $event
+     * @param RequestEvent $event
      */
-    public function onKernelRequest(GetResponseEvent $event)
+    public function onKernelRequest(RequestEvent $event)
     {
         if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return;

tests/ApplicationTest.php

@@ -9,14 +9,15 @@
 
 namespace Nice\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Nice\Application;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\TerminableInterface;
 
-class ApplicationTest extends \PHPUnit_Framework_TestCase
+class ApplicationTest extends TestCase
 {
     /**
      * Test the instantiation
@@ -190,7 +191,7 @@ public function testDefaultExtensions()
     {
         /** @var \Nice\Application|\PHPUnit_Framework_MockObject_MockObject $app */
         $app = $this->getMockBuilder('Nice\Application')
-            ->setMethods(array('getRootDir'))
+            ->onlyMethods(array('getRootDir'))
             ->setConstructorArgs(array('init', true))
             ->getMock();
         $app->expects($this->any())
@@ -211,7 +212,7 @@ public function testInitializeContainer()
     {
         /** @var \Nice\Application|\PHPUnit_Framework_MockObject_MockObject $app */
         $app = $this->getMockBuilder('Nice\Application')
-            ->setMethods(array('getRootDir'))
+            ->onlyMethods(array('getRootDir'))
             ->setConstructorArgs(array('init', true))
             ->getMock();
         $app->expects($this->any())
@@ -234,14 +235,14 @@ public function testFailureToCreateCacheDir()
     {
         /** @var \Nice\Application|\PHPUnit_Framework_MockObject_MockObject $app */
         $app = $this->getMockBuilder('Nice\Application')
-            ->setMethods(array('getRootDir', 'getCacheDir'))
+            ->onlyMethods(array('getRootDir', 'getCacheDir'))
             ->setConstructorArgs(array('create', true))
             ->getMock();
         $app->expects($this->any())
             ->method('getCacheDir')
             ->will($this->returnValue('/someunwriteable/path'));
 
-        $this->setExpectedException('RuntimeException', 'Unable to create the cache directory');
+        $this->expectException('RuntimeException', 'Unable to create the cache directory');
 
         $app->boot();
     }
@@ -257,14 +258,14 @@ public function testFailureToWriteCacheDir()
 
         /** @var \Nice\Application|\PHPUnit_Framework_MockObject_MockObject $app */
         $app = $this->getMockBuilder('Nice\Application')
-            ->setMethods(array('getRootDir', 'getCacheDir'))
+            ->onlyMethods(array('getRootDir', 'getCacheDir'))
             ->setConstructorArgs(array('write', true))
             ->getMock();
         $app->expects($this->any())
             ->method('getCacheDir')
             ->will($this->returnValue($tmpdir));
 
-        $this->setExpectedException('RuntimeException', 'Unable to write in the cache directory');
+        $this->expectException('RuntimeException', 'Unable to write in the cache directory');
 
         $app->boot();
     }
@@ -280,7 +281,7 @@ protected function getMockApplication(HttpKernelInterface $kernel = null, $cache
 
         /** @var \Nice\Application|\PHPUnit_Framework_MockObject_MockObject $app */
         $app = $this->getMockBuilder('Nice\Application')
-            ->setMethods(array('getRootDir', 'registerDefaultExtensions', 'initializeContainer'))
+            ->onlyMethods(array('getRootDir', 'registerDefaultExtensions', 'initializeContainer'))
             ->setConstructorArgs(array('test', true, $cache))
             ->getMock();
         $app->expects($this->any())

tests/DependencyInjection/ConfigurationProvider/FileConfigurationProviderTest.php

@@ -9,10 +9,11 @@
 
 namespace Nice\Tests\DependencyInjection\ConfigurationProvider;
 
+use PHPUnit\Framework\TestCase;
 use Nice\DependencyInjection\ConfigurationProvider\FileConfigurationProvider;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class FileConfigurationProviderTest extends \PHPUnit_Framework_TestCase
+class FileConfigurationProviderTest extends TestCase
 {
     /**
      * Test no-operation functionality

tests/DependencyInjection/ConfigurationProvider/NullConfigurationProviderTest.php

@@ -9,16 +9,17 @@
 
 namespace Nice\Tests\DependencyInjection\ConfigurationProvider;
 
+use PHPUnit\Framework\TestCase;
 use Nice\DependencyInjection\ConfigurationProvider\NullConfigurationProvider;
 
-class NullConfigurationProviderTest extends \PHPUnit_Framework_TestCase
+class NullConfigurationProviderTest extends TestCase
 {
     /**
      * Test no-operation functionality
      */
     public function testNoOp()
     {
-        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+        $container = $this->getMockForAbstractClass('Symfony\Component\DependencyInjection\ContainerBuilder');
         $container->expects($this->never())
             ->method($this->anything());