[WIP] clean up

.gush.yml

@@ -0,0 +1,2 @@
+adapter: github
+issue-tracker: github

.travis.yml

@@ -1,14 +1,14 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
+#  - 5.3
+#  - 5.4
   - 5.5
-  - hhvm
+#  - hhvm
 
-matrix:
-  allow_failures:
-    - php: hhvm
+#matrix:
+#  allow_failures:
+#    - php: hhvm
 
 before_script:
   - composer self-update
@@ -21,5 +21,6 @@ before_script:
 script: phpunit -c app
 
 notifications:
-  irc: "irc.freenode.org#symfony-cmf"
-  email: "symfony-cmf-devs@googlegroups.com"
+#  irc: "irc.freenode.org#symfony-cmf"
+#  email: "symfony-cmf-devs@googlegroups.com"
+  email: "cordoval@gmail.com"

composer.json

@@ -11,9 +11,9 @@
         }
     ],
     "autoload": {
-        "psr-0": { "": "src/" }
+        "psr-4": { "Acme\\DemoBundle\\": "src/" }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.3.3",
         "symfony/symfony": "2.3.*",
@@ -25,9 +25,9 @@
         "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.*",
+        "symfony-cmf/symfony-cmf": "1.2.*",
+        "symfony-cmf/simple-cms-bundle": "1.2.*",
+        "symfony-cmf/create-bundle": "1.2.*",
         "sensio/distribution-bundle": "2.3.*",
         "sensio/framework-extra-bundle": "2.3.*",
         "sensio/generator-bundle": "2.3.*",
@@ -65,7 +65,7 @@
             "file": "app/config/parameters.yml"
         },
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }

src/Acme/DemoBundle/Document/UnitBlock.php → src/Document/UnitBlock.php

@@ -2,10 +2,7 @@
 
 namespace Acme\DemoBundle\Document;
 
-use Sonata\BlockBundle\Block\BlockContextInterface;
 use Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\AbstractBlock;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCR;
 
 /**

src/Resources/views/Block/unit.html.twig

@@ -0,0 +1,8 @@
+{% extends sonata_block.templates.block_base %}
+
+{% block block %}
+    <div class="col-md-4 col-sm-4">
+        <img class="center-block" src="{{ asset(block.image) }}"><br>
+        <a class="btn btn-default btn-block" href="{{ block.url is not null ? block.url : path(block.route) }}">{{ block.text }}</a>
+    </div>
+{% endblock %}

src/Acme/DemoBundle/Resources/views/home.html.twig → src/Resources/views/home.html.twig

@@ -1,10 +1,10 @@
 {% extends 'AcmeDemoBundle::layout.html.twig' %}
 
 {% block hero_unit %}
-<div class="jumbotron page__hero-unit">
-    <h1>Welcome!</h1>
-    <h2>Symfony2 Content Management Framework</h2>
-</div>
+    <div class="jumbotron page__hero-unit">
+        <h1>Welcome!</h1>
+        <h2>Symfony2 Content Management Framework</h2>
+    </div>
 {% endblock %}
 
 {% block main %}

src/Acme/DemoBundle/Resources/views/layout.html.twig → src/Resources/views/layout.html.twig

@@ -6,8 +6,8 @@
     <title>{% block title %}Demo Bundle{% endblock %}</title>
 
     {% block stylesheets %}
-    <link href="{{ asset('bundles/acmedemo/css/bootstrap.min.css') }}" rel="stylesheet">
-    <link href="{{ asset('bundles/acmedemo/css/demo.css') }}" rel="stylesheet">
+        <link href="{{ asset('bundles/acmedemo/css/bootstrap.min.css') }}" rel="stylesheet">
+        <link href="{{ asset('bundles/acmedemo/css/demo.css') }}" rel="stylesheet">
     {% endblock %}
 
     {# CreateJS is only available for admins by default #}

src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php → src/Tests/Functional/StaticPageTest.php

@@ -35,4 +35,3 @@ public function testDemoPage()
         $this->assertCount(1, $crawler->filter(sprintf('body:contains("%s")', $body)), 'Page does not contain the text: '.$body);
     }
 }
-

src/Acme/DemoBundle/Tests/WebTestCase.php → src/Tests/WebTestCase.php

@@ -14,9 +14,11 @@ public function setUp()
             return;
         }
 
-        $this->loadFixtures(array(
-            'Acme\DemoBundle\DataFixtures\PHPCR\LoadDemoData',
-        ), null, 'doctrine_phpcr');
+        $this->loadFixtures(
+            array('Acme\DemoBundle\DataFixtures\PHPCR\LoadDemoData'),
+            null,
+            'doctrine_phpcr'
+        );
 
         self::$fixturesLoaded = true;
     }