From dc196413447ed8dc53261924b69278edc221f7da Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Tue, 8 Apr 2014 13:25:23 +0200 Subject: [PATCH 1/7] update to 1.1.0-RC1 --- app/AppKernel.php | 2 +- app/config/config.yml | 12 +- app/config/parameters.yml | 4 +- composer.json | 22 +- composer.lock | 919 +++++++++++------- .../DataFixtures/PHPCR/LoadStaticData.php | 110 ++- src/Cmf/MainBundle/Resources/data/page.yml | 1 + 7 files changed, 704 insertions(+), 366 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index aa2b2f3..a9bbafe 100755 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -17,7 +17,7 @@ public function registerBundles() new Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle(), new Knp\Bundle\MenuBundle\KnpMenuBundle(), - new Liip\DoctrineCacheBundle\LiipDoctrineCacheBundle(), + new Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle(), new FOS\RestBundle\FOSRestBundle(), new JMS\SerializerBundle\JMSSerializerBundle($this), diff --git a/app/config/config.yml b/app/config/config.yml index 620ec18..8248fcc 100755 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -41,8 +41,8 @@ cmf_core: phpcr: enabled: true -cmf_simple_cms: - routing: +cmf_routing: + dynamic: templates_by_class: Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: CmfSimpleCmsBundle:Page:index.html.twig @@ -53,11 +53,11 @@ cmf_menu: voters: uri_prefix: true -liip_doctrine_cache: - namespaces: - meta: +doctrine_cache: + providers: + phpcr_meta: type: file_system - nodes: + phpcr_nodes: type: file_system fos_rest: diff --git a/app/config/parameters.yml b/app/config/parameters.yml index dcd8eb7..20e4676 100755 --- a/app/config/parameters.yml +++ b/app/config/parameters.yml @@ -8,8 +8,8 @@ parameters: type: doctrinedbal connection: default caches: - meta: liip_doctrine_cache.ns.meta - nodes: liip_doctrine_cache.ns.nodes + meta: doctrine_cache.providers.phpcr_meta + nodes: doctrine_cache.providers.phpcr_nodes phpcr_workspace: default phpcr_user: admin phpcr_pass: admin diff --git a/composer.json b/composer.json index 0ccb480..a462423 100755 --- a/composer.json +++ b/composer.json @@ -6,21 +6,27 @@ "require": { "php": ">=5.3.3", "symfony/symfony": "2.3.*", - "twig/extensions": "1.0.*", + "twig/extensions": "~1.0", "symfony/monolog-bundle": "2.3.*", "sensio/distribution-bundle": "2.3.*", - "symfony-cmf/menu-bundle": "1.0.*", - "symfony-cmf/simple-cms-bundle": "1.0.*", - "friendsofsymfony/rest-bundle": "1.0.*", - "jms/serializer-bundle": "0.12.*", - "jackalope/jackalope-doctrine-dbal": "1.0.*", + "symfony-cmf/core-bundle": "1.1.*@dev", + "symfony-cmf/routing": "1.2.*@dev", + "symfony-cmf/routing-bundle": "1.2.*@dev", + "symfony-cmf/content-bundle": "1.1.*@dev", + "symfony-cmf/menu-bundle": "1.1.*@dev", + "symfony-cmf/simple-cms-bundle": "1.1.*@dev", + "friendsofsymfony/rest-bundle": "~1.0", + "jms/serializer-bundle": ">=0.12,<0.14", + "jackalope/jackalope-doctrine-dbal": "1.1.*", + "doctrine/phpcr-bundle": "1.1.*@dev", + "doctrine/phpcr-odm": "1.1.*@dev", "doctrine/doctrine-bundle": "1.2.*", "doctrine/data-fixtures": "1.0.*", "liip/functional-test-bundle": "1.0.*", - "liip/doctrine-cache-bundle": "1.0.*", + "doctrine/doctrine-cache-bundle": "1.0.*", "symfony/icu": "1.0.*", "seld/slippy": "dev-master", - "symfony-cmf/block-bundle": "1.0.*" + "symfony-cmf/block-bundle": "1.1.*@dev" }, "scripts": { "post-install-cmd": [ diff --git a/composer.lock b/composer.lock index f18a0a7..e350b92 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": "7ee72d372f3060628847cd3ace03bd56", + "hash": "21fb1843e1b46169b1c2091f46bd2139", "packages": [ { "name": "doctrine/annotations", @@ -78,16 +78,16 @@ }, { "name": "doctrine/cache", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "d0e4447707a064a5814b18cb0dcc2f24185f6179" + "reference": "e16d7adf45664a50fa86f515b6d5e7f670130449" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/d0e4447707a064a5814b18cb0dcc2f24185f6179", - "reference": "d0e4447707a064a5814b18cb0dcc2f24185f6179", + "url": "https://api.github.com/repos/doctrine/cache/zipball/e16d7adf45664a50fa86f515b6d5e7f670130449", + "reference": "e16d7adf45664a50fa86f515b6d5e7f670130449", "shasum": "" }, "require": { @@ -96,6 +96,10 @@ "conflict": { "doctrine/common": ">2.2,<2.4" }, + "require-dev": { + "phpunit/phpunit": ">=3.7", + "satooshi/php-coveralls": "~0.6" + }, "type": "library", "extra": { "branch-alias": { @@ -113,9 +117,10 @@ ], "authors": [ { - "name": "Jonathan Wage", + "name": "Jonathan H. Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -143,20 +148,20 @@ "cache", "caching" ], - "time": "2013-09-26 19:23:25" + "time": "2013-10-25 19:04:14" }, { "name": "doctrine/collections", - "version": "v1.1", + "version": "v1.2", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "560f29c39cfcfbcd210e5d549d993a39d898b04b" + "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/560f29c39cfcfbcd210e5d549d993a39d898b04b", - "reference": "560f29c39cfcfbcd210e5d549d993a39d898b04b", + "url": "https://api.github.com/repos/doctrine/collections/zipball/b99c5c46c87126201899afe88ec490a25eedd6a2", + "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2", "shasum": "" }, "require": { @@ -165,7 +170,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -181,7 +186,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -210,7 +216,7 @@ "collections", "iterator" ], - "time": "2013-03-07 12:15:54" + "time": "2014-02-03 23:07:43" }, { "name": "doctrine/common", @@ -343,16 +349,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.4.0", + "version": "v2.4.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "3eb557f144ec41e6e84997e43acb1946c92fbc88" + "reference": "fec965d330c958e175c39e61c3f6751955af32d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/3eb557f144ec41e6e84997e43acb1946c92fbc88", - "reference": "3eb557f144ec41e6e84997e43acb1946c92fbc88", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/fec965d330c958e175c39e61c3f6751955af32d0", + "reference": "fec965d330c958e175c39e61c3f6751955af32d0", "shasum": "" }, "require": { @@ -380,7 +386,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -404,7 +411,7 @@ "persistence", "queryobject" ], - "time": "2013-09-07 10:49:18" + "time": "2014-01-01 16:43:57" }, { "name": "doctrine/doctrine-bundle", @@ -455,7 +462,9 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { "name": "Symfony Community", @@ -476,6 +485,90 @@ ], "time": "2013-03-25 20:13:59" }, + { + "name": "doctrine/doctrine-cache-bundle", + "version": "1.0.0", + "target-dir": "Doctrine/Bundle/DoctrineCacheBundle", + "source": { + "type": "git", + "url": "https://github.com/doctrine/DoctrineCacheBundle.git", + "reference": "49a9d2d9a35863201e5e608d1194db28946c4552" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/49a9d2d9a35863201e5e608d1194db28946c4552", + "reference": "49a9d2d9a35863201e5e608d1194db28946c4552", + "shasum": "" + }, + "require": { + "doctrine/cache": "~1.3", + "doctrine/inflector": "~1.0", + "php": ">=5.3.2", + "symfony/doctrine-bridge": "~2.2", + "symfony/framework-bundle": "~2.2", + "symfony/security": "~2.2" + }, + "require-dev": { + "instaclick/coding-standard": "~1.1", + "instaclick/object-calisthenics-sniffs": "dev-master", + "instaclick/symfony2-coding-standard": "dev-remaster", + "phpunit/phpunit": "~3.7", + "satooshi/php-coveralls": "~0.6.1", + "squizlabs/php_codesniffer": "dev-master", + "symfony/validator": "~2.2", + "symfony/yaml": "~2.2" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Bundle\\DoctrineCacheBundle": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Fabio B. Silva", + "email": "fabio.bat.silva@gmail.com" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@hotmail.com" + }, + { + "name": "Doctrine Project", + "homepage": "http://www.doctrine-project.org/" + } + ], + "description": "Symfony2 Bundle for Doctrine Cache", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "cache", + "caching" + ], + "time": "2014-03-04 19:18:55" + }, { "name": "doctrine/inflector", "version": "v1.0", @@ -593,42 +686,45 @@ }, { "name": "doctrine/phpcr-bundle", - "version": "1.0.0", + "version": "dev-master", "target-dir": "Doctrine/Bundle/PHPCRBundle", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrinePHPCRBundle.git", - "reference": "93b0485d5c0606742715c34b3ebe640702fc3574" + "reference": "e7fc9122f67766eef9cb4054034926b7660a275c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/93b0485d5c0606742715c34b3ebe640702fc3574", - "reference": "93b0485d5c0606742715c34b3ebe640702fc3574", + "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/e7fc9122f67766eef9cb4054034926b7660a275c", + "reference": "e7fc9122f67766eef9cb4054034926b7660a275c", "shasum": "" }, "require": { "php": ">=5.3.3", "phpcr/phpcr-implementation": "2.1.*", - "phpcr/phpcr-utils": "~1.0.0", - "symfony/doctrine-bridge": "~2.1", - "symfony/framework-bundle": "~2.1" + "phpcr/phpcr-utils": "~1.1.0", + "symfony/doctrine-bridge": "~2.2", + "symfony/framework-bundle": "~2.2" }, "require-dev": { - "doctrine/phpcr-odm": "1.0.*", - "jackalope/jackalope-jackrabbit": "1.0.*", - "symfony/form": "~2.1" + "doctrine/phpcr-odm": "1.1.*", + "jackalope/jackalope-jackrabbit": "~1.1.0", + "matthiasnoback/symfony-dependency-injection-test": "0.*", + "symfony-cmf/testing": "1.1.*", + "symfony/form": "~2.2" }, "suggest": { + "burgov/key-value-form-bundle": "to edit assoc multivalue properties. require version 1.0.*", "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.*", + "doctrine/phpcr-odm": "if you want to use the odm as well. require version 1.1.*", "jackalope/jackalope-doctrine-dbal": "if you want to use jackalope-doctrine-dbal. require version 1.0.*", - "jackalope/jackalope-jackrabbit": "if you want to connect to jackrabbit. require version 1.0.*" + "jackalope/jackalope-jackrabbit": "if you want to connect to jackrabbit. require version ~1.0.1" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -658,34 +754,36 @@ "persistence", "phpcr" ], - "time": "2013-10-10 21:04:03" + "time": "2014-04-03 12:45:33" }, { "name": "doctrine/phpcr-odm", - "version": "1.0.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/doctrine/phpcr-odm.git", - "reference": "dff0f022f9ac389d319b609049b26da2e6181106" + "reference": "5d2e990ca7a0b73df75d3a8303d44d076b23351b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/dff0f022f9ac389d319b609049b26da2e6181106", - "reference": "dff0f022f9ac389d319b609049b26da2e6181106", + "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/5d2e990ca7a0b73df75d3a8303d44d076b23351b", + "reference": "5d2e990ca7a0b73df75d3a8303d44d076b23351b", "shasum": "" }, "require": { "doctrine/common": "~2.4.0", "php": ">=5.3.3", + "phpcr/phpcr": "2.1.1", "phpcr/phpcr-implementation": "~2.1.0", - "phpcr/phpcr-utils": "~1.0.0" + "phpcr/phpcr-utils": "~1.1.0" }, "require-dev": { + "liip/rmt": "dev-master", "symfony/yaml": "~2.0" }, "suggest": { - "jackalope/jackalope-doctrine-dbal": "~1.0.0", - "jackalope/jackalope-jackrabbit": "~1.0.0", + "jackalope/jackalope-doctrine-dbal": "~1.0", + "jackalope/jackalope-jackrabbit": "~1.0", "symfony/yaml": "~2.0" }, "bin": [ @@ -695,7 +793,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -730,28 +828,30 @@ "odm", "phpcr" ], - "time": "2013-10-10 20:54:13" + "time": "2014-04-08 06:58:30" }, { "name": "friendsofsymfony/rest-bundle", - "version": "1.0.0", + "version": "1.3.1", "target-dir": "FOS/RestBundle", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "8e0b02a3ea9cbb76b2043868796659c8f61af29b" + "reference": "ed28a056225d911de4be4686326339a1a51b7fa9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/8e0b02a3ea9cbb76b2043868796659c8f61af29b", - "reference": "8e0b02a3ea9cbb76b2043868796659c8f61af29b", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/ed28a056225d911de4be4686326339a1a51b7fa9", + "reference": "ed28a056225d911de4be4686326339a1a51b7fa9", "shasum": "" }, "require": { "doctrine/inflector": "1.0.*", "php": ">=5.3.2", - "symfony/framework-bundle": "~2.1", - "willdurand/negotiation": "1.0.*" + "psr/log": "~1.0", + "symfony/framework-bundle": "~2.2", + "willdurand/jsonp-callback-validator": "~1.0", + "willdurand/negotiation": "~1.2" }, "conflict": { "jms/serializer": "<0.12", @@ -759,22 +859,22 @@ }, "require-dev": { "jms/serializer-bundle": "0.12.*", - "sensio/framework-extra-bundle": "~2.1", - "symfony/form": "~2.1", - "symfony/security": "~2.1", - "symfony/serializer": "~2.1", - "symfony/validator": "~2.1", - "symfony/yaml": "~2.1" + "sensio/framework-extra-bundle": "~2.2", + "symfony/form": "~2.2", + "symfony/security": "~2.2", + "symfony/serializer": "~2.2", + "symfony/validator": "~2.2", + "symfony/yaml": "~2.2" }, "suggest": { "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires 0.12.*", "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener", - "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.1" + "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.2" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -806,28 +906,28 @@ "keywords": [ "rest" ], - "time": "2013-10-11 14:23:24" + "time": "2014-03-11 15:28:34" }, { "name": "jackalope/jackalope", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/jackalope/jackalope.git", - "reference": "7bb631536adf3264a4a745499edcb7bda13310e3" + "reference": "1f936da47bd29deb8b0a1a21af46519485f99d37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jackalope/jackalope/zipball/7bb631536adf3264a4a745499edcb7bda13310e3", - "reference": "7bb631536adf3264a4a745499edcb7bda13310e3", + "url": "https://api.github.com/repos/jackalope/jackalope/zipball/1f936da47bd29deb8b0a1a21af46519485f99d37", + "reference": "1f936da47bd29deb8b0a1a21af46519485f99d37", "shasum": "" }, "require": { - "ext-libxml": "*", + "ext-xml": "*", "jackalope/jackalope-transport": "*", "php": ">=5.3.2", "phpcr/phpcr": "~2.1.0", - "phpcr/phpcr-utils": "~1.0.0" + "phpcr/phpcr-utils": "~1.1.0" }, "provide": { "phpcr/phpcr-implementation": "2.1.0" @@ -835,7 +935,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -859,34 +959,35 @@ "keywords": [ "phpcr" ], - "time": "2013-10-10 19:57:47" + "time": "2014-04-04 10:29:19" }, { "name": "jackalope/jackalope-doctrine-dbal", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/jackalope/jackalope-doctrine-dbal.git", - "reference": "db3b622fa96b30d3095ee8b657494f21af1df044" + "reference": "571f54f95f46bc8b0608d87886ba17906685edf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/db3b622fa96b30d3095ee8b657494f21af1df044", - "reference": "db3b622fa96b30d3095ee8b657494f21af1df044", + "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/571f54f95f46bc8b0608d87886ba17906685edf1", + "reference": "571f54f95f46bc8b0608d87886ba17906685edf1", "shasum": "" }, "require": { "doctrine/dbal": ">=2.2.0,<2.5", - "jackalope/jackalope": "~1.0.0", + "jackalope/jackalope": "~1.1.1", "php": ">=5.3.3", - "phpcr/phpcr": "~2.1.0-RC1", - "phpcr/phpcr-utils": "~1.0.0" + "phpcr/phpcr": "~2.1.0", + "phpcr/phpcr-utils": "~1.1.0" }, "provide": { - "jackalope/jackalope-transport": "1.0.0" + "jackalope/jackalope-transport": "1.1.0" }, "require-dev": { - "phpcr/phpcr-api-tests": "2.1.0" + "phpcr/phpcr-api-tests": "2.1.0", + "psr/log": "~1.0" }, "bin": [ "bin/jackalope" @@ -894,7 +995,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -920,20 +1021,20 @@ "phpcr", "transport implementation" ], - "time": "2013-10-10 20:12:56" + "time": "2014-04-04 12:08:19" }, { "name": "jdorn/sql-formatter", - "version": "v1.2.9", + "version": "v1.2.17", "source": { "type": "git", "url": "https://github.com/jdorn/sql-formatter.git", - "reference": "bd1f09133f6dbbe0713856910e58ea9480c2be58" + "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/bd1f09133f6dbbe0713856910e58ea9480c2be58", - "reference": "bd1f09133f6dbbe0713856910e58ea9480c2be58", + "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc", + "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc", "shasum": "" }, "require": { @@ -970,20 +1071,20 @@ "highlight", "sql" ], - "time": "2013-04-26 18:42:52" + "time": "2014-01-12 16:20:24" }, { "name": "jms/metadata", - "version": "1.4.2", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "246d7096801ce29b5aea30a1abf0277ccfb9f055" + "reference": "88ffa28bc987e4c26229fc84a2e541b6ed4e1459" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/246d7096801ce29b5aea30a1abf0277ccfb9f055", - "reference": "246d7096801ce29b5aea30a1abf0277ccfb9f055", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/88ffa28bc987e4c26229fc84a2e541b6ed4e1459", + "reference": "88ffa28bc987e4c26229fc84a2e541b6ed4e1459", "shasum": "" }, "require": { @@ -995,7 +1096,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -1022,7 +1123,7 @@ "xml", "yaml" ], - "time": "2013-09-13 09:05:44" + "time": "2013-11-05 23:02:36" }, { "name": "jms/parser-lib", @@ -1061,16 +1162,16 @@ }, { "name": "jms/serializer", - "version": "0.13.0", + "version": "0.16.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "9e0fcd00a374e9ad484687628c6c25ab1083ea5a" + "reference": "c8a171357ca92b6706e395c757f334902d430ea9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/9e0fcd00a374e9ad484687628c6c25ab1083ea5a", - "reference": "9e0fcd00a374e9ad484687628c6c25ab1083ea5a", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/c8a171357ca92b6706e395c757f334902d430ea9", + "reference": "c8a171357ca92b6706e395c757f334902d430ea9", "shasum": "" }, "require": { @@ -1078,14 +1179,17 @@ "jms/metadata": "~1.1", "jms/parser-lib": "1.*", "php": ">=5.3.2", - "phpcollection/phpcollection": ">=0.1,<0.3-dev" + "phpcollection/phpcollection": "~0.1" }, "require-dev": { - "doctrine/orm": ">=2.1,<2.4-dev", + "doctrine/orm": "~2.1", + "doctrine/phpcr-odm": "~1.0.1", + "jackalope/jackalope-doctrine-dbal": "1.0.*", + "propel/propel1": "~1.7", "symfony/filesystem": "2.*", - "symfony/form": ">=2.1,<2.2-dev", - "symfony/translation": ">=2.0,<2.2-dev", - "symfony/validator": ">=2.0,<2.2-dev", + "symfony/form": "~2.1", + "symfony/translation": "~2.0", + "symfony/validator": "~2.0", "symfony/yaml": "2.*", "twig/twig": ">=1.8,<2.0-dev" }, @@ -1095,7 +1199,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.13-dev" + "dev-master": "0.15-dev" } }, "autoload": { @@ -1111,7 +1215,7 @@ { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", + "homepage": "https://github.com/schmittjoh", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -1124,21 +1228,21 @@ "serialization", "xml" ], - "time": "2013-07-29 13:39:49" + "time": "2014-03-18 08:39:00" }, { "name": "jms/serializer-bundle", - "version": "0.12.0", + "version": "0.13.0", "target-dir": "JMS/SerializerBundle", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", - "reference": "5531198a73c4adee669a8a2d1452999349822771" + "reference": "bb15db3e661168f4310fad48b86915ff1ca33795" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/5531198a73c4adee669a8a2d1452999349822771", - "reference": "5531198a73c4adee669a8a2d1452999349822771", + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/bb15db3e661168f4310fad48b86915ff1ca33795", + "reference": "bb15db3e661168f4310fad48b86915ff1ca33795", "shasum": "" }, "require": { @@ -1165,7 +1269,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "0.12-dev" + "dev-master": "0.13-dev" } }, "autoload": { @@ -1194,7 +1298,7 @@ "serialization", "xml" ], - "time": "2013-07-29 12:36:36" + "time": "2013-12-05 14:36:11" }, { "name": "knplabs/knp-menu", @@ -1309,67 +1413,19 @@ ], "time": "2013-05-25 10:20:03" }, - { - "name": "liip/doctrine-cache-bundle", - "version": "1.0.3", - "target-dir": "Liip/DoctrineCacheBundle", - "source": { - "type": "git", - "url": "https://github.com/liip/LiipDoctrineCacheBundle.git", - "reference": "4e90369883927df579db36eae69a50aa23b5aa77" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/liip/LiipDoctrineCacheBundle/zipball/4e90369883927df579db36eae69a50aa23b5aa77", - "reference": "4e90369883927df579db36eae69a50aa23b5aa77", - "shasum": "" - }, - "require": { - "doctrine/common": ">=2.2", - "php": ">=5.3.0", - "symfony/symfony": ">=2.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "Liip\\DoctrineCacheBundle\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Liip AG", - "homepage": "http://www.liip.ch/" - } - ], - "description": "This Bundle provides integration into Symfony2 with the Doctrine Common Cache layer.", - "keywords": [ - "Symfony2", - "cache" - ], - "time": "2013-08-08 14:44:34" - }, { "name": "liip/functional-test-bundle", - "version": "1.0.0", + "version": "1.0.1", "target-dir": "Liip/FunctionalTestBundle", "source": { "type": "git", "url": "https://github.com/liip/LiipFunctionalTestBundle.git", - "reference": "6054badcd590b63162ed7fdbd0d9391db88eff85" + "reference": "21e1f5f8ca25364fa076ca6118b3645173be0036" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/6054badcd590b63162ed7fdbd0d9391db88eff85", - "reference": "6054badcd590b63162ed7fdbd0d9391db88eff85", + "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/21e1f5f8ca25364fa076ca6118b3645173be0036", + "reference": "21e1f5f8ca25364fa076ca6118b3645173be0036", "shasum": "" }, "require": { @@ -1412,20 +1468,20 @@ "keywords": [ "Symfony2" ], - "time": "2013-10-08 12:57:10" + "time": "2014-03-23 23:13:37" }, { "name": "monolog/monolog", - "version": "1.6.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f72392d0e6eb855118f5a84e89ac2d257c704abd" + "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f72392d0e6eb855118f5a84e89ac2d257c704abd", - "reference": "f72392d0e6eb855118f5a84e89ac2d257c704abd", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/392ef35fd470638e08d0160d6b1cbab63cb23174", + "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174", "shasum": "" }, "require": { @@ -1433,26 +1489,32 @@ "psr/log": "~1.0" }, "require-dev": { - "doctrine/couchdb": "dev-master", - "mlehner/gelf-php": "1.0.*", - "raven/raven": "0.5.*" + "aws/aws-sdk-php": "~2.4, >2.4.8", + "doctrine/couchdb": "~1.0@dev", + "graylog2/gelf-php": "~1.0", + "phpunit/phpunit": "~3.7.0", + "raven/raven": "~0.5", + "ruflin/elastica": "0.90.*" }, "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server", - "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server", - "raven/raven": "Allow sending log messages to a Sentry server" + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "raven/raven": "Allow sending log messages to a Sentry server", + "rollbar/rollbar": "Allow sending log messages to Rollbar", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.8.x-dev" } }, "autoload": { - "psr-0": { - "Monolog": "src/" + "psr-4": { + "Monolog\\": "src/Monolog" } }, "notification-url": "https://packagist.org/downloads/", @@ -1474,20 +1536,20 @@ "logging", "psr-3" ], - "time": "2013-07-28 22:38:30" + "time": "2014-03-23 19:50:26" }, { "name": "phpcollection/phpcollection", - "version": "0.2.0", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-collection.git", - "reference": "acb02a921bb364f360ce786b13455345063c4a07" + "reference": "b8bf55a0a929ca43b01232b36719f176f86c7e83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/acb02a921bb364f360ce786b13455345063c4a07", - "reference": "acb02a921bb364f360ce786b13455345063c4a07", + "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/b8bf55a0a929ca43b01232b36719f176f86c7e83", + "reference": "b8bf55a0a929ca43b01232b36719f176f86c7e83", "shasum": "" }, "require": { @@ -1496,7 +1558,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.2-dev" + "dev-master": "0.3-dev" } }, "autoload": { @@ -1524,20 +1586,20 @@ "sequence", "set" ], - "time": "2013-01-23 15:16:14" + "time": "2014-03-11 13:46:42" }, { "name": "phpcr/phpcr", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/phpcr/phpcr.git", - "reference": "f9483968fb77584e47c1dbf2dbc7906447f8c5b1" + "reference": "eea4472c18e6f01fed9ce30dbada8255759ab810" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpcr/phpcr/zipball/f9483968fb77584e47c1dbf2dbc7906447f8c5b1", - "reference": "f9483968fb77584e47c1dbf2dbc7906447f8c5b1", + "url": "https://api.github.com/repos/phpcr/phpcr/zipball/eea4472c18e6f01fed9ce30dbada8255759ab810", + "reference": "eea4472c18e6f01fed9ce30dbada8255759ab810", "shasum": "" }, "require": { @@ -1579,20 +1641,20 @@ "contentrepository", "phpcr" ], - "time": "2013-10-07 15:34:44" + "time": "2014-03-03 07:42:27" }, { "name": "phpcr/phpcr-utils", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/phpcr/phpcr-utils.git", - "reference": "7920ce3c60cffceb325819bfdf4ebe873df69839" + "reference": "e50943432f8e26f9fc05af7994f8747ead3270fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpcr/phpcr-utils/zipball/7920ce3c60cffceb325819bfdf4ebe873df69839", - "reference": "7920ce3c60cffceb325819bfdf4ebe873df69839", + "url": "https://api.github.com/repos/phpcr/phpcr-utils/zipball/e50943432f8e26f9fc05af7994f8747ead3270fa", + "reference": "e50943432f8e26f9fc05af7994f8747ead3270fa", "shasum": "" }, "require": { @@ -1603,7 +1665,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -1642,20 +1704,20 @@ "contentrepository", "phpcr" ], - "time": "2013-10-10 19:46:30" + "time": "2014-02-02 18:30:21" }, { "name": "phpoption/phpoption", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "1c7e8016289d17d83ced49c56d0f266fd0568941" + "reference": "5d099bcf0393908bf4ad69cc47dafb785d51f7f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/1c7e8016289d17d83ced49c56d0f266fd0568941", - "reference": "1c7e8016289d17d83ced49c56d0f266fd0568941", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/5d099bcf0393908bf4ad69cc47dafb785d51f7f5", + "reference": "5d099bcf0393908bf4ad69cc47dafb785d51f7f5", "shasum": "" }, "require": { @@ -1691,20 +1753,20 @@ "php", "type" ], - "time": "2013-05-19 11:09:35" + "time": "2014-01-09 22:37:17" }, { "name": "psr/log", "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/php-fig/log", - "reference": "1.0.0" + "url": "https://github.com/php-fig/log.git", + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" }, "dist": { "type": "zip", - "url": "https://github.com/php-fig/log/archive/1.0.0.zip", - "reference": "1.0.0", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", "shasum": "" }, "type": "library", @@ -1737,12 +1799,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/slippy.git", - "reference": "ec4d493bb51c64b717d55605d5dd73879742a3b0" + "reference": "302b9142f6495e122c5bb49fa9067cfb0d397d65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/slippy/zipball/ec4d493bb51c64b717d55605d5dd73879742a3b0", - "reference": "ec4d493bb51c64b717d55605d5dd73879742a3b0", + "url": "https://api.github.com/repos/Seldaek/slippy/zipball/302b9142f6495e122c5bb49fa9067cfb0d397d65", + "reference": "302b9142f6495e122c5bb49fa9067cfb0d397d65", "shasum": "" }, "type": "library", @@ -1759,7 +1821,7 @@ } ], "description": "HTML Slides Engine", - "time": "2013-10-19 16:09:18" + "time": "2013-12-04 21:35:13" }, { "name": "sensio/distribution-bundle", @@ -1797,7 +1859,9 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" } ], "description": "The base bundle for the Symfony Distributions", @@ -1809,30 +1873,32 @@ }, { "name": "sonata-project/block-bundle", - "version": "2.2.7", - "target-dir": "Sonata/BlockBundle", + "version": "2.2.10", "source": { "type": "git", "url": "https://github.com/sonata-project/SonataBlockBundle.git", - "reference": "ff56bb0135fbfe0d270a47049a7d35f8610c4776" + "reference": "81be112e0cd76777280012288cabf4974de8d1a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/ff56bb0135fbfe0d270a47049a7d35f8610c4776", - "reference": "ff56bb0135fbfe0d270a47049a7d35f8610c4776", + "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/81be112e0cd76777280012288cabf4974de8d1a2", + "reference": "81be112e0cd76777280012288cabf4974de8d1a2", "shasum": "" }, "require": { "doctrine/common": "~2.3", + "sonata-project/cache": "~1.0", + "sonata-project/core-bundle": "~2.2", "symfony/form": "~2.2", - "symfony/http-foundation": "~2.2" + "symfony/http-kernel": "~2.2" }, "require-dev": { - "sonata-project/admin-bundle": "~2.2@dev", - "sonata-project/cache-bundle": "~2.1" + "knplabs/knp-menu-bundle": "~1.1", + "sonata-project/admin-bundle": "~2.2" }, "suggest": { - "sonata-project/admin-bundle": "~2.2@dev", + "knplabs/knp-menu-bundle": "~1.1", + "sonata-project/admin-bundle": "~2.2", "sonata-project/cache-bundle": "~2.1" }, "type": "symfony-bundle", @@ -1842,8 +1908,8 @@ } }, "autoload": { - "psr-0": { - "Sonata\\BlockBundle": "" + "psr-4": { + "Sonata\\BlockBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1867,35 +1933,158 @@ "block", "sonata" ], - "time": "2013-10-24 09:04:49" + "time": "2014-02-14 14:21:50" + }, + { + "name": "sonata-project/cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sonata-project/cache.git", + "reference": "3bd8c266c6184ebcf82846d659292e9680b979eb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sonata-project/cache/zipball/3bd8c266c6184ebcf82846d659292e9680b979eb", + "reference": "3bd8c266c6184ebcf82846d659292e9680b979eb", + "shasum": "" + }, + "require-dev": { + "doctrine/orm": "~2.2", + "doctrine/phpcr-odm": "~1.0", + "predis/predis": "~0.8", + "psr/log": "~1.0" + }, + "suggest": { + "doctrine/orm": "ORM support", + "doctrine/phpcr-odm": "PHPCR ODM support", + "ext-apc": "Caching with ext/apc", + "ext-memcached": "Caching with ext/memcached", + "predis/predis": "Install redis php" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Sonata\\Cache\\Tests\\": "test/", + "Sonata\\Cache\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Thomas Rabaix", + "email": "thomas.rabaix@gmail.com", + "homepage": "http://sonata-project.org/" + } + ], + "description": "Cache library", + "homepage": "https://github.com/sonata-project/cache", + "keywords": [ + "cache", + "memcached", + "mongodb", + "redis" + ], + "time": "2014-02-13 15:12:33" + }, + { + "name": "sonata-project/core-bundle", + "version": "2.2.5", + "source": { + "type": "git", + "url": "https://github.com/sonata-project/SonataCoreBundle.git", + "reference": "863809982c98b8444aeab1ff442c117d74f1a7c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sonata-project/SonataCoreBundle/zipball/863809982c98b8444aeab1ff442c117d74f1a7c7", + "reference": "863809982c98b8444aeab1ff442c117d74f1a7c7", + "shasum": "" + }, + "require": { + "symfony/config": "~2.0", + "symfony/form": "~2.2", + "symfony/http-foundation": "~2.2", + "symfony/translation": "~2.2", + "twig/twig": "~1.12" + }, + "require-dev": { + "doctrine/orm": "~2.4", + "doctrine/phpcr-odm": "~1.0", + "sonata-project/exporter": "~1.3" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Sonata\\CoreBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Thomas Rabaix", + "email": "thomas.rabaix@sonata-project.org", + "homepage": "http://sonata-project.org" + }, + { + "name": "Sonata Community", + "homepage": "https://github.com/sonata-project/SonataCoreBundle/contributors" + } + ], + "description": "Symfony SonataCoreBundle", + "homepage": "http://sonata-project.org/bundles/core", + "keywords": [ + "sonata" + ], + "time": "2014-02-14 14:24:51" }, { "name": "symfony-cmf/block-bundle", - "version": "1.0.0", + "version": "dev-master", "target-dir": "Symfony/Cmf/Bundle/BlockBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/BlockBundle.git", - "reference": "015802c250ba81ae07706e3d142cfdf9987b0dfa" + "reference": "0e5e7a53492e62eef640d0254a7599bb529cd086" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/015802c250ba81ae07706e3d142cfdf9987b0dfa", - "reference": "015802c250ba81ae07706e3d142cfdf9987b0dfa", + "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/0e5e7a53492e62eef640d0254a7599bb529cd086", + "reference": "0e5e7a53492e62eef640d0254a7599bb529cd086", "shasum": "" }, "require": { - "doctrine/phpcr-bundle": "1.0.*", - "doctrine/phpcr-odm": "1.0.*", + "doctrine/phpcr-bundle": "~1.0", + "doctrine/phpcr-odm": "~1.0", "php": ">=5.3.3", - "sonata-project/block-bundle": "~2.2.4", - "symfony-cmf/core-bundle": "1.0.*", - "symfony/framework-bundle": "~2.2" + "sonata-project/block-bundle": ">=2.2.8,<2.2.11", + "symfony-cmf/core-bundle": "~1.0", + "symfony/framework-bundle": ">=2.2.4,<3.0" + }, + "conflict": { + "symfony/framework-bundle": ">=2.3.0,<2.3.2" }, "require-dev": { - "sonata-project/cache-bundle": "~2.1.3", - "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*", - "symfony-cmf/testing": "1.0.*", + "sonata-project/cache-bundle": ">=2.1.3,<2.1.6", + "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*", + "symfony-cmf/menu-bundle": "1.1.*", + "symfony-cmf/testing": "1.1.*", "twig/twig": "~1.11" }, "suggest": { @@ -1907,7 +2096,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -1932,35 +2121,35 @@ "block", "content fragments" ], - "time": "2013-10-14 15:32:36" + "time": "2014-04-07 17:11:30" }, { "name": "symfony-cmf/content-bundle", - "version": "1.0.0", + "version": "dev-master", "target-dir": "Symfony/Cmf/Bundle/ContentBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/ContentBundle.git", - "reference": "b2ed5d1623ec609691a3f93cb2a7d5c5850bc0d2" + "reference": "f7899ee0662d6f2dff63f252b7428f5810b61aaa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/b2ed5d1623ec609691a3f93cb2a7d5c5850bc0d2", - "reference": "b2ed5d1623ec609691a3f93cb2a7d5c5850bc0d2", + "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/f7899ee0662d6f2dff63f252b7428f5810b61aaa", + "reference": "f7899ee0662d6f2dff63f252b7428f5810b61aaa", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony-cmf/core-bundle": "1.0.*", + "symfony-cmf/core-bundle": ">=1.0.0,<1.2-dev", "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.*", - "symfony-cmf/testing": "1.0.*", + "doctrine/phpcr-bundle": "1.1.*", + "doctrine/phpcr-odm": "1.1.*", + "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*", + "symfony-cmf/menu-bundle": "1.1.*", + "symfony-cmf/routing-bundle": "1.2.*", + "symfony-cmf/testing": "1.1.*", "symfony/monolog-bundle": "2.2.*" }, "suggest": { @@ -1974,7 +2163,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -1997,21 +2186,21 @@ "keywords": [ "Symfony CMF" ], - "time": "2013-10-14 15:32:15" + "time": "2014-04-08 07:03:02" }, { "name": "symfony-cmf/core-bundle", - "version": "1.0.0", + "version": "dev-master", "target-dir": "Symfony/Cmf/Bundle/CoreBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/CoreBundle.git", - "reference": "6078616e2378333fec63b2bdd63c08ed97b3977b" + "reference": "12f7b1b8cc7dc9714bd68aac7a6283072428c165" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/6078616e2378333fec63b2bdd63c08ed97b3977b", - "reference": "6078616e2378333fec63b2bdd63c08ed97b3977b", + "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/12f7b1b8cc7dc9714bd68aac7a6283072428c165", + "reference": "12f7b1b8cc7dc9714bd68aac7a6283072428c165", "shasum": "" }, "require": { @@ -2020,8 +2209,8 @@ }, "require-dev": { "sonata-project/admin-bundle": "~2.2", - "symfony-cmf/routing-bundle": "1.1.*", - "symfony-cmf/testing": "1.0.*" + "symfony-cmf/routing-bundle": "1.2.*", + "symfony-cmf/testing": "1.1.*" }, "suggest": { "doctrine/phpcr-bundle": "To be able to use the CMF twig extension, 1.0.*", @@ -2035,7 +2224,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2058,35 +2247,35 @@ "keywords": [ "Symfony CMF" ], - "time": "2013-10-14 15:31:29" + "time": "2014-04-07 17:03:47" }, { "name": "symfony-cmf/menu-bundle", - "version": "1.0.0", + "version": "dev-master", "target-dir": "Symfony/Cmf/Bundle/MenuBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/MenuBundle.git", - "reference": "1f84e1a6a9e3686d85b586953f8a8eb6cad9c143" + "reference": "7dc4fbd80a8bc752fc37d212c6d87c00600458b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/1f84e1a6a9e3686d85b586953f8a8eb6cad9c143", - "reference": "1f84e1a6a9e3686d85b586953f8a8eb6cad9c143", + "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/7dc4fbd80a8bc752fc37d212c6d87c00600458b1", + "reference": "7dc4fbd80a8bc752fc37d212c6d87c00600458b1", "shasum": "" }, "require": { - "doctrine/phpcr-bundle": "1.0.*", - "doctrine/phpcr-odm": "1.0.*", + "doctrine/phpcr-bundle": "1.1.*", + "doctrine/phpcr-odm": "1.1.*", "knplabs/knp-menu-bundle": "1.1.*", "php": ">=5.3.3", - "symfony-cmf/core-bundle": "1.0.*", + "symfony-cmf/core-bundle": ">=1.0.0,<1.2-dev", "symfony/framework-bundle": "~2.2" }, "require-dev": { - "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*", - "symfony-cmf/routing-bundle": "1.1.*", - "symfony-cmf/testing": "1.0.*", + "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*", + "symfony-cmf/routing-bundle": "1.2.*", + "symfony-cmf/testing": "1.1.*", "symfony/monolog-bundle": "2.2.*" }, "suggest": { @@ -2095,7 +2284,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2119,21 +2308,21 @@ "Symfony CMF", "menu" ], - "time": "2013-10-14 15:31:59" + "time": "2014-04-07 17:11:51" }, { "name": "symfony-cmf/routing", - "version": "1.1.0", + "version": "dev-master", "target-dir": "Symfony/Cmf/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony-cmf/Routing.git", - "reference": "9f8607950cbf888ec678713a35f3d0088857c85f" + "reference": "81f23fddd7ed00b2dc5d185b23b017d4727b26d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/9f8607950cbf888ec678713a35f3d0088857c85f", - "reference": "9f8607950cbf888ec678713a35f3d0088857c85f", + "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/81f23fddd7ed00b2dc5d185b23b017d4727b26d6", + "reference": "81f23fddd7ed00b2dc5d185b23b017d4727b26d6", "shasum": "" }, "require": { @@ -2153,7 +2342,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2177,33 +2366,35 @@ "database", "routing" ], - "time": "2013-10-14 15:32:46" + "time": "2014-04-07 17:03:09" }, { "name": "symfony-cmf/routing-bundle", - "version": "1.1.0", + "version": "dev-master", "target-dir": "Symfony/Cmf/Bundle/RoutingBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/RoutingBundle.git", - "reference": "176e082769afa2b69400cebfd5e0bb22a8536d97" + "reference": "eb68f214b4c9e19d5defa11db2215dfdcc8946d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/176e082769afa2b69400cebfd5e0bb22a8536d97", - "reference": "176e082769afa2b69400cebfd5e0bb22a8536d97", + "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/eb68f214b4c9e19d5defa11db2215dfdcc8946d0", + "reference": "eb68f214b4c9e19d5defa11db2215dfdcc8946d0", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony-cmf/routing": "1.1.*", + "symfony-cmf/routing": "~1.2.0", "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.*", - "symfony-cmf/testing": "1.0.*", + "matthiasnoback/symfony-config-test": "0.*", + "matthiasnoback/symfony-dependency-injection-test": "0.*", + "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*", + "symfony-cmf/core-bundle": "~1.1", + "symfony-cmf/testing": "1.1.*", "symfony/monolog-bundle": "2.2.*" }, "suggest": { @@ -2217,7 +2408,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2241,47 +2432,48 @@ "database", "routing" ], - "time": "2013-10-14 15:34:10" + "time": "2014-04-07 17:05:14" }, { "name": "symfony-cmf/simple-cms-bundle", - "version": "1.0.0", + "version": "dev-master", "target-dir": "Symfony/Cmf/Bundle/SimpleCmsBundle", "source": { "type": "git", "url": "https://github.com/symfony-cmf/SimpleCmsBundle.git", - "reference": "772116ed10e14d7491793bf3109438317cfd1485" + "reference": "d62bbd8e7f640fea90325b86467afe8204100dd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/772116ed10e14d7491793bf3109438317cfd1485", - "reference": "772116ed10e14d7491793bf3109438317cfd1485", + "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/d62bbd8e7f640fea90325b86467afe8204100dd3", + "reference": "d62bbd8e7f640fea90325b86467afe8204100dd3", "shasum": "" }, "require": { - "doctrine/phpcr-bundle": "1.0.*", - "doctrine/phpcr-odm": "1.0.*", + "doctrine/phpcr-bundle": ">=1.1.0,<1.2-dev", + "doctrine/phpcr-odm": ">=1.1.0,<1.2-dev", "php": ">=5.3.3", - "symfony-cmf/content-bundle": "1.0.*", - "symfony-cmf/core-bundle": "1.0.*", - "symfony-cmf/menu-bundle": "1.0.*", - "symfony-cmf/routing-bundle": "1.1.*", + "symfony-cmf/content-bundle": ">=1.0.0,<1.2-dev", + "symfony-cmf/core-bundle": ">=1.1.0,<1.2-dev", + "symfony-cmf/menu-bundle": ">=1.0.0,<1.2-dev", + "symfony-cmf/routing-bundle": "1.2.*", "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.*" + "matthiasnoback/symfony-config-test": "0.*", + "matthiasnoback/symfony-dependency-injection-test": "0.*", + "sonata-project/doctrine-phpcr-admin-bundle": ">=1.0.0,<1.2-dev", + "symfony-cmf/testing": ">=1.0.0,<1.2-dev", + "symfony/monolog-bundle": "~2.2" }, "suggest": { - "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*", - "symfony-cmf/create-bundle": "1.0.*", - "symfony-cmf/menu-bundle": "~1.0.0-RC1" + "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*", + "symfony-cmf/create-bundle": "1.1.*" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2305,21 +2497,21 @@ "Symfony CMF", "cms" ], - "time": "2013-10-14 15:32:50" + "time": "2014-04-08 07:02:55" }, { "name": "symfony/icu", - "version": "v1.0.0", + "version": "v1.0.1", "target-dir": "Symfony/Component/Icu", "source": { "type": "git", "url": "https://github.com/symfony/Icu.git", - "reference": "cac3fdfb111adbe590155f491594636d45129783" + "reference": "fdba214b1e087c149843bde976263c53ac10c975" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Icu/zipball/cac3fdfb111adbe590155f491594636d45129783", - "reference": "cac3fdfb111adbe590155f491594636d45129783", + "url": "https://api.github.com/repos/symfony/Icu/zipball/fdba214b1e087c149843bde976263c53ac10c975", + "reference": "fdba214b1e087c149843bde976263c53ac10c975", "shasum": "" }, "require": { @@ -2352,7 +2544,7 @@ "icu", "intl" ], - "time": "2013-06-03 18:32:07" + "time": "2013-10-04 09:12:07" }, { "name": "symfony/monolog-bundle", @@ -2397,7 +2589,9 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { "name": "Symfony Community", @@ -2414,16 +2608,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.6", + "version": "v2.3.12", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "d0597156c4c03ceca039f6b7770a47397ba295f0" + "reference": "3574df3d5e0039f3225007b8be534df5c4104503" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/d0597156c4c03ceca039f6b7770a47397ba295f0", - "reference": "d0597156c4c03ceca039f6b7770a47397ba295f0", + "url": "https://api.github.com/repos/symfony/symfony/zipball/3574df3d5e0039f3225007b8be534df5c4104503", + "reference": "3574df3d5e0039f3225007b8be534df5c4104503", "shasum": "" }, "require": { @@ -2506,7 +2700,9 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { "name": "Symfony Community", @@ -2518,24 +2714,24 @@ "keywords": [ "framework" ], - "time": "2013-10-10 13:24:22" + "time": "2014-04-03 05:42:39" }, { "name": "twig/extensions", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/fabpot/Twig-extensions.git", - "reference": "921799aaf05f88af749d72912d6b154dfeb9a03e" + "reference": "f91a82ec225e5bb108e01a0f93c9be04f84dcfa0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/921799aaf05f88af749d72912d6b154dfeb9a03e", - "reference": "921799aaf05f88af749d72912d6b154dfeb9a03e", + "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/f91a82ec225e5bb108e01a0f93c9be04f84dcfa0", + "reference": "f91a82ec225e5bb108e01a0f93c9be04f84dcfa0", "shasum": "" }, "require": { - "twig/twig": "1.*" + "twig/twig": "~1.0" }, "type": "library", "extra": { @@ -2555,7 +2751,9 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" } ], "description": "Common additional features for Twig that do not directly belong in core", @@ -2565,20 +2763,20 @@ "i18n", "text" ], - "time": "2013-02-28 14:21:30" + "time": "2013-10-18 19:37:15" }, { "name": "twig/twig", - "version": "v1.14.1", + "version": "v1.15.1", "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "8873d7593ad7c120004f177c0fd01459b383c9cb" + "reference": "1fb5784662f438d7d96a541e305e28b812e2eeed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/8873d7593ad7c120004f177c0fd01459b383c9cb", - "reference": "8873d7593ad7c120004f177c0fd01459b383c9cb", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/1fb5784662f438d7d96a541e305e28b812e2eeed", + "reference": "1fb5784662f438d7d96a541e305e28b812e2eeed", "shasum": "" }, "require": { @@ -2587,7 +2785,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -2602,11 +2800,19 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com" + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" + }, + { + "name": "Twig Team", + "homepage": "https://github.com/fabpot/Twig/graphs/contributors", + "role": "Contributors" } ], "description": "Twig, the flexible, fast, and secure template language for PHP", @@ -2614,20 +2820,60 @@ "keywords": [ "templating" ], - "time": "2013-10-15 19:17:38" + "time": "2014-02-13 10:19:29" + }, + { + "name": "willdurand/jsonp-callback-validator", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/willdurand/JsonpCallbackValidator.git", + "reference": "1a7d388bb521959e612ef50c5c7b1691b097e909" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/willdurand/JsonpCallbackValidator/zipball/1a7d388bb521959e612ef50c5c7b1691b097e909", + "reference": "1a7d388bb521959e612ef50c5c7b1691b097e909", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "~3.7" + }, + "type": "library", + "autoload": { + "psr-0": { + "JsonpCallbackValidator": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "William DURAND", + "email": "william.durand1@gmail.com", + "homepage": "http://www.willdurand.fr" + } + ], + "description": "JSONP callback validator.", + "time": "2014-01-20 22:35:06" }, { "name": "willdurand/negotiation", - "version": "1.0.1", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/willdurand/Negotiation.git", - "reference": "6021e6a9e14d6ab62dcd4f83364058d4978d6890" + "reference": "cda64e26a980f433ce98200ba1b2301850489aab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/6021e6a9e14d6ab62dcd4f83364058d4978d6890", - "reference": "6021e6a9e14d6ab62dcd4f83364058d4978d6890", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/cda64e26a980f433ce98200ba1b2301850489aab", + "reference": "cda64e26a980f433ce98200ba1b2301850489aab", "shasum": "" }, "require": { @@ -2636,7 +2882,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2664,7 +2910,7 @@ "header", "negotiation" ], - "time": "2013-08-01 14:42:09" + "time": "2014-02-26 13:56:25" } ], "packages-dev": [ @@ -2675,7 +2921,16 @@ ], "minimum-stability": "stable", "stability-flags": { - "seld/slippy": 20 + "symfony-cmf/core-bundle": 20, + "symfony-cmf/routing": 20, + "symfony-cmf/routing-bundle": 20, + "symfony-cmf/content-bundle": 20, + "symfony-cmf/menu-bundle": 20, + "symfony-cmf/simple-cms-bundle": 20, + "doctrine/phpcr-bundle": 20, + "doctrine/phpcr-odm": 20, + "seld/slippy": 20, + "symfony-cmf/block-bundle": 20 }, "platform": { "php": ">=5.3.3" diff --git a/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php b/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php index c0d7069..457c338 100644 --- a/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php +++ b/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php @@ -2,56 +2,132 @@ namespace Cmf\MainBundle\DataFixtures\PHPCR; +use Doctrine\Common\DataFixtures\FixtureInterface; +use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Common\Persistence\ObjectManager; +use Doctrine\ODM\PHPCR\DocumentManager; + use PHPCR\Util\NodeHelper; -use Symfony\Component\Yaml\Parser; -use Symfony\Cmf\Bundle\SimpleCmsBundle\DataFixtures\Phpcr\AbstractLoadPageData; + use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode; +use Symfony\Cmf\Component\Routing\RouteObjectInterface; +use Symfony\Component\DependencyInjection\ContainerAware; -class LoadStaticData extends AbstractLoadPageData +use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page; +use Symfony\Component\Yaml\Parser; +class LoadStaticData extends ContainerAware implements FixtureInterface, OrderedFixtureInterface { public function getOrder() { return 5; } - protected function getData() + + public function load(ObjectManager $manager) { + $session = $manager->getPhpcrSession(); $yaml = new Parser(); - return $yaml->parse(file_get_contents(__DIR__.'/../../Resources/data/page.yml')); - } - public function load(ObjectManager $dm) - { - parent::load($dm); - $session = $dm->getPhpcrSession(); + $basepath = $this->container->getParameter('cmf_simple_cms.persistence.phpcr.basepath'); + NodeHelper::createPath($session, preg_replace('#/[^/]*$#', '', $basepath)); - $yaml = new Parser(); + $data = $yaml->parse(file_get_contents(__DIR__.'/../../Resources/data/page.yml')); + foreach ($data['static'] as $overview) { + $class = isset($overview['class']) ? $overview['class'] : '\Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page'; + + $parent = (isset($overview['parent']) ? trim($overview['parent'], '/') : ''); + $name = (isset($overview['name']) ? trim($overview['name'], '/') : ''); + + $path = $basepath + .(empty($parent) ? '' : '/' . $parent) + .(empty($name) ? '' : '/' . $name); + + $page = $manager->find($class, $path); + if (!$page) { + $page = new $class(); + $page->setId($path); + } + + if (isset($overview['formats'])) { + $page->setDefault('_format', reset($overview['formats'])); + $page->setRequirement('_format', implode('|', $overview['formats'])); + } + + if (!empty($overview['template'])) { + $page->setDefault(RouteObjectInterface::TEMPLATE_NAME, $overview['template']); + } + + if (!empty($overview['controller'])) { + $page->setDefault(RouteObjectInterface::CONTROLLER_NAME, $overview['controller']); + } + + if (!empty($overview['options'])) { + $page->setOptions($overview['options']); + } + + $manager->persist($page); + + if (is_array($overview['title'])) { + foreach ($overview['title'] as $locale => $title) { + $page->setTitle($title); + if (isset($overview['label'][$locale]) && $overview['label'][$locale]) { + $page->setLabel($overview['label'][$locale]); + } elseif (!isset($overview['label'][$locale])) { + $page->setLabel($title); + } + $page->setBody($overview['body'][$locale]); + $manager->bindTranslation($page, $locale); + } + } else { + $page->setTitle($overview['title']); + if (isset($overview['label'])) { + if ($overview['label']) { + $page->setLabel($overview['label']); + } + } elseif (!isset($overview['label'])) { + $page->setLabel($overview['title']); + } + $page->setBody($overview['body']); + } + + if (isset($overview['create_date'])) { + $page->setCreateDate(date_create_from_format('U', strtotime($overview['create_date']))); + } + + if (isset($overview['publish_start_date'])) { + $page->setPublishStartDate(date_create_from_format('U', strtotime($overview['publish_start_date']))); + } + + if (isset($overview['publish_end_date'])) { + $page->setPublishEndDate(date_create_from_format('U', strtotime($overview['publish_end_date']))); + } + } + $data = $yaml->parse(file_get_contents(__DIR__ . '/../../Resources/data/external.yml')); $basepath = $this->container->getParameter('cmf_core.persistence.phpcr.basepath'); - $home = $dm->find(null, $basepath); + $home = $manager->find(null, $basepath); foreach ($data['static'] as $name => $overview) { $item = new MenuNode(); $item->setName($name); $item->setLabel($overview['label']); $item->setUri($overview['uri']); - $item->setParent($home); - $dm->persist($item); + $item->setParentDocument($home); + $manager->persist($item); } $blocks = $yaml->parse(file_get_contents(__DIR__ . '/../../Resources/data/block.yml')); $blockBasepath = $this->container->getParameter('cmf_block.persistence.phpcr.block_basepath'); NodeHelper::createPath($session, $blockBasepath); - $blocksHome = $dm->find(null, $blockBasepath); + $blocksHome = $manager->find(null, $blockBasepath); foreach ($blocks['static'] as $name => $block) { - $this->loadBlock($dm, $blocksHome, $name, $block); + $this->loadBlock($manager, $blocksHome, $name, $block); } - $dm->flush(); + $manager->flush(); } /** diff --git a/src/Cmf/MainBundle/Resources/data/page.yml b/src/Cmf/MainBundle/Resources/data/page.yml index 3ffa97f..f03aa07 100644 --- a/src/Cmf/MainBundle/Resources/data/page.yml +++ b/src/Cmf/MainBundle/Resources/data/page.yml @@ -81,6 +81,7 @@ static: formats: [html, rss] template: CmfMainBundle:Cms:news_overview.{_format}.twig options: + add_format_pattern: true displayChildren: false currentUriPrefix: "/news" body: The latest news about the Symfony CMF (RSS feed): From 43000b212ee5e7ecb66cf3d34a755fc33c576f26 Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Tue, 8 Apr 2014 14:23:28 +0200 Subject: [PATCH 2/7] add seo default behavior --- app/AppKernel.php | 3 + app/config/config.yml | 11 + composer.json | 1 + composer.lock | 197 +++++++++++++++++- .../Resources/views/layout.html.twig | 5 +- 5 files changed, 210 insertions(+), 7 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index a9bbafe..991a9be 100755 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -28,9 +28,12 @@ public function registerBundles() new Symfony\Cmf\Bundle\BlockBundle\CmfBlockBundle(), new Symfony\Cmf\Bundle\CoreBundle\CmfCoreBundle(), new Symfony\Cmf\Bundle\SimpleCmsBundle\CmfSimpleCmsBundle(), + new Symfony\Cmf\Bundle\SeoBundle\CmfSeoBundle(), // dependency of the block bundle new Sonata\BlockBundle\SonataBlockBundle(), + new Sonata\SeoBundle\SonataSeoBundle(), + // and the website specific bundle new Cmf\MainBundle\CmfMainBundle(), diff --git a/app/config/config.yml b/app/config/config.yml index 8248fcc..3f4b3f2 100755 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -53,6 +53,10 @@ cmf_menu: voters: uri_prefix: true +cmf_seo: + title: %%content_title%% | Symfony2 CMF + description: The Symfony2 Content Management Framework. %%content_description%% + doctrine_cache: providers: phpcr_meta: @@ -76,3 +80,10 @@ fos_rest: sonata_block: default_context: [cms] + +sonata_seo: + page: + title: Symfony2 CMF + metas: + name: + keywords: "CMF, Symfony2, PHPCR" diff --git a/composer.json b/composer.json index a462423..7a98444 100755 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ "symfony-cmf/content-bundle": "1.1.*@dev", "symfony-cmf/menu-bundle": "1.1.*@dev", "symfony-cmf/simple-cms-bundle": "1.1.*@dev", + "symfony-cmf/seo-bundle": "1.0.*@dev", "friendsofsymfony/rest-bundle": "~1.0", "jms/serializer-bundle": ">=0.12,<0.14", "jackalope/jackalope-doctrine-dbal": "1.1.*", diff --git a/composer.lock b/composer.lock index e350b92..6d3866f 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": "21fb1843e1b46169b1c2091f46bd2139", + "hash": "b4a898b75d40e7164eab2a4f07d54be5", "packages": [ { "name": "doctrine/annotations", @@ -43,9 +43,10 @@ ], "authors": [ { - "name": "Jonathan Wage", + "name": "Jonathan H. Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -259,7 +260,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -337,7 +339,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" } ], "description": "Data Fixtures for all Doctrine Object Managers", @@ -600,7 +603,8 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/" + "homepage": "http://www.jwage.com/", + "role": "Creator" }, { "name": "Guilherme Blanco", @@ -2054,6 +2058,123 @@ ], "time": "2014-02-14 14:24:51" }, + { + "name": "sonata-project/exporter", + "version": "1.3.3", + "source": { + "type": "git", + "url": "https://github.com/sonata-project/exporter.git", + "reference": "dad681274e09854a972a0c882ebddd095b7837be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sonata-project/exporter/zipball/dad681274e09854a972a0c882ebddd095b7837be", + "reference": "dad681274e09854a972a0c882ebddd095b7837be", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "propel/propel1": "~1.6", + "symfony/property-access": "~2.2", + "symfony/routing": "*" + }, + "suggest": { + "ext-curl": "*", + "propel/propel1": "~1.6", + "symfony/property-access": "~2.2", + "symfony/routing": "*" + }, + "type": "library", + "autoload": { + "psr-0": { + "Exporter": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Thomas Rabaix", + "email": "thomas.rabaix@gmail.com", + "homepage": "http://sonata-project.org/" + } + ], + "description": "Lightweight Exporter library", + "homepage": "https://github.com/sonata-project/Exporter", + "keywords": [ + "client", + "csv", + "data", + "export", + "xls" + ], + "time": "2013-10-24 13:43:33" + }, + { + "name": "sonata-project/seo-bundle", + "version": "1.1.6", + "source": { + "type": "git", + "url": "https://github.com/sonata-project/SonataSeoBundle.git", + "reference": "0ccc9f2e36b467a9d4b7729ed075196b80376304" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sonata-project/SonataSeoBundle/zipball/0ccc9f2e36b467a9d4b7729ed075196b80376304", + "reference": "0ccc9f2e36b467a9d4b7729ed075196b80376304", + "shasum": "" + }, + "require": { + "sonata-project/exporter": ">=1.2.2,<2.0", + "symfony/symfony": "~2.1", + "twig/twig": "*" + }, + "require-dev": { + "sonata-project/admin-bundle": "~2.2", + "sonata-project/block-bundle": "~2.2,>=2.2.7" + }, + "suggest": { + "knplabs/knp-menu-bundle": "Used by the BreadcrumbMenuBuilder", + "sonata-project/block-bundle": "Allows you to use SEO friendly blocks" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Sonata\\SeoBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Thomas Rabaix", + "email": "thomas.rabaix@sonata-project.org", + "homepage": "http://sonata-project.org" + }, + { + "name": "Sonata Community", + "homepage": "https://github.com/sonata-project/SonataSeoBundle/contributors" + } + ], + "description": "Symfony SonataSeoBundle", + "homepage": "http://sonata-project.org/bundles/seo", + "keywords": [ + "seo", + "sonata" + ], + "time": "2014-02-14 14:28:54" + }, { "name": "symfony-cmf/block-bundle", "version": "dev-master", @@ -2434,6 +2555,69 @@ ], "time": "2014-04-07 17:05:14" }, + { + "name": "symfony-cmf/seo-bundle", + "version": "dev-master", + "target-dir": "Symfony/Cmf/Bundle/SeoBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony-cmf/SeoBundle.git", + "reference": "cf6cb08729faad077303766d13f1ddbd79ff9264" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony-cmf/SeoBundle/zipball/cf6cb08729faad077303766d13f1ddbd79ff9264", + "reference": "cf6cb08729faad077303766d13f1ddbd79ff9264", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sonata-project/seo-bundle": "1.1.*@dev", + "symfony-cmf/core-bundle": "1.1.*@dev" + }, + "require-dev": { + "doctrine/phpcr-bundle": "1.1.*@dev", + "doctrine/phpcr-odm": "1.1.*@dev", + "matthiasnoback/symfony-config-test": "0.*", + "matthiasnoback/symfony-dependency-injection-test": "0.*", + "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*@dev", + "symfony-cmf/routing-bundle": "1.2.*@dev", + "symfony-cmf/testing": "dev-master" + }, + "suggest": { + "doctrine/doctrine-bundle": "To persist the metadata in ORM entities", + "doctrine/phpcr-bundle": "To persist the metadata in PHPCR ODM documents", + "sonata-project/doctrine-phpcr-admin-bundle": "To provide an admin extension for the seo metadata" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Cmf\\Bundle\\SeoBundle": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony CMF Community", + "homepage": "https://github.com/symfony-cmf/SeoBundle/contributors" + } + ], + "description": "Symfony CMF Search Engine Optimization Bundle", + "homepage": "http://cmf.symfony.com", + "keywords": [ + "Symfony CMF", + "seo" + ], + "time": "2014-04-08 07:04:01" + }, { "name": "symfony-cmf/simple-cms-bundle", "version": "dev-master", @@ -2927,6 +3111,7 @@ "symfony-cmf/content-bundle": 20, "symfony-cmf/menu-bundle": 20, "symfony-cmf/simple-cms-bundle": 20, + "symfony-cmf/seo-bundle": 20, "doctrine/phpcr-bundle": 20, "doctrine/phpcr-odm": 20, "seld/slippy": 20, diff --git a/src/Cmf/MainBundle/Resources/views/layout.html.twig b/src/Cmf/MainBundle/Resources/views/layout.html.twig index 82a50cd..795f4a0 100755 --- a/src/Cmf/MainBundle/Resources/views/layout.html.twig +++ b/src/Cmf/MainBundle/Resources/views/layout.html.twig @@ -3,7 +3,10 @@ - {% block title %}{{ title|default('Welcome')|striptags }}{% endblock %} | Symfony2 CMF + {{ sonata_seo_metadatas() }} + {{ sonata_seo_link_canonical() }} + {{ sonata_seo_lang_alternates() }} + {{ sonata_seo_title() }} {% block includes %} From 690d9b791779c942f54972284bc71881f87a9d11 Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Tue, 8 Apr 2014 14:37:33 +0200 Subject: [PATCH 3/7] add description to default config --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/config.yml b/app/config/config.yml index 3f4b3f2..9af3190 100755 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -86,4 +86,5 @@ sonata_seo: title: Symfony2 CMF metas: name: + description: The Symfony2 Content Management Framework keywords: "CMF, Symfony2, PHPCR" From 6fc7f8d95885d9fbc5d17f6fdf28f696f791fe6b Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Tue, 8 Apr 2014 15:47:41 +0200 Subject: [PATCH 4/7] adjust default title, CS --- app/AppKernel.php | 1 - app/config/config.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 991a9be..36d44c7 100755 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -34,7 +34,6 @@ public function registerBundles() new Sonata\BlockBundle\SonataBlockBundle(), new Sonata\SeoBundle\SonataSeoBundle(), - // and the website specific bundle new Cmf\MainBundle\CmfMainBundle(), ); diff --git a/app/config/config.yml b/app/config/config.yml index 9af3190..83ba37d 100755 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -83,7 +83,7 @@ sonata_block: sonata_seo: page: - title: Symfony2 CMF + title: Welcome | Symfony2 CMF metas: name: description: The Symfony2 Content Management Framework From 886142daa033738c06c418be75f3ab1dd59a180d Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Wed, 9 Apr 2014 10:29:50 +0200 Subject: [PATCH 5/7] add meta data from page.yml - with null in find() --- app/config/config.yml | 2 +- .../DataFixtures/PHPCR/LoadStaticData.php | 20 ++++++- src/Cmf/MainBundle/Document/SeoPage.php | 55 +++++++++++++++++++ src/Cmf/MainBundle/Resources/data/page.yml | 5 +- 4 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 src/Cmf/MainBundle/Document/SeoPage.php diff --git a/app/config/config.yml b/app/config/config.yml index 83ba37d..0ed4271 100755 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -86,5 +86,5 @@ sonata_seo: title: Welcome | Symfony2 CMF metas: name: - description: The Symfony2 Content Management Framework + description: The Symfony2 Content Management Framework. keywords: "CMF, Symfony2, PHPCR" diff --git a/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php b/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php index 457c338..5b77381 100644 --- a/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php +++ b/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php @@ -10,6 +10,8 @@ use PHPCR\Util\NodeHelper; use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode; +use Symfony\Cmf\Bundle\SeoBundle\Model\SeoAwareInterface; +use Symfony\Cmf\Bundle\SeoBundle\Model\SeoMetadata; use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Component\DependencyInjection\ContainerAware; @@ -34,7 +36,7 @@ public function load(ObjectManager $manager) $data = $yaml->parse(file_get_contents(__DIR__.'/../../Resources/data/page.yml')); foreach ($data['static'] as $overview) { - $class = isset($overview['class']) ? $overview['class'] : '\Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page'; + $class = isset($overview['class']) ? $overview['class'] : '\Cmf\MainBundle\Document\SeoPage'; $parent = (isset($overview['parent']) ? trim($overview['parent'], '/') : ''); $name = (isset($overview['name']) ? trim($overview['name'], '/') : ''); @@ -43,7 +45,7 @@ public function load(ObjectManager $manager) .(empty($parent) ? '' : '/' . $parent) .(empty($name) ? '' : '/' . $name); - $page = $manager->find($class, $path); + $page = $manager->find(null, $path); if (!$page) { $page = new $class(); $page->setId($path); @@ -66,6 +68,20 @@ public function load(ObjectManager $manager) $page->setOptions($overview['options']); } + if (!empty($overview['seo-metadata']) && $page instanceof SeoAwareInterface) { + $seoMetadata = new SeoMetadata(); + $seoMetadata->setMetaDescription( + !empty($overview['seo-metadata']['description']) ? $overview['seo-metadata']['description'] : '' + ); + $seoMetadata->setMetaKeywords( + !empty($overview['seo-metadata']['keywords']) ? $overview['seo-metadata']['keywords'] : '' + ); + $seoMetadata->setOriginalUrl( + !empty($overview['seo-metadata']['original-url']) ? $overview['seo-metadata']['original-url'] : '' + ); + $page->setSeoMetadata($seoMetadata); + } + $manager->persist($page); if (is_array($overview['title'])) { diff --git a/src/Cmf/MainBundle/Document/SeoPage.php b/src/Cmf/MainBundle/Document/SeoPage.php new file mode 100644 index 0000000..71f13c3 --- /dev/null +++ b/src/Cmf/MainBundle/Document/SeoPage.php @@ -0,0 +1,55 @@ + + */ +class SeoPage extends Page implements SeoAwareInterface +{ + /** + * @var SeoMetadata + * + * @PHPCR\String(assoc="") + */ + protected $seoMetadata; + + public function __construct(array $options = array()) + { + parent::__construct($options); + $this->seoMetadata = new SeoMetadata(); + } + + /** + * Gets the SEO metadata for this content. + * + * @return SeoMetadataInterface + */ + public function getSeoMetadata() + { + return $this->seoMetadata; + } + + /** + * Sets the SEO metadata for this content. + * + * This method is used by a listener, which converts the metadata to a + * plain array in order to persist it and converts it back when the content + * is fetched. + * + * @param array|SeoMetadataInterface $metadata + */ + public function setSeoMetadata($metadata) + { + $this->seoMetadata = $metadata; + } +} + \ No newline at end of file diff --git a/src/Cmf/MainBundle/Resources/data/page.yml b/src/Cmf/MainBundle/Resources/data/page.yml index f03aa07..aa0f5b1 100644 --- a/src/Cmf/MainBundle/Resources/data/page.yml +++ b/src/Cmf/MainBundle/Resources/data/page.yml @@ -3,7 +3,7 @@ static: name: "" title: "Home" template: "CmfMainBundle:Cms:home.html.twig" - body: | + body: |

The Symfony CMF Project

Welcome to the home of the Symfony2 @@ -85,6 +85,9 @@ static: displayChildren: false currentUriPrefix: "/news" body: The latest news about the Symfony CMF (RSS feed): + seo-metadata: + description: "News around the Symfony2 CMF" + keywords: "News" cmf-featured-on-symfony-com: name: "cmf-featured-on-symfony-com" From 644b9faea9d2c621218a28e0a663762122cde237 Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Wed, 9 Apr 2014 10:42:08 +0200 Subject: [PATCH 6/7] class for seo page --- src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php | 4 ++-- src/Cmf/MainBundle/Resources/data/page.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php b/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php index 5b77381..14d5d90 100644 --- a/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php +++ b/src/Cmf/MainBundle/DataFixtures/PHPCR/LoadStaticData.php @@ -36,7 +36,7 @@ public function load(ObjectManager $manager) $data = $yaml->parse(file_get_contents(__DIR__.'/../../Resources/data/page.yml')); foreach ($data['static'] as $overview) { - $class = isset($overview['class']) ? $overview['class'] : '\Cmf\MainBundle\Document\SeoPage'; + $class = isset($overview['class']) ? $overview['class'] : '\Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page'; $parent = (isset($overview['parent']) ? trim($overview['parent'], '/') : ''); $name = (isset($overview['name']) ? trim($overview['name'], '/') : ''); @@ -45,7 +45,7 @@ public function load(ObjectManager $manager) .(empty($parent) ? '' : '/' . $parent) .(empty($name) ? '' : '/' . $name); - $page = $manager->find(null, $path); + $page = $manager->find($class, $path); if (!$page) { $page = new $class(); $page->setId($path); diff --git a/src/Cmf/MainBundle/Resources/data/page.yml b/src/Cmf/MainBundle/Resources/data/page.yml index aa0f5b1..53f01d1 100644 --- a/src/Cmf/MainBundle/Resources/data/page.yml +++ b/src/Cmf/MainBundle/Resources/data/page.yml @@ -3,7 +3,7 @@ static: name: "" title: "Home" template: "CmfMainBundle:Cms:home.html.twig" - body: | + body: |

The Symfony CMF Project

Welcome to the home of the Symfony2 @@ -80,6 +80,7 @@ static: title: "News" formats: [html, rss] template: CmfMainBundle:Cms:news_overview.{_format}.twig + class: "\Cmf\MainBundle\Document\SeoPage" options: add_format_pattern: true displayChildren: false From ab971e767f88400aeba64a14119f92843ff2c913 Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Wed, 9 Apr 2014 10:43:53 +0200 Subject: [PATCH 7/7] delete indent --- src/Cmf/MainBundle/Resources/data/page.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cmf/MainBundle/Resources/data/page.yml b/src/Cmf/MainBundle/Resources/data/page.yml index 53f01d1..0668638 100644 --- a/src/Cmf/MainBundle/Resources/data/page.yml +++ b/src/Cmf/MainBundle/Resources/data/page.yml @@ -3,7 +3,7 @@ static: name: "" title: "Home" template: "CmfMainBundle:Cms:home.html.twig" - body: | + body: |

The Symfony CMF Project

Welcome to the home of the Symfony2