RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-09 18:47:10 +03:00
Code Issues Projects Releases Wiki Activity

Fix some code standard things

Browse Source
This commit is contained in:
Geoffrey Wagner 2014-01-09 10:48:38 -06:00
parent 4772cbfae6
commit e9739f8591
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -2550,8 +2550,9 @@ class ClassMetadataInfo implements ClassMetadata
*/ */
public function addLifecycleCallback($callback, $event) public function addLifecycleCallback($callback, $event)
{ {
if(isset($this->lifecycleCallbacks[$event]) && in_array($callback, $this->lifecycleCallbacks[$event])) if(isset($this->lifecycleCallbacks[$event]) && in_array($callback, $this->lifecycleCallbacks[$event])) {
return; return;
}
$this->lifecycleCallbacks[$event][] = $callback; $this->lifecycleCallbacks[$event][] = $callback;
} }

8
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
View File

@ -469,10 +469,10 @@ class AnnotationDriver extends AbstractAnnotationDriver
if (isset($classAnnotations['Doctrine\ORM\Mapping\HasLifecycleCallbacks'])) if (isset($classAnnotations['Doctrine\ORM\Mapping\HasLifecycleCallbacks']))
{ {
/* @var $method \ReflectionMethod */ /* @var $method \ReflectionMethod */
foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method){
{
foreach ($this->getMethodCallbacks($method) as $value) foreach ($this->getMethodCallbacks($method) as $value) {
{
$metadata->addLifecycleCallback($value[0], $value[1]); $metadata->addLifecycleCallback($value[0], $value[1]);
} }
} }

11
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php
View File

@ -1,13 +1,12 @@
<?php <?php
/**
* Created by PhpStorm.
* User: gwagner
* Date: 1/8/14
* Time: 8:19 PM
*/
namespace Doctrine\Tests\ORM\Functional\Ticket; namespace Doctrine\Tests\ORM\Functional\Ticket;
/**
* Class DDC2895Test
* @package Doctrine\Tests\ORM\Functional\Ticket
* @author http://github.com/gwagner
*/
class DDC2895Test extends \Doctrine\Tests\OrmFunctionalTestCase class DDC2895Test extends \Doctrine\Tests\OrmFunctionalTestCase
{ {
public function setUp() public function setUp()