'import' is a reserved word in PHP 6. Changed all method names / properties...

'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

lib/Doctrine.php

@@ -408,16 +408,16 @@ final class Doctrine
         }
     }
     /**
-     * import
+     * imprt
      * method for importing existing schema to Doctrine_Record classes
      *
      * @param string $directory
      * @param array $info
      * @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

lib/Doctrine/Connection.php

@@ -94,7 +94,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
      *
      *              export                      Doctrine_Export driver, handles db structure modification abstraction (contains
      *                                          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
      *
@@ -116,7 +116,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
                              'expression'  => false,
                              'dataDict'    => false,
                              'export'      => false,
-                             'import'      => false,
+                             'imprt'      => false,
                              'sequence'    => false,
                              'unitOfWork'  => false,
                              'formatter'   => false,

lib/Doctrine/Import.php

@@ -175,7 +175,7 @@ class Doctrine_Import extends Doctrine_Connection_Module
         return $this->conn->fetchColumn($this->sql['listViews']);
     }
     /**
-     * import
+     * imprt
      *
      * method for importing existing schema to Doctrine_Record classes
      *
@@ -183,7 +183,7 @@ class Doctrine_Import extends Doctrine_Connection_Module
      * @param array $databases
      * @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->setTargetPath($directory);

lib/Doctrine/Import/Schema.php

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