From 903457498bfb010199416a2f12daeb2d1c5cc899 Mon Sep 17 00:00:00 2001 From: Hussam Hebbo Date: Wed, 18 Oct 2017 16:00:33 +0000 Subject: [PATCH 1/8] updated functions in setup script --- deploy/setup/functions.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/setup/functions.sh b/deploy/setup/functions.sh index 4214597de..db7ea3c54 100644 --- a/deploy/setup/functions.sh +++ b/deploy/setup/functions.sh @@ -88,7 +88,8 @@ function dropAndRestoreDatabase { mysql -u${DATABASE_USER} -p${DATABASE_PASSWORD} -e "CREATE DATABASE ${DATABASE_NAME};" mysql -u${DATABASE_USER} -p${DATABASE_PASSWORD} ${DATABASE_NAME} < ${DATABASE_BACKUP_PATH} else - sudo pg_ctlcluster 9.4 main restart --force + PG_VERSION=$(psql --version | awk '{print $3}' | cut -f1,2 -d'.') + sudo pg_ctlcluster $PG_VERSION main restart --force sudo dropdb $DATABASE_NAME sudo createdb $DATABASE_NAME pg_restore -i -h 127.0.0.1 -p 5432 -U $DATABASE_USER -d $DATABASE_NAME -v $DATABASE_BACKUP_PATH @@ -233,7 +234,8 @@ function dropDevelopmentDatabase { if [[ -f $PG_CTL_CLUSTER ]] && [[ -f $DROP_DB ]]; then labelText "Deleting PostgreSql Database: ${DATABASE_NAME} " labelText "Drop PostgresSQL database: ${DATABASE_NAME}" - sudo pg_ctlcluster 9.4 main restart --force && sudo -u postgres dropdb $DATABASE_NAME 1>/dev/null + PG_VERSION=$(psql --version | awk '{print $3}' | cut -f1,2 -d'.') + sudo pg_ctlcluster $PG_VERSION main restart --force && sudo -u postgres dropdb $DATABASE_NAME 1>/dev/null writeErrorMessage "Deleting DB command failed" fi From bafe71975de8a613d3fdfff5f9f6c1c168b0cef9 Mon Sep 17 00:00:00 2001 From: Hussam Hebbo Date: Wed, 18 Oct 2017 16:06:30 +0000 Subject: [PATCH 2/8] cleaned up code --- deploy/setup/functions.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy/setup/functions.sh b/deploy/setup/functions.sh index db7ea3c54..ab80547d7 100644 --- a/deploy/setup/functions.sh +++ b/deploy/setup/functions.sh @@ -17,6 +17,7 @@ CURL=`which curl` NPM=`which npm` GIT=`which git` PHP=`which php` +PG_VERSION=$(psql --version | awk '{print $3}' | cut -f1,2 -d'.') if [[ `echo "$@" | grep '\-v'` ]]; then VERBOSITY='-v' @@ -88,7 +89,6 @@ function dropAndRestoreDatabase { mysql -u${DATABASE_USER} -p${DATABASE_PASSWORD} -e "CREATE DATABASE ${DATABASE_NAME};" mysql -u${DATABASE_USER} -p${DATABASE_PASSWORD} ${DATABASE_NAME} < ${DATABASE_BACKUP_PATH} else - PG_VERSION=$(psql --version | awk '{print $3}' | cut -f1,2 -d'.') sudo pg_ctlcluster $PG_VERSION main restart --force sudo dropdb $DATABASE_NAME sudo createdb $DATABASE_NAME @@ -234,7 +234,6 @@ function dropDevelopmentDatabase { if [[ -f $PG_CTL_CLUSTER ]] && [[ -f $DROP_DB ]]; then labelText "Deleting PostgreSql Database: ${DATABASE_NAME} " labelText "Drop PostgresSQL database: ${DATABASE_NAME}" - PG_VERSION=$(psql --version | awk '{print $3}' | cut -f1,2 -d'.') sudo pg_ctlcluster $PG_VERSION main restart --force && sudo -u postgres dropdb $DATABASE_NAME 1>/dev/null writeErrorMessage "Deleting DB command failed" fi From 6eb52285782d9406d9797eb6c272db6fe9df1999 Mon Sep 17 00:00:00 2001 From: Denis Turkov Date: Thu, 19 Oct 2017 12:21:26 +0000 Subject: [PATCH 3/8] CORE-2155: Fix a project for a proper return value --- .../Business/Model/StateMachineExampleItemSaver.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Pyz/Zed/StateMachineExample/Business/Model/StateMachineExampleItemSaver.php b/src/Pyz/Zed/StateMachineExample/Business/Model/StateMachineExampleItemSaver.php index 733ea4090..00dcc89b3 100644 --- a/src/Pyz/Zed/StateMachineExample/Business/Model/StateMachineExampleItemSaver.php +++ b/src/Pyz/Zed/StateMachineExample/Business/Model/StateMachineExampleItemSaver.php @@ -50,7 +50,6 @@ public function createExampleItem() { $stateMachineExampleItemEntity = new PyzStateMachineExampleItem(); $stateMachineExampleItemEntity->setName('Test item ' . rand(123, 321)); - $stateMachineExampleItemEntity->save(); $affectedRowCount = $stateMachineExampleItemEntity->save(); From 055ef704dfd72932e390fdc8a9dcacbd779144c5 Mon Sep 17 00:00:00 2001 From: Denis Turkov Date: Thu, 19 Oct 2017 12:29:10 +0000 Subject: [PATCH 4/8] CORE-2155: Composer update --- composer.json | 2 +- composer.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 93894627e..cbb7586c0 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Project", "license": "MIT", "require": { - "spryker/spryker": "dev-master", + "spryker/spryker": "dev-bugfix/core-2155-statemachine-subprocess-reuse", "php": ">=5.6.0", "braintree/braintree_php": "~3.15.0", diff --git a/composer.lock b/composer.lock index 54b093e34..1dbcd6a91 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "ecd72eec046c4fc2ea7d6d5f4fd8dc6c", + "content-hash": "952fc93acffcb2a442fe6b65a10849f0", "packages": [ { "name": "braintree/braintree_php", @@ -1623,11 +1623,11 @@ }, { "name": "spryker/spryker", - "version": "dev-master", + "version": "dev-bugfix/core-2155-statemachine-subprocess-reuse", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "180f21c88d2cd9be462f8e2a1a4b887d1cef1e9d" + "reference": "b38e69ac42a4a654bdb38953ced1f45a45347416" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1821,7 +1821,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2017-10-18T10:33:12+00:00" + "time": "2017-10-19T11:03:09+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -4023,16 +4023,16 @@ }, { "name": "codeception/c3", - "version": "2.0.12", + "version": "2.0.13", "source": { "type": "git", "url": "https://github.com/Codeception/c3.git", - "reference": "f08f20b0b6191f0c58be022c6f20d5b1cdc1004c" + "reference": "7cbeb7029efe621cf5a5b73853e5321147bfab01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/c3/zipball/f08f20b0b6191f0c58be022c6f20d5b1cdc1004c", - "reference": "f08f20b0b6191f0c58be022c6f20d5b1cdc1004c", + "url": "https://api.github.com/repos/Codeception/c3/zipball/7cbeb7029efe621cf5a5b73853e5321147bfab01", + "reference": "7cbeb7029efe621cf5a5b73853e5321147bfab01", "shasum": "" }, "require": { @@ -4069,7 +4069,7 @@ "code coverage", "codecoverage" ], - "time": "2017-04-06T00:08:55+00:00" + "time": "2017-10-19T07:08:06+00:00" }, { "name": "codeception/codeception", @@ -6598,7 +6598,7 @@ ], "authors": [ { - "name": "Sullivan Senechal", + "name": "Sullivan SENECHAL", "email": "soullivaneuh@gmail.com" } ], From 9d29b8e8016f77de32b055c49d0ed0d4033ffe43 Mon Sep 17 00:00:00 2001 From: mscherer Date: Thu, 19 Oct 2017 15:39:53 +0200 Subject: [PATCH 5/8] Fix indentation for yml files. --- .editorconfig | 4 ---- codeception.yml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index a7a066fd2..9bd45737b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,10 +13,6 @@ trim_trailing_whitespace = true [*.bat] end_of_line = crlf -[*.yml] -indent_style = space -indent_size = 2 - [*.json] indent_style = space indent_size = 2 diff --git a/codeception.yml b/codeception.yml index 81a788476..0c4e7b61e 100644 --- a/codeception.yml +++ b/codeception.yml @@ -2,8 +2,8 @@ namespace: PyzTest actor: Tester include: - - tests/PyzTest/*/* - - vendor/spryker/spryker/Bundles/*/* + - tests/PyzTest/*/* + - vendor/spryker/spryker/Bundles/*/* paths: tests: tests From c6647d03bac10b347a908719e531339c82e88e7d Mon Sep 17 00:00:00 2001 From: Denis Turkov Date: Thu, 19 Oct 2017 14:01:03 +0000 Subject: [PATCH 6/8] CORE-2155: Composer update --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 30ef2af9e..651decc32 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "f54702266ffb5e8fe28e740b67a67e7b", + "content-hash": "f763a8d84761d7094d4e94b271be2e1a", "packages": [ { "name": "braintree/braintree_php", @@ -1661,11 +1661,11 @@ }, { "name": "spryker/spryker", - "version": "dev-master", + "version": "dev-bugfix/core-2155-statemachine-subprocess-reuse", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "fa784b21d54f107981abee3a4088236eb15c4a28" + "reference": "30804d19f7282fca06d89c11fbeea9fabc01bc3b" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1863,7 +1863,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2017-10-19T09:20:10+00:00" + "time": "2017-10-19T13:57:42+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -6640,7 +6640,7 @@ ], "authors": [ { - "name": "Sullivan Senechal", + "name": "Sullivan SENECHAL", "email": "soullivaneuh@gmail.com" } ], From a17f71a8e9593fd1abea026d9fbbb8ff7b619d19 Mon Sep 17 00:00:00 2001 From: mscherer Date: Fri, 20 Oct 2017 10:38:31 +0200 Subject: [PATCH 7/8] Update spryker core. --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 30ef2af9e..87c226e7a 100644 --- a/composer.lock +++ b/composer.lock @@ -1665,7 +1665,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "fa784b21d54f107981abee3a4088236eb15c4a28" + "reference": "4c4b19d2919de0cbde12ba434d9559bdbc84c7bf" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1863,7 +1863,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2017-10-19T09:20:10+00:00" + "time": "2017-10-20T08:33:35+00:00" }, { "name": "swiftmailer/swiftmailer", From 46a5dfa21912bfa1c35bd1052be68c219812f5b5 Mon Sep 17 00:00:00 2001 From: mscherer Date: Fri, 20 Oct 2017 12:20:46 +0200 Subject: [PATCH 8/8] Update spryker core. --- composer.json | 2 +- composer.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 1c242eabb..5b1172856 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Project", "license": "MIT", "require": { - "spryker/spryker": "dev-bugfix/core-2155-statemachine-subprocess-reuse", + "spryker/spryker": "dev-master", "php": ">=5.6.0", "braintree/braintree_php": "~3.15.0", diff --git a/composer.lock b/composer.lock index 87c226e7a..546517767 100644 --- a/composer.lock +++ b/composer.lock @@ -1665,7 +1665,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "4c4b19d2919de0cbde12ba434d9559bdbc84c7bf" + "reference": "54e8bca73fc70a03508f4c9707515e375f266571" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1863,7 +1863,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2017-10-20T08:33:35+00:00" + "time": "2017-10-20T09:37:18+00:00" }, { "name": "swiftmailer/swiftmailer",