Skip to content
This repository was archived by the owner on Dec 5, 2019. It is now read-only.

update to 1.1.0-RC1 #43

Merged
merged 9 commits into from
Apr 9, 2014
Merged

update to 1.1.0-RC1 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dc19641
update to 1.1.0-RC1
lsmith77 Apr 8, 2014
43000b2
add seo default behavior
ElectricMaxxx Apr 8, 2014
690d9b7
add description to default config
ElectricMaxxx Apr 8, 2014
b045508
Merge pull request #45 from ElectricMaxxx/1-1-update
lsmith77 Apr 8, 2014
6fc7f8d
adjust default title, CS
ElectricMaxxx Apr 8, 2014
886142d
add meta data from page.yml - with null in find()
ElectricMaxxx Apr 9, 2014
644b9fa
class for seo page
ElectricMaxxx Apr 9, 2014
ab971e7
delete indent
ElectricMaxxx Apr 9, 2014
cffea9c
Merge pull request #46 from ElectricMaxxx/1-1-update
lsmith77 Apr 9, 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
4 changes: 3 additions & 1 deletion app/AppKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public function registerBundles()

new Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle(),
new Knp\Bundle\MenuBundle\KnpMenuBundle(),
new Liip\DoctrineCacheBundle\LiipDoctrineCacheBundle(),
new Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle(),
Copy link
Member Author

@lsmith77 lsmith77 Apr 8, 2014

Choose a reason for hiding this comment

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

note LiipDoctrineCacheBundle still works fine, we just recommend to switch to the new DoctrineCacheBundle as its likely going to see more attention by the Doctrine core devs.

new FOS\RestBundle\FOSRestBundle(),
new JMS\SerializerBundle\JMSSerializerBundle($this),

Expand All @@ -28,9 +28,11 @@ public function registerBundles()
new Symfony\Cmf\Bundle\BlockBundle\CmfBlockBundle(),
new Symfony\Cmf\Bundle\CoreBundle\CmfCoreBundle(),
new Symfony\Cmf\Bundle\SimpleCmsBundle\CmfSimpleCmsBundle(),
new Symfony\Cmf\Bundle\SeoBundle\CmfSeoBundle(),

// dependency of the block bundle
new Sonata\BlockBundle\SonataBlockBundle(),
new Sonata\SeoBundle\SonataSeoBundle(),

// and the website specific bundle
new Cmf\MainBundle\CmfMainBundle(),
Expand Down
24 changes: 18 additions & 6 deletions app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ cmf_core:
phpcr:
enabled: true

cmf_simple_cms:
routing:
cmf_routing:
dynamic:
templates_by_class:
Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: CmfSimpleCmsBundle:Page:index.html.twig

Expand All @@ -53,11 +53,15 @@ cmf_menu:
voters:
uri_prefix: true

liip_doctrine_cache:
namespaces:
meta:
cmf_seo:
title: %%content_title%% | Symfony2 CMF
description: The Symfony2 Content Management Framework. %%content_description%%

doctrine_cache:
providers:
phpcr_meta:
type: file_system
nodes:
phpcr_nodes:
type: file_system

fos_rest:
Expand All @@ -76,3 +80,11 @@ fos_rest:

sonata_block:
default_context: [cms]

sonata_seo:
page:
title: Welcome | Symfony2 CMF
metas:
name:
description: The Symfony2 Content Management Framework.
keywords: "CMF, Symfony2, PHPCR"
4 changes: 2 additions & 2 deletions app/config/parameters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ parameters:
type: doctrinedbal
connection: default
caches:
meta: liip_doctrine_cache.ns.meta
nodes: liip_doctrine_cache.ns.nodes
meta: doctrine_cache.providers.phpcr_meta
nodes: doctrine_cache.providers.phpcr_nodes
phpcr_workspace: default
phpcr_user: admin
phpcr_pass: admin
Expand Down
23 changes: 15 additions & 8 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,28 @@
"require": {
"php": ">=5.3.3",
"symfony/symfony": "2.3.*",
"twig/extensions": "1.0.*",
"twig/extensions": "~1.0",
"symfony/monolog-bundle": "2.3.*",
"sensio/distribution-bundle": "2.3.*",
"symfony-cmf/menu-bundle": "1.0.*",
"symfony-cmf/simple-cms-bundle": "1.0.*",
"friendsofsymfony/rest-bundle": "1.0.*",
"jms/serializer-bundle": "0.12.*",
"jackalope/jackalope-doctrine-dbal": "1.0.*",
"symfony-cmf/core-bundle": "1.1.*@dev",
Copy link
Member Author

@lsmith77 lsmith77 Apr 8, 2014

Choose a reason for hiding this comment

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

note we need to list all these Bundles explicitly only because the minimum stability is set to stable and so dependencies need to explicitly be allowed in this composer.json until we have stable releases of all the updated Bundles. Note that CMF 1.1 is using RoutingBundle 1.2.

"symfony-cmf/routing": "1.2.*@dev",
"symfony-cmf/routing-bundle": "1.2.*@dev",
"symfony-cmf/content-bundle": "1.1.*@dev",
"symfony-cmf/menu-bundle": "1.1.*@dev",
"symfony-cmf/simple-cms-bundle": "1.1.*@dev",
"symfony-cmf/seo-bundle": "1.0.*@dev",
"friendsofsymfony/rest-bundle": "~1.0",
"jms/serializer-bundle": ">=0.12,<0.14",
"jackalope/jackalope-doctrine-dbal": "1.1.*",
"doctrine/phpcr-bundle": "1.1.*@dev",
"doctrine/phpcr-odm": "1.1.*@dev",
"doctrine/doctrine-bundle": "1.2.*",
"doctrine/data-fixtures": "1.0.*",
"liip/functional-test-bundle": "1.0.*",
"liip/doctrine-cache-bundle": "1.0.*",
"doctrine/doctrine-cache-bundle": "1.0.*",
"symfony/icu": "1.0.*",
"seld/slippy": "dev-master",
"symfony-cmf/block-bundle": "1.0.*"
"symfony-cmf/block-bundle": "1.1.*@dev"
},
"scripts": {
"post-install-cmd": [
Expand Down
Loading