From 34262aeae198485c98ec6315ee2e6020d3ae795b Mon Sep 17 00:00:00 2001
From: "Roman S. Borschel" <roman.borschel@googlemail.com>
Date: Sun, 8 Aug 2010 12:52:46 +0200
Subject: [PATCH] Removed support for experimental C extension. Will be
re-examined for 3.0.
---
lib/Doctrine/ORM/Configuration.php | 23 -----------------------
lib/Doctrine/ORM/UnitOfWork.php | 20 +++-----------------
2 files changed, 3 insertions(+), 40 deletions(-)
diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
index 994e65e62..5e5341d1d 100644
--- a/lib/Doctrine/ORM/Configuration.php
+++ b/lib/Doctrine/ORM/Configuration.php
@@ -239,29 +239,6 @@ class Configuration extends \Doctrine\DBAL\Configuration
$this->_attributes['metadataCacheImpl'] = $cacheImpl;
}
- /**
- * Gets a boolean flag that indicates whether Doctrine should make use of the
- * C extension.
- *
- * @return boolean TRUE if Doctrine is configured to use the C extension, FALSE otherwise.
- */
- public function getUseCExtension()
- {
- return isset($this->_attributes['useCExtension']) ?
- $this->_attributes['useCExtension'] : false;
- }
-
- /**
- * Sets a boolean flag that indicates whether Doctrine should make use of the
- * C extension.
- *
- * @param boolean $boolean Whether to make use of the C extension or not.
- */
- public function setUseCExtension($boolean)
- {
- $this->_attributes['useCExtension'] = $boolean;
- }
-
/**
* Adds a named DQL query to the configuration.
*
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 916952850..c929ddad1 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -200,15 +200,6 @@ class UnitOfWork implements PropertyChangedListener
* @var array
*/
private $collectionPersisters = array();
-
- /**
- * EXPERIMENTAL:
- * Flag for whether or not to make use of the C extension which is an experimental
- * library that aims to improve the performance of some critical code sections.
- *
- * @var boolean
- */
- private $useCExtension = false;
/**
* The EventManager used for dispatching events.
@@ -235,7 +226,6 @@ class UnitOfWork implements PropertyChangedListener
{
$this->em = $em;
$this->evm = $em->getEventManager();
- $this->useCExtension = $this->em->getConfiguration()->getUseCExtension();
}
/**
@@ -1866,13 +1856,9 @@ class UnitOfWork implements PropertyChangedListener
}
if ($overrideLocalValues) {
- if ($this->useCExtension) {
- doctrine_populate_data($entity, $data);
- } else {
- foreach ($data as $field => $value) {
- if (isset($class->fieldMappings[$field])) {
- $class->reflFields[$field]->setValue($entity, $value);
- }
+ foreach ($data as $field => $value) {
+ if (isset($class->fieldMappings[$field])) {
+ $class->reflFields[$field]->setValue($entity, $value);
}
}