diff --git a/composer.json b/composer.json index c815992d..8ef10cb2 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "symfony-cmf/simple-cms-bundle": "1.3.*", "symfony-cmf/search-bundle": "1.2.*", "symfony-cmf/seo-bundle": "1.2.*", - "symfony-cmf/routing-auto-bundle": "1.0.*", + "symfony-cmf/routing-auto-bundle": "1.1.*", "jackalope/jackalope-doctrine-dbal": "1.2.*", "jackalope/jackalope-jackrabbit": "1.2.*", @@ -55,7 +55,7 @@ "liip/functional-test-bundle": "~1.0,<1.3.0", "symfony-cmf/testing": "1.2.*" }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "scripts": { "post-install-cmd": [ @@ -79,6 +79,7 @@ "extra": { "symfony-app-dir": "app", "symfony-web-dir": "web", + "symfony-assets-install": "relative", "incenteev-parameters": [ { "file": "app/config/parameters.yml", diff --git a/composer.lock b/composer.lock index 3af3ca68..bb660255 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "7bc4c1bb85797a4db8c7092e083e2848", - "content-hash": "68f5c9efe3fea292e4b63a3e07da6ecb", + "hash": "6072ef1194790679d6a23b56038a6ef8", + "content-hash": "de48ccc82d481b987af73b428c3bc328", "packages": [ { "name": "aferrandini/urlizer", @@ -587,16 +587,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b" + "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b", - "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/e9c2ccf573b59b7cea566390f34254fed3c20ed9", + "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9", "shasum": "" }, "require": { @@ -612,6 +612,7 @@ "doctrine/orm": "~2.3", "phpunit/phpunit": "~4", "satooshi/php-coveralls": "~0.6.1", + "symfony/phpunit-bridge": "~2.7|~3.0", "symfony/validator": "~2.2|~3.0", "symfony/yaml": "~2.2|~3.0", "twig/twig": "~1.10" @@ -661,7 +662,7 @@ "orm", "persistence" ], - "time": "2015-11-16 17:11:46" + "time": "2016-01-10 17:21:44" }, { "name": "doctrine/doctrine-cache-bundle", @@ -2587,16 +2588,16 @@ }, { "name": "paragonie/random_compat", - "version": "1.1.6", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "e6f80ab77885151908d0ec743689ca700886e8b0" + "reference": "b0e69d10852716b2ccbdff69c75c477637220790" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/e6f80ab77885151908d0ec743689ca700886e8b0", - "reference": "e6f80ab77885151908d0ec743689ca700886e8b0", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/b0e69d10852716b2ccbdff69c75c477637220790", + "reference": "b0e69d10852716b2ccbdff69c75c477637220790", "shasum": "" }, "require": { @@ -2631,7 +2632,7 @@ "pseudorandom", "random" ], - "time": "2016-01-29 16:19:52" + "time": "2016-02-06 03:52:05" }, { "name": "phpcollection/phpcollection", @@ -3808,35 +3809,36 @@ }, { "name": "symfony-cmf/block-bundle", - "version": "1.2.2", + "version": "1.3.0-RC2", "source": { "type": "git", "url": "https://github.com/symfony-cmf/BlockBundle.git", - "reference": "f0e6a935a4fb3e6ce71b2acf987d732854946388" + "reference": "49c7b2e38bc21ca8da71d9ebd442911738c8ad0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/f0e6a935a4fb3e6ce71b2acf987d732854946388", - "reference": "f0e6a935a4fb3e6ce71b2acf987d732854946388", + "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/49c7b2e38bc21ca8da71d9ebd442911738c8ad0f", + "reference": "49c7b2e38bc21ca8da71d9ebd442911738c8ad0f", "shasum": "" }, "require": { - "doctrine/phpcr-bundle": "~1.0", - "doctrine/phpcr-odm": "~1.0", - "php": ">=5.3.3", - "sonata-project/block-bundle": ">=2.2.8,<=2.2.13", - "symfony-cmf/core-bundle": "~1.0", - "symfony/framework-bundle": "~2.3" + "doctrine/phpcr-bundle": "^1.0", + "doctrine/phpcr-odm": "^1.0", + "php": "^5.3.9|^7.0", + "sonata-project/block-bundle": ">=2.2.12,<2.5", + "symfony-cmf/core-bundle": "^1.1", + "symfony/framework-bundle": "^2.3" }, "conflict": { "symfony/framework-bundle": ">=2.3.0,<2.3.2" }, "require-dev": { "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" + "sonata-project/doctrine-phpcr-admin-bundle": "^1.1", + "symfony-cmf/menu-bundle": "^1.1|^2.0", + "symfony-cmf/testing": "^1.3@RC", + "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1", + "twig/twig": "^1.14.2|^2.0" }, "suggest": { "eko/feedbundle": "When using the RssBlock", @@ -3847,7 +3849,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -3872,7 +3874,7 @@ "block", "content fragments" ], - "time": "2015-01-22 06:47:29" + "time": "2016-02-11 09:45:18" }, { "name": "symfony-cmf/content-bundle", @@ -4003,16 +4005,16 @@ }, { "name": "symfony-cmf/media-bundle", - "version": "dev-master", + "version": "1.3.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/MediaBundle.git", - "reference": "7593e35baa26661a3230a7e13dbfb783f3df055c" + "reference": "197ac4c7e16ab23a008a437ee44ce27c44461610" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/7593e35baa26661a3230a7e13dbfb783f3df055c", - "reference": "7593e35baa26661a3230a7e13dbfb783f3df055c", + "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/197ac4c7e16ab23a008a437ee44ce27c44461610", + "reference": "197ac4c7e16ab23a008a437ee44ce27c44461610", "shasum": "" }, "require": { @@ -4020,13 +4022,13 @@ "symfony/framework-bundle": "~2.3" }, "require-dev": { - "doctrine/annotations": ">=1.1.2", - "doctrine/phpcr-odm": "~1.3", - "jms/serializer-bundle": "~0.12", + "doctrine/annotations": "^1.1.2", + "doctrine/phpcr-odm": "^1.3", + "jms/serializer-bundle": "^0.12|^1.0", "liip/imagine-bundle": "~1.0.4", - "mikey179/vfsstream": "~1.2", - "symfony-cmf/testing": "~1.2,>=1.2.7", - "twig/twig": "~1.12,>=1.12.0" + "mikey179/vfsstream": "^1.2", + "symfony-cmf/testing": "^1.3@RC", + "twig/twig": "^1.12|^2.0" }, "suggest": { "helios-ag/fm-elfinder-bundle": "When using the elFinder media browser", @@ -4034,7 +4036,7 @@ "knplabs/gaufrette": "When using the Gaufrette adapter", "liip/imagine-bundle": "To integrate with the Imagine library for processing images", "phpcr/phpcr-utils": "When using the Gaufrette adapter", - "symfony-cmf/core-bundle": "Simplifies configuration with other CMF bundles, use PHP >=5.3.9 with PHPCR" + "symfony-cmf/core-bundle": "Simplifies configuration with other CMF bundles" }, "type": "symfony-bundle", "extra": { @@ -4064,7 +4066,7 @@ "image", "media" ], - "time": "2016-02-03 12:37:12" + "time": "2016-02-08 13:34:07" }, { "name": "symfony-cmf/menu-bundle", @@ -4192,37 +4194,40 @@ }, { "name": "symfony-cmf/routing-auto", - "version": "1.0.1", + "version": "1.1.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/RoutingAuto.git", - "reference": "faa61f31a43f0ac4f59545454598e1cf53a5d66f" + "reference": "a947ac5db6b8914a5be17b9d050712f1ff6cdcdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/RoutingAuto/zipball/faa61f31a43f0ac4f59545454598e1cf53a5d66f", - "reference": "faa61f31a43f0ac4f59545454598e1cf53a5d66f", + "url": "https://api.github.com/repos/symfony-cmf/RoutingAuto/zipball/a947ac5db6b8914a5be17b9d050712f1ff6cdcdc", + "reference": "a947ac5db6b8914a5be17b9d050712f1ff6cdcdc", "shasum": "" }, "require": { "jms/metadata": "1.5.*", - "symfony-cmf/core-bundle": "~1.1", - "symfony-cmf/routing": "~1.2", - "symfony/config": "~2.2", - "symfony/options-resolver": "~2.2" + "php": "^5.3.9|^7.0", + "symfony-cmf/routing": "^1.2", + "symfony-cmf/slugifier-api": "^1.0@rc", + "symfony/config": "^2.2|3.*", + "symfony/options-resolver": "^2.2" }, "require-dev": { - "phpspec/prophecy": "~1.1.2", - "symfony/yaml": "~2.1" + "symfony/dependency-injection": "^2.0.5|3.*", + "symfony/event-dispatcher": "^2.2|3.*", + "symfony/yaml": "^2.1|3.*" }, "suggest": { "symfony-cmf/routing-auto-bundle": "To integrate this lirbary with Symfony and the CMF", - "symfony/yaml": "To be able to load Yaml configuration files" + "symfony/event-dispatcher": "To use the EventDispatchingAdapter, allowing to edit the AutoRoute documents (^2.2|3.*)", + "symfony/yaml": "To be able to load Yaml configuration files (^2.1|3.*)" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -4242,41 +4247,45 @@ ], "description": "Component for automatically creating and managing routes for persisted objects", "homepage": "http://cmf.symfony.com", - "time": "2015-07-28 11:12:39" + "time": "2016-02-10 17:04:33" }, { "name": "symfony-cmf/routing-auto-bundle", - "version": "1.0.2", + "version": "1.1.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/RoutingAutoBundle.git", - "reference": "840d8eb8bd751a10c8b7355657d26dc63dfa4313" + "reference": "5669d6feabcf3ebd51e96e58131254cc7fd2508f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/RoutingAutoBundle/zipball/840d8eb8bd751a10c8b7355657d26dc63dfa4313", - "reference": "840d8eb8bd751a10c8b7355657d26dc63dfa4313", + "url": "https://api.github.com/repos/symfony-cmf/RoutingAutoBundle/zipball/5669d6feabcf3ebd51e96e58131254cc7fd2508f", + "reference": "5669d6feabcf3ebd51e96e58131254cc7fd2508f", "shasum": "" }, "require": { "aferrandini/urlizer": "1.0.*", "jms/metadata": "1.5.*", - "symfony-cmf/core-bundle": "~1.2", - "symfony-cmf/routing-auto": "1.0.*", - "symfony-cmf/routing-bundle": "~1.2", - "symfony/config": "~2.2" + "php": "^5.3.9|^7.0", + "symfony-cmf/core-bundle": "^1.2", + "symfony-cmf/routing-auto": "^1.1@RC", + "symfony-cmf/routing-bundle": "^1.2.0", + "symfony/config": "^2.2" }, "require-dev": { - "doctrine/phpcr-odm": "~1.2", + "doctrine/phpcr-odm": "^1.3", "matthiasnoback/symfony-config-test": "0.*", - "matthiasnoback/symfony-dependency-injection-test": "0.*", - "symfony-cmf/testing": "~1.1", - "symfony/yaml": "~2.1" + "matthiasnoback/symfony-dependency-injection-test": "~0.6", + "phpunit/phpunit": "^4.5", + "symfony-cmf/slugifier-api": "@RC", + "symfony-cmf/testing": "^1.3@RC", + "symfony/phpunit-bridge": "^2.7", + "symfony/yaml": "^2.1" }, "suggest": { "doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents", "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents", - "symfony/yaml": "To be able to load Yaml configuration files" + "symfony/yaml": "To be able to load Yaml configuration files (^2.1)" }, "type": "library", "extra": { @@ -4301,7 +4310,7 @@ ], "description": "Bundle which automatically creates and manages routes for persisted objects", "homepage": "http://cmf.symfony.com", - "time": "2015-11-10 07:03:11" + "time": "2016-02-10 18:39:10" }, { "name": "symfony-cmf/routing-bundle", @@ -4495,16 +4504,16 @@ }, { "name": "symfony-cmf/simple-cms-bundle", - "version": "dev-master", + "version": "1.3.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/SimpleCmsBundle.git", - "reference": "94abfb5bd5157954c0685a6f739d6e1672e658ba" + "reference": "1b51ee16def201f576ccd7c0532d8bf1421690ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/94abfb5bd5157954c0685a6f739d6e1672e658ba", - "reference": "94abfb5bd5157954c0685a6f739d6e1672e658ba", + "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/1b51ee16def201f576ccd7c0532d8bf1421690ed", + "reference": "1b51ee16def201f576ccd7c0532d8bf1421690ed", "shasum": "" }, "require": { @@ -4562,7 +4571,7 @@ "Symfony CMF", "cms" ], - "time": "2016-01-05 07:41:39" + "time": "2016-02-07 15:03:06" }, { "name": "symfony-cmf/slugifier-api", @@ -4612,27 +4621,27 @@ }, { "name": "symfony-cmf/symfony-cmf", - "version": "dev-master", + "version": "1.3.0-RC1", "source": { "type": "git", "url": "https://github.com/symfony-cmf/symfony-cmf.git", - "reference": "1801ba5e76fff3696c30ea87f845a5240328e195" + "reference": "6cb3ad668b0af02914cd12dec99e2b621d1eb7a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/symfony-cmf/zipball/1801ba5e76fff3696c30ea87f845a5240328e195", - "reference": "1801ba5e76fff3696c30ea87f845a5240328e195", + "url": "https://api.github.com/repos/symfony-cmf/symfony-cmf/zipball/6cb3ad668b0af02914cd12dec99e2b621d1eb7a3", + "reference": "6cb3ad668b0af02914cd12dec99e2b621d1eb7a3", "shasum": "" }, "require": { - "doctrine/phpcr-bundle": "1.3.*", - "doctrine/phpcr-odm": "1.3.*", + "doctrine/phpcr-bundle": "~1.3", + "doctrine/phpcr-odm": "~1.3", "php": "^5.3.9|^7.0", - "symfony-cmf/block-bundle": "1.2.*", + "symfony-cmf/block-bundle": "1.3.*", "symfony-cmf/content-bundle": "1.3.*", "symfony-cmf/core-bundle": "1.3.*", "symfony-cmf/media-bundle": "1.3.*", - "symfony-cmf/menu-bundle": "2.*", + "symfony-cmf/menu-bundle": "2.0.*", "symfony-cmf/routing-bundle": "1.4.*", "symfony/framework-bundle": "~2.3" }, @@ -4643,11 +4652,11 @@ "jackalope/jackalope-doctrine-dbal": "1.* as PHPCR implementation required by PHPCR-ODM", "jackalope/jackalope-jackrabbit": "1.* as PHPCR implementation required by PHPCR-ODM", "sonata-project/doctrine-phpcr-admin-bundle": "1.1.* for backend admin", - "symfony-cmf/create-bundle": "1.2.* for frontend editing", - "symfony-cmf/routing-auto-bundle": "1.0.* to automatically generate routes on certain events", - "symfony-cmf/search-bundle": "1.1.* for searching", - "symfony-cmf/seo-bundle": "1.1.* for search engine optimization", - "symfony-cmf/simple-cms-bundle": "1.2.* for simplified handling of route, content and menu", + "symfony-cmf/create-bundle": "1.3.* for frontend editing", + "symfony-cmf/routing-auto-bundle": "1.1.* to automatically generate routes on certain events", + "symfony-cmf/search-bundle": "1.2.* for searching", + "symfony-cmf/seo-bundle": "1.2.* for search engine optimization", + "symfony-cmf/simple-cms-bundle": "1.3.* for simplified handling of route, content and menu", "symfony-cmf/tree-browser-bundle": "1.1.* to support tree navigation in admins" }, "type": "library", @@ -4668,7 +4677,7 @@ ], "description": "Symfony Content Management Framework", "homepage": "http://cmf.symfony.com", - "time": "2015-12-09 15:28:45" + "time": "2016-02-10 16:52:21" }, { "name": "symfony-cmf/tree-browser-bundle", @@ -6290,7 +6299,7 @@ } ], "aliases": [], - "minimum-stability": "dev", + "minimum-stability": "RC", "stability-flags": [], "prefer-stable": true, "prefer-lowest": false,