Merge pull request #89 from abame/symfony-seven-compatibility

Symfony 7.0 compatibility
eko · Dec 29, 2023 · f57ad60 · f57ad60
2 parents e39da78 + 538cd2a
commit f57ad60
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 28 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -29,6 +29,7 @@ jobs:
           - "4.4.x"
           - "5.4.x"
           - "6.0.x"
+          - "7.0.x"
         dependencies:
           - "highest"
         include:

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -25,9 +25,9 @@ class Configuration implements ConfigurationInterface
     /**
      * Builds configuration tree.
      *
-     * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder A tree builder instance
+     * @return TreeBuilder A tree builder instance
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('eko_feed');
 

diff --git a/EkoFeedBundle.php b/EkoFeedBundle.php
@@ -27,7 +27,7 @@ class EkoFeedBundle extends Bundle
     /**
      * {@inheritdoc}
      */
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 

diff --git a/Feed/FeedManager.php b/Feed/FeedManager.php
@@ -10,7 +10,6 @@
 
 namespace Eko\FeedBundle\Feed;
 
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\Routing\RouterInterface;
 
 /**
@@ -22,8 +21,6 @@
  */
 class FeedManager
 {
-    use ContainerAwareTrait;
-
     /**
      * @var array
      */

diff --git a/composer.json b/composer.json
@@ -13,16 +13,16 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "symfony/framework-bundle": "^4.4|^5.3|^6.0",
-        "symfony/translation": "^4.4|^5.3|^6.0",
+        "symfony/framework-bundle": "^4.4|^5.3|^6.0|^7.0",
+        "symfony/translation": "^4.4|^5.3|^6.0|^7.0",
         "laminas/laminas-feed": "^2.4"
     },
     "require-dev": {
-        "doctrine/orm": "^2.7",
-        "phpunit/phpunit": "^8.5 || ^9.5"
+        "doctrine/orm": "^2.17",
+        "phpunit/phpunit": "^8.5 || ^9.5 || ^10.5"
     },
     "suggest": {
-        "doctrine/orm": "~2.7"
+        "doctrine/orm": "~2.17"
     },
     "autoload": {
         "psr-4": { "Eko\\FeedBundle\\": "" }

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit colors="true" bootstrap="Tests/bootstrap.php">
-    <testsuites>
-        <testsuite name="FeedBundle Tests">
-            <directory suffix="Test.php">./Tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="Tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <testsuites>
+    <testsuite name="FeedBundle Tests">
+      <directory suffix="Test.php">./Tests</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </source>
 </phpunit>