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

Jump to bottom

Bring symfony-standard and cmf-sandbox back into sync #81

Merged
merged 6 commits into from
Jun 12, 2012
Merged

Bring symfony-standard and cmf-sandbox back into sync #81

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7dbdaf9
Added web/config to check deps of actual SF2 project, handy for users…
Jun 11, 2012
5741340
Gitignore is now more inline with sf-standard distro, files such as n…
Jun 11, 2012
9581fd2
blank src/.htaccess as per symfony-standard
Jun 11, 2012
6498a24
cmf sandbox is now more inline with symfony-standard, uses the sensio…
Jun 11, 2012
026afc3
Spaces
Jun 11, 2012
e64e126
Fixed indentation issue.
Jun 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 3 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ app/logs/*
build/
vendor/
app/config/parameters.yml
nbproject
.idea
vagrant/.vagrant
.DS_Store

app/config/phpcr.yml
jackrabbit/

app/config/phpcr.yml
vagrant/.vagrant
app/bootstrap.php.cache
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ Create an apache virtual host entry along the lines of

And add an entry to your hosts file for cmf.lo

# If you are running Symfony2 for the first time, run http://cmf.lo/check.php to ensure your system settings have been setup inline with the expected behaviour of the Symfony2 framework.

Then point your browser to http://cmf.lo/app_dev.php


Expand Down
13 changes: 11 additions & 2 deletions app/AppKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,21 @@ class AppKernel extends Kernel
public function registerBundles()
{
$bundles = array(
// enable symfony-standard bundles
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
new Symfony\Bundle\MonologBundle\MonologBundle(),
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
new Knp\Bundle\MenuBundle\KnpMenuBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
// new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new JMS\AopBundle\JMSAopBundle(),
new JMS\DiExtraBundle\JMSDiExtraBundle($this),
new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),

new Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle(),
new Knp\Bundle\MenuBundle\KnpMenuBundle(),

// enable cmf bundles
new Symfony\Cmf\Bundle\RoutingExtraBundle\SymfonyCmfRoutingExtraBundle(),
Expand All @@ -28,6 +35,7 @@ public function registerBundles()
new Symfony\Cmf\Bundle\BlockBundle\SymfonyCmfBlockBundle(),
new Symfony\Cmf\Bundle\SimpleCmsBundle\SymfonyCmfSimpleCmsBundle(),

// create.js editing related
new Liip\VieBundle\LiipVieBundle(),
new FOS\RestBundle\FOSRestBundle(),
new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
Expand All @@ -49,6 +57,7 @@ public function registerBundles()

if (in_array($this->getEnvironment(), array('dev', 'test'))) {
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();

// additional bundle for tests
$bundles[] = new Liip\FunctionalTestBundle\LiipFunctionalTestBundle();
Expand All @@ -61,4 +70,4 @@ public function registerContainerConfiguration(LoaderInterface $loader)
{
$loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
}
}
}