diff --git a/Dockerfile b/Dockerfile index 600e2b07..b8d8fc1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,6 @@ RUN a2enmod rewrite USER www-data RUN composer install -a --no-dev && composer clear-cache RUN yarn install && yarn build && yarn cache clean -RUN php bin/console --env=prod ckeditor:install --clear=skip # Use demo env to output logs to stdout ENV APP_ENV=demo diff --git a/composer.json b/composer.json index 170f3a9a..7675e198 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "erusev/parsedown": "^1.7", "florianv/swap": "^4.0", "florianv/swap-bundle": "dev-master", - "friendsofsymfony/ckeditor-bundle": "^2.0", "gregwar/captcha-bundle": "^2.1.0", "league/html-to-markdown": "^5.0.1", "liip/imagine-bundle": "^2.2", @@ -123,8 +122,7 @@ "auto-scripts": { "cache:clear": "symfony-cmd", "ckeditor:install --clear=drop": "symfony-cmd", - "assets:install %PUBLIC_DIR%": "symfony-cmd", - "ckeditor:install": "symfony-cmd" + "assets:install %PUBLIC_DIR%": "symfony-cmd" }, "post-install-cmd": [ "@auto-scripts" diff --git a/composer.lock b/composer.lock index f51ef5fa..245e97b1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "74cb95ca58a1efdfbc3705c6b0442e2b", + "content-hash": "3599c75572b6f6a85032719ab3f122e4", "packages": [ { "name": "beberlei/assert", @@ -2175,87 +2175,6 @@ ], "time": "2022-05-05T09:31:05+00:00" }, - { - "name": "friendsofsymfony/ckeditor-bundle", - "version": "2.4.0", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfSymfony/FOSCKEditorBundle.git", - "reference": "a4df4056b2832881e17b939e83f25406a6cc6414" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSCKEditorBundle/zipball/a4df4056b2832881e17b939e83f25406a6cc6414", - "reference": "a4df4056b2832881e17b939e83f25406a6cc6414", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-zip": "*", - "php": "^7.1|^8.0", - "symfony/asset": "^4.4 || ^5.0 || ^6.0", - "symfony/config": "^4.4 || ^5.0 || ^6.0", - "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0", - "symfony/expression-language": "^4.4 || ^5.0 || ^6.0", - "symfony/form": "^4.4 || ^5.0 || ^6.0", - "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0", - "symfony/http-foundation": "^4.4 || ^5.0 || ^6.0", - "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0", - "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0", - "symfony/property-access": "^4.4 || ^5.0 || ^6.0", - "symfony/routing": "^4.4 || ^5.0 || ^6.0", - "symfony/twig-bundle": "^4.4 || ^5.0 || ^6.0", - "twig/twig": "^2.4 || ^3.0" - }, - "conflict": { - "sebastian/environment": "<1.3.4", - "sebastian/exporter": "<2.0.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", - "matthiasnoback/symfony-dependency-injection-test": "^3.0 || ^4.0", - "symfony/console": "^4.4 || ^5.0 || ^6.0", - "symfony/phpunit-bridge": "^4.4 || ^5.0 || ^6.0", - "symfony/yaml": "^4.4 || ^5.0 || ^6.0" - }, - "suggest": { - "egeloen/form-extra-bundle": "Allows to load CKEditor asynchronously" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "FOS\\CKEditorBundle\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eric GELOEN", - "email": "geloen.eric@gmail.com" - }, - { - "name": "FriendsOfSymfony Community", - "homepage": "https://github.com/FriendsOfSymfony/FOSCKEditorBundle/graphs/contributors" - } - ], - "description": "Provides a CKEditor integration for your Symfony project.", - "keywords": [ - "CKEditor" - ], - "support": { - "issues": "https://github.com/FriendsOfSymfony/FOSCKEditorBundle/issues", - "source": "https://github.com/FriendsOfSymfony/FOSCKEditorBundle/tree/2.4.0" - }, - "time": "2022-01-07T12:34:18+00:00" - }, { "name": "gregwar/captcha", "version": "v1.1.9", @@ -3030,16 +2949,16 @@ }, { "name": "monolog/monolog", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524" + "reference": "720488632c590286b88b80e62aa3d3d551ad4a50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524", - "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50", + "reference": "720488632c590286b88b80e62aa3d3d551ad4a50", "shasum": "" }, "require": { @@ -3059,11 +2978,10 @@ "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "php-console/php-console": "^3.1.3", "phpspec/prophecy": "^1.15", "phpstan/phpstan": "^0.12.91", "phpunit/phpunit": "^8.5.14", - "predis/predis": "^1.1", + "predis/predis": "^1.1 || ^2.0", "rollbar/rollbar": "^1.3 || ^2 || ^3", "ruflin/elastica": "^7", "swiftmailer/swiftmailer": "^5.3|^6.0", @@ -3083,7 +3001,6 @@ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", - "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, @@ -3118,7 +3035,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.7.0" + "source": "https://github.com/Seldaek/monolog/tree/2.8.0" }, "funding": [ { @@ -3130,7 +3047,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T08:59:12+00:00" + "time": "2022-07-24T11:55:47+00:00" }, { "name": "nelmio/security-bundle", @@ -13299,12 +13216,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "4bc2609bf9e2c2146d25465546bb10651cce47ac" + "reference": "13587f393de35e82081d102217f46284d3beb4f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4bc2609bf9e2c2146d25465546bb10651cce47ac", - "reference": "4bc2609bf9e2c2146d25465546bb10651cce47ac", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/13587f393de35e82081d102217f46284d3beb4f7", + "reference": "13587f393de35e82081d102217f46284d3beb4f7", "shasum": "" }, "conflict": { @@ -13384,7 +13301,7 @@ "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", "dolibarr/dolibarr": "<16|= 12.0.5|>= 3.3.beta1, < 13.0.2", "dompdf/dompdf": "<2", - "drupal/core": ">=7,<7.88|>=8,<9.2.13|>=9.3,<9.3.6", + "drupal/core": ">=7,<7.91|>=8,<9.3.19|>=9.4,<9.4.3", "drupal/drupal": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", "dweeves/magmi": "<=0.7.24", "ecodev/newsletter": "<=4", @@ -13803,7 +13720,7 @@ "type": "tidelift" } ], - "time": "2022-07-21T23:04:29+00:00" + "time": "2022-07-26T09:04:23+00:00" }, { "name": "sebastian/diff", diff --git a/config/bundles.php b/config/bundles.php index 751a2de6..e8da8562 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -14,7 +14,6 @@ return [ Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], Omines\DataTablesBundle\DataTablesBundle::class => ['all' => true], Shivas\VersioningBundle\ShivasVersioningBundle::class => ['all' => true], - FOS\CKEditorBundle\FOSCKEditorBundle::class => ['all' => true], Liip\ImagineBundle\LiipImagineBundle::class => ['all' => true], Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true], DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true], diff --git a/config/packages/fos_ckeditor.yaml b/config/packages/fos_ckeditor.yaml deleted file mode 100644 index 11103ccd..00000000 --- a/config/packages/fos_ckeditor.yaml +++ /dev/null @@ -1,79 +0,0 @@ -# Read the documentation: https://symfony.com/doc/current/bundles/FOSCKEditorBundle/index.html - -twig: - form_themes: - - '@FOSCKEditor/Form/ckeditor_widget.html.twig' - -fos_ck_editor: - default_config: complex_config - configs: - complex_config: - extraPlugins: "markdown" - toolbar: comment_toolbar - simple_config: - extraPlugins: "markdown" - toolbar: basic - description_config: - extraPlugins: "markdown" - height: 60 - toolbar: description_toolbar - label_config: - height: 100 - enterMode: 2 - toolbar: label_toolbar - extraPlugins: ["partdb_label", "showprotected"] - allowedContent: true - font_names: > - DejaVu Sans Mono/DejaVu Sans Mono; - DejaVu Sans/DejaVu Sans; - DejaVu Serif/DejaVu Serif; - Helvetica/Helvetica, Arial, sans-serif; - Times New Roman/Times New Roman, Times, serif; - Courier New/Courier New, Courier, monospace; - - plugins: - bbcode: - path: "ckeditor/plugins/bbcode/" # with trailing slash - filename: "plugin.js" - markdown: - path: "ckeditor/plugins/markdown/" - filename: "plugin.js" - specialchar: - path: "ckeditor/plugins/specialchar" - filename: "plugin.js" - partdb_label: - path: "ckeditor/plugins/partdb_label/" - filename: "plugin.js" - showprotected: - path: "ckeditor/plugins/showprotected/" - filename: "plugin.js" - - - toolbars: - configs: - label_toolbar: - - [ 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] - - ['JustifyLeft', 'JustifyCenter', 'JustifyRight'] - - ["SpecialChar"] - - ["Source"] - - "/" - - ['Format', 'FontSize', 'Font'] - - ['Table', 'HorizontalRule'] - - ['Placeholders'] - description_toolbar: - - [ 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] - - ["SpecialChar"] - - ["Source"] - comment_toolbar: - - ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'] - - [ 'Find', 'Replace', '-', 'SelectAll', '-', 'Scayt' ] - - [ 'Styles', 'Format'] - - [ 'TextColor'] - - [ 'Maximize', 'ShowBlocks' ] - - [ 'Source', '-', 'About'] - - '/' - - [ 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] - - [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'] - - [ 'Link', 'Unlink' ] - - [ 'Image', 'Table', 'HorizontalRule', 'SpecialChar' ] - diff --git a/src/Form/Part/PartBaseType.php b/src/Form/Part/PartBaseType.php index 77d382b8..31eca1d9 100644 --- a/src/Form/Part/PartBaseType.php +++ b/src/Form/Part/PartBaseType.php @@ -63,7 +63,6 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\Extension\Core\Type\ResetType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; -use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\UrlType; use Symfony\Component\Form\FormBuilderInterface; diff --git a/symfony.lock b/symfony.lock index 0be73001..961a7e39 100644 --- a/symfony.lock +++ b/symfony.lock @@ -167,18 +167,6 @@ "friendsofphp/proxy-manager-lts": { "version": "v1.0.5" }, - "friendsofsymfony/ckeditor-bundle": { - "version": "2.0", - "recipe": { - "repo": "github.com/symfony/recipes-contrib", - "branch": "master", - "version": "2.0", - "ref": "f5ad42002183a6881962683e6d84bbb25cdfce5d" - }, - "files": [ - "./config/packages/fos_ckeditor.yaml" - ] - }, "gregwar/captcha": { "version": "v1.1.7" },