Skip to content

S
Silex
Commit a5a2599f authored by Fabien Potencier's avatar Fabien Potencier
Browse files
Options

removed unneeded code (now that the Validator component has been fixed)

parent 198c74fc
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 103 deletions
composer.lock
View file @ a5a2599f
{ {
"hash": "cb84b3fe6b1c0f5846880d387eb21ead", "hash": "e30e4b42f5fb1991fa491aefe225cc2e",
"packages": [ "packages": [
{ {
"package": "pimple/pimple", "package": "pimple/pimple",
...@@ -34,12 +34,6 @@ ...@@ -34,12 +34,6 @@
"version": "dev-master", "version": "dev-master",
"source-reference": "5d15807c883c6a927eb3ac3c04e9a3f62b92e5b4" "source-reference": "5d15807c883c6a927eb3ac3c04e9a3f62b92e5b4"
}, },
{
"package": "symfony/http-foundation",
"version": "dev-master",
"alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev"
},
{ {
"package": "symfony/http-kernel", "package": "symfony/http-kernel",
"version": "dev-master", "version": "dev-master",
...@@ -51,12 +45,6 @@ ...@@ -51,12 +45,6 @@
"version": "dev-master", "version": "dev-master",
"source-reference": "cca9802587090c5d24ed015437cebdb4e6a770c0" "source-reference": "cca9802587090c5d24ed015437cebdb4e6a770c0"
}, },
{
"package": "symfony/http-kernel",
"version": "dev-master",
"alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev"
},
{ {
"package": "symfony/routing", "package": "symfony/routing",
"version": "dev-master", "version": "dev-master",
...@@ -67,12 +55,6 @@ ...@@ -67,12 +55,6 @@
"package": "symfony/routing", "package": "symfony/routing",
"version": "dev-master", "version": "dev-master",
"source-reference": "9e0b9b0d4143a6b90752e1111d9948416ef62b50" "source-reference": "9e0b9b0d4143a6b90752e1111d9948416ef62b50"
},
{
"package": "symfony/routing",
"version": "dev-master",
"alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev"
} }
], ],
"packages-dev": [ "packages-dev": [
...@@ -99,13 +81,13 @@ ...@@ -99,13 +81,13 @@
{ {
"package": "swiftmailer/swiftmailer", "package": "swiftmailer/swiftmailer",
"version": "dev-master", "version": "dev-master",
"source-reference": "d33d54cc8a081b0b85734744936ede1ba230dd64" "alias-pretty-version": "4.1.x-dev",
"alias-version": "4.1.9999999.9999999-dev"
}, },
{ {
"package": "swiftmailer/swiftmailer", "package": "swiftmailer/swiftmailer",
"version": "dev-master", "version": "dev-master",
"alias-pretty-version": "4.1.x-dev", "source-reference": "0ba1372991110629f44ed076dfc5b93240a4a19a"
"alias-version": "4.1.9999999.9999999-dev"
}, },
{ {
"package": "symfony/browser-kit", "package": "symfony/browser-kit",
...@@ -118,11 +100,6 @@ ...@@ -118,11 +100,6 @@
"version": "dev-master", "version": "dev-master",
"source-reference": "6d1864547be92e51972a416fae9460b8be4afe0e" "source-reference": "6d1864547be92e51972a416fae9460b8be4afe0e"
}, },
{
"package": "symfony/css-selector",
"version": "dev-master",
"source-reference": "d0a98b37fbb57188766fd7c7d757354397ee6ead"
},
{ {
"package": "symfony/css-selector", "package": "symfony/css-selector",
"version": "dev-master", "version": "dev-master",
...@@ -130,9 +107,9 @@ ...@@ -130,9 +107,9 @@
"alias-version": "2.1.9999999.9999999-dev" "alias-version": "2.1.9999999.9999999-dev"
}, },
{ {
"package": "symfony/dom-crawler", "package": "symfony/css-selector",
"version": "dev-master", "version": "dev-master",
"source-reference": "2e27527036c4cd608692718414835173c40f52bd" "source-reference": "d0a98b37fbb57188766fd7c7d757354397ee6ead"
}, },
{ {
"package": "symfony/dom-crawler", "package": "symfony/dom-crawler",
...@@ -141,9 +118,9 @@ ...@@ -141,9 +118,9 @@
"alias-version": "2.1.9999999.9999999-dev" "alias-version": "2.1.9999999.9999999-dev"
}, },
{ {
"package": "symfony/finder", "package": "symfony/dom-crawler",
"version": "dev-master", "version": "dev-master",
"source-reference": "9ee9a907afeef52956187e862714a7702ca26590" "source-reference": "2e27527036c4cd608692718414835173c40f52bd"
}, },
{ {
"package": "symfony/finder", "package": "symfony/finder",
...@@ -152,9 +129,9 @@ ...@@ -152,9 +129,9 @@
"alias-version": "2.1.9999999.9999999-dev" "alias-version": "2.1.9999999.9999999-dev"
}, },
{ {
"package": "symfony/form", "package": "symfony/finder",
"version": "dev-master", "version": "dev-master",
"source-reference": "678c4b40815c322c9fae6e2b5b3d6a951c0e021f" "source-reference": "9ee9a907afeef52956187e862714a7702ca26590"
}, },
{ {
"package": "symfony/form", "package": "symfony/form",
...@@ -165,8 +142,7 @@ ...@@ -165,8 +142,7 @@
{ {
"package": "symfony/form", "package": "symfony/form",
"version": "dev-master", "version": "dev-master",
"alias-pretty-version": "2.1.x-dev", "source-reference": "678c4b40815c322c9fae6e2b5b3d6a951c0e021f"
"alias-version": "2.1.9999999.9999999-dev"
}, },
{ {
"package": "symfony/locale", "package": "symfony/locale",
...@@ -179,11 +155,6 @@ ...@@ -179,11 +155,6 @@
"version": "dev-master", "version": "dev-master",
"source-reference": "741210486db314ff288a44de2628da7ee31d383e" "source-reference": "741210486db314ff288a44de2628da7ee31d383e"
}, },
{
"package": "symfony/monolog-bridge",
"version": "dev-master",
"source-reference": "ee24f08e2e74ee964018ce9d5de2a37977f6ec6b"
},
{ {
"package": "symfony/monolog-bridge", "package": "symfony/monolog-bridge",
"version": "dev-master", "version": "dev-master",
...@@ -191,9 +162,9 @@ ...@@ -191,9 +162,9 @@
"alias-version": "2.1.9999999.9999999-dev" "alias-version": "2.1.9999999.9999999-dev"
}, },
{ {
"package": "symfony/options-resolver", "package": "symfony/monolog-bridge",
"version": "dev-master", "version": "dev-master",
"source-reference": "915b39d1e0ad1c1f2526b93a16a10e5e504aefad" "source-reference": "ee24f08e2e74ee964018ce9d5de2a37977f6ec6b"
}, },
{ {
"package": "symfony/options-resolver", "package": "symfony/options-resolver",
...@@ -204,19 +175,18 @@ ...@@ -204,19 +175,18 @@
{ {
"package": "symfony/options-resolver", "package": "symfony/options-resolver",
"version": "dev-master", "version": "dev-master",
"alias-pretty-version": "2.1.x-dev", "source-reference": "915b39d1e0ad1c1f2526b93a16a10e5e504aefad"
"alias-version": "2.1.9999999.9999999-dev"
}, },
{ {
"package": "symfony/process", "package": "symfony/process",
"version": "dev-master", "version": "dev-master",
"source-reference": "f4f101fc7c1adb8b157058dcc1715f28f1d53208" "alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev"
}, },
{ {
"package": "symfony/process", "package": "symfony/process",
"version": "dev-master", "version": "dev-master",
"alias-pretty-version": "2.1.x-dev", "source-reference": "f4f101fc7c1adb8b157058dcc1715f28f1d53208"
"alias-version": "2.1.9999999.9999999-dev"
}, },
{ {
"package": "symfony/security", "package": "symfony/security",
...@@ -230,7 +200,7 @@ ...@@ -230,7 +200,7 @@
"source-reference": "81db3fb8af37dd884580433a647df23d6de5347e" "source-reference": "81db3fb8af37dd884580433a647df23d6de5347e"
}, },
{ {
"package": "symfony/security", "package": "symfony/translation",
"version": "dev-master", "version": "dev-master",
"alias-pretty-version": "2.1.x-dev", "alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev" "alias-version": "2.1.9999999.9999999-dev"
...@@ -241,7 +211,7 @@ ...@@ -241,7 +211,7 @@
"source-reference": "db3e85934353a130d743b2ddd53dd678c8ebca12" "source-reference": "db3e85934353a130d743b2ddd53dd678c8ebca12"
}, },
{ {
"package": "symfony/translation", "package": "symfony/twig-bridge",
"version": "dev-master", "version": "dev-master",
"alias-pretty-version": "2.1.x-dev", "alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev" "alias-version": "2.1.9999999.9999999-dev"
...@@ -252,7 +222,7 @@ ...@@ -252,7 +222,7 @@
"source-reference": "97752ed347a8466bb33c70cfb8ddbc00b6e70512" "source-reference": "97752ed347a8466bb33c70cfb8ddbc00b6e70512"
}, },
{ {
"package": "symfony/twig-bridge", "package": "symfony/validator",
"version": "dev-master", "version": "dev-master",
"alias-pretty-version": "2.1.x-dev", "alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev" "alias-version": "2.1.9999999.9999999-dev"
...@@ -266,24 +236,18 @@ ...@@ -266,24 +236,18 @@
{ {
"package": "symfony/validator", "package": "symfony/validator",
"version": "dev-master", "version": "dev-master",
"source-reference": "563cda58cdde910cb900a4f28974b999924d4a0b" "source-reference": "8dc28e8b8f0c829322b6349979efc069f03db0c2"
},
{
"package": "symfony/validator",
"version": "dev-master",
"alias-pretty-version": "2.1.x-dev",
"alias-version": "2.1.9999999.9999999-dev"
}, },
{ {
"package": "twig/twig", "package": "twig/twig",
"version": "dev-master", "version": "dev-master",
"source-reference": "ca33207bb22fe6365d13bdaf034f936e30b53560" "alias-pretty-version": "1.8.x-dev",
"alias-version": "1.8.9999999.9999999-dev"
}, },
{ {
"package": "twig/twig", "package": "twig/twig",
"version": "dev-master", "version": "dev-master",
"alias-pretty-version": "1.8.x-dev", "source-reference": "120c44d68f07ced5b1e08f582f94016f4f2685d6"
"alias-version": "1.8.9999999.9999999-dev"
} }
], ],
"aliases": [ "aliases": [
......
src/Silex/Provider/ValidatorServiceProvider.php
View file @ a5a2599f
...@@ -17,8 +17,6 @@ use Silex\ServiceProviderInterface; ...@@ -17,8 +17,6 @@ use Silex\ServiceProviderInterface;
use Symfony\Component\Validator\Validator; use Symfony\Component\Validator\Validator;
use Symfony\Component\Validator\Mapping\ClassMetadataFactory; use Symfony\Component\Validator\Mapping\ClassMetadataFactory;
use Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader; use Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader;
use Symfony\Component\Validator\Mapping\Loader\LoaderChain;
use Symfony\Component\Validator\Mapping\Loader\XmlFileLoader;
use Symfony\Component\Validator\ConstraintValidatorFactory; use Symfony\Component\Validator\ConstraintValidatorFactory;
/** /**
...@@ -38,15 +36,6 @@ class ValidatorServiceProvider implements ServiceProviderInterface ...@@ -38,15 +36,6 @@ class ValidatorServiceProvider implements ServiceProviderInterface
}); });
$app['validator.mapping.class_metadata_factory'] = $app->share(function () use ($app) { $app['validator.mapping.class_metadata_factory'] = $app->share(function () use ($app) {
if (isset($app['form.factory'])) {
$reflClass = new \ReflectionClass('Symfony\\Component\\Form\\FormInterface');
return new ClassMetadataFactory(new LoaderChain(array(
new StaticMethodLoader(),
new XmlFileLoader(dirname($reflClass->getFileName()) . '/Resources/config/validation.xml')
)));
}
return new ClassMetadataFactory(new StaticMethodLoader()); return new ClassMetadataFactory(new StaticMethodLoader());
}); });
......
tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php
View file @ a5a2599f
...@@ -47,38 +47,6 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase ...@@ -47,38 +47,6 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
$this->assertInstanceOf('Symfony\Component\Validator\Validator', $app['validator']); $this->assertInstanceOf('Symfony\Component\Validator\Validator', $app['validator']);
} }
/**
* @depends testRegister
*/
public function testValidatorServiceWithFormServiceDisabled($app)
{
if (!is_dir(__DIR__ . '/../../../../vendor/symfony/form')) {
$this->markTestSkipped('Form component was not installed.');
}
$metadatas = $app['validator']->getMetadataFactory()->getClassMetadata('Symfony\Component\Form\Form');
$this->assertEquals(0, count($metadatas->constraints));
}
/**
* @depends testRegister
*/
public function testValidatorServiceWithFormServiceEnabled($app)
{
if (!is_dir(__DIR__ . '/../../../../vendor/symfony/form')) {
$this->markTestSkipped('Form component was not installed.');
}
$app->register(new ValidatorServiceProvider());
$app['form.factory'] = true;
$metadatas = $app['validator']->getMetadataFactory()->getClassMetadata('Symfony\Component\Form\Form');
$this->assertEquals(1, count($metadatas->constraints));
}
/** /**
* @depends testRegister * @depends testRegister
* @dataProvider testValidatorConstraintProvider * @dataProvider testValidatorConstraintProvider
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment