Skip to content

Commit

Permalink
Merge branch '1.3'
Browse files Browse the repository at this point in the history
* 1.3:
  [Maintenance] Remove webserver from kernel
  [Migration] Add new tables
  [Maintenance] Remove redis doctrine cache storage
  [Maintenance] Update js dependencies
  Missing test routing
  Missing .gitignore file in image directory
  Update demo + add version switcher
  • Loading branch information
pamil committed Feb 1, 2019
2 parents 7d62f0a + 83a5934 commit 878b65b
Show file tree
Hide file tree
Showing 18 changed files with 1,562 additions and 9,366 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -6,6 +6,7 @@
/public/css
/public/js
/public/media
!/public/media/image/.gitignore

/vendor
/node_modules
Expand Down
1,591 changes: 959 additions & 632 deletions composer.lock

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion config/bundles.php
Expand Up @@ -48,7 +48,7 @@
Sylius\Bundle\FixturesBundle\SyliusFixturesBundle::class => ['all' => true],
Sylius\Bundle\PayumBundle\SyliusPayumBundle::class => ['all' => true],
Sylius\Bundle\ThemeBundle\SyliusThemeBundle::class => ['all' => true],
Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['all' => true],
Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
Sylius\Bundle\AdminBundle\SyliusAdminBundle::class => ['all' => true],
Sylius\Bundle\ShopBundle\SyliusShopBundle::class => ['all' => true],
FOS\OAuthServerBundle\FOSOAuthServerBundle::class => ['all' => true],
Expand All @@ -58,4 +58,5 @@
Sonata\DatagridBundle\SonataDatagridBundle::class => ['all' => true],
Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true],
Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true],
Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin::class => ['test' => true, 'test_cached' => true],
];
21 changes: 0 additions & 21 deletions config/packages/prod/doctrine.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions config/routes/test/routing.yaml
@@ -0,0 +1,5 @@
sylius_test_plugin_main:
path: /test/main
controller: FrameworkBundle:Template:template
defaults:
template: "@SyliusTestPlugin/main.html.twig"
5 changes: 5 additions & 0 deletions config/routes/test_cached/routing.yaml
@@ -0,0 +1,5 @@
sylius_test_plugin_main:
path: /test/main
controller: FrameworkBundle:Template:template
defaults:
template: "@SyliusTestPlugin/main.html.twig"

0 comments on commit 878b65b

Please sign in to comment.