Merge remote-tracking branch 'nonsplit/master' into test

spryker · Jan 24, 2019 · 8590035 · 8590035
2 parents 1dcb5b1 + cffb4d6
commit 8590035
Show file tree

Hide file tree

Showing 29 changed files with 1,895 additions and 1,536 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,8 @@ config/accumulated-config.json
 /src/Generated/
 /vendor/
 FOSS.md
+/public/Yves/maintenance/maintenance.marker
+/public/Zed/maintenance/maintenance.marker
 
 /data/*
 !/data/import/

diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,14 @@ env:
 
 matrix:
   fast_finish: true
+
+  allow_failures:
+    - php: "7.3"
+      env:
+        - TEST_GROUP=acceptance
+        - ON_EVENTS=push,cron
+        - DB=mysql
+
   include:
     - php: "7.1"
       env:
@@ -19,6 +27,11 @@ matrix:
     - php: "7.1"
       env:
         - TEST_GROUP=acceptance
+    - php: "7.2"
+      env:
+        - TEST_GROUP=acceptance
+        - ON_EVENTS=push,cron
+        - DB=mysql
     - php: "7.2"
       env:
         - TEST_GROUP=acceptance
@@ -105,7 +118,7 @@ before_script:
   - if [[ $VALIDATION == 1 ]] ; then vendor/bin/console setup:search ; fi
 
 script:
-  - if [[ $VALIDATION == 1 ]] ; then vendor/bin/phpstan analyze -c phpstan.neon src/ -l 1 ; fi
+  - if [[ $VALIDATION == 1 ]] ; then vendor/bin/phpstan analyze -c phpstan.neon src/ -l 4 ; fi
 
   - if [[ $VALIDATION == 1 ]] ; then vendor/bin/console propel:schema:validate ; fi
   - if [[ $VALIDATION == 1 ]] ; then vendor/bin/console propel:schema:validate-xml-names ; fi

diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php
@@ -433,6 +433,7 @@
 
 // ----------- Glue Application
 $config[GlueApplicationConstants::GLUE_APPLICATION_DOMAIN] = '';
+$config[GlueApplicationConstants::GLUE_APPLICATION_CORS_ALLOW_ORIGIN] = '';
 $config[GlueApplicationConstants::GLUE_APPLICATION_REST_DEBUG] = false;
 
 // ----------- OAUTH

diff --git a/config/Shared/config_default_AT.php b/config/Shared/config_default_AT.php
@@ -63,3 +63,4 @@
 
 // ---------- Glue host
 $config[GlueApplicationConstants::GLUE_APPLICATION_DOMAIN] = sprintf('http://glue.at.%s.local', $domain);
+$config[GlueApplicationConstants::GLUE_APPLICATION_CORS_ALLOW_ORIGIN] = sprintf('http://glue.at.%s.local', $domain);
diff --git a/config/Shared/config_default_DE.php b/config/Shared/config_default_DE.php
@@ -63,3 +63,4 @@
 
 // ---------- Glue host
 $config[GlueApplicationConstants::GLUE_APPLICATION_DOMAIN] = sprintf('http://glue.de.%s.local', $domain);
+$config[GlueApplicationConstants::GLUE_APPLICATION_CORS_ALLOW_ORIGIN] = sprintf('http://glue.de.%s.local', $domain);
diff --git a/config/Shared/config_default_US.php b/config/Shared/config_default_US.php
@@ -63,3 +63,4 @@
 
 // ---------- Glue host
 $config[GlueApplicationConstants::GLUE_APPLICATION_DOMAIN] = sprintf('http://glue.us.%s.local', $domain);
+$config[GlueApplicationConstants::GLUE_APPLICATION_CORS_ALLOW_ORIGIN] = sprintf('http://glue.us.%s.local', $domain);
diff --git a/data/import/glossary.csv b/data/import/glossary.csv
@@ -202,7 +202,7 @@ catalog.sort.price_asc,Sort by price ascending,en_US
 catalog.sort.price_desc,Nach Preis absteigend sortieren,de_DE
 catalog.sort.price_desc,Sort by price descending,en_US
 catalog.sort.rating,Sort by product ratings,en_US
-caralot.sort.rating,Nach Produktbewertungen sortieren,de_DE
+catalog.sort.rating,Nach Produktbewertungen sortieren,de_DE
 catalog.filter.activeFilters,Aktive Filter,de_DE
 catalog.filter.activeFilters,Active filters,en_US
 catalog.filter.resetAllFilters,Alle Filter zurücksetzen,de_DE
@@ -703,6 +703,8 @@ validator.constraints.password.do_not_match,Passwords don't match,en_US
 validator.constraints.password.do_not_match,Passwörter stimmen nicht überein,de_DE
 discount.successfully.applied,"The discount ""display_name"" has been successfully applied",en_US
 discount.successfully.applied,"Der Rabatt ""display_name"" wurde erfolgreich angewendet",de_DE
+discount.voucher_code.usage_limit.reached,"Voucher is no longer available",en_US
+discount.voucher_code.usage_limit.reached,"Der Gutschein ist nicht mehr verfügbar",de_DE
 product.unavailable,Product is out of stock,en_US
 product.unavailable,Keine Produkte mehr auf Lager,de_DE
 product.attribute.slug,slug,en_US
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,3 +63,4 @@

		// ---------- Glue host
		$config[GlueApplicationConstants::GLUE_APPLICATION_DOMAIN] = sprintf('http://glue.at.%s.local', $domain);
		$config[GlueApplicationConstants::GLUE_APPLICATION_CORS_ALLOW_ORIGIN] = sprintf('http://glue.at.%s.local', $domain);