From bea3a7c50dbcfa755b2d795f20ea36ca02b7da9e Mon Sep 17 00:00:00 2001 From: jwage Date: Fri, 15 Feb 2008 18:42:06 +0000 Subject: [PATCH] Minor changes backported from 0.9 and 0.10 --- lib/Doctrine/Configurable.php | 13 ++++ lib/Doctrine/Connection.php | 15 ++++ lib/Doctrine/Data/Import.php | 6 +- package.php | 136 +++++++++++++++++++--------------- tools/sandbox/config.php | 2 +- tools/sandbox/doctrine.php | 21 +++++- 6 files changed, 127 insertions(+), 66 deletions(-) diff --git a/lib/Doctrine/Configurable.php b/lib/Doctrine/Configurable.php index 1e35963bf..1e5ec20b7 100644 --- a/lib/Doctrine/Configurable.php +++ b/lib/Doctrine/Configurable.php @@ -385,6 +385,19 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable */ public function getAttribute($attribute) { + if (is_string($attribute)) { + $upper = strtoupper($attribute); + + $const = 'Doctrine::ATTR_' . $upper; + + if (defined($const)) { + $attribute = constant($const); + $this->_state = $attribute; + } else { + throw new Doctrine_Exception('Unknown attribute: "' . $attribute . '"'); + } + } + $attribute = (int) $attribute; if ($attribute < 0) { diff --git a/lib/Doctrine/Connection.php b/lib/Doctrine/Connection.php index 729199631..71534cb0a 100644 --- a/lib/Doctrine/Connection.php +++ b/lib/Doctrine/Connection.php @@ -328,11 +328,26 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun return $this->_name; } + /** + * setName + * + * Sets the name of the connection + * + * @param string $name + * @return void + */ public function setName($name) { $this->_name = $name; } + /** + * getDriverName + * + * Gets the name of the instance driver + * + * @return void + */ public function getDriverName() { return $this->driverName; diff --git a/lib/Doctrine/Data/Import.php b/lib/Doctrine/Data/Import.php index 86ad88b60..28f469328 100644 --- a/lib/Doctrine/Data/Import.php +++ b/lib/Doctrine/Data/Import.php @@ -130,6 +130,9 @@ class Doctrine_Data_Import extends Doctrine_Data foreach ($row as $key => $value) { if ($obj->getTable()->hasField($key)) { $obj->set($key, $value); + } else if (method_exists($obj, 'set' . Doctrine::classify($key))) { + $func = 'set' . Doctrine::classify($key); + $obj->$func($value); } else if ($obj->getTable()->hasRelation($key)) { if (is_array($value)) { if (isset($value[0])) { @@ -149,9 +152,6 @@ class Doctrine_Data_Import extends Doctrine_Data } else { $obj->set($key, $this->_getImportedObject($value)); } - } else if (method_exists($obj, 'set' . Doctrine::classify($key))) { - $func = 'set' . Doctrine::classify($key); - $obj->$func($value); } } } diff --git a/package.php b/package.php index 0ee661c2a..8213b1958 100644 --- a/package.php +++ b/package.php @@ -1,21 +1,23 @@ 'svn', + 'changelogoldtonew' => false, + 'simpleoutput' => true, + 'baseinstalldir' => '/', + 'packagedirectory' => $path, + 'packageFile' => $packageFile, + 'clearcontents' => false, + // What to ignore + 'ignore' => array( + $path . DIRECTORY_SEPARATOR . 'vendor/', + $path . DIRECTORY_SEPARATOR . 'package*.*', + $path . DIRECTORY_SEPARATOR . 'tests_old/', + $path . DIRECTORY_SEPARATOR . 'tests/', + $path . DIRECTORY_SEPARATOR . 'tools/' + ), + // What to include in package + 'include' => array( + $path . DIRECTORY_SEPARATOR . 'lib/', + $path . DIRECTORY_SEPARATOR . 'manual/', + $path . DIRECTORY_SEPARATOR . 'vendor/', + $path . DIRECTORY_SEPARATOR . 'README', + $path . DIRECTORY_SEPARATOR . 'CHANGELOG', + $path . DIRECTORY_SEPARATOR . 'LICENSE', + $path . DIRECTORY_SEPARATOR . 'COPYRIGHT' + ), + // Dir roles + 'dir_roles' => array( + 'lib' => 'php', + 'manual' => 'doc', + 'vendor' => 'php' + ), + // File roles + 'exceptions' => array( + 'README' => 'doc', + 'CHANGELOG' => 'doc', + 'LICENSE' => 'doc', + 'COPYRIGHT' => 'doc' + ) + ); -$options = array( - 'filelistgenerator' => 'svn', - 'changelogoldtonew' => false, - 'simpleoutput' => true, - 'baseinstalldir' => '/', - 'packagedirectory' => './', - 'packagefile' => $packagefile, - 'clearcontents' => false, - 'ignore' => array( - 'vendor/', - 'tools/', - 'package*.php', - 'package*.xml', - ), - 'dir_roles' => array( - 'lib' => 'php', - 'manual' => 'doc', - 'models' => 'doc', - 'tests' => 'test', - ), - 'exceptions' => array( - 'README' => 'doc', - 'CHANGELOG' => 'doc', - 'LICENSE' => 'doc', - 'COPYRIGHT' => 'doc' - ) -); + $package = &PEAR_packageFileManager2::importOptions($packageFile, $options); + $package->setPackageType('php'); -$package = &PEAR_PackageFileManager2::importOptions($packagefile, $options); -$package->setPackageType('php'); + $package->clearDeps(); + $package->setPhpDep('5.2.3'); + $package->setPearInstallerDep('1.4.0b1'); + $package->addPackageDepWithChannel('required', 'PEAR', 'pear.php.net', '1.3.6'); -$package->clearDeps(); -$package->setPhpDep('5.2.3'); -$package->setPearInstallerDep('1.4.0b1'); -$package->addPackageDepWithChannel('required', 'PEAR', 'pear.php.net', '1.3.6'); + $package->addRelease(); + $package->generateContents(); + $package->setReleaseVersion($version); + $package->setAPIVersion($version); + $package->setReleaseStability($state); + $package->setAPIStability($state); + $package->setNotes($notes); + $package->setSummary($summary); + $package->setDescription($description); + $package->addGlobalReplacement('package-info', '@package_version@', 'version'); -$package->addRelease(); -$package->generateContents(); -$package->setReleaseVersion($version_release); -$package->setAPIVersion($version_api); -$package->setReleaseStability($state); -$package->setAPIStability($state); -$package->setNotes($notes); -$package->setSummary($summary); -$package->setDescription($description); -$package->addGlobalReplacement('package-info', '@package_version@', 'version'); - -if (isset($_GET['make']) || (isset($_SERVER['argv']) && @$_SERVER['argv'][1] == 'make')) { - $package->writePackageFile(); -} else { - $package->debugPackageFile(); -} + if (isset($_GET['make']) || (isset($_SERVER['argv']) && @$_SERVER['argv'][1] == 'make')) { + $package->writepackageFile(); + } else { + $package->debugpackageFile(); + } +} \ No newline at end of file diff --git a/tools/sandbox/config.php b/tools/sandbox/config.php index 6abbf714f..5cb42b2b1 100644 --- a/tools/sandbox/config.php +++ b/tools/sandbox/config.php @@ -50,4 +50,4 @@ spl_autoload_register(array('Doctrine', 'autoload')); Doctrine_Manager::connection(DSN, 'sandbox'); -Doctrine_Manager::getInstance()->setAttribute(Doctrine::ATTR_MODEL_LOADING, Doctrine::MODEL_LOADING_CONSERVATIVE); +Doctrine_Manager::getInstance()->setAttribute('model_loading', 'conservative'); \ No newline at end of file diff --git a/tools/sandbox/doctrine.php b/tools/sandbox/doctrine.php index e0651351e..1b3545e46 100644 --- a/tools/sandbox/doctrine.php +++ b/tools/sandbox/doctrine.php @@ -1,5 +1,24 @@ +#!/usr/bin/env php setAttribute(Doctrine::ATTR_MODEL_LOADING, Doctrine::MODEL_LOADING_CONSERVATIVE); // Configure Doctrine Cli // Normally these are arguments to the cli tasks but if they are set here the arguments will be auto-filled