Merge branch '1.13' into 2.2

ezpublishlegacy · Nov 23, 2018 · fbffbff · fbffbff
2 parents f7e934e + 1c317a4
commit fbffbff
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -33,25 +33,25 @@
         "ezsystems/ezplatform-admin-ui-modules": "~1.2.1@dev",
         "ezsystems/ezplatform-cron": "~2.0.0@dev",
         "ezsystems/ezplatform-design-engine": "~2.0.0@dev",
-        "ezsystems/ezplatform-http-cache": "~0.7.0@dev",
-        "ezsystems/ezplatform-solr-search-engine": "~1.5.2@dev",
+        "ezsystems/ezplatform-http-cache": "~0.8@dev",
+        "ezsystems/ezplatform-solr-search-engine": "^1.5.2@dev",
         "ezsystems/ezplatform-standard-design": "~0.1.0@dev",
         "ezsystems/ezpublish-kernel": "~7.2.1@dev",
         "ezsystems/repository-forms": "~2.2.0@dev",
         "friendsofsymfony/jsrouting-bundle": "^1.6.3",
         "incenteev/composer-parameter-handler": "^2.1.3",
         "knplabs/knp-menu-bundle": "^2.2.1",
-        "leafo/scssphp": "^0.7.6",
+        "leafo/scssphp": "^0.7.7",
         "roave/security-advisories": "dev-master",
-        "sensio/distribution-bundle": "^5.0.22",
+        "sensio/distribution-bundle": "^5.0.23",
         "symfony/assetic-bundle": "^2.8.2",
-        "symfony/monolog-bundle": "^3.3.0",
-        "symfony/swiftmailer-bundle": "^3.2.2",
+        "symfony/monolog-bundle": "^3.3.1",
+        "symfony/swiftmailer-bundle": "^3.2.4",
         "symfony/symfony": "^3.4.18",
-        "symfony/thanks": "^1.0.7",
-        "twig/extensions": "^1.5.1",
-        "twig/twig": "^1.0||^2.0",
-        "white-october/pagerfanta-bundle": "^1.2",
+        "symfony/thanks": "^1.1.0",
+        "twig/extensions": "^1.5.3",
+        "twig/twig": "^2.5",
+        "white-october/pagerfanta-bundle": "^1.2.2",
         "willdurand/js-translation-bundle": "^2.6.6"
     },
     "require-dev": {
@@ -60,12 +60,12 @@
         "behat/mink-goutte-driver": "^1.2.1",
         "behat/mink-selenium2-driver": "^1.3.1",
         "behat/symfony2-extension": "^2.1.5",
-        "bex/behat-screenshot": "^1.2",
-        "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.0",
-        "ezsystems/behatbundle": "^6.5.3",
-        "phpunit/phpunit": "^6.4.4",
+        "bex/behat-screenshot": "^1.2.7",
+        "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.0.0",
+        "ezsystems/behatbundle": "^6.5.4",
+        "phpunit/phpunit": "^6.5.13",
         "sensio/generator-bundle": "^3.1.7",
-        "symfony/phpunit-bridge": "^3.4.11"
+        "symfony/phpunit-bridge": "^3.4.18"
     },
     "conflict": {
         "symfony/symfony": "3.4.9||3.4.12||3.4.16",