Commit 814eef80 authored by doctrine's avatar doctrine

component name conversion bug fixed

parent 03d10490
<?php <?php
/** /**
* class Doctrine_Access * Doctrine_Access
* *
* the purpose of Doctrine_Access is to provice array access * the purpose of Doctrine_Access is to provice array access
* and property overload interface for subclasses * and property overload interface for subclasses
*
* @package Doctrine ORM
* @url www.phpdoctrine.com
* @license LGPL
*/ */
abstract class Doctrine_Access implements ArrayAccess { abstract class Doctrine_Access implements ArrayAccess {
/** /**
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
require_once("Configurable.class.php"); require_once("Configurable.class.php");
require_once("EventListener.class.php"); require_once("EventListener.class.php");
/** /**
* @author Konsta Vesterinen
* @package Doctrine ORM * @package Doctrine ORM
* @url www.phpdoctrine.com * @url www.phpdoctrine.com
* @license LGPL * @license LGPL
......
...@@ -439,7 +439,7 @@ class Doctrine_Query extends Doctrine_Access { ...@@ -439,7 +439,7 @@ class Doctrine_Query extends Doctrine_Access {
} }
/** /**
* parseData * parseData
* parses a PDOStatement * parses the data returned by PDOStatement
* *
* @return array * @return array
*/ */
...@@ -826,8 +826,6 @@ class Doctrine_Query extends Doctrine_Access { ...@@ -826,8 +826,6 @@ class Doctrine_Query extends Doctrine_Access {
final public function load($path, $fetchmode = Doctrine::FETCH_LAZY) { final public function load($path, $fetchmode = Doctrine::FETCH_LAZY) {
$e = explode(".",$path); $e = explode(".",$path);
foreach($e as $key => $name) { foreach($e as $key => $name) {
$low = strtolower($name);
$name = ucwords($low);
try { try {
if($key == 0) { if($key == 0) {
...@@ -886,6 +884,7 @@ class Doctrine_Query extends Doctrine_Access { ...@@ -886,6 +884,7 @@ class Doctrine_Query extends Doctrine_Access {
} }
} catch(Exception $e) { } catch(Exception $e) {
throw new DQLException($e->getMessage(),$e->getCode()); throw new DQLException($e->getMessage(),$e->getCode());
} }
} }
......
...@@ -47,8 +47,8 @@ class Sensei_Session extends Doctrine_Record { ...@@ -47,8 +47,8 @@ class Sensei_Session extends Doctrine_Record {
* @return void * @return void
*/ */
public function setUp() { public function setUp() {
$this->ownsMany("Sensei_variable","Sensei_variable.session_id"); $this->ownsMany("Sensei_Variable","Sensei_Variable.session_id");
$this->hasOne("Sensei_entity","Sensei_session.entity_id"); $this->hasOne("Sensei_Entity","Sensei_Session.entity_id");
} }
/** /**
* setTableDefinition * setTableDefinition
...@@ -210,7 +210,7 @@ class Sensei extends Doctrine_Access { ...@@ -210,7 +210,7 @@ class Sensei extends Doctrine_Access {
$this->record->user_agent = $_SERVER['HTTP_USER_AGENT']; $this->record->user_agent = $_SERVER['HTTP_USER_AGENT'];
$this->record->updated = time(); $this->record->updated = time();
$this->record->session_id = $id; $this->record->session_id = $id;
$this->vars = $this->record->Sensei_variable; $this->vars = $this->record->Sensei_Variable;
if($this->record->getState() == Doctrine_Record::STATE_TDIRTY) { if($this->record->getState() == Doctrine_Record::STATE_TDIRTY) {
$this->record->created = time(); $this->record->created = time();
......
...@@ -186,8 +186,6 @@ abstract class Doctrine_Session extends Doctrine_Configurable implements Countab ...@@ -186,8 +186,6 @@ abstract class Doctrine_Session extends Doctrine_Configurable implements Countab
* @return object Doctrine_Table * @return object Doctrine_Table
*/ */
public function getTable($name) { public function getTable($name) {
// $name = ucwords(strtolower($name));
if(isset($this->tables[$name])) if(isset($this->tables[$name]))
return $this->tables[$name]; return $this->tables[$name];
......
...@@ -218,6 +218,9 @@ class Doctrine_Table extends Doctrine_Configurable { ...@@ -218,6 +218,9 @@ class Doctrine_Table extends Doctrine_Configurable {
break; break;
endswitch; endswitch;
} }
/**
* @return Doctrine_Repository
*/
public function getRepository() { public function getRepository() {
return $this->repository; return $this->repository;
} }
...@@ -334,7 +337,10 @@ class Doctrine_Table extends Doctrine_Configurable { ...@@ -334,7 +337,10 @@ class Doctrine_Table extends Doctrine_Configurable {
return $this->bound; return $this->bound;
} }
/** /**
* returns a bound relation array
*
* @param string $name * @param string $name
* @return array
*/ */
final public function getBound($name) { final public function getBound($name) {
if( ! isset($this->bound[$name])) if( ! isset($this->bound[$name]))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment