diff --git a/codeception.yml b/codeception.yml index 3296dc183..97c46c8b2 100644 --- a/codeception.yml +++ b/codeception.yml @@ -30,7 +30,7 @@ coverage: enabled: true remote: true c3_url: 'http://zed.de.project.local' - whitelist: { include: ['src/*.php'] } + whitelist: { include: ['src/Pyz/*.php'] } extensions: enabled: diff --git a/composer.lock b/composer.lock index 25908469f..e7d85dde3 100644 --- a/composer.lock +++ b/composer.lock @@ -2496,16 +2496,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": { @@ -2518,7 +2518,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2550,20 +2550,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": { @@ -2575,7 +2575,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2609,20 +2609,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": { @@ -2631,7 +2631,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2667,20 +2667,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": { @@ -2690,7 +2690,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2723,7 +2723,7 @@ "portable", "shim" ], - "time": "2016-05-18 14:26:46" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/process", diff --git a/config/Shared/ci/travis/travis-ci-apache-yves b/config/Shared/ci/travis/travis-ci-apache-yves index d6adf85bf..4a8f83db5 100644 --- a/config/Shared/ci/travis/travis-ci-apache-yves +++ b/config/Shared/ci/travis/travis-ci-apache-yves @@ -1,8 +1,8 @@ DocumentRoot %TRAVIS_BUILD_DIR%/public/Yves - ServerName www.de.spryker.test - SetEnv APPLICATION_ENV test + ServerName www.de.spryker.local + SetEnv APPLICATION_ENV devtest Options Indexes FollowSymLinks MultiViews ExecCGI diff --git a/config/Shared/ci/travis/travis-ci-apache-zed b/config/Shared/ci/travis/travis-ci-apache-zed index e0032e5d0..c7defa098 100644 --- a/config/Shared/ci/travis/travis-ci-apache-zed +++ b/config/Shared/ci/travis/travis-ci-apache-zed @@ -1,8 +1,8 @@ DocumentRoot %TRAVIS_BUILD_DIR%/public/Zed - ServerName zed.de.spryker.test - SetEnv APPLICATION_ENV test + ServerName zed.de.spryker.local + SetEnv APPLICATION_ENV devtest ErrorLog /tmp/zed-error.log diff --git a/config/Shared/config_default-development_DE.php b/config/Shared/config_default-development_DE.php index 62574c62d..961f3297b 100644 --- a/config/Shared/config_default-development_DE.php +++ b/config/Shared/config_default-development_DE.php @@ -38,7 +38,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'; diff --git a/config/Shared/config_default-devtest_DE.php b/config/Shared/config_default-devtest_DE.php index 05397f0f0..314544ba7 100644 --- a/config/Shared/config_default-devtest_DE.php +++ b/config/Shared/config_default-devtest_DE.php @@ -15,13 +15,13 @@ $yvesHost = 'www-test.de.project.local'; $config[PropelConstants::ZED_DB_ENGINE] = $config[PropelConstants::ZED_DB_ENGINE_PGSQL]; -$config[PropelConstants::ZED_DB_USERNAME] = 'development'; +$config[PropelConstants::ZED_DB_USERNAME] = 'devtest'; $config[PropelConstants::ZED_DB_PASSWORD] = 'mate20mg'; -$config[PropelConstants::ZED_DB_DATABASE] = 'DE_test_zed'; +$config[PropelConstants::ZED_DB_DATABASE] = 'DE_devtest_zed'; $config[PropelConstants::ZED_DB_HOST] = '127.0.0.1'; $config[PropelConstants::ZED_DB_PORT] = 5432; -$config[ApplicationConstants::ELASTICA_PARAMETER__INDEX_NAME] = 'de_search_test'; +$config[ApplicationConstants::ELASTICA_PARAMETER__INDEX_NAME] = 'de_search_devtest'; $config[SearchConstants::SEARCH_INDEX_NAME_SUFFIX] = '_test'; @@ -81,6 +81,3 @@ $config[ApplicationConstants::HOST_SSL_YVES] = 'https://' . $yvesHost; $config[ApplicationConstants::HOST_SSL_STATIC_ASSETS] = $config[ApplicationConstants::HOST_SSL_STATIC_MEDIA] = $yvesHost; $config[SessionConstants::ZED_SESSION_COOKIE_SECURE] = false; - - - diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index 82d0a94c1..fc5ad933f 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -92,7 +92,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] = []; diff --git a/deploy/setup/params.sh b/deploy/setup/params.sh index a7abc97e4..fca35feb9 100644 --- a/deploy/setup/params.sh +++ b/deploy/setup/params.sh @@ -1,7 +1,7 @@ #!/bin/bash SETUP='spryker' -DATABASE_NAME='DE_test_zed' +DATABASE_NAME='DE_development_zed' DATABASE_USER='development' DATABASE_PASSWORD='mate20mg' REDIS_PORT='10009' diff --git a/setup_test b/setup_test index b23e64ba4..92a9fb524 100755 --- a/setup_test +++ b/setup_test @@ -4,7 +4,9 @@ set -o pipefail . deploy/setup/params.sh -ELASTIC_SEARCH_INDEX='de_search_test' +ELASTIC_SEARCH_INDEX='de_search_devtest' +DATABASE_NAME='DE_devtest_zed' +DATABASE_USER='devtest' export APPLICATION_ENV='devtest'