diff --git a/.travis.yml b/.travis.yml index fbd9d02a..0e50f6da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,11 +27,4 @@ script: phpunit -c app notifications: irc: "irc.freenode.org#symfony-cmf" - email: "symfony-cmf-devs@googlegroups.com" - -#matrix: -# allow_failures: -# - env: TRANSPORT=midgard_sqlite MIDGARD_EXT_VERSION=ratatoskr -# - env: TRANSPORT=midgard_mysql MIDGARD_EXT_VERSION=ratatoskr -# - env: TRANSPORT=midgard_sqlite MIDGARD_EXT_VERSION=gjallarhorn -# - env: TRANSPORT=midgard_mysql MIDGARD_EXT_VERSION=gjallarhorn + email: "symfony-cmf-devs@googlegroups.com" \ No newline at end of file diff --git a/app/config/config.yml b/app/config/config.yml index 7acbfb78..1649a4f7 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -95,12 +95,6 @@ cmf_core: phpcr: enabled: true -cmf_menu: - persistence: - phpcr: - # TODO remove once https://github.com/jackalope/jackalope-doctrine-dbal/issues/189 is fixed - prefetch: 0 - cmf_routing: chain: routers_by_id: @@ -113,13 +107,9 @@ cmf_routing: Sandbox\MainBundle\Document\DemoClassContent: sandbox_main.controller:classAction Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute: cmf_routing.redirect_controller:redirectAction - templates_by_class: - Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent: SandboxMainBundle:StaticContent:index.html.twig - -cmf_simple_cms: - routing: templates_by_class: Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: CmfSimpleCmsBundle:Page:index.html.twig + Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent: SandboxMainBundle:StaticContent:index.html.twig cmf_create: editor_base_path: /bundles/cmfcreate/vendor/ckeditor/ @@ -145,6 +135,9 @@ sonata_block: sonata_admin: extensions: + cmf_core.admin_extension.child: + implements: + - Symfony\Cmf\Bundle\CoreBundle\Model\ChildInterface cmf_core.admin_extension.publish_workflow.time_period: implements: - Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodInterface diff --git a/app/config/phpcr_doctrine_dbal.yml.dist b/app/config/phpcr_doctrine_dbal.yml.dist index fbb93140..4a10312b 100644 --- a/app/config/phpcr_doctrine_dbal.yml.dist +++ b/app/config/phpcr_doctrine_dbal.yml.dist @@ -1,5 +1,7 @@ parameters: phpcr_backend: + logging: true + profiling: true type: doctrinedbal connection: default caches: diff --git a/app/config/phpcr_jackrabbit.yml.dist b/app/config/phpcr_jackrabbit.yml.dist index 1f40783b..7dab30c0 100644 --- a/app/config/phpcr_jackrabbit.yml.dist +++ b/app/config/phpcr_jackrabbit.yml.dist @@ -1,5 +1,7 @@ parameters: phpcr_backend: + logging: true + profiling: true type: jackrabbit url: http://localhost:8080/server/ phpcr_workspace: default diff --git a/app/config/phpcr_midgard_mysql.yml.dist b/app/config/phpcr_midgard_mysql.yml.dist deleted file mode 100644 index 32bce485..00000000 --- a/app/config/phpcr_midgard_mysql.yml.dist +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - locale: en - - secret: xxxxxxxxxx - - phpcr_backend: - type: midgard2 - db_type: MySQL - db_name: midgard2_test - db_host: "0.0.0.0" - db_port: 3306 - db_username: "" - db_password: "" - db_init: true - blobdir: /tmp/cmf-blobs - phpcr_workspace: default - phpcr_user: admin - phpcr_pass: password diff --git a/app/config/phpcr_midgard_sqlite.yml.dist b/app/config/phpcr_midgard_sqlite.yml.dist deleted file mode 100644 index 8820314d..00000000 --- a/app/config/phpcr_midgard_sqlite.yml.dist +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - locale: en - - secret: xxxxxxxxxx - - phpcr_backend: - type: midgard2 - db_type: SQLite - db_name: cmf - db_dir: /tmp - db_init: true - blobdir: /tmp/cmf-blobs - phpcr_workspace: default - phpcr_user: admin - phpcr_pass: password diff --git a/app/tests/AdminTest.php b/app/tests/AdminTest.php index da68174a..b118890b 100644 --- a/app/tests/AdminTest.php +++ b/app/tests/AdminTest.php @@ -110,7 +110,8 @@ protected function doTestReachableAdminRoutes($admin) // if an ID is required, try and find a document to test if (isset($requirements['id'])) { - if ($document = $this->dm->getRepository($class)->findOneBy(array())) { + $document = $admin->createQuery('list')->execute()->first(); + if ($document) { $node = $this->dm->getNodeForDocument($document); $routeParams['id'] = $node->getPath(); } else { diff --git a/app/tests/travis_midgard_install.sh b/app/tests/travis_midgard_install.sh deleted file mode 100755 index cdae9c07..00000000 --- a/app/tests/travis_midgard_install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# Download installation script from phpcr-midgard2 -wget https://raw.github.com/midgardproject/phpcr-midgard2/master/tests/travis_midgard.sh -chmod +x ./travis_midgard.sh -./travis_midgard.sh - -# Copy PHPCR schemas to Midgard's global schema dir -sudo wget --directory-prefix=/usr/share/midgard2/schema https://github.com/midgardproject/phpcr-midgard2/raw/master/data/share/schema/midgard_namespace_registry.xml -sudo wget --directory-prefix=/usr/share/midgard2/schema https://github.com/midgardproject/phpcr-midgard2/raw/master/data/share/schema/midgard_tree_node.xml - -composer require midgard/phpcr:dev-master --prefer-source diff --git a/app/tests/travis_midgard_mysql.sh b/app/tests/travis_midgard_mysql.sh deleted file mode 100755 index 36ce1712..00000000 --- a/app/tests/travis_midgard_mysql.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Install libgda MySQL connector -sudo apt-get install -y libgda-4.0-mysql - -# Create the database -mysql -e 'create database midgard2_test;' -sudo mysql -e 'SET GLOBAL sql_mode="";' - -# Install Midgard2 -./app/tests/travis_midgard_install.sh diff --git a/app/tests/travis_midgard_sqlite.sh b/app/tests/travis_midgard_sqlite.sh deleted file mode 100755 index b0b1cd70..00000000 --- a/app/tests/travis_midgard_sqlite.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# Install Midgard2 -./app/tests/travis_midgard_install.sh diff --git a/composer.json b/composer.json index b581f03f..8dbf3103 100644 --- a/composer.json +++ b/composer.json @@ -23,27 +23,28 @@ "sensio/distribution-bundle": "2.3.*", "sensio/framework-extra-bundle": "2.3.*", "sensio/generator-bundle": "2.3.*", - "symfony-cmf/symfony-cmf": "~1.1", - "symfony-cmf/simple-cms-bundle": "~1.1", - "symfony-cmf/search-bundle": "~1.1", - "symfony-cmf/create-bundle": "~1.1", - "jackalope/jackalope-doctrine-dbal": "~1.1", - "jackalope/jackalope-jackrabbit": "~1.1", - "doctrine/doctrine-bundle": "~1.2", + "symfony-cmf/symfony-cmf": "1.1.*", + "symfony-cmf/simple-cms-bundle": "1.1.*", + "symfony-cmf/search-bundle": "1.1.*", + "symfony-cmf/create-bundle": "1.1.*", + "jackalope/jackalope-doctrine-dbal": "1.1.*", + "jackalope/jackalope-jackrabbit": "1.1.*", + "doctrine/doctrine-bundle": "1.2.*", "doctrine/data-fixtures": "1.0.*", - "doctrine/doctrine-cache-bundle": "~1.0", - "sonata-project/cache-bundle": "~2.1", - "sonata-project/doctrine-phpcr-admin-bundle": "~1.1", - "symfony-cmf/block-bundle": "~1.1", - "eko/feedbundle": "~1.0", - "lunetics/locale-bundle": "~2.2", - "liip/imagine-bundle": "~0.12", - "wjzijderveld/check-bundles": "~1.0", - "helios-ag/fm-elfinder-bundle": "~1.4" + "doctrine/doctrine-cache-bundle": "1.0.*", + "sonata-project/cache-bundle": "2.1.*", + "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*", + "sonata-project/jquery-bundle": "1.8.3", + "symfony-cmf/block-bundle": "1.1.*", + "eko/feedbundle": "1.0.*", + "lunetics/locale-bundle": "2.2.*", + "liip/imagine-bundle": "0.21.*", + "wjzijderveld/check-bundles": "1.0.*", + "helios-ag/fm-elfinder-bundle": "1.4.*" }, "require-dev": { - "liip/functional-test-bundle": "~1.0.1", - "symfony-cmf/testing": "~1.0" + "liip/functional-test-bundle": "1.0.*", + "symfony-cmf/testing": "1.1.*" }, "scripts": { "post-install-cmd": [ diff --git a/composer.lock b/composer.lock index b1632795..f4120b06 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": "515065cd5285983edc72a9cb606faea0", + "hash": "d01658516dbeb8a2c0d4b69dfbe0f972", "packages": [ { "name": "doctrine/annotations", @@ -83,12 +83,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "36c4eee5051629524389da376ba270f15765e49f" + "reference": "bb9b55b17bed5923c9446c8158a92623d39480c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/36c4eee5051629524389da376ba270f15765e49f", - "reference": "36c4eee5051629524389da376ba270f15765e49f", + "url": "https://api.github.com/repos/doctrine/cache/zipball/bb9b55b17bed5923c9446c8158a92623d39480c6", + "reference": "bb9b55b17bed5923c9446c8158a92623d39480c6", "shasum": "" }, "require": { @@ -149,7 +149,7 @@ "cache", "caching" ], - "time": "2013-12-18 17:21:03" + "time": "2014-03-27 11:06:41" }, { "name": "doctrine/collections", @@ -418,36 +418,30 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "dev-master", + "version": "v1.2.0", "target-dir": "Doctrine/Bundle/DoctrineBundle", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "326bc9422817a0c3abe4551fd3b816a066947630" + "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/326bc9422817a0c3abe4551fd3b816a066947630", - "reference": "326bc9422817a0c3abe4551fd3b816a066947630", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/765b0d87fcc3e839c74817b7211258cbef3a4fb9", + "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9", "shasum": "" }, "require": { - "doctrine/dbal": "~2.3", - "doctrine/doctrine-cache-bundle": "~1.0", + "doctrine/dbal": ">=2.2,<2.5-dev", "jdorn/sql-formatter": "~1.1", "php": ">=5.3.2", "symfony/doctrine-bridge": "~2.2", "symfony/framework-bundle": "~2.2" }, "require-dev": { - "doctrine/orm": "~2.3", - "phpunit/php-code-coverage": "~1.2", - "phpunit/phpunit": "~3.7", - "phpunit/phpunit-mock-objects": "~1.2", - "satooshi/php-coveralls": "~0.6.1", + "doctrine/orm": ">=2.2,<2.5-dev", "symfony/validator": "~2.2", - "symfony/yaml": "~2.2", - "twig/twig": "~1" + "symfony/yaml": "~2.2" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", @@ -456,7 +450,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -482,10 +476,6 @@ { "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" - }, - { - "name": "Doctrine Project", - "homepage": "http://www.doctrine-project.org/" } ], "description": "Symfony DoctrineBundle", @@ -496,7 +486,7 @@ "orm", "persistence" ], - "time": "2014-03-04 21:50:51" + "time": "2013-03-25 20:13:59" }, { "name": "doctrine/doctrine-cache-bundle", @@ -715,12 +705,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/DoctrinePHPCRBundle.git", - "reference": "ad8fa77618e39c74feee9c25885e29f60e37258c" + "reference": "e7fc9122f67766eef9cb4054034926b7660a275c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/ad8fa77618e39c74feee9c25885e29f60e37258c", - "reference": "ad8fa77618e39c74feee9c25885e29f60e37258c", + "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/e7fc9122f67766eef9cb4054034926b7660a275c", + "reference": "e7fc9122f67766eef9cb4054034926b7660a275c", "shasum": "" }, "require": { @@ -778,7 +768,7 @@ "persistence", "phpcr" ], - "time": "2014-03-23 14:34:25" + "time": "2014-04-03 12:45:33" }, { "name": "doctrine/phpcr-odm", @@ -786,12 +776,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/phpcr-odm.git", - "reference": "22d03a826ac0e6a6089326fe29d41f20ecadb726" + "reference": "ea13fa3066efc433da9236f38e4a403e8eab6fee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/22d03a826ac0e6a6089326fe29d41f20ecadb726", - "reference": "22d03a826ac0e6a6089326fe29d41f20ecadb726", + "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/ea13fa3066efc433da9236f38e4a403e8eab6fee", + "reference": "ea13fa3066efc433da9236f38e4a403e8eab6fee", "shasum": "" }, "require": { @@ -852,25 +842,26 @@ "odm", "phpcr" ], - "time": "2014-03-24 09:03:01" + "time": "2014-03-31 19:33:32" }, { "name": "eko/feedbundle", - "version": "dev-master", + "version": "1.0.1", + "target-dir": "Eko/FeedBundle", "source": { "type": "git", "url": "https://github.com/eko/FeedBundle.git", - "reference": "59008490ef8fe8a97e0c167d66ca84a59eb584c1" + "reference": "f180c6dc7d5216ff0a5f1b905d32f4b427a4dcf5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/eko/FeedBundle/zipball/59008490ef8fe8a97e0c167d66ca84a59eb584c1", - "reference": "59008490ef8fe8a97e0c167d66ca84a59eb584c1", + "url": "https://api.github.com/repos/eko/FeedBundle/zipball/f180c6dc7d5216ff0a5f1b905d32f4b427a4dcf5", + "reference": "f180c6dc7d5216ff0a5f1b905d32f4b427a4dcf5", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/framework-bundle": "~2.0", + "symfony/framework-bundle": ">=2.0,<2.4-dev", "zendframework/zend-feed": ">=2.0", "zendframework/zend-http": ">=2.0", "zendframework/zend-servicemanager": ">=2.0" @@ -878,12 +869,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "psr-4": { - "Eko\\FeedBundle\\": "" + "psr-0": { + "Eko\\FeedBundle": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -904,7 +895,7 @@ "feed", "rss" ], - "time": "2014-03-07 19:16:00" + "time": "2013-06-08 08:30:49" }, { "name": "friendsofsymfony/jsrouting-bundle", @@ -970,12 +961,12 @@ "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "74dcf0465b19f2c3082693a875850897241851ef" + "reference": "890829effff016b53f392d45702107a09e71edcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/74dcf0465b19f2c3082693a875850897241851ef", - "reference": "74dcf0465b19f2c3082693a875850897241851ef", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/890829effff016b53f392d45702107a09e71edcf", + "reference": "890829effff016b53f392d45702107a09e71edcf", "shasum": "" }, "require": { @@ -1039,7 +1030,7 @@ "keywords": [ "rest" ], - "time": "2014-03-23 17:58:22" + "time": "2014-04-03 21:10:08" }, { "name": "helios-ag/fm-elfinder-bundle", @@ -1202,12 +1193,12 @@ "source": { "type": "git", "url": "https://github.com/jackalope/jackalope.git", - "reference": "5051008ba1d67c8391809a13c18310a01c287cc6" + "reference": "1f936da47bd29deb8b0a1a21af46519485f99d37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jackalope/jackalope/zipball/5051008ba1d67c8391809a13c18310a01c287cc6", - "reference": "5051008ba1d67c8391809a13c18310a01c287cc6", + "url": "https://api.github.com/repos/jackalope/jackalope/zipball/1f936da47bd29deb8b0a1a21af46519485f99d37", + "reference": "1f936da47bd29deb8b0a1a21af46519485f99d37", "shasum": "" }, "require": { @@ -1247,7 +1238,7 @@ "keywords": [ "phpcr" ], - "time": "2014-03-11 08:03:09" + "time": "2014-04-04 10:29:19" }, { "name": "jackalope/jackalope-doctrine-dbal", @@ -1255,17 +1246,17 @@ "source": { "type": "git", "url": "https://github.com/jackalope/jackalope-doctrine-dbal.git", - "reference": "b3fc10e3e365637730ecb622806d8a73e6962f16" + "reference": "571f54f95f46bc8b0608d87886ba17906685edf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/b3fc10e3e365637730ecb622806d8a73e6962f16", - "reference": "b3fc10e3e365637730ecb622806d8a73e6962f16", + "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.1.0", + "jackalope/jackalope": "~1.1.1", "php": ">=5.3.3", "phpcr/phpcr": "~2.1.0", "phpcr/phpcr-utils": "~1.1.0" @@ -1309,7 +1300,7 @@ "phpcr", "transport implementation" ], - "time": "2014-03-17 08:47:49" + "time": "2014-04-04 12:08:19" }, { "name": "jackalope/jackalope-jackrabbit", @@ -1839,17 +1830,17 @@ }, { "name": "liip/imagine-bundle", - "version": "0.x-dev", + "version": "v0.21.1", "target-dir": "Liip/ImagineBundle", "source": { "type": "git", "url": "https://github.com/liip/LiipImagineBundle.git", - "reference": "e39b7c1d5a969605690ef5f9ab1f837bf4083b5f" + "reference": "0490ecfd7184e71b24108ba0c2a85261c14b9fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/liip/LiipImagineBundle/zipball/e39b7c1d5a969605690ef5f9ab1f837bf4083b5f", - "reference": "e39b7c1d5a969605690ef5f9ab1f837bf4083b5f", + "url": "https://api.github.com/repos/liip/LiipImagineBundle/zipball/0490ecfd7184e71b24108ba0c2a85261c14b9fc4", + "reference": "0490ecfd7184e71b24108ba0c2a85261c14b9fc4", "shasum": "" }, "require": { @@ -1890,7 +1881,7 @@ "image", "imagine" ], - "time": "2014-03-23 14:00:21" + "time": "2014-03-14 17:57:09" }, { "name": "liip/search-bundle", @@ -2012,7 +2003,7 @@ }, { "name": "midgard/createphp", - "version": "dev-master", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/flack/createphp.git", @@ -2063,12 +2054,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174" + "reference": "f3032a2b9874aa76efcc155eff776eabdf322d05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/392ef35fd470638e08d0160d6b1cbab63cb23174", - "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f3032a2b9874aa76efcc155eff776eabdf322d05", + "reference": "f3032a2b9874aa76efcc155eff776eabdf322d05", "shasum": "" }, "require": { @@ -2123,7 +2114,7 @@ "logging", "psr-3" ], - "time": "2014-03-23 19:50:26" + "time": "2014-04-01 19:53:04" }, { "name": "phpcollection/phpcollection", @@ -2131,12 +2122,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/php-collection.git", - "reference": "7e9d6fd65031a0258ec2a36e484a4f46a1f4b1ed" + "reference": "8ecd043d427706ead32abfc76ca672c8a4efad43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/7e9d6fd65031a0258ec2a36e484a4f46a1f4b1ed", - "reference": "7e9d6fd65031a0258ec2a36e484a4f46a1f4b1ed", + "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/8ecd043d427706ead32abfc76ca672c8a4efad43", + "reference": "8ecd043d427706ead32abfc76ca672c8a4efad43", "shasum": "" }, "require": { @@ -2173,7 +2164,7 @@ "sequence", "set" ], - "time": "2014-03-18 16:15:04" + "time": "2014-04-04 12:06:15" }, { "name": "phpcr/phpcr", @@ -2387,22 +2378,20 @@ }, { "name": "sensio/distribution-bundle", - "version": "dev-master", + "version": "v2.3.4", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "7e5be792d3d17dcc407d73057f44f0c451a56b04" + "reference": "66df91b4bd637a83299d8072aed3658bfd3b3021" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/7e5be792d3d17dcc407d73057f44f0c451a56b04", - "reference": "7e5be792d3d17dcc407d73057f44f0c451a56b04", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/66df91b4bd637a83299d8072aed3658bfd3b3021", + "reference": "66df91b4bd637a83299d8072aed3658bfd3b3021", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/class-loader": "~2.2", "symfony/framework-bundle": "~2.2" }, "type": "symfony-bundle", @@ -2433,7 +2422,7 @@ "configuration", "distribution" ], - "time": "2014-03-14 12:33:57" + "time": "2013-08-22 05:04:53" }, { "name": "sensio/framework-extra-bundle", @@ -2491,12 +2480,12 @@ "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "eae9c659949b0901947a565ec0ff7606692ce53e" + "reference": "201c75b4ae26e906c26cdfe4db7ac5043cc15743" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/eae9c659949b0901947a565ec0ff7606692ce53e", - "reference": "eae9c659949b0901947a565ec0ff7606692ce53e", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/201c75b4ae26e906c26cdfe4db7ac5043cc15743", + "reference": "201c75b4ae26e906c26cdfe4db7ac5043cc15743", "shasum": "" }, "require": { @@ -2532,7 +2521,7 @@ } ], "description": "This bundle generates code for you", - "time": "2014-02-19 06:31:38" + "time": "2014-03-30 07:47:50" }, { "name": "sonata-project/admin-bundle", @@ -2740,16 +2729,16 @@ }, { "name": "sonata-project/cache-bundle", - "version": "dev-master", + "version": "2.1.6", "source": { "type": "git", "url": "https://github.com/sonata-project/SonataCacheBundle.git", - "reference": "af5b3f2bc1622b4952bcb7a5d2edde313fb0c847" + "reference": "2803d69b13e237b2de53076750e5c0df528727e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/SonataCacheBundle/zipball/af5b3f2bc1622b4952bcb7a5d2edde313fb0c847", - "reference": "af5b3f2bc1622b4952bcb7a5d2edde313fb0c847", + "url": "https://api.github.com/repos/sonata-project/SonataCacheBundle/zipball/2803d69b13e237b2de53076750e5c0df528727e8", + "reference": "2803d69b13e237b2de53076750e5c0df528727e8", "shasum": "" }, "require": { @@ -2804,7 +2793,7 @@ "keywords": [ "cache block" ], - "time": "2014-03-19 11:43:29" + "time": "2014-02-14 14:16:31" }, { "name": "sonata-project/core-bundle", @@ -2875,16 +2864,16 @@ "source": { "type": "git", "url": "https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle.git", - "reference": "d15ceb51f1ef60514a013e5a5dc106ba2ad05823" + "reference": "75af28aa2ec5ffbdf648b759cf2fb3fff24338a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/SonataDoctrinePhpcrAdminBundle/zipball/d15ceb51f1ef60514a013e5a5dc106ba2ad05823", - "reference": "d15ceb51f1ef60514a013e5a5dc106ba2ad05823", + "url": "https://api.github.com/repos/sonata-project/SonataDoctrinePhpcrAdminBundle/zipball/75af28aa2ec5ffbdf648b759cf2fb3fff24338a9", + "reference": "75af28aa2ec5ffbdf648b759cf2fb3fff24338a9", "shasum": "" }, "require": { - "doctrine/phpcr-bundle": "~1.0", + "doctrine/phpcr-bundle": "~1.1", "doctrine/phpcr-odm": "~1.1", "php": ">=5.3.3", "sonata-project/admin-bundle": ">=2.2.9,<2.2.11", @@ -2928,7 +2917,7 @@ "bootstrap", "sonata" ], - "time": "2014-03-24 07:19:15" + "time": "2014-04-04 12:35:06" }, { "name": "sonata-project/exporter", @@ -2988,30 +2977,27 @@ }, { "name": "sonata-project/jquery-bundle", - "version": "dev-master", + "version": "1.8.3", + "target-dir": "Sonata/jQueryBundle", "source": { "type": "git", "url": "https://github.com/sonata-project/SonatajQueryBundle.git", - "reference": "8db2fbc85e57f193d22ed67f0223c8a717eeaad5" + "reference": "1b6dde1becb93b801e64b20e96bc76a110ead712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/SonatajQueryBundle/zipball/8db2fbc85e57f193d22ed67f0223c8a717eeaad5", - "reference": "8db2fbc85e57f193d22ed67f0223c8a717eeaad5", + "url": "https://api.github.com/repos/sonata-project/SonatajQueryBundle/zipball/1b6dde1becb93b801e64b20e96bc76a110ead712", + "reference": "1b6dde1becb93b801e64b20e96bc76a110ead712", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": ">=5.3.2", + "symfony/framework-bundle": "2.*" }, "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.9.x-dev" - } - }, "autoload": { - "psr-4": { - "Sonata\\jQueryBundle\\": "" + "psr-0": { + "Sonata\\jQueryBundle": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -3035,20 +3021,20 @@ "jquery", "sonata" ], - "time": "2014-03-19 11:45:00" + "time": "2013-03-01 17:24:02" }, { "name": "swiftmailer/swiftmailer", - "version": "v5.0.3", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "32edc3b0de0fdc1b10f5c4912e8677b3f411a230" + "reference": "4f7a8b30aea0e580849a814876cdd8343277efc2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/32edc3b0de0fdc1b10f5c4912e8677b3f411a230", - "reference": "32edc3b0de0fdc1b10f5c4912e8677b3f411a230", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4f7a8b30aea0e580849a814876cdd8343277efc2", + "reference": "4f7a8b30aea0e580849a814876cdd8343277efc2", "shasum": "" }, "require": { @@ -3072,7 +3058,9 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { "name": "Chris Corbyn" @@ -3084,7 +3072,7 @@ "mail", "mailer" ], - "time": "2013-12-03 13:33:24" + "time": "2014-04-03 05:12:31" }, { "name": "symfony-cmf/block-bundle", @@ -3093,12 +3081,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/BlockBundle.git", - "reference": "f3c8d7f165b479045b0bfdd51d0fb70b26955491" + "reference": "26bcf5465b972042b6e5fe43c8115a567187d8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/f3c8d7f165b479045b0bfdd51d0fb70b26955491", - "reference": "f3c8d7f165b479045b0bfdd51d0fb70b26955491", + "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/26bcf5465b972042b6e5fe43c8115a567187d8e5", + "reference": "26bcf5465b972042b6e5fe43c8115a567187d8e5", "shasum": "" }, "require": { @@ -3153,7 +3141,7 @@ "block", "content fragments" ], - "time": "2014-03-24 07:31:37" + "time": "2014-04-02 12:52:00" }, { "name": "symfony-cmf/content-bundle", @@ -3162,12 +3150,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/ContentBundle.git", - "reference": "294b2e1d4a133aa1916ca1eb5672e7718765e403" + "reference": "ae15dbbcb38c47bc28cfc618779dac13c23e9a1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/294b2e1d4a133aa1916ca1eb5672e7718765e403", - "reference": "294b2e1d4a133aa1916ca1eb5672e7718765e403", + "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/ae15dbbcb38c47bc28cfc618779dac13c23e9a1b", + "reference": "ae15dbbcb38c47bc28cfc618779dac13c23e9a1b", "shasum": "" }, "require": { @@ -3218,7 +3206,7 @@ "keywords": [ "Symfony CMF" ], - "time": "2014-03-09 21:31:43" + "time": "2014-03-27 07:56:59" }, { "name": "symfony-cmf/core-bundle", @@ -3227,12 +3215,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/CoreBundle.git", - "reference": "96ac5cb6c2b38bca0a6c04b87d2041c90ae4cbb8" + "reference": "53c3dc16f5d2d40a40f321046064e31f9548ea1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/96ac5cb6c2b38bca0a6c04b87d2041c90ae4cbb8", - "reference": "96ac5cb6c2b38bca0a6c04b87d2041c90ae4cbb8", + "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/53c3dc16f5d2d40a40f321046064e31f9548ea1d", + "reference": "53c3dc16f5d2d40a40f321046064e31f9548ea1d", "shasum": "" }, "require": { @@ -3279,7 +3267,7 @@ "keywords": [ "Symfony CMF" ], - "time": "2014-03-10 17:38:16" + "time": "2014-04-02 08:03:25" }, { "name": "symfony-cmf/create-bundle", @@ -3288,18 +3276,18 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/CreateBundle.git", - "reference": "13a545230d0c405a9884eec315fabc2bcbd201bb" + "reference": "61ae0fbc573766f799229bc972e48a24ff769df9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/CreateBundle/zipball/13a545230d0c405a9884eec315fabc2bcbd201bb", - "reference": "13a545230d0c405a9884eec315fabc2bcbd201bb", + "url": "https://api.github.com/repos/symfony-cmf/CreateBundle/zipball/61ae0fbc573766f799229bc972e48a24ff769df9", + "reference": "61ae0fbc573766f799229bc972e48a24ff769df9", "shasum": "" }, "require": { "friendsofsymfony/rest-bundle": "~1.0", "jms/serializer-bundle": ">=0.12,<0.14", - "midgard/createphp": "0.9.*", + "midgard/createphp": "1.0.*", "php": ">=5.3.3", "symfony/assetic-bundle": "~2.1", "symfony/framework-bundle": "~2.1" @@ -3336,7 +3324,7 @@ } ], "description": "Symfony Bundle for createphp and create.js. The easiest way to make any site editable and have semantic annotations with RDFa.", - "time": "2014-03-09 21:31:30" + "time": "2014-04-03 13:30:33" }, { "name": "symfony-cmf/media-bundle", @@ -3345,12 +3333,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/MediaBundle.git", - "reference": "fcd08bcede4f1222fa028c805f4407754c04841f" + "reference": "a954667518abbb36e6d47f5412ff76cc922d0179" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/fcd08bcede4f1222fa028c805f4407754c04841f", - "reference": "fcd08bcede4f1222fa028c805f4407754c04841f", + "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/a954667518abbb36e6d47f5412ff76cc922d0179", + "reference": "a954667518abbb36e6d47f5412ff76cc922d0179", "shasum": "" }, "require": { @@ -3399,7 +3387,7 @@ "image", "media" ], - "time": "2014-03-10 07:05:59" + "time": "2014-03-27 07:58:41" }, { "name": "symfony-cmf/menu-bundle", @@ -3408,12 +3396,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/MenuBundle.git", - "reference": "f2613020cce828cf711d1752b14d1405939f89be" + "reference": "dae5e530c066913b145f09e4255b2fd651488da6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/f2613020cce828cf711d1752b14d1405939f89be", - "reference": "f2613020cce828cf711d1752b14d1405939f89be", + "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/dae5e530c066913b145f09e4255b2fd651488da6", + "reference": "dae5e530c066913b145f09e4255b2fd651488da6", "shasum": "" }, "require": { @@ -3460,7 +3448,7 @@ "Symfony CMF", "menu" ], - "time": "2014-03-12 16:59:57" + "time": "2014-04-04 12:22:35" }, { "name": "symfony-cmf/routing", @@ -3469,12 +3457,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/Routing.git", - "reference": "988cdaf163da51c9aeb65fca733790678cce5e2f" + "reference": "6fb75b22097dcb1d0f4fa132ea24646ee004871f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/988cdaf163da51c9aeb65fca733790678cce5e2f", - "reference": "988cdaf163da51c9aeb65fca733790678cce5e2f", + "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/6fb75b22097dcb1d0f4fa132ea24646ee004871f", + "reference": "6fb75b22097dcb1d0f4fa132ea24646ee004871f", "shasum": "" }, "require": { @@ -3518,7 +3506,7 @@ "database", "routing" ], - "time": "2014-03-24 07:11:29" + "time": "2014-04-01 09:05:49" }, { "name": "symfony-cmf/routing-bundle", @@ -3527,12 +3515,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/RoutingBundle.git", - "reference": "cb9124e4bbfb3c8a6037057c28c9070640444eff" + "reference": "c85cad0ff1b9533c9fea07f1ff93d0eeffd76870" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/cb9124e4bbfb3c8a6037057c28c9070640444eff", - "reference": "cb9124e4bbfb3c8a6037057c28c9070640444eff", + "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/c85cad0ff1b9533c9fea07f1ff93d0eeffd76870", + "reference": "c85cad0ff1b9533c9fea07f1ff93d0eeffd76870", "shasum": "" }, "require": { @@ -3545,7 +3533,7 @@ "matthiasnoback/symfony-config-test": "0.*", "matthiasnoback/symfony-dependency-injection-test": "0.*", "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*", - "symfony-cmf/core-bundle": "~1.0", + "symfony-cmf/core-bundle": "~1.1", "symfony-cmf/testing": "1.1.*", "symfony/monolog-bundle": "2.2.*" }, @@ -3584,7 +3572,7 @@ "database", "routing" ], - "time": "2014-03-23 21:24:46" + "time": "2014-04-04 11:37:28" }, { "name": "symfony-cmf/search-bundle", @@ -3593,12 +3581,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/SearchBundle.git", - "reference": "c115f61cdbd13c82fa7388d93714a99161567b3b" + "reference": "86adb34df76cdabf8d5ae48ea42d8f39e941c109" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/SearchBundle/zipball/c115f61cdbd13c82fa7388d93714a99161567b3b", - "reference": "c115f61cdbd13c82fa7388d93714a99161567b3b", + "url": "https://api.github.com/repos/symfony-cmf/SearchBundle/zipball/86adb34df76cdabf8d5ae48ea42d8f39e941c109", + "reference": "86adb34df76cdabf8d5ae48ea42d8f39e941c109", "shasum": "" }, "require": { @@ -3638,7 +3626,7 @@ "database", "search" ], - "time": "2014-03-11 12:45:25" + "time": "2014-03-27 08:00:52" }, { "name": "symfony-cmf/simple-cms-bundle", @@ -3647,12 +3635,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/SimpleCmsBundle.git", - "reference": "d6d0b28a5a39e015a87556188fc164b6821de58e" + "reference": "d9ece63cd4fab71767793eb8f5773f20fcd640aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/d6d0b28a5a39e015a87556188fc164b6821de58e", - "reference": "d6d0b28a5a39e015a87556188fc164b6821de58e", + "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/d9ece63cd4fab71767793eb8f5773f20fcd640aa", + "reference": "d9ece63cd4fab71767793eb8f5773f20fcd640aa", "shasum": "" }, "require": { @@ -3660,12 +3648,14 @@ "doctrine/phpcr-odm": ">=1.1.0,<1.2-dev", "php": ">=5.3.3", "symfony-cmf/content-bundle": ">=1.0.0,<1.2-dev", - "symfony-cmf/core-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": { + "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" @@ -3701,7 +3691,7 @@ "Symfony CMF", "cms" ], - "time": "2014-03-09 21:29:42" + "time": "2014-04-03 10:03:25" }, { "name": "symfony-cmf/symfony-cmf", @@ -3709,12 +3699,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/symfony-cmf.git", - "reference": "c375321e8387d53efaab60724aed1bd5a931b39c" + "reference": "fb211068352ec83ae027f1b09c0941896787fef3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/symfony-cmf/zipball/c375321e8387d53efaab60724aed1bd5a931b39c", - "reference": "c375321e8387d53efaab60724aed1bd5a931b39c", + "url": "https://api.github.com/repos/symfony-cmf/symfony-cmf/zipball/fb211068352ec83ae027f1b09c0941896787fef3", + "reference": "fb211068352ec83ae027f1b09c0941896787fef3", "shasum": "" }, "require": { @@ -3732,8 +3722,8 @@ "suggest": { "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*", "symfony-cmf/create-bundle": "1.1.*", - "symfony-cmf/routing-auto-bundle": "~1.0.0-alpha6", "symfony-cmf/search-bundle": "1.0.*", + "symfony-cmf/seo-bundle": "1.0.*", "symfony-cmf/simple-cms-bundle": "1.1.*", "symfony-cmf/tree-browser-bundle": "1.1.*" }, @@ -3760,7 +3750,7 @@ ], "description": "Symfony Content Management Framework", "homepage": "http://cmf.symfony.com", - "time": "2014-03-02 12:44:40" + "time": "2014-03-31 06:24:28" }, { "name": "symfony-cmf/tree-browser-bundle", @@ -3769,12 +3759,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/TreeBrowserBundle.git", - "reference": "8bf832a45e4dd30a723687e1f0a64535df683e16" + "reference": "e58b1621044c8177c7e7e9c334aa676e885c9137" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/TreeBrowserBundle/zipball/8bf832a45e4dd30a723687e1f0a64535df683e16", - "reference": "8bf832a45e4dd30a723687e1f0a64535df683e16", + "url": "https://api.github.com/repos/symfony-cmf/TreeBrowserBundle/zipball/e58b1621044c8177c7e7e9c334aa676e885c9137", + "reference": "e58b1621044c8177c7e7e9c334aa676e885c9137", "shasum": "" }, "require": { @@ -3817,7 +3807,7 @@ "phpcr", "tree" ], - "time": "2014-03-09 21:32:25" + "time": "2014-03-27 08:01:07" }, { "name": "symfony/assetic-bundle", @@ -3992,22 +3982,22 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.5", + "version": "dev-master", "target-dir": "Symfony/Bundle/SwiftmailerBundle", "source": { "type": "git", "url": "https://github.com/symfony/SwiftmailerBundle.git", - "reference": "fcefa9dbd5a1ed20547b0f8a2afd5ad6837ea321" + "reference": "d272424f01656f9327198fd6c07a48499622d133" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/fcefa9dbd5a1ed20547b0f8a2afd5ad6837ea321", - "reference": "fcefa9dbd5a1ed20547b0f8a2afd5ad6837ea321", + "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/d272424f01656f9327198fd6c07a48499622d133", + "reference": "d272424f01656f9327198fd6c07a48499622d133", "shasum": "" }, "require": { "php": ">=5.3.2", - "swiftmailer/swiftmailer": ">=4.2.0,<5.1-dev", + "swiftmailer/swiftmailer": ">=4.2.0,~5.0", "symfony/swiftmailer-bridge": "~2.1" }, "require-dev": { @@ -4019,7 +4009,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -4045,7 +4035,7 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2013-11-21 12:29:01" + "time": "2014-04-03 07:36:17" }, { "name": "symfony/symfony", @@ -4053,12 +4043,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "bbaa839a82dac011750f0c3314d65fb9225b40e7" + "reference": "a18ee423f92cd2a5245cdcd3a145dbd6e9402613" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/bbaa839a82dac011750f0c3314d65fb9225b40e7", - "reference": "bbaa839a82dac011750f0c3314d65fb9225b40e7", + "url": "https://api.github.com/repos/symfony/symfony/zipball/a18ee423f92cd2a5245cdcd3a145dbd6e9402613", + "reference": "a18ee423f92cd2a5245cdcd3a145dbd6e9402613", "shasum": "" }, "require": { @@ -4155,7 +4145,7 @@ "keywords": [ "framework" ], - "time": "2014-03-21 11:48:43" + "time": "2014-04-03 08:18:27" }, { "name": "twig/extensions", @@ -4212,12 +4202,12 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "dab8d90755a7c1a54cd20be5098f5b5bf3346d9b" + "reference": "c8366374d9d531029a6b031528b552c37e1b2e66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/dab8d90755a7c1a54cd20be5098f5b5bf3346d9b", - "reference": "dab8d90755a7c1a54cd20be5098f5b5bf3346d9b", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/c8366374d9d531029a6b031528b552c37e1b2e66", + "reference": "c8366374d9d531029a6b031528b552c37e1b2e66", "shasum": "" }, "require": { @@ -4261,7 +4251,7 @@ "keywords": [ "templating" ], - "time": "2014-03-15 10:50:05" + "time": "2014-03-30 17:23:57" }, { "name": "willdurand/jsonp-callback-validator", @@ -4295,7 +4285,7 @@ ], "authors": [ { - "name": "William Durand", + "name": "William DURAND", "email": "william.durand1@gmail.com", "homepage": "http://www.willdurand.fr" } @@ -4355,7 +4345,7 @@ }, { "name": "wjzijderveld/check-bundles", - "version": "1.x-dev", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/wjzijderveld/CheckBundles.git", @@ -4796,12 +4786,12 @@ "source": { "type": "git", "url": "https://github.com/liip/LiipFunctionalTestBundle.git", - "reference": "21e1f5f8ca25364fa076ca6118b3645173be0036" + "reference": "e7480e6716913c553f34b22e4e8c33480a2b022e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/21e1f5f8ca25364fa076ca6118b3645173be0036", - "reference": "21e1f5f8ca25364fa076ca6118b3645173be0036", + "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/e7480e6716913c553f34b22e4e8c33480a2b022e", + "reference": "e7480e6716913c553f34b22e4e8c33480a2b022e", "shasum": "" }, "require": { @@ -4844,7 +4834,7 @@ "keywords": [ "Symfony2" ], - "time": "2014-03-23 23:13:37" + "time": "2014-04-02 22:28:13" }, { "name": "symfony-cmf/testing", @@ -4852,12 +4842,12 @@ "source": { "type": "git", "url": "https://github.com/symfony-cmf/Testing.git", - "reference": "5ea9e504a64f26c35903c408bd4244655fe546ea" + "reference": "3b89e9f57774ddf98ad1d4d62166d6be5ddaa357" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/Testing/zipball/5ea9e504a64f26c35903c408bd4244655fe546ea", - "reference": "5ea9e504a64f26c35903c408bd4244655fe546ea", + "url": "https://api.github.com/repos/symfony-cmf/Testing/zipball/3b89e9f57774ddf98ad1d4d62166d6be5ddaa357", + "reference": "3b89e9f57774ddf98ad1d4d62166d6be5ddaa357", "shasum": "" }, "require": { @@ -4894,7 +4884,7 @@ } ], "description": "Component for bootstraping functional tests for CMF bundles only.", - "time": "2014-03-10 11:23:36" + "time": "2014-04-02 20:46:35" } ], "aliases": [ diff --git a/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php b/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php index bf0b4fec..d771ed45 100644 --- a/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php +++ b/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php @@ -34,7 +34,7 @@ public function load(ObjectManager $dm) { $session = $dm->getPhpcrSession(); - $basepath = $this->container->getParameter('cmf_routing.dynamic.persistence.phpcr.route_basepath'); + $basepath = $this->container->getParameter('cmf_routing.dynamic.persistence.phpcr.admin_basepath'); if ($session->itemExists($basepath)) { $session->removeItem($basepath); } diff --git a/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php b/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php index 87c7aa6f..0d964bb1 100644 --- a/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php +++ b/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php @@ -5,6 +5,7 @@ use Doctrine\Common\DataFixtures\FixtureInterface; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Common\Persistence\ObjectManager; +use Doctrine\ODM\PHPCR\DocumentManager; use PHPCR\Util\NodeHelper; @@ -23,6 +24,7 @@ public function load(ObjectManager $manager) { $basepath = $this->container->getParameter('cmf_simple_cms.persistence.phpcr.basepath'); $root = $manager->find(null, $basepath); + $root->setTitle('simple cms root (hidden by the home route in the sandbox)'); $this->createPage($manager, $root, 'about', 'About us', 'Some information about us', 'The about us page with some content'); $this->createPage($manager, $root, 'contact', 'Contact', 'A contact page', 'Please send an email to cmf-devs@groups.google.com'); @@ -33,7 +35,7 @@ public function load(ObjectManager $manager) /** * @return Page instance with the specified information */ - protected function createPage($manager, $parent, $name, $label, $title, $body) + protected function createPage(DocumentManager $manager, $parent, $name, $label, $title, $body) { $page = new Page(); $page->setPosition($parent, $name);