Merge branch '2.3' into master

.platform.app.yaml

@@ -26,7 +26,7 @@ relationships:
     # this relationship and the corresponding service in .platform/services.yaml
     #redissession: 'redissession:redis'
     # If you wish to use solr, uncomment this relationship and the corresponding service in .platform/services.yaml
-    #solr: 'solrsearch:solr'
+    #solr: 'solrsearch:collection1'
 
 variables:
     #php:
@@ -52,7 +52,7 @@ web:
             expires: 600
 
 # The size of the persistent disk of the application (in MB).
-disk: 2048
+disk: 3072
 
 # The mounts that will be performed when the package is deployed.
 mounts:

.platform/services.yaml

@@ -2,7 +2,7 @@ mysqldb:
     type: mysql:10.2
     # Version 10.1 might be a better option when running Legacy Bridge
     # For more information see https://doc.ezplatform.com/en/2.1/getting_started/requirements_and_system_configuration/#supported-setups
-    disk: 2048
+    disk: 1024
     configuration:
         schemas:
             - main
@@ -32,11 +32,13 @@ rediscache:
 # have storage space to spare for this, and don't mind a bit slower instance type of redis
 #redissession:
 #    type: redis-persistent:3.2
-#    disk: 1024
+#    disk: 512
 
 # If you wish to use solr, uncomment this service and the corresponding relationship in .platform.app.yaml.
 # Also, you need to generate the config using:
 # vendor/ezsystems/ezplatform-solr-search-engine/bin/generate-solr-config.sh
+# Multi core setup is currently not supported on Platform.sh. Sharding does not work as the cores are
+# unable to reach each other
 #solrsearch:
 #    type: solr:6.6
 #    disk: 512

app/config/env/platformsh.php

@@ -126,5 +126,7 @@
 
         $container->setParameter('search_engine', 'solr');
         $container->setParameter('solr_dsn', sprintf('http://%s:%d/%s', $endpoint['host'], $endpoint['port'], 'solr'));
+        // To set solr_core parameter we assume path is in form like: "solr/collection1"
+        $container->setParameter('solr_core', substr($endpoint['path'], 5));
     }
 }

composer.json

@@ -54,7 +54,6 @@
         "netgen/tagsbundle": "^3.0",
         "novactive/ezseobundle": "^3.0.0@rc",
         "oneup/flysystem-bundle": "^3.0",
-        "roave/security-advisories": "dev-master",
         "sensio/distribution-bundle": "^5.0.23",
         "sensio/framework-extra-bundle": "^5.1",
         "symfony/assetic-bundle": "^2.8.2",
@@ -77,6 +76,7 @@
         "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.0.0",
         "ezsystems/behatbundle": "^6.5.4",
         "phpunit/phpunit": "^6.5.13",
+        "roave/security-advisories": "dev-master",
         "sensio/generator-bundle": "^3.1.7",
         "symfony/phpunit-bridge": "^3.4.18"
     },