merging fixes and changes from my sandbox up to last svn commit [675]

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@677 3807eeeb-6ff5-0310-8944-8be069107fe0

app/views/tests/index.thtml

@@ -0,0 +1,4 @@
+<?php 
+/* empty view 
+ * output is handle by the test suite
+ */ ?>

libs/model.php

@@ -1526,11 +1526,10 @@ class Model extends Object
  * @return True if the input string ends in "_id", else false.
  */
 	function isForeignKey( $field ) {
-	   //  get the length of the field.
-	   $length = strlen( $field );
-	   
-	   //  if a reverse search for the string _id reveals that this string appears three characters from the end, then this is a foreign key.
-	   if( strrpos( $field, "_id" ) == $length - 3 ) {
+	  
+	   //  search for the string _id reveals that this string appears three characters from the end, then this is a foreign key.
+	   if( substr($field, -3) === '_id' )
+	   {
 	     return true;
 	   }
 	   return false;

libs/scaffold.php

@@ -162,7 +162,6 @@ class Scaffold extends Object {
 	 */
 	function scaffoldList($params)
 	{
-	    $model = $this->model;
 	    $this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames(null,false) );
 		$this->controllerClass->set('data', $this->controllerClass->models[$this->model]->findAll());
 		$this->controllerClass->render($this->actionView, '', LIBS.'controllers'.DS.'templates'.DS.'scaffolds'.DS.'list.thtml');		

tests/caketest.config.ini

@@ -1,27 +0,0 @@
-;========================================================================= 
-; Cake Test Suite configuration file
-;
-; License http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
-;
-; $Id$
-; $Date$
-; $LastChangedBy$
-;=========================================================================
-
-
-[paths]
-TEST_CASES = cases
-TEST_GROUPS = groups
-
-; Modify these values
-TEST_HTTP_PATH = http://somedomain/tests/cases/
-CAKE_EXAMPLES_HTTP_PATH = http://somedomain/examples
-
-; For remote tests
-REMOTE_TEST_HTTP_PATH = http://somedomain/tests/index.php
-
-; This is set for subversion repository layout currently
-; each developers sandbox should resolve to path below properly
-
-[simpletest]
-library_path = ../../../../vendor/simpletest/

tests/caketest.config.php

@@ -1,45 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-
-/**
- * Short description for file.
- * 
- * Long description for file
- *
- * PHP versions 4 and 5
- *
- * CakePHP Test Suite <https://trac.cakephp.org/wiki/Cake/Manual/TestSuite/>
- * Copyright (c) 2005, CakePHP Test Suite Authors/Developers
- *
- * Author(s): Larry E. Masters aka PhpNut <nut@phpnut.com>
- *            Kamil Dzielinski aka Brego <brego.dk@gmail.com>
- *
- *  Licensed under The Open Group Test Suite License
- *  Redistributions of files must retain the above copyright notice.
- *
- * @filesource 
- * @author       CakePHP Test Suite Authors/Developers
- * @copyright    Copyright (c) 2005, CakePHP Test Suite Authors/Developers 
- * @link         https://trac.cakephp.org/wiki/TestSuite/Authors/ Authors/Developers
- * @package      test_suite
- * @since        CakePHP Test Suite v 1.0.0.0
- * @version      $Revision$
- * @modifiedby   $LastChangedBy$
- * @lastmodified $Date$
- * @license      http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
- */
-
-/** Cake SimpleTest config file
-  *
-  * Set the path to the simpletest package.
-  * The default define:
-  * ('SIMPLE_TEST', '../../../../vendor/simpletest/');
-  * links SimpleTest to each developers sandbox.
-  * 
-  * This must be changed by endusers wishing to run test suite
-  *
-  */
-
-define('SIMPLE_TEST', '../../../../vendor/simpletest/');
-
-?>