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

adjust to routing cleanup #244

Merged
merged 11 commits into from
Apr 4, 2014
Merged

adjust to routing cleanup #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1658b97
WIP adjust to routing cleanup
dbu Mar 31, 2014
c849db4
hardcode jquery 1.8.3
lsmith77 Mar 31, 2014
f181773
updated dependencies
lsmith77 Apr 1, 2014
2f58136
remove midgard
lsmith77 Apr 3, 2014
9b664d8
update dependencies
lsmith77 Apr 3, 2014
cb3d9e4
activate logging/profiling by default
lsmith77 Apr 3, 2014
dc5d077
update dependencies
lsmith77 Apr 3, 2014
a0a4ebc
update sandbox to routing refactoring
dbu Apr 4, 2014
bb366e1
updated dependencies
lsmith77 Apr 4, 2014
fcbe120
fix test failure caused by test setup issue
lsmith77 Apr 4, 2014
e09eb00
Merge branch 'routing-cleanup' of github.com:symfony-cmf/cmf-sandbox …
lsmith77 Apr 4, 2014
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
9 changes: 1 addition & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,4 @@ script: phpunit -c app

notifications:
irc: "irc.freenode.org#symfony-cmf"
email: "[email protected]"

#matrix:
# allow_failures:
# - env: TRANSPORT=midgard_sqlite MIDGARD_EXT_VERSION=ratatoskr
# - env: TRANSPORT=midgard_mysql MIDGARD_EXT_VERSION=ratatoskr
# - env: TRANSPORT=midgard_sqlite MIDGARD_EXT_VERSION=gjallarhorn
# - env: TRANSPORT=midgard_mysql MIDGARD_EXT_VERSION=gjallarhorn
email: "[email protected]"
15 changes: 4 additions & 11 deletions app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,6 @@ cmf_core:
phpcr:
enabled: true

cmf_menu:
persistence:
phpcr:
# TODO remove once https://github.com/jackalope/jackalope-doctrine-dbal/issues/189 is fixed
prefetch: 0

cmf_routing:
chain:
routers_by_id:
Expand All @@ -113,13 +107,9 @@ cmf_routing:
Sandbox\MainBundle\Document\DemoClassContent: sandbox_main.controller:classAction
Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute: cmf_routing.redirect_controller:redirectAction

templates_by_class:
Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent: SandboxMainBundle:StaticContent:index.html.twig

cmf_simple_cms:
routing:
templates_by_class:
Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: CmfSimpleCmsBundle:Page:index.html.twig
Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent: SandboxMainBundle:StaticContent:index.html.twig

cmf_create:
editor_base_path: /bundles/cmfcreate/vendor/ckeditor/
Expand All @@ -145,6 +135,9 @@ sonata_block:

sonata_admin:
extensions:
cmf_core.admin_extension.child:
implements:
- Symfony\Cmf\Bundle\CoreBundle\Model\ChildInterface
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not related to the routing refactoring but symfony-cmf/symfony-cmf#188

cmf_core.admin_extension.publish_workflow.time_period:
implements:
- Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodInterface
Expand Down
2 changes: 2 additions & 0 deletions app/config/phpcr_doctrine_dbal.yml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
parameters:
phpcr_backend:
logging: true
profiling: true
type: doctrinedbal
connection: default
caches:
Expand Down
2 changes: 2 additions & 0 deletions app/config/phpcr_jackrabbit.yml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
parameters:
phpcr_backend:
logging: true
profiling: true
type: jackrabbit
url: http://localhost:8080/server/
phpcr_workspace: default
Expand Down
18 changes: 0 additions & 18 deletions app/config/phpcr_midgard_mysql.yml.dist
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions app/config/phpcr_midgard_sqlite.yml.dist
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion app/tests/AdminTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ protected function doTestReachableAdminRoutes($admin)

// if an ID is required, try and find a document to test
if (isset($requirements['id'])) {
if ($document = $this->dm->getRepository($class)->findOneBy(array())) {
$document = $admin->createQuery('list')->execute()->first();
if ($document) {
$node = $this->dm->getNodeForDocument($document);
$routeParams['id'] = $node->getPath();
} else {
Expand Down
12 changes: 0 additions & 12 deletions app/tests/travis_midgard_install.sh
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions app/tests/travis_midgard_mysql.sh
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions app/tests/travis_midgard_sqlite.sh
View file
Open in desktop

This file was deleted.

37 changes: 19 additions & 18 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,28 @@
"sensio/distribution-bundle": "2.3.*",
"sensio/framework-extra-bundle": "2.3.*",
"sensio/generator-bundle": "2.3.*",
"symfony-cmf/symfony-cmf": "~1.1",
"symfony-cmf/simple-cms-bundle": "~1.1",
"symfony-cmf/search-bundle": "~1.1",
"symfony-cmf/create-bundle": "~1.1",
"jackalope/jackalope-doctrine-dbal": "~1.1",
"jackalope/jackalope-jackrabbit": "~1.1",
"doctrine/doctrine-bundle": "~1.2",
"symfony-cmf/symfony-cmf": "1.1.*",
"symfony-cmf/simple-cms-bundle": "1.1.*",
"symfony-cmf/search-bundle": "1.1.*",
"symfony-cmf/create-bundle": "1.1.*",
"jackalope/jackalope-doctrine-dbal": "1.1.*",
"jackalope/jackalope-jackrabbit": "1.1.*",
"doctrine/doctrine-bundle": "1.2.*",
"doctrine/data-fixtures": "1.0.*",
"doctrine/doctrine-cache-bundle": "~1.0",
"sonata-project/cache-bundle": "~2.1",
"sonata-project/doctrine-phpcr-admin-bundle": "~1.1",
"symfony-cmf/block-bundle": "~1.1",
"eko/feedbundle": "~1.0",
"lunetics/locale-bundle": "~2.2",
"liip/imagine-bundle": "~0.12",
"wjzijderveld/check-bundles": "~1.0",
"helios-ag/fm-elfinder-bundle": "~1.4"
"doctrine/doctrine-cache-bundle": "1.0.*",
"sonata-project/cache-bundle": "2.1.*",
"sonata-project/doctrine-phpcr-admin-bundle": "1.1.*",
"sonata-project/jquery-bundle": "1.8.3",
"symfony-cmf/block-bundle": "1.1.*",
"eko/feedbundle": "1.0.*",
"lunetics/locale-bundle": "2.2.*",
"liip/imagine-bundle": "0.21.*",
"wjzijderveld/check-bundles": "1.0.*",
"helios-ag/fm-elfinder-bundle": "1.4.*"
},
"require-dev": {
"liip/functional-test-bundle": "~1.0.1",
"symfony-cmf/testing": "~1.0"
"liip/functional-test-bundle": "1.0.*",
"symfony-cmf/testing": "1.1.*"
},
"scripts": {
"post-install-cmd": [
Expand Down
Loading