update symfony to ^7.0

Author: zhoutianliang

.gitignore

@@ -3,3 +3,5 @@
 
 /_connector
 /Resources/public
+.phpunit.result.cache
+.idea

Authentication/Authentication.php

@@ -21,7 +21,7 @@ class Authentication implements AuthenticationInterface
     /**
      * @var ContainerInterface
      */
-    protected $container;
+    protected ContainerInterface $container;
 
     /**
      * {@inheritdoc}
@@ -36,7 +36,7 @@ public function authenticate(): bool
      *
      * @param ContainerInterface|null $container A ContainerInterface instance or null
      */
-    public function setContainer(ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null): void
     {
         $this->container = $container;
     }

Authentication/AuthenticationInterface.php

@@ -11,15 +11,13 @@
 
 namespace CKSource\Bundle\CKFinderBundle\Authentication;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-
 /**
  * Interface for the CKFinder authentication service.
  */
-interface AuthenticationInterface extends ContainerAwareInterface
+interface AuthenticationInterface
 {
     /**
      * @return bool `true` if the current user was successfully authenticated within CKFinder.
      */
-    public function authenticate();
+    public function authenticate(): bool;
 }

Command/CKFinderDownloadCommand.php

@@ -26,12 +26,12 @@
  */
 class CKFinderDownloadCommand extends Command
 {
-    const LATEST_VERSION = '3.6.1';
+    const LATEST_VERSION = '3.7.0';
 
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('ckfinder:download')
              ->setDescription('Downloads the CKFinder distribution package and extracts it to CKSourceCKFinderBundle.');
@@ -42,7 +42,7 @@ protected function configure()
      *
      * @return string
      */
-    protected function buildPackageUrl()
+    protected function buildPackageUrl(): string
     {
         $packageVersion = self::LATEST_VERSION;
 
@@ -52,7 +52,7 @@ protected function buildPackageUrl()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $targetPublicPath = realpath(__DIR__ . '/../Resources/public');
 

Config/Definition/VariableArrayNode.php

@@ -28,7 +28,7 @@ class VariableArrayNode extends VariableNode
      *
      * @var array
      */
-    protected $requiredKeys = array();
+    protected array $requiredKeys = array();
 
     /**
      * @param string             $name
@@ -44,7 +44,7 @@ public function __construct($name, NodeInterface $parent = null, array $required
     /**
      * {@inheritdoc}
      */
-    protected function validateType($value)
+    protected function validateType($value): void
     {
         if (!is_array($value)) {
             $ex = new InvalidTypeException(sprintf(

DependencyInjection/Configuration.php

@@ -24,15 +24,10 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
-        if (method_exists(TreeBuilder::class, 'getRootNode')) {
-            $treeBuilder = new TreeBuilder('ckfinder');
-            $rootNode = $treeBuilder->getRootNode();
-        } else {
-            $treeBuilder = new TreeBuilder();
-            $rootNode = $treeBuilder->root('ckfinder');
-        }
+        $treeBuilder = new TreeBuilder('ckfinder');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode->append($this->addConnectorNode());
 
@@ -46,13 +41,8 @@ public function getConfigTreeBuilder()
      */
     public function addConnectorNode()
     {
-        if (method_exists(TreeBuilder::class, 'getRootNode')) {
-            $treeBuilder = new TreeBuilder('connector');
-            $connectorNode = $treeBuilder->getRootNode();
-        } else {
-            $treeBuilder = new TreeBuilder();
-            $connectorNode = $treeBuilder->root('connector');
-        }
+        $treeBuilder = new TreeBuilder('connector');
+        $connectorNode = $treeBuilder->getRootNode();
 
         $connectorNode
             ->children()

Factory/ConnectorFactory.php

@@ -3,35 +3,32 @@
 namespace CKSource\Bundle\CKFinderBundle\Factory;
 
 use CKSource\Bundle\CKFinderBundle\Authentication\AuthenticationInterface;
-use CKSource\Bundle\CKFinderBundle\Polyfill\CommandResolver;
 use CKSource\CKFinder\CKFinder;
-use Symfony\Component\HttpKernel\HttpKernel;
-use Symfony\Component\HttpKernel\Kernel;
 
 class ConnectorFactory
 {
     /**
      * @var array
      */
-    protected $connectorConfig;
+    protected array $connectorConfig;
 
     /**
      * @var AuthenticationInterface
      */
-    protected $authenticationService;
+    protected AuthenticationInterface $authenticationService;
 
     /**
-     * @var CKFinder
+     * @var ?CKFinder
      */
-    protected $connectorInstance;
+    protected ?CKFinder $connectorInstance = null;
 
     /**
      * ConnectorFactory constructor.
      *
-     * @param $connectorConfig
-     * @param $authenticationService
+     * @param array $connectorConfig
+     * @param AuthenticationInterface $authenticationService
      */
-    public function __construct($connectorConfig, $authenticationService)
+    public function __construct(array $connectorConfig, AuthenticationInterface $authenticationService)
     {
         $this->connectorConfig = $connectorConfig;
         $this->authenticationService = $authenticationService;
@@ -40,7 +37,7 @@ public function __construct($connectorConfig, $authenticationService)
     /**
      * @return CKFinder
      */
-    public function getConnector()
+    public function getConnector(): CKFinder
     {
         if ($this->connectorInstance) {
             return $this->connectorInstance;
@@ -50,36 +47,8 @@ public function getConnector()
 
         $connector['authentication'] = $this->authenticationService;
 
-        if (Kernel::MAJOR_VERSION === 4) {
-            $this->setupForV4Kernel($connector);
-        }
-
         $this->connectorInstance = $connector;
 
         return $connector;
     }
-
-    /**
-     * Prepares the internal CKFinder's DI container to use the version 4+ of HttpKernel.
-     *
-     * @param \CKSource\CKFinder\CKFinder $ckfinder
-     */
-    protected function setupForV4Kernel($ckfinder)
-    {
-        $ckfinder['resolver'] = function () use ($ckfinder) {
-            $commandResolver = new CommandResolver($ckfinder);
-            $commandResolver->setCommandsNamespace(CKFinder::COMMANDS_NAMESPACE);
-            $commandResolver->setPluginsNamespace(CKFinder::PLUGINS_NAMESPACE);
-            return $commandResolver;
-        };
-
-        $ckfinder['kernel'] = function () use ($ckfinder) {
-            return new HttpKernel(
-                $ckfinder['dispatcher'],
-                $ckfinder['resolver'],
-                $ckfinder['request_stack'],
-                $ckfinder['resolver']
-            );
-        };
-    }
 }

Polyfill/CommandResolver.php

@@ -2,11 +2,18 @@
 
 namespace CKSource\Bundle\CKFinderBundle\Polyfill;
 
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 
 /**
  * Class CommandResolver
  *
  * @deprecated
  */
-class CommandResolver extends \CKSource\CKFinder\CommandResolver implements ArgumentResolverInterface {}
+class CommandResolver extends \CKSource\CKFinder\CommandResolver implements ArgumentResolverInterface {
+    public function getArguments(Request $request, callable $controller, ?\ReflectionFunctionAbstract $reflector = null): array
+    {
+        // TODO: Implement getArguments() method.
+        return [];
+    }
+}

Tests/Config/Definition/VariableArrayNodeTest.php

@@ -37,13 +37,8 @@ public function testNormalizeThrowsExceptionIfValueIsNotArray(): void
      */
     public function testMerge(): void
     {
-        if (method_exists(TreeBuilder::class, 'getRootNode')) {
-            $builder = new TreeBuilder('root');
-            $rootNode = $builder->getRootNode();
-        } else {
-            $builder = new TreeBuilder();
-            $rootNode = $builder->root('root');
-        }
+        $builder = new TreeBuilder('root');
+        $rootNode = $builder->getRootNode();
 
         $tree = $rootNode
                 ->children()

Tests/Fixtures/Authentication/CustomAuthentication.php

@@ -19,20 +19,27 @@
  */
 class CustomAuthentication implements AuthenticationInterface
 {
-    protected $authenticated = false;
+
+    /**
+     * @var ContainerInterface
+     */
+    protected ContainerInterface $container;
+
+
+    protected bool $authenticated = false;
 
     /**
      * @param bool $authenticated
      */
-    public function setAuthenticated($authenticated)
+    public function setAuthenticated(bool $authenticated): void
     {
-        $this->authenticated = (bool) $authenticated;
+        $this->authenticated = $authenticated;
     }
 
     /**
      * @return bool
      */
-    public function authenticate()
+    public function authenticate(): bool
     {
         return $this->authenticated;
     }
@@ -42,8 +49,9 @@ public function authenticate()
      *
      * @param ContainerInterface|null $container A ContainerInterface instance or null
      */
-    public function setContainer(ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null): void
     {
         // stub
+        $this->container = $container;
     }
 }