From 2b104a94f8b4ec4cf1f35ad0778a7e030b407c26 Mon Sep 17 00:00:00 2001
From: SonataCI <thomas+ci@sonata-project.org>
Date: Wed, 19 Dec 2018 02:08:19 +0100
Subject: [PATCH 1/8] DevKit updates

---
 .github/ISSUE_TEMPLATE/Bug.md     |  1 +
 .github/ISSUE_TEMPLATE/Feature.md |  1 +
 .travis.yml                       | 17 +++++++++--------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/Bug.md b/.github/ISSUE_TEMPLATE/Bug.md
index 4f6341e3..3b3a6f00 100644
--- a/.github/ISSUE_TEMPLATE/Bug.md
+++ b/.github/ISSUE_TEMPLATE/Bug.md
@@ -1,6 +1,7 @@
 ---
 name: 🐞 Bug Report
 about: Something is broken? 🔨
+labels: bug, unconfirmed
 ---
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/Feature.md b/.github/ISSUE_TEMPLATE/Feature.md
index ccf89ffa..5693087f 100644
--- a/.github/ISSUE_TEMPLATE/Feature.md
+++ b/.github/ISSUE_TEMPLATE/Feature.md
@@ -1,6 +1,7 @@
 ---
 name: 🚀 Feature Request
 about: I have a suggestion (and may want to implement it 🙂)!
+labels: feature
 ---
 
 ## Feature Request
diff --git a/.travis.yml b/.travis.yml
index 41b5bb1a..b2ee6311 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ php:
   - '7.0'
   - '7.1'
   - '7.2'
+  - '7.3'
   - nightly
 
 sudo: false
@@ -35,26 +36,26 @@ env:
     - SYMFONY_DEPRECATIONS_HELPER=weak_vendors
     - TARGET=test
     - UPSTREAM_URL=https://github.com/sonata-project/SonataNotificationBundle.git
-    - PHPUNIT_VERSION=5.7
+    - PHPUNIT_VERSION=5.7.26
 
 matrix:
   fast_finish: true
   include:
-    - php: '7.2'
+    - php: '7.3'
       env: TARGET=docs
-    - php: '7.2'
+    - php: '7.3'
       env: TARGET=lint
     - php: '5.6'
       env: COMPOSER_FLAGS="--prefer-lowest"
-    - php: '7.2'
+    - php: '7.3'
       env: SYMFONY=3.4.*
-    - php: '7.2'
+    - php: '7.3'
       env: SYMFONY='dev-master as 3.4.x-dev'
-    - php: '7.2'
+    - php: '7.3'
       env: SONATA_CORE=3.*
-    - php: '7.2'
+    - php: '7.3'
       env: SONATA_CORE='dev-master as 3.x-dev'
-    - php: '7.2'
+    - php: '7.3'
       env: SYMFONY_DEPRECATIONS_HELPER=0
   allow_failures:
     - php: nightly

From 5496d16e0fb4248198ab57c1c229aff3b79870eb Mon Sep 17 00:00:00 2001
From: SonataCI <thomas+ci@sonata-project.org>
Date: Wed, 9 Jan 2019 02:07:35 +0100
Subject: [PATCH 2/8] DevKit updates

