Merge remote-tracking branch 'origin/2.x'

sonata-project · Feb 3, 2020 · 637f4d0 · 637f4d0
2 parents 389b32d + 1fbdd8c
commit 637f4d0
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 37 deletions.
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -0,0 +1,30 @@
+# https://github.com/actions/stale
+
+name: "Stale"
+
+on:
+  schedule:
+    - cron: "0 9-18 * * *"
+
+jobs:
+  stale:
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: "Close stale issues and pull requests"
+        uses: "actions/stale@v1.1.0"
+        with:
+          days-before-close: 7
+          days-before-stale: 180
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          exempt-issue-label: "keep"
+          stale-issue-label: "pending author"
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. Thank you
+            for your contributions.
+          stale-pr-label: "pending author"
+          stale-pr-message: >
+            This PR has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. Thank you
+            for your contributions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,7 +33,7 @@ env:
     - SYMFONY_DEPRECATIONS_HELPER=max[self]=0
     - TARGET=test
     - UPSTREAM_URL=https://github.com/sonata-project/SonataSeoBundle.git
-    - PHPUNIT_VERSION=7
+    - PHPUNIT_VERSION=8
 
 matrix:
   fast_finish: true
@@ -45,9 +45,9 @@ matrix:
     - php: '7.2'
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: '7.3'
-      env: SYMFONY=3.4.*
+      env: SYMFONY=4.4.*
     - php: '7.3'
-      env: SYMFONY='dev-master as 3.4.x-dev'
+      env: SYMFONY='dev-master as 4.4.x-dev'
     - php: '7.3'
       env: SONATA_BLOCK=3.*
     - php: '7.3'
@@ -62,7 +62,7 @@ matrix:
     - php: 7.4snapshot
     - php: nightly
     - env: SYMFONY_DEPRECATIONS_HELPER=0
-    - env: SYMFONY='dev-master as 3.4.x-dev'
+    - env: SYMFONY='dev-master as 4.4.x-dev'
     - env: SONATA_BLOCK='dev-master as 3.x-dev'
     - env: SONATA_ADMIN='dev-master as 3.x-dev'
 

diff --git a/composer.json b/composer.json
@@ -24,14 +24,14 @@
         "psr/http-client": "^1.0",
         "psr/http-message": "^1.0",
         "sonata-project/exporter": "^1.11 || ^2.0",
