RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

'import' is a reserved word in PHP 6. Changed all method names / properties name from import to imprt. This means the documentation will need to be changed

Browse source
This commit is contained in:
nicobn 2007-08-15 14:49:00 +00:00
parent b3e983abc3
commit a062835e43
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Doctrine.php
View file

@ -408,16 +408,16 @@ final class Doctrine
} }
} }
/** /**
* import * imprt
* method for importing existing schema to Doctrine_Record classes * method for importing existing schema to Doctrine_Record classes
* *
* @param string $directory * @param string $directory
* @param array $info * @param array $info
* @return boolean * @return boolean
*/ */
public static function import($directory, array $databases = array()) public static function imprt($directory, array $databases = array())
{ {
return Doctrine_Manager::connection()->import->import($directory, $databases); return Doctrine_Manager::connection()->imprt->imprt($directory, $databases);
} }
/** /**
* export * export

4
lib/Doctrine/Connection.php
View file

@ -94,7 +94,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
* *
* export Doctrine_Export driver, handles db structure modification abstraction (contains * export Doctrine_Export driver, handles db structure modification abstraction (contains
* methods such as alterTable, createConstraint etc.) * methods such as alterTable, createConstraint etc.)
* import Doctrine_Import driver, handles db schema reading * imprt Doctrine_Import driver, handles db schema reading
* *
* sequence Doctrine_Sequence driver, handles sequential id generation and retrieval * sequence Doctrine_Sequence driver, handles sequential id generation and retrieval
* *
@ -116,7 +116,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
'expression' => false, 'expression' => false,
'dataDict' => false, 'dataDict' => false,
'export' => false, 'export' => false,
'import' => false, 'imprt' => false,
'sequence' => false, 'sequence' => false,
'unitOfWork' => false, 'unitOfWork' => false,
'formatter' => false, 'formatter' => false,

4
lib/Doctrine/Import.php
View file

@ -175,7 +175,7 @@ class Doctrine_Import extends Doctrine_Connection_Module
return $this->conn->fetchColumn($this->sql['listViews']); return $this->conn->fetchColumn($this->sql['listViews']);
} }
/** /**
* import * imprt
* *
* method for importing existing schema to Doctrine_Record classes * method for importing existing schema to Doctrine_Record classes
* *
@ -183,7 +183,7 @@ class Doctrine_Import extends Doctrine_Connection_Module
* @param array $databases * @param array $databases
* @return array the names of the imported classes * @return array the names of the imported classes
*/ */
public function import($directory, array $databases = array()) public function imprt($directory, array $databases = array())
{ {
$builder = new Doctrine_Import_Builder(); $builder = new Doctrine_Import_Builder();
$builder->setTargetPath($directory); $builder->setTargetPath($directory);

4
lib/Doctrine/Import/Schema.php
View file

@ -48,7 +48,7 @@ class Doctrine_Import_Schema
* @param string $directory The directory where the Doctrine_Record classes will * @param string $directory The directory where the Doctrine_Record classes will
* be written * be written
*/ */
public function import($schema, $directory) public function imprt($schema, $directory)
{ {
$builder = new Doctrine_Import_Builder(); $builder = new Doctrine_Import_Builder();
$builder->setTargetPath($directory); $builder->setTargetPath($directory);
@ -62,4 +62,4 @@ class Doctrine_Import_Schema
$builder->buildRecord($options, $columns, array()); $builder->buildRecord($options, $columns, array());
} }
} }
} }