.gitignore

@@ -1,19 +1,23 @@
-# Composer
-/vendor/
-/bin/*
-
-# Symfony directories
-/phpunit.xml
-/app/bootstrap.php.cache
 /app/config/parameters.yml
-/app/cache/*
-/app/logs/*
-/app/check.php
+/build/
+/phpunit.xml
+/var/*
+!/var/cache
+/var/cache/*
+!var/cache/.gitkeep
+!/var/logs
+/var/logs/*
+!var/logs/.gitkeep
+!/var/sessions
+/var/sessions/*
+!var/sessions/.gitkeep
+!var/SymfonyRequirements.php
+/vendor/
 /web/bundles/
 /web/css/
 /web/js/
 /web/images/
 /web/fonts/
 
 /bower_components/
-/node_modules
+/node_modules

.travis.yml

@@ -15,12 +15,13 @@ install:
   - npm install
   - npm link
 before_script:
-  - app/console ongr:es:index:create
-  - app/console ongr:es:index:import --raw src/ONGR/DemoBundle/Resources/data/ongr.json
+  - bin/console ongr:es:index:create
+  - bin/console ongr:es:index:import app/Resources/data/demo.json
   - php -S localhost:8000 web/app_dev.php &
   - sleep 3
 script:
-  - bin/phpcs -p --standard=PSR2 --extensions=php ./src
+  - vendor/bin/phpunit
+  - vendor/bin/phpcs -p --standard=PSR2 --extensions=php ./src
 notifications:
   webhooks:
     urls:

Gulpfile.js

@@ -6,7 +6,7 @@ var concat  = require('gulp-concat');
 var uglify  = require('gulp-uglify');
 
 var dir = {
-    assets: './src/ONGR/DemoBundle/Resources/public/',
+    assets: './app/Resources/',
     dist: './web/',
     bower: './bower_components/',
     bootstrapJS: './bower_components/bootstrap-sass/assets/javascripts/bootstrap/'

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 NFQ Technologies UAB
+Copyright (c) 2014-2016 NFQ Technologies UAB
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,27 +1,32 @@
-# Demo of ONGR bundles
+# Demo app of the ONGR bundles
 
-This is the showcase of how can be used the ONGR bundles.
+Demo app will show you how the ONGR bundles could be used in particular project. Depending on what you want:
+- Just to see it in action - please do a _Very quick setup_. 
+- Get a hands-on experience from development side - please proceed with a _Quick setup for development_.
 
-> WARNING: `master` branch is for development, if you want to try out a stable version we recommend to use a latest tagged version.
+**WARNING**: Please keep in mind, that the `master` branch is for development. And if you want to try a stable version - we recommend you to use a latest tagged version.
 
-If you have any questions, don't hesitate to ask them on [![Join the chat at https://gitter.im/ongr-io/support](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ongr-io/support?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
- chat, or just come to say Hi ;).
+If you will need any help or have any questions, don't hesitate to ask on [![Join the chat at https://gitter.im/ongr-io/support](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ongr-io/support?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) chat, or just come to say Hi ;).
 
+## Very quick setup
 
-## Quick setup
+* Step 1: Install [Kitematic from Docker](https://kitematic.com).
+* Step 2: Open [Kitematic from Docker](https://kitematic.com) and search for the `ongr/demo-presentation`. When you found it, press `CREATE`.
+* Step 3: When this is finished, just click on the `Web Preview` link in the right side.
+
+## Quick setup for the development
 
 This example is based on [Symfony framework](https://github.com/symfony/symfony-standard) project by using ONGR bundles. 
 So if you want to use ONGR bundles we assume that you know how to work with [Symfony](https://github.com/symfony/symfony) framework.
 
 To run this demo you gonna need:
 * PHP >=5.5
 * Elasticsearch
+* **Linux/Unix** based environment or **OS X**. Sorry, currently we do not support Microsoft Windows as a development environment, but this might change in the future. For now you could try it with a _Very quick setup_ guide.
 
-If you have you own development env got straight to the [Step 4](#step-4) to install assets and demo data.
+If you already have your own development environment, you can go straight to the [Step 4](#step-4) to install assets and demo data.
 
-In case you don't have an environment we have a [Vagrant](https://www.vagrantup.com) box configuration in the [testing-vm repository](https://github.com/ongr-io/testing-vm).
-
-> We do not support Microsoft Windows as a development environment. This might change in the future but for now you either need **Linux/Unix** based environment or **OS X**.
+In case you don't have an environment, we have a [Vagrant](https://www.vagrantup.com) box configuration in the [testing-vm repository](https://github.com/ongr-io/testing-vm).
 
 ### Step 1
 
@@ -33,9 +38,7 @@ git clone https://github.com/ongr-io/testing-vm.git ongr
 
 ### Step 2
 
-Provision your new box. 
-
-> First time it will take about 5-15 min (depending on your internet connection).
+Provision your new box. At the first time it might take about 5-15 min (depending on your internet connection).
 
 ```bash
 cd ongr
@@ -52,7 +55,7 @@ git clone https://github.com/ongr-io/Demo.git public
 vagrant ssh
 ```
 
-> WARNING: Do not change `public` folder name, it's hardcoded vhost location in the [testing-vm](https://github.com/ongr-io/testing-vm)
+**WARNING**: Do not change `public` folder name, it's hardcoded vhost location in the [testing-vm](https://github.com/ongr-io/testing-vm)
 
 ### Step 4
 
@@ -63,12 +66,12 @@ composer install --no-interaction
 npm install
 bower install
 gulp
-app/console ongr:es:index:create
-app/console ongr:es:index:import --raw src/ONGR/DemoBundle/Resources/data/ongr.json
+bin/console ongr:es:index:create
+bin/console ongr:es:index:import app/Resources/data/demo.json
 ```
 
 ### Step 5
 
 Navigate your browser to the http://ongr.dev
 
-> Make sure you have correct host definition in the `/etc/hosts`. ongr.dev is our host example from [testing-vm](https://github.com/ongr-io/testing-vm)
+**NOTE**: Please make sure that your host definition in the `/etc/hosts` is correct. _ongr.dev_ is our host example from [testing-vm](https://github.com/ongr-io/testing-vm)

app/AppCache.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__.'/AppKernel.php';
-
 use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
 
 class AppCache extends HttpCache

app/AppKernel.php

@@ -7,27 +7,24 @@ class AppKernel extends Kernel
 {
     public function registerBundles()
     {
-        $bundles = array(
+        $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 Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
-
-            //Third party
-            new ONGR\DemoBundle\ONGRDemoBundle(),
             new ONGR\ElasticsearchBundle\ONGRElasticsearchBundle(),
-            new ONGR\RouterBundle\ONGRRouterBundle(),
             new ONGR\FilterManagerBundle\ONGRFilterManagerBundle(),
-            new ONGR\ContentBundle\ONGRContentBundle(),
+            new ONGR\RouterBundle\ONGRRouterBundle(),
             new JMS\SerializerBundle\JMSSerializerBundle(),
             new ONGR\ApiBundle\ONGRApiBundle(),
-        );
+            new AppBundle\AppBundle(),
+        ];
 
-        if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
+            $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
@@ -36,8 +33,23 @@ public function registerBundles()
         return $bundles;
     }
 
+    public function getRootDir()
+    {
+        return __DIR__;
+    }
+
+    public function getCacheDir()
+    {
+        return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
+    }
+
+    public function getLogDir()
+    {
+        return dirname(__DIR__).'/var/logs';
+    }
+
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
     }
 }