[Validator] Add expressionLanguage to ExpressionValidator constructor #16161

enumag · 2015-10-07T08:34:31Z

Q	A
Bug fix?	no
New feature?	yes
BC breaks?	no
Deprecations?	no
Tests pass?	yes
Fixed tickets
License	MIT
Doc PR

nicolas-grekas · 2015-10-07T08:38:53Z

src/Symfony/Component/Validator/Constraints/ExpressionValidator.php

@@ -38,17 +38,22 @@ class ExpressionValidator extends ConstraintValidator
    private $expressionLanguage;

    /**
-     * @param PropertyAccessorInterface|null $propertyAccessor Optional as of Symfony 2.5
+     * @param PropertyAccessorInterface|null $propertyAccessor   Optional as of Symfony 2.5
+     * @param ExpressionLanguage             $expressionLanguage


missing |null

Thanks, fixed.

stof · 2015-10-07T08:48:44Z

src/Symfony/Component/Validator/Constraints/ExpressionValidator.php

@@ -38,17 +38,22 @@ class ExpressionValidator extends ConstraintValidator
    private $expressionLanguage;

    /**
-     * @param PropertyAccessorInterface|null $propertyAccessor Optional as of Symfony 2.5
+     * @param PropertyAccessorInterface|null $propertyAccessor   Optional as of Symfony 2.5


the comment Optional as of Symfony 2.5 does not bring any value and should be removed IMO. when looking at the phpdoc, we don't really care about which version made it optional. Someone wanting to know this will look at the changelog or the git history

nicolas-grekas · 2015-10-07T08:50:59Z

src/Symfony/Component/Validator/Constraints/ExpressionValidator.php

-     * @param PropertyAccessorInterface|null $propertyAccessor Optional as of Symfony 2.5
-     *
-     * @throws UnexpectedTypeException If the property accessor is invalid
+     * @param PropertyAccessorInterface|null $propertyAccessor


Then I suggest removing the doc block, it provides no value, pure repetition of the signature

nicolas-grekas · 2015-10-07T08:53:54Z

We may have a test that expects the UnexpectedTypeException. If yes, it should be removed (I didn't check for it).

enumag · 2015-10-07T08:54:58Z

@nicolas-grekas If there is such test Travis is going to fail so I'll just wait for that.

nicolas-grekas · 2015-10-07T09:13:24Z

👍
Status: reviewed

stof · 2015-10-07T09:19:53Z

IMO, we should have a test ensuring that the ExpressionLanguage passed as argument is actually used, to avoid regressions

enumag · 2015-10-07T09:30:05Z

@stof Sounds reasonable (although there is no such test for propertyAccessor argument). I'm just not sure how to write it - I'd use Mockery for such tests, but symfony doesn't use it. Can you point me to a similar test in symfony?

stof · 2015-10-07T09:36:37Z

@enumag there are lots of tests in Symfony using PHPUnit mocks. look for any usage of getMock in the testsuite

enumag · 2015-10-07T10:28:39Z

@stof Can you give me some advice how to run symfony tests locally? The guide from http://symfony.com/doc/current/contributing/code/tests.html doesn't work at all.

I run composer update and then:

php ./phpunit symfony throws many errors, last of which is Warning: unlink(E:\Git\Symfony/src/Symfony/Component/Yaml/phpunit.stderr): No such file or directory in E:\Git\Symfony\phpunit on line 140.

php ./phpunit src/Symfony/Component/Validator complains about a wrong path (without telling me what the path is - or maybe it means the "src/Symfony/Component/Validator" is wrong, which it obviously isn't, I've triple-checked for typos).

The only thing that sorf of worked was this. It let me know about some parse errors I've made and then failed:

E:\Git\Symfony>php .\.phpunit\phpunit-4.8\phpunit src\Symfony\Component\Validator

Fatal error: Class 'Doctrine\Tests\Common\Annotations\Fixtures\AnnotationTargetAll' not found in E:\Git\Symfony\src\Symfony\C
omponent\Validator\vendor\doctrine\annotations\tests\Doctrine\Tests\Common\Annotations\DocParserTest.php on line 1351

I'm on Windows 7 and I installed msysgit with unix tools.

nicolas-grekas · 2015-10-10T06:20:37Z

@enumag can you please post the full output so that we can figure out what's wrong with the tests?

enumag · 2015-10-10T10:29:13Z

I've checked the output and there is nothing that points to the cause. However it seems there is some kind of problem with arguments escaping. When I hack Symfony\Component\Process\ProcessUtils::escapeArgument($argument) to just return the argument without any change, the tests suddenly work, although some of them fail.

enumag · 2015-10-10T10:45:54Z

Can't figure out the arguments escaping problem but I now know why some of the tests were failing for me. The reason is autocrlf setting in git. My default is

git config --global core.autocrlf true

You should add a .gitattributes file to fix this.

There are still some other tests failing. In case of Validator see this:

E:\Git\Symfony>php .\phpunit src/Symfony/Component/Validator
PHPUnit 4.8.10 by Sebastian Bergmann and contributors.

............................................................   60 / 2185 (  2%)
............................................................  120 / 2185 (  5%)
............................................................  180 / 2185 (  8%)
............................................................  240 / 2185 ( 10%)
...........................................................S  300 / 2185 ( 13%)
........SSSSS...............................................  360 / 2185 ( 16%)
..........SSS.SSS...........................................  420 / 2185 ( 19%)
............................................................  480 / 2185 ( 21%)
.................F..........................................  540 / 2185 ( 24%)
.......................F....................SSS.SSS.........  600 / 2185 ( 27%)
....SSSSSS....SSSSSS........................................  660 / 2185 ( 30%)
............................................................  720 / 2185 ( 32%)
............................................................  780 / 2185 ( 35%)
............................................................  840 / 2185 ( 38%)
............................................................  900 / 2185 ( 41%)
................................SS.SS.......................  960 / 2185 ( 43%)
............................................................ 1020 / 2185 ( 46%)
............................................................ 1080 / 2185 ( 49%)
............................................................ 1140 / 2185 ( 52%)
............................................................ 1200 / 2185 ( 54%)
............................................................ 1260 / 2185 ( 57%)
...................................................S........ 1320 / 2185 ( 60%)
............................................................ 1380 / 2185 ( 63%)
.............SSS..SSS.............SSSSSS...SSSSSS........... 1440 / 2185 ( 65%)
....................................................SSS.SSS. 1500 / 2185 ( 68%)
..................S......................................... 1560 / 2185 ( 71%)
........................SSSSSSSSSSSSSSSS.................... 1620 / 2185 ( 74%)
............................................................ 1680 / 2185 ( 76%)
............................................................ 1740 / 2185 ( 79%)
............................................................ 1800 / 2185 ( 82%)
............................................................ 1860 / 2185 ( 85%)
................................................SSS......... 1920 / 2185 ( 87%)
............................................................ 1980 / 2185 ( 90%)
............................................................ 2040 / 2185 ( 93%)
............................................................ 2100 / 2185 ( 96%)
............................................................ 2160 / 2185 ( 98%)
.........................

Time: 24.67 seconds, Memory: 63.75Mb

There were 2 failures:

1) Symfony\Component\Validator\Tests\Constraints\FileValidatorObjectTest::testUploadedFileError with data set #8 (1, 'uploadIniSizeErrorMessage', array(1000, 'MiB'), '1000M')
Failed asserting that two objects are equal.
--- Expected
+++ Actual
@@ @@
 Symfony\Component\Validator\ConstraintViolation Object (
     'message' => null
     'messageTemplate' => 'myMessage'
     'parameters' => Array (
-        '{{ limit }}' => 1000
-        '{{ suffix }}' => 'MiB'
+        '{{ limit }}' => '1000'
+        '{{ suffix }}' => 'MB'
     )
     'plural' => null
     'root' => 'root'
     'propertyPath' => 'property.path'
     'invalidValue' => 'InvalidValue'
     'constraint' => Symfony\Component\Validator\Constraints\NotNull Object (...)
     'code' => 1
     'cause' => null
 )

E:\Git\Symfony\src\Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest.php:421
E:\Git\Symfony\src\Symfony\Component\Validator\Tests\Constraints\FileValidatorTest.php:431

2) Symfony\Component\Validator\Tests\Constraints\FileValidatorPathTest::testUploadedFileError with data set #8 (1, 'uploadIniSizeErrorMessage', array(1000, 'MiB'), '1000M')
Failed asserting that two objects are equal.
--- Expected
+++ Actual
@@ @@
 Symfony\Component\Validator\ConstraintViolation Object (
     'message' => null
     'messageTemplate' => 'myMessage'
     'parameters' => Array (
-        '{{ limit }}' => 1000
-        '{{ suffix }}' => 'MiB'
+        '{{ limit }}' => '1000'
+        '{{ suffix }}' => 'MB'
     )
     'plural' => null
     'root' => 'root'
     'propertyPath' => 'property.path'
     'invalidValue' => 'InvalidValue'
     'constraint' => Symfony\Component\Validator\Constraints\NotNull Object (...)
     'code' => 1
     'cause' => null
 )

E:\Git\Symfony\src\Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest.php:421
E:\Git\Symfony\src\Symfony\Component\Validator\Tests\Constraints\FileValidatorTest.php:431

FAILURES!
Tests: 2185, Assertions: 4557, Failures: 2, Skipped: 79.

Legacy deprecation notices (276)
KO src/Symfony/Component/Validator

enumag · 2015-10-10T11:37:56Z

Arguments escaping problem is caused by https://bugs.php.net/bug.php?id=49139. Adding additional double quotes into both proc_open calls in https://github.com/symfony/symfony/blob/2.8/phpunit fixed my problem. The second suggested workaround with bypass_shell option only works for one of the calls.

enumag · 2015-10-10T12:26:44Z

@stof I've added the requested test. Not sure if this is the correct way to write such test though.

fabpot · 2015-10-19T11:49:35Z

Thank you @enumag.

…tor constructor (enumag) This PR was merged into the 2.8 branch. Discussion ---------- [Validator] Add expressionLanguage to ExpressionValidator constructor | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 4ad1e20 [Validator] Add expressionLanguage to ExpressionValidator constructor

carsonbot added the Status: Needs Review label Oct 7, 2015

enumag force-pushed the patch-expression branch 3 times, most recently from d604110 to 81130b3 Compare October 7, 2015 08:37

enumag changed the title ~~[Validator] Add optional expressionLanguage argument to ExpressionValidator~~ [Validator] Add expressionLanguage to ExpressionValidator constructor Oct 7, 2015

nicolas-grekas reviewed Oct 7, 2015
View reviewed changes

enumag force-pushed the patch-expression branch from 81130b3 to aa9757c Compare October 7, 2015 08:41

stof reviewed Oct 7, 2015
View reviewed changes

enumag force-pushed the patch-expression branch from aa9757c to ce1d197 Compare October 7, 2015 08:50

nicolas-grekas reviewed Oct 7, 2015
View reviewed changes

enumag force-pushed the patch-expression branch from ce1d197 to b3deb5b Compare October 7, 2015 08:53

carsonbot added Status: Reviewed and removed Status: Needs Review labels Oct 7, 2015

enumag force-pushed the patch-expression branch 2 times, most recently from 9e41727 to 64bb03e Compare October 10, 2015 12:24

[Validator] Add expressionLanguage to ExpressionValidator constructor

4ad1e20

enumag force-pushed the patch-expression branch from 64bb03e to 4ad1e20 Compare October 10, 2015 12:25

fabpot merged commit 4ad1e20 into symfony:2.8 Oct 19, 2015

fabpot mentioned this pull request Nov 16, 2015

Release v2.8.0-BETA1 #16550

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Validator] Add expressionLanguage to ExpressionValidator constructor #16161

[Validator] Add expressionLanguage to ExpressionValidator constructor #16161

enumag commented Oct 7, 2015

nicolas-grekas Oct 7, 2015

enumag Oct 7, 2015

stof Oct 7, 2015

enumag Oct 7, 2015

nicolas-grekas Oct 7, 2015

stof Oct 7, 2015

enumag Oct 7, 2015

nicolas-grekas commented Oct 7, 2015

enumag commented Oct 7, 2015

nicolas-grekas commented Oct 7, 2015

stof commented Oct 7, 2015

enumag commented Oct 7, 2015

stof commented Oct 7, 2015

enumag commented Oct 7, 2015

nicolas-grekas commented Oct 10, 2015

enumag commented Oct 10, 2015

enumag commented Oct 10, 2015

enumag commented Oct 10, 2015

enumag commented Oct 10, 2015

fabpot commented Oct 19, 2015

[Validator] Add expressionLanguage to ExpressionValidator constructor #16161

[Validator] Add expressionLanguage to ExpressionValidator constructor #16161

Conversation

enumag commented Oct 7, 2015

nicolas-grekas Oct 7, 2015

Choose a reason for hiding this comment

enumag Oct 7, 2015

Choose a reason for hiding this comment

stof Oct 7, 2015

Choose a reason for hiding this comment

enumag Oct 7, 2015

Choose a reason for hiding this comment

nicolas-grekas Oct 7, 2015

Choose a reason for hiding this comment

stof Oct 7, 2015

Choose a reason for hiding this comment

enumag Oct 7, 2015

Choose a reason for hiding this comment

nicolas-grekas commented Oct 7, 2015

enumag commented Oct 7, 2015

nicolas-grekas commented Oct 7, 2015

stof commented Oct 7, 2015

enumag commented Oct 7, 2015

stof commented Oct 7, 2015

enumag commented Oct 7, 2015

nicolas-grekas commented Oct 10, 2015

enumag commented Oct 10, 2015

enumag commented Oct 10, 2015

enumag commented Oct 10, 2015

enumag commented Oct 10, 2015

fabpot commented Oct 19, 2015