Skip to content
This repository has been archived by the owner on Nov 27, 2020. It is now read-only.

[CMF] Start new SE #633

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions app/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class AppKernel extends Kernel
public function registerBundles()
{
$bundles = array(
// Symfony Standard Edition Bundles
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
Expand All @@ -16,6 +17,19 @@ public function registerBundles()
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),

// Symfony CMF Standard Edition Bundles
new Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle(),
new Symfony\Cmf\Bundle\CoreBundle\CmfCoreBundle(),
new Symfony\Cmf\Bundle\RoutingBundle\CmfRoutingBundle(),
new Symfony\Cmf\Bundle\SimpleCmsBundle\CmfSimpleCmsBundle(),

new Symfony\Cmf\Bundle\MenuBundle\CmfMenuBundle(),
new Knp\Bundle\MenuBundle\KnpMenuBundle(),

new Symfony\Cmf\Bundle\CreateBundle\CmfCreateBundle(),
new FOS\RestBundle\FOSRestBundle(),
new JMS\SerializerBundle\JMSSerializerBundle(),
);

if (in_array($this->getEnvironment(), array('dev', 'test'))) {
Expand Down
Binary file added app/app.sqlite
Binary file not shown.
42 changes: 31 additions & 11 deletions app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,43 @@ assetic:
#yui_css:
# jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"

# Doctrine Configuration
# Doctrine Configuration (needed for Jackalope Doctrine DBAL)
doctrine:
dbal:
driver: "%database_driver%"
host: "%database_host%"
port: "%database_port%"
dbname: "%database_name%"
user: "%database_user%"
password: "%database_password%"
charset: UTF8
# if using pdo_sqlite as your database driver, add the path in parameters.yml
# e.g. database_path: "%kernel.root_dir%/data/data.db3"
# path: "%database_path%"
path: "%database_path%"
# if using something else than pdo_sqlite as driver, add the
# parameters in parameters.yml.dist and uncomment the lines below
#host: "%database_host%"
#port: "%database_port%"
#dbname: "%database_name%"
#user: "%database_user%"
#password: "%database_password%"

orm:
auto_generate_proxy_classes: "%kernel.debug%"
# Doctrine PHPCR-ODM configuration
doctrine_phpcr:
session:
backend: "%phpcr_backend%"
workspace: "%phpcr_workspace%"
username: "%phpcr_user%"
password: "%phpcr_password%"
odm:
auto_mapping: true
auto_generate_proxy_classes: "%kernel.debug%"

# Cmf Configuration
cmf_core:
persistence:
phpcr: true
# if you want another basepath
# basepath: /custom/basepath
publish_workflow: false

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

# Swiftmailer Configuration
swiftmailer:
Expand Down
3 changes: 0 additions & 3 deletions app/config/config_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ monolog:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
console:
type: console
bubble: false
# uncomment to get logging in your browser
# you may have to allow bigger header sizes in your Web server configuration
#firephp:
Expand Down
2 changes: 0 additions & 2 deletions app/config/config_prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@ monolog:
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
console:
type: console
14 changes: 9 additions & 5 deletions app/config/parameters.yml.dist
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
parameters:
database_driver: pdo_mysql
database_host: 127.0.0.1
database_port: ~
database_name: symfony
database_user: root
database_password: ~
database_path: "%kernel.root_dir%/app.sqlite"

phpcr_backend:
# use Jackalope Doctrine DBAL
type: doctrinedbal
connection: default
phpcr_workspace: default
phpcr_user: admin
phpcr_password: admin

mailer_transport: smtp
mailer_host: 127.0.0.1
Expand Down
4 changes: 0 additions & 4 deletions app/config/routing_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,3 @@ _configurator:

_main:
resource: routing.yml

# AcmeDemoBundle routes (to be removed)
_acme_demo:
resource: "@AcmeDemoBundle/Resources/config/routing.yml"
34 changes: 20 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,31 @@
{
"name": "symfony/framework-standard-edition",
"name": "symfony-cmf/standard-edition",
"license": "MIT",
"type": "project",
"description": "The \"Symfony Standard Edition\" distribution",
"description": "The \"Symfony CMF Standard Edition\" distribution",
"autoload": {
"psr-0": { "": "src/" }
},
"require": {
"php": ">=5.3.3",
"symfony/symfony": "~2.4",
"doctrine/orm": "~2.2,>=2.2.3",
"doctrine/doctrine-bundle": "~1.2",
"twig/extensions": "~1.0",
"symfony/assetic-bundle": "~2.3",
"symfony/swiftmailer-bundle": "~2.3",
"symfony/monolog-bundle": "~2.4",
"sensio/distribution-bundle": "~2.3",
"sensio/framework-extra-bundle": "~3.0",
"sensio/generator-bundle": "~2.3",
"incenteev/composer-parameter-handler": "~2.0"
"symfony/symfony": "2.3.*",
"jackalope/jackalope-doctrine-dbal": "1.1.*",
"doctrine/doctrine-bundle": "1.2.*",
"doctrine/data-fixtures": "1.0.*",
"twig/extensions": "1.0.*",
"symfony/assetic-bundle": "2.3.*",
"symfony/swiftmailer-bundle": "2.3.*",
"symfony/monolog-bundle": "2.3.*",
"symfony-cmf/symfony-cmf": "1.1.*",
"symfony-cmf/simple-cms-bundle": "1.1.*",
"symfony-cmf/create-bundle": "1.1.*",
"sensio/distribution-bundle": "2.3.*",
"sensio/framework-extra-bundle": "2.3.*",
"sensio/generator-bundle": "2.3.*",
"incenteev/composer-parameter-handler": "~2.0",
"nelmio/alice": "1.*"
},
"minimum-stability": "dev",
"scripts": {
"post-install-cmd": [
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
Expand All @@ -46,7 +52,7 @@
"file": "app/config/parameters.yml"
},
"branch-alias": {
"dev-master": "2.4-dev"
"dev-master": "1.1-dev"
}
}
}
48 changes: 0 additions & 48 deletions src/Acme/DemoBundle/Command/HelloWorldCommand.php

This file was deleted.

56 changes: 0 additions & 56 deletions src/Acme/DemoBundle/Controller/DemoController.php

This file was deleted.

70 changes: 0 additions & 70 deletions src/Acme/DemoBundle/Controller/SecuredController.php

This file was deleted.

18 changes: 0 additions & 18 deletions src/Acme/DemoBundle/Controller/WelcomeController.php

This file was deleted.

Loading