RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-05 03:06:05 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-221] Namespace fixes.

Browse Source
This commit is contained in:
romanb 2009-12-22 13:56:30 +00:00
parent 42a1af8256
commit afbe3add30
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/Common/Cli/CliController.php
View File

@ -68,11 +68,11 @@ class CliController extends AbstractNamespace
$this->setConfiguration($config);
// Include core namespaces of tasks
$ns = '\Doctrine\Common\Cli\Tasks';
$ns = 'Doctrine\Common\Cli\Tasks';
$this->addNamespace('Core')
->addTask('help', $ns . '\HelpTask');
$ns = '\Doctrine\ORM\Tools\Cli\Tasks';
$ns = 'Doctrine\ORM\Tools\Cli\Tasks';
$this->addNamespace('Orm')
->addTask('clear-cache', $ns . '\ClearCacheTask')
->addTask('convert-mapping', $ns . '\ConvertMappingTask')
@ -82,7 +82,7 @@ class CliController extends AbstractNamespace
->addTask('schema-tool', $ns . '\SchemaToolTask')
->addTask('version', $ns . '\VersionTask');
$ns = '\Doctrine\DBAL\Tools\Cli\Tasks';
$ns = 'Doctrine\DBAL\Tools\Cli\Tasks';
$this->addNamespace('Dbal')
->addTask('run-sql', $ns . '\RunSqlTask');
}

5
lib/Doctrine/ORM/Persisters/StandardEntityPersister.php
View File

@ -103,9 +103,8 @@ class StandardEntityPersister
private $_insertSql;
/**
* Initializes a new instance of a class derived from AbstractEntityPersister
* that uses the given EntityManager and persists instances of the class described
* by the given class metadata descriptor.
* Initializes a new <tt>StandardEntityPersister</tt> that uses the given EntityManager
* and persists instances of the class described by the given class metadata descriptor.
*
* @param EntityManager $em
* @param ClassMetadata $class

7
tools/sandbox/doctrine.php
View File

@ -1,13 +1,12 @@
<?php
require_once __DIR__ . '/../../lib/Doctrine/Common/ClassLoader.php';
require __DIR__ . '/../../lib/Doctrine/Common/ClassLoader.php';
$classLoader = new \Doctrine\Common\ClassLoader();
$classLoader->setIncludePath(__DIR__ . '/../../lib');
$classLoader = new \Doctrine\Common\ClassLoader('Doctrine', __DIR__ . '/../../lib');
$classLoader->register();
// Variable $configuration is defined inside cli-config.php
require_once __DIR__ . '/cli-config.php';
require __DIR__ . '/cli-config.php';
$cli = new \Doctrine\Common\Cli\CliController($configuration);
$cli->run($_SERVER['argv']);