Merge 2.x into master

sonata-project · Jan 22, 2018 · 0791b6b · 0791b6b
2 parents 39c48ea + 4ea340e
commit 0791b6b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/.flintci.yml b/.flintci.yml
@@ -1,3 +1,4 @@
 services:
+  composernormalize: true
   phpcsfixer: true
   yamllint: true
diff --git a/composer.json b/composer.json
@@ -2,7 +2,10 @@
     "name": "sonata-project/seo-bundle",
     "type": "symfony-bundle",
     "description": "Symfony SonataSeoBundle",
-    "keywords": ["seo", "sonata"],
+    "keywords": [
+        "seo",
+        "sonata"
+    ],
     "homepage": "https://sonata-project.org/bundles/seo",
     "license": "MIT",
     "authors": [
@@ -35,18 +38,22 @@
         "guzzle/guzzle": "3.*",
         "knplabs/knp-menu-bundle": "Used by the BreadcrumbMenuBuilder"
     },
-    "autoload": {
-        "psr-4": { "Sonata\\SeoBundle\\": "src/" }
-    },
-    "autoload-dev": {
-        "psr-4": { "Sonata\\SeoBundle\\Tests\\": "tests/" }
-    },
     "config": {
         "sort-packages": true
     },
     "extra": {
         "branch-alias": {
             "dev-master": "3.x-dev"
         }
+    },
+    "autoload": {
+        "psr-4": {
+            "Sonata\\SeoBundle\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Sonata\\SeoBundle\\Tests\\": "tests/"
+        }
     }
 }