diff --git a/.gitignore b/.gitignore index 99738ecb..9d736b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /jackrabbit/ /jackrabbit-standalone-*.jar /vagrant/.vagrant +/app/app.sqlite diff --git a/app/AppKernel.php b/app/AppKernel.php index 09463e5d..e3d759fd 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -41,6 +41,7 @@ public function registerBundles() new Symfony\Cmf\Bundle\ResourceBundle\CmfResourceBundle(), new Symfony\Cmf\Bundle\ResourceRestBundle\CmfResourceRestBundle(), new Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\CmfSonataPhpcrAdminIntegrationBundle(), + new \Symfony\Cmf\Bundle\GrapesjsBundle\CmfGrapesjsBundle(), // language switcher new Lunetics\LocaleBundle\LuneticsLocaleBundle(), diff --git a/app/app.sqlite b/app/app.sqlite new file mode 100644 index 00000000..c11fc1ac Binary files /dev/null and b/app/app.sqlite differ diff --git a/app/config/config.yml b/app/config/config.yml index c38d3d36..9722e82b 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -25,6 +25,7 @@ twig: exception_controller: 'FOS\RestBundle\Controller\ExceptionController::showAction' form_themes: - '@CmfTreeBrowser/Form/fields.html.twig' + - '@CmfGrapesjs/Form/fields.html.twig' # Assetic Configuration assetic: diff --git a/composer.json b/composer.json index 2d3f7a00..6d62a8d0 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ "psr-4": { "Tests\\": "tests/" } }, "require": { - "php": "^7.1", - "symfony/symfony": "^3.3", + "php": "^5.6|^7.0", + "symfony/symfony": "^3.4", "symfony/assetic-bundle": "^2.8", "symfony/swiftmailer-bundle": "^2.3.10", "symfony/monolog-bundle": "^3.0.2", @@ -31,7 +31,7 @@ "symfony-cmf/seo-bundle": "^2.0", "symfony-cmf/routing": "^2.0", "symfony-cmf/routing-auto-bundle": "^2.0", - "symfony-cmf/sonata-phpcr-admin-integration-bundle": "^1.0", + "symfony-cmf/sonata-phpcr-admin-integration-bundle": "dev-trygrapes", "jackalope/jackalope-doctrine-dbal": "1.2.*", "jackalope/jackalope-jackrabbit": "1.2.*", @@ -42,14 +42,20 @@ "sonata-project/cache-bundle": "^2.4", "sonata-project/translation-bundle": "2.1.0", - "sonata-project/doctrine-phpcr-admin-bundle": "^2.0", "jms/serializer-bundle": "^1.1", "friendsofsymfony/rest-bundle": "~1.7", "eko/feedbundle": "^1.2.7", "lunetics/locale-bundle": "^2.5", "burgov/key-value-form-bundle": "^1.4", - "egeloen/ckeditor-bundle": "^4.0" + "egeloen/ckeditor-bundle": "^4.0", + "sonata-project/core-bundle": "^3.6", + "sonata-project/admin-bundle": "^3.30", + "sonata-project/block-bundle": "^3.9", + "sonata-project/doctrine-phpcr-admin-bundle": "^2.1", + "symfony/polyfill-php70": "^1.6", + "twig/twig": "^1.35", + "symfony-cmf/grapesjs-bundle": "^1.0@dev" }, "require-dev": { "sensio/generator-bundle": "^3.0", @@ -92,6 +98,8 @@ } }, "conflict": { - "sonata-project/cache": "<1.1.1" - } + "sonata-project/cache": "<1.1.1" + }, + "minimum-stability": "dev", + "prefer-stable": true } diff --git a/composer.lock b/composer.lock index 3b908884..57f35f9d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "70e90db5a39274b9018b31d3c288327d", + "content-hash": "a40e553873d1b8d272d5a101aace5c42", "packages": [ { "name": "aferrandini/urlizer", @@ -3207,16 +3207,16 @@ }, { "name": "sonata-project/admin-bundle", - "version": "3.27.0", + "version": "3.31.0", "source": { "type": "git", "url": "https://github.com/sonata-project/SonataAdminBundle.git", - "reference": "875374f2f14ddb3c2437b2050ff331913d7a8bed" + "reference": "499d7d20bdca9a1571ad323fec7b330ad5140aee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/875374f2f14ddb3c2437b2050ff331913d7a8bed", - "reference": "875374f2f14ddb3c2437b2050ff331913d7a8bed", + "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/499d7d20bdca9a1571ad323fec7b330ad5140aee", + "reference": "499d7d20bdca9a1571ad323fec7b330ad5140aee", "shasum": "" }, "require": { @@ -3226,24 +3226,26 @@ "php": "^5.6 || ^7.0", "sonata-project/block-bundle": "^3.2", "sonata-project/core-bundle": "^3.6", - "sonata-project/exporter": "^1.7", - "symfony/class-loader": "^2.8 || ^3.2", - "symfony/config": "^2.8 || ^3.2", - "symfony/console": "^2.8 || ^3.2", - "symfony/dependency-injection": "^2.8 || ^3.2", - "symfony/expression-language": "^2.8 || ^3.2", - "symfony/form": "^2.8 || ^3.2", - "symfony/http-foundation": "^2.8 || ^3.2", - "symfony/property-access": "^2.8 || ^3.2", - "symfony/routing": "^2.8 || ^3.2", + "sonata-project/exporter": "^1.7.1", + "symfony/asset": "^2.8 || ^3.2 || ^4.0", + "symfony/class-loader": "^2.8 || ^3.2 || ^4.0", + "symfony/config": "^2.8 || ^3.2 || ^4.0", + "symfony/console": "^2.8 || ^3.2 || ^4.0", + "symfony/dependency-injection": "^2.8 || ^3.2 || ^4.0", + "symfony/expression-language": "^2.8 || ^3.2 || ^4.0", + "symfony/form": "^2.8 || ^3.2 || ^4.0", + "symfony/http-foundation": "^2.8 || ^3.2 || ^4.0", + "symfony/property-access": "^2.8 || ^3.2 || ^4.0", + "symfony/routing": "^2.8 || ^3.2 || ^4.0", "symfony/security-acl": "^2.8 || ^3.0", - "symfony/security-bundle": "^2.8 || ^3.2", - "symfony/templating": "^2.8 || ^3.2", - "symfony/translation": "^2.8 || ^3.2", - "symfony/twig-bridge": "^2.8 || ^3.2", - "symfony/validator": "^2.8 || ^3.2", + "symfony/security-bundle": "^2.8 || ^3.2 || ^4.0", + "symfony/templating": "^2.8 || ^3.2 || ^4.0", + "symfony/translation": "^2.8 || ^3.2 || ^4.0", + "symfony/twig-bridge": "^2.8 || ^3.2 || ^4.0", + "symfony/twig-bundle": "^2.8 || ^3.2 || ^4.0", + "symfony/validator": "^2.8 || ^3.2 || ^4.0", "twig/extensions": "^1.0", - "twig/twig": "^1.28 || ^2.0" + "twig/twig": "^1.34 || ^2.0" }, "conflict": { "jms/di-extra-bundle": "<1.7.0", @@ -3256,10 +3258,9 @@ "jms/translation-bundle": "^1.2", "matthiasnoback/symfony-dependency-injection-test": "^1.1", "sensio/generator-bundle": "^3.1", - "sllh/php-cs-fixer-styleci-bridge": "^2.0", "sonata-project/intl-bundle": "^2.2.4", - "symfony/phpunit-bridge": "^3.3", - "symfony/yaml": "^2.8 || ^3.2" + "symfony/phpunit-bridge": "^3.4 || ^4.0", + "symfony/yaml": "^2.8 || ^3.2 || ^4.0" }, "suggest": { "jms/di-extra-bundle": "Annotations for Admin definition", @@ -3301,20 +3302,20 @@ "bootstrap", "sonata" ], - "time": "2017-11-26T17:25:18+00:00" + "time": "2018-01-23T09:49:45+00:00" }, { "name": "sonata-project/block-bundle", - "version": "3.6.0", + "version": "3.11.0", "source": { "type": "git", "url": "https://github.com/sonata-project/SonataBlockBundle.git", - "reference": "a18a2be9ac1d10f1106f7fa98862d10cf132054c" + "reference": "c58b58fb3c784200eaf9e08be6a22fabf4f17f80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/a18a2be9ac1d10f1106f7fa98862d10cf132054c", - "reference": "a18a2be9ac1d10f1106f7fa98862d10cf132054c", + "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/c58b58fb3c784200eaf9e08be6a22fabf4f17f80", + "reference": "c58b58fb3c784200eaf9e08be6a22fabf4f17f80", "shasum": "" }, "require": { @@ -3322,8 +3323,12 @@ "php": "^5.6 || ^7.0", "sonata-project/cache": "^1.0 || ^2.0", "sonata-project/core-bundle": "^3.4", - "symfony/form": "^2.8 || ^3.2", - "symfony/http-kernel": "^2.8 || ^3.2" + "symfony/asset": "^2.8 || ^3.2 || ^4.0", + "symfony/form": "^2.8 || ^3.2 || ^4.0", + "symfony/http-kernel": "^2.8 || ^3.2 || ^4.0", + "symfony/templating": "^2.8 || ^3.2 || ^4.0", + "symfony/twig-bundle": "^2.8 || ^3.2 || ^4.0", + "twig/twig": "^1.34 || ^2.0" }, "conflict": { "jms/di-extra-bundle": "<1.7.0" @@ -3331,9 +3336,8 @@ "require-dev": { "jms/di-extra-bundle": "^1.7", "knplabs/knp-menu-bundle": "^2.0", - "sllh/php-cs-fixer-styleci-bridge": "^2.0", "sonata-project/admin-bundle": "^3.22", - "symfony/phpunit-bridge": "^3.3" + "symfony/phpunit-bridge": "^3.3 || ^4.0" }, "suggest": { "jms/di-extra-bundle": "Annotations for Block definition", @@ -3375,7 +3379,7 @@ "block", "sonata" ], - "time": "2017-11-27T16:12:36+00:00" + "time": "2018-01-23T15:18:58+00:00" }, { "name": "sonata-project/cache", @@ -3521,31 +3525,31 @@ }, { "name": "sonata-project/core-bundle", - "version": "3.7.0", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/sonata-project/SonataCoreBundle.git", - "reference": "d02ede43caeb1edee17b64c4cb8560aef8ed2d4d" + "reference": "d6be7dd79a69dfeb63d75b4b0e4871d9cf4133a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/SonataCoreBundle/zipball/d02ede43caeb1edee17b64c4cb8560aef8ed2d4d", - "reference": "d02ede43caeb1edee17b64c4cb8560aef8ed2d4d", + "url": "https://api.github.com/repos/sonata-project/SonataCoreBundle/zipball/d6be7dd79a69dfeb63d75b4b0e4871d9cf4133a0", + "reference": "d6be7dd79a69dfeb63d75b4b0e4871d9cf4133a0", "shasum": "" }, "require": { "cocur/slugify": "^1.4 || ^2.0 || ^3.0", "php": "^5.6 || ^7.0", "sonata-project/datagrid-bundle": "^2.0", - "symfony/config": "^2.8 || ^3.2", - "symfony/form": "^2.8 || ^3.2", - "symfony/framework-bundle": "^2.8 || ^3.2", - "symfony/http-foundation": "^2.8 || ^3.2", - "symfony/property-access": "^2.8 || ^3.2", - "symfony/security": "^2.8 || ^3.2", - "symfony/translation": "^2.8 || ^3.2", - "symfony/twig-bridge": "^2.8 || ^3.2", - "symfony/validator": "^2.8 || ^3.2", + "symfony/config": "^2.8 || ^3.2 || ^4.0", + "symfony/form": "^2.8 || ^3.2 || ^4.0", + "symfony/framework-bundle": "^2.8 || ^3.2 || ^4.0", + "symfony/http-foundation": "^2.8 || ^3.2 || ^4.0", + "symfony/property-access": "^2.8 || ^3.2 || ^4.0", + "symfony/security": "^2.8 || ^3.2 || ^4.0", + "symfony/translation": "^2.8 || ^3.2 || ^4.0", + "symfony/twig-bridge": "^2.8 || ^3.2 || ^4.0", + "symfony/validator": "^2.8 || ^3.2 || ^4.0", "twig/extensions": "^1.5", "twig/twig": "^1.34 || ^2.0" }, @@ -3559,9 +3563,8 @@ "matthiasnoback/symfony-dependency-injection-test": "^0.7", "nelmio/api-doc-bundle": "^2.11", "sensio/framework-extra-bundle": "^3.0 || ^4.0 || ^5.0", - "sllh/php-cs-fixer-styleci-bridge": "^2.0", "sonata-project/exporter": "^1.3", - "symfony/phpunit-bridge": "^3.3.12" + "symfony/phpunit-bridge": "^3.3.12 || ^4.0" }, "type": "symfony-bundle", "extra": { @@ -3593,7 +3596,7 @@ "keywords": [ "sonata" ], - "time": "2017-11-19T18:36:28+00:00" + "time": "2018-01-07T10:18:00+00:00" }, { "name": "sonata-project/datagrid-bundle", @@ -3655,43 +3658,48 @@ }, { "name": "sonata-project/doctrine-phpcr-admin-bundle", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle.git", - "reference": "bb238e5624d0fe72a6e75973d05dbdc9e3a14660" + "reference": "865031737c07e52ff0bb11cea8db188c31d769e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/SonataDoctrinePhpcrAdminBundle/zipball/bb238e5624d0fe72a6e75973d05dbdc9e3a14660", - "reference": "bb238e5624d0fe72a6e75973d05dbdc9e3a14660", + "url": "https://api.github.com/repos/sonata-project/SonataDoctrinePhpcrAdminBundle/zipball/865031737c07e52ff0bb11cea8db188c31d769e5", + "reference": "865031737c07e52ff0bb11cea8db188c31d769e5", "shasum": "" }, "require": { - "doctrine/phpcr-bundle": "^1.1", - "doctrine/phpcr-odm": "^1.3 || ^2.0", + "doctrine/phpcr-bundle": "^1.3 || ^2.0", + "doctrine/phpcr-odm": "^1.4 || ^2.0", "php": "^5.6 || ^7.0", - "sonata-project/admin-bundle": "^3.21.0", - "sonata-project/block-bundle": "^3.0", + "sonata-project/admin-bundle": "^3.30.1", + "sonata-project/block-bundle": "^3.9", "symfony-cmf/resource-rest-bundle": "^1.0", "symfony-cmf/tree-browser-bundle": "^2.0", - "symfony/framework-bundle": "^2.8 || ^3.0", - "symfony/property-access": "^2.8 || ^3.0" + "symfony/config": "^2.8 || ^3.2", + "symfony/dependency-injection": "^2.8 || ^3.2", + "symfony/form": "^2.8 || ^3.2", + "symfony/framework-bundle": "^2.8 || ^3.2", + "symfony/http-foundation": "^2.8 || ^3.2", + "symfony/http-kernel": "^2.8 || ^3.2", + "symfony/options-resolver": "^2.8 || ^3.2", + "symfony/property-access": "^2.8 || ^3.2" }, "provide": { "sonata-project/admin-bundle-persistency-layer": "1.0.0" }, "require-dev": { - "dantleech/glob-finder": "1.*", + "dantleech/glob-finder": "^1.0", "jackalope/jackalope-jackrabbit": "^1.3", "matthiasnoback/symfony-dependency-injection-test": "^1.1", - "puli/repository": "@beta", - "sllh/php-cs-fixer-styleci-bridge": "^2.0", - "sonata-project/core-bundle": "@dev", + "sonata-project/core-bundle": "^3.8", "symfony-cmf/resource": "^1.0", "symfony-cmf/resource-bundle": "^1.0", - "symfony-cmf/testing": "^2.0", - "symfony/phpunit-bridge": "^2.8 || ^3.0", + "symfony-cmf/testing": "^2.0.1", + "symfony/phpunit-bridge": "^4.0", + "symfony/routing": "^2.8 || ^3.2", "symfony/security-acl": "^2.8 || ^3.0" }, "type": "symfony-bundle", @@ -3727,7 +3735,7 @@ "bootstrap", "sonata" ], - "time": "2017-08-16T07:22:48+00:00" + "time": "2018-01-08T09:39:41+00:00" }, { "name": "sonata-project/exporter", @@ -4183,6 +4191,60 @@ ], "time": "2017-10-11T11:49:19+00:00" }, + { + "name": "symfony-cmf/grapesjs-bundle", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/symfony-cmf/grapesjs-bundle.git", + "reference": "90cd3c6ae68e08dd9e198c98e99180c1d7204d73" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony-cmf/grapesjs-bundle/zipball/90cd3c6ae68e08dd9e198c98e99180c1d7204d73", + "reference": "90cd3c6ae68e08dd9e198c98e99180c1d7204d73", + "shasum": "" + }, + "require": { + "php": "^7.1", + "symfony/form": "^3.3 || ^4.0", + "symfony/framework-bundle": "^3.3 || ^4.0" + }, + "require-dev": { + "symfony-cmf/testing": "^2.1", + "symfony/asset": "^4.0", + "symfony/dotenv": "^4.0", + "symfony/templating": "^4.0", + "symfony/translation": "^4.0", + "symfony/validator": "^4.0", + "symfony/web-server-bundle": "^4.0", + "symfony/yaml": "^4.0", + "twig/twig": "^2.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Cmf\\Bundle\\GrapesjsBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "ElectricMaxxx", + "email": "maximilian.berghoff@gmx.de" + } + ], + "description": "Bundle to enable grapesjs support as a Symfony form.", + "time": "2018-02-01T04:58:49+00:00" + }, { "name": "symfony-cmf/menu-bundle", "version": "2.1.1", @@ -4778,41 +4840,49 @@ }, { "name": "symfony-cmf/sonata-phpcr-admin-integration-bundle", - "version": "1.0.0", + "version": "dev-trygrapes", "source": { "type": "git", "url": "https://github.com/symfony-cmf/sonata-phpcr-admin-integration-bundle.git", - "reference": "b05954fa3f9bd532140e218ff7b34a3d074ec8cb" + "reference": "5d3ac13b7b4b8e97c979225b37de73f52936f955" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/sonata-phpcr-admin-integration-bundle/zipball/b05954fa3f9bd532140e218ff7b34a3d074ec8cb", - "reference": "b05954fa3f9bd532140e218ff7b34a3d074ec8cb", + "url": "https://api.github.com/repos/symfony-cmf/sonata-phpcr-admin-integration-bundle/zipball/5d3ac13b7b4b8e97c979225b37de73f52936f955", + "reference": "5d3ac13b7b4b8e97c979225b37de73f52936f955", "shasum": "" }, "require": { - "php": "^5.6|^7.0", + "php": "^7.1", "sonata-project/admin-bundle": "^3.6.0", - "sonata-project/doctrine-phpcr-admin-bundle": "^2.0.0-RC4", + "sonata-project/doctrine-phpcr-admin-bundle": "^2.1", "symfony-cmf/tree-browser-bundle": "^2.0", - "symfony/framework-bundle": "^2.8|^3.0" + "symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0", + "symfony/symfony": "^3.4" + }, + "conflict": { + "sebastian/environment": "<1.3.4", + "sebastian/exporter": "<2.0.0" }, "require-dev": { "burgov/key-value-form-bundle": "^1.0", "doctrine/doctrine-bundle": "^1.3", "doctrine/orm": "^2.4", - "doctrine/phpcr-odm": "^2.0", + "doctrine/phpcr-odm": "^1.4|^2.0", "egeloen/ckeditor-bundle": "^4.0", - "matthiasnoback/symfony-config-test": "^1.3.1", - "matthiasnoback/symfony-dependency-injection-test": "~0.6", - "symfony-cmf/block-bundle": "^2.0", - "symfony-cmf/content-bundle": "^2.0", - "symfony-cmf/core-bundle": "^2.0", - "symfony-cmf/menu-bundle": "^2.0", - "symfony-cmf/routing-bundle": "^2.0", - "symfony-cmf/seo-bundle": "^2.0", - "symfony-cmf/testing": "^2.0", - "symfony/phpunit-bridge": "^3.2" + "matthiasnoback/symfony-config-test": "^2.1", + "matthiasnoback/symfony-dependency-injection-test": "^1.1", + "symfony-cmf/block-bundle": "^2.1", + "symfony-cmf/content-bundle": "^2.1", + "symfony-cmf/core-bundle": "^2.1", + "symfony-cmf/menu-bundle": "^2.2", + "symfony-cmf/routing-bundle": "^2.1", + "symfony-cmf/seo-bundle": "^2.1", + "symfony-cmf/testing": "^2.1", + "symfony/asset": "^2.8 || ^3.3 || ^4.0", + "symfony/browser-kit": "^2.8 || ^3.3 || ^4.0", + "symfony/css-selector": "^2.8 || ^3.3 || ^4.0", + "symfony/phpunit-bridge": "^3.3 || ^4.0" }, "suggest": { "doctrine/doctrine-bundle": "To persist the metadata in ORM entities", @@ -4824,13 +4894,12 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { "psr-4": { - "Symfony\\Cmf\\Bundle\\SonataPhpcrAdminIntegrationBundle\\": "src/", - "Symfony\\Cmf\\Bundle\\SonataPhpcrAdminIntegrationBundle\\Tests\\": "tests/" + "Symfony\\Cmf\\Bundle\\SonataPhpcrAdminIntegrationBundle\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -4850,7 +4919,7 @@ "admin", "sonata" ], - "time": "2017-08-10T14:46:49+00:00" + "time": "2018-01-28T08:30:53+00:00" }, { "name": "symfony-cmf/symfony-cmf", @@ -5555,16 +5624,16 @@ }, { "name": "symfony/symfony", - "version": "v3.3.13", + "version": "v3.4.3", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "9b0226340705f75fd0cebd220746a36050ead8a9" + "reference": "21abeae69baf64d689b04ca33663b4354be1a226" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/9b0226340705f75fd0cebd220746a36050ead8a9", - "reference": "9b0226340705f75fd0cebd220746a36050ead8a9", + "url": "https://api.github.com/repos/symfony/symfony/zipball/21abeae69baf64d689b04ca33663b4354be1a226", + "reference": "21abeae69baf64d689b04ca33663b4354be1a226", "shasum": "" }, "require": { @@ -5581,9 +5650,9 @@ "symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php56": "~1.0", - "symfony/polyfill-php70": "~1.0", + "symfony/polyfill-php70": "~1.6", "symfony/polyfill-util": "~1.0", - "twig/twig": "~1.34|~2.4" + "twig/twig": "^1.35|^2.4.4" }, "conflict": { "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2", @@ -5593,6 +5662,7 @@ "provide": { "psr/cache-implementation": "1.0", "psr/container-implementation": "1.0", + "psr/log-implementation": "1.0", "psr/simple-cache-implementation": "1.0" }, "replace": { @@ -5620,6 +5690,7 @@ "symfony/inflector": "self.version", "symfony/intl": "self.version", "symfony/ldap": "self.version", + "symfony/lock": "self.version", "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", @@ -5660,14 +5731,13 @@ "ocramius/proxy-manager": "~0.4|~1.0|~2.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0", "predis/predis": "~1.0", - "sensio/framework-extra-bundle": "^3.0.2", - "symfony/phpunit-bridge": "~3.2", + "symfony/phpunit-bridge": "~3.4|~4.0", "symfony/security-acl": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -5705,7 +5775,7 @@ "keywords": [ "framework" ], - "time": "2017-11-16T18:15:01+00:00" + "time": "2018-01-05T08:33:31+00:00" }, { "name": "twig/extensions", @@ -6750,12 +6820,15 @@ } ], "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, + "minimum-stability": "dev", + "stability-flags": { + "symfony-cmf/sonata-phpcr-admin-integration-bundle": 20, + "symfony-cmf/grapesjs-bundle": 20 + }, + "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^5.6 || ^7.0" + "php": "^5.6|^7.0" }, "platform-dev": [] } diff --git a/web/assets/fonts/FontAwesome.otf b/web/assets/fonts/FontAwesome.otf new file mode 100644 index 00000000..401ec0f3 Binary files /dev/null and b/web/assets/fonts/FontAwesome.otf differ diff --git a/web/assets/fonts/fontawesome-webfont.eot b/web/assets/fonts/fontawesome-webfont.eot new file mode 100644 index 00000000..e9f60ca9 Binary files /dev/null and b/web/assets/fonts/fontawesome-webfont.eot differ diff --git a/web/assets/fonts/fontawesome-webfont.svg b/web/assets/fonts/fontawesome-webfont.svg new file mode 100644 index 00000000..855c845e --- /dev/null +++ b/web/assets/fonts/fontawesome-webfont.svg @@ -0,0 +1,2671 @@ + + + + +Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 + By ,,, +Copyright Dave Gandy 2016. All rights reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/assets/fonts/fontawesome-webfont.ttf b/web/assets/fonts/fontawesome-webfont.ttf new file mode 100644 index 00000000..35acda2f Binary files /dev/null and b/web/assets/fonts/fontawesome-webfont.ttf differ diff --git a/web/assets/fonts/fontawesome-webfont.woff b/web/assets/fonts/fontawesome-webfont.woff new file mode 100644 index 00000000..400014a4 Binary files /dev/null and b/web/assets/fonts/fontawesome-webfont.woff differ diff --git a/web/assets/fonts/fontawesome-webfont.woff2 b/web/assets/fonts/fontawesome-webfont.woff2 new file mode 100644 index 00000000..4d13fc60 Binary files /dev/null and b/web/assets/fonts/fontawesome-webfont.woff2 differ