---
 .php_cs.dist        | 6 ++++++
 .travis.yml         | 6 ++----
 tests/bootstrap.php | 2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index 3873ae58..658e2c8b 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -36,6 +36,12 @@ $rules = [
     '@PHP56Migration' => true,
     '@PHP56Migration:risky' => true,
     '@PHPUnit57Migration:risky' => true,
+    '@PHP70Migration' => true,
+    '@PHP70Migration:risky' => true,
+    '@PHPUnit60Migration:risky' => true,
+    '@PHP71Migration' => true,
+    '@PHP71Migration:risky' => true,
+    'compact_nullable_typehint' => true,
     // To be tested before insertion:
 //    'strict_comparison' => true,
 //    'strict_param' => true,
diff --git a/.travis.yml b/.travis.yml
index b2ee6311..0a328831 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,6 @@ branches:
 language: php
 
 php:
-  - '5.6'
-  - '7.0'
   - '7.1'
   - '7.2'
   - '7.3'
@@ -36,7 +34,7 @@ env:
     - SYMFONY_DEPRECATIONS_HELPER=weak_vendors
     - TARGET=test
     - UPSTREAM_URL=https://github.com/sonata-project/SonataNotificationBundle.git
-    - PHPUNIT_VERSION=5.7.26
+    - PHPUNIT_VERSION=7
 
 matrix:
   fast_finish: true
@@ -45,7 +43,7 @@ matrix:
       env: TARGET=docs
     - php: '7.3'
       env: TARGET=lint
-    - php: '5.6'
+    - php: '7.1'
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: '7.3'
       env: SYMFONY=3.4.*
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index f31b24fe..2f104d78 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *

From 75263a5b7b04a1a449722d1200fd5af1b28d2338 Mon Sep 17 00:00:00 2001
From: SonataCI <thomas+ci@sonata-project.org>
Date: Thu, 10 Jan 2019 02:07:37 +0100
Subject: [PATCH 3/8] DevKit updates

---
 .php_cs.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.php_cs.dist b/.php_cs.dist
index 658e2c8b..c4875241 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -42,6 +42,7 @@ $rules = [
     '@PHP71Migration' => true,
     '@PHP71Migration:risky' => true,
     'compact_nullable_typehint' => true,
+    'void_return' => null,
     // To be tested before insertion:
 //    'strict_comparison' => true,
 //    'strict_param' => true,

From 9ffcfca02bd2e7c61ff7511786c5b4f84a121efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Thu, 10 Jan 2019 23:21:21 +0100
Subject: [PATCH 4/8] Drop old versions of php

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ecfc2df2..aeab39dd 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.1",
         "sonata-project/core-bundle": "^3.9",
         "sonata-project/datagrid-bundle": "^2.3",
         "sonata-project/doctrine-extensions": "^1.0",

From 4eb9268e48c47c5b932e9cd73a4a2cf264f0ce5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Thu, 10 Jan 2019 23:21:42 +0100
Subject: [PATCH 5/8] Use recent version the phpunit bridge

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index aeab39dd..d5605c46 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
         "nelmio/api-doc-bundle": "^2.4",
         "sonata-project/doctrine-orm-admin-bundle": "^3.4",
         "swiftmailer/swiftmailer": "^5.0 || ^6.0",
-        "symfony/phpunit-bridge": "^4.0"
+        "symfony/phpunit-bridge": "^4.2"
     },
     "suggest": {
         "guzzlehttp/guzzle": "If you want to get a status report when using the rabbitMQ backend.",

From 57b478a3de18b6e8b25f3507eb26fb335ce2c4d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Thu, 10 Jan 2019 23:22:12 +0100
Subject: [PATCH 6/8] Apply php 7 cs-fixer rules

---
 src/Admin/MessageAdmin.php                       |  2 ++
 src/Backend/AMQPBackend.php                      | 12 +++++++-----
 src/Backend/AMQPBackendDispatcher.php            |  2 ++
 src/Backend/BackendHealthCheck.php               |  2 ++
 src/Backend/BackendInterface.php                 |  2 ++
 src/Backend/MessageManagerBackend.php            |  2 ++
 src/Backend/MessageManagerBackendDispatcher.php  |  2 ++
 src/Backend/PostponeRuntimeBackend.php           |  2 ++
 src/Backend/QueueBackendDispatcher.php           |  2 ++
 src/Backend/QueueDispatcherInterface.php         |  2 ++
 src/Backend/RuntimeBackend.php                   |  2 ++
 src/Command/CleanupCommand.php                   |  2 ++
 src/Command/ConsumerHandlerCommand.php           |  2 ++
 src/Command/CreateAndPublishCommand.php          |  2 ++
 src/Command/ListHandlerCommand.php               |  2 ++
 src/Command/ListQueuesCommand.php                |  2 ++
 src/Command/RestartCommand.php                   |  2 ++
 src/Consumer/ConsumerEvent.php                   |  2 ++
 src/Consumer/ConsumerEventInterface.php          |  2 ++
 src/Consumer/ConsumerInterface.php               |  2 ++
 src/Consumer/ConsumerReturnInfo.php              |  2 ++
 src/Consumer/LoggerConsumer.php                  |  2 ++
 src/Consumer/Metadata.php                        |  2 ++
 src/Consumer/SwiftMailerConsumer.php             |  2 ++
 src/Controller/Api/MessageController.php         |  2 ++
 src/Controller/MessageAdminController.php        |  2 ++
 .../Compiler/NotificationCompilerPass.php        |  4 +++-
 src/DependencyInjection/Configuration.php        |  6 ++++--
 .../SonataNotificationExtension.php              |  2 ++
 src/Entity/BaseMessage.php                       |  2 ++
 src/Entity/MessageManager.php                    |  2 ++
 src/Event/DoctrineBackendOptimizeListener.php    |  2 ++
 src/Event/DoctrineOptimizeListener.php           |  2 ++
 src/Event/IterateEvent.php                       |  4 +++-
 src/Event/IterationListener.php                  |  2 ++
 src/Exception/BackendNotFoundException.php       |  2 ++
 src/Exception/HandlingException.php              |  2 ++
 src/Exception/InvalidParameterException.php      |  2 ++
 src/Form/Type/MessageSerializationType.php       |  2 ++
 src/Iterator/AMQPMessageIterator.php             |  2 ++
 src/Iterator/ErroneousMessageIterator.php        |  2 ++
 src/Iterator/IteratorProxyMessageIterator.php    |  2 ++
 src/Iterator/MessageIteratorInterface.php        |  2 ++
 src/Iterator/MessageManagerMessageIterator.php   |  2 ++
 src/Model/Message.php                            |  2 ++
 src/Model/MessageInterface.php                   | 12 +++++++-----
 src/Model/MessageManagerInterface.php            |  2 ++
 src/Selector/ErroneousMessagesSelector.php       |  2 ++
 src/SonataNotificationBundle.php                 |  2 ++
 tests/Backend/AMQPBackendDispatcherTest.php      |  2 ++
 tests/Backend/AMQPBackendTest.php                | 16 +++++++++-------
 tests/Backend/BackendHealthCheckTest.php         |  2 ++
 .../MessageManagerBackendDispatcherTest.php      |  2 ++
 tests/Backend/MessageManagerBackendTest.php      |  2 ++
 tests/Backend/PostponeRuntimeBackendTest.php     |  2 ++
 tests/Backend/RuntimeBackendTest.php             |  2 ++
 tests/Consumer/LoggerConsumerTest.php            |  2 ++
 tests/Consumer/SwiftMailerConsumerTest.php       |  2 ++
 tests/Controller/Api/MessageControllerTest.php   |  2 ++
 .../SonataNotificationExtensionTest.php          |  2 ++
 tests/Entity/Message.php                         |  2 ++
 tests/Entity/MessageManagerMock.php              |  2 ++
 tests/Entity/MessageManagerTest.php              |  2 ++
 tests/Entity/MessageTest.php                     |  2 ++
 tests/Event/DoctrineOptimizeListenerTest.php     |  2 ++
 .../Exception/InvalidParameterExceptionTest.php  |  2 ++
 tests/Iterator/AMQPMessageIteratorTest.php       |  2 ++
 .../IteratorProxyMessageIteratorTest.php         |  2 ++
 tests/Iterator/MessageManagerMessageIterator.php |  2 ++
 .../MessageManagerMessageIteratorTest.php        |  2 ++
 tests/Mock/AmqpConnectionFactoryStub.php         |  2 ++
 71 files changed, 163 insertions(+), 21 deletions(-)

diff --git a/src/Admin/MessageAdmin.php b/src/Admin/MessageAdmin.php
index 81fc6e1c..99cd4345 100644
--- a/src/Admin/MessageAdmin.php
+++ b/src/Admin/MessageAdmin.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Backend/AMQPBackend.php b/src/Backend/AMQPBackend.php
index 24bb40e1..8bcf9e4c 100644
--- a/src/Backend/AMQPBackend.php
+++ b/src/Backend/AMQPBackend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -58,22 +60,22 @@ class AMQPBackend implements BackendInterface
     protected $recover;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     protected $deadLetterExchange;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     protected $deadLetterRoutingKey;
 
     /**
-     * @var null|int
+     * @var int|null
      */
     protected $ttl;
 
     /**
-     * @var null|int
+     * @var int|null
      */
     private $prefetchCount;
 
@@ -89,7 +91,7 @@ class AMQPBackend implements BackendInterface
      * @param string   $key
      * @param string   $deadLetterExchange
      * @param string   $deadLetterRoutingKey
-     * @param null|int $ttl
+     * @param int|null $ttl
      */
     public function __construct($exchange, $queue, $recover, $key, $deadLetterExchange = null, $deadLetterRoutingKey = null, $ttl = null, $prefetchCount = null)
     {
diff --git a/src/Backend/AMQPBackendDispatcher.php b/src/Backend/AMQPBackendDispatcher.php
index 5d5200bd..da9afe62 100644
--- a/src/Backend/AMQPBackendDispatcher.php
+++ b/src/Backend/AMQPBackendDispatcher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Backend/BackendHealthCheck.php b/src/Backend/BackendHealthCheck.php
index 3931f50f..ab2743d6 100644
--- a/src/Backend/BackendHealthCheck.php
+++ b/src/Backend/BackendHealthCheck.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Backend/BackendInterface.php b/src/Backend/BackendInterface.php
index 66e1e6ea..cb09b408 100644
--- a/src/Backend/BackendInterface.php
+++ b/src/Backend/BackendInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Backend/MessageManagerBackend.php b/src/Backend/MessageManagerBackend.php
index 0461d083..d5c04785 100644
--- a/src/Backend/MessageManagerBackend.php
+++ b/src/Backend/MessageManagerBackend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Backend/MessageManagerBackendDispatcher.php b/src/Backend/MessageManagerBackendDispatcher.php
index c1fffb0c..f3fba603 100644
--- a/src/Backend/MessageManagerBackendDispatcher.php
+++ b/src/Backend/MessageManagerBackendDispatcher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Backend/PostponeRuntimeBackend.php b/src/Backend/PostponeRuntimeBackend.php
index 92ad1fbb..a27f5378 100644
--- a/src/Backend/PostponeRuntimeBackend.php
+++ b/src/Backend/PostponeRuntimeBackend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Backend/QueueBackendDispatcher.php b/src/Backend/QueueBackendDispatcher.php
index fa80ae91..c2f9079b 100644
--- a/src/Backend/QueueBackendDispatcher.php
+++ b/src/Backend/QueueBackendDispatcher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Backend/QueueDispatcherInterface.php b/src/Backend/QueueDispatcherInterface.php
index 4be17066..d760da46 100644
--- a/src/Backend/QueueDispatcherInterface.php
+++ b/src/Backend/QueueDispatcherInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Backend/RuntimeBackend.php b/src/Backend/RuntimeBackend.php
index ad78f3a1..fefd6c6d 100644
--- a/src/Backend/RuntimeBackend.php
+++ b/src/Backend/RuntimeBackend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Command/CleanupCommand.php b/src/Command/CleanupCommand.php
index 66a45600..c8e799ff 100644
--- a/src/Command/CleanupCommand.php
+++ b/src/Command/CleanupCommand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Command/ConsumerHandlerCommand.php b/src/Command/ConsumerHandlerCommand.php
index 00ebe7ee..41a8bbca 100644
--- a/src/Command/ConsumerHandlerCommand.php
+++ b/src/Command/ConsumerHandlerCommand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Command/CreateAndPublishCommand.php b/src/Command/CreateAndPublishCommand.php
index cb3aea3e..4b0d35e9 100644
--- a/src/Command/CreateAndPublishCommand.php
+++ b/src/Command/CreateAndPublishCommand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Command/ListHandlerCommand.php b/src/Command/ListHandlerCommand.php
index 4d3a2d9d..e76e36ad 100644
--- a/src/Command/ListHandlerCommand.php
+++ b/src/Command/ListHandlerCommand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Command/ListQueuesCommand.php b/src/Command/ListQueuesCommand.php
index 596ac1ce..c72c1b62 100644
--- a/src/Command/ListQueuesCommand.php
+++ b/src/Command/ListQueuesCommand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Command/RestartCommand.php b/src/Command/RestartCommand.php
index 880dfb33..59030788 100644
--- a/src/Command/RestartCommand.php
+++ b/src/Command/RestartCommand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Consumer/ConsumerEvent.php b/src/Consumer/ConsumerEvent.php
index b83cad70..c51a9a2e 100644
--- a/src/Consumer/ConsumerEvent.php
+++ b/src/Consumer/ConsumerEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Consumer/ConsumerEventInterface.php b/src/Consumer/ConsumerEventInterface.php
index ae797a8c..20fbd601 100644
--- a/src/Consumer/ConsumerEventInterface.php
+++ b/src/Consumer/ConsumerEventInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Consumer/ConsumerInterface.php b/src/Consumer/ConsumerInterface.php
index 1e0cc446..6435c063 100644
--- a/src/Consumer/ConsumerInterface.php
+++ b/src/Consumer/ConsumerInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Consumer/ConsumerReturnInfo.php b/src/Consumer/ConsumerReturnInfo.php
index fbb05e34..7ea4bd6b 100644
--- a/src/Consumer/ConsumerReturnInfo.php
+++ b/src/Consumer/ConsumerReturnInfo.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Consumer/LoggerConsumer.php b/src/Consumer/LoggerConsumer.php
index 94373523..576132cb 100644
--- a/src/Consumer/LoggerConsumer.php
+++ b/src/Consumer/LoggerConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Consumer/Metadata.php b/src/Consumer/Metadata.php
index a4e9739b..3b0b880f 100644
--- a/src/Consumer/Metadata.php
+++ b/src/Consumer/Metadata.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Consumer/SwiftMailerConsumer.php b/src/Consumer/SwiftMailerConsumer.php
index 1b62293c..ea1e28e6 100644
--- a/src/Consumer/SwiftMailerConsumer.php
+++ b/src/Consumer/SwiftMailerConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Controller/Api/MessageController.php b/src/Controller/Api/MessageController.php
index 0d61bb60..eddb2ec9 100644
--- a/src/Controller/Api/MessageController.php
+++ b/src/Controller/Api/MessageController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Controller/MessageAdminController.php b/src/Controller/MessageAdminController.php
index b4364afe..9bac2e64 100644
--- a/src/Controller/MessageAdminController.php
+++ b/src/Controller/MessageAdminController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/DependencyInjection/Compiler/NotificationCompilerPass.php b/src/DependencyInjection/Compiler/NotificationCompilerPass.php
index 7bd93d5f..017f91b7 100644
--- a/src/DependencyInjection/Compiler/NotificationCompilerPass.php
+++ b/src/DependencyInjection/Compiler/NotificationCompilerPass.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -38,7 +40,7 @@ public function process(ContainerBuilder $container)
             $container->getDefinition($id)->setPublic(true);
 
             foreach ($events as $event) {
-                $priority = isset($event['priority']) ? $event['priority'] : 0;
+                $priority = $event['priority'] ?? 0;
 
                 if (!isset($event['type'])) {
                     throw new \InvalidArgumentException(sprintf(
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 4d813198..3ff44fda 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -27,7 +29,7 @@ public function getConfigTreeBuilder()
         $treeBuilder = new TreeBuilder('sonata_notification');
 
         // Keep compatibility with symfony/config < 4.2
-        if (!\method_exists($treeBuilder, 'getRootNode')) {
+        if (!method_exists($treeBuilder, 'getRootNode')) {
             $rootNode = $treeBuilder->root('sonata_notification')->children();
         } else {
             $rootNode = $treeBuilder->getRootNode()->children();
@@ -191,7 +193,7 @@ protected function getQueueNode()
         $treeBuilder = new TreeBuilder('queues');
 
         // Keep compatibility with symfony/config < 4.2
-        if (!\method_exists($treeBuilder, 'getRootNode')) {
+        if (!method_exists($treeBuilder, 'getRootNode')) {
             $node = $treeBuilder->root('queues');
         } else {
             $node = $treeBuilder->getRootNode();
diff --git a/src/DependencyInjection/SonataNotificationExtension.php b/src/DependencyInjection/SonataNotificationExtension.php
index 937f573d..ec3fcd00 100644
--- a/src/DependencyInjection/SonataNotificationExtension.php
+++ b/src/DependencyInjection/SonataNotificationExtension.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Entity/BaseMessage.php b/src/Entity/BaseMessage.php
index ead47000..b18573e5 100644
--- a/src/Entity/BaseMessage.php
+++ b/src/Entity/BaseMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Entity/MessageManager.php b/src/Entity/MessageManager.php
index 21516928..f0723481 100644
--- a/src/Entity/MessageManager.php
+++ b/src/Entity/MessageManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Event/DoctrineBackendOptimizeListener.php b/src/Event/DoctrineBackendOptimizeListener.php
index 8bc38c43..76d23713 100644
--- a/src/Event/DoctrineBackendOptimizeListener.php
+++ b/src/Event/DoctrineBackendOptimizeListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Event/DoctrineOptimizeListener.php b/src/Event/DoctrineOptimizeListener.php
index 8b221ca1..62cfd61f 100644
--- a/src/Event/DoctrineOptimizeListener.php
+++ b/src/Event/DoctrineOptimizeListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Event/IterateEvent.php b/src/Event/IterateEvent.php
index 59c43973..31157908 100644
--- a/src/Event/IterateEvent.php
+++ b/src/Event/IterateEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -23,7 +25,7 @@
  */
 class IterateEvent extends Event
 {
-    const EVENT_NAME = 'sonata.notification.event.message_iterate_event';
+    public const EVENT_NAME = 'sonata.notification.event.message_iterate_event';
 
     /**
      * @var MessageIteratorInterface
diff --git a/src/Event/IterationListener.php b/src/Event/IterationListener.php
index 52365d48..e3f31707 100644
--- a/src/Event/IterationListener.php
+++ b/src/Event/IterationListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Exception/BackendNotFoundException.php b/src/Exception/BackendNotFoundException.php
index b1164bb7..00d3221f 100644
--- a/src/Exception/BackendNotFoundException.php
+++ b/src/Exception/BackendNotFoundException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Exception/HandlingException.php b/src/Exception/HandlingException.php
index 59c5f2fe..7ffac2d2 100644
--- a/src/Exception/HandlingException.php
+++ b/src/Exception/HandlingException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Exception/InvalidParameterException.php b/src/Exception/InvalidParameterException.php
index 6a4e87ff..cf4b567c 100644
--- a/src/Exception/InvalidParameterException.php
+++ b/src/Exception/InvalidParameterException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Form/Type/MessageSerializationType.php b/src/Form/Type/MessageSerializationType.php
index 1a63bd6f..4fd20d7c 100644
--- a/src/Form/Type/MessageSerializationType.php
+++ b/src/Form/Type/MessageSerializationType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Iterator/AMQPMessageIterator.php b/src/Iterator/AMQPMessageIterator.php
index ca74bfd6..4d605175 100644
--- a/src/Iterator/AMQPMessageIterator.php
+++ b/src/Iterator/AMQPMessageIterator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Iterator/ErroneousMessageIterator.php b/src/Iterator/ErroneousMessageIterator.php
index d788c73a..5b7545d8 100644
--- a/src/Iterator/ErroneousMessageIterator.php
+++ b/src/Iterator/ErroneousMessageIterator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Iterator/IteratorProxyMessageIterator.php b/src/Iterator/IteratorProxyMessageIterator.php
index a0cf60f5..7df41879 100644
--- a/src/Iterator/IteratorProxyMessageIterator.php
+++ b/src/Iterator/IteratorProxyMessageIterator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Iterator/MessageIteratorInterface.php b/src/Iterator/MessageIteratorInterface.php
index 8e58d41b..98c74954 100644
--- a/src/Iterator/MessageIteratorInterface.php
+++ b/src/Iterator/MessageIteratorInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Iterator/MessageManagerMessageIterator.php b/src/Iterator/MessageManagerMessageIterator.php
index 408434ed..2e30e527 100644
--- a/src/Iterator/MessageManagerMessageIterator.php
+++ b/src/Iterator/MessageManagerMessageIterator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Model/Message.php b/src/Model/Message.php
index 61f72963..1366a5ca 100644
--- a/src/Model/Message.php
+++ b/src/Model/Message.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Model/MessageInterface.php b/src/Model/MessageInterface.php
index 310d9dbf..13351cce 100644
--- a/src/Model/MessageInterface.php
+++ b/src/Model/MessageInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -13,11 +15,11 @@
 
 interface MessageInterface
 {
-    const STATE_OPEN = 0;
-    const STATE_IN_PROGRESS = 1;
-    const STATE_DONE = 2;
-    const STATE_ERROR = -1;
-    const STATE_CANCELLED = -2;
+    public const STATE_OPEN = 0;
+    public const STATE_IN_PROGRESS = 1;
+    public const STATE_DONE = 2;
+    public const STATE_ERROR = -1;
+    public const STATE_CANCELLED = -2;
 
     /**
      * @param array $body
diff --git a/src/Model/MessageManagerInterface.php b/src/Model/MessageManagerInterface.php
index 8e32cb6d..e107af71 100644
--- a/src/Model/MessageManagerInterface.php
+++ b/src/Model/MessageManagerInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/Selector/ErroneousMessagesSelector.php b/src/Selector/ErroneousMessagesSelector.php
index f30b1ce5..32b8ec53 100644
--- a/src/Selector/ErroneousMessagesSelector.php
+++ b/src/Selector/ErroneousMessagesSelector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/src/SonataNotificationBundle.php b/src/SonataNotificationBundle.php
index 77e75849..0bd1485f 100644
--- a/src/SonataNotificationBundle.php
+++ b/src/SonataNotificationBundle.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Backend/AMQPBackendDispatcherTest.php b/tests/Backend/AMQPBackendDispatcherTest.php
index 10560c36..4e6ee967 100644
--- a/tests/Backend/AMQPBackendDispatcherTest.php
+++ b/tests/Backend/AMQPBackendDispatcherTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Backend/AMQPBackendTest.php b/tests/Backend/AMQPBackendTest.php
index 728caf8c..824d5a4c 100644
--- a/tests/Backend/AMQPBackendTest.php
+++ b/tests/Backend/AMQPBackendTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
@@ -29,13 +31,13 @@
 
 class AMQPBackendTest extends TestCase
 {
-    const EXCHANGE = 'exchange';
-    const QUEUE = 'foo';
-    const KEY = 'message.type.foo';
-    const DEAD_LETTER_EXCHANGE = 'dlx';
-    const DEAD_LETTER_ROUTING_KEY = 'message.type.dl';
-    const TTL = 60000;
-    const PREFETCH_COUNT = 1;
+    public const EXCHANGE = 'exchange';
+    public const QUEUE = 'foo';
+    public const KEY = 'message.type.foo';
+    public const DEAD_LETTER_EXCHANGE = 'dlx';
+    public const DEAD_LETTER_ROUTING_KEY = 'message.type.dl';
+    public const TTL = 60000;
+    public const PREFETCH_COUNT = 1;
 
     protected function setUp()
     {
diff --git a/tests/Backend/BackendHealthCheckTest.php b/tests/Backend/BackendHealthCheckTest.php
index 14edc6ba..2c6402cc 100644
--- a/tests/Backend/BackendHealthCheckTest.php
+++ b/tests/Backend/BackendHealthCheckTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Backend/MessageManagerBackendDispatcherTest.php b/tests/Backend/MessageManagerBackendDispatcherTest.php
index 9b4b5fef..d857d3f2 100644
--- a/tests/Backend/MessageManagerBackendDispatcherTest.php
+++ b/tests/Backend/MessageManagerBackendDispatcherTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Backend/MessageManagerBackendTest.php b/tests/Backend/MessageManagerBackendTest.php
index 92fba93f..ef13c379 100644
--- a/tests/Backend/MessageManagerBackendTest.php
+++ b/tests/Backend/MessageManagerBackendTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Backend/PostponeRuntimeBackendTest.php b/tests/Backend/PostponeRuntimeBackendTest.php
index 501b36ff..a4e51d2b 100644
--- a/tests/Backend/PostponeRuntimeBackendTest.php
+++ b/tests/Backend/PostponeRuntimeBackendTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Backend/RuntimeBackendTest.php b/tests/Backend/RuntimeBackendTest.php
index 8639b80d..673808f2 100644
--- a/tests/Backend/RuntimeBackendTest.php
+++ b/tests/Backend/RuntimeBackendTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Consumer/LoggerConsumerTest.php b/tests/Consumer/LoggerConsumerTest.php
index df87a5ed..880dc215 100644
--- a/tests/Consumer/LoggerConsumerTest.php
+++ b/tests/Consumer/LoggerConsumerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Consumer/SwiftMailerConsumerTest.php b/tests/Consumer/SwiftMailerConsumerTest.php
index f55c2c68..f9cc0d7a 100644
--- a/tests/Consumer/SwiftMailerConsumerTest.php
+++ b/tests/Consumer/SwiftMailerConsumerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Controller/Api/MessageControllerTest.php b/tests/Controller/Api/MessageControllerTest.php
index 926aaed9..7a863197 100644
--- a/tests/Controller/Api/MessageControllerTest.php
+++ b/tests/Controller/Api/MessageControllerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/DependencyInjection/SonataNotificationExtensionTest.php b/tests/DependencyInjection/SonataNotificationExtensionTest.php
index 27b21b67..a51b8a93 100644
--- a/tests/DependencyInjection/SonataNotificationExtensionTest.php
+++ b/tests/DependencyInjection/SonataNotificationExtensionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Entity/Message.php b/tests/Entity/Message.php
index 939c21a6..9e9b8af3 100644
--- a/tests/Entity/Message.php
+++ b/tests/Entity/Message.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Entity/MessageManagerMock.php b/tests/Entity/MessageManagerMock.php
index 7444e994..33e54763 100644
--- a/tests/Entity/MessageManagerMock.php
+++ b/tests/Entity/MessageManagerMock.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Entity/MessageManagerTest.php b/tests/Entity/MessageManagerTest.php
index 324943cf..c2d87f98 100644
--- a/tests/Entity/MessageManagerTest.php
+++ b/tests/Entity/MessageManagerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Entity/MessageTest.php b/tests/Entity/MessageTest.php
index 58c7dd4a..0d4bbc35 100644
--- a/tests/Entity/MessageTest.php
+++ b/tests/Entity/MessageTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Event/DoctrineOptimizeListenerTest.php b/tests/Event/DoctrineOptimizeListenerTest.php
index 412e6292..20cabd22 100644
--- a/tests/Event/DoctrineOptimizeListenerTest.php
+++ b/tests/Event/DoctrineOptimizeListenerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Exception/InvalidParameterExceptionTest.php b/tests/Exception/InvalidParameterExceptionTest.php
index 0b86df39..29b737e4 100644
--- a/tests/Exception/InvalidParameterExceptionTest.php
+++ b/tests/Exception/InvalidParameterExceptionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Iterator/AMQPMessageIteratorTest.php b/tests/Iterator/AMQPMessageIteratorTest.php
index 1174c30b..3dab930d 100644
--- a/tests/Iterator/AMQPMessageIteratorTest.php
+++ b/tests/Iterator/AMQPMessageIteratorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Iterator/IteratorProxyMessageIteratorTest.php b/tests/Iterator/IteratorProxyMessageIteratorTest.php
index 5256120e..6bd4aef1 100644
--- a/tests/Iterator/IteratorProxyMessageIteratorTest.php
+++ b/tests/Iterator/IteratorProxyMessageIteratorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Iterator/MessageManagerMessageIterator.php b/tests/Iterator/MessageManagerMessageIterator.php
index afc99e09..9f5024c7 100644
--- a/tests/Iterator/MessageManagerMessageIterator.php
+++ b/tests/Iterator/MessageManagerMessageIterator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Iterator/MessageManagerMessageIteratorTest.php b/tests/Iterator/MessageManagerMessageIteratorTest.php
index 611687e0..2c329067 100644
--- a/tests/Iterator/MessageManagerMessageIteratorTest.php
+++ b/tests/Iterator/MessageManagerMessageIteratorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *
diff --git a/tests/Mock/AmqpConnectionFactoryStub.php b/tests/Mock/AmqpConnectionFactoryStub.php
index 2867071e..b8d92d52 100644
--- a/tests/Mock/AmqpConnectionFactoryStub.php
+++ b/tests/Mock/AmqpConnectionFactoryStub.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Sonata Project package.
  *

From f53f7dedb5af21131d228e089f5025dc1d0d2b62 Mon Sep 17 00:00:00 2001
From: Sonata CI <thomas+ci@sonata-project.org>
Date: Tue, 15 Jan 2019 03:50:09 +0100
Subject: [PATCH 7/8] DevKit updates (#358)

---
 .gitattributes                |  4 ++--
 .travis/before_script_test.sh |  4 ++++
 CONTRIBUTING.md               | 18 ++++++++++++++++++
 docs/conf.py                  | 20 ++++++++++++++++++--
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 920aef34..667b29d7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
 .* export-ignore
 *.md export-ignore
-tests/* export-ignore
-docs/* export-ignore
+tests export-ignore
+docs export-ignore
diff --git a/.travis/before_script_test.sh b/.travis/before_script_test.sh
index 87b47509..d21cc625 100755
--- a/.travis/before_script_test.sh
+++ b/.travis/before_script_test.sh
@@ -1,3 +1,7 @@
 #!/usr/bin/env bash
 set -ev
 
+if [ -f before_script_test.local.sh ]
+then
+    ./before_script_test.local.sh
+fi
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c5704fcf..53325818 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -516,6 +516,24 @@ Thank them for contributing. Encourage them if you feel this is going to be long
 In short, try to make them want to contribute again. If they are stuck, try to provide them with
 code yourself, or ping someone who can help.
 
+## Manual merges
+
+Thanks to dev-kit, stable branches are regularly merged into master branches.
+It is great when it works, but often, there will be git conflicts and a human
+intervention will be needed. Let us assume we are working on a repository where
+the stable branch is 42.x. To do the merge manually, follow these steps:
+1. Fetch the latest commits: `git fetch --all`
+2. Checkout the master branch, and make sure it is up to date:
+   `git checkout -B master origin/master`
+3. Proceed with the merge: `git merge origin/42.x`
+4. Fix the conflicts (if you are doing this, it is because of conflicts,
+   right?) `git mergetool`
+5. Create a merge commit `git commit`
+6. Push the result to your fork: `git push fork 42.x`
+7. Create a pull request from `fork/42.x` to `origin/42.x`
+8. When the PR can be merged, do not merge it. Instead, use
+   `git push origin 42.x`.
+
 ## Releases
 
 ### Limitations and requests
diff --git a/docs/conf.py b/docs/conf.py
index 48208b99..160f2637 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,6 +18,10 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.insert(0, os.path.abspath('.'))
 
+# adding PhpLexer
+from sphinx.highlighting import lexers
+from pygments.lexers.web import PhpLexer
+
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -40,8 +44,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Sonata ~ NotificationBundle'
-copyright = u'2010-2015, Thomas Rabaix'
+project = u''
+copyright = u'2010-2019, Thomas Rabaix'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -83,9 +87,18 @@
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
+# This will be used when using the shorthand notation
+highlight_language = 'php'
+
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
+# -- Settings for symfony doc extension ---------------------------------------------------
+
+# enable highlighting for PHP code not between ``<?php ... ?>`` by default
+lexers['php'] = PhpLexer(startinline=True)
+lexers['php-annotations'] = PhpLexer(startinline=True)
+lexers['php-standalone'] = PhpLexer(startinline=True)
 
 # -- Options for HTML output ---------------------------------------------------
 import sphinx_rtd_theme
@@ -241,3 +254,6 @@
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
 #texinfo_show_urls = 'footnote'
+
+# Use PHP syntax highlighting in code examples by default
+highlight_language='php'

From fd639bdc29d30515fefe586c65bb2b207f0ed17a Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Sun, 13 Jan 2019 23:12:04 +0100
Subject: [PATCH 8/8] [Docs] big cleanup

---
 docs/reference/advanced_configuration.rst |  9 ++-
 docs/reference/command_line.rst           | 21 +++---
 docs/reference/installation.rst           | 66 ++--------------
 docs/reference/multiple_queues.rst        | 35 +++++----
 docs/reference/usage.rst                  | 91 +++++++++--------------
 5 files changed, 77 insertions(+), 145 deletions(-)

diff --git a/docs/reference/advanced_configuration.rst b/docs/reference/advanced_configuration.rst
index 3bd96b33..e1394acb 100644
--- a/docs/reference/advanced_configuration.rst
+++ b/docs/reference/advanced_configuration.rst
@@ -102,6 +102,8 @@ Full configuration options:
 
     .. code-block:: yaml
 
+        # config/packages/doctrine.yaml
+
         doctrine:
             orm:
                 entity_managers:
@@ -110,7 +112,6 @@ Full configuration options:
                             SonataNotificationBundle: ~
                             ApplicationSonataNotificationBundle: ~
 
-
 Changing AMQP transport
 -----------------------
 
@@ -128,13 +129,13 @@ run `composer require enqueue/amqp-ext:^0.8` and change `factory_class` option i
 
     .. code-block:: yaml
 
+        # config/packages/sonata_notification.yaml
+
         sonata_notification:
             backends:
                 rabbitmq:
                     connection:
-                        factory_class:        \Enqueue\AmqpExt\AmqpConnectionFactory
-
-
+                        factory_class: Enqueue\AmqpExt\AmqpConnectionFactory
 
 .. _`queue interop`: https://github.com/queue-interop/queue-interop#amqp-interop
 .. _`enqueue/amqp-lib`: https://github.com/php-enqueue/enqueue-dev/blob/master/docs/transport/amqp_lib.md
diff --git a/docs/reference/command_line.rst b/docs/reference/command_line.rst
index f61649fc..773ef956 100644
--- a/docs/reference/command_line.rst
+++ b/docs/reference/command_line.rst
@@ -5,7 +5,7 @@ The notification bundle comes with one command which will listen to new incoming
 
 .. code-block:: bash
 
-    app/console sonata:notification:start --env=prod --iteration=250
+    bin/console sonata:notification:start --env=prod --iteration=250
 
 This command must be started in production environment to limit memory usage produced by
 debugging information.
@@ -20,10 +20,12 @@ Monitoring process : Supervisord
 This command cannot be used or started as it is on a production server. The task must be supervised by a process control system.
 There are many solutions available, here a solution with ``supervisord``:
 
-Supervisor is a client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems::
+Supervisor is a client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems
+
+.. code-block:: ini
 
     [program:sonata_production_sonata_notification]
-    command=/home/org.sonata-project.demo/current/app/console sonata:notification:start --env=notification --iteration=250
+    command=/home/org.sonata-project.demo/current/bin/console sonata:notification:start --env=notification --iteration=250
     autorestart=true
     user=www-data
     redirect_stderr=false
@@ -44,7 +46,6 @@ If you are deploying with Capistrano, you can restart the supervisor process wit
     long run processes as each log entry will be stacked into memory. So the notification process can stop
     with a memory usage error. To solve this, just create a new env called notification without this handler.
 
-
 Clean up messages
 -----------------
 
@@ -52,7 +53,7 @@ You might want to clean old messages from different backend (if ever a backend h
 
 .. code-block:: bash
 
-    app/console sonata:notification:cleanup --env=prod
+    bin/console sonata:notification:cleanup --env=prod
 
 Restart erroneous messages
 --------------------------
@@ -62,18 +63,20 @@ the next iteration (this command must be used for the database backend):
 
 .. code-block:: bash
 
-    app/console sonata:notification:restart --type="xxx" --max-attempts=10
+    bin/console sonata:notification:restart --type="xxx" --max-attempts=10
 
 You can get this command to run continuously with the --pulling option and you can set the delay between the time the
 message has been set to error and the time the message can be reprocess with --attempt-delay option (in seconds):
 
 .. code-block:: bash
 
-    app/console sonata:notification:restart --type="xxx" --pulling --max-attempts=10 --attempt-delay=60 --pause=500000 --batch-size=10
+    bin/console sonata:notification:restart --type="xxx" --pulling --max-attempts=10 --attempt-delay=60 --pause=500000 --batch-size=10
 
 Create and publish messages
 ---------------------------
 
-For testing purpose, you might want to manually create and publish messages::
+For testing purpose, you might want to manually create and publish messages
+
+... code-block:: bash
 
-    app/console sonata:notification:create-and-publish logger '{"level":"debug","message":"Hello world!"}'
+    bin/console sonata:notification:create-and-publish logger '{"level":"debug","message":"Hello world!"}'
diff --git a/docs/reference/installation.rst b/docs/reference/installation.rst
index 21f2e8b0..17c4d2d1 100644
--- a/docs/reference/installation.rst
+++ b/docs/reference/installation.rst
@@ -24,35 +24,13 @@ Now, add the new ``SonataNotificationBundle`` Bundle to ``bundles.php`` file::
     // config/bundles.php
 
     return [
-        //...
+        // ...
         Sonata\NotificationBundle\SonataNotificationBundle::class => ['all' => true],
     ];
 
-.. note::
-
-    If you are not using Symfony Flex, you should enable bundles in your
-    ``AppKernel.php``.
-
-.. code-block:: php
-
-    // app/AppKernel.php
-
-    public function registerBundles()
-    {
-        return array(
-            // Application Bundles
-            new Sonata\NotificationBundle\SonataNotificationBundle(),
-        );
-    }
-
 Configuration
 -------------
 
-.. note::
-
-    If you are not using Symfony Flex, all configuration in this section should
-    be added to ``app/config/config.yml``.
-
 SonataNotificationBundle Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -85,6 +63,7 @@ You can disable the admin if you don't need it :
 
 Doctrine Configuration
 ~~~~~~~~~~~~~~~~~~~~~~
+
 Add these bundles in the config mapping definition (or enable `auto_mapping`_):
 
 .. code-block:: yaml
@@ -105,6 +84,7 @@ Add these bundles in the config mapping definition (or enable `auto_mapping`_):
 
 Extending the Bundle
 --------------------
+
 .. note::
 
     You can skip this section if you are using Flex and installed a bundle
@@ -117,10 +97,6 @@ generate the correct entities for the media:
 
     bin/console sonata:easy-extends:generate SonataNotificationBundle --dest=src --namespace_prefix=App
 
-.. note::
-
-    If you are not using Symfony Flex, use command without ``--namespace_prefix=App``.
-
 With provided parameters, the files are generated in ``src/Application/Sonata/NotificationBundle``.
 
 .. note::
@@ -131,42 +107,15 @@ With provided parameters, the files are generated in ``src/Application/Sonata/No
     point to a global namespace. For instance the message will be
     ``App\Application\Sonata\NotificationBundle\Entity\Message``.
 
-.. note::
-
-    If you are not using Symfony Flex, the namespace will be ``Application\Sonata\NotificationBundle\Entity``.
-
 Now, add the new ``Application`` Bundle into the ``bundles.php``::
 
     // config/bundles.php
 
     return [
-        //...
+        // ...
         App\Application\Sonata\NotificationBundle\ApplicationSonataNotificationBundle::class => ['all' => true],
     ];
 
-.. note::
-
-    If you are not using Symfony Flex, add the new ``Application`` Bundle into your
-    ``AppKernel.php``.
-
-.. code-block:: php
-
-    // app/AppKernel.php
-
-    class AppKernel
-    {
-        public function registerBundles()
-        {
-            return array(
-                // Application Bundles
-                // ...
-                new Application\Sonata\NotificationBundle\ApplicationSonataNotificationBundle(),
-                // ...
-
-            )
-        }
-    }
-
 And configure ``SonataNotificationBundle`` to use the newly generated Message class:
 
 .. code-block:: php
@@ -177,15 +126,10 @@ And configure ``SonataNotificationBundle`` to use the newly generated Message cl
         class:
             message: App\Application\Sonata\NotificationBundle\Entity\Message
 
-.. note::
-
-    If you are not using Symfony Flex, add classes without the ``App\``
-    part and this configuration should be added to ``app/config/config.yml``
-
 The only thing left is to update your schema:
 
 .. code-block:: bash
 
-    php bin/console doctrine:schema:update --force
+    bin/console doctrine:schema:update --force
 
 .. _`auto_mapping`: http://symfony.com/doc/2.0/reference/configuration/doctrine.html#configuration-overview
diff --git a/docs/reference/multiple_queues.rst b/docs/reference/multiple_queues.rst
index 44162281..2ba17576 100644
--- a/docs/reference/multiple_queues.rst
+++ b/docs/reference/multiple_queues.rst
@@ -27,14 +27,13 @@ To enable multiple queues, simply define a `queues` node in your configuration:
 
         backends:
             rabbitmq:
-                exchange:     router
+                exchange: router
                 connection:
-                    host:     "%rabbitmq_host%"
-                    user:     "%rabbitmq_user%"
-                    pass:     "%rabbitmq_pass%"
-                    port:     "%rabbitmq_port%"
-                    vhost:    "%rabbitmq_vhost%"
-
+                    host: '%rabbitmq_host%'
+                    user: '%rabbitmq_user%'
+                    pass: '%rabbitmq_pass%'
+                    port: '%rabbitmq_port%'
+                    vhost: '%rabbitmq_vhost%'
 
 This will define 2 different queues: `transcoder` and `catchall` and where the `transcoder` queue is bound to a routing key:
 
@@ -42,9 +41,13 @@ This will define 2 different queues: `transcoder` and `catchall` and where the `
 
 In the above example you will need to start 2 processes, where each process will handle messages sent by a specific queue:
 
-    - ``php app/console sonata:notification:start --env=prod --iteration=250 --type=start.transcode.video``
-    - ``php app/console sonata:notification:start --env=prod --iteration=250``
+.. code-block:: bash
+
+    bin/console sonata:notification:start --env=prod --iteration=250 --type=start.transcode.video
+
+.. code-block:: bash
 
+    bin/console sonata:notification:start --env=prod --iteration=250
 
 Messages published with the ``start.transcode.video`` type will be handled by the first consumer.
 Any other message types will be handled by the ``catchall`` consumer, as it has been set as the default one.
@@ -62,9 +65,9 @@ To enable multiple queues, simply define a `queues` node in your configuration:
         backend: sonata.notification.backend.doctrine
         backends:
             doctrine:
-                max_age:      86400     # max age in second
-                pause:        500000    # delay in microseconds
-                states:                 # raising errors level
+                max_age:   86400     # max age in second
+                pause:     500000    # delay in microseconds
+                states:              # raising errors level
                     in_progress: 10
                     error:       20
                     open:        100
@@ -81,9 +84,13 @@ This will define 2 different queues: `sonata_page` and `catchall` and where the
 
 In the above example you will need to create 2 processes, where each process will handle messages sent by a specific queue:
 
-    - ``php app/console sonata:notification:start --env=prod --iteration=250 --type=sonata.page.create_snapshot``
-    - ``php app/console sonata:notification:start --env=prod --iteration=250``
+.. code-block:: bash
+
+    bin/console sonata:notification:start --env=prod --iteration=250 --type=sonata.page.create_snapshot
+
+.. code-block:: bash
 
+    bin/console sonata:notification:start --env=prod --iteration=250
 
 Messages published with `sonata.page.create_snapshot` or `sonata.page.create_snapshots` types will be handled by the first consumer.
 Any other message types will be handled by the `catchall` consumer, as it has been set as the default one.
diff --git a/docs/reference/usage.rst b/docs/reference/usage.rst
index 797b6429..2433a5f8 100644
--- a/docs/reference/usage.rst
+++ b/docs/reference/usage.rst
@@ -6,31 +6,29 @@ Calling an existing consumer
 
 .. code-block:: php
 
-    <?php
     // retrieve the notification backend
     $backend = $container->get('sonata.notification.backend');
 
     // create and publish a message
-    $backend->createAndPublish('mailer', array(
-        'from' => array(
+    $backend->createAndPublish('mailer', [
+        'from' => [
             'email' => 'no-reply@sonata-project.org',
-            'name'  => 'No Reply'
-        ),
-        'to'   => array(
+            'name'  => 'No Reply',
+        ],
+        'to' => [
             'myuser@example.org' => 'My User',
             'myuser1@example.org' => 'My User 1',
-        ),
-        'message' => array(
+        ],
+        'message' => [
             'html' => '<b>hello</b>',
-            'text' => 'hello'
-        ),
+            'text' => 'hello',
+        ],
         'subject' => 'Contact form',
-        'attachment' => array(
+        'attachment' => [
             'file' => '/path/to/file',
-            'name' => 'fileName'
-        ),
-    ));
-
+            'name' => 'fileName',
+        ],
+    ]);
 
 Custom consumer
 ----------------
@@ -40,29 +38,26 @@ In order to create a consumer, you have to take these two steps :
 * Create a consumer class
 * Define the consumer in the service container
 
-
 The consumer class must implement the ``ConsumerInterface`` interface, which defines
 only one method ``process``. The ``process`` method will receive a ``ConsumerEvent`` as an
 argument. The ``ConsumerEvent`` object is a standard Symfony Event from the ``EventDispatcher``
 Component. So it is possible to stop the event propagation from the consumer.
 
 The current example is not meant to be used in production, however it is a good example of
-logger consumer creation.
-
-.. code-block:: php
+logger consumer creation::
 
-    <?php
     namespace Sonata\NotificationBundle\Consumer;
 
+    use Sonata\NotificationBundle\Consumer\ConsumerInterface;
+    use Sonata\NotificationBundle\Exception\InvalidParameterException;
     use Sonata\NotificationBundle\Model\MessageInterface;
     use Symfony\Component\HttpKernel\Log\LoggerInterface;
-    use Sonata\NotificationBundle\Exception\InvalidParameterException;
 
-    class LoggerConsumer implements ConsumerInterface
+    final class LoggerConsumer implements ConsumerInterface
     {
-        protected $logger;
+        private $logger;
 
-        protected $types = array(
+        private $types = [
             'emerg',
             'alert',
             'crit',
@@ -71,19 +66,13 @@ logger consumer creation.
             'notice',
             'info',
             'debug',
-        );
+        ];
 
-        /**
-         * @param \Symfony\Component\HttpKernel\Log\LoggerInterface $logger
-         */
         public function __construct(LoggerInterface $logger)
         {
             $this->logger = $logger;
         }
 
-        /**
-         * {@inheritdoc}
-         */
         public function process(ConsumerEvent $event)
         {
             $message = $event->getMessage();
@@ -92,7 +81,7 @@ logger consumer creation.
                 throw new InvalidParameterException();
             }
 
-            call_user_func(array($this->logger, $message->getValue('level')), $message->getValue('message'));
+            call_user_func([$this->logger, $message->getValue('level')], $message->getValue('message'));
         }
     }
 
@@ -100,44 +89,32 @@ The last step is to register the service as a consumer in the service container.
 a custom tag : ``sonata.notification.consumer`` with a ``type``. The ``type`` value is the name used when a
 message is receive or created.
 
-* XML
+.. configuration-block::
 
     .. code-block:: xml
 
-        <?xml version="1.0" ?>
-
-        <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+        <!-- config/services.xml -->
 
-            <services>
-                <service id="sonata.notification.consumer.logger" class="Sonata\NotificationBundle\Consumer\LoggerConsumer">
-                    <tag name="sonata.notification.consumer" type="logger" />
-
-                    <argument type="service" id="logger" />
-                </service>
-            </services>
-        </container>
-
-* YAML
+        <service id="sonata.notification.consumer.logger" class="Sonata\NotificationBundle\Consumer\LoggerConsumer">
+            <argument type="service" id="logger" />
+            <tag name="sonata.notification.consumer" type="logger" />
+        </service>
 
     .. code-block:: yaml
 
+        # config/services.yaml
+
         services:
             sonata.notification.consumer.logger:
                 class: Sonata\NotificationBundle\Consumer\LoggerConsumer
+                arguments: ['@logger']
                 tags:
                     - { name: sonata.notification.consumer, type: logger }
-                arguments: [ "@logger" ]
 
+Now you can use the created service to send a message to the Symfony logger::
 
-Now you can use the created service to send a message to the symfony logger.
-
-.. code-block:: php
-
-    <?php
-    $this->get('sonata.notification.backend')->createAndPublish('logger', array(
+    $this->get('sonata.notification.backend')->createAndPublish('logger', [
         'level' => 'debug',
-        'message' => 'Hello world!'
-    ));
+        'message' => 'Hello world!',
+    ]);