Changeset 4933 for trunk/lib/Doctrine
- Timestamp:
- 09/12/08 11:58:33 (4 months ago)
- Location:
- trunk/lib/Doctrine
- Files:
-
- 1 added
- 1 removed
- 3 modified
-
Common/Configuration.php (added)
-
Configuration.php (deleted)
-
Connection.php (modified) (1 diff)
-
ConnectionFactory.php (modified) (1 diff)
-
EntityManager.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/Doctrine/Connection.php
r4932 r4933 173 173 // Create default config and event manager if none given 174 174 if ( ! $config) { 175 $this->_config = new Doctrine_Co nfiguration();175 $this->_config = new Doctrine_Common_Configuration(); 176 176 } 177 177 if ( ! $eventManager) { -
trunk/lib/Doctrine/ConnectionFactory.php
r4932 r4933 59 59 * @return Connection 60 60 */ 61 public function createConnection(array $params, Doctrine_Co nfiguration $config = null,61 public function createConnection(array $params, Doctrine_Common_Configuration $config = null, 62 62 Doctrine_Common_EventManager $eventManager = null) 63 63 { 64 64 // create default config and event manager, if not set 65 65 if ( ! $config) { 66 $config = new Doctrine_Co nfiguration();66 $config = new Doctrine_Common_Configuration(); 67 67 } 68 68 if ( ! $eventManager) { -
trunk/lib/Doctrine/EntityManager.php
r4932 r4933 149 149 * @param string $name 150 150 */ 151 protected function __construct(Doctrine_Connection $conn, $name, Doctrine_Co nfiguration $config,151 protected function __construct(Doctrine_Connection $conn, $name, Doctrine_Common_Configuration $config, 152 152 Doctrine_Common_EventManager $eventManager) 153 153 {