Merge pull request #22 from FriendsOfREDAXO/vendor_updates

Vendor-Updates

Author: skerbis

composer.lock

@@ -10,17 +10,23 @@
             "slug": "latest",
             "upcoming": true
         },
+        {
+            "name": "1.8",
+            "branchName": "1.8.x",
+            "slug": "1.8",
+            "upcoming": true
+        },
         {
             "name": "1.7",
             "branchName": "1.7.x",
             "slug": "1.7",
-            "upcoming": true
+            "current": true
         },
         {
             "name": "1.6",
             "branchName": "1.6.x",
             "slug": "1.6",
-            "current": true
+            "maintained": false
         }
     ]
 }

vendor/doctrine/collections/.doctrine-project.json

@@ -6,16 +6,6 @@ Before we can merge your Pull-Request here are some guidelines that you need to
 These guidelines exist not to annoy you, but to keep the code base clean,
 unified and future proof.
 
-## We only accept PRs  to "master"
-
-Our branching strategy is "everything to master first", even
-bugfixes and we then merge them into the stable branches. You should only 
-open pull requests against the master branch. Otherwise we cannot accept the PR.
-
-There is one exception to the rule, when we merged a bug into some stable branches
-we do occasionally accept pull requests that merge the same bug fix into earlier
-branches.
-
 ## Coding Standard
 
 We use the [Doctrine Coding Standard](https://github.com/doctrine/coding-standard).