Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Pimcore] remove pimcore bc layers #1221

Merged
merged 1 commit into from
Jan 10, 2020
Merged

[Pimcore] remove pimcore bc layers #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,3 @@ tmp/
phpda.html
parameters.yml
var
app/config/config.yml
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
0 etc/_config/config_6.yml → app/config/config.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 0 additions & 5 deletions etc/_config/config_5.yml
View file
Open in desktop

This file was deleted.

167 changes: 0 additions & 167 deletions etc/_config/system.template.php
View file
Open in desktop

This file was deleted.

167 changes: 0 additions & 167 deletions etc/_config/system.template.yml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions etc/_setup/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


##########################################################################################
#########
Expand Down
Loading