Эх сурвалжийг харах

Update php version to 7.2, add html sanitizer

Julio Montoya 5 жил өмнө
parent
commit
568d8b5eb5

+ 1 - 1
.travis.yml

@@ -19,8 +19,8 @@ cache:
   directories:
     - $HOME/.composer/cache/files
 php:
-  - 7.1
   - 7.2
+  - 7.3
 
 env:
   global:

+ 25 - 25
composer.json

@@ -32,7 +32,7 @@
         ]
     },
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.2.0",
         "ext-intl": "*",
         "ext-gd": "*",
         "ext-curl": "*",
@@ -45,7 +45,6 @@
         "ext-dom": "*",
         "ext-fileinfo": "*",
         "ext-bcmath": "*",
-        "twig/twig": "2.*",
         "doctrine/orm": "~2.6",
         "doctrine/dbal": "~2.9",
         "doctrine/data-fixtures": "~1.0@dev",
@@ -56,8 +55,9 @@
         "erusev/parsedown": "~1.7",
         "ezyang/htmlpurifier": "~4.10",
         "sensio/framework-extra-bundle": "~5.0",
-        "sensiolabs/security-checker": "~5.0",
+        "sensiolabs/security-checker": "~6.0",
         "symfony/asset": "^4.0",
+        "symfony/dotenv": "^4.0",
         "symfony/expression-language": "^4.0",
         "symfony/flex": "^1.0",
         "symfony/form": "^4.0",
@@ -66,15 +66,17 @@
         "symfony/polyfill-apcu": "^1.9",
         "symfony/security-bundle": "^4.0",
         "symfony/swiftmailer-bundle": "^3.2",
+        "symfony/templating" : "*",
         "symfony/translation": "^4.0",
-        "symfony/twig-bundle": "^4.0",
+        "symfony/twig-bundle": "*",
         "symfony/validator": "^4.0",
+        "symfony/webpack-encore-bundle": "^1.1",
         "symfony/yaml": "^4.0",
-        "symfony/apache-pack": "^1.0",
+        "tgalopin/html-sanitizer-bundle": "^1.1",
+        "twig/extensions": "^1.5",
 
+        "symfony/apache-pack": "^1.0",
         "apy/datagrid-bundle" : "dev-master",
-
-        "twig/extensions": "^1.5",
         "white-october/pagerfanta-bundle": "^1.1",
         "chamilo/settings-bundle": "dev-master",
         "sonata-project/admin-bundle": "~3.0",
@@ -83,11 +85,11 @@
         "sonata-project/classification-bundle": "~3.0",
         "sonata-project/timeline-bundle" : "~3.0",
         "sonata-project/core-bundle": "~3.0",
-        "sonata-project/datagrid-bundle": "^2.3",
-        "sonata-project/doctrine-extensions": "~1@dev",
+        "sonata-project/datagrid-bundle": "^2.5",
+        "sonata-project/doctrine-extensions": "~1.3",
         "sonata-project/doctrine-orm-admin-bundle": "~3.0",
         "sonata-project/easy-extends-bundle": "~2.5",
-        "sonata-project/exporter": "~1",
+        "sonata-project/exporter": "~2.0",
         "sonata-project/intl-bundle": "~2.5",
         "sonata-project/media-bundle": "3.x-dev",
         "sonata-project/notification-bundle": "~3.0",
@@ -99,7 +101,7 @@
         "stephpy/timeline-bundle": "~3.0",
         "stof/doctrine-extensions-bundle": "~1.3",
         "sunra/php-simple-html-dom-parser": "~1.5.0",
-        "sylius/resource-bundle": "1.2.*",
+        "sylius/resource-bundle": "~1.5",
 
         "friendsofsymfony/jsrouting-bundle": "~2.0",
         "gedmo/doctrine-extensions": "~2.4",
@@ -123,31 +125,30 @@
         "zendframework/zend-permissions-acl": "~2.7",
         "zendframework/zend-soap": "~2.6",
         "robrichards/xmlseclibs": "3.0.*",
-        "szymach/c-pchart": "3.0.4",
+        "szymach/c-pchart": "~3.0",
         "endroid/qr-code": "~3.4",
         "alchemy/zippy": "~0.4",
