+Doctrine MongoDB
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php
index ab6189a7ae472..9860733347672 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php
@@ -259,6 +259,23 @@ public function testAnnotationsBundleMappingDetection()
$this->assertEquals('DoctrineMongoDBBundle\Tests\DependencyInjection\Fixtures\Bundles\AnnotationsBundle\Document', $calls[0][1][1]);
}
+ public function testAnnotationsBundleMappingDetectionWithVendorNamespace()
+ {
+ $container = $this->getContainer('AnnotationsBundle', 'Vendor');
+ $loader = new DoctrineMongoDBExtension();
+
+ $loader->mongodbLoad(array(), $container);
+
+ $this->assertEquals(array(), $container->getParameter('doctrine.odm.mongodb.mapping_dirs'));
+ $this->assertEquals('%doctrine.odm.mongodb.mapping_dirs%', $container->getParameter('doctrine.odm.mongodb.xml_mapping_dirs'));
+ $this->assertEquals('%doctrine.odm.mongodb.mapping_dirs%', $container->getParameter('doctrine.odm.mongodb.yml_mapping_dirs'));
+ $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/Vendor/AnnotationsBundle/Document'), $container->getParameter('doctrine.odm.mongodb.document_dirs'));
+
+ $calls = $container->getDefinition('doctrine.odm.mongodb.metadata')->getMethodCalls();
+ $this->assertEquals('doctrine.odm.mongodb.metadata.annotation', (string) $calls[0][1][0]);
+ $this->assertEquals('DoctrineMongoDBBundle\Tests\DependencyInjection\Fixtures\Bundles\Vendor\AnnotationsBundle\Document', $calls[0][1][1]);
+ }
+
public function testDocumentManagerMetadataCacheDriverConfiguration()
{
$container = $this->getContainer();
@@ -316,13 +333,13 @@ public function testDependencyInjectionImportsOverrideDefaults()
$this->assertTrue($container->getParameter('doctrine.odm.mongodb.auto_generate_proxy_classes'));
}
- protected function getContainer($bundle = 'YamlBundle')
+ protected function getContainer($bundle = 'YamlBundle', $vendor = null)
{
- require_once __DIR__.'/Fixtures/Bundles/'.$bundle.'/'.$bundle.'.php';
+ require_once __DIR__.'/Fixtures/Bundles/'.($vendor ? $vendor.'/' : '').$bundle.'/'.$bundle.'.php';
return new ContainerBuilder(new ParameterBag(array(
'kernel.bundle_dirs' => array('DoctrineMongoDBBundle\\Tests\\DependencyInjection\\Fixtures\\Bundles' => __DIR__.'/Fixtures/Bundles'),
- 'kernel.bundles' => array('DoctrineMongoDBBundle\\Tests\\DependencyInjection\\Fixtures\\Bundles\\'.$bundle.'\\'.$bundle),
+ 'kernel.bundles' => array('DoctrineMongoDBBundle\\Tests\\DependencyInjection\\Fixtures\\Bundles\\'.($vendor ? $vendor.'\\' : '').$bundle.'\\'.$bundle),
'kernel.cache_dir' => sys_get_temp_dir(),
)));
}
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/Bundles/Vendor/AnnotationsBundle/AnnotationsBundle.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/Bundles/Vendor/AnnotationsBundle/AnnotationsBundle.php
new file mode 100644
index 0000000000000..c64c8afdc2a69
--- /dev/null
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/Bundles/Vendor/AnnotationsBundle/AnnotationsBundle.php
@@ -0,0 +1,9 @@
+context->getPropertyPath();
$factory = $this->context->getClassMetadataFactory();
- if (is_array($value)) {
- foreach ($value as $key => $element) {
- $walker->walkConstraint($constraint, $element, $group, $propertyPath.'['.$key.']');
- }
- } else if (!is_object($value)) {
+ if (!is_array($value) && !is_object($value)) {
throw new UnexpectedTypeException($value, 'object or array');
} else if ($constraint->class && !$value instanceof $constraint->class) {
$this->setMessage($constraint->message, array('class' => $constraint->class));
return false;
- } else {
+ } else if (!is_array($value)) {
$metadata = $factory->getClassMetadata(get_class($value));
$walker->walkClass($metadata, $value, $group, $propertyPath);
}
+ if (is_array($value) || $value instanceof \Traversable) {
+ foreach ($value as $key => $element) {
+ $walker->walkConstraint($constraint, $element, $group, $propertyPath.'['.$key.']');
+ }
+ }
+
return true;
}
}
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Fixtures/Namespaced/Bar.php b/tests/Symfony/Tests/Component/HttpFoundation/Fixtures/Namespaced/Bar.php
new file mode 100644
index 0000000000000..c16eef7b080cc
--- /dev/null
+++ b/tests/Symfony/Tests/Component/HttpFoundation/Fixtures/Namespaced/Bar.php
@@ -0,0 +1,7 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\HttpFoundation;
+
+use Symfony\Component\HttpFoundation\UniversalClassLoader;
+
+class UniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @covers Symfony\Component\HttpFoundation\UniversalClassLoader::loadClass
+ * @dataProvider testClassProvider
+ */
+ public function testLoadClass($className, $testClassName, $message)
+ {
+ $loader = new UniversalClassLoader();
+ $loader->registerNamespace('Namespaced', __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures');
+ $loader->registerPrefix('Pearlike_', __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures');
+ $loader->loadClass($testClassName);
+ $this->assertTrue(class_exists($className), $message);
+ }
+
+ public static function testClassProvider()
+ {
+ return array(
+ array('\\Namespaced\\Foo', 'Namespaced\\Foo', '->loadClass() loads Namespaced\Foo class'),
+ array('\\Pearlike_Foo', 'Pearlike_Foo', '->loadClass() loads Pearlike_Foo class'),
+ array('\\Namespaced\\Bar', '\\Namespaced\\Bar', '->loadClass() loads Namespaced\Bar class with a leading slash'),
+ array('\\Pearlike_Bar', '\\Pearlike_Bar', '->loadClass() loads Pearlike_Bar class with a leading slash'),
+ );
+ }
+}
+
diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/ValidValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/ValidValidatorTest.php
index 788247d6e924d..17e971a6d334b 100644
--- a/tests/Symfony/Tests/Component/Validator/Constraints/ValidValidatorTest.php
+++ b/tests/Symfony/Tests/Component/Validator/Constraints/ValidValidatorTest.php
@@ -79,6 +79,35 @@ public function testWalkArray()
$this->assertTrue($this->validator->isValid($array, $constraint));
}
+ public function testWalkTraversable()
+ {
+ $this->context->setGroup('MyGroup');
+ $this->context->setPropertyPath('foo');
+
+ $constraint = new Valid();
+ $metadata = $this->createClassMetadata();
+ $entity = new Entity();
+ // can only test for one object due to PHPUnit's mocking limitations
+ $traversable = new \ArrayObject( array('key' => $entity));
+
+ $this->walker->expects($this->once())
+ ->method('walkConstraint')
+ ->with($this->equalTo($constraint), $this->equalTo($entity), 'MyGroup', 'foo[key]');
+
+ $this->factory->expects($this->once())
+ ->method('getClassMetadata')
+ ->with($this->equalTo(get_class($traversable)))
+ ->will($this->returnValue($metadata));
+
+
+ $this->walker->expects($this->once())
+ ->method('walkClass')
+ ->with($this->equalTo($metadata), $this->equalTo($traversable), 'MyGroup', 'foo');
+
+
+ $this->assertTrue($this->validator->isValid($traversable, $constraint));
+ }
+
public function testValidateClass_Succeeds()
{
$metadata = $this->createClassMetadata();
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: