Merge pull request #30410 from owncloud/stable10-composer-update-01

[stable10] bump phpunit and symfony/translation to match master
owncloud · Feb 8, 2018 · aefb9f7 · aefb9f7
2 parents f4fa553 + d96e440
commit aefb9f7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "require-dev": {
         "jakub-onderka/php-parallel-lint": "^0.9.2",
         "jakub-onderka/php-console-highlighter": "^0.3.2",
-        "phpunit/phpunit": "^5.5",
+        "phpunit/phpunit": "^5.7",
         "mikey179/vfsStream": "^1.6",
         "behat/mink-extension": "^2.2",
         "behat/mink-goutte-driver": "^1.2",
@@ -60,6 +60,6 @@
         "deepdiver/zipstreamer": "^1.1",
         "zendframework/zend-inputfilter": "^2.8",
         "zendframework/zend-servicemanager": "^3.3",
-        "symfony/translation": "3.3.16"
+        "symfony/translation": "^3.4"
     }
 }
diff --git a/composer.lock b/composer.lock