RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-22 07:03:13 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-1872] skip 5.4 versions for php 5.3 uncompatible tests

Browse Source
This commit is contained in:
Luis Cordova 2012-07-29 22:55:26 -05:00
parent 8742377c3b
commit 5d0082471f
5 changed files with 83 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Doctrine/Tests/Models/DDC1872/DDC1872Bar.php Normal file
View File

@ -0,0 +1,12 @@
<?php
namespace Doctrine\Tests\Models\DDC1872;
/**
* @Entity
*/
class DDC1872Bar
{
/** @Id @Column(type="string") */
private $id;
}

31
tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithOverride.php Normal file
View File

@ -0,0 +1,31 @@
<?php
namespace Doctrine\Tests\Models\DDC1872;
/**
* @Entity
*
* @AttributeOverrides({
* @AttributeOverride(name="foo",
* column=@Column(
* name = "foo_overridden",
* type = "integer",
* length = 140,
* nullable = false,
* unique = false
* )
* )
* })
*
* @AssociationOverrides({
* @AssociationOverride(name="bar",
* joinColumns=@JoinColumn(
* name="example_entity_overridden_bar_id", referencedColumnName="id"
* )
* )
* })
*/
class DDC1872ExampleEntityWithOverride
{
use DDC1872ExampleTrait;
}

11
tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleEntityWithoutOverride.php Normal file
View File

@ -0,0 +1,11 @@
<?php
namespace Doctrine\Tests\Models\DDC1872;
/**
* @Entity
*/
class DDC1872ExampleEntityWithoutOverride
{
use DDC1872ExampleTrait;
}

23
tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleTrait.php Normal file
View File

@ -0,0 +1,23 @@
<?php
namespace Doctrine\Tests\Models\DDC1872;
/**
* Trait class
*/
trait DDC1872ExampleTrait
{
/** @Id @Column(type="string") */
private $id;
/**
* @Column(name="trait_foo", type="integer", length=100, nullable=true, unique=true)
*/
protected $foo;
/**
* @OneToOne(targetEntity="DDC1872Bar", cascade={"persist", "merge"})
* @JoinColumn(name="example_trait_bar_id", referencedColumnName="id")
*/
protected $bar;
}

73
tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
View File

@ -218,10 +218,14 @@ class AnnotationDriverTest extends AbstractMappingDriverTest
public function testAttributeOverridesMappingWithTrait() public function testAttributeOverridesMappingWithTrait()
{ {
if (!version_compare(PHP_VERSION, '5.4.0', '>=')) {
$this->markTestSkipped('Invalid PHP version, unable to run this test.');
}
$factory = $this->createClassMetadataFactory(); $factory = $this->createClassMetadataFactory();
$metadataWithoutOverride = $factory->getMetadataFor(get_class(new ExampleEntityWithoutOverride())); $metadataWithoutOverride = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithoutOverride');
$metadataWithOverride = $factory->getMetadataFor(get_class(new ExampleEntityWithOverride())); $metadataWithOverride = $factory->getMetadataFor('Doctrine\Tests\Models\DDC1872\DDC1872ExampleEntityWithOverride');
$this->assertEquals('trait_foo', $metadataWithoutOverride->fieldMappings['foo']['columnName']); $this->assertEquals('trait_foo', $metadataWithoutOverride->fieldMappings['foo']['columnName']);
$this->assertEquals('foo_overridden', $metadataWithOverride->fieldMappings['foo']['columnName']); $this->assertEquals('foo_overridden', $metadataWithOverride->fieldMappings['foo']['columnName']);
@ -351,68 +355,3 @@ class InvalidFetchOption
*/ */
private $collection; private $collection;
} }
/**
* @Entity
*
* @AttributeOverrides({
* @AttributeOverride(name="foo",
* column=@Column(
* name = "foo_overridden",
* type = "integer",
* length = 140,
* nullable = false,
* unique = false
* )
* )
* })
*
* @AssociationOverrides({
* @AssociationOverride(name="bar",
* joinColumns=@JoinColumn(
* name="example_entity_overridden_bar_id", referencedColumnName="id"
* )
* )
* })
*/
class ExampleEntityWithOverride
{
use ExampleTrait;
}
/**
* @Entity
*/
class ExampleEntityWithoutOverride
{
use ExampleTrait;
}
/**
* Trait class
*/
trait ExampleTrait
{
/** @Id @Column(type="string") */
private $id;
/**
* @Column(name="trait_foo", type="integer", length=100, nullable=true, unique=true)
*/
protected $foo;
/**
* @OneToOne(targetEntity="Bar", cascade={"persist", "merge"})
* @JoinColumn(name="example_trait_bar_id", referencedColumnName="id")
*/
protected $bar;
}
/**
* @Entity
*/
class Bar
{
/** @Id @Column(type="string") */
private $id;
}