Merge remote-tracking branch 'origin/master' into feature/ps-2940/mas…

…ter-reclamtion-techdebt

composer.json

@@ -3,7 +3,7 @@
   "description": "Spryker Demoshop (internal)",
   "license": "MIT",
   "require": {
-    "spryker/spryker": "dev-feature/ps-2940/master-reclamtion-techdebt",
+    "spryker/spryker": "dev-master",
     "spryker-eco/loggly": "dev-master",
     "spryker/rabbit-mq": "dev-master",
     "spryker/event-behavior": "dev-master",
@@ -19,7 +19,6 @@
     "mandrill/mandrill": "~1.0.55",
     "monolog/monolog": "^1.21.0",
     "nesbot/carbon": "~1.13.0",
-    "pimple/pimple": "~1.1.1",
     "predis/predis": "^1.1.1",
     "propel/propel": "2.0.0-alpha8",
     "psr/log": "^1.0.0",
@@ -41,11 +40,11 @@
     "symfony/serializer": "^2.6.13 || ^3.0.0",
     "symfony/stopwatch": "^3.0.0 || ^4.0.0",
     "symfony/translation": "^2.6.13 || ^3.0.0",
-    "symfony/twig-bridge": "^2.7.0 || ^3.0.0 || ^4.0.0",
+    "symfony/twig-bridge": "^3.2.0 || ^4.0.0",
     "symfony/validator": "^2.6.13 || ^3.0.0",
     "symfony/yaml": "^2.6.13 || ^3.0.0",
     "swiftmailer/swiftmailer": "^6.1",
-    "twig/twig": "^1.30.0",
+    "twig/twig": "^1.36.0",
     "zendframework/zend-config": "^3.1.0",
     "zendframework/zend-filter": "^2.5.1",
     "zendframework/zend-servicemanager": "^3.3",
@@ -100,6 +99,9 @@
       "PyzTest\\": "tests/PyzTest/",
       "PhpStan\\": "tests/PhpStan/"
     },
+    "psr-0": {
+      "Pimple": "vendor/spryker/spryker/Bundles/Container/src/Spryker"
+    },
     "files": [
       "test-autoload.php"
     ]
@@ -121,6 +123,10 @@
     {
       "type": "git",
       "url": "[email protected]:spryker/spryk.git"
+    },
+    {
+      "type": "git",
+      "url": "[email protected]:spryker/silexphp.git"
     }
   ],
   "scripts": {

config/Shared/ci/travis/config_ci.php

@@ -18,7 +18,6 @@
 use Spryker\Shared\ProductManagement\ProductManagementConstants;
 use Spryker\Shared\Propel\PropelConstants;
 use Spryker\Shared\RabbitMq\RabbitMqEnv;
-use Spryker\Shared\Ratepay\RatepayConstants;
 use Spryker\Shared\Search\SearchConstants;
 use Spryker\Shared\Session\SessionConstants;
 use Spryker\Shared\Setup\SetupConstants;
@@ -135,14 +134,6 @@
 // ---------- Email
 $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED] . ':1080';
 
-// ---------- Ratepay
-$config[RatepayConstants::PROFILE_ID] = '';
-$config[RatepayConstants::SECURITY_CODE] = '';
-$config[RatepayConstants::SNIPPET_ID] = 'ratepay';
-$config[RatepayConstants::SHOP_ID] = '';
-$config[RatepayConstants::SYSTEM_ID] = 'Spryker ' . $config[ApplicationConstants::HOST_YVES];
-$config[RatepayConstants::API_URL] = 'https://gateway-int.ratepay.com/api/xml/1_0';
-
 // ---------- Propel
 $config[PropelConstants::ZED_DB_DATABASE] = 'DE_test_zed';
 

config/Zed/navigation.xml

@@ -12,7 +12,6 @@
     <navigation/>
     <tax/>
     <shipment/>
-    <payment/>
     <acl/>
     <maintenance/>
 </config>

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