Merge pull request #1221 from dpfaffenbauer/remove-bc-layer

[Pimcore] remove pimcore bc layers
coreshop · Jan 10, 2020 · 5ed3bf5 · 5ed3bf5
2 parents 3e2fef9 + 98c8b3c
commit 5ed3bf5
Show file tree

Hide file tree

Showing 40 changed files with 63 additions and 429 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,4 +57,3 @@ tmp/
 phpda.html
 parameters.yml
 var
-app/config/config.yml
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ env:
     global:
         - PIMCORE_ENVIRONMENT=test
         - PIMCORE_TEST_DB_DSN="mysql://root@localhost/coreshop_test"
-        - PIMCORE_VERSION="^6.3.4"
+        - PIMCORE_VERSION="^6.3.6"
         - CORESHOP_TEST=1
         - CORESHOP_SUITE=application
         - SYMFONY_VERSION="^3.4"
@@ -36,13 +36,13 @@ matrix:
         - sudo: required
           php: 7.2
           env:
-            - PIMCORE_VERSION="~6.3.4"
+            - PIMCORE_VERSION="~6.3.6"
             - SYMFONY_VERSION="^4.0"
 
         - sudo: required
           php: 7.3
           env:
-            - PIMCORE_VERSION="~6.3.4"
+            - PIMCORE_VERSION="~6.3.6"
             - SYMFONY_VERSION="^4.0"
 
         - sudo: required

diff --git a/etc/_config/config_6.yml → app/config/config.yml b/etc/_config/config_6.yml → app/config/config.yml
diff --git a/composer.json b/composer.json
@@ -89,7 +89,7 @@
     "payum/payum-bundle": "^2.2",
     "payum/sofort": "^1.4",
     "php-http/guzzle6-adapter": "^2.0",
-    "pimcore/pimcore": "^6.3.4",
+    "pimcore/pimcore": "^6.3.6",
     "rinvex/countries": "^6.0",
     "stof/doctrine-extensions-bundle": "^1.2",
     "webmozart/assert": "^1.2"

diff --git a/etc/_config/config_5.yml b/etc/_config/config_5.yml
diff --git a/etc/_config/system.template.php b/etc/_config/system.template.php
diff --git a/etc/_config/system.template.yml b/etc/_config/system.template.yml
diff --git a/etc/_setup/install b/etc/_setup/install
@@ -19,16 +19,8 @@ mysql -e "CREATE DATABASE coreshop_test CHARSET=utf8mb4;"
 #########
 ##########################################################################################
 mkdir -p $CS_HOME/var/config
-cp $CS_HOME/etc/_config/system.template.php var/config/system.php
 cp app/config/parameters.example.yml app/config/parameters.yml
 
-if [[ "$PIMCORE_VERSION" == "~5.8" ]];
-then
-    cp $CS_HOME/etc/_config/config_5.yml app/config/config.yml
-else
-    cp $CS_HOME/etc/_config/config_6.yml app/config/config.yml
-fi
-
 
 ##########################################################################################
 #########