From 06dc51940a7f1b9fd5582bfb74a886ed9f023071 Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Mon, 19 Aug 2013 23:58:46 +0200 Subject: [PATCH 1/3] updated SimpleCmsBundle config and fixture loading --- app/config/config.yml | 6 ++---- .../DataFixtures/PHPCR/LoadSimpleCmsData.php | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index d65a17f..48bcf7a 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -86,11 +86,9 @@ cmf_create: cmf_simple_cms: routing: templates_by_class: - Symfony\Cmf\Bundle\SimpleCmsBundle\Document\Page: CmfSimpleCmsBundle:Page:index.html.twig + Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: CmfSimpleCmsBundle:Page:index.html.twig controllers_by_class: - Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute: cmf_routing.redirect_controller:redirectAction - multilang: - locales: %locales% + Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute: cmf_routing.redirect_controller:redirectAction knp_menu: twig: true diff --git a/src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php b/src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php index d16fe59..fd36def 100644 --- a/src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php +++ b/src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php @@ -6,13 +6,13 @@ use Symfony\Component\Yaml\Parser; -use Symfony\Cmf\Bundle\SimpleCmsBundle\DataFixtures\LoadCmsData; -use Symfony\Cmf\Bundle\SimpleCmsBundle\Document\MultilangRedirectRoute; -use Symfony\Cmf\Bundle\SimpleCmsBundle\Document\MultilangRoute; +use Symfony\Cmf\Bundle\SimpleCmsBundle\DataFixtures\Phpcr\AbstractLoadPageData; +use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\MultilangRedirectRoute; +use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\MultilangRoute; use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode; -class LoadSimpleCmsData extends LoadCmsData +class LoadSimpleCmsData extends AbstractLoadPageData { private $yaml; @@ -34,7 +34,7 @@ public function load(ObjectManager $dm) $data = $this->yaml->parse(file_get_contents(__DIR__ . '/../../Resources/data/external.yml')); - $basepath = $this->container->getParameter('cmf_simple_cms.basepath'); + $basepath = $this->getBasePath(); $home = $dm->find(null, $basepath); $route = new MultilangRoute(); From 017623929e5c2ed8d39477453ad59703b4fdb876 Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Thu, 22 Aug 2013 01:34:09 +0200 Subject: [PATCH 2/3] prepare release --- app/AppKernel.php | 2 + app/config/config.yml | 3 - composer.json | 9 +- composer.lock | 717 +++++++++++------- .../DataFixtures/PHPCR/LoadSimpleCmsData.php | 5 + 5 files changed, 435 insertions(+), 301 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index b4ca3d1..3e38246 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -21,6 +21,7 @@ public function registerBundles() new Lunetics\LocaleBundle\LuneticsLocaleBundle(), new FOS\RestBundle\FOSRestBundle(), new JMS\SerializerBundle\JMSSerializerBundle($this), + new Liip\ImagineBundle\LiipImagineBundle(), // enable cmf bundles new Symfony\Cmf\Bundle\RoutingBundle\CmfRoutingBundle(), @@ -28,6 +29,7 @@ public function registerBundles() new Symfony\Cmf\Bundle\MenuBundle\CmfMenuBundle(), new Symfony\Cmf\Bundle\ContentBundle\CmfContentBundle(), new Symfony\Cmf\Bundle\SimpleCmsBundle\CmfSimpleCmsBundle(), + new Symfony\Cmf\Bundle\MediaBundle\CmfMediaBundle(), new Symfony\Cmf\Bundle\CreateBundle\CmfCreateBundle(), // and the sandbox bundle diff --git a/app/config/config.yml b/app/config/config.yml index 48bcf7a..1aa4d34 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -80,9 +80,6 @@ cmf_core: multilang: locales: %locales% -cmf_create: - phpcr_odm: true - cmf_simple_cms: routing: templates_by_class: diff --git a/composer.json b/composer.json index 5357660..c5b3297 100644 --- a/composer.json +++ b/composer.json @@ -14,16 +14,17 @@ "symfony/monolog-bundle": "2.3.*", "symfony/assetic-bundle": "2.3.*", "sensio/distribution-bundle": "2.3.*", - "symfony-cmf/symfony-cmf": "1.0.0-beta3", - "symfony-cmf/simple-cms-bundle": "1.0.0-beta3", - "symfony-cmf/create-bundle": "1.0.0-beta3", + "symfony-cmf/symfony-cmf": "1.0.0-beta6", + "symfony-cmf/simple-cms-bundle": "1.0.0-RC2", + "symfony-cmf/create-bundle": "1.0.0-beta4", "jackalope/jackalope-doctrine-dbal":"1.0.0-beta3", "doctrine/doctrine-bundle": "1.2.*", "doctrine/doctrine-fixtures-bundle": "2.1.*", "liip/functional-test-bundle": "1.0.*", "lunetics/locale-bundle": "2.2.*", "liip/doctrine-cache-bundle": "1.0.*", - "incenteev/composer-parameter-handler": "~2.0" + "incenteev/composer-parameter-handler": "~2.0", + "liip/imagine-bundle": "~0.12" }, "scripts": { "post-install-cmd": [ diff --git a/composer.lock b/composer.lock index b14a85a..9e2d9d1 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "ff87abe1d757ccea2d6711532701b170", + "hash": "fb05fa22081b1a69d5f5385e7c79ca60", "packages": [ { "name": "doctrine/annotations", @@ -78,16 +78,16 @@ }, { "name": "doctrine/cache", - "version": "dev-master", + "version": "v1.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "beb242e0e22eebdca1db571edb1bac788b054124" + "reference": "2c9761ff1d13e188d5f7378066c1ce2882d7a336" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/beb242e0e22eebdca1db571edb1bac788b054124", - "reference": "beb242e0e22eebdca1db571edb1bac788b054124", + "url": "https://api.github.com/repos/doctrine/cache/zipball/2c9761ff1d13e188d5f7378066c1ce2882d7a336", + "reference": "2c9761ff1d13e188d5f7378066c1ce2882d7a336", "shasum": "" }, "require": { @@ -143,7 +143,7 @@ "cache", "caching" ], - "time": "2013-07-31 00:07:06" + "time": "2013-08-07 16:04:25" }, { "name": "doctrine/collections", @@ -218,12 +218,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "9c6b8615a988117dec83bdbb0fad80afef23eab8" + "reference": "b4c7860e0c5a8d13598ca34d156533300b0dacf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/9c6b8615a988117dec83bdbb0fad80afef23eab8", - "reference": "9c6b8615a988117dec83bdbb0fad80afef23eab8", + "url": "https://api.github.com/repos/doctrine/common/zipball/b4c7860e0c5a8d13598ca34d156533300b0dacf0", + "reference": "b4c7860e0c5a8d13598ca34d156533300b0dacf0", "shasum": "" }, "require": { @@ -284,7 +284,7 @@ "persistence", "spl" ], - "time": "2013-07-30 05:35:10" + "time": "2013-08-20 18:10:31" }, { "name": "doctrine/data-fixtures", @@ -411,12 +411,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "5a4d5724e14fc07bb955a6ab898313fab4b230ea" + "reference": "b19261fdbc4d8a4697b5373a64f9da5766bbb4db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/5a4d5724e14fc07bb955a6ab898313fab4b230ea", - "reference": "5a4d5724e14fc07bb955a6ab898313fab4b230ea", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/b19261fdbc4d8a4697b5373a64f9da5766bbb4db", + "reference": "b19261fdbc4d8a4697b5373a64f9da5766bbb4db", "shasum": "" }, "require": { @@ -472,7 +472,7 @@ "orm", "persistence" ], - "time": "2013-06-16 18:40:01" + "time": "2013-08-09 10:00:34" }, { "name": "doctrine/doctrine-fixtures-bundle", @@ -481,19 +481,19 @@ "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "8070624b47f7f171db4c9e4134436db7de51244c" + "reference": "e018cf34f6c8642eba40ca44871fead97616922a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/8070624b47f7f171db4c9e4134436db7de51244c", - "reference": "8070624b47f7f171db4c9e4134436db7de51244c", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/e018cf34f6c8642eba40ca44871fead97616922a", + "reference": "e018cf34f6c8642eba40ca44871fead97616922a", "shasum": "" }, "require": { "doctrine/data-fixtures": "*", "doctrine/doctrine-bundle": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": ">=2.1.0,<2.4-dev" + "symfony/doctrine-bridge": "~2.1" }, "type": "symfony-bundle", "extra": { @@ -530,7 +530,7 @@ "Fixture", "persistence" ], - "time": "2013-07-18 09:26:47" + "time": "2013-08-05 08:41:18" }, { "name": "doctrine/inflector", @@ -659,17 +659,17 @@ }, { "name": "doctrine/phpcr-bundle", - "version": "1.0.0-beta3", + "version": "1.0.0-beta4", "target-dir": "Doctrine/Bundle/PHPCRBundle", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrinePHPCRBundle.git", - "reference": "1.0.0-beta3" + "reference": "ffc86e33ab011f4abaa8d9d7439e1467971de6e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/1.0.0-beta3", - "reference": "1.0.0-beta3", + "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/ffc86e33ab011f4abaa8d9d7439e1467971de6e2", + "reference": "ffc86e33ab011f4abaa8d9d7439e1467971de6e2", "shasum": "" }, "require": { @@ -682,8 +682,7 @@ "suggest": { "doctrine/data-fixtures": "if you want to use the fixture loading", "doctrine/doctrine-bundle": "when using jackalope-doctrine-dbal", - "doctrine/phpcr-odm": "if you want to use the odm as well. require version 1.0.*", - "liip/imagine-bundle": "when using the phpcr_odm_image form type" + "doctrine/phpcr-odm": "if you want to use the odm as well. require version 1.0.*" }, "type": "symfony-bundle", "extra": { @@ -718,20 +717,20 @@ "persistence", "phpcr" ], - "time": "2013-07-18 12:22:08" + "time": "2013-08-19 16:24:43" }, { "name": "doctrine/phpcr-odm", - "version": "1.0.0-beta3", + "version": "1.0.0-beta5", "source": { "type": "git", "url": "https://github.com/doctrine/phpcr-odm.git", - "reference": "1.0.0-beta3" + "reference": "445dfe17fccb91a0dad6f512dfb774d5e4985856" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/1.0.0-beta3", - "reference": "1.0.0-beta3", + "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/445dfe17fccb91a0dad6f512dfb774d5e4985856", + "reference": "445dfe17fccb91a0dad6f512dfb774d5e4985856", "shasum": "" }, "require": { @@ -741,13 +740,13 @@ "phpcr/phpcr-utils": "~1.0.0-beta6" }, "require-dev": { - "symfony/yaml": ">=2.0.0,<2.4.0-dev" + "symfony/yaml": "~2.0" }, "suggest": { - "jackalope/jackalope-doctrine-dbal": ">=1.0.0-beta2", - "jackalope/jackalope-jackrabbit": ">=1.0.0-beta3", + "jackalope/jackalope-doctrine-dbal": ">=1.0.0-beta3", + "jackalope/jackalope-jackrabbit": ">=1.0.0-beta4", "midgard/phpcr": ">=1.3", - "symfony/yaml": ">=2.0.0,<2.4.0-dev" + "symfony/yaml": "~2.0" }, "bin": [ "bin/phpcrodm", @@ -791,61 +790,7 @@ "odm", "phpcr" ], - "time": "2013-07-26 16:37:37" - }, - { - "name": "friendsofsymfony/jsrouting-bundle", - "version": "1.2.0", - "target-dir": "FOS/JsRoutingBundle", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfSymfony/FOSJsRoutingBundle.git", - "reference": "1.2.0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSJsRoutingBundle/zipball/1.2.0", - "reference": "1.2.0", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "symfony/console": "~2.0", - "symfony/framework-bundle": "~2.0", - "symfony/serializer": "~2.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-0": { - "FOS\\JsRoutingBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "William Durand", - "email": "william.durand1@gmail.com", - "homepage": "http://www.willdurand.fr" - }, - { - "name": "FriendsOfSymfony Community", - "homepage": "https://github.com/friendsofsymfony/FOSJsRoutingBundle/contributors" - } - ], - "description": "Symfony FOSJsRoutingBundle", - "homepage": "http://friendsofsymfony.github.com", - "keywords": [ - "Js Routing" - ], - "time": "2013-07-15 09:21:37" + "time": "2013-08-19 16:23:43" }, { "name": "friendsofsymfony/rest", @@ -900,31 +845,36 @@ }, { "name": "friendsofsymfony/rest-bundle", - "version": "0.12.0", + "version": "dev-master", "target-dir": "FOS/RestBundle", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "0.12.0" + "reference": "0.13.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/0.12.0", - "reference": "0.12.0", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/0.13.1", + "reference": "0.13.1", "shasum": "" }, "require": { "doctrine/inflector": "1.0.*", "friendsofsymfony/rest": ">=0.7.0,<0.9.0-dev", "php": ">=5.3.2", - "symfony/framework-bundle": ">=2.1,<3.0" + "symfony/framework-bundle": "~2.1", + "willdurand/negotiation": "1.0.*" + }, + "conflict": { + "jms/serializer": "<0.12", + "jms/serializer-bundle": "<0.11" }, "require-dev": { "jms/serializer-bundle": "0.12.*", - "sensio/framework-extra-bundle": ">=2.1,<3.0", - "symfony/form": ">=2.1,<3.0", - "symfony/security": ">=2.1,<3.0", - "symfony/yaml": ">=2.1,<3.0" + "sensio/framework-extra-bundle": "~2.1", + "symfony/form": "~2.1", + "symfony/security": "~2.1", + "symfony/yaml": "~2.1" }, "suggest": { "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires 0.12.*", @@ -934,7 +884,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "0.12.x-dev" + "dev-master": "1.0-dev" } }, "autoload": { @@ -966,7 +916,59 @@ "keywords": [ "rest" ], - "time": "2013-05-06 10:33:17" + "time": "2013-08-15 13:30:47" + }, + { + "name": "imagine/imagine", + "version": "v0.5.0", + "source": { + "type": "git", + "url": "https://github.com/avalanche123/Imagine.git", + "reference": "f64ec666baaa800edcbf237db41121a569230709" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/f64ec666baaa800edcbf237db41121a569230709", + "reference": "f64ec666baaa800edcbf237db41121a569230709", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "sami/sami": "dev-master" + }, + "suggest": { + "ext-gd": "to use the GD implementation", + "ext-gmagick": "to use the Gmagick implementation", + "ext-imagick": "to use the Imagick implementation" + }, + "type": "library", + "autoload": { + "psr-0": { + "Imagine": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bulat Shakirzyanov", + "email": "mallluhuct@gmail.com", + "homepage": "http://avalanche123.com" + } + ], + "description": "Image processing for PHP 5.3", + "homepage": "http://imagine.readthedocs.org/", + "keywords": [ + "drawing", + "graphics", + "image manipulation", + "image processing" + ], + "time": "2013-07-10 17:25:36" }, { "name": "incenteev/composer-parameter-handler", @@ -1186,12 +1188,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "0979c7d9eb7f0031a3c5ffed1d6e1fa4eb846e4e" + "reference": "b63f380d36a70586fd2abe518e35899d044745df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/0979c7d9eb7f0031a3c5ffed1d6e1fa4eb846e4e", - "reference": "0979c7d9eb7f0031a3c5ffed1d6e1fa4eb846e4e", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/b63f380d36a70586fd2abe518e35899d044745df", + "reference": "b63f380d36a70586fd2abe518e35899d044745df", "shasum": "" }, "require": { @@ -1217,7 +1219,7 @@ ], "authors": [ { - "name": "Johannes M. Schmitt", + "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -1230,7 +1232,7 @@ "xml", "yaml" ], - "time": "2013-03-28 16:32:37" + "time": "2013-08-04 12:47:51" }, { "name": "jms/parser-lib", @@ -1238,12 +1240,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/parser-lib.git", - "reference": "4d469a70c6dd03f921cbdeadafbcb261bb23e8b0" + "reference": "d5961fa3fa039aa5ee0e50021c6681ba949e360c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/4d469a70c6dd03f921cbdeadafbcb261bb23e8b0", - "reference": "4d469a70c6dd03f921cbdeadafbcb261bb23e8b0", + "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/d5961fa3fa039aa5ee0e50021c6681ba949e360c", + "reference": "d5961fa3fa039aa5ee0e50021c6681ba949e360c", "shasum": "" }, "require": { @@ -1265,7 +1267,7 @@ "Apache2" ], "description": "A library for easily creating recursive-descent parsers.", - "time": "2012-11-30 08:11:04" + "time": "2013-08-09 15:53:02" }, { "name": "jms/serializer", @@ -1273,12 +1275,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "9e0fcd00a374e9ad484687628c6c25ab1083ea5a" + "reference": "89a43cbe84e079bcd81d82889b03ded9abda2f47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/9e0fcd00a374e9ad484687628c6c25ab1083ea5a", - "reference": "9e0fcd00a374e9ad484687628c6c25ab1083ea5a", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/89a43cbe84e079bcd81d82889b03ded9abda2f47", + "reference": "89a43cbe84e079bcd81d82889b03ded9abda2f47", "shasum": "" }, "require": { @@ -1303,7 +1305,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.13-dev" + "dev-master": "0.14-dev" } }, "autoload": { @@ -1317,7 +1319,7 @@ ], "authors": [ { - "name": "Johannes M. Schmitt", + "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -1332,21 +1334,21 @@ "serialization", "xml" ], - "time": "2013-07-29 13:39:49" + "time": "2013-08-17 18:17:07" }, { "name": "jms/serializer-bundle", - "version": "dev-master", + "version": "0.12.0", "target-dir": "JMS/SerializerBundle", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", - "reference": "c7f57e622ec4ad531f59ac79b2536b0cb5681559" + "reference": "5531198a73c4adee669a8a2d1452999349822771" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/c7f57e622ec4ad531f59ac79b2536b0cb5681559", - "reference": "c7f57e622ec4ad531f59ac79b2536b0cb5681559", + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/5531198a73c4adee669a8a2d1452999349822771", + "reference": "5531198a73c4adee669a8a2d1452999349822771", "shasum": "" }, "require": { @@ -1387,7 +1389,7 @@ ], "authors": [ { - "name": "Johannes M. Schmitt", + "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" @@ -1402,7 +1404,7 @@ "serialization", "xml" ], - "time": "2013-07-29 12:32:39" + "time": "2013-07-29 12:36:36" }, { "name": "knplabs/knp-menu", @@ -1410,12 +1412,12 @@ "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpMenu.git", - "reference": "v1.1.2" + "reference": "f8e867268f63f561c1adadd6cbb5d8524f921873" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/v1.1.2", - "reference": "v1.1.2", + "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/f8e867268f63f561c1adadd6cbb5d8524f921873", + "reference": "f8e867268f63f561c1adadd6cbb5d8524f921873", "shasum": "" }, "require": { @@ -1452,7 +1454,7 @@ "email": "stof@notk.org" }, { - "name": "KnpLabs", + "name": "Knplabs", "homepage": "http://knplabs.com" }, { @@ -1475,12 +1477,12 @@ "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpMenuBundle.git", - "reference": "v1.1.2" + "reference": "2fecac02614e5a006f674dd5dd754eeaeca060b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpMenuBundle/zipball/v1.1.2", - "reference": "v1.1.2", + "url": "https://api.github.com/repos/KnpLabs/KnpMenuBundle/zipball/2fecac02614e5a006f674dd5dd754eeaeca060b9", + "reference": "2fecac02614e5a006f674dd5dd754eeaeca060b9", "shasum": "" }, "require": { @@ -1595,12 +1597,12 @@ "source": { "type": "git", "url": "https://github.com/liip/LiipDoctrineCacheBundle.git", - "reference": "c46dafe64c535550153c1577d3731f410b5febca" + "reference": "1.0.3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/liip/LiipDoctrineCacheBundle/zipball/c46dafe64c535550153c1577d3731f410b5febca", - "reference": "c46dafe64c535550153c1577d3731f410b5febca", + "url": "https://api.github.com/repos/liip/LiipDoctrineCacheBundle/zipball/1.0.3", + "reference": "1.0.3", "shasum": "" }, "require": { @@ -1634,7 +1636,7 @@ "Symfony2", "cache" ], - "time": "2013-05-31 17:52:22" + "time": "2013-08-08 14:44:34" }, { "name": "liip/functional-test-bundle", @@ -1692,6 +1694,60 @@ ], "time": "2013-05-24 05:48:28" }, + { + "name": "liip/imagine-bundle", + "version": "v0.14.0", + "target-dir": "Liip/ImagineBundle", + "source": { + "type": "git", + "url": "https://github.com/liip/LiipImagineBundle.git", + "reference": "ea3395eb6d73e096a64a0ee9f9d35e8cdcdf3636" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/liip/LiipImagineBundle/zipball/ea3395eb6d73e096a64a0ee9f9d35e8cdcdf3636", + "reference": "ea3395eb6d73e096a64a0ee9f9d35e8cdcdf3636", + "shasum": "" + }, + "require": { + "imagine/imagine": "0.5.*", + "php": ">=5.3.2", + "symfony/filesystem": ">=2.0.16,~2.0", + "symfony/finder": ">=2.0.16,~2.0", + "symfony/framework-bundle": ">=2.0.16,~2.0", + "symfony/options-resolver": ">=2.0.16,~2.0" + }, + "require-dev": { + "symfony/yaml": ">=2.0.16,~2.0", + "twig/twig": ">=1.0,<2.0-dev" + }, + "suggest": { + "twig/twig": ">=1.0,<2.0-dev" + }, + "type": "symfony-bundle", + "autoload": { + "psr-0": { + "Liip\\ImagineBundle": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Liip and other contributors", + "homepage": "https://github.com/liip/LiipImagineBundle/contributors" + } + ], + "description": "This Bundle assists in imagine manipulation using the imagine library", + "homepage": "http://liip.ch", + "keywords": [ + "image", + "imagine" + ], + "time": "2013-08-21 09:50:26" + }, { "name": "lunetics/locale-bundle", "version": "dev-master", @@ -1806,12 +1862,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "b33357d16bb84ca83be119e67abaff7321702b22" + "reference": "7a8844d4db868cf20040facb8c3413802dd0ec9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b33357d16bb84ca83be119e67abaff7321702b22", - "reference": "b33357d16bb84ca83be119e67abaff7321702b22", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/7a8844d4db868cf20040facb8c3413802dd0ec9b", + "reference": "7a8844d4db868cf20040facb8c3413802dd0ec9b", "shasum": "" }, "require": { @@ -1860,7 +1916,7 @@ "logging", "psr-3" ], - "time": "2013-07-30 11:01:58" + "time": "2013-08-09 12:12:38" }, { "name": "phpcollection/phpcollection", @@ -1868,12 +1924,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/php-collection.git", - "reference": "0.3.0" + "reference": "4925a0d7a39e137447a8f9d6339e6921fa09dca8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/0.3.0", - "reference": "0.3.0", + "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/4925a0d7a39e137447a8f9d6339e6921fa09dca8", + "reference": "4925a0d7a39e137447a8f9d6339e6921fa09dca8", "shasum": "" }, "require": { @@ -1972,12 +2028,12 @@ "source": { "type": "git", "url": "https://github.com/phpcr/phpcr-utils.git", - "reference": "1.0.0-beta14" + "reference": "c5223ef0025515e09a93bddeccb16f996991f620" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpcr/phpcr-utils/zipball/1.0.0-beta14", - "reference": "1.0.0-beta14", + "url": "https://api.github.com/repos/phpcr/phpcr-utils/zipball/c5223ef0025515e09a93bddeccb16f996991f620", + "reference": "c5223ef0025515e09a93bddeccb16f996991f620", "shasum": "" }, "require": { @@ -2026,7 +2082,7 @@ "contentrepository", "phpcr" ], - "time": "2013-07-26 10:37:28" + "time": "2013-08-14 11:31:39" }, { "name": "phpoption/phpoption", @@ -2122,12 +2178,12 @@ "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "4dad0ba10df54ea44581a51937f1a601b9d64575" + "reference": "f666c65c810f6a23455966c37f99ba76094775b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/4dad0ba10df54ea44581a51937f1a601b9d64575", - "reference": "4dad0ba10df54ea44581a51937f1a601b9d64575", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/f666c65c810f6a23455966c37f99ba76094775b5", + "reference": "f666c65c810f6a23455966c37f99ba76094775b5", "shasum": "" }, "require": { @@ -2159,7 +2215,7 @@ "configuration", "distribution" ], - "time": "2013-07-24 08:45:20" + "time": "2013-08-08 12:18:08" }, { "name": "sonata-project/block-bundle", @@ -2168,32 +2224,30 @@ "source": { "type": "git", "url": "https://github.com/sonata-project/SonataBlockBundle.git", - "reference": "03ff77585eaff60058b33a98793168b4d3865c2c" + "reference": "2.2.6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/03ff77585eaff60058b33a98793168b4d3865c2c", - "reference": "03ff77585eaff60058b33a98793168b4d3865c2c", + "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/2.2.6", + "reference": "2.2.6", "shasum": "" }, "require": { - "doctrine/common": ">=2.3,<2.5-dev", - "symfony/form": ">=2.2,<2.4-dev", - "symfony/http-foundation": ">=2.2,<2.4-dev" + "doctrine/common": "~2.3", + "symfony/form": "~2.2", + "symfony/http-foundation": "~2.2" }, "require-dev": { - "sonata-project/admin-bundle": "2.2.*@dev", - "sonata-project/cache-bundle": "2.1.*" + "sonata-project/admin-bundle": "~2.2@dev", + "sonata-project/cache-bundle": "~2.1" }, "suggest": { - "sonata-project/admin-bundle": "2.2.*@dev", - "sonata-project/cache-bundle": "2.1.*" + "sonata-project/admin-bundle": "~2.2@dev", + "sonata-project/cache-bundle": "~2.1" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-2.0": "2.0.x-dev", - "dev-2.1": "2.1.x-dev", "dev-master": "2.2.x-dev" } }, @@ -2223,21 +2277,21 @@ "block", "sonata" ], - "time": "2013-07-29 08:28:01" + "time": "2013-08-19 17:41:22" }, { "name": "symfony-cmf/block-bundle", - "version": "1.0.0-beta3", + "version": "1.0.0-RC1", "target-dir": "Symfony/Cmf/Bundle/BlockBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/BlockBundle.git", - "reference": "1.0.0-beta3" + "reference": "5ae7853034c223d11de594da241a7bd57ab74be6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/1.0.0-beta3", - "reference": "1.0.0-beta3", + "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/5ae7853034c223d11de594da241a7bd57ab74be6", + "reference": "5ae7853034c223d11de594da241a7bd57ab74be6", "shasum": "" }, "require": { @@ -2245,16 +2299,20 @@ "doctrine/phpcr-odm": "1.0.*", "php": ">=5.3.3", "sonata-project/block-bundle": "~2.2.4", + "symfony-cmf/core-bundle": "~1.0.0-RC1", "symfony/framework-bundle": "~2.2" }, "require-dev": { "sonata-project/cache-bundle": "~2.1.3", + "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*", + "symfony-cmf/testing": "1.0.*", "twig/twig": "~1.11" }, "suggest": { - "eko/feedbundle": "To use the RssBlock", + "eko/feedbundle": "When using the RssBlock", "liip/imagine-bundle": "When using the ImagineBlock", - "sonata-project/cache-bundle": "To add caching support for block loading" + "sonata-project/cache-bundle": "To add caching support for block loading", + "symfony-cmf/media-bundle": "When using the ImagineBlock" }, "type": "symfony-bundle", "extra": { @@ -2284,31 +2342,31 @@ "block", "content fragments" ], - "time": "2013-08-01 06:13:05" + "time": "2013-08-21 21:47:42" }, { "name": "symfony-cmf/content-bundle", - "version": "1.0.0-RC1", + "version": "1.0.0-RC2", "target-dir": "Symfony/Cmf/Bundle/ContentBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/ContentBundle.git", - "reference": "1.0.0-RC1" + "reference": "aa46de1b60366e3661245be65e8100d9c57aab09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/1.0.0-RC1", - "reference": "1.0.0-RC1", + "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/aa46de1b60366e3661245be65e8100d9c57aab09", + "reference": "aa46de1b60366e3661245be65e8100d9c57aab09", "shasum": "" }, "require": { - "doctrine/phpcr-bundle": "1.0.*", - "doctrine/phpcr-odm": "1.0.*", "php": ">=5.3.3", "symfony-cmf/core-bundle": "~1.0.0-RC1", "symfony/framework-bundle": "~2.2" }, "require-dev": { + "doctrine/phpcr-bundle": "1.0.*", + "doctrine/phpcr-odm": "1.0.*", "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*", "symfony-cmf/menu-bundle": "1.0.*", "symfony-cmf/routing-bundle": "1.1.*", @@ -2316,7 +2374,10 @@ "symfony/monolog-bundle": "2.2.*" }, "suggest": { + "doctrine/phpcr-bundle": "To integrate PHPCR-ODM with Symfony", + "doctrine/phpcr-odm": "To persist content with the PHP content repository", "friendsofsymfony/rest-bundle": "Improved handling for different output formats", + "sonata-project/doctrine-phpcr-admin-bundle": "To provide admin interfaces for the content", "symfony-cmf/menu-bundle": "Have editable menus for content", "symfony-cmf/routing-bundle": "Have editable routes for content" }, @@ -2346,21 +2407,21 @@ "keywords": [ "Symfony CMF" ], - "time": "2013-08-01 06:12:13" + "time": "2013-08-21 13:27:01" }, { "name": "symfony-cmf/core-bundle", - "version": "1.0.0-RC1", + "version": "1.0.0-RC3", "target-dir": "Symfony/Cmf/Bundle/CoreBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/CoreBundle.git", - "reference": "1.0.0-RC1" + "reference": "2134792666acebaaa2b6ce6fa4dec92cb8323b2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/1.0.0-RC1", - "reference": "1.0.0-RC1", + "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/2134792666acebaaa2b6ce6fa4dec92cb8323b2c", + "reference": "2134792666acebaaa2b6ce6fa4dec92cb8323b2c", "shasum": "" }, "require": { @@ -2407,31 +2468,34 @@ "keywords": [ "Symfony CMF" ], - "time": "2013-08-01 05:46:17" + "time": "2013-08-20 20:46:51" }, { "name": "symfony-cmf/create-bundle", - "version": "1.0.0-beta3", + "version": "1.0.0-beta4", "target-dir": "Symfony/Cmf/Bundle/CreateBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/CreateBundle.git", - "reference": "1.0.0-beta3" + "reference": "3714cced87805adb46a4f2ebff4035abe5393f33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/CreateBundle/zipball/1.0.0-beta3", - "reference": "1.0.0-beta3", + "url": "https://api.github.com/repos/symfony-cmf/CreateBundle/zipball/3714cced87805adb46a4f2ebff4035abe5393f33", + "reference": "3714cced87805adb46a4f2ebff4035abe5393f33", "shasum": "" }, "require": { - "friendsofsymfony/rest-bundle": "0.12.*", + "friendsofsymfony/rest-bundle": ">=0.12.0,<2.0", "jms/serializer-bundle": "0.12.*", "midgard/createphp": "dev-master", "php": ">=5.3.3", "symfony/assetic-bundle": "~2.1", "symfony/framework-bundle": "~2.1" }, + "suggest": { + "symfony-cmf/media-bundle": "When using the default image support" + }, "type": "symfony-bundle", "extra": { "branch-alias": { @@ -2458,21 +2522,82 @@ } ], "description": "Symfony Bundle for createphp and create.js. The easiest way to make any site editable and have semantic annotations with RDFa.", - "time": "2013-08-01 07:12:15" + "time": "2013-08-21 21:35:22" + }, + { + "name": "symfony-cmf/media-bundle", + "version": "1.0.0-beta1", + "target-dir": "Symfony/Cmf/Bundle/MediaBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony-cmf/MediaBundle.git", + "reference": "1e699097f56335eba4f244a716f0475136056682" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/1e699097f56335eba4f244a716f0475136056682", + "reference": "1e699097f56335eba4f244a716f0475136056682", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/framework-bundle": "~2.1" + }, + "require-dev": { + "jms/serializer-bundle": "0.12.*", + "liip/imagine-bundle": "~0.12", + "mikey179/vfsstream": "~1.2", + "symfony-cmf/testing": "1.0.*" + }, + "suggest": { + "jms/serializer-bundle": "When using the serializer handler", + "knplabs/gaufrette": "When using the Gaufrette adapter", + "liip/imagine-bundle": "When using the ImagineBlock", + "phpcr/phpcr-utils": "When using the Gaufrette adapter" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Cmf\\Bundle\\MediaBundle": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony CMF Community", + "homepage": "https://github.com/symfony-cmf/MediaBundle/contributors" + } + ], + "description": "Symfony CMF Media Bundle", + "homepage": "http://cmf.symfony.com", + "keywords": [ + "Symfony CMF", + "image", + "media" + ], + "time": "2013-08-21 21:46:38" }, { "name": "symfony-cmf/menu-bundle", - "version": "1.0.0-RC1", + "version": "1.0.0-RC3", "target-dir": "Symfony/Cmf/Bundle/MenuBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/MenuBundle.git", - "reference": "1.0.0-RC1" + "reference": "e0c9572fe460ca7e1bd034bc70c40cbc502d8997" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/1.0.0-RC1", - "reference": "1.0.0-RC1", + "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/e0c9572fe460ca7e1bd034bc70c40cbc502d8997", + "reference": "e0c9572fe460ca7e1bd034bc70c40cbc502d8997", "shasum": "" }, "require": { @@ -2519,7 +2644,7 @@ "Symfony CMF", "menu" ], - "time": "2013-08-01 06:54:31" + "time": "2013-08-21 20:45:43" }, { "name": "symfony-cmf/routing", @@ -2528,12 +2653,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/Routing.git", - "reference": "1.1.0-RC1" + "reference": "c3e0c82a92da2973ffbab1f06f7144dae8701112" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/1.1.0-RC1", - "reference": "1.1.0-RC1", + "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/c3e0c82a92da2973ffbab1f06f7144dae8701112", + "reference": "c3e0c82a92da2973ffbab1f06f7144dae8701112", "shasum": "" }, "require": { @@ -2578,21 +2703,21 @@ "database", "routing" ], - "time": "2013-07-31 21:06:34" + "time": "2013-08-05 11:18:50" }, { "name": "symfony-cmf/routing-bundle", - "version": "1.1.0-RC1", + "version": "1.1.0-RC4", "target-dir": "Symfony/Cmf/Bundle/RoutingBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/RoutingBundle.git", - "reference": "1.1.0-RC1" + "reference": "85092116f2b9565439aa5f5881f6362068faa993" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/1.1.0-RC1", - "reference": "1.1.0-RC1", + "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/85092116f2b9565439aa5f5881f6362068faa993", + "reference": "85092116f2b9565439aa5f5881f6362068faa993", "shasum": "" }, "require": { @@ -2601,15 +2726,19 @@ "symfony/framework-bundle": "~2.2" }, "require-dev": { + "doctrine/orm": "2.3.*", "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*", + "symfony-cmf/core-bundle": "~1.0.0-alpha1", "symfony-cmf/testing": "1.0.*", "symfony/monolog-bundle": "2.2.*" }, "suggest": { + "doctrine/orm": "To enable support for the ORM entities", "doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents", "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents", "sonata-project/doctrine-phpcr-admin-bundle": "To provide an admin interface for the PHPCR ODM documents", - "symfony-cmf/content-bundle": "To optionally use the configured value for 'content_basepath' from the CoreBundle" + "symfony-cmf/content-bundle": "To optionally use the configured value for 'content_basepath' from the CoreBundle", + "symfony-cmf/core-bundle": "For compatibility with Symfony 2.2" }, "type": "symfony-bundle", "extra": { @@ -2638,21 +2767,21 @@ "database", "routing" ], - "time": "2013-08-01 05:47:13" + "time": "2013-08-21 23:15:29" }, { "name": "symfony-cmf/simple-cms-bundle", - "version": "1.0.0-beta3", + "version": "1.0.0-RC2", "target-dir": "Symfony/Cmf/Bundle/SimpleCmsBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/SimpleCmsBundle.git", - "reference": "1.0.0-beta3" + "reference": "005cb61d5a2a2e06d22d3284975a2244cec643ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/1.0.0-beta3", - "reference": "1.0.0-beta3", + "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/005cb61d5a2a2e06d22d3284975a2244cec643ad", + "reference": "005cb61d5a2a2e06d22d3284975a2244cec643ad", "shasum": "" }, "require": { @@ -2661,9 +2790,15 @@ "php": ">=5.3.3", "symfony-cmf/content-bundle": "~1.0.0-RC1", "symfony-cmf/core-bundle": "~1.0.0-RC1", + "symfony-cmf/menu-bundle": "~1.0.0-RC1", "symfony-cmf/routing-bundle": "~1.1.0-RC1", "symfony/framework-bundle": "~2.2" }, + "require-dev": { + "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*", + "symfony-cmf/testing": "1.0.*", + "symfony/monolog-bundle": "2.2.*" + }, "suggest": { "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*", "symfony-cmf/create-bundle": "1.0.*", @@ -2696,40 +2831,41 @@ "Symfony CMF", "cms" ], - "time": "2013-08-01 08:15:08" + "time": "2013-08-21 23:15:55" }, { "name": "symfony-cmf/symfony-cmf", - "version": "1.0.0-beta3", + "version": "1.0.0-beta6", "source": { "type": "git", "url": "https://github.com/symfony-cmf/symfony-cmf.git", - "reference": "1.0.0-beta3" + "reference": "149d9cc400797fc7aca8c14cd41253f0fb24fabb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/symfony-cmf/zipball/1.0.0-beta3", - "reference": "1.0.0-beta3", + "url": "https://api.github.com/repos/symfony-cmf/symfony-cmf/zipball/149d9cc400797fc7aca8c14cd41253f0fb24fabb", + "reference": "149d9cc400797fc7aca8c14cd41253f0fb24fabb", "shasum": "" }, "require": { - "doctrine/phpcr-bundle": "1.0.0-beta3", - "doctrine/phpcr-odm": "1.0.0-beta3", + "doctrine/phpcr-bundle": "1.0.0-beta4", + "doctrine/phpcr-odm": "1.0.0-beta5", "php": ">=5.3.3", - "symfony-cmf/block-bundle": "1.0.0-beta3", - "symfony-cmf/content-bundle": "1.0.0-RC1", - "symfony-cmf/core-bundle": "1.0.0-RC1", - "symfony-cmf/menu-bundle": "1.0.0-RC1", - "symfony-cmf/routing-bundle": "1.1.0-RC1", - "symfony-cmf/tree-browser-bundle": "1.0.0-beta2", + "symfony-cmf/block-bundle": "1.0.0-RC1", + "symfony-cmf/content-bundle": "1.0.0-RC2", + "symfony-cmf/core-bundle": "1.0.0-RC3", + "symfony-cmf/media-bundle": "1.0.0-beta1", + "symfony-cmf/menu-bundle": "1.0.0-RC3", + "symfony-cmf/routing-bundle": "1.1.0-RC4", "symfony/framework-bundle": "~2.2" }, "suggest": { - "symfony-cmf/blog-bundle": "1.0.0-beta2", - "symfony-cmf/create-bundle": "1.0.0-beta3", + "symfony-cmf/blog-bundle": "1.0.0-beta4", + "symfony-cmf/create-bundle": "1.0.0-beta4", "symfony-cmf/routing-auto-bundle": "1.0.0-alpha4", "symfony-cmf/search-bundle": "1.0.0-beta2", - "symfony-cmf/simple-cms-bundle": "1.0.0-beta3" + "symfony-cmf/simple-cms-bundle": "1.0.0-RC2", + "symfony-cmf/tree-browser-bundle": "1.0.0-beta2" }, "type": "library", "extra": { @@ -2754,64 +2890,7 @@ ], "description": "Symfony Content Management Framework", "homepage": "http://cmf.symfony.com", - "time": "2013-08-01 07:17:04" - }, - { - "name": "symfony-cmf/tree-browser-bundle", - "version": "1.0.0-beta2", - "target-dir": "Symfony/Cmf/Bundle/TreeBrowserBundle", - "source": { - "type": "git", - "url": "https://github.com/symfony-cmf/TreeBrowserBundle.git", - "reference": "1.0.0-beta2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/TreeBrowserBundle/zipball/1.0.0-beta2", - "reference": "1.0.0-beta2", - "shasum": "" - }, - "require": { - "friendsofsymfony/jsrouting-bundle": "~1.1", - "php": ">=5.3.3", - "symfony/framework-bundle": "~2.1" - }, - "require-dev": { - "symfony-cmf/testing": "1.0.*" - }, - "suggest": { - "doctrine/phpcr-bundle": "1.0.*", - "doctrine/phpcr-odm": "1.0.*" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Cmf\\Bundle\\TreeBrowserBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony CMF Community", - "homepage": "https://github.com/symfony-cmf/TreeBrowserBundle/contributors" - } - ], - "description": "Symfony CMF Tree Browser Bundle", - "homepage": "http://cmf.symfony.com", - "keywords": [ - "Symfony CMF", - "phpcr", - "tree" - ], - "time": "2013-07-05 07:22:15" + "time": "2013-08-21 23:24:49" }, { "name": "symfony/assetic-bundle", @@ -2883,12 +2962,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Icu.git", - "reference": "v1.2.0" + "reference": "45c8d35427304b1e14a13a03426055f501ba5f61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Icu/zipball/v1.2.0", - "reference": "v1.2.0", + "url": "https://api.github.com/repos/symfony/Icu/zipball/45c8d35427304b1e14a13a03426055f501ba5f61", + "reference": "45c8d35427304b1e14a13a03426055f501ba5f61", "shasum": "" }, "require": { @@ -2922,7 +3001,7 @@ "icu", "intl" ], - "time": "2013-06-03 18:32:58" + "time": "2013-08-06 12:55:36" }, { "name": "symfony/monolog-bundle", @@ -2931,12 +3010,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/MonologBundle.git", - "reference": "v2.3.0" + "reference": "03ed73bc11367b3156cc21f22ac37c7f70fcd10a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/v2.3.0", - "reference": "v2.3.0", + "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/03ed73bc11367b3156cc21f22ac37c7f70fcd10a", + "reference": "03ed73bc11367b3156cc21f22ac37c7f70fcd10a", "shasum": "" }, "require": { @@ -2988,12 +3067,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "bd30a5cc30bfb13c0f02bf61eac4c4a3a4fb0d2f" + "reference": "cbc30a31e2248bccd9ee8e8142177b617fb32e37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/bd30a5cc30bfb13c0f02bf61eac4c4a3a4fb0d2f", - "reference": "bd30a5cc30bfb13c0f02bf61eac4c4a3a4fb0d2f", + "url": "https://api.github.com/repos/symfony/symfony/zipball/cbc30a31e2248bccd9ee8e8142177b617fb32e37", + "reference": "cbc30a31e2248bccd9ee8e8142177b617fb32e37", "shasum": "" }, "require": { @@ -3088,7 +3167,7 @@ "keywords": [ "framework" ], - "time": "2013-07-29 17:56:59" + "time": "2013-08-21 19:09:08" }, { "name": "twig/extensions", @@ -3143,12 +3222,12 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "0e63ef04a00fb238ee457708f8b4e8918aa51d7e" + "reference": "fcf007e9a2e6c65594360ae7fa3c410ae8d56a11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/0e63ef04a00fb238ee457708f8b4e8918aa51d7e", - "reference": "0e63ef04a00fb238ee457708f8b4e8918aa51d7e", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/fcf007e9a2e6c65594360ae7fa3c410ae8d56a11", + "reference": "fcf007e9a2e6c65594360ae7fa3c410ae8d56a11", "shasum": "" }, "require": { @@ -3157,7 +3236,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -3184,7 +3263,57 @@ "keywords": [ "templating" ], - "time": "2013-07-24 03:16:45" + "time": "2013-08-07 12:53:34" + }, + { + "name": "willdurand/negotiation", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/willdurand/Negotiation.git", + "reference": "a25b58fd5d6cabcd515bc83661788582b0bcf3f8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/a25b58fd5d6cabcd515bc83661788582b0bcf3f8", + "reference": "a25b58fd5d6cabcd515bc83661788582b0bcf3f8", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Negotiation": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "William Durand", + "email": "william.durand1@gmail.com", + "homepage": "http://www.willdurand.fr" + } + ], + "description": "Content Negotiation tools for PHP provided as a standalone library.", + "homepage": "http://williamdurand.fr/Negotiation/", + "keywords": [ + "accept", + "content", + "format", + "header", + "negotiation" + ], + "time": "2013-08-06 14:47:08" } ], "packages-dev": [ diff --git a/src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php b/src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php index fd36def..6868a03 100644 --- a/src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php +++ b/src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php @@ -26,6 +26,11 @@ protected function getData() return $this->yaml->parse(file_get_contents(__DIR__.'/../../Resources/data/page.yml')); } + protected function createPageInstance($className) + { + return new $className(true, false, true); + } + public function load(ObjectManager $dm) { $this->yaml = new Parser(); From 59ed9f06e4b9bc4fd328f60e6714c9391cbe6dfd Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Thu, 22 Aug 2013 01:52:41 +0200 Subject: [PATCH 3/3] update travis config --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05769f7..2680c03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,11 @@ language: php php: - 5.3 - 5.4 + - 5.5 before_script: - composer self-update - - composer install + - composer install --prefer-source - php app/console doctrine:database:create -e=test - php app/console doctrine:phpcr:init:dbal -e=test - php app/console doctrine:phpcr:workspace:create standard_test -e=test