From 00c459e9556db4fb9c854f201089b62a99f5e9a6 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sat, 17 Sep 2016 17:47:46 +0200 Subject: [PATCH 01/20] grunt setup --- scripts/compile_translations.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/compile_translations.sh b/scripts/compile_translations.sh index c84ea1f..83525d3 100755 --- a/scripts/compile_translations.sh +++ b/scripts/compile_translations.sh @@ -1,14 +1,16 @@ #!/bin/bash +pwd + if [ -d node_modules/ng_backoffice ]; then pushd node_modules/ng_backoffice - grunt compile_translations - grunt concat + node_modules/.bin/grunt compile_translations + node_modules/.bin/grunt concat fi if [ -d node_modules/ng_client ]; then pushd node_modules/ng_client - grunt compile_translations - grunt concat + node_modules/.bin/grunt compile_translations + node_modules/.bin/grunt concat fi From 84ab71d4adc7c41634f9d3fe149c09e959ef5abb Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sat, 17 Sep 2016 18:02:11 +0200 Subject: [PATCH 02/20] grunt setup --- package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index daee00a..a8900ad 100644 --- a/package.json +++ b/package.json @@ -8,5 +8,9 @@ "url": "ssh://gogs@rhea.netlor.fr:2222/monarc/skeleton.git" }, "author": "Netlor", - "license": "Copyright" + "license": "Copyright", + "devDependencies": { + "grunt": "~0.4.1", + "grunt-cli": "~0.1.13" + } } From 0a72de930aa7fda3f720307e52fb1d693c865ad2 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sat, 17 Sep 2016 18:18:50 +0200 Subject: [PATCH 03/20] grunt setup --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a8900ad..6495a18 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "repository": { "type": "git", - "url": "ssh://gogs@rhea.netlor.fr:2222/monarc/skeleton.git" + "url": "https://github.com/CASES-LU/skeleton.git" }, "author": "Netlor", "license": "Copyright", From 21710f3423945c5787d5c1d32add09a3f0656bfc Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sun, 18 Sep 2016 10:23:13 +0200 Subject: [PATCH 04/20] grunt setup --- scripts/extract_translations.sh | 4 ++-- scripts/link_modules_resources.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/extract_translations.sh b/scripts/extract_translations.sh index 2f435cd..6ba7dfc 100755 --- a/scripts/extract_translations.sh +++ b/scripts/extract_translations.sh @@ -2,11 +2,11 @@ if [ -d node_modules/ng_backoffice ]; then pushd node_modules/ng_backoffice - grunt extract_translations + node_modules/.bin/grunt extract_translations fi if [ -d node_modules/ng_client ]; then pushd node_modules/ng_client - grunt extract_translations + node_modules/.bin/grunt extract_translations fi diff --git a/scripts/link_modules_resources.sh b/scripts/link_modules_resources.sh index 1728c91..4c192b2 100755 --- a/scripts/link_modules_resources.sh +++ b/scripts/link_modules_resources.sh @@ -54,7 +54,7 @@ if [ -d node_modules/ng_backoffice ]; then cd ../.. pushd node_modules/ng_backoffice - grunt concat + node_modules/.bin/grunt concat popd fi @@ -80,7 +80,7 @@ if [ -d node_modules/ng_client ]; then cd ../.. pushd node_modules/ng_client - grunt concat + node_modules/.bin/grunt concat popd fi From f1c953ae0bec3eab82e6d67927fef7d8d6f6fe79 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sun, 18 Sep 2016 14:25:25 +0200 Subject: [PATCH 05/20] database setup --- config/autoload/database.local.php.dist | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 config/autoload/database.local.php.dist diff --git a/config/autoload/database.local.php.dist b/config/autoload/database.local.php.dist new file mode 100644 index 0000000..2e30aae --- /dev/null +++ b/config/autoload/database.local.php.dist @@ -0,0 +1,24 @@ + array( + 'connection' => array( + 'orm_default' => array( + 'params' => array( + 'host' => '@db.host@', + 'user' => '@db.username@', + 'password' => '@db.password@', + 'dbname' => '@db.name@', + ) + ), + 'orm_cli' => array( + 'params' => array( + 'host' => '@db.host@', + 'user' => '@db.username@', + 'password' => '@db.password@', + 'dbname' => '@db.name@', + ) + ) + ) + ) +); From ea3a454b77f46f84e67773022c994db896122912 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Sun, 18 Sep 2016 22:42:07 +0200 Subject: [PATCH 06/20] working on setup with phing --- config/autoload/languages.local.php.dist | 30 +++++++++++++++++++ .../security-authentication.local.php.dist | 8 +++++ 2 files changed, 38 insertions(+) create mode 100644 config/autoload/languages.local.php.dist create mode 100644 config/autoload/security-authentication.local.php.dist diff --git a/config/autoload/languages.local.php.dist b/config/autoload/languages.local.php.dist new file mode 100644 index 0000000..fbc7c8b --- /dev/null +++ b/config/autoload/languages.local.php.dist @@ -0,0 +1,30 @@ + [ + 1 => 'Français', + 2 => 'English', + 3 => 'Deutsch' + ], + + 'defaultLanguageIndex' => 1, + + /* Link with (ModuleCore) + config['languages'] = [ + 'fr' => array( + 'index' => 1, + 'label' => 'Français' + ), + 'en' => array( + 'index' => 2, + 'label' => 'English' + ), + 'de' => array( + 'index' => 3, + 'label' => 'Deutsch' + ), + ] + */ + + 'activeLanguages' => array('fr','en','de',) +); diff --git a/config/autoload/security-authentication.local.php.dist b/config/autoload/security-authentication.local.php.dist new file mode 100644 index 0000000..1213f69 --- /dev/null +++ b/config/autoload/security-authentication.local.php.dist @@ -0,0 +1,8 @@ + array( + 'ttl' => @monarc.ttl@, // timeout + 'salt' => '@monarc.salt@', // salt privé pour chiffrement pwd + ), +); From 8cbfe06dd9d83fab60dee02310309d52c430b240 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 11:19:13 +0200 Subject: [PATCH 07/20] working on setup --- build.properties | 12 ++++ build.xml | 106 ++++++++++++++++++++++++++++++ composer.json | 17 ++++- package.json | 6 +- package.json.continuousphp | 20 ++++++ scripts/compile_translations.sh | 11 ++-- scripts/link_modules_resources.sh | 4 +- 7 files changed, 164 insertions(+), 12 deletions(-) create mode 100644 build.properties create mode 100644 build.xml create mode 100644 package.json.continuousphp diff --git a/build.properties b/build.properties new file mode 100644 index 0000000..2016378 --- /dev/null +++ b/build.properties @@ -0,0 +1,12 @@ +version=0.1.0 +author.name=Pascal Paulis +author.email=pascal.paulis@continuousphp.com + +db.host=localhost +db.name=monarc +db.username=dbuser +db.password=123 + +dir.bin=./bin + +phinx.bin=${dir.bin}/phinx \ No newline at end of file diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..eaa1cfd --- /dev/null +++ b/build.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DROP DATABASE IF EXISTS `${db.name}`; + + + + + + + + + + CREATE DATABASE IF NOT EXISTS ${db.name}; + GRANT USAGE ON *.* TO '${db.username}'@'%' IDENTIFIED BY '${db.password}'; + GRANT UPDATE,CREATE,REFERENCES,ALTER,LOCK TABLES,CREATE VIEW,CREATE + ROUTINE,TRIGGER,INSERT,DELETE,DROP,INDEX,CREATE TEMPORARY TABLES,EXECUTE,SHOW VIEW,ALTER ROUTINE,SELECT ON + `${db.name}`.* TO '${db.username}'@'%'; + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/composer.json b/composer.json index 865f6ce..42f7f30 100644 --- a/composer.json +++ b/composer.json @@ -12,9 +12,22 @@ "php": ">=5.5", "zendframework/zendframework": "2.5.3", "doctrine/doctrine-orm-module": "^0.10", - "robmorgan/phinx": "0.5.*" + "robmorgan/phinx": "0.5.*", + "monarc/core": "dev-beta", + "monarc/backoffice": "dev-beta", + "phing/phing": "~2.0" }, "config": { "bin-dir": "bin/" - } + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/CASES-LU/zm-core" + }, + { + "type": "vcs", + "url": "https://github.com/CASES-LU/zm-backoffice" + } + ] } diff --git a/package.json b/package.json index 6495a18..e2caecc 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,12 @@ }, "author": "Netlor", "license": "Copyright", + "dependencies": { + "ng_anr": "git+ssh://git@github.com/CASES-LU/ng_anr#beta", + "ng_backoffice": "git+ssh://git@github.com/CASES-LU/ng_backoffice#beta" + }, "devDependencies": { "grunt": "~0.4.1", "grunt-cli": "~0.1.13" } -} +} \ No newline at end of file diff --git a/package.json.continuousphp b/package.json.continuousphp new file mode 100644 index 0000000..fe78126 --- /dev/null +++ b/package.json.continuousphp @@ -0,0 +1,20 @@ +{ + "name": "MONARC", + "version": "1.0.0", + "description": "MONARC Skeleton App", + "private": true, + "repository": { + "type": "git", + "url": "https://github.com/CASES-LU/skeleton.git" + }, + "author": "Netlor", + "license": "Copyright", + "dependencies": { + "ng_anr": "git+https://@github.token@:x-oauth-basic@github.com/CASES-LU/ng-anr#beta", + "ng_backoffice": "git+https://@github.token@:x-oauth-basic@github.com/CASES-LU/ng-backoffice#beta" + }, + "devDependencies": { + "grunt": "~0.4.1", + "grunt-cli": "~0.1.13" + } +} \ No newline at end of file diff --git a/scripts/compile_translations.sh b/scripts/compile_translations.sh index 83525d3..2de3e76 100755 --- a/scripts/compile_translations.sh +++ b/scripts/compile_translations.sh @@ -1,16 +1,13 @@ #!/bin/bash -pwd - if [ -d node_modules/ng_backoffice ]; then pushd node_modules/ng_backoffice - node_modules/.bin/grunt compile_translations - node_modules/.bin/grunt concat + ../.bin/grunt compile_translations + ../.bin/grunt concat fi - if [ -d node_modules/ng_client ]; then pushd node_modules/ng_client - node_modules/.bin/grunt compile_translations - node_modules/.bin/grunt concat + ../.bin/grunt compile_translations + ../.bin/grunt concat fi diff --git a/scripts/link_modules_resources.sh b/scripts/link_modules_resources.sh index 5a7c03c..cfbadc4 100755 --- a/scripts/link_modules_resources.sh +++ b/scripts/link_modules_resources.sh @@ -59,7 +59,7 @@ if [ -d node_modules/ng_backoffice ]; then cd ../.. pushd node_modules/ng_backoffice - node_modules/.bin/grunt concat + ../.bin/grunt concat popd fi @@ -90,7 +90,7 @@ if [ -d node_modules/ng_client ]; then cd ../.. pushd node_modules/ng_client - node_modules/.bin/grunt concat + ../.bin/grunt concat popd fi From 9e87ebe9227f79c930b3166da157dfa32067c625 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 11:38:12 +0200 Subject: [PATCH 08/20] working on setup --- build.xml | 8 ++++---- scripts/post-install.sh | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100755 scripts/post-install.sh diff --git a/build.xml b/build.xml index eaa1cfd..5fe6b6f 100644 --- a/build.xml +++ b/build.xml @@ -53,14 +53,14 @@ - + - + - + @@ -68,7 +68,7 @@ - + diff --git a/scripts/post-install.sh b/scripts/post-install.sh new file mode 100755 index 0000000..c2eca07 --- /dev/null +++ b/scripts/post-install.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +npm install + +cd node_modules/ng_backoffice +npm install + +cd ../.. + +# Compile stuff needed for the minified frontend +./scripts/compile_translations.sh +./scripts/link_modules_resources.sh \ No newline at end of file From b4297121c0499e0dedb70a20d46297e63cd8f3e4 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 13:29:55 +0200 Subject: [PATCH 09/20] working on setup --- build.xml | 6 +++++- continuous.yml | 5 +++++ scripts/migrate.sh | 10 ++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 continuous.yml create mode 100755 scripts/migrate.sh diff --git a/build.xml b/build.xml index 5fe6b6f..99156aa 100644 --- a/build.xml +++ b/build.xml @@ -97,10 +97,14 @@ - + + + \ No newline at end of file diff --git a/continuous.yml b/continuous.yml new file mode 100644 index 0000000..9b5d112 --- /dev/null +++ b/continuous.yml @@ -0,0 +1,5 @@ +# continuous.yml +deployment: + hooks: + AfterInstall: + - command: scripts/migrate.sh \ No newline at end of file diff --git a/scripts/migrate.sh b/scripts/migrate.sh new file mode 100755 index 0000000..bd4a7b5 --- /dev/null +++ b/scripts/migrate.sh @@ -0,0 +1,10 @@ +#!/bin/bash +cd /var/www/continuousphp/current + +while [ ! -f /var/lib/continuousphp/credentials.ini ] +do + sleep 2 +done + +vendor/bin/phing -propertyfile /var/lib/continuousphp/credentials.ini init +chown -R www-data:www-data /var/www/continuousphp/current/* \ No newline at end of file From 0451b9c2947088b23d2848424f844029474e9003 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 13:50:42 +0200 Subject: [PATCH 10/20] working on setup --- continuous.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuous.yml b/continuous.yml index 9b5d112..5be542e 100644 --- a/continuous.yml +++ b/continuous.yml @@ -2,4 +2,4 @@ deployment: hooks: AfterInstall: - - command: scripts/migrate.sh \ No newline at end of file + - command: ./scripts/migrate.sh \ No newline at end of file From ad33c92b0ed418a8f6b4e82a68734c72b85f6899 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 14:55:10 +0200 Subject: [PATCH 11/20] working on setup --- continuous.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuous.yml b/continuous.yml index 5be542e..bb67165 100644 --- a/continuous.yml +++ b/continuous.yml @@ -2,4 +2,4 @@ deployment: hooks: AfterInstall: - - command: ./scripts/migrate.sh \ No newline at end of file + - command: chmod +x scripts/migrate.sh && ./scripts/migrate.sh \ No newline at end of file From 6f3af81443b55e3049d408b93a7214bfd6c5e21f Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 15:03:38 +0200 Subject: [PATCH 12/20] working on setup --- scripts/migrate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/migrate.sh b/scripts/migrate.sh index bd4a7b5..b50080e 100755 --- a/scripts/migrate.sh +++ b/scripts/migrate.sh @@ -6,5 +6,5 @@ do sleep 2 done -vendor/bin/phing -propertyfile /var/lib/continuousphp/credentials.ini init +bin/phing -propertyfile /var/lib/continuousphp/credentials.ini init chown -R www-data:www-data /var/www/continuousphp/current/* \ No newline at end of file From be2f09514b2c0f781a9d9959ee87c4ca72a681bd Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 15:26:47 +0200 Subject: [PATCH 13/20] working on setup --- scripts/migrate.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/migrate.sh b/scripts/migrate.sh index b50080e..e250455 100755 --- a/scripts/migrate.sh +++ b/scripts/migrate.sh @@ -6,5 +6,6 @@ do sleep 2 done -bin/phing -propertyfile /var/lib/continuousphp/credentials.ini init -chown -R www-data:www-data /var/www/continuousphp/current/* \ No newline at end of file +chown -R www-data:www-data /var/www/continuousphp/current/* +chmod +x bin/* +bin/phing -propertyfile /var/lib/continuousphp/credentials.ini init \ No newline at end of file From 5bdf1591edead82cddae4388377fe9c495b6b8f8 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 15:48:10 +0200 Subject: [PATCH 14/20] working on setup --- continuous.yml | 2 +- scripts/migrate.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/continuous.yml b/continuous.yml index bb67165..9b5d112 100644 --- a/continuous.yml +++ b/continuous.yml @@ -2,4 +2,4 @@ deployment: hooks: AfterInstall: - - command: chmod +x scripts/migrate.sh && ./scripts/migrate.sh \ No newline at end of file + - command: scripts/migrate.sh \ No newline at end of file diff --git a/scripts/migrate.sh b/scripts/migrate.sh index e250455..02aa88b 100755 --- a/scripts/migrate.sh +++ b/scripts/migrate.sh @@ -7,5 +7,4 @@ do done chown -R www-data:www-data /var/www/continuousphp/current/* -chmod +x bin/* bin/phing -propertyfile /var/lib/continuousphp/credentials.ini init \ No newline at end of file From 6d4e86402c56ee3605a4d07937a7f0fc77017fc7 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 16:13:21 +0200 Subject: [PATCH 15/20] working on setup --- build.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.xml b/build.xml index 99156aa..253c9ee 100644 --- a/build.xml +++ b/build.xml @@ -32,7 +32,7 @@ - + @@ -42,14 +42,14 @@ - + - + - + From a4e71aa11022da845869af7140e615ef9aaac055 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 16:28:26 +0200 Subject: [PATCH 16/20] working on setup --- scripts/client-upgrade-db.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/client-upgrade-db.sh b/scripts/client-upgrade-db.sh index 853e62c..dd1dab0 100755 --- a/scripts/client-upgrade-db.sh +++ b/scripts/client-upgrade-db.sh @@ -13,8 +13,8 @@ cat </tmp/conf.tmp.php array( - 'migrations' => 'module/$MODULE/migrations/db', - 'seeds' => 'module/$MODULE/migrations/seeds', + 'migrations' => 'vendor/monarc/backoffice/migrations/db', + 'seeds' => 'vendor/monarc/backoffice/migrations/seeds', ), 'environments' => array( 'default_migration_table' => 'phinxlog', From 6cb44645ae16aef4244b97f2375b5523bd3125ed Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 16:42:09 +0200 Subject: [PATCH 17/20] working on setup --- scripts/upgrade-db.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/scripts/upgrade-db.sh b/scripts/upgrade-db.sh index 90edf87..69943a1 100755 --- a/scripts/upgrade-db.sh +++ b/scripts/upgrade-db.sh @@ -1,11 +1,4 @@ #!/bin/bash -php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./module/MonarcCore/migrations/phinx.php - -if [ -d module/MonarcBO ]; then - php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./module/MonarcBO/migrations/phinx.php -fi - -if [ -d module/MonarcFO ]; then - php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./module/MonarcFO/migrations/phinx.php -fi +php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./vendor/monarc/core/migrations/phinx.php +php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./vendor/monarc/backoffice/migrations/phinx.php \ No newline at end of file From 29b6c971e3786c2825d7843f64ee25ef1c9be094 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 17:07:20 +0200 Subject: [PATCH 18/20] working on setup --- build.xml | 3 ++- scripts/client-upgrade-db.sh | 4 ++-- scripts/upgrade-db.sh | 11 +++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build.xml b/build.xml index 253c9ee..901b16c 100644 --- a/build.xml +++ b/build.xml @@ -97,7 +97,8 @@ - + + /tmp/conf.tmp.php array( - 'migrations' => 'vendor/monarc/backoffice/migrations/db', - 'seeds' => 'vendor/monarc/backoffice/migrations/seeds', + 'migrations' => 'vendor/monarc/$MODULE/migrations/db', + 'seeds' => 'vendor/monarc/$MODULE/migrations/seeds', ), 'environments' => array( 'default_migration_table' => 'phinxlog', diff --git a/scripts/upgrade-db.sh b/scripts/upgrade-db.sh index 69943a1..90edf87 100755 --- a/scripts/upgrade-db.sh +++ b/scripts/upgrade-db.sh @@ -1,4 +1,11 @@ #!/bin/bash -php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./vendor/monarc/core/migrations/phinx.php -php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./vendor/monarc/backoffice/migrations/phinx.php \ No newline at end of file +php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./module/MonarcCore/migrations/phinx.php + +if [ -d module/MonarcBO ]; then + php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./module/MonarcBO/migrations/phinx.php +fi + +if [ -d module/MonarcFO ]; then + php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./module/MonarcFO/migrations/phinx.php +fi From c4bd1ee8e922cc86029d8da026ad1a172541b9b5 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 17:31:26 +0200 Subject: [PATCH 19/20] working on setup --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 42f7f30..1eb58b9 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,8 @@ "zendframework/zendframework": "2.5.3", "doctrine/doctrine-orm-module": "^0.10", "robmorgan/phinx": "0.5.*", - "monarc/core": "dev-beta", - "monarc/backoffice": "dev-beta", + "monarc/core": "dev-deployment-test", + "monarc/backoffice": "dev-deployment-test", "phing/phing": "~2.0" }, "config": { From f0b114a784c2db897a93033a5886b350bcf1c0f1 Mon Sep 17 00:00:00 2001 From: Guillaume Lesniak Date: Mon, 24 Oct 2016 10:37:36 +0200 Subject: [PATCH 20/20] Update composer.json branches to beta --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1eb58b9..42f7f30 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,8 @@ "zendframework/zendframework": "2.5.3", "doctrine/doctrine-orm-module": "^0.10", "robmorgan/phinx": "0.5.*", - "monarc/core": "dev-deployment-test", - "monarc/backoffice": "dev-deployment-test", + "monarc/core": "dev-beta", + "monarc/backoffice": "dev-beta", "phing/phing": "~2.0" }, "config": {