correct value formatting in violation messages

sustmi · sustmi · commit ff56bd568893 · 2015-05-11T10:08:59.000+02:00
Commit symfony/symfony@97243bc changed formatting of violation message parameters. (since Symfony v2.3.19, v2.4.9, v2.5.3)
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,9 @@ language: php
 php: [5.3]
 
 env:
-  - SF_VERSION='~2.3.0'
-  - SF_VERSION='~2.4.0'
-  - SF_VERSION='>=2.5,<2.5.3'
+  - SF_VERSION='~2.3.0,>=2.3.19'
+  - SF_VERSION='~2.4.0,>=2.4.9'
+  - SF_VERSION='~2.5.0,>=2.5.3,<=2.5.4'
 
 before_script:
   - export WEB_FIXTURES_HOST=http://localhost/index.php
diff --git a/Resources/public/js/FpJsFormValidator.js b/Resources/public/js/FpJsFormValidator.js
@@ -335,6 +335,31 @@ var FpJsBaseConstraint = {
         }
 
         return realMsg;
+    },
+
+    formatValue: function (value) {
+        switch (Object.prototype.toString.call(value)) {
+            case '[object Date]':
+                return value.format('Y-m-d H:i:s');
+
+            case '[object Object]':
+                return 'object';
+
+            case '[object Array]':
+                return 'array';
+
+            case '[object String]':
+                return '"' + value + '"';
+
+            case '[object Null]':
+                return 'null';
+
+            case '[object Boolean]':
+                return value ? 'true' : 'false';
+
+            default:
+                return String(value);
+        }
     }
 };
 
