Merge 3.x into master

sonata-project · Aug 29, 2020 · 020fa6e · 020fa6e
2 parents 4d1ddde + 294de93
commit 020fa6e
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 111 deletions.
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -2,64 +2,64 @@
 #
 # It's auto-generated by sonata-project/dev-kit package.
 
-on:
-    push:
-        paths:
-            - 'docs/**'
-
-    pull_request:
-        paths:
-            - 'docs/**'
-
 name: Documentation
 
+on:
+  push:
+    branches:
+      - master
+      - 3.x
+  pull_request:
+    paths:
+      - 'docs/**'
+
 jobs:
-    build:
-        name: Build
+  build:
+    name: Build
+
+    runs-on: ubuntu-latest
 
-        runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-        steps:
-            - name: "Checkout"
-              uses: actions/checkout@v2
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: '3.7'
 
-            - name: "Set up Python 3.7"
-              uses: actions/setup-python@v1
-              with:
-                  python-version: '3.7' # Semantic version range syntax or exact version of a Python version
+      - name: Display Python version
+        run: python -c "import sys; print(sys.version)"
 
-            - name: "Display Python version"
-              run: python -c "import sys; print(sys.version)"
+      - name: Install Sphinx dependencies
+        run: sudo apt-get install python-dev build-essential
 
-            - name: "Install Sphinx dependencies"
-              run: sudo apt-get install python-dev build-essential
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
 
-            - name: "Cache pip"
-              uses: actions/cache@v2
-              with:
-                  path: ~/.cache/pip
-                  key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
-                  restore-keys: |
-                      ${{ runner.os }}-pip-
+          key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
+          restore-keys: ${{ runner.os }}-pip-
 
-            - name: "Install custom requirements via pip"
-              run: pip install -r docs/requirements.txt
+      - name: Install custom requirements via pip
+        run: pip install -r docs/requirements.txt
 
-            - name: "Build documentation"
-              run: make docs
+      - name: Build documentation
+        run: make docs
 
-    doctor-rst:
-        name: DOCtor-RST
+  doctor-rst:
+    name: DOCtor-RST
 
-        runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
 
-        steps:
-            - name: "Checkout"
-              uses: actions/checkout@v2
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-            - name: "Run DOCtor-RST"
-              uses: docker://oskarstark/doctor-rst
-              with:
-                  args: --short
-              env:
-                  DOCS_DIR: 'docs/'
+      - name: Run DOCtor-RST
+        uses: docker://oskarstark/doctor-rst
+        with:
+          args: --short
+        env:
+          DOCS_DIR: 'docs/'
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -2,68 +2,75 @@
 #
 # It's auto-generated by sonata-project/dev-kit package.
 
-on: [push, pull_request]
-
 name: Lint
 
+on:
+  push:
+    branches:
+      - master
+      - 3.x
+  pull_request:
+
 jobs:
-    php-cs-fixer:
-        name: PHP-CS-Fixer
+  php-cs-fixer:
+    name: PHP-CS-Fixer
 
-        runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
 
-        steps:
-            - name: "Checkout"
-              uses: actions/checkout@v2
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-            - name: "Run PHP-CS-Fixer"
-              uses: docker://oskarstark/php-cs-fixer-ga:2.16.4
-              with:
-                  args: --ansi --verbose --diff --dry-run
+      - name: Run PHP-CS-Fixer
+        uses: docker://oskarstark/php-cs-fixer-ga:2.16.4
+        with:
+          args: --ansi --verbose --diff --dry-run
 
-    composer-normalize:
-        name: composer-normalize
+  composer-normalize:
+    name: composer-normalize
 
-        runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
 
-        steps:
-            - name: "Checkout"
-              uses: actions/checkout@v2
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-            - name: "Run composer-normalize"
-              uses: docker://ergebnis/composer-normalize-action:0.8.0
-              with:
-                  args: --dry-run
+      - name: Run composer-normalize
+        uses: docker://ergebnis/composer-normalize-action:0.8.0
+        with:
+          args: --dry-run
 
-    yaml-files:
-        name: YAML files
+  yaml-files:
+    name: YAML files
 
