Author: romanb
Date: 2008-09-13 11:36:58 +0100 (Sat, 13 Sep 2008)
New Revision: 4963
Removed:
trunk/lib/Doctrine/Query/Filter.php
trunk/lib/Doctrine/Query/Registry.php
trunk/lib/Doctrine/Query/Registry/
trunk/lib/Doctrine/Query/Tokenizer.php
Modified:
trunk/lib/Doctrine/ORM/ActiveEntity.php
trunk/lib/Doctrine/ORM/EntityRepository.php
Log:
removed some more legacy
Modified: trunk/lib/Doctrine/ORM/ActiveEntity.php
===================================================================
--- trunk/lib/Doctrine/ORM/ActiveEntity.php 2008-09-13 10:28:29 UTC (rev
4962)
+++ trunk/lib/Doctrine/ORM/ActiveEntity.php 2008-09-13 10:36:58 UTC (rev
4963)
@@ -21,37 +21,10 @@
*/
public function save()
{
- // TODO: Forward to EntityManager. There: registerNew() OR
registerDirty() on UnitOfWork.
$this->_em->save($this);
}
/**
- * Execute a SQL REPLACE query. A REPLACE query is identical to a INSERT
- * query, except that if there is already a row in the table with the same
- * key field values, the REPLACE query just updates its values instead of
- * inserting a new row.
- *
- * The REPLACE type of query does not make part of the SQL standards. Since
- * practically only MySQL and SQLIte implement it natively, this type of
- * query isemulated through this method for other DBMS using standard types
- * of queries inside a transaction to assure the atomicity of the
operation.
- *
- * @param Doctrine_Connection $conn optional connection
parameter
- * @throws Doctrine_Connection_Exception if some of the key values
was null
- * @throws Doctrine_Connection_Exception if there were no key fields
- * @throws Doctrine_Connection_Exception if something fails at
database level
- * @return integer number of rows affected
- * @todo ActiveEntity method.
- */
- public function replace()
- {
- return $this->_em->replace(
- $this->_class,
- $this->getPrepared(),
- $this->_id);
- }
-
- /**
* Creates an array representation of the object's data.
*
* @param boolean $deep - Return also the relations
@@ -213,11 +186,9 @@
* Deletes the persistent state of the entity.
*
* @return boolean TRUE on success, FALSE on failure.
- * @todo ActiveRecord method.
*/
public function delete()
{
- // TODO: Forward to EntityManager. There: registerRemoved() on
UnitOfWork
return $this->_em->remove($this);
}
@@ -268,7 +239,6 @@
* @param string $alias related component alias
* @param array $ids the identifiers of the related records
* @return Doctrine_Entity this object
- * @todo ActiveEntity method.
*/
public function unlink($alias, $ids = array())
{
@@ -322,7 +292,6 @@
* @param string $alias related component alias
* @param array $ids the identifiers of the related records
* @return Doctrine_Entity this object
- * @todo ActiveEntity method.
*/
public function link($alias, array $ids)
{
Modified: trunk/lib/Doctrine/ORM/EntityRepository.php
===================================================================
--- trunk/lib/Doctrine/ORM/EntityRepository.php 2008-09-13 10:28:29 UTC (rev
4962)
+++ trunk/lib/Doctrine/ORM/EntityRepository.php 2008-09-13 10:36:58 UTC (rev
4963)
@@ -26,10 +26,8 @@
* Base class for all custom user-defined repositories.
* Provides basic finder methods, common to all repositories.
*
- * @package Doctrine
- * @subpackage EntityRepository
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link www.phpdoctrine.org
+ * @link www.doctrine-project.org
* @since 2.0
* @version $Revision$
* @author Roman Borschel <[EMAIL PROTECTED]>
@@ -40,7 +38,7 @@
protected $_em;
protected $_classMetadata;
- public function __construct($entityName, Doctrine_ClassMetadata
$classMetadata)
+ public function __construct($entityName,
Doctrine_ORM_Mapping_ClassMetadata $classMetadata)
{
$this->_entityName = $entityName;
$this->_em = $classMetadata->getConnection();
@@ -70,7 +68,7 @@
*/
public function clear()
{
-
$this->_em->unitOfWork->clearIdentitiesForEntity($this->_classMetadata->getRootClassName());
+
$this->_em->getUnitOfWork()->clearIdentitiesForEntity($this->_classMetadata->getRootClassName());
}
/**
@@ -185,7 +183,7 @@
* findById, findByContactId, etc.
*
* @return void
- * @throws Doctrine_Mapper_Exception If the method called is an invalid
find* method
+ * @throws BadMethodCallException If the method called is an invalid
find* method
* or no find* method at all and
therefore an invalid
* method call.
*/
@@ -198,7 +196,7 @@
$by = substr($method, 9, strlen($method));
$method = 'findOneBy';
} else {
- throw new Doctrine_Mapper_Exception("Undefined method '$method'.");
+ throw new BadMethodCallException("Undefined method '$method'.");
}
if (isset($by)) {
Deleted: trunk/lib/Doctrine/Query/Filter.php
===================================================================
--- trunk/lib/Doctrine/Query/Filter.php 2008-09-13 10:28:29 UTC (rev 4962)
+++ trunk/lib/Doctrine/Query/Filter.php 2008-09-13 10:36:58 UTC (rev 4963)
@@ -1,63 +0,0 @@
-<?php
-/*
- * $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-/**
- * Doctrine_Query_Filter
- *
- * @package Doctrine
- * @subpackage Query
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link www.phpdoctrine.org
- * @since 1.0
- * @version $Revision$
- * @author Konsta Vesterinen <[EMAIL PROTECTED]>
- */
-class Doctrine_Query_Filter implements Doctrine_Query_Filter_Interface
-{
- /**
- * preQuery
- *
- * Method for listening the preQuery method of Doctrine_Query and
- * hooking into the query building procedure, doing any custom /
specialized
- * query building procedures that are neccessary.
- *
- * @return void
- */
- public function preQuery(Doctrine_Query $query)
- {
-
- }
-
- /**
- * postQuery
- *
- * Method for listening the postQuery method of Doctrine_Query and
- * to hook into the query building procedure, doing any custom /
specialized
- * post query procedures (for example logging) that are neccessary.
- *
- * @param Doctrine_Query $query
- * @return void
- */
- public function postQuery(Doctrine_Query $query)
- {
-
- }
-}
\ No newline at end of file
Deleted: trunk/lib/Doctrine/Query/Registry.php
===================================================================
--- trunk/lib/Doctrine/Query/Registry.php 2008-09-13 10:28:29 UTC (rev
4962)
+++ trunk/lib/Doctrine/Query/Registry.php 2008-09-13 10:36:58 UTC (rev
4963)
@@ -1,76 +0,0 @@
-<?php
-/*
- * $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-/**
- * Doctrine_Query_Registry
- *
- * @package Doctrine
- * @subpackage Query
- * @author Konsta Vesterinen <[EMAIL PROTECTED]>
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link www.phpdoctrine.org
- * @since 1.0
- * @version $Revision$
- * @todo Remove
- */
-class Doctrine_Query_Registry
-{
- protected $_queries = array();
-
- public function add($key, $query)
- {
- if (strpos($key, '/') === false) {
- $this->_queries[$key] = $query;
- } else {
- // namespace found
-
- $e = explode('/', $key);
-
- $this->_queries[$e[0]][$e[1]] = $query;
- }
- }
-
- public function get($key, $namespace = null)
- {
- if (isset($namespace)) {
- if ( ! isset($this->_queries[$namespace][$key])) {
- throw new Doctrine_Query_Registry_Exception('A query with the
name ' . $namespace . '/' . $key . ' does not exist.');
- }
- $query = $this->_queries[$namespace][$key];
- } else {
- if ( ! isset($this->_queries[$key])) {
- try {
- throw new Exception();
- } catch (Exception $e) {
- echo $e->getTraceAsString() ."<br /><br />";
- }
- throw new Doctrine_Query_Registry_Exception('A query with the
name ' . $key . ' does not exist.');
- }
- $query = $this->_queries[$key];
- }
-
- if ( ! ($query instanceof Doctrine_Query)) {
- $query = Doctrine_Query::create()->parseQuery($query);
- }
-
- return $query;
- }
-}
\ No newline at end of file
Deleted: trunk/lib/Doctrine/Query/Tokenizer.php
===================================================================
--- trunk/lib/Doctrine/Query/Tokenizer.php 2008-09-13 10:28:29 UTC (rev
4962)
+++ trunk/lib/Doctrine/Query/Tokenizer.php 2008-09-13 10:36:58 UTC (rev
4963)
@@ -1,384 +0,0 @@
-<?php
-/*
- * $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-/**
- * Doctrine_Query_Tokenizer
- *
- * @package Doctrine
- * @subpackage Query
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link www.phpdoctrine.org
- * @since 1.0
- * @version $Revision$
- * @todo Remove.
- */
-class Doctrine_Query_Tokenizer
-{
-
- /**
- * tokenizeQuery
- * splits the given dql query into an array where keys
- * represent different query part names and values are
- * arrays splitted using sqlExplode method
- *
- * example:
- *
- * parameter:
- * $query = "SELECT u.* FROM User u WHERE u.name LIKE ?"
- * returns:
- * array('select' => array('u.*'),
- * 'from' => array('User', 'u'),
- * 'where' => array('u.name', 'LIKE', '?'))
- *
- * @param string $query DQL query
- * @throws Doctrine_Query_Exception if some generic parsing error
occurs
- * @return array an array containing the query
string parts
- */
- public function tokenizeQuery($query)
- {
- $parts = array();
- $tokens = $this->sqlExplode($query, ' ');
-
- foreach ($tokens as $index => $token) {
- $token = trim($token);
- switch (strtolower($token)) {
- case 'delete':
- case 'update':
- case 'select':
- case 'set':
- case 'from':
- case 'where':
- case 'limit':
- case 'offset':
- case 'having':
- $p = $token;
- //$parts[$token] = array();
- $parts[$token] = '';
- break;
- case 'order':
- case 'group':
- $i = ($index + 1);
- if (isset($tokens[$i]) && strtolower($tokens[$i]) ===
'by') {
- $p = $token;
- $parts[$token] = '';
- //$parts[$token] = array();
- } else {
- $parts[$p] .= "$token ";
- //$parts[$p][] = $token;
- }
- break;
- case 'by':
- continue;
- default:
- if ( ! isset($p)) {
- throw new Doctrine_Query_Tokenizer_Exception(
- "Couldn't tokenize query. Encountered invalid
token: '$token'.");
- }
-
- $parts[$p] .= "$token ";
- //$parts[$p][] = $token;
- }
- }
- return $parts;
- }
-
- /**
- * trims brackets
- *
- * @param string $str
- * @param string $e1 the first bracket, usually '('
- * @param string $e2 the second bracket, usually ')'
- */
- public function bracketTrim($str, $e1 = '(', $e2 = ')')
- {
- if (substr($str, 0, 1) === $e1 && substr($str, -1) === $e2) {
- return substr($str, 1, -1);
- } else {
- return $str;
- }
- }
-
- /**
- * bracketExplode
- *
- * example:
- *
- * parameters:
- * $str = (age < 20 AND age > 18) AND email LIKE '[EMAIL PROTECTED]'
- * $d = ' AND '
- * $e1 = '('
- * $e2 = ')'
- *
- * would return an array:
- * array("(age < 20 AND age > 18)",
- * "email LIKE '[EMAIL PROTECTED]'")
- *
- * @param string $str
- * @param string $d the delimeter which explodes the string
- * @param string $e1 the first bracket, usually '('
- * @param string $e2 the second bracket, usually ')'
- *
- */
- public function bracketExplode($str, $d = ' ', $e1 = '(', $e2 = ')')
- {
- if (is_array($d)) {
- $a = preg_split('#('.implode('|', $d).')#i', $str);
- $d = stripslashes($d[0]);
- } else {
- $a = explode($d, $str);
- }
-
- $i = 0;
- $term = array();
- foreach($a as $key=>$val) {
- if (empty($term[$i])) {
- $term[$i] = trim($val);
- $s1 = substr_count($term[$i], $e1);
- $s2 = substr_count($term[$i], $e2);
-
- if ($s1 == $s2) {
- $i++;
- }
- } else {
- $term[$i] .= $d . trim($val);
- $c1 = substr_count($term[$i], $e1);
- $c2 = substr_count($term[$i], $e2);
-
- if ($c1 == $c2) {
- $i++;
- }
- }
- }
- return $term;
- }
-
- /**
- * quoteExplode
- *
- * example:
- *
- * parameters:
- * $str = email LIKE '[EMAIL PROTECTED]'
- * $d = ' LIKE '
- *
- * would return an array:
- * array("email", "LIKE", "'[EMAIL PROTECTED]'")
- *
- * @param string $str
- * @param string $d the delimeter which explodes the string
- */
- public function quoteExplode($str, $d = ' ')
- {
- if (is_array($d)) {
- $a = preg_split('/('.implode('|', $d).')/', $str);
- $d = stripslashes($d[0]);
- } else {
- $a = explode($d, $str);
- }
-
- $i = 0;
- $term = array();
- foreach ($a as $key => $val) {
- if (empty($term[$i])) {
- $term[$i] = trim($val);
-
- if ( ! (substr_count($term[$i], "'") & 1)) {
- $i++;
- }
- } else {
- $term[$i] .= $d . trim($val);
-
- if ( ! (substr_count($term[$i], "'") & 1)) {
- $i++;
- }
- }
- }
- return $term;
- }
-
- /**
- * sqlExplode
- *
- * explodes a string into array using custom brackets and
- * quote delimeters
- *
- *
- * example:
- *
- * parameters:
- * $str = "(age < 20 AND age > 18) AND name LIKE 'John Doe'"
- * $d = ' '
- * $e1 = '('
- * $e2 = ')'
- *
- * would return an array:
- * array('(age < 20 AND age > 18)',
- * 'name',
- * 'LIKE',
- * 'John Doe')
- *
- * @param string $str
- * @param string $d the delimeter which explodes the string
- * @param string $e1 the first bracket, usually '('
- * @param string $e2 the second bracket, usually ')'
- *
- * @return array
- */
- public function sqlExplode($str, $d = ' ', $e1 = '(', $e2 = ')')
- {
- if ($d == ' ') {
- $d = array(' ', '\s');
- }
- if (is_array($d)) {
- $d = array_map('preg_quote', $d);
-
- if (in_array(' ', $d)) {
- $d[] = '\s';
- }
-
- $split = '#(' . implode('|', $d) . ')#';
-
- $str = preg_split($split, $str);
- $d = stripslashes($d[0]);
- } else {
- $str = explode($d, $str);
- }
-
- $i = 0;
- $term = array();
-
- foreach ($str as $key => $val) {
- if (empty($term[$i])) {
- $term[$i] = trim($val);
-
- $s1 = substr_count($term[$i], $e1);
- $s2 = substr_count($term[$i], $e2);
-
- if (strpos($term[$i], '(') !== false) {
- if ($s1 == $s2) {
- $i++;
- }
- } else {
- if ( ! (substr_count($term[$i], "'") & 1) &&
- ! (substr_count($term[$i], "\"") & 1)) {
- $i++;
- }
- }
- } else {
- $term[$i] .= $d . trim($val);
- $c1 = substr_count($term[$i], $e1);
- $c2 = substr_count($term[$i], $e2);
-
- if (strpos($term[$i], '(') !== false) {
- if ($c1 == $c2) {
- $i++;
- }
- } else {
- if ( ! (substr_count($term[$i], "'") & 1) &&
- ! (substr_count($term[$i], "\"") & 1)) {
- $i++;
- }
- }
- }
- }
- return $term;
- }
-
- /**
- * clauseExplode
- *
- * explodes a string into array using custom brackets and
- * quote delimeters
- *
- *
- * example:
- *
- * parameters:
- * $str = "(age < 20 AND age > 18) AND name LIKE 'John Doe'"
- * $d = ' '
- * $e1 = '('
- * $e2 = ')'
- *
- * would return an array:
- * array('(age < 20 AND age > 18)',
- * 'name',
- * 'LIKE',
- * 'John Doe')
- *
- * @param string $str
- * @param string $d the delimeter which explodes the string
- * @param string $e1 the first bracket, usually '('
- * @param string $e2 the second bracket, usually ')'
- *
- * @return array
- */
- public function clauseExplode($str, array $d, $e1 = '(', $e2 = ')')
- {
- if (is_array($d)) {
- $d = array_map('preg_quote', $d);
-
- if (in_array(' ', $d)) {
- $d[] = '\s';
- }
-
- $split = '#(' . implode('|', $d) . ')#';
-
- $str = preg_split($split, $str, -1, PREG_SPLIT_DELIM_CAPTURE);
- }
-
- $i = 0;
- $term = array();
-
- foreach ($str as $key => $val) {
- if ($key & 1) {
- if (isset($term[($i - 1)]) && ! is_array($term[($i - 1)])) {
- $term[($i - 1)] = array($term[($i - 1)], $val);
- }
- continue;
- }
- if (empty($term[$i])) {
- $term[$i] = $val;
- } else {
- $term[$i] .= $str[($key - 1)] . $val;
- }
-
- $c1 = substr_count($term[$i], $e1);
- $c2 = substr_count($term[$i], $e2);
-
- if (strpos($term[$i], '(') !== false) {
- if ($c1 == $c2) {
- $i++;
- }
- } else {
- if ( ! (substr_count($term[$i], "'") & 1) &&
- ! (substr_count($term[$i], "\"") & 1)) {
- $i++;
- }
- }
- }
-
- if (isset($term[$i - 1])) {
- $term[$i - 1] = array($term[$i - 1], '');
- }
-
- return $term;
- }
-}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"doctrine-svn" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.co.uk/group/doctrine-svn?hl=en-GB
-~----------~----~----~----~------~----~------~--~---
