From 3170c4184459fbb1f72e04c011efdae01a905593 Mon Sep 17 00:00:00 2001 From: Marek Obuchowicz Date: Wed, 14 Sep 2016 15:33:45 +0200 Subject: [PATCH 01/11] Update CircleCI hostnames to new domain convention --- config/Shared/ci/travis/travis-ci-apache-yves | 2 +- config/Shared/ci/travis/travis-ci-apache-zed | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/Shared/ci/travis/travis-ci-apache-yves b/config/Shared/ci/travis/travis-ci-apache-yves index 453c3683f..854a829a6 100644 --- a/config/Shared/ci/travis/travis-ci-apache-yves +++ b/config/Shared/ci/travis/travis-ci-apache-yves @@ -1,7 +1,7 @@ DocumentRoot %TRAVIS_BUILD_DIR%/public/Yves - ServerName www.de.spryker.dev + ServerName www.de.spryker.local SetHandler application/x-httpd-php diff --git a/config/Shared/ci/travis/travis-ci-apache-zed b/config/Shared/ci/travis/travis-ci-apache-zed index ff65eae46..06430bf01 100644 --- a/config/Shared/ci/travis/travis-ci-apache-zed +++ b/config/Shared/ci/travis/travis-ci-apache-zed @@ -1,7 +1,7 @@ DocumentRoot %TRAVIS_BUILD_DIR%/public/Zed - ServerName zed.de.spryker.dev + ServerName zed.de.spryker.local ErrorLog /tmp/zed-error.log From c5598ca7d4ac0c550f8bb631214a3df35ac48a82 Mon Sep 17 00:00:00 2001 From: Marek Obuchowicz Date: Thu, 15 Sep 2016 17:32:07 +0200 Subject: [PATCH 02/11] Update URLs to new convention --- codeception.yml | 2 +- composer.json | 2 +- .../Shared/config_default-development_DE.php | 8 +- .../Shared/config_default-development_US.php | 12 +-- config/Shared/config_default.php | 1 + deploy/setup/functions.sh | 34 ++++-- setup_test | 101 ++++++++++++++++++ 7 files changed, 139 insertions(+), 21 deletions(-) create mode 100755 setup_test diff --git a/codeception.yml b/codeception.yml index 0c9cf97a6..1e793fe47 100644 --- a/codeception.yml +++ b/codeception.yml @@ -28,7 +28,7 @@ modules: coverage: enabled: true remote: true - c3_url: 'http://zed.de.spryker.dev' + c3_url: 'http://zed.de.project.local' whitelist: { include: ['src/Pyz/*.php'] } extensions: diff --git a/composer.json b/composer.json index a35ec0ab9..0d97cc804 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Project", "license": "MIT", "require": { - "spryker/spryker": "dev-master", + "spryker/spryker": "dev-testing_enviroment", "php": ">=5.6.0", "braintree/braintree_php": "~3.15.0", diff --git a/config/Shared/config_default-development_DE.php b/config/Shared/config_default-development_DE.php index 5d2eabffa..873e7c3a7 100644 --- a/config/Shared/config_default-development_DE.php +++ b/config/Shared/config_default-development_DE.php @@ -13,7 +13,7 @@ $config[PropelConstants::ZED_DB_ENGINE] = $config[PropelConstants::ZED_DB_ENGINE_PGSQL]; $config[PropelConstants::ZED_DB_PORT] = 5432; -$yvesHost = 'www.de.spryker.dev'; +$yvesHost = 'www.de.project.local'; $config[ApplicationConstants::HOST_YVES] = 'http://' . $yvesHost; $config[ApplicationConstants::HOST_STATIC_ASSETS] = $config[ApplicationConstants::HOST_STATIC_MEDIA] = $yvesHost; $config[SessionConstants::YVES_SESSION_COOKIE_DOMAIN] = $yvesHost; @@ -21,7 +21,7 @@ $config[ApplicationConstants::HOST_SSL_YVES] = 'https://' . $yvesHost; $config[ApplicationConstants::HOST_SSL_STATIC_ASSETS] = $config[ApplicationConstants::HOST_SSL_STATIC_MEDIA] = $yvesHost; -$zedHost = 'zed.de.spryker.dev'; +$zedHost = 'zed.de.project.local'; $config[ApplicationConstants::HOST_ZED_GUI] = 'http://' . $zedHost; $config[ApplicationConstants::HOST_ZED_API] = $zedHost; @@ -32,8 +32,8 @@ $config[SessionConstants::ZED_SESSION_COOKIE_NAME] = $zedHost; $config[SessionConstants::ZED_SESSION_COOKIE_SECURE] = false; -$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.de.spryker.dev'; -$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.de.spryker.dev'; +$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.project.local'; +$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.project.local'; $config[ApplicationConstants::JENKINS_BASE_URL] = 'http://localhost:10007/'; $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':1080'; diff --git a/config/Shared/config_default-development_US.php b/config/Shared/config_default-development_US.php index 9e3108d46..d4c200c49 100644 --- a/config/Shared/config_default-development_US.php +++ b/config/Shared/config_default-development_US.php @@ -3,14 +3,14 @@ use Spryker\Shared\Application\ApplicationConstants; use Spryker\Shared\Mail\MailConstants; -$yvesHost = 'www.com.spryker.dev'; +$yvesHost = 'www.com.project.local'; $config[ApplicationConstants::HOST_YVES] = 'http://' . $yvesHost; $config[ApplicationConstants::HOST_STATIC_ASSETS] = $config[ApplicationConstants::HOST_STATIC_MEDIA] = $yvesHost; $config[ApplicationConstants::HOST_SSL_YVES] = 'https://' . $yvesHost; $config[ApplicationConstants::HOST_SSL_STATIC_ASSETS] = $config[ApplicationConstants::HOST_SSL_STATIC_MEDIA] = $yvesHost; -$zedHost = 'zed.com.spryker.dev'; +$zedHost = 'zed.com.project.local'; $config[ApplicationConstants::HOST_ZED_GUI] = $config[ApplicationConstants::HOST_ZED_API] = 'http://' . $zedHost; @@ -20,17 +20,17 @@ $config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost]; -$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.com.spryker.dev'; -$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.com.spryker.dev'; +$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.project.local'; +$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.project.local'; $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':1080'; /* RabbitMQ */ $config[ApplicationConstants::ZED_RABBITMQ_HOST] = 'localhost'; $config[ApplicationConstants::ZED_RABBITMQ_PORT] = '5672'; -$config[ApplicationConstants::ZED_RABBITMQ_USERNAME] = 'DE_development'; +$config[ApplicationConstants::ZED_RABBITMQ_USERNAME] = 'US_development'; $config[ApplicationConstants::ZED_RABBITMQ_PASSWORD] = 'mate20mg'; -$config[ApplicationConstants::ZED_RABBITMQ_VHOST] = '/DE_development_zed'; +$config[ApplicationConstants::ZED_RABBITMQ_VHOST] = '/US_development_zed'; /* Elasticsearch */ $config[ApplicationConstants::ELASTICA_PARAMETER__INDEX_NAME] = 'us_search'; diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index cc768b4f5..c9e164ea3 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -69,6 +69,7 @@ */ $config[SearchConstants::SEARCH_CONFIG_CACHE_KEY] = 'search_config_cache'; $config[SearchConstants::FULL_TEXT_BOOSTED_BOOSTING_VALUE] = 3; +$config[SearchConstants::SEARCH_INDEX_NAME_SUFFIX] = ''; /** * Hostname(s) for Yves - Shop frontend diff --git a/deploy/setup/functions.sh b/deploy/setup/functions.sh index 994b963d0..eb30aae64 100644 --- a/deploy/setup/functions.sh +++ b/deploy/setup/functions.sh @@ -80,20 +80,20 @@ function dumpDevelopmentDatabase { export PGPASSWORD=$DATABASE_PASSWORD export LC_ALL="en_US.UTF-8" - pg_dump -i -h 127.0.0.1 -U $DATABASE_USER -F c -b -v -f $DATABASE_NAME.backup $DATABASE_NAME + if [[ -z "$1" ]]; then + DATABASE_BACKUP_PATH=$DATABASE_NAME.backup; + else + DATABASE_BACKUP_PATH=$1 + fi + + pg_dump -i -h 127.0.0.1 -U $DATABASE_USER -F c -b -v -f $DATABASE_BACKUP_PATH $DATABASE_NAME } function restoreDevelopmentDatabase { read -r -p "Restore database ${DATABASE_NAME} ? [y/N] " response case $response in [yY][eE][sS]|[yY]) - export PGPASSWORD=$DATABASE_PASSWORD - export LC_ALL="en_US.UTF-8" - - sudo pg_ctlcluster 9.4 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_NAME.backup + dropAndRestoreDatabase ;; *) echo "Nothing done." @@ -101,6 +101,22 @@ function restoreDevelopmentDatabase { esac } +function dropAndRestoreDatabase { + if [[ -z "$1" ]]; then + DATABASE_BACKUP_PATH=$DATABASE_NAME.backup; + else + DATABASE_BACKUP_PATH=$1 + fi + + export PGPASSWORD=$DATABASE_PASSWORD + export LC_ALL="en_US.UTF-8" + + sudo pg_ctlcluster 9.4 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 +} + function installDemoshop { labelText "Preparing to install Spryker Platform..." @@ -114,7 +130,7 @@ function installDemoshop { configureCodeception successText "Setup successful" - infoText "\nYves URL: http://www.de.spryker.dev/\nZed URL: http://zed.de.spryker.dev/\n" + infoText "\nYves URL: http://www.de.project.local/\nZed URL: http://zed.de.project.local/\n" } function installZed { diff --git a/setup_test b/setup_test new file mode 100755 index 000000000..15626591a --- /dev/null +++ b/setup_test @@ -0,0 +1,101 @@ +#!/bin/bash + +set -o pipefail + +SETUP='spryker' +DEVELOPMENT_DATABASE_NAME='DE_development_zed' +DATABASE_NAME='DE_devtest_zed' +DATABASE_USER='devtest' +DATABASE_PASSWORD='mate20mg' +VERBOSITY='-v' +CONSOLE=vendor/bin/console +PHANTOMJS_CDNURL='https://github.com/Medium/phantomjs/' +DATABASE_BACKUP_PATH='data/test.backup' + +export APPLICATION_ENV='devtest' + +. deploy/setup/functions.sh + +warningText "This script should be used only in development and NEVER IN PRODUCTION" + +function backupTestingEnvData { + + dropDevelopmentDatabase + + labelText "Running setup:install" + $CONSOLE setup:install $VERBOSITY + writeErrorMessage "Setup install failed" + + labelText "Running propel code generation/migrations" + $CONSOLE propel:install $VERBOSITY + $CONSOLE propel:diff $VERBOSITY + $CONSOLE propel:migrate $VERBOSITY + + labelText "Importing Demo data" + $CONSOLE import:demo-data $VERBOSITY + writeErrorMessage "DemoData import failed" + + labelText "Initializing DB" + $CONSOLE setup:init-db $VERBOSITY + writeErrorMessage "DB setup failed" + + runCollectors + + backupDevelopmentForTests + + successText "Backup successful." +} + +function restoreTestingEnvData { + dropAndRestoreDatabase $DATABASE_BACKUP_PATH +} + +function backupDevelopmentForTests { + export PGPASSWORD=$DATABASE_PASSWORD + export LC_ALL="en_US.UTF-8" + + pg_dump -i -h 127.0.0.1 -U $DATABASE_USER -F c -b -v -f $DATABASE_BACKUP_PATH $DATABASE_NAME +} + +function runCollectors() { + export PGPASSWORD=$DATABASE_PASSWORD + labelText "Reset touch table." + psql -h 127.0.0.1 -U $DATABASE_USER -d $DATABASE_NAME -c 'UPDATE spy_touch set touched=now()' -w + + labelText "Run collectors." + $CONSOLE collector:search:export $VERBOSITY + $CONSOLE collector:storage:export $VERBOSITY +} + +if [ $# -eq 0 ]; then + displayHelp + exit 0 +fi + +for arg in "$@" +do + case $arg in + + "--restore" | "-r" ) + restoreTestingEnvData + ;; + + "--backup" | "-b" ) + backupTestingEnvData + ;; + "--collectors" | "-c" ) + runCollectors + ;; + + *) + displayHeader + echo "" + echo "Unrecognized option: $@. Use -h to display help." + exit 1 + ;; + esac +done + + +exit 0 + From 5f109bb192aad91420b3aa8b6699bd3705895f11 Mon Sep 17 00:00:00 2001 From: Marek Obuchowicz Date: Thu, 15 Sep 2016 17:32:40 +0200 Subject: [PATCH 03/11] Add configs for devtest environment --- config/Shared/config_default-devtest.php | 44 +++++++++++++++++++++ config/Shared/config_default-devtest_DE.php | 18 +++++++++ 2 files changed, 62 insertions(+) create mode 100644 config/Shared/config_default-devtest.php create mode 100644 config/Shared/config_default-devtest_DE.php diff --git a/config/Shared/config_default-devtest.php b/config/Shared/config_default-devtest.php new file mode 100644 index 000000000..58b42f3aa --- /dev/null +++ b/config/Shared/config_default-devtest.php @@ -0,0 +1,44 @@ + '', +]; + +$config[ApplicationConstants::JENKINS_BASE_URL] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':10007/jenkins'; +$config[ApplicationConstants::JENKINS_DIRECTORY] = '/data/shop/development/shared/data/common/jenkins'; + +$config[ApplicationConstants::APPLICATION_SPRYKER_ROOT] = APPLICATION_ROOT_DIR . '/vendor/spryker/spryker/Bundles'; + +$config[SearchConstants::SEARCH_INDEX_NAME_SUFFIX] = '_devtest'; diff --git a/config/Shared/config_default-devtest_DE.php b/config/Shared/config_default-devtest_DE.php new file mode 100644 index 000000000..7eaa5d23f --- /dev/null +++ b/config/Shared/config_default-devtest_DE.php @@ -0,0 +1,18 @@ + Date: Tue, 13 Sep 2016 16:55:30 +0200 Subject: [PATCH 04/11] CORE-372 BC check. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0d97cc804..03e2016be 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Project", "license": "MIT", "require": { - "spryker/spryker": "dev-testing_enviroment", + "spryker/spryker": "dev-bugfix/php7-comp", "php": ">=5.6.0", "braintree/braintree_php": "~3.15.0", From a951bc8263bb3e2e7b4d4d1552b95d36e650ac68 Mon Sep 17 00:00:00 2001 From: mscherer Date: Thu, 20 Oct 2016 16:59:08 +0200 Subject: [PATCH 05/11] Update composer lock --- config/Shared/config_default.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index c9e164ea3..cc768b4f5 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -69,7 +69,6 @@ */ $config[SearchConstants::SEARCH_CONFIG_CACHE_KEY] = 'search_config_cache'; $config[SearchConstants::FULL_TEXT_BOOSTED_BOOSTING_VALUE] = 3; -$config[SearchConstants::SEARCH_INDEX_NAME_SUFFIX] = ''; /** * Hostname(s) for Yves - Shop frontend From c6c72a18756a4607fccdcb33d2a7df34826425fe Mon Sep 17 00:00:00 2001 From: Marek Obuchowicz Date: Mon, 31 Oct 2016 15:09:32 +0000 Subject: [PATCH 06/11] Disable Yves Trusted hosts --- config/Shared/config_default-development_DE.php | 2 +- config/Shared/config_default-development_US.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/Shared/config_default-development_DE.php b/config/Shared/config_default-development_DE.php index 873e7c3a7..b2992162e 100644 --- a/config/Shared/config_default-development_DE.php +++ b/config/Shared/config_default-development_DE.php @@ -37,7 +37,7 @@ $config[ApplicationConstants::JENKINS_BASE_URL] = 'http://localhost:10007/'; $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':1080'; -$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost]; +$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = []; /* Elasticsearch */ $config[ApplicationConstants::ELASTICA_PARAMETER__INDEX_NAME] = 'de_search'; diff --git a/config/Shared/config_default-development_US.php b/config/Shared/config_default-development_US.php index d4c200c49..80e988760 100644 --- a/config/Shared/config_default-development_US.php +++ b/config/Shared/config_default-development_US.php @@ -18,7 +18,7 @@ = $config[ApplicationConstants::HOST_SSL_ZED_API] = 'https://' . $zedHost; -$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost]; +$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = []; $config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.project.local'; $config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.project.local'; From d881f784fd12677f2714f1412d4301cf77d75a6b Mon Sep 17 00:00:00 2001 From: Marek Obuchowicz Date: Mon, 31 Oct 2016 15:09:46 +0000 Subject: [PATCH 07/11] Remove undeclared configs from constants --- config/Shared/config_default-devtest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config/Shared/config_default-devtest.php b/config/Shared/config_default-devtest.php index 58b42f3aa..9e7c80fec 100644 --- a/config/Shared/config_default-devtest.php +++ b/config/Shared/config_default-devtest.php @@ -41,4 +41,3 @@ $config[ApplicationConstants::APPLICATION_SPRYKER_ROOT] = APPLICATION_ROOT_DIR . '/vendor/spryker/spryker/Bundles'; -$config[SearchConstants::SEARCH_INDEX_NAME_SUFFIX] = '_devtest'; From f6a195a385e0e9abee916667679b0d1e8cf4832f Mon Sep 17 00:00:00 2001 From: Marek Obuchowicz Date: Mon, 31 Oct 2016 16:26:03 +0000 Subject: [PATCH 08/11] Adjust default hostname(s) --- config/Shared/config_default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index cc768b4f5..0b60353bc 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -90,7 +90,7 @@ = $config[ApplicationConstants::HOST_ZED_API] = $config[ApplicationConstants::HOST_SSL_ZED_GUI] = $config[ApplicationConstants::HOST_SSL_ZED_API] - = 'zed.de.spryker.dev'; + = 'zed.de.project.local'; $config[ApplicationConstants::YVES_TRUSTED_HOSTS] = []; From 4f717706452cd8b7d9ca2d6d9a00a207c6617ab8 Mon Sep 17 00:00:00 2001 From: Marek Obuchowicz Date: Mon, 31 Oct 2016 16:42:22 +0000 Subject: [PATCH 09/11] Fix codesniff issues --- config/Shared/config_default-devtest.php | 2 -- config/Shared/config_default-devtest_DE.php | 2 -- 2 files changed, 4 deletions(-) diff --git a/config/Shared/config_default-devtest.php b/config/Shared/config_default-devtest.php index 9e7c80fec..baf2301b8 100644 --- a/config/Shared/config_default-devtest.php +++ b/config/Shared/config_default-devtest.php @@ -7,7 +7,6 @@ use Spryker\Shared\Application\ApplicationConstants; use Spryker\Shared\Payone\PayoneConstants; use Spryker\Shared\Session\SessionConstants; -use Spryker\Shared\Search\SearchConstants; use Spryker\Shared\Storage\StorageConstants; $config[SessionConstants::YVES_SESSION_SAVE_HANDLER] = SessionConstants::SESSION_HANDLER_REDIS; @@ -40,4 +39,3 @@ $config[ApplicationConstants::JENKINS_DIRECTORY] = '/data/shop/development/shared/data/common/jenkins'; $config[ApplicationConstants::APPLICATION_SPRYKER_ROOT] = APPLICATION_ROOT_DIR . '/vendor/spryker/spryker/Bundles'; - diff --git a/config/Shared/config_default-devtest_DE.php b/config/Shared/config_default-devtest_DE.php index 7eaa5d23f..7998e7550 100644 --- a/config/Shared/config_default-devtest_DE.php +++ b/config/Shared/config_default-devtest_DE.php @@ -14,5 +14,3 @@ $config[ApplicationConstants::ZED_DB_PORT] = 5432; $config[ApplicationConstants::ELASTICA_PARAMETER__INDEX_NAME] = 'de_search_devtest'; - - From 096915aca703eacfe91f7c9051d8291857189521 Mon Sep 17 00:00:00 2001 From: mscherer Date: Mon, 14 Nov 2016 16:05:36 +0100 Subject: [PATCH 10/11] Update composer lock --- composer.lock | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/composer.lock b/composer.lock index 211b7b6be..21d3eb088 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "e492a4ce8f22d54dd30f79ecc5aa9e4e", - "content-hash": "ce252d74c9e573c9762dd89fc3bcd32a", + "hash": "a3f25cc8337510b52dbfcb5f06401525", + "content-hash": "fce546b6d40ec3358bedd8cb61c8216e", "packages": [ { "name": "braintree/braintree_php", @@ -1249,11 +1249,11 @@ }, { "name": "spryker/spryker", - "version": "dev-master", + "version": "dev-bugfix/php7-comp", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "d33ffc2d92a00cdb3791b5d0af3b417d1450aaf8" + "reference": "4e77a5de70b0229fa1a3681ff3992f86c7cb6c99" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1784,7 +1784,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-11-11 16:51:39" + "time": "2016-11-11 09:25:01" }, { "name": "symfony-cmf/routing", @@ -2507,16 +2507,16 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "0f8dc2c45f69f8672379e9210bca4a115cd5146f" + "reference": "2d6e2b20d457603eefb6e614286c22efca30fdb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/0f8dc2c45f69f8672379e9210bca4a115cd5146f", - "reference": "0f8dc2c45f69f8672379e9210bca4a115cd5146f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2d6e2b20d457603eefb6e614286c22efca30fdb4", + "reference": "2d6e2b20d457603eefb6e614286c22efca30fdb4", "shasum": "" }, "require": { @@ -2529,7 +2529,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2561,20 +2561,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "dff51f72b0706335131b00a7f49606168c582594" + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", - "reference": "dff51f72b0706335131b00a7f49606168c582594", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", "shasum": "" }, "require": { @@ -2586,7 +2586,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2620,20 +2620,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/polyfill-php54", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1" + "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1", - "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/90e085822963fdcc9d1c5b73deb3d2e5783b16a0", + "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0", "shasum": "" }, "require": { @@ -2642,7 +2642,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2678,20 +2678,20 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/polyfill-php55", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d" + "reference": "03e3f0350bca2220e3623a0e340eef194405fc67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d", - "reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/03e3f0350bca2220e3623a0e340eef194405fc67", + "reference": "03e3f0350bca2220e3623a0e340eef194405fc67", "shasum": "" }, "require": { @@ -2701,7 +2701,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2734,7 +2734,7 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/process", From 6fedce2eceaf6a8b8f8f511df0724e6c304b63de Mon Sep 17 00:00:00 2001 From: mscherer Date: Mon, 14 Nov 2016 16:23:55 +0100 Subject: [PATCH 11/11] Update composer --- composer.json | 2 +- composer.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 03e2016be..a35ec0ab9 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Project", "license": "MIT", "require": { - "spryker/spryker": "dev-bugfix/php7-comp", + "spryker/spryker": "dev-master", "php": ">=5.6.0", "braintree/braintree_php": "~3.15.0", diff --git a/composer.lock b/composer.lock index 21d3eb088..534a6632f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a3f25cc8337510b52dbfcb5f06401525", - "content-hash": "fce546b6d40ec3358bedd8cb61c8216e", + "hash": "e492a4ce8f22d54dd30f79ecc5aa9e4e", + "content-hash": "ce252d74c9e573c9762dd89fc3bcd32a", "packages": [ { "name": "braintree/braintree_php", @@ -1249,11 +1249,11 @@ }, { "name": "spryker/spryker", - "version": "dev-bugfix/php7-comp", + "version": "dev-master", "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "4e77a5de70b0229fa1a3681ff3992f86c7cb6c99" + "reference": "345adba7d6d78c4f32835b55bdc1ec4e9a32699a" }, "require": { "everon/criteria-builder": "^1.1.0", @@ -1784,7 +1784,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2016-11-11 09:25:01" + "time": "2016-11-14 10:51:39" }, { "name": "symfony-cmf/routing",