Merge branch '2.7'

fabpot · fabpot · commit 3805557b75a7 · 2014-12-13T10:20:22.000+01:00
* 2.7:
  Fix failing tests after merge
  fix ocramius/proxy-manager dependency version
diff --git a/composer.json b/composer.json
@@ -75,7 +75,7 @@
         "monolog/monolog": "~1.11",
         "propel/propel1": "~1.6",
         "ircmaxell/password-compat": "~1.0",
-        "ocramius/proxy-manager": "~0.3.1",
+        "ocramius/proxy-manager": "~0.4|~1.0",
         "egulias/email-validator": "~1.2"
     },
     "autoload": {
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.3",
         "symfony/dependency-injection": "~2.3",
-        "ocramius/proxy-manager": "~0.3.1"
+        "ocramius/proxy-manager": "~0.4|~1.0"
     },
     "require-dev": {
         "symfony/config": "~2.3"
diff --git a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
@@ -58,24 +58,18 @@ public function validate($object, Constraint $constraint)
                 }
 
                 call_user_func($method, $object, $this->context);
+            } elseif (null !== $object) {
+                if (!method_exists($object, $method)) {
+                    throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist', $method));
+                }
 
-                continue;
-            }
-
-            if (null === $object) {
-                continue;
-            }
-
-            if (!method_exists($object, $method)) {
-                throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist', $method));
-            }
-
-            $reflMethod = new \ReflectionMethod($object, $method);
+                $reflMethod = new \ReflectionMethod($object, $method);
 
-            if ($reflMethod->isStatic()) {
-                $reflMethod->invoke(null, $object, $this->context);
-            } else {
-                $reflMethod->invoke($object, $this->context);
+                if ($reflMethod->isStatic()) {
+                    $reflMethod->invoke(null, $object, $this->context);
+                } else {
+                    $reflMethod->invoke($object, $this->context);
+                }
             }
         }
     }
