RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-23 16:33:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request from da-eto-ya/remove_public_validation

Browse Source 
Remove incorrect (outdated) validation for public fields in SchemaValidator
This commit is contained in:
Marco Pivetta 2014-02-19 21:21:59 +01:00
commit 5a2497d482
2 changed files with 0 additions and 20 deletions
lib/Doctrine/ORM/Tools
SchemaValidator.php
tests/Doctrine/Tests/ORM/Functional
SchemaValidatorTest.php

14
lib/Doctrine/ORM/Tools/SchemaValidator.php

@ -236,20 +236,6 @@ class SchemaValidator
}
}
foreach ($class->reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $publicAttr) {
if ($publicAttr->isStatic()) {
continue;
}
if ( ! isset($class->fieldMappings[$publicAttr->getName()]) &&
! isset($class->associationMappings[$publicAttr->getName()])) {
continue;
}
$ce[] = "Field '".$publicAttr->getName()."' in class '".$class->name."' must be private ".
"or protected. Public fields may break lazy-loading.";
}
foreach ($class->subClasses as $subClass) {
if (!in_array($class->name, class_parents($subClass))) {
$ce[] = "According to the discriminator map class '" . $subClass . "' has to be a child ".

6
tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php

@ -38,12 +38,6 @@ class SchemaValidatorTest extends \Doctrine\Tests\OrmFunctionalTestCase
foreach ($classes as $class) {
$ce = $validator->validateClass($class);
foreach ($ce as $key => $error) {
if (strpos($error, "must be private or protected. Public fields may break lazy-loading.") !== false) {
unset($ce[$key]);
}
}
$this->assertEquals(0, count($ce), "Invalid Modelset: " . $modelSet . " class " . $class->name . ": ". implode("\n", $ce));
}
}