From 8ac1db96cb56bcaa1d9e8ca7cfb33fbc9690182a Mon Sep 17 00:00:00 2001
From: Alfonso Machado <almacbe@gmail.com>
Date: Wed, 13 Dec 2017 10:36:01 +0200
Subject: [PATCH 1/2] fix version of routing auto (#221)

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

diff --git a/composer.json b/composer.json
index 6e7d7eb..395ddcb 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "php": "^5.6|^7.0",
         "symfony/framework-bundle": "^2.8|^3.0",
-        "symfony-cmf/routing-auto": "^2.0.0-RC5",
+        "symfony-cmf/routing-auto": "^2.0",
         "symfony-cmf/routing-bundle": "^1.2.0|^2.0",
         "aferrandini/urlizer": "1.0.*",
         "phpdocumentor/reflection-docblock": "^3.1, !=3.2.0"

From e8140f7f21b5586673a7f4f246d282040842ccbf Mon Sep 17 00:00:00 2001
From: David Buchmann <david@liip.ch>
Date: Wed, 13 Dec 2017 09:36:30 +0100
Subject: [PATCH 2/2] Apply fixes from StyleCI (#222)

[ci skip] [skip ci]
---
 src/Adapter/PhpcrOdmAdapter.php            | 4 +++-
 tests/Unit/Adapter/PhpcrOdmAdapterTest.php | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Adapter/PhpcrOdmAdapter.php b/src/Adapter/PhpcrOdmAdapter.php
index ce0495d..ff99887 100644
--- a/src/Adapter/PhpcrOdmAdapter.php
+++ b/src/Adapter/PhpcrOdmAdapter.php
@@ -30,7 +30,9 @@ class PhpcrOdmAdapter implements AdapterInterface
     const TAG_NO_MULTILANG = 'no-multilang';
 
     protected $dm;
+
     protected $baseRoutePath;
+
     protected $autoRouteFqcn;
 
     /**
@@ -215,7 +217,7 @@ public function compareAutoRouteLocale(AutoRouteInterface $autoRoute, $locale)
     {
         $autoRouteLocale = $autoRoute->getLocale();
 
-        if ($autoRouteLocale === self::TAG_NO_MULTILANG) {
+        if (self::TAG_NO_MULTILANG === $autoRouteLocale) {
             $autoRouteLocale = null;
         }
 
diff --git a/tests/Unit/Adapter/PhpcrOdmAdapterTest.php b/tests/Unit/Adapter/PhpcrOdmAdapterTest.php
index c4b5d52..fff8b7b 100644
--- a/tests/Unit/Adapter/PhpcrOdmAdapterTest.php
+++ b/tests/Unit/Adapter/PhpcrOdmAdapterTest.php
@@ -39,8 +39,11 @@ class PhpcrOdmAdapterTest extends \PHPUnit_Framework_TestCase
     private $metadata;
 
     private $contentDocument;
+
     private $contentDocument2;
+
     private $baseNode;
+
     private $parentRoute;
 
     /**
@@ -62,6 +65,7 @@ class PhpcrOdmAdapterTest extends \PHPUnit_Framework_TestCase
      * @var NodeInterface|ObjectProphecy
      */
     private $phpcrRootNode;
+
     private $baseRoutePath;
 
     /**