fix bug

CHANGELOG.md

@@ -1,66 +1,3 @@
-# v1.7.25
-## 11/16/2021
-
-1. [](#new)
-    * Updated phpstan to v1.0
-    * Added `FlexObject::getDiff()` to see difference to the saved object
-2. [](#improved)
-    * Use Symfony `dump` instead of PHP's `vardump` in side the `{{ vardump(x) }}` Twig vardump function
-    * Added `route` and `request` to `onPagesInitialized` event
-    * Improved page cloning, added method `Page::initialize()`
-    * Improved `FlexObject::getChanges()`: return changed lists and arrays as whole instead of just changed keys/values
-    * Improved form validation JSON responses to contain list of failed fields with their error messages
-    * Improved redirects: send redirect response in JSON if the request was in JSON
-3. [](#bugfix)
-    * Fixed path traversal vulnerability when using `bin/grav server`
-    * Fixed unescaped error messages in JSON error responses
-    * Fixed `|t(variable)` twig filter in admin
-    * Fixed `FlexObject::getChanges()` always returning empty array
-    * Fixed form validation exceptions to use `400 Bad Request` instead of `500 Internal Server Error`
-
-# v1.7.24
-## 10/26/2021
-
-1. [](#new)
-    * Added support for image watermarks
-    * Added support to disable a form, making it readonly
-2. [](#improved)
-    * Flex `$user->authorize()` now checks user groups before `admin.super`, allowing deny rules to work properly
-3. [](#bugfix)
-    * Fixed a bug in `PermissionsReader` in PHP 7.3
-    * Fixed `session_store_active` language option (#3464)
-    * Fixed deprecated warnings on `ArrayAccess` in PHP 8.1
-    * Fixed XSS detection with `:`
-
-# v1.7.23
-## 09/29/2021
-
-1. [](#new)
-    * Added method `Pages::referrerRoute()` to get the referrer route and language
-    * Added true unique `Utils::uniqueId()` / `{{ unique_id() }}` utilities  with length, prefix, and suffix support
-    * Added `UserObject::isMyself()` method to check if flex user is currently logged in
-    * Added support for custom form field options validation with `validate: options: key|ignore`
-2. [](#improved)
-   * Replaced GPL `SVG-Sanitizer` with MIT licensed `DOM-Sanitizer`
-   * `Uri::referrer()` now accepts third parameter, if set to `true`, it returns route without base or language code [#3411](https://github.com/getgrav/grav/issues/3411)
-   * Updated vendor libs with latest
-   * Updated with latest language strings via Crowdin.com
-3. [](#bugfix)
-    * Fixed `Folder::move()` throwing an error when target folder is changed by only appending characters to the end [#3445](https://github.com/getgrav/grav/issues/3445)
-    * Fixed some phpstan issues (all code back to level 1, Framework level 3)
-    * Fixed form reset causing image uploads to fail when using Flex
-
-# v1.7.22
-## 09/16/2021
-
-1. [](#new)
-    * Register plugin autoloaders into plugin objects
-2. [](#improved)
-    * Improve Twig 2 compatibility
-    * Update to customized version of Twig DeferredExtension (Twig 1/2 compatible)
-3. [](#bugfix)
-    * Fixed conflicting `$_original` variable in `Flex Pages`
-
 # v1.7.21
 ## 09/14/2021
 

composer.json

@@ -20,10 +20,9 @@
         "ext-dom": "*",
         "ext-libxml": "*",
         "symfony/polyfill-mbstring": "~1.20",
-        "symfony/polyfill-iconv": "^1.23",
-        "symfony/polyfill-php74": "^1.23",
-        "symfony/polyfill-php80": "^1.23",
-        "symfony/polyfill-php81": "^1.23",
+        "symfony/polyfill-iconv": "^1.20",
+        "symfony/polyfill-php74": "^1.20",
+        "symfony/polyfill-php80": "^1.20",
         "psr/simple-cache": "^1.0",
         "psr/http-message": "^1.0",
         "psr/http-server-middleware": "^1.0",
@@ -56,16 +55,17 @@
         "miljar/php-exif": "^0.6",
         "composer/ca-bundle": "^1.2",
         "dragonmantank/cron-expression": "^1.2",
+        "phive/twig-extensions-deferred": "^1.0",
         "willdurand/negotiation": "^3.0",
         "itsgoingd/clockwork": "^5.0",
+        "enshrined/svg-sanitize": "~0.13",
         "symfony/http-client": "^4.4",
-        "composer/semver": "^1.4",
-        "rhukster/dom-sanitizer": "^1.0"
+        "composer/semver": "^1.4"
     },
     "require-dev": {
         "codeception/codeception": "^4.1",
-        "phpstan/phpstan": "^1.0",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-deprecation-rules": "^0.12",
         "phpunit/php-code-coverage": "~9.2",
         "getgrav/markdowndocs": "^2.0",
         "codeception/module-asserts": "^1.3",
@@ -93,8 +93,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Grav\\": "system/src/Grav",
-            "Twig\\": "system/src/Twig"
+            "Grav\\": "system/src/Grav"
         },
         "files": [
             "system/defines.php"
@@ -108,8 +107,8 @@
     "scripts": {
         "api-17": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.17.md",
         "post-create-project-cmd": "bin/grav install",
-        "phpstan": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/phpstan.neon --memory-limit=520M system/src",
-        "phpstan-framework": "vendor/bin/phpstan analyse -l 3 -c ./tests/phpstan/phpstan.neon --memory-limit=480M system/src/Grav/Framework system/src/Grav/Events system/src/Grav/Installer",
+        "phpstan": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/phpstan.neon --memory-limit=480M system/src",
+        "phpstan-framework": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/phpstan.neon --memory-limit=480M system/src/Grav/Framework system/src/Grav/Events system/src/Grav/Installer",
         "phpstan-plugins": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/plugins.neon --memory-limit=400M user/plugins",
         "test": "vendor/bin/codecept run unit",
         "test-windows": "vendor\\bin\\codecept run unit"