Fix builds

sonata-project · Oct 17, 2021 · d54c4f9 · d54c4f9
1 parent ff6980f
commit d54c4f9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -48,8 +48,9 @@
         "phpstan/phpstan-phpunit": "^0.12.16",
         "phpstan/phpstan-strict-rules": "^0.12.10",
         "phpstan/phpstan-symfony": "^0.12.21",
+        "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.16",
-        "psalm/plugin-symfony": "^2.0",
+        "psalm/plugin-symfony": "^3.0",
         "symfony/config": "^4.4 || ^5.3 || ^6.0",
         "symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0",
         "symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0",
@@ -79,13 +80,5 @@
         "psr-4": {
             "Sonata\\Form\\Tests\\": "tests/"
         }
-    },
-    "scripts": {
-        "post-install-cmd": [
-            "[ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/simple-phpunit install"
-        ],
-        "post-update-cmd": [
-            "[ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/simple-phpunit install"
-        ]
     }
 }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,7 +1,5 @@
 parameters:
     level: max
-    bootstrapFiles:
-        - vendor/bin/.phpunit/phpunit/vendor/autoload.php
     paths:
         - src
         - tests

diff --git a/psalm.xml b/psalm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" errorLevel="3" findUnusedPsalmSuppress="true" resolveFromConfigFile="true" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" autoloader="vendor/bin/.phpunit/phpunit/vendor/autoload.php">
+<psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" errorLevel="3" findUnusedPsalmSuppress="true" resolveFromConfigFile="true" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd">
     <projectFiles>
         <directory name="src"/>
         <directory name="tests"/>

diff --git a/src/Date/MomentFormatConverter.php b/src/Date/MomentFormatConverter.php
@@ -25,8 +25,8 @@ class MomentFormatConverter
 {
     /**
      * @var array<string, string> This defines the mapping between PHP ICU date format (key) and moment.js date format (value)
-     *                    For ICU formats see http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax
-     *                    For Moment formats see http://momentjs.com/docs/#/displaying/format/
+     *                            For ICU formats see http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax
+     *                            For Moment formats see http://momentjs.com/docs/#/displaying/format/
      */
     private static $formatConvertRules = [
         // year