Fix Symfony 6 strict compatibility

Author: curry684

.travis.yml

@@ -15,9 +15,9 @@ env:
     - SYMFONY_VERSION=""
 
 php:
-  - 7.2
-  - 7.3
   - 7.4
+  - 8.0
+  - 8.1
 
 services:
   - mongodb
@@ -26,28 +26,28 @@ matrix:
     fast_finish: true
     include:
      # no flag build with code coverage:
-     - php: 7.4
+     - php: 8.1
        env: ENABLE_CODE_COVERAGE="yes"
      # --ignore-platform-reqs for ruflin/elastica:6 which doesn't support PHP8
      - php: 8.0
        env: COMPOSER_FLAGS="--ignore-platform-reqs"
      - php: nightly
        env: COMPOSER_FLAGS="--ignore-platform-reqs"
      # normal build
-     - php: 7.2
+     - php: 7.4
        env:
          - COMPOSER_FLAGS="--prefer-lowest"
          - SYMFONY_DEPRECATIONS_HELPER=weak
      - php: 7.4
        env:
-         - SYMFONY_VERSION=^4.4
+         - SYMFONY_VERSION=^5.4
          - SYMFONY_DEPRECATIONS_HELPER=weak
-     - php: 8.0snapshot
+     - php: 8.2snapshot
        env:
          - DEPENDENCIES=dev
          - COMPOSER_FLAGS="--ignore-platform-reqs"
     allow_failures:
-     - php: 8.0snapshot
+     - php: 8.2snapshot
 
 before_install:
   - if [ "$DEPENDENCIES" != "" ]; then composer config minimum-stability ${DEPENDENCIES}; fi;

composer.json

@@ -20,12 +20,12 @@
       "issues": "https://github.com/omines/datatables-bundle/issues"
     },
     "require": {
-        "php": ">=7.2",
-        "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
-        "symfony/framework-bundle": "^4.4|^5.0|^6.0",
-        "symfony/options-resolver": "^4.4|^5.0|^6.0",
-        "symfony/property-access": "^4.4|^5.0|^6.0",
-        "symfony/translation": "^4.4|^5.0|^6.0"
+        "php": ">=8.0",
+        "symfony/event-dispatcher": "^5.4|^6.0",
+        "symfony/framework-bundle": "^5.4|^6.0",
+        "symfony/options-resolver": "^5.4|^6.0",
+        "symfony/property-access": "^5.4|^6.0",
+        "symfony/translation": "^5.4|^6.0"
     },
     "require-dev": {
         "ext-curl": "*",
@@ -41,15 +41,15 @@
         "ocramius/package-versions": "^1.4",
         "phpoffice/phpspreadsheet": "^1.6",
         "ruflin/elastica": "^6.0|^7.0",
-        "symfony/browser-kit": "^4.4|^5.0|^6.0",
-        "symfony/css-selector": "^4.4|^5.0|^6.0",
-        "symfony/dom-crawler": "^4.4|^5.0|^6.0",
-        "symfony/intl": "^4.4|^5.0|^6.0",
-        "symfony/mime": "^4.4|^5.0|^6.0",
-        "symfony/phpunit-bridge": "^4.4|^5.0|^6.0",
-        "symfony/twig-bundle": "^4.4|^5.0|^6.0",
-        "symfony/var-dumper": "^4.4|^5.0|^6.0",
-        "symfony/yaml": "^4.4|^5.0|^6.0"
+        "symfony/browser-kit": "^5.4|^6.0",
+        "symfony/css-selector": "^5.4|^6.0",
+        "symfony/dom-crawler": "^5.4|^6.0",
+        "symfony/intl": "^5.4|^6.0",
+        "symfony/mime": "^5.4|^6.0",
+        "symfony/phpunit-bridge": "^5.4|^6.0",
+        "symfony/twig-bundle": "^5.4|^6.0",
+        "symfony/var-dumper": "^5.4|^6.0",
+        "symfony/yaml": "^5.4|^6.0"
     },
     "suggest": {
         "doctrine/doctrine-bundle": "For integrated access to Doctrine object managers",
@@ -71,7 +71,7 @@
     },
     "extra": {
         "branch-alias": {
-          "dev-master": "0.5-dev"
+          "dev-master": "0.6-dev"
         }
     }
 }

src/DataTablesBundle.php

@@ -15,6 +15,7 @@
 use Omines\DataTablesBundle\DependencyInjection\Compiler\LocatorRegistrationPass;
 use Omines\DataTablesBundle\DependencyInjection\DataTablesExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
@@ -37,7 +38,7 @@ public function build(ContainerBuilder $container)
     /**
      * {@inheritdoc}
      */
-    public function getContainerExtension()
+    public function getContainerExtension(): ?ExtensionInterface
     {
         return new DataTablesExtension();
     }

src/DependencyInjection/DataTablesExtension.php

@@ -60,10 +60,7 @@ public function load(array $configs, ContainerBuilder $container)
             ->addTag('datatables.exporter');
     }
 
-    /**
-     * @return string
-     */
-    public function getAlias()
+    public function getAlias(): string
     {
         // Default would underscore the camelcase unintuitively
         return 'datatables';

tests/Fixtures/AppKernel.php

@@ -22,7 +22,7 @@
  */
 class AppKernel extends Kernel
 {
-    public function registerBundles()
+    public function registerBundles(): array
     {
         return [
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
@@ -38,12 +38,12 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(__DIR__ . '/config.yml');
     }
 
-    public function getRootDir()
+    public function getRootDir(): string
     {
         return __DIR__ . '/../../tmp';
     }
 
-    public function getProjectDir()
+    public function getProjectDir(): string
     {
         return __DIR__;
     }

tests/Functional/FunctionalTest.php

@@ -229,7 +229,7 @@ private function assertSuccessful(Response $response)
         }
     }
 
-    protected static function getKernelClass()
+    protected static function getKernelClass(): string
     {
         return AppKernel::class;
     }