-        "mpdf/mpdf": "~7.1",
+        "mpdf/mpdf": "~8.0",
         "oneup/flysystem-bundle": "~3.0",
         "studio-42/elfinder": "2.1.*",
-        "jbroadway/urlify": "1.1.0-stable",
+        "jbroadway/urlify": "~1.1",
         "patchwork/utf8": "~1.3",
         "portphp/portphp": "~1.3",
         "portphp/excel": "^1.1",
         "portphp/doctrine": "^1.0",
         "portphp/csv": "^1.1",
         "phpoffice/phpspreadsheet": "~1.5",
-        "phpoffice/phpword": "^0.14.0",
-        "webit/eval-math": "1.0.1",
+        "phpoffice/phpword": "~0.14",
+        "webit/eval-math": "~1.0",
         "clue/graph": "~0.9.0",
         "graphp/graphviz": "~0.2.0",
         "graphp/algorithms": "~0.8.0",
-        "php-ffmpeg/php-ffmpeg": "0.5.1",
-        "imagine/imagine": "~0.7",
-        "jeroendesloovere/vcard": "~1.5",
-        "jimmiw/php-time-ago": "2.0.*",
-        "kigkonsult/icalcreator": "2.24",
+        "php-ffmpeg/php-ffmpeg": "~0.6",
+        "jeroendesloovere/vcard": "~1.7",
+        "jimmiw/php-time-ago": "~3.0",
+        "kigkonsult/icalcreator": "~2.24",
         "essence/essence": "~3.0",
-        "paragonie/random-lib": "2.0.0",
+        "paragonie/random-lib": "~2.0",
         "hwi/oauth-bundle": "~0.6",
         "php-http/guzzle6-adapter": "^1.1",
         "php-http/httplug-bundle": "^1.8",
@@ -155,14 +156,14 @@
         "symfony/requirements-checker": "^1.1",
         "liip/theme-bundle": "^1.6",
         "liip/imagine-bundle": "^2.1",
+        "imagine/imagine": "~0.7",
         "a2lix/translation-form-bundle": "^3.0",
         "oneup/uploader-bundle": "^2.0",
-        "overblog/graphql-bundle": "^0.11.4",
+        "overblog/graphql-bundle": "~0.11",
         "firebase/php-jwt": "^5.0",
         "simplethings/entity-audit-bundle": "^1.0",
         "masterminds/html5": "2.*",
         "league/csv": "^9.1",
-        "symfony/webpack-encore-bundle": "^1.1",
         "brumann/polyfill-unserialize": "^1.0"
     },
     "config": {
@@ -174,7 +175,6 @@
         "symfony/browser-kit": "^4.0",
         "symfony/css-selector": "^4.0",
         "symfony/debug-bundle": "^4.0",
-        "symfony/dotenv": "^4.0",
         "symfony/phpunit-bridge": "^4.0",
         "symfony/stopwatch": "^4.0",
         "symfony/web-profiler-bundle": "^4.0",

+ 1 - 0
config/bundles.php

@@ -77,4 +77,5 @@ return [
     SimpleThings\EntityAudit\SimpleThingsEntityAuditBundle::class => ['all' => true],
     Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
     Liip\ImagineBundle\LiipImagineBundle::class => ['all' => true],
+    HtmlSanitizer\Bundle\HtmlSanitizerBundle::class => ['all' => true],
 ];

+ 17 - 0
config/packages/html_sanitizer.yaml

@@ -0,0 +1,17 @@
+html_sanitizer:
+    default_sanitizer: 'default'
+    sanitizers:
+        default:
+            # Read https://github.com/tgalopin/html-sanitizer/blob/master/docs/1-getting-started.md#extensions
+            # to learn more about which extensions you would like to enable.
+            extensions:
+                - 'basic'
+                # - 'list'
+                # - 'table'
+                # - 'image'
+                # - 'code'
+                # - 'iframe'
+                # - 'extra'
+
+            # Read https://github.com/tgalopin/html-sanitizer/blob/master/docs/3-configuration-reference.md
+            # to discover all the available options for each extension.