Skip to content

Commit

Permalink
Merge pull request #22 from Lakion/introduce-demo
Browse files Browse the repository at this point in the history
Introduce DemoBundle
  • Loading branch information
michalmarcinkowski committed Dec 23, 2015
2 parents 808bb0c + b17a0ee commit 0c0d009
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 6 deletions.
1 change: 1 addition & 0 deletions app/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public function registerBundles()
new Symfony\Bundle\MonologBundle\MonologBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new AppBundle\AppBundle(),
new DemoBundle\DemoBundle(),
);

if (in_array($this->getEnvironment(), array('dev', 'test'))) {
Expand Down
2 changes: 1 addition & 1 deletion app/config/api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sylius_resource:
acme.post:
driver: doctrine/orm
classes:
model: AppBundle\Entity\Post
model: DemoBundle\Entity\Post

fos_rest:
disable_csrf_role: ROLE_API
Expand Down
2 changes: 1 addition & 1 deletion app/config/routing.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
acme_demo:
resource: "@AppBundle/Resources/config/routing.yml"
resource: "@DemoBundle/Resources/config/routing.yml"
prefix: /
9 changes: 9 additions & 0 deletions src/DemoBundle/DemoBundle.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

namespace DemoBundle;

use Symfony\Component\HttpKernel\Bundle\Bundle;

class DemoBundle extends Bundle
{
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace AppBundle\Entity;
namespace DemoBundle\Entity;

use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AppBundle\Entity\Post:
DemoBundle\Entity\Post:
type: entity
table: null
id:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace AppBundle\Tests\Controller;
namespace DemoBundle\Tests\Controller;

use Lakion\ApiTestCase\JsonApiTestCase;
use Symfony\Component\HttpFoundation\Response;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AppBundle\Entity\Post:
DemoBundle\Entity\Post:
post1:
title: 'Clean Code principles'
author: 'Robert C. Martin'
Expand Down

0 comments on commit 0c0d009

Please sign in to comment.