Merge pull request #339 from FriendsOfSymfony/2.0

updated to v2.0

removed Symfony 2.8 support (sadly) so that Symfony4 support can be added

Author: softwarebycg

.gitignore

@@ -6,3 +6,4 @@ vendor
 .php_cs
 Tests/Functional/cache
 Tests/Functional/logs
+var

Controller/MessageController.php

@@ -3,14 +3,18 @@
 namespace FOS\MessageBundle\Controller;
 
 use FOS\MessageBundle\Provider\ProviderInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class MessageController extends Controller implements ContainerAwareInterface
+class MessageController extends AbstractController
 {
+    public function __construct(ContainerInterface $container)
+    {
+        $this->setContainer($container);
+    }
+
     /**
      * @var ContainerInterface
      */
@@ -162,12 +166,4 @@ protected function getProvider()
     {
         return $this->container->get('fos_message.provider');
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
 }

DependencyInjection/Configuration.php

@@ -17,7 +17,7 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
+        $treeBuilder = new TreeBuilder('fos_message');
         $rootNode = $treeBuilder->root('fos_message');
 
         $rootNode

README.md

@@ -16,7 +16,24 @@ Documentation
 
 Documentation for this bundle is stored under `Resources/doc` in this repository.
 
-[Read the documentation for the last stable (1.3)][]
+[Read the documentation for the last stable (2.0)][]
+
+Legacy (Symfony 2, or <=3.3)
+------
+
+Due to difficulties in CI testing, deprecation of the `Controller` class and the [deprecation coming November of this year (2019)][] support for anything older than Symfony3.4 (LTS) has been dropped in this bundle.
+
+For more info, see the pull request that ultimately made the decision for us - https://github.com/FriendsOfSymfony/FOSMessageBundle/pull/340
+
+If using versions older than Symfony3.4 (LTS), make sure to use version 1.3 of this bundle.
+
+https://github.com/FriendsOfSymfony/FOSMessageBundle/tree/v1.3.0
+
+When using composer, tag it as such but otherwise install as per the 1.3 docs:
+
+```bash
+composer require friendsofsymfony/message-bundle:1.3.0
+```
 
 License
 -------
@@ -27,4 +44,6 @@ This bundle is under the MIT license. See the complete license in the bundle:
 Resources/meta/LICENSE
 ```
 
-[Read the documentation for the last stable (1.3)]: https://github.com/FriendsOfSymfony/FOSMessageBundle/blob/master/Resources/doc/00-index.md
+[Read the documentation for the last stable (2.0)]: https://github.com/FriendsOfSymfony/FOSMessageBundle/blob/master/Resources/doc/00-index.md
+
+[deprecation coming November of this year (2019)]: https://symfony.com/roadmap/2.8

Resources/config/config.xml

@@ -6,6 +6,13 @@
 
     <services>
 
+        <service id="FOS\MessageBundle\Controller\MessageController" public="true">
+            <bind key="$container"
+                type="service"
+                id="service_container"
+            />
+        </service>
+
         <service id="fos_message.sender.default" class="FOS\MessageBundle\Sender\Sender" public="false">
             <argument type="service" id="fos_message.message_manager" />
             <argument type="service" id="fos_message.thread_manager" />

Resources/doc/01-installation.md

@@ -50,7 +50,9 @@ We provide examples for both Mongo DB and ORM.
 
 ### Step 4 - Enable the bundle in your kernel
 
-The bundle must be added to your `AppKernel`
+The bundle must be added to your `AppKernel`.
+
+**Step usually not necescary in Symfony 4**.
 
 ```php
 // app/AppKernel.php
@@ -77,6 +79,17 @@ fos_message:
     prefix: /optional_routing_prefix
 ```
 
+### Step 6 - Check templating
+
+Make sure to add this to `framwork.yaml` (and check twig is installed) if you run into the non-existant service `templating` issue:
+
+```yaml
+templating:
+    engines:
+        twig
+```
+
+
 ## Installation Finished
 
 At this point, the bundle has been installed and configured and should be ready for use.

composer.json

@@ -19,19 +19,19 @@
     "require": {
         "php": ">=5.5.9",
         "doctrine/collections": "^1.3",
-        "symfony/form": "^2.8.45|^3.0|^4.0",
-        "symfony/framework-bundle": "^2.8.45|^3.0|^4.0",
-        "symfony/security": "^2.8.45|^3.0|^4.0",
-        "symfony/twig-bundle": "^2.8.45|^3.0|^4.0"
+        "symfony/form": "^3.4|^4.0",
+        "symfony/framework-bundle": "^3.4|^4.0",
+        "symfony/security": "^3.4|^4.0",
+        "symfony/twig-bundle": "^3.4|^4.0"
     },
     "require-dev": {
-        "symfony/validator": "^2.8.45|^3.0|^4.0",
-        "symfony/translation": "^2.8.45|^3.0|^4.0",
-        "symfony/yaml": "^2.8.45|^3.0|^4.0",
-        "symfony/security-bundle": "^2.8.45|^3.0|^4.0",
-        "symfony/templating": "^2.8.45|^3.0|^4.0",
-        "symfony/browser-kit": "^2.8.45|^3.0|^4.0",
-        "symfony/phpunit-bridge": "^4.0",
+        "symfony/validator": "^3.4|^4.0",
+        "symfony/translation": "^3.4|^4.0",
+        "symfony/yaml": "^3.4|^4.0",
+        "symfony/security-bundle": "^3.4|^4.0",
+        "symfony/templating": "^3.4|^4.0",
+        "symfony/browser-kit": "^3.4|^4.0",
+        "symfony/phpunit-bridge": "^4.2.8",
         "doctrine/orm": "^2.0"
     },
     "suggest": {
@@ -45,7 +45,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.3-dev"
+            "dev-master": "2.0-dev"
         }
     }
 }