From 025f0da2b159f53a74fa5c7be58fe7ed186e29fe Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Sun, 17 Aug 2014 23:58:32 +0200 Subject: [PATCH 1/7] use dev packages --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index f9c66f13ed..3df7f9390b 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "autoload": { "psr-0": { "": "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" } } } From c392dfa179e32a481bebd912812ded063adffffc Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Wed, 20 Aug 2014 04:06:20 -0500 Subject: [PATCH 2/7] bootstrap some changes --- src/Acme/DemoBundle/Document/UnitBlock.php | 3 --- src/Acme/DemoBundle/Resources/views/Block/unit.html.twig | 8 ++++---- src/Acme/DemoBundle/Resources/views/home.html.twig | 8 ++++---- src/Acme/DemoBundle/Resources/views/layout.html.twig | 4 ++-- src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php | 1 - 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/Acme/DemoBundle/Document/UnitBlock.php b/src/Acme/DemoBundle/Document/UnitBlock.php index b8480cd3fe..86751fa511 100644 --- a/src/Acme/DemoBundle/Document/UnitBlock.php +++ b/src/Acme/DemoBundle/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; /** diff --git a/src/Acme/DemoBundle/Resources/views/Block/unit.html.twig b/src/Acme/DemoBundle/Resources/views/Block/unit.html.twig index 15a6a1ddf2..8cb6c3a925 100644 --- a/src/Acme/DemoBundle/Resources/views/Block/unit.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Block/unit.html.twig @@ -1,8 +1,8 @@ {% extends sonata_block.templates.block_base %} {% block block %} -
-
- {{ block.text }} -
+
+
+ {{ block.text }} +
{% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/home.html.twig b/src/Acme/DemoBundle/Resources/views/home.html.twig index 9601467d41..24ada017c9 100644 --- a/src/Acme/DemoBundle/Resources/views/home.html.twig +++ b/src/Acme/DemoBundle/Resources/views/home.html.twig @@ -1,10 +1,10 @@ {% extends 'AcmeDemoBundle::layout.html.twig' %} {% block hero_unit %} -
-

Welcome!

-

Symfony2 Content Management Framework

-
+
+

Welcome!

+

Symfony2 Content Management Framework

+
{% endblock %} {% block main %} diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Acme/DemoBundle/Resources/views/layout.html.twig index 1b26f22388..61aaa3094a 100644 --- a/src/Acme/DemoBundle/Resources/views/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/layout.html.twig @@ -6,8 +6,8 @@ {% block title %}Demo Bundle{% endblock %} {% block stylesheets %} - - + + {% endblock %} {# CreateJS is only available for admins by default #} diff --git a/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php b/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php index 7664a0876b..19e945f5a9 100644 --- a/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php +++ b/src/Acme/DemoBundle/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); } } - From 8c16035810af8a767178911b2fca1592548575dd Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Wed, 20 Aug 2014 04:08:56 -0500 Subject: [PATCH 3/7] plug .gush.yml --- .gush.yml | 3 +++ composer.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .gush.yml diff --git a/.gush.yml b/.gush.yml new file mode 100644 index 0000000000..ffa6c4a74f --- /dev/null +++ b/.gush.yml @@ -0,0 +1,3 @@ +adapter: github +issue-tracker: github + diff --git a/composer.json b/composer.json index 3df7f9390b..04208169f7 100644 --- a/composer.json +++ b/composer.json @@ -65,7 +65,7 @@ "file": "app/config/parameters.yml" }, "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } } } From 25a62e4780c641e9d65e3344153e53f68c977bf8 Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Wed, 20 Aug 2014 04:18:28 -0500 Subject: [PATCH 4/7] let's move to PSR4 --- composer.json | 4 ++-- src/{Acme/DemoBundle => }/AcmeDemoBundle.php | 0 .../DemoBundle => }/Block/UnitBlockService.php | 0 .../Controller/SecurityController.php | 0 .../DataFixtures/PHPCR/LoadDemoData.php | 0 .../DependencyInjection/AcmeDemoExtension.php | 0 src/{Acme/DemoBundle => }/Document/UnitBlock.php | 0 .../DemoBundle => }/Resources/config/routing.yml | 0 .../DemoBundle => }/Resources/config/services.yml | 0 src/{Acme/DemoBundle => }/Resources/data/blocks.yml | 0 src/{Acme/DemoBundle => }/Resources/data/pages.yml | 0 .../Resources/public/css/bootstrap.min.css | 0 .../DemoBundle => }/Resources/public/css/demo.css | 0 .../Resources/public/images/logo.gif | Bin .../Resources/public/images/welcome-configure.gif | Bin .../Resources/public/images/welcome-demo.gif | Bin .../Resources/public/images/welcome-quick-tour.gif | Bin .../Resources/views/Block/unit.html.twig | 0 .../Resources/views/Menu/bootstrap.html.twig | 0 .../Resources/views/Page/index.html.twig | 0 .../Resources/views/Security/login.html.twig | 0 .../DemoBundle => }/Resources/views/home.html.twig | 0 .../Resources/views/layout.html.twig | 0 .../Tests/Functional/StaticPageTest.php | 0 src/{Acme/DemoBundle => }/Tests/WebTestCase.php | 0 25 files changed, 2 insertions(+), 2 deletions(-) rename src/{Acme/DemoBundle => }/AcmeDemoBundle.php (100%) rename src/{Acme/DemoBundle => }/Block/UnitBlockService.php (100%) rename src/{Acme/DemoBundle => }/Controller/SecurityController.php (100%) rename src/{Acme/DemoBundle => }/DataFixtures/PHPCR/LoadDemoData.php (100%) rename src/{Acme/DemoBundle => }/DependencyInjection/AcmeDemoExtension.php (100%) rename src/{Acme/DemoBundle => }/Document/UnitBlock.php (100%) rename src/{Acme/DemoBundle => }/Resources/config/routing.yml (100%) rename src/{Acme/DemoBundle => }/Resources/config/services.yml (100%) rename src/{Acme/DemoBundle => }/Resources/data/blocks.yml (100%) rename src/{Acme/DemoBundle => }/Resources/data/pages.yml (100%) rename src/{Acme/DemoBundle => }/Resources/public/css/bootstrap.min.css (100%) rename src/{Acme/DemoBundle => }/Resources/public/css/demo.css (100%) rename src/{Acme/DemoBundle => }/Resources/public/images/logo.gif (100%) rename src/{Acme/DemoBundle => }/Resources/public/images/welcome-configure.gif (100%) rename src/{Acme/DemoBundle => }/Resources/public/images/welcome-demo.gif (100%) rename src/{Acme/DemoBundle => }/Resources/public/images/welcome-quick-tour.gif (100%) rename src/{Acme/DemoBundle => }/Resources/views/Block/unit.html.twig (100%) rename src/{Acme/DemoBundle => }/Resources/views/Menu/bootstrap.html.twig (100%) rename src/{Acme/DemoBundle => }/Resources/views/Page/index.html.twig (100%) rename src/{Acme/DemoBundle => }/Resources/views/Security/login.html.twig (100%) rename src/{Acme/DemoBundle => }/Resources/views/home.html.twig (100%) rename src/{Acme/DemoBundle => }/Resources/views/layout.html.twig (100%) rename src/{Acme/DemoBundle => }/Tests/Functional/StaticPageTest.php (100%) rename src/{Acme/DemoBundle => }/Tests/WebTestCase.php (100%) diff --git a/composer.json b/composer.json index 04208169f7..dc4046a8db 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "autoload": { - "psr-0": { "": "src/" } + "psr-4": { "Acme\\DemoBundle": "src/" } }, "minimum-stability": "dev", "require": { @@ -65,7 +65,7 @@ "file": "app/config/parameters.yml" }, "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.2-dev" } } } diff --git a/src/Acme/DemoBundle/AcmeDemoBundle.php b/src/AcmeDemoBundle.php similarity index 100% rename from src/Acme/DemoBundle/AcmeDemoBundle.php rename to src/AcmeDemoBundle.php diff --git a/src/Acme/DemoBundle/Block/UnitBlockService.php b/src/Block/UnitBlockService.php similarity index 100% rename from src/Acme/DemoBundle/Block/UnitBlockService.php rename to src/Block/UnitBlockService.php diff --git a/src/Acme/DemoBundle/Controller/SecurityController.php b/src/Controller/SecurityController.php similarity index 100% rename from src/Acme/DemoBundle/Controller/SecurityController.php rename to src/Controller/SecurityController.php diff --git a/src/Acme/DemoBundle/DataFixtures/PHPCR/LoadDemoData.php b/src/DataFixtures/PHPCR/LoadDemoData.php similarity index 100% rename from src/Acme/DemoBundle/DataFixtures/PHPCR/LoadDemoData.php rename to src/DataFixtures/PHPCR/LoadDemoData.php diff --git a/src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php b/src/DependencyInjection/AcmeDemoExtension.php similarity index 100% rename from src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php rename to src/DependencyInjection/AcmeDemoExtension.php diff --git a/src/Acme/DemoBundle/Document/UnitBlock.php b/src/Document/UnitBlock.php similarity index 100% rename from src/Acme/DemoBundle/Document/UnitBlock.php rename to src/Document/UnitBlock.php diff --git a/src/Acme/DemoBundle/Resources/config/routing.yml b/src/Resources/config/routing.yml similarity index 100% rename from src/Acme/DemoBundle/Resources/config/routing.yml rename to src/Resources/config/routing.yml diff --git a/src/Acme/DemoBundle/Resources/config/services.yml b/src/Resources/config/services.yml similarity index 100% rename from src/Acme/DemoBundle/Resources/config/services.yml rename to src/Resources/config/services.yml diff --git a/src/Acme/DemoBundle/Resources/data/blocks.yml b/src/Resources/data/blocks.yml similarity index 100% rename from src/Acme/DemoBundle/Resources/data/blocks.yml rename to src/Resources/data/blocks.yml diff --git a/src/Acme/DemoBundle/Resources/data/pages.yml b/src/Resources/data/pages.yml similarity index 100% rename from src/Acme/DemoBundle/Resources/data/pages.yml rename to src/Resources/data/pages.yml diff --git a/src/Acme/DemoBundle/Resources/public/css/bootstrap.min.css b/src/Resources/public/css/bootstrap.min.css similarity index 100% rename from src/Acme/DemoBundle/Resources/public/css/bootstrap.min.css rename to src/Resources/public/css/bootstrap.min.css diff --git a/src/Acme/DemoBundle/Resources/public/css/demo.css b/src/Resources/public/css/demo.css similarity index 100% rename from src/Acme/DemoBundle/Resources/public/css/demo.css rename to src/Resources/public/css/demo.css diff --git a/src/Acme/DemoBundle/Resources/public/images/logo.gif b/src/Resources/public/images/logo.gif similarity index 100% rename from src/Acme/DemoBundle/Resources/public/images/logo.gif rename to src/Resources/public/images/logo.gif diff --git a/src/Acme/DemoBundle/Resources/public/images/welcome-configure.gif b/src/Resources/public/images/welcome-configure.gif similarity index 100% rename from src/Acme/DemoBundle/Resources/public/images/welcome-configure.gif rename to src/Resources/public/images/welcome-configure.gif diff --git a/src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif b/src/Resources/public/images/welcome-demo.gif similarity index 100% rename from src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif rename to src/Resources/public/images/welcome-demo.gif diff --git a/src/Acme/DemoBundle/Resources/public/images/welcome-quick-tour.gif b/src/Resources/public/images/welcome-quick-tour.gif similarity index 100% rename from src/Acme/DemoBundle/Resources/public/images/welcome-quick-tour.gif rename to src/Resources/public/images/welcome-quick-tour.gif diff --git a/src/Acme/DemoBundle/Resources/views/Block/unit.html.twig b/src/Resources/views/Block/unit.html.twig similarity index 100% rename from src/Acme/DemoBundle/Resources/views/Block/unit.html.twig rename to src/Resources/views/Block/unit.html.twig diff --git a/src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig b/src/Resources/views/Menu/bootstrap.html.twig similarity index 100% rename from src/Acme/DemoBundle/Resources/views/Menu/bootstrap.html.twig rename to src/Resources/views/Menu/bootstrap.html.twig diff --git a/src/Acme/DemoBundle/Resources/views/Page/index.html.twig b/src/Resources/views/Page/index.html.twig similarity index 100% rename from src/Acme/DemoBundle/Resources/views/Page/index.html.twig rename to src/Resources/views/Page/index.html.twig diff --git a/src/Acme/DemoBundle/Resources/views/Security/login.html.twig b/src/Resources/views/Security/login.html.twig similarity index 100% rename from src/Acme/DemoBundle/Resources/views/Security/login.html.twig rename to src/Resources/views/Security/login.html.twig diff --git a/src/Acme/DemoBundle/Resources/views/home.html.twig b/src/Resources/views/home.html.twig similarity index 100% rename from src/Acme/DemoBundle/Resources/views/home.html.twig rename to src/Resources/views/home.html.twig diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Resources/views/layout.html.twig similarity index 100% rename from src/Acme/DemoBundle/Resources/views/layout.html.twig rename to src/Resources/views/layout.html.twig diff --git a/src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php b/src/Tests/Functional/StaticPageTest.php similarity index 100% rename from src/Acme/DemoBundle/Tests/Functional/StaticPageTest.php rename to src/Tests/Functional/StaticPageTest.php diff --git a/src/Acme/DemoBundle/Tests/WebTestCase.php b/src/Tests/WebTestCase.php similarity index 100% rename from src/Acme/DemoBundle/Tests/WebTestCase.php rename to src/Tests/WebTestCase.php From 400eb59dc1442073ad8f1034d9157ad3733c5ba4 Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Wed, 20 Aug 2014 04:19:22 -0500 Subject: [PATCH 5/7] missing \ --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dc4046a8db..5eedf70421 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "autoload": { - "psr-4": { "Acme\\DemoBundle": "src/" } + "psr-4": { "Acme\\DemoBundle\\": "src/" } }, "minimum-stability": "dev", "require": { From 9279d74ab99be81a102a64a8fb7f1e2a23a7d1fc Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Wed, 20 Aug 2014 04:23:54 -0500 Subject: [PATCH 6/7] help travis not to test and load the servers --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 08a1871293..2a2956a531 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: php php: - 5.3 - - 5.4 - 5.5 - hhvm From 5e9faa899a24114c1b86cc5488beacf9e0036e88 Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Wed, 20 Aug 2014 04:28:13 -0500 Subject: [PATCH 7/7] avoiding spam --- .gush.yml | 1 - .travis.yml | 16 +++++++++------- src/Tests/WebTestCase.php | 8 +++++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.gush.yml b/.gush.yml index ffa6c4a74f..bc53b9f248 100644 --- a/.gush.yml +++ b/.gush.yml @@ -1,3 +1,2 @@ adapter: github issue-tracker: github - diff --git a/.travis.yml b/.travis.yml index 2a2956a531..aaf9211afc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,14 @@ language: php php: - - 5.3 +# - 5.3 +# - 5.4 - 5.5 - - hhvm +# - hhvm -matrix: - allow_failures: - - php: hhvm +#matrix: +# allow_failures: +# - php: hhvm before_script: - composer self-update @@ -20,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" diff --git a/src/Tests/WebTestCase.php b/src/Tests/WebTestCase.php index 82f065c6c9..4bbda0b589 100644 --- a/src/Tests/WebTestCase.php +++ b/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; }