Merge branch ezplatform/master

ezecosystem · Jun 26, 2018 · 5775746 · 5775746
2 parents b5371df + 34decc9
commit 5775746
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ For further information [on requirements see online doc](https://doc.ezplatform.
 
 #### Install eZ Platform _(demo distribution)_
 
-Assuming you have prerequisites sorted out, you can get eZ Platform up and running with the following commands in your terminal:
+Assuming you have prerequisites sorted out, you can get the install up and running with the following commands in your terminal:
 
 ``` bash
 composer create-project --keep-vcs ezsystems/ezplatform-demo ezplatform ^2

diff --git a/composer.json b/composer.json
@@ -72,7 +72,7 @@
         "symfony/phpunit-bridge": "^3.4.11"
     },
     "conflict": {
-        "symfony/symfony": "3.4.9",
+        "symfony/symfony": "3.4.9||3.4.12",
         "doctrine/dbal": "2.7.0"
     },
     "scripts": {
@@ -91,6 +91,9 @@
         ],
         "post-create-project-cmd": [
             "eZ\\Bundle\\EzPublishCoreBundle\\Composer\\ScriptHandler::installWelcomeText"
+        ],
+        "ezplatform-install": [
+            "@php bin/console ezplatform:install clean"
         ]
     },
     "config": {