Merge pull request #616 from spryker/merge

TTL Products

.gitignore

@@ -19,6 +19,7 @@ GTAGS
 
 # Y&Z
 /config/Shared/config_local*
+!/config/Shared/config_local.dist.php
 /config/Shared/console_env_local.php
 /config/Shared/cubes.*
 /config/Zed/behat.local.yml

.travis.yml

@@ -14,18 +14,24 @@ matrix:
        env:
           - TEST_GROUP=without-acceptance
           - PHPSTAN=1
-     - php: "7.1"
+     - php: "7.2"
        env:
           - TEST_GROUP=without-acceptance
           - DB=mysql
      - php: "7.1"
        env:
           - TEST_GROUP=acceptance
-     - php: "7.1"
+     - php: "7.2"
        env:
           - TEST_GROUP=acceptance
           - DB=mysql
 
+  allow_failures:
+    - php: "7.2"
+      env:
+        - TEST_GROUP=acceptance
+        - DB=mysql
+
 addons:
   postgresql: 9.4
   mysql: 5.7
@@ -80,6 +86,7 @@ before_script:
   - if [[ $DB == 'mysql' ]]; then sudo service mysql restart ; fi
 
   - if [[ $TEST_GROUP == 'acceptance' ]]; then config/Shared/ci/travis/acceptance_env.sh ; fi
+
   - if [[ $TEST_GROUP == 'acceptance' ]]; then vendor/bin/install DE -r testing ; fi
   - if [[ $TEST_GROUP == 'without-acceptance' ]]; then vendor/bin/install DE -r testing -x frontend ; fi
 

composer.json

@@ -39,10 +39,10 @@
     "spryker/category-exporter": "^3.0.0",
     "spryker/checkout": "^4.0.0",
     "spryker/cms": "^6.0.0",
-    "spryker/cms-block": "^1.0.0",
+    "spryker/cms-block": "^2.0.0",
     "spryker/cms-block-category-connector": "^2.0.0",
-    "spryker/cms-block-collector": "^1.0.0",
-    "spryker/cms-block-gui": "^1.0.0",
+    "spryker/cms-block-collector": "^2.0.0",
+    "spryker/cms-block-gui": "^2.0.0",
     "spryker/cms-block-product-connector": "^1.0.0",
     "spryker/cms-collector": "^2.0.0",
     "spryker/cms-content-widget": "^1.0.0",
@@ -66,7 +66,7 @@
     "spryker/customer-user-connector": "^1.0.0",
     "spryker/customer-user-connector-gui": "^1.0.0",
     "spryker/data-import": "^1.0.0",
-    "spryker/discount": "^5.0.0",
+    "spryker/discount": "^6.0.0",
     "spryker/discount-calculation-connector": "^5.0.0",
     "spryker/discount-promotion": "^1.0.0",
     "spryker/dummy-payment": "^2.0.0",
@@ -87,7 +87,7 @@
     "spryker/gui": "^3.0.0",
     "spryker/guzzle": "^2.0.0",
     "spryker/heartbeat": "^3.0.0",
-    "spryker/install": "^0.1.0",
+    "spryker/install": "^0.2.0",
     "spryker/installer": "^4.0.0",
     "spryker/invoice": "^2.0.0",
     "spryker/kernel": "^3.0.0",
@@ -128,6 +128,8 @@
     "spryker/product-category-filter": "^1.0.0",
     "spryker/product-category-filter-collector": "^1.0.0",
     "spryker/product-category-filter-gui": "^1.0.0",
+    "spryker/product-customer-permission": "^1.0.0",
+    "spryker/product-customer-permission-collector": "^1.0.0",
     "spryker/product-discount-connector": "^3.0.0",
     "spryker/product-group": "^1.0.0",
     "spryker/product-group-collector": "^1.0.0",
@@ -137,7 +139,7 @@
     "spryker/product-label-collector": "^1.0.0",
     "spryker/product-label-discount-connector": "^1.0.0",
     "spryker/product-label-gui": "^2.0.0",
-    "spryker/product-management": "^0.10.0",
+    "spryker/product-management": "^0.11.0",
     "spryker/product-new": "^1.1.1",
     "spryker/product-option": "^6.0.0",
     "spryker/product-option-cart-connector": "^5.0.0",
@@ -150,6 +152,7 @@
     "spryker/product-set": "^1.0.0",
     "spryker/product-set-collector": "^1.0.0",
     "spryker/product-set-gui": "^2.0.0",
+    "spryker/product-validity": "^1.0.0",
     "spryker/propel": "^3.0.0",
     "spryker/propel-orm": "^1.0.0",
     "spryker/propel-query-builder": "^0.3.0",
@@ -204,11 +207,11 @@
     "phpdocumentor/reflection-docblock": "^2.0",
     "phploc/phploc": "^3.0.1",
     "phpmd/phpmd": "~2.4.3",
-    "phpstan/phpstan": "^0.8.5",
+    "phpstan/phpstan": "^0.9",
     "phpunit/php-token-stream": "^1.4.11",
     "sebastian/phpcpd": "^2.0.2",
     "sensiolabs/security-checker": "^3.0.2",
-    "silex/web-profiler": "^1.0.8",
+    "silex/web-profiler": "*",
     "site5/phantoman": "^1.1",
     "sllh/composer-versions-check": "^2.0.2",
     "spryker/architecture-sniffer": "^0.4.0",
@@ -247,7 +250,9 @@
     "preferred-install": "dist",
     "use-include-path": true,
     "sort-packages": true,
-    "github-protocols": ["https"],
+    "github-protocols": [
+      "https"
+    ],
     "process-timeout": 1200
   },
   "scripts": {