-        runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
 
-        steps:
-            - name: "Checkout"
-              uses: actions/checkout@v2
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-            - name: "Install Ruby 2.6"
-              uses: actions/setup-ruby@v1
-              with:
-                  ruby-version: '2.6'
+      - name: Install Ruby 2.6
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: '2.6'
 
-            - run: gem install yaml-lint
+      - name: Install required gem
+        run: gem install yaml-lint
 
-            - name: "Linting..."
-              run: make lint-yaml
+      - name: Lint files
+        run: make lint-yaml
 
-    xml-files:
-        name: XML files
+  xml-files:
+    name: XML files
 
-        runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
 
-        steps:
-            - name: "Checkout"
-              uses: actions/checkout@v2
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-            - run: sudo apt-get update && sudo apt-get install libxml2-utils
+      - name: Install required dependencies
+        run: sudo apt-get update && sudo apt-get install libxml2-utils
 
-            - name: "Linting..."
-              run: make lint-xml
+      - name: Lint files
+        run: make lint-xml
diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
@@ -4,32 +4,30 @@
 
 # https://github.com/actions/stale
 
-name: "Stale"
+name: Stale
 
 on:
   schedule:
     - cron: "0 9-18 * * *"
 
 jobs:
   stale:
-    runs-on: "ubuntu-latest"
+    runs-on: ubuntu-latest
 
     steps:
-      - name: "Close stale issues and pull requests"
-
-        uses: "actions/stale@v1.1.0"
-
+      - 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: "stale"
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          exempt-issue-label: keep
+          stale-issue-label: stale
           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: "stale"
+          stale-pr-label: stale
           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

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -9,9 +9,7 @@ on:
     branches:
       - master
       - 3.x
-
   pull_request:
-    paths: ['**.php', '**.yml', '**.yaml', '**.xml', '**.twig', '**.js', '**.css', '**.json']
 
 jobs:
   test:

diff --git a/README.md b/README.md
@@ -16,10 +16,10 @@ Symfony SonataNotificationBundle
 [![Monthly Downloads](https://poser.pugx.org/sonata-project/notification-bundle/d/monthly)](https://packagist.org/packages/sonata-project/notification-bundle)
 [![Daily Downloads](https://poser.pugx.org/sonata-project/notification-bundle/d/daily)](https://packagist.org/packages/sonata-project/notification-bundle)
 
-Branch | Travis | Coveralls | Scrutinizer |
------- | ------ | --------- | ----------- |
-3.x   | [![Build Status][travis_stable_badge]][travis_stable_link]     | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link]     | [![Scrutinizer Status][scrutinizer_stable_badge]][scrutinizer_stable_link] |
-master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] | [![Scrutinizer Status][scrutinizer_unstable_badge]][scrutinizer_unstable_link] |
+Branch | Travis | Coveralls |
+------ | ------ | --------- |
+3.x   | [![Build Status][travis_stable_badge]][travis_stable_link]     | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link]     |
+master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
 
 ## Documentation
 
@@ -45,8 +45,3 @@ This package is available under the [MIT license](LICENSE).
 [coveralls_stable_link]: https://coveralls.io/github/sonata-project/SonataNotificationBundle?branch=3.x
 [coveralls_unstable_badge]: https://coveralls.io/repos/github/sonata-project/SonataNotificationBundle/badge.svg?branch=master
 [coveralls_unstable_link]: https://coveralls.io/github/sonata-project/SonataNotificationBundle?branch=master
-
-[scrutinizer_stable_badge]: https://scrutinizer-ci.com/g/sonata-project/SonataNotificationBundle/badges/quality-score.png?b=3.x
-[scrutinizer_stable_link]: https://scrutinizer-ci.com/g/sonata-project/SonataNotificationBundle/?branch=3.x
-[scrutinizer_unstable_badge]: https://scrutinizer-ci.com/g/sonata-project/SonataNotificationBundle/badges/quality-score.png?b=master
-[scrutinizer_unstable_link]: https://scrutinizer-ci.com/g/sonata-project/SonataNotificationBundle/?branch=master