-        "symfony/config": "^3.4 || ^4.2 || ^5.0",
-        "symfony/dependency-injection": "^3.4 || ^4.2 || ^5.0",
-        "symfony/form": "^3.4 || ^4.2 || ^5.0",
-        "symfony/framework-bundle": "^3.4 || ^4.2 || ^5.0",
-        "symfony/http-foundation": "^3.4 || ^4.2 || ^5.0",
-        "symfony/http-kernel": "^3.4 || ^4.2 || ^5.0",
-        "symfony/options-resolver": "^3.4 || ^4.2 || ^5.0",
-        "twig/twig": "^1.40 || ^2.9 || ^3.0"
+        "symfony/config": "^4.4 || ^5.0",
+        "symfony/dependency-injection": "^4.4 || ^5.0",
+        "symfony/form": "^4.4 || ^5.0",
+        "symfony/framework-bundle": "^4.4 || ^5.0",
+        "symfony/http-foundation": "^4.4 || ^5.0",
+        "symfony/http-kernel": "^4.4 || ^5.0",
+        "symfony/options-resolver": "^4.4 || ^5.0",
+        "twig/twig": "^2.9 || ^3.0"
     },
     "conflict": {
         "sonata-project/block-bundle": "<3.11"
@@ -40,14 +40,14 @@
         "guzzlehttp/guzzle": "^6.0",
         "nyholm/psr7": "^1.2",
         "sonata-project/admin-bundle": "^3.31",
-        "sonata-project/block-bundle": "^3.11",
+        "sonata-project/block-bundle": "^3.17",
         "sonata-project/core-bundle": "^3.9",
-        "symfony/console": "^3.4 || ^4.2 || ^5.0",
-        "symfony/filesystem": "^3.4 || ^4.2 || ^5.0",
-        "symfony/finder": "^3.4 || ^4.2 || ^5.0",
+        "symfony/console": "^4.4 || ^5.0",
+        "symfony/filesystem": "^4.4 || ^5.0",
+        "symfony/finder": "^4.4 || ^5.0",
         "symfony/http-client": "^4.4 || ^5.0",
-        "symfony/phpunit-bridge": "^4.1 || ^5.0",
-        "symfony/yaml": "^3.4 || ^4.2 || ^5.0"
+        "symfony/phpunit-bridge": "^4.4 || ^5.0",
+        "symfony/yaml": "^4.4 || ^5.0"
     },
     "suggest": {
         "knplabs/knp-menu-bundle": "Used by the BreadcrumbMenuBuilder",

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -25,13 +25,7 @@ final class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('sonata_seo');
-
-        // Keep compatibility with symfony/config < 4.2
-        if (!method_exists($treeBuilder, 'getRootNode')) {
-            $rootNode = $treeBuilder->root('sonata_seo');
-        } else {
-            $rootNode = $treeBuilder->getRootNode();
-        }
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()

diff --git a/tests/Block/Breadcrumb/BreadcrumbTest.php b/tests/Block/Breadcrumb/BreadcrumbTest.php
@@ -15,7 +15,7 @@
 
 use Knp\Menu\FactoryInterface;
 use Knp\Menu\Provider\MenuProviderInterface;
-use Sonata\BlockBundle\Test\AbstractBlockServiceTestCase;
+use Sonata\BlockBundle\Test\BlockServiceTestCase;
 use Sonata\SeoBundle\Block\Breadcrumb\BaseBreadcrumbMenuBlockService;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 
@@ -26,7 +26,7 @@ final class BreadcrumbMenuBlockService_Test extends BaseBreadcrumbMenuBlockServi
 /**
  * @author Sylvain Deloux <sylvain.deloux@ekino.com>
  */
-final class BreadcrumbTest extends AbstractBlockServiceTestCase
+final class BreadcrumbTest extends BlockServiceTestCase
 {
     public function testBlockService(): void
     {

diff --git a/tests/Block/Social/FacebookLikeBoxBlockServiceTest.php b/tests/Block/Social/FacebookLikeBoxBlockServiceTest.php
@@ -16,11 +16,11 @@
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\BlockBundle\Block\BlockContext;
 use Sonata\BlockBundle\Model\Block;
-use Sonata\BlockBundle\Test\AbstractBlockServiceTestCase;
+use Sonata\BlockBundle\Test\BlockServiceTestCase;
 use Sonata\BlockBundle\Util\OptionsResolver;
 use Sonata\SeoBundle\Block\Social\FacebookLikeBoxBlockService;
 
-final class FacebookLikeBoxBlockServiceTest extends AbstractBlockServiceTestCase
+final class FacebookLikeBoxBlockServiceTest extends BlockServiceTestCase
 {
     public function testService(): void
     {

diff --git a/tests/Block/Social/FacebookLikeButtonBlockServiceTest.php b/tests/Block/Social/FacebookLikeButtonBlockServiceTest.php
@@ -16,11 +16,11 @@
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\BlockBundle\Block\BlockContext;
 use Sonata\BlockBundle\Model\Block;
-use Sonata\BlockBundle\Test\AbstractBlockServiceTestCase;
+use Sonata\BlockBundle\Test\BlockServiceTestCase;
 use Sonata\BlockBundle\Util\OptionsResolver;
 use Sonata\SeoBundle\Block\Social\FacebookLikeButtonBlockService;
 
-final class FacebookLikeButtonBlockServiceTest extends AbstractBlockServiceTestCase
+final class FacebookLikeButtonBlockServiceTest extends BlockServiceTestCase
 {
     public function testService(): void
     {

diff --git a/tests/Block/Social/FacebookSendButtonBlockServiceTest.php b/tests/Block/Social/FacebookSendButtonBlockServiceTest.php
@@ -16,11 +16,11 @@
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\BlockBundle\Block\BlockContext;
 use Sonata\BlockBundle\Model\Block;
-use Sonata\BlockBundle\Test\AbstractBlockServiceTestCase;
+use Sonata\BlockBundle\Test\BlockServiceTestCase;
 use Sonata\BlockBundle\Util\OptionsResolver;
 use Sonata\SeoBundle\Block\Social\FacebookSendButtonBlockService;
 
-final class FacebookSendButtonBlockServiceTest extends AbstractBlockServiceTestCase
+final class FacebookSendButtonBlockServiceTest extends BlockServiceTestCase
 {
     public function testService(): void
     {

diff --git a/tests/Block/Social/FacebookShareButtonBlockServiceTest.php b/tests/Block/Social/FacebookShareButtonBlockServiceTest.php
@@ -16,11 +16,11 @@
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\BlockBundle\Block\BlockContext;
 use Sonata\BlockBundle\Model\Block;
-use Sonata\BlockBundle\Test\AbstractBlockServiceTestCase;
+use Sonata\BlockBundle\Test\BlockServiceTestCase;
 use Sonata\BlockBundle\Util\OptionsResolver;
 use Sonata\SeoBundle\Block\Social\FacebookShareButtonBlockService;
 
-final class FacebookShareButtonBlockServiceTest extends AbstractBlockServiceTestCase
+final class FacebookShareButtonBlockServiceTest extends BlockServiceTestCase
 {
     public function testService(): void
     {

diff --git a/tests/Block/Social/TwitterEmbedTweetBlockServiceTest.php b/tests/Block/Social/TwitterEmbedTweetBlockServiceTest.php
@@ -13,15 +13,15 @@
 
 namespace Sonata\SeoBundle\Tests\Block\Social;
 
-use Sonata\BlockBundle\Test\AbstractBlockServiceTestCase;
+use Sonata\BlockBundle\Test\BlockServiceTestCase;
 use Sonata\SeoBundle\Block\Social\TwitterEmbedTweetBlockService;
 use Sonata\SeoBundle\Tests\Fixtures\Block\TwitterEmbedTweetBSTest;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 
 /**
  * @author Hugo Briand <briand@ekino.com>
  */
-final class TwitterEmbedTweetBlockServiceTest extends AbstractBlockServiceTestCase
+final class TwitterEmbedTweetBlockServiceTest extends BlockServiceTestCase
 {
     public function testBuildUri(): void
     {