diff --git a/Resources/public/js/constraints/Blank.js b/Resources/public/js/constraints/Blank.js
@@ -12,7 +12,7 @@ function SymfonyComponentValidatorConstraintsBlank() {
         var f = FpJsFormValidator;
 
         if (!f.isValueEmty(value)) {
-            errors.push(this.message.replace('{{ value }}', String(value)));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/Choice.js b/Resources/public/js/constraints/Choice.js
@@ -29,7 +29,10 @@ function SymfonyComponentValidatorConstraintsChoice() {
         if (this.multiple) {
             if (invalidCnt) {
                 while (invalidCnt--) {
-                    errors.push(this.multipleMessage.replace('{{ value }}', String(invalidList[invalidCnt])));
+                    errors.push(this.multipleMessage.replace(
+                        '{{ value }}',
+                        FpJsBaseConstraint.formatValue(invalidList[invalidCnt])
+                    ));
                 }
             }
             if (!isNaN(this.min) && value.length < this.min) {
@@ -40,7 +43,10 @@ function SymfonyComponentValidatorConstraintsChoice() {
             }
         } else if (invalidCnt) {
             while (invalidCnt--) {
-                errors.push(this.message.replace('{{ value }}', String(invalidList[invalidCnt])));
+                errors.push(this.message.replace(
+                    '{{ value }}',
+                    FpJsBaseConstraint.formatValue(invalidList[invalidCnt])
+                ));
             }
         }
 
@@ -53,12 +59,12 @@ function SymfonyComponentValidatorConstraintsChoice() {
 
         this.minMessage = FpJsBaseConstraint.prepareMessage(
             this.minMessage,
-            {'{{ limit }}': this.min},
+            {'{{ limit }}': FpJsBaseConstraint.formatValue(this.min)},
             this.min
         );
         this.maxMessage = FpJsBaseConstraint.prepareMessage(
             this.maxMessage,
-            {'{{ limit }}': this.max},
+            {'{{ limit }}': FpJsBaseConstraint.formatValue(this.max)},
             this.max
         );
     };
diff --git a/Resources/public/js/constraints/Count.js b/Resources/public/js/constraints/Count.js
@@ -42,17 +42,17 @@ function SymfonyComponentValidatorConstraintsCount() {
 
         this.minMessage = FpJsBaseConstraint.prepareMessage(
             this.minMessage,
-            {'{{ limit }}': this.min},
+            {'{{ limit }}': FpJsBaseConstraint.formatValue(this.min)},
             this.min
         );
         this.maxMessage = FpJsBaseConstraint.prepareMessage(
             this.maxMessage,
-            {'{{ limit }}': this.max},
+            {'{{ limit }}': FpJsBaseConstraint.formatValue(this.max)},
             this.max
         );
         this.exactMessage = FpJsBaseConstraint.prepareMessage(
             this.exactMessage,
-            {'{{ limit }}': this.min},
+            {'{{ limit }}': FpJsBaseConstraint.formatValue(this.min)},
             this.min
         );
     }
diff --git a/Resources/public/js/constraints/Date.js b/Resources/public/js/constraints/Date.js
@@ -13,7 +13,7 @@ function SymfonyComponentValidatorConstraintsDate() {
         var f = FpJsFormValidator;
 
         if (!f.isValueEmty(value) && !regexp.test(value)) {
-            errors.push(this.message.replace('{{ value }}', String(value)));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/DateTime.js b/Resources/public/js/constraints/DateTime.js
@@ -13,7 +13,7 @@ function SymfonyComponentValidatorConstraintsDateTime() {
         var f = FpJsFormValidator;
 
         if (!f.isValueEmty(value) && !regexp.test(value)) {
-            errors.push(this.message.replace('{{ value }}', String(value)));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/Email.js b/Resources/public/js/constraints/Email.js
@@ -13,7 +13,7 @@ function SymfonyComponentValidatorConstraintsEmail() {
         var f = FpJsFormValidator;
 
         if (!f.isValueEmty(value) && !regexp.test(value)) {
-            errors.push(this.message.replace('{{ value }}', String(value)));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/EqualTo.js b/Resources/public/js/constraints/EqualTo.js
@@ -15,9 +15,9 @@ function SymfonyComponentValidatorConstraintsEqualTo() {
         if (!f.isValueEmty(value) && this.value != value) {
             errors.push(
                 this.message
-                    .replace('{{ value }}', String(value))
-                    .replace('{{ compared_value }}', String(this.value))
-                    .replace('{{ compared_value_type }}', String(this.value))
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
+                    .replace('{{ compared_value }}', FpJsBaseConstraint.formatValue(this.value))
+                    .replace('{{ compared_value_type }}', FpJsBaseConstraint.formatValue(this.value))
             );
         }
 
diff --git a/Resources/public/js/constraints/False.js b/Resources/public/js/constraints/False.js
@@ -10,7 +10,7 @@ function SymfonyComponentValidatorConstraintsFalse() {
     this.validate = function (value) {
         var errors = [];
         if ('' !== value && false !== value) {
-            errors.push(this.message.replace('{{ value }}', value));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/GreaterThan.js b/Resources/public/js/constraints/GreaterThan.js
@@ -15,8 +15,8 @@ function SymfonyComponentValidatorConstraintsGreaterThan() {
         } else {
             return [
                 this.message
-                    .replace('{{ value }}', String(value))
-                    .replace('{{ compared_value }}', String(this.value))
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
+                    .replace('{{ compared_value }}', FpJsBaseConstraint.formatValue(this.value))
             ];
         }
     }
diff --git a/Resources/public/js/constraints/GreaterThanOrEqual.js b/Resources/public/js/constraints/GreaterThanOrEqual.js
@@ -15,8 +15,8 @@ function SymfonyComponentValidatorConstraintsGreaterThanOrEqual() {
         } else {
             return [
                 this.message
-                    .replace('{{ value }}', String(value))
-                    .replace('{{ compared_value }}', String(this.value))
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
+                    .replace('{{ compared_value }}', FpJsBaseConstraint.formatValue(this.value))
             ];
         }
     }
diff --git a/Resources/public/js/constraints/IdenticalTo.js b/Resources/public/js/constraints/IdenticalTo.js
@@ -13,9 +13,9 @@ function SymfonyComponentValidatorConstraintsIdenticalTo() {
         if ('' !== value && this.value !== value) {
             errors.push(
                 this.message
-                    .replace('{{ value }}', String(value))
-                    .replace('{{ compared_value }}', String(this.value))
-                    .replace('{{ compared_value_type }}', String(this.value))
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
+                    .replace('{{ compared_value }}', FpJsBaseConstraint.formatValue(this.value))
+                    .replace('{{ compared_value_type }}', FpJsBaseConstraint.formatValue(this.value))
             );
         }
 
diff --git a/Resources/public/js/constraints/Ip.js b/Resources/public/js/constraints/Ip.js
@@ -13,7 +13,7 @@ function SymfonyComponentValidatorConstraintsIp() {
         var f = FpJsFormValidator;
 
         if (!f.isValueEmty(value) && !regexp.test(value)) {
-            errors.push(this.message.replace('{{ value }}', String(value)));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/Length.js b/Resources/public/js/constraints/Length.js
@@ -38,17 +38,17 @@ function SymfonyComponentValidatorConstraintsLength() {
 
         this.minMessage = FpJsBaseConstraint.prepareMessage(
             this.minMessage,
-            {'{{ limit }}': this.min},
+            {'{{ limit }}': FpJsBaseConstraint.formatValue(this.min)},
             this.min
         );
         this.maxMessage = FpJsBaseConstraint.prepareMessage(
             this.maxMessage,
-            {'{{ limit }}': this.max},
+            {'{{ limit }}': FpJsBaseConstraint.formatValue(this.max)},
             this.max
         );
         this.exactMessage = FpJsBaseConstraint.prepareMessage(
             this.exactMessage,
-            {'{{ limit }}': this.min},
+            {'{{ limit }}': FpJsBaseConstraint.formatValue(this.min)},
             this.min
         );
     }
diff --git a/Resources/public/js/constraints/LessThan.js b/Resources/public/js/constraints/LessThan.js
@@ -15,8 +15,8 @@ function SymfonyComponentValidatorConstraintsLessThan() {
         } else {
             return [
                 this.message
-                    .replace('{{ value }}', String(value))
-                    .replace('{{ compared_value }}', String(this.value))
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
+                    .replace('{{ compared_value }}', FpJsBaseConstraint.formatValue(this.value))
             ];
         }
     }
diff --git a/Resources/public/js/constraints/LessThanOrEqual.js b/Resources/public/js/constraints/LessThanOrEqual.js
@@ -15,8 +15,8 @@ function SymfonyComponentValidatorConstraintsLessThanOrEqual() {
         } else {
             return [
                 this.message
-                    .replace('{{ value }}', String(value))
-                    .replace('{{ compared_value }}', String(this.value))
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
+                    .replace('{{ compared_value }}', FpJsBaseConstraint.formatValue(this.value))
             ];
         }
     }
diff --git a/Resources/public/js/constraints/NotBlank.js b/Resources/public/js/constraints/NotBlank.js
@@ -12,7 +12,7 @@ function SymfonyComponentValidatorConstraintsNotBlank() {
         var f = FpJsFormValidator;
 
         if (f.isValueEmty(value)) {
-            errors.push(this.message.replace('{{ value }}', String(value)));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/NotEqualTo.js b/Resources/public/js/constraints/NotEqualTo.js
@@ -13,9 +13,9 @@ function SymfonyComponentValidatorConstraintsNotEqualTo() {
         if ('' !== value && this.value == value) {
             errors.push(
                 this.message
-                    .replace('{{ value }}', String(value))
-                    .replace('{{ compared_value }}', String(this.value))
-                    .replace('{{ compared_value_type }}', String(this.value))
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
+                    .replace('{{ compared_value }}', FpJsBaseConstraint.formatValue(this.value))
+                    .replace('{{ compared_value_type }}', FpJsBaseConstraint.formatValue(this.value))
             );
         }
 
diff --git a/Resources/public/js/constraints/NotIdenticalTo.js b/Resources/public/js/constraints/NotIdenticalTo.js
@@ -13,9 +13,9 @@ function SymfonyComponentValidatorConstraintsNotIdenticalTo() {
         if ('' !== value && this.value === value) {
             errors.push(
                 this.message
-                    .replace('{{ value }}', String(value))
-                    .replace('{{ compared_value }}', String(this.value))
-                    .replace('{{ compared_value_type }}', String(this.value))
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
+                    .replace('{{ compared_value }}', FpJsBaseConstraint.formatValue(this.value))
+                    .replace('{{ compared_value_type }}', FpJsBaseConstraint.formatValue(this.value))
             );
         }
 
diff --git a/Resources/public/js/constraints/NotNull.js b/Resources/public/js/constraints/NotNull.js
@@ -10,7 +10,7 @@ function SymfonyComponentValidatorConstraintsNotNull() {
     this.validate = function (value) {
         var errors = [];
         if (null === value) {
-            errors.push(this.message.replace('{{ value }}', String(value)));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/Null.js b/Resources/public/js/constraints/Null.js
@@ -10,7 +10,7 @@ function SymfonyComponentValidatorConstraintsNull() {
     this.validate = function(value) {
         var errors = [];
         if (null !== value) {
-            errors.push(this.message.replace('{{ value }}', String(value)));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/Range.js b/Resources/public/js/constraints/Range.js
@@ -21,21 +21,21 @@ function SymfonyComponentValidatorConstraintsRange() {
         if (isNaN(value)) {
             errors.push(
                 this.invalidMessage
-                    .replace('{{ value }}', String(value))
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
             );
         }
         if (!isNaN(this.max) && value > this.max) {
             errors.push(
                 this.maxMessage
-                    .replace('{{ value }}', String(value))
-                    .replace('{{ limit }}', this.max)
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
+                    .replace('{{ limit }}', FpJsBaseConstraint.formatValue(this.max))
             );
         }
         if (!isNaN(this.min) && value < this.min) {
             errors.push(
                 this.minMessage
-                    .replace('{{ value }}', String(value))
-                    .replace('{{ limit }}', this.min)
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
+                    .replace('{{ limit }}', FpJsBaseConstraint.formatValue(this.min))
             );
         }
 
diff --git a/Resources/public/js/constraints/Regex.js b/Resources/public/js/constraints/Regex.js
@@ -14,7 +14,7 @@ function SymfonyComponentValidatorConstraintsRegex() {
         var f = FpJsFormValidator;
 
         if (!f.isValueEmty(value) && !this.pattern.test(value)) {
-            errors.push(this.message.replace('{{ value }}', String(value)));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/Time.js b/Resources/public/js/constraints/Time.js
@@ -13,7 +13,7 @@ function SymfonyComponentValidatorConstraintsTime() {
         var f = FpJsFormValidator;
 
         if (!f.isValueEmty(value) && !regexp.test(value)) {
-            errors.push(this.message.replace('{{ value }}', String(value)));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/True.js b/Resources/public/js/constraints/True.js
@@ -14,7 +14,7 @@ function SymfonyComponentValidatorConstraintsTrue() {
 
         var errors = [];
         if (true !== value) {
-            errors.push(this.message.replace('{{ value }}', value));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));
         }
 
         return errors;
diff --git a/Resources/public/js/constraints/Type.js b/Resources/public/js/constraints/Type.js
@@ -56,7 +56,6 @@ function SymfonyComponentValidatorConstraintsType() {
 
             case 'scalar':
                 isValid = (/boolean|number|string/).test(typeof value);
-                value = 'Array';
                 break;
 
             case '':
@@ -76,7 +75,7 @@ function SymfonyComponentValidatorConstraintsType() {
         if (!isValid) {
             errors.push(
                 this.message
-                    .replace('{{ value }}', value)
+                    .replace('{{ value }}', FpJsBaseConstraint.formatValue(value))
                     .replace('{{ type }}', this.type)
             );
         }
diff --git a/Resources/public/js/constraints/Url.js b/Resources/public/js/constraints/Url.js
@@ -14,7 +14,7 @@ function SymfonyComponentValidatorConstraintsUrl() {
 
         if (!f.isValueEmty(value) && !regexp.test(value)) {
             element.domNode.value = 'http://' + value;
-            errors.push(this.message.replace('{{ value }}', String('http://' + value)));
+            errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue('http://' + value)));
         }
 
         return errors;
diff --git a/Resources/public/js/fp_js_validator.js b/Resources/public/js/fp_js_validator.js
diff --git a/Tests/app/switch_sf_version.sh b/Tests/app/switch_sf_version.sh
diff --git a/composer.json b/composer.json

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ function SymfonyComponentValidatorConstraintsBlank() {`
`12`	`12`	`var f = FpJsFormValidator;`
`13`	`13`
`14`	`14`	`if (!f.isValueEmty(value)) {`
`15`		`- errors.push(this.message.replace('{{ value }}', String(value)));`
	`15`	`+ errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`return errors;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ function SymfonyComponentValidatorConstraintsDate() {`
`13`	`13`	`var f = FpJsFormValidator;`
`14`	`14`
`15`	`15`	`if (!f.isValueEmty(value) && !regexp.test(value)) {`
`16`		`- errors.push(this.message.replace('{{ value }}', String(value)));`
	`16`	`+ errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`return errors;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ function SymfonyComponentValidatorConstraintsFalse() {`
`10`	`10`	`this.validate = function (value) {`
`11`	`11`	`var errors = [];`
`12`	`12`	`if ('' !== value && false !== value) {`
`13`		`- errors.push(this.message.replace('{{ value }}', value));`
	`13`	`+ errors.push(this.message.replace('{{ value }}', FpJsBaseConstraint.formatValue(value)));`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`return errors;`