Skip to content

Commit

Permalink
Merge pull request Sylius#44 from lchrusciel/composer-update
Browse files Browse the repository at this point in the history
[Composer] Remove rest of obsolete bundles
  • Loading branch information
pamil committed Jun 11, 2018
2 parents f18baa6 + c4c808e commit eee362e
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 202 deletions.
1 change: 1 addition & 0 deletions .platform.app.yaml
Expand Up @@ -83,6 +83,7 @@ hooks:
yarn install
GULP_ENV=prod yarn build
deploy: |
rm -rf var/cache/*
php bin/console doctrine:migrations:migrate --no-interaction
php composer reload-fixtures
Expand Down
6 changes: 0 additions & 6 deletions app/AppKernel.php
Expand Up @@ -27,15 +27,9 @@ public function registerBundles(): array
new \FOS\OAuthServerBundle\FOSOAuthServerBundle(), // Required by SyliusApiBundle
new \Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle(),

new Nelmio\CorsBundle\NelmioCorsBundle(),

new \AppBundle\AppBundle(),
];

if ('prod' === $this->getEnvironment()) {
$bundles[] = new \Snc\RedisBundle\SncRedisBundle();
}

return array_merge(parent::registerBundles(), $bundles);
}
}
18 changes: 0 additions & 18 deletions app/config/config.yml
Expand Up @@ -64,21 +64,3 @@ fos_rest:
- { path: '^/shop-api', priorities: ['json'], fallback_format: json, prefer_extension: true }
- { path: '^/api', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
- { path: '^/', stop: true }

nelmio_cors:
defaults:
allow_credentials: false
allow_origin: []
allow_headers: []
allow_methods: []
expose_headers: []
max_age: 0
hosts: []
origin_regex: false
forced_allow_origin_value: ~
paths:
'^/shop-api/':
allow_origin: ['*']
allow_headers: ['Content-Type']
allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
max_age: 3600
5 changes: 1 addition & 4 deletions composer.json
Expand Up @@ -22,10 +22,7 @@
"require": {
"php": "^7.1",

"sylius/sylius": "^1.2@rc",
"snc/redis-bundle": "^2.0",
"predis/predis": "^1.0",
"nelmio/cors-bundle": "^1.5"
"sylius/sylius": "^1.2@rc"
},
"require-dev": {
"behat/behat": "^3.2",
Expand Down
175 changes: 1 addition & 174 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit eee362e

Please sign in to comment.