- Updated dependencies

marellocommerce · Jun 6, 2018 · ccada9f · ccada9f
1 parent f93d6a4
commit ccada9f
Show file tree

Hide file tree

Showing 4 changed files with 10,644 additions and 8 deletions.
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -5,7 +5,7 @@ parameters:
     database_name:          marello_application
     database_user:          root
     database_password:      ~
-
+    database_driver_options: {}
     mailer_transport:       mail
     mailer_host:            127.0.0.1
     mailer_port:            ~

diff --git a/app/config/parameters_test.yml.dist b/app/config/parameters_test.yml.dist
@@ -5,7 +5,7 @@ parameters:
     database_name:          marello_application_dev
     database_user:          root
     database_password:      root
-
+    database_driver_options: {}
     mailer_transport:       smtp
     mailer_host:            127.0.0.1
     mailer_port:            ~

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "exclude-from-classmap": ["**/Tests/"]
     },
     "repositories": {
-        "composer" : {
+        "oro" : {
             "type": "composer",
             "url": "https://packagist.orocrm.com"
         },
@@ -23,11 +23,11 @@
         }
     },
     "require": {
-        "php": ">=7.0",
-        "oro/platform": "2.5.*",
-        "oro/platform-serialised-fields": "2.5.*",
-        "oro/calendar-bundle": "<2.5.3",
-        "marellocommerce/marello": "1.x-dev"
+        "php": "7.1.*",
+        "oro/platform": "2.6.*",
+        "oro/platform-serialised-fields": "2.6.*",
+        "oro/calendar-bundle": "2.6.*",
+        "marellocommerce/marello": "1.4.*"
     },
     "require-dev": {
         "sensio/generator-bundle": "3.1.2",
@@ -55,6 +55,12 @@
         }
     },
     "scripts": {
+        "marello-reset": [
+            "rm -rf app/cache/*",
+            "rm -rf app/logs/*",
+            "sed -i -e 's/installed:.*/installed: ~/g' app/config/parameters.yml",
+            "app/console oro:install --timeout 3600 --sample-data=y --drop-database --env=prod --user-name=admin --user-firstname=John --user-lastname=Doe --user-password=marello123 --user-email=johndoe@example.com  --organization-name=Marello --application-url=http://marello-ee.docker:5080/"
+        ],
         "post-install-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",