Merge branch 'master' into 2.4

Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php

app/webroot/index.php

@@ -79,7 +79,8 @@ if (!defined('WWW_ROOT')) {
 
 // for built-in server
 if (php_sapi_name() == 'cli-server') {
-	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['REQUEST_URI'])) {
+	$uri = str_replace($_SERVER['SCRIPT_FILENAME'], WWW_ROOT, '');
+	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $uri)) {
 		return false;
 	}
 	$_SERVER['PHP_SELF'] = '/' . basename(__FILE__);

lib/Cake/Console/Command/ServerShell.php

@@ -130,7 +130,7 @@ class ServerShell extends AppShell {
 			$this->_host,
 			$this->_port,
 			$this->_documentRoot,
-			WWW_ROOT . '/index.php'
+			$this->_documentRoot . '/index.php'
 		);
 
 		$port = ($this->_port == self::DEFAULT_PORT) ? '' : ':' . $this->_port;

lib/Cake/Console/Command/Task/ExtractTask.php

@@ -443,7 +443,7 @@ class ExtractTask extends AppShell {
 
 		$plugins = array(null);
 		if (empty($this->params['exclude-plugins'])) {
-			$plugins = array_merge($plugins, App::objects('plugins'));
+			$plugins = array_merge($plugins, App::objects('plugin', null, false));
 		}
 		foreach ($plugins as $plugin) {
 			$this->_extractPluginValidationMessages($plugin);

lib/Cake/Console/Command/TestShell.php

@@ -338,7 +338,6 @@ class TestShell extends Shell {
  * @param string $file
  * @param string $category
  * @param boolean $throwOnMissingFile
- * @access protected
  * @return array array(type, case)
  * @throws Exception
  */
@@ -414,7 +413,6 @@ class TestShell extends Shell {
  * For the given file, what category of test is it? returns app, core or the name of the plugin
  *
  * @param string $file
- * @access protected
  * @return string
  */
 	protected function _mapFileToCategory($file) {

lib/Cake/Console/Templates/skel/webroot/index.php

@@ -70,7 +70,8 @@ if (!defined('WWW_ROOT')) {
 
 // for built-in server
 if (php_sapi_name() === 'cli-server') {
-	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['REQUEST_URI'])) {
+	$uri = str_replace($_SERVER['SCRIPT_FILENAME'], WWW_ROOT, '');
+	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $uri)) {
 		return false;
 	}
 	$_SERVER['PHP_SELF'] = '/' . basename(__FILE__);

lib/Cake/Controller/Component/AuthComponent.php

@@ -722,7 +722,6 @@ class AuthComponent extends Component {
 			$this->Session->write('Auth.redirect', $redir);
 		} elseif ($this->Session->check('Auth.redirect')) {
 			$redir = $this->Session->read('Auth.redirect');
-			$redir = is_string($redir) ? ltrim($redir, '/') : $redir;
 			$this->Session->delete('Auth.redirect');
 
 			if (Router::normalize($redir) == Router::normalize($this->loginAction)) {
@@ -733,7 +732,10 @@ class AuthComponent extends Component {
 		} else {
 			$redir = '/';
 		}
-		return Router::normalize($redir);
+		if (is_array($redir)) {
+			return Router::url($redir);
+		}
+		return $redir;
 	}
 
 /**

lib/Cake/Core/App.php

@@ -542,7 +542,8 @@ class App {
 		$parts = explode('.', self::$_classMap[$className], 2);
 		list($plugin, $package) = count($parts) > 1 ? $parts : array(null, current($parts));
 
-		if ($file = self::_mapped($className, $plugin)) {
+		$file = self::_mapped($className, $plugin);
+		if ($file) {
 			return include $file;
 		}
 		$paths = self::path($package, $plugin);

lib/Cake/Model/Datasource/DataSource.php

@@ -415,7 +415,6 @@ class DataSource extends Object {
  * Returns the schema name. Override this in subclasses.
  *
  * @return string schema name
- * @access public
  */
 	public function getSchemaName() {
 		return null;
@@ -425,7 +424,6 @@ class DataSource extends Object {
  * Closes a connection. Override in subclasses
  *
  * @return boolean
- * @access public
  */
 	public function close() {
 		return $this->connected = false;

lib/Cake/Model/Model.php

@@ -95,7 +95,6 @@ class Model extends Object implements CakeEventListener {
  * Holds physical schema/database name for this model. Automatically set during Model creation.
  *
  * @var string
- * @access public
  */
 	public $schemaName = null;
 

lib/Cake/Network/CakeResponse.php

@@ -345,6 +345,13 @@ class CakeResponse {
  */
 	protected $_file = null;
 
+/**
+ * File range. Used for requesting ranges of files.
+ *
+ * @var array
+ */
+	protected $_fileRange = null;
+
 /**
  * The charset the response body is encoded with
  *
@@ -413,8 +420,8 @@ class CakeResponse {
 			$this->_sendHeader($header, $value);
 		}
 		if ($this->_file) {
-			$this->_sendFile($this->_file);
+			$this->_sendFile($this->_file, $this->_fileRange);
-			$this->_file = null;
+			$this->_file = $this->_fileRange = null;
 		} else {
 			$this->_sendContent($this->_body);
 		}
@@ -1204,13 +1211,18 @@ class CakeResponse {
 	}
 
 /**
- * Setup for display or download the given file
+ * Setup for display or download the given file.
+ *
+ * If $_SERVER['HTTP_RANGE'] is set a slice of the file will be
+ * returned instead of the entire file.
  *
- * @param string $path Path to file
- * @param array $options Options
  * ### Options keys
+ *
  * - name: Alternate download name
  * - download: If `true` sets download header and forces file to be downloaded rather than displayed in browser
+ *
+ * @param string $path Path to file
+ * @param array $options Options See above.
  * @return void
  * @throws NotFoundException
  */
@@ -1261,19 +1273,7 @@ class CakeResponse {
 
 			$httpRange = env('HTTP_RANGE');
 			if (isset($httpRange)) {
-				list(, $range) = explode('=', $httpRange);
+				$this->_fileRange($file, $httpRange);
-
-				$size = $fileSize - 1;
-				$length = $fileSize - $range;
-
-				$this->header(array(
-					'Content-Length' => $length,
-					'Content-Range' => 'bytes ' . $range . $size . '/' . $fileSize
-				));
-
-				$this->statusCode(206);
-				$file->open('rb', true);
-				$file->offset($range);
 			} else {
 				$this->header('Content-Length', $fileSize);
 			}
@@ -1281,26 +1281,76 @@ class CakeResponse {
 			$this->header('Content-Length', $fileSize);
 		}
 		$this->_clearBuffer();
-
 		$this->_file = $file;
 	}
 
+/**
+ * Apply a file range to a file and set the end offset.
+ *
+ * If an invalid range is requested a 416 Status code will be used
+ * in the response.
+ *
+ * @param File $file The file to set a range on.
+ * @param string $httpRange The range to use.
+ * @return void
+ */
+	protected function _fileRange($file, $httpRange) {
+		list(, $range) = explode('=', $httpRange);
+		list($start, $end) = explode('-', $range);
+
+		$fileSize = $file->size();
+		$lastByte = $fileSize - 1;
+		if ($start > $end || $end > $lastByte || $start > $lastByte) {
+			$this->statusCode(416);
+			$this->header(array(
+				'Content-Range' => 'bytes 0-' . $lastByte . '/' . $fileSize
+			));
+			return;
+		}
+
+		$this->header(array(
+			'Content-Length' => $end - $start + 1,
+			'Content-Range' => 'bytes ' . $start . '-' . $end . '/' . $fileSize
+		));
+
+		$this->statusCode(206);
+		$this->_fileRange = array($start, $end);
+	}
+
 /**
  * Reads out a file, and echos the content to the client.
  *
  * @param File $file File object
+ * @param array $range The range to read out of the file.
  * @return boolean True is whole file is echoed successfully or false if client connection is lost in between
  */
-	protected function _sendFile($file) {
+	protected function _sendFile($file, $range) {
 		$compress = $this->outputCompressed();
 		$file->open('rb');
+
+		$end = $start = false;
+		if ($range) {
+			list($start, $end) = $range;
+		}
+		if ($start !== false) {
+			$file->offset($start);
+		}
+
+		$bufferSize = 8192;
+		set_time_limit(0);
 		while (!feof($file->handle)) {
 			if (!$this->_isActive()) {
 				$file->close();
 				return false;
 			}
-			set_time_limit(0);
+			$offset = $file->offset();
-			echo fread($file->handle, 8192);
+			if ($end && $offset >= $end) {
+				break;
+			}
+			if ($end && $offset + $bufferSize >= $end) {
+				$bufferSize = $end - $offset;
+			}
+			echo fread($file->handle, $bufferSize);
 			if (!$compress) {
 				$this->_flushBuffer();
 			}

lib/Cake/Test/Case/Core/ObjectTest.php

@@ -49,14 +49,12 @@ class RequestActionController extends Controller {
  * uses property
  *
  * @var array
- * @access public
  */
 	public $uses = array('RequestActionPost');
 
 /**
  * test_request_action method
  *
- * @access public
  * @return void
  */
 	public function test_request_action() {
@@ -68,7 +66,6 @@ class RequestActionController extends Controller {
  *
  * @param mixed $id
  * @param mixed $other
- * @access public
  * @return void
  */
 	public function another_ra_test($id, $other) {

lib/Cake/Test/Case/Model/CakeSchemaTest.php

@@ -533,7 +533,6 @@ class CakeSchemaTest extends CakeTestCase {
 /**
  * testSchemaReadWithAppModel method
  *
- * @access public
  * @return void
  */
 	public function testSchemaReadWithAppModel() {

lib/Cake/Test/Case/Model/ModelIntegrationTest.php

@@ -239,7 +239,6 @@ class ModelIntegrationTest extends BaseModelTest {
 /**
  * testFindWithJoinsOption method
  *
- * @access public
  * @return void
  */
 	public function testFindWithJoinsOption() {

lib/Cake/Test/Case/Model/ModelWriteTest.php

@@ -63,7 +63,6 @@ class ModelWriteTest extends BaseModelTest {
 /**
  * testInsertAnotherHabtmRecordWithSameForeignKey method
  *
- * @access public
  * @return void
  */
 	public function testInsertAnotherHabtmRecordWithSameForeignKey() {
@@ -511,7 +510,6 @@ class ModelWriteTest extends BaseModelTest {
 /**
  * Tests having multiple counter caches for an associated model
  *
- * @access public
  * @return void
  */
 	public function testCounterCacheMultipleCaches() {

lib/Cake/Test/Case/Network/CakeResponseTest.php

@@ -1,9 +1,5 @@
 <?php
 /**
- * CakeResponse Test case file.
- *
- * PHP 5
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -1389,4 +1385,100 @@ class CakeResponseTest extends CakeTestCase {
 		$response->file(CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'img' . DS . 'test_2.JPG');
 	}
 
+/**
+ * Test fetching ranges from a file.
+ *
+ * @return void
+ */
+	public function testFileRange() {
+		$_SERVER['HTTP_RANGE'] = 'bytes=8-25';
+		$response = $this->getMock('CakeResponse', array(
+			'header',
+			'type',
+			'_sendHeader',
+			'_setContentType',
+			'_isActive',
+			'_clearBuffer',
+			'_flushBuffer'
+		));
+
+		$response->expects($this->exactly(1))
+			->method('type')
+			->with('css')
+			->will($this->returnArgument(0));
+
+		$response->expects($this->at(1))
+			->method('header')
+			->with('Content-Disposition', 'attachment; filename="test_asset.css"');
+
+		$response->expects($this->at(2))
+			->method('header')
+			->with('Accept-Ranges', 'bytes');
+
+		$response->expects($this->at(3))
+			->method('header')
+			->with(array(
+				'Content-Length' => 18,
+				'Content-Range' => 'bytes 8-25/38',
+			));
+
+		$response->expects($this->once())->method('_clearBuffer');
+
+		$response->expects($this->any())
+			->method('_isActive')
+			->will($this->returnValue(true));
+
+		$response->file(
+			CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'css' . DS . 'test_asset.css',
+			array('download' => true)
+		);
+
+		ob_start();
+		$result = $response->send();
+		$output = ob_get_clean();
+		$this->assertEquals(206, $response->statusCode());
+		$this->assertEquals("is the test asset", $output);
+		$this->assertTrue($result !== false);
+	}
+
+/**
+ * Test invalid file ranges.
+ *
+ * @return void
+ */
+	public function testFileRangeInvalid() {
+		$_SERVER['HTTP_RANGE'] = 'bytes=30-2';
+		$response = $this->getMock('CakeResponse', array(
+			'header',
+			'type',
+			'_sendHeader',
+			'_setContentType',
+			'_isActive',
+			'_clearBuffer',
+			'_flushBuffer'
+		));
+
+		$response->expects($this->at(1))
+			->method('header')
+			->with('Content-Disposition', 'attachment; filename="test_asset.css"');
+
+		$response->expects($this->at(2))
+			->method('header')
+			->with('Accept-Ranges', 'bytes');
+
+		$response->expects($this->at(3))
+			->method('header')
+			->with(array(
+				'Content-Range' => 'bytes 0-37/38',
+			));
+
+		$response->file(
+			CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'css' . DS . 'test_asset.css',
+			array('download' => true)
+		);
+
+		$this->assertEquals(416, $response->statusCode());
+		$result = $response->send();
+	}
+
 }

lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php

@@ -39,7 +39,6 @@ if (!class_exists('AppController', false)) {
 	 * helpers property
 	 *
 	 * @var array
-	 * @access public
 	 */
 		public $helpers = array('Html');
 
@@ -47,7 +46,6 @@ if (!class_exists('AppController', false)) {
 	 * uses property
 	 *
 	 * @var array
-	 * @access public
 	 */
 		public $uses = array('ControllerPost');
 
@@ -55,7 +53,6 @@ if (!class_exists('AppController', false)) {
 	 * components property
 	 *
 	 * @var array
-	 * @access public
 	 */
 		public $components = array('Cookie');
 

lib/Cake/Test/Case/Utility/InflectorTest.php

@@ -109,6 +109,14 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEquals(Inflector::singularize('foes'), 'foe');
 		$this->assertEquals(Inflector::singularize('databases'), 'database');
 		$this->assertEquals(Inflector::singularize('cookies'), 'cookie');
+		$this->assertEquals(Inflector::singularize('thieves'), 'thief');
+		$this->assertEquals(Inflector::singularize('potatoes'), 'potato');
+		$this->assertEquals(Inflector::singularize('heroes'), 'hero');
+		$this->assertEquals(Inflector::singularize('buffalos'), 'buffalo');
+		$this->assertEquals(Inflector::singularize('babies'), 'baby');
+		$this->assertEquals(Inflector::singularize('teeth'), 'tooth');
+		$this->assertEquals(Inflector::singularize('geese'), 'goose');
+		$this->assertEquals(Inflector::singularize('feet'), 'foot');
 
 		$this->assertEquals(Inflector::singularize(''), '');
 	}
@@ -161,6 +169,14 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEquals(Inflector::pluralize('roof'), 'roofs');
 		$this->assertEquals(Inflector::pluralize('foe'), 'foes');
 		$this->assertEquals(Inflector::pluralize('cookie'), 'cookies');
+		$this->assertEquals(Inflector::pluralize('wolf'), 'wolves');
+		$this->assertEquals(Inflector::pluralize('thief'), 'thieves');
+		$this->assertEquals(Inflector::pluralize('potato'), 'potatoes');
+		$this->assertEquals(Inflector::pluralize('hero'), 'heroes');
+		$this->assertEquals(Inflector::pluralize('buffalo'), 'buffalo');
+		$this->assertEquals(Inflector::pluralize('tooth'), 'teeth');
+		$this->assertEquals(Inflector::pluralize('goose'), 'geese');
+		$this->assertEquals(Inflector::pluralize('foot'), 'feet');
 		$this->assertEquals(Inflector::pluralize(''), '');
 	}
 

lib/Cake/Test/Case/View/Helper/FormHelperTest.php

@@ -779,7 +779,6 @@ class FormHelperTest extends CakeTestCase {
 /**
  * Tests correct generation of number fields for integer fields
  *
- * @access public
  * @return void
  */
 	public function testTextFieldTypeNumberGenerationForIntegers() {
@@ -1525,7 +1524,6 @@ class FormHelperTest extends CakeTestCase {
 /**
  * Test validation errors, when validation message is an empty string.
  *
- * @access public
  * @return void
  */
 	public function testEmptyErrorValidation() {
@@ -1566,7 +1564,6 @@ class FormHelperTest extends CakeTestCase {
 /**
  * Test validation errors, when calling input() overriding validation message by an empty string.
  *
- * @access public
  * @return void
  */
 	public function testEmptyInputErrorValidation() {

lib/Cake/Test/Fixture/AccountFixture.php

@@ -25,13 +25,6 @@
  */
 class AccountFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Aco'
- */
-	public $name = 'Account';
-
 	public $table = 'Accounts';
 
 /**

lib/Cake/Test/Fixture/AcoActionFixture.php

@@ -25,13 +25,6 @@
  */
 class AcoActionFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'AcoAction'
- */
-	public $name = 'AcoAction';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AcoFixture.php

@@ -25,13 +25,6 @@
  */
 class AcoFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Aco'
- */
-	public $name = 'Aco';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AcoTwoFixture.php

@@ -25,13 +25,6 @@
  */
 class AcoTwoFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'AcoTwo'
- */
-	public $name = 'AcoTwo';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AdFixture.php

@@ -26,13 +26,6 @@
  */
 class AdFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Ad'
- */
-	public $name = 'Ad';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AdvertisementFixture.php

@@ -25,13 +25,6 @@
  */
 class AdvertisementFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Advertisement'
- */
-	public $name = 'Advertisement';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AfterTreeFixture.php

@@ -26,13 +26,6 @@
  */
 class AfterTreeFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'AfterTree'
- */
-	public $name = 'AfterTree';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AnotherArticleFixture.php

@@ -25,13 +25,6 @@
  */
 class AnotherArticleFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'AnotherArticle'
- */
-	public $name = 'AnotherArticle';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AppleFixture.php

@@ -25,13 +25,6 @@
  */
 class AppleFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Apple'
- */
-	public $name = 'Apple';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/ArmorFixture.php

@@ -25,13 +25,6 @@
  */
 class ArmorFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Armor'
- */
-	public $name = 'Armor';
-
 /**
  * Datasource
  *

lib/Cake/Test/Fixture/ArmorsPlayerFixture.php

@@ -25,13 +25,6 @@
  */
 class ArmorsPlayerFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'ArmorsPlayer'
- */
-	public $name = 'ArmorsPlayer';
-
 /**
  * Datasource
  *

lib/Cake/Test/Fixture/AroFixture.php

@@ -25,13 +25,6 @@
  */
 class AroFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Aro'
- */
-	public $name = 'Aro';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AroTwoFixture.php

@@ -25,13 +25,6 @@
  */
 class AroTwoFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'AroTwo'
- */
-	public $name = 'AroTwo';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/ArosAcoFixture.php

@@ -25,13 +25,6 @@
  */
 class ArosAcoFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'ArosAco'
- */
-	public $name = 'ArosAco';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/ArosAcoTwoFixture.php

@@ -25,13 +25,6 @@
  */
 class ArosAcoTwoFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'ArosAcoTwo'
- */
-	public $name = 'ArosAcoTwo';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/ArticleFeaturedFixture.php

@@ -25,13 +25,6 @@
  */
 class ArticleFeaturedFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'ArticleFeatured'
- */
-	public $name = 'ArticleFeatured';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/ArticleFeaturedsTagsFixture.php

@@ -25,13 +25,6 @@
  */
 class ArticleFeaturedsTagsFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'ArticleFeaturedsTags'
- */
-	public $name = 'ArticleFeaturedsTags';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/ArticleFixture.php

@@ -25,13 +25,6 @@
  */
 class ArticleFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Article'
- */
-	public $name = 'Article';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/ArticlesTagFixture.php

@@ -25,13 +25,6 @@
  */
 class ArticlesTagFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'ArticlesTag'
- */
-	public $name = 'ArticlesTag';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AttachmentFixture.php

@@ -25,13 +25,6 @@
  */
 class AttachmentFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Attachment'
- */
-	public $name = 'Attachment';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AuthUserCustomFieldFixture.php

@@ -25,13 +25,6 @@
  */
 class AuthUserCustomFieldFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'AuthUser'
- */
-	public $name = 'AuthUserCustomField';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AuthUserFixture.php

@@ -25,13 +25,6 @@
  */
 class AuthUserFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'AuthUser'
- */
-	public $name = 'AuthUser';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/AuthorFixture.php

@@ -25,13 +25,6 @@
  */
 class AuthorFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Author'
- */
-	public $name = 'Author';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/BakeArticleFixture.php

@@ -25,13 +25,6 @@
  */
 class BakeArticleFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string
- */
-	public $name = 'BakeArticle';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/BakeArticlesBakeTagFixture.php

@@ -25,13 +25,6 @@
  */
 class BakeArticlesBakeTagFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'ArticlesTag'
- */
-	public $name = 'BakeArticlesBakeTag';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/BakeCommentFixture.php

@@ -25,13 +25,6 @@
  */
 class BakeCommentFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Comment'
- */
-	public $name = 'BakeComment';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/BakeTagFixture.php

@@ -25,13 +25,6 @@
  */
 class BakeTagFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Tag'
- */
-	public $name = 'BakeTag';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/BasketFixture.php

@@ -25,13 +25,6 @@
  */
 class BasketFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Basket'
- */
-	public $name = 'Basket';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/BidFixture.php

@@ -25,13 +25,6 @@
  */
 class BidFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Bid'
- */
-	public $name = 'Bid';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/BiddingFixture.php

@@ -25,13 +25,6 @@
  */
 class BiddingFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Bidding'
- */
-	public $name = 'Bidding';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/BiddingMessageFixture.php

@@ -25,13 +25,6 @@
  */
 class BiddingMessageFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'BiddingMessage'
- */
-	public $name = 'BiddingMessage';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/BinaryTestFixture.php

@@ -25,13 +25,6 @@
  */
 class BinaryTestFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'BinaryTest'
- */
-	public $name = 'BinaryTest';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/BookFixture.php

@@ -25,13 +25,6 @@
  */
 class BookFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Book'
- */
-	public $name = 'Book';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/CacheTestModelFixture.php

@@ -25,13 +25,6 @@
  */
 class CacheTestModelFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'CacheTestModel'
- */
-	public $name = 'CacheTestModel';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/CakeSessionFixture.php

@@ -21,13 +21,6 @@
  */
 class CakeSessionFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string
- */
-	public $name = 'CakeSession';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/CallbackFixture.php

@@ -25,13 +25,6 @@
  */
 class CallbackFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Callback'
- */
-	public $name = 'Callback';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/CampaignFixture.php

@@ -26,13 +26,6 @@
  */
 class CampaignFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Campaign'
- */
-	public $name = 'Campaign';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/CategoryFixture.php

@@ -25,13 +25,6 @@
  */
 class CategoryFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Category'
- */
-	public $name = 'Category';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/CategoryThreadFixture.php

@@ -25,13 +25,6 @@
  */
 class CategoryThreadFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'CategoryThread'
- */
-	public $name = 'CategoryThread';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/CdFixture.php

@@ -25,13 +25,6 @@
  */
 class CdFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Cd'
- */
-	public $name = 'Cd';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/CommentFixture.php

@@ -25,13 +25,6 @@
  */
 class CommentFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Comment'
- */
-	public $name = 'Comment';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/ContentAccountFixture.php

@@ -25,13 +25,6 @@
  */
 class ContentAccountFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Aco'
- */
-	public $name = 'ContentAccount';
-
 	public $table = 'ContentAccounts';
 
 /**

lib/Cake/Test/Fixture/ContentFixture.php

@@ -25,13 +25,6 @@
  */
 class ContentFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Aco'
- */
-	public $name = 'Content';
-
 	public $table = 'Content';
 
 /**

lib/Cake/Test/Fixture/CounterCachePostFixture.php

@@ -25,8 +25,6 @@
  */
 class CounterCachePostFixture extends CakeTestFixture {
 
-	public $name = 'CounterCachePost';
-
 	public $fields = array(
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'title' => array('type' => 'string', 'length' => 255),

lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php

@@ -25,8 +25,6 @@
  */
 class CounterCachePostNonstandardPrimaryKeyFixture extends CakeTestFixture {
 
-	public $name = 'CounterCachePostNonstandardPrimaryKey';
-
 	public $fields = array(
 		'pid' => array('type' => 'integer', 'key' => 'primary'),
 		'title' => array('type' => 'string', 'length' => 255, 'null' => false),

lib/Cake/Test/Fixture/CounterCacheUserFixture.php

@@ -25,8 +25,6 @@
  */
 class CounterCacheUserFixture extends CakeTestFixture {
 
-	public $name = 'CounterCacheUser';
-
 	public $fields = array(
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'length' => 255, 'null' => false),

lib/Cake/Test/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php

@@ -25,8 +25,6 @@
  */
 class CounterCacheUserNonstandardPrimaryKeyFixture extends CakeTestFixture {
 
-	public $name = 'CounterCacheUserNonstandardPrimaryKey';
-
 	public $fields = array(
 		'uid' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'length' => 255, 'null' => false),

lib/Cake/Test/Fixture/DataTestFixture.php

@@ -25,13 +25,6 @@
  */
 class DataTestFixture extends CakeTestFixture {
 
-/**
- * Name property
- *
- * @var string 'DataTest'
- */
-	public $name = 'DataTest';
-
 /**
  * Fields property
  *

lib/Cake/Test/Fixture/DatatypeFixture.php

@@ -25,13 +25,6 @@
  */
 class DatatypeFixture extends CakeTestFixture {
 
-/**
- * Name property
- *
- * @var string 'Datatype'
- */
-	public $name = 'Datatype';
-
 /**
  * Fields property
  *

lib/Cake/Test/Fixture/DependencyFixture.php

@@ -26,13 +26,6 @@
  */
 class DependencyFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Dependency'
- */
-	public $name = 'Dependency';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/DeviceFixture.php

@@ -25,13 +25,6 @@
  */
 class DeviceFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Device'
- */
-	public $name = 'Device';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/DeviceTypeCategoryFixture.php

@@ -25,13 +25,6 @@
  */
 class DeviceTypeCategoryFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'DeviceTypeCategory'
- */
-	public $name = 'DeviceTypeCategory';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/DeviceTypeFixture.php

@@ -25,13 +25,6 @@
  */
 class DeviceTypeFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'DeviceType'
- */
-	public $name = 'DeviceType';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/DocumentDirectoryFixture.php

@@ -25,13 +25,6 @@
  */
 class DocumentDirectoryFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'DocumentDirectory'
- */
-	public $name = 'DocumentDirectory';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/DocumentFixture.php

@@ -25,13 +25,6 @@
  */
 class DocumentFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Document'
- */
-	public $name = 'Document';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/DomainFixture.php

@@ -24,19 +24,10 @@
  */
 class DomainFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Domain'
- * @access public
- */
-	public $name = 'Domain';
-
 /**
  * fields property
  *
  * @var array
- * @access public
  */
 	public $fields = array(
 		'id' => array('type' => 'integer', 'key' => 'primary'),
@@ -49,7 +40,6 @@ class DomainFixture extends CakeTestFixture {
  * records property
  *
  * @var array
- * @access public
  */
 	public $records = array(
 		array('domain' => 'cakephp.org', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),

lib/Cake/Test/Fixture/DomainsSiteFixture.php

@@ -24,19 +24,10 @@
  */
 class DomainsSiteFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Domain'
- * @access public
- */
-	public $name = 'DomainsSite';
-
 /**
  * fields property
  *
  * @var array
- * @access public
  */
 	public $fields = array(
 		'id' => array('type' => 'integer', 'key' => 'primary'),
@@ -51,7 +42,6 @@ class DomainsSiteFixture extends CakeTestFixture {
  * records property
  *
  * @var array
- * @access public
  */
 	public $records = array(
 		array('site_id' => 1, 'domain_id' => 1, 'active' => true, 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),

lib/Cake/Test/Fixture/ExteriorTypeCategoryFixture.php

@@ -25,13 +25,6 @@
  */
 class ExteriorTypeCategoryFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'ExteriorTypeCategory'
- */
-	public $name = 'ExteriorTypeCategory';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/FeatureSetFixture.php

@@ -25,13 +25,6 @@
  */
 class FeatureSetFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'FeatureSet'
- */
-	public $name = 'FeatureSet';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/FeaturedFixture.php

@@ -25,13 +25,6 @@
  */
 class FeaturedFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Featured'
- */
-	public $name = 'Featured';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/FilmFileFixture.php

@@ -25,13 +25,6 @@
  */
 class FilmFileFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'FilmFile'
- */
-	public $name = 'FilmFile';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/FlagTreeFixture.php

@@ -29,13 +29,6 @@
  */
 class FlagTreeFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'FlagTree'
- */
-	public $name = 'FlagTree';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/FruitFixture.php

@@ -25,13 +25,6 @@
  */
 class FruitFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Fruit'
- */
-	public $name = 'Fruit';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/FruitsUuidTagFixture.php

@@ -25,13 +25,6 @@
  */
 class FruitsUuidTagFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'FruitsUuidTag'
- */
-	public $name = 'FruitsUuidTag';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/GroupUpdateAllFixture.php

@@ -25,8 +25,6 @@
  */
 class GroupUpdateAllFixture extends CakeTestFixture {
 
-	public $name = 'GroupUpdateAll';
-
 	public $table = 'group_update_all';
 
 	public $fields = array(

lib/Cake/Test/Fixture/GuildFixture.php

@@ -25,13 +25,6 @@
  */
 class GuildFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Guild'
- */
-	public $name = 'Guild';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/GuildsPlayerFixture.php

@@ -25,13 +25,6 @@
  */
 class GuildsPlayerFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'GuildsPlayer'
- */
-	public $name = 'GuildsPlayer';
-
 	public $useDbConfig = 'test2';
 
 /**

lib/Cake/Test/Fixture/HomeFixture.php

@@ -25,13 +25,6 @@
  */
 class HomeFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Home'
- */
-	public $name = 'Home';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/ImageFixture.php

@@ -25,13 +25,6 @@
  */
 class ImageFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Image'
- */
-	public $name = 'Image';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/InnoFixture.php

@@ -25,13 +25,6 @@
  */
 class InnoFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Article'
- */
-	public $name = 'Inno';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/ItemFixture.php

@@ -25,13 +25,6 @@
  */
 class ItemFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Item'
- */
-	public $name = 'Item';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/ItemsPortfolioFixture.php

@@ -25,13 +25,6 @@
  */
 class ItemsPortfolioFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'ItemsPortfolio'
- */
-	public $name = 'ItemsPortfolio';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/JoinAFixture.php

@@ -25,13 +25,6 @@
  */
 class JoinAFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'JoinA'
- */
-	public $name = 'JoinA';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/JoinBFixture.php

@@ -25,13 +25,6 @@
  */
 class JoinBFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'JoinB'
- */
-	public $name = 'JoinB';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/JoinCFixture.php

@@ -25,13 +25,6 @@
  */
 class JoinCFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'JoinC'
- */
-	public $name = 'JoinC';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/JoinThingFixture.php

@@ -25,13 +25,6 @@
  */
 class JoinThingFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'JoinThing'
- */
-	public $name = 'JoinThing';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/MessageFixture.php

@@ -25,13 +25,6 @@
  */
 class MessageFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'Message'
- */
-	public $name = 'Message';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php

@@ -25,13 +25,6 @@
  */
 class MyCategoriesMyProductsFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'MyCategoriesMyProducts'
- */
-	public $name = 'MyCategoriesMyProducts';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php

@@ -25,13 +25,6 @@
  */
 class MyCategoriesMyUsersFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'MyCategoriesMyUsers'
- */
-	public $name = 'MyCategoriesMyUsers';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/MyCategoryFixture.php

@@ -25,13 +25,6 @@
  */
 class MyCategoryFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'MyCategory'
- */
-	public $name = 'MyCategory';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/MyProductFixture.php

@@ -25,13 +25,6 @@
  */
 class MyProductFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'MyProduct'
- */
-	public $name = 'MyProduct';
-
 /**
  * fields property
  *

lib/Cake/Test/Fixture/MyUserFixture.php

@@ -25,13 +25,6 @@
  */
 class MyUserFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'MyUser'
- */
-	public $name = 'MyUser';
-
 /**
  * fields property
  *