Changeset 8531

Timestamp:

04/18/08 19:15:38 (7 months ago)

Author:

dwhittle

Message:

dwhittle: merged changes to branch

Files:

• branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ObjectBuilder.php (modified) (3 diffs)
• branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/test/classes/propel/GeneratedObjectTest.php (modified) (2 diffs)
• branches/dwhittle/1.1/lib/test/sfTestBrowser.class.php (modified) (3 diffs)
• branches/dwhittle/1.1/lib/util/sfParameterHolder.class.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/validator/sfValidatorFile.class.php (modified) (2 diffs)
• branches/dwhittle/1.1/test/unit/validator/sfValidatorFileTest.php (modified) (2 diffs)

branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ObjectBuilder.php

@@ -2 +2 @@
-
-/*
-17 2008-03-27 17:58:03
+28 2008-04-18 10:29:27
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -3170 +3170 @@
-";
-
-
-
-
-
-
-
-
+
-    foreach ($table->getColumns() as $col) {
-
+
+
+
+
+
+
+
+
-        $script .= "
-    \$copyObj->set".$col->getPhpName()."(\$this->".strtolower($col->getName()).");
@@ -3232 +3233 @@
-";
-
-
-foreach ($table->getColumns() as $col) {
- if ($col->isPrimaryKey()
+
+// due to: http://propel.phpdb.org/trac/ticket/618
+foreach ($autoIncCols as $col
-        $coldefval = $col->getPhpDefaultValue();
-        $coldefval = var_export($coldefval, true);
-        $script .= "
-
-
-
+
+
-    } // foreach
-    $script .= "

branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/test/classes/propel/GeneratedObjectTest.php

@@ -1 +1 @@
-<?php
-/*
-19 2008-04-03 20:35:22Z soenke
+28 2008-04-18 10:29:27Z hans
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -884 +884 @@
-    $this->assertEquals($emp->getBookstoreEmployeeAccount()->getLogin(), $e2->getBookstoreEmployeeAccount()->getLogin());
-  }
+  
+  /**
+   * Test copying when an object has composite primary key.
+   * @link http://propel.phpdb.org/trac/ticket/618
+   */
+  public function testCopy_CompositePK()
+  {
+    $br = new BookReader();
+    $br->setName("TestReader");
+    $br->save();
+    $br->copy();
+    
+    $b = new Book();
+    $b->setTitle("TestBook");
+    $b->setISBN("XX-XX-XX-XX");
+    $b->save();
+    
+    $op = new BookOpinion();
+    $op->setBookReader($br);
+    $op->setBook($b);
+    $op->setRating(10);
+    $op->setRecommendToFriend(true);
+    $op->save();
+    
+    
+    $br2 = $br->copy(true);
+    
+    $this->assertNull($br2->getId());
+    
+    $opinions = $br2->getBookOpinions();
+    $this->assertEquals(1, count($opinions), "Expected to have a related BookOpinion after copy()");
+    
+    // We DO expect the reader_id to be null
+    $this->assertNull($opinions[0]->getReaderId());
+    // but we DO NOT expect the book_id to be null 
+    $this->assertEquals($op->getBookId(), $opinions[0]->getBookId());
+  }
-
-  /**

branches/dwhittle/1.1/lib/test/sfTestBrowser.class.php

@@ -474 +474 @@
-}
-
+if (!defined('E_RECOVERABLE_ERROR'))
+{
+  define('E_RECOVERABLE_ERROR', 4096);
+}
+
-/**
- * Error handler for the current test browser instance.
@@ -489 +494 @@
-  }
-
-s" error at %s line %s (%s)', '%s
+%s" error at %s line %s (%s)
-  switch ($errno)
-  {
@@ -501 +506 @@
-      throw new Exception(sprintf($msg, 'strict'));
-      break;
+    case E_RECOVERABLE_ERROR:
+      throw new Exception(sprintf($msg, 'catchable'));
+      break;
-  }
-}

branches/dwhittle/1.1/lib/util/sfParameterHolder.class.php

@@ -98 +98 @@
-    else
-    {
-get
+has
-    }
-

branches/dwhittle/1.1/lib/validator/sfValidatorFile.class.php

@@ -69 +69 @@
-        'image/gif',
-    )));
+    $this->addOption('validated_file_class', 'sfValidatedFile');
-
-    $this->addMessage('max_size', 'File is too large (maximum is %max_size% bytes).');
@@ -152 +153 @@
-    }
-
-
+
+
+
-  }
-

branches/dwhittle/1.1/test/unit/validator/sfValidatorFileTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-8
+9
-
-$tmpDir = sfToolkit::getTmpDir();
@@ -128 +128 @@
-$t->is($f->getSize(), strlen($content), '->clean() returns a sfValidatedFile with a computed file size if the size is not passed in the initial value');
-$t->is($f->getType(), 'text/plain', '->clean() returns a sfValidatedFile with a guessed content type');
+
+class myValidatedFile extends sfValidatedFile
+{
+}
+
+$v->setOption('validated_file_class', 'myValidatedFile');
+$f = $v->clean(array('tmp_name' => $tmpDir.'/test.txt'));
+$t->ok($f instanceof myValidatedFile, '->clean() can take a "validated_file_class" option');
-
-foreach (array(UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_EXTENSION) as $error)