remove name attribute where not necessary, clean up doc blocks

cakephp · Jun 8, 2013 · 394bf10 · 394bf10
1 parent b75449d
commit 394bf10
Show file tree

Hide file tree

Showing 32 changed files with 246 additions and 707 deletions.
diff --git a/lib/Cake/Test/Case/Console/Command/BakeShellTest.php b/lib/Cake/Test/Case/Console/Command/BakeShellTest.php
@@ -31,9 +31,6 @@
 
 if (!class_exists('UsersController')) {
 	class UsersController extends Controller {
-
-		public $name = 'Users';
-
 	}
 }
 

diff --git a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
@@ -32,17 +32,10 @@
  */
 class SchemaShellTestSchema extends CakeSchema {
 
-/**
- * name property
- *
- * @var string 'MyApp'
- */
-	public $name = 'SchemaShellTest';
-
 /**
  * connection property
  *
- * @var string 'test'
+ * @var string
  */
 	public $connection = 'test';
 

diff --git a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
@@ -45,8 +45,6 @@
  */
 	class BakeArticle extends Model {
 
-		public $name = 'BakeArticle';
-
 		public $hasMany = array('BakeComment');
 
 		public $hasAndBelongsToMany = array('BakeTag');

diff --git a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
@@ -36,13 +36,6 @@
  */
 class TestTaskArticle extends Model {
 
-/**
- * Model name
- *
- * @var string
- */
-	public $name = 'TestTaskArticle';
-
 /**
  * Table name to use
  *
@@ -109,13 +102,6 @@ protected function _innerMethod() {
  */
 class TestTaskTag extends Model {
 
-/**
- * Model name
- *
- * @var string
- */
-	public $name = 'TestTaskTag';
-
 /**
  * Table name
  *
@@ -153,13 +139,6 @@ class TestTaskAppModel extends Model {
  */
 class TestTaskComment extends TestTaskAppModel {
 
-/**
- * Model name
- *
- * @var string
- */
-	public $name = 'TestTaskComment';
-
 /**
  * Table name
  *
@@ -187,13 +166,6 @@ class TestTaskComment extends TestTaskAppModel {
  */
 class TestTaskCommentsController extends Controller {
 
-/**
- * Controller Name
- *
- * @var string
- */
-	public $name = 'TestTaskComments';
-
 /**
  * Models to use
  *

diff --git a/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php
@@ -39,13 +39,6 @@
  */
 class ViewTaskComment extends Model {
 
-/**
- * Model name
- *
- * @var string
- */
-	public $name = 'ViewTaskComment';
-
 /**
  * Table name
  *
@@ -73,13 +66,6 @@ class ViewTaskComment extends Model {
  */
 class ViewTaskArticle extends Model {
 
-/**
- * Model name
- *
- * @var string
- */
-	public $name = 'ViewTaskArticle';
-
 /**
  * Table name
  *
@@ -95,13 +81,6 @@ class ViewTaskArticle extends Model {
  */
 class ViewTaskCommentsController extends Controller {
 
-/**
- * Controller name
- *
- * @var string
- */
-	public $name = 'ViewTaskComments';
-
 /**
  * Testing public controller action
  *
@@ -127,13 +106,6 @@ public function add() {
  */
 class ViewTaskArticlesController extends Controller {
 
-/**
- * Controller name
- *
- * @var string
- */
-	public $name = 'ViewTaskArticles';
-
 /**
  * Test public controller action
  *

diff --git a/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php b/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php
@@ -35,7 +35,7 @@ class AclNodeTwoTestBase extends AclNode {
 /**
  * useDbConfig property
  *
- * @var string 'test'
+ * @var string
  */
 	public $useDbConfig = 'test';
 
@@ -57,14 +57,14 @@ class AroTwoTest extends AclNodeTwoTestBase {
 /**
  * name property
  *
- * @var string 'AroTwoTest'
+ * @var string
  */
 	public $name = 'AroTwoTest';
 
 /**
  * useTable property
  *
- * @var string 'aro_twos'
+ * @var string
  */
 	public $useTable = 'aro_twos';
 
@@ -86,14 +86,14 @@ class AcoTwoTest extends AclNodeTwoTestBase {
 /**
  * name property
  *
- * @var string 'AcoTwoTest'
+ * @var string
  */
 	public $name = 'AcoTwoTest';
 
 /**
  * useTable property
  *
- * @var string 'aco_twos'
+ * @var string
  */
 	public $useTable = 'aco_twos';
 
@@ -115,14 +115,14 @@ class PermissionTwoTest extends Permission {
 /**
  * name property
  *
- * @var string 'PermissionTwoTest'
+ * @var string
  */
 	public $name = 'PermissionTwoTest';
 
 /**
  * useTable property
  *
- * @var string 'aros_aco_twos'
+ * @var string
  */
 	public $useTable = 'aros_aco_twos';
 

diff --git a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
@@ -59,17 +59,10 @@ public static function clearUser() {
  */
 class AuthUser extends CakeTestModel {
 
-/**
- * name property
- *
- * @var string 'AuthUser'
- */
-	public $name = 'AuthUser';
-
 /**
  * useDbConfig property
  *
- * @var string 'test'
+ * @var string
  */
 	public $useDbConfig = 'test';
 
@@ -82,13 +75,6 @@ class AuthUser extends CakeTestModel {
  */
 class AuthTestController extends Controller {
 
-/**
- * name property
- *
- * @var string 'AuthTest'
- */
-	public $name = 'AuthTest';
-
 /**
  * uses property
  *
@@ -203,13 +189,6 @@ public function isAuthorized() {
  */
 class AjaxAuthController extends Controller {
 
-/**
- * name property
- *
- * @var string 'AjaxAuth'
- */
-	public $name = 'AjaxAuth';
-
 /**
  * components property
  *
@@ -278,7 +257,7 @@ class AuthComponentTest extends CakeTestCase {
 /**
  * name property
  *
- * @var string 'Auth'
+ * @var string
  */
 	public $name = 'Auth';
 

diff --git a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
@@ -93,13 +93,6 @@ public function send(CakeEmail $email) {
  */
 class EmailTestController extends Controller {
 
-/**
- * name property
- *
- * @var string 'EmailTest'
- */
-	public $name = 'EmailTest';
-
 /**
  * uses property
  *
@@ -133,7 +126,7 @@ class EmailComponentTest extends CakeTestCase {
 /**
  * name property
  *
- * @var string 'Email'
+ * @var string
  */
 	public $name = 'Email';
 

diff --git a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
@@ -32,13 +32,6 @@
  */
 class PaginatorTestController extends Controller {
 
-/**
- * name property
- *
- * @var string 'PaginatorTest'
- */
-	public $name = 'PaginatorTest';
-
 /**
  * components property
  *
@@ -54,17 +47,10 @@ class PaginatorTestController extends Controller {
  */
 class PaginatorControllerPost extends CakeTestModel {
 
-/**
- * name property
- *
- * @var string 'PaginatorControllerPost'
- */
-	public $name = 'PaginatorControllerPost';
-
 /**
  * useTable property
  *
- * @var string 'posts'
+ * @var string
  */
 	public $useTable = 'posts';
 
@@ -124,17 +110,10 @@ public function find($conditions = null, $fields = array(), $order = null, $recu
  */
 class ControllerPaginateModel extends CakeTestModel {
 
-/**
- * name property
- *
- * @var string 'ControllerPaginateModel'
- */
-	public $name = 'ControllerPaginateModel';
-
 /**
  * useTable property
  *
- * @var string 'comments'
+ * @var string
  */
 	public $useTable = 'comments';
 
@@ -169,21 +148,21 @@ class PaginatorControllerComment extends CakeTestModel {
 /**
  * name property
  *
- * @var string 'Comment'
+ * @var string
  */
 	public $name = 'Comment';
 
 /**
  * useTable property
  *
- * @var string 'comments'
+ * @var string
  */
 	public $useTable = 'comments';
 
 /**
  * alias property
  *
- * @var string 'PaginatorControllerComment'
+ * @var string
  */
 	public $alias = 'PaginatorControllerComment';
 }
@@ -195,31 +174,17 @@ class PaginatorControllerComment extends CakeTestModel {
  */
 class PaginatorAuthor extends CakeTestModel {
 
-/**
- * name property
- *
- * @var string 'PaginatorAuthor'
- */
-	public $name = 'PaginatorAuthor';
-
 /**
  * useTable property
  *
- * @var string 'authors'
+ * @var string
  */
 	public $useTable = 'authors';
 
 /**
  * alias property
  *
- * @var string 'PaginatorAuthor'
- */
-	public $alias = 'PaginatorAuthor';
-
-/**
- * alias property
- *
- * @var string 'PaginatorAuthor'
+ * @var string
  */
 	public $virtualFields = array(
 			'joined_offset' => 'PaginatorAuthor.id + 1'