tests/TestAssociationProxies.class.php @@ -45,11 +45,11 @@ <weburl>http://localhost/</weburl> </webInvocation> <shell> - <phpexe>/usr/bin/php</phpexe> + <phpexe>/usr/bin/php-shell</phpexe> <phpini/> </shell> <options> - <phpincludepath>/usr/share/php5;/usr/share/php</phpincludepath> + <phpincludepath>.;/usr/share/php5;/usr/share/php</phpincludepath> <defaultFile/> <startupFileMode>1</startupFileMode> </options> @@ -113,6 +113,7 @@ <kdevfileview> <groups> <group pattern="*.class.php" name="Klassendateien" /> + <group pattern="*.module.php" name="Moduldateien" /> <group pattern="*.php" name="PHP-Scripte" /> <group pattern="*.txt,README" name="Dokumentation" /> <hidenonprojectfiles>false</hidenonprojectfiles> AdoDBRecord.kdevelop @@ -223,7 +223,7 @@ $options = $this->_has_many[$property]; } elseif (AdoDBRecord_Tools::is_belongs_to_property($property)) { - $returns_many = true; + $returns_many = false; $options = $this->_belongs_to[$property]; } elseif (AdoDBRecord_Tools::is_has_one_property($property)) { lib/AdoDBRecord/Base.class.php @@ -20,7 +20,7 @@ class Singleton { function &instance($class = false) { if ($class === false) { - if (!isset($this)) die("Singleton::instance() called from non-instantiated context."); + if (!isset($this)) die("Singleton::instance() called from non-instanciated context."); $class = get_class($this); } $class = ucfirst(strtolower($class)); lib/Singleton.class.php d6c2e9736ae31ec60e2cf05dd1572ca439336e92 Kai Krakow kk@netactive.de http://github.com/kakra/adodbrecord/commit/5ff986eb5d2fcde7409d6aef1d953aea577e47f4 5ff986eb5d2fcde7409d6aef1d953aea577e47f4 2009-02-02T11:56:37-08:00 2009-02-02T11:56:37-08:00 Prepare association tests for implementation 539307563527616e1b6e2310a4b044a3d7b6b996 Kai Krakow kk@netactive.de