Skip to content
This repository
Browse code

Add missing visibility keywords

  • Loading branch information...
commit 45ec5d73c5a212659ff937d402fc6ec4ae8699b6 1 parent a9c279a
Kyle Robinson Young authored February 16, 2012

Showing 34 changed files with 74 additions and 74 deletions. Show diff stats Hide diff stats

  1. 2  lib/Cake/Console/Command/Task/BakeTask.php
  2. 2  lib/Cake/Model/Datasource/Database/Postgres.php
  3. 2  lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php
  4. 2  lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
  5. 2  lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
  6. 4  lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
  7. 4  lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php
  8. 6  lib/Cake/Test/Case/Controller/Component/DbAclTest.php
  9. 2  lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
  10. 2  lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
  11. 6  lib/Cake/Test/Case/Controller/ScaffoldTest.php
  12. 8  lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
  13. 2  lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
  14. 6  lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
  15. 4  lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
  16. 2  lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
  17. 4  lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
  18. 2  lib/Cake/Test/Case/Model/DbAclTest.php
  19. 24  lib/Cake/Test/Case/Model/ModelIntegrationTest.php
  20. 2  lib/Cake/Test/Case/Model/ModelValidationTest.php
  21. 4  lib/Cake/Test/Case/Network/CakeRequestTest.php
  22. 8  lib/Cake/Test/Case/Routing/DispatcherTest.php
  23. 2  lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
  24. 2  lib/Cake/Test/Case/Utility/ClassRegistryTest.php
  25. 4  lib/Cake/Test/Case/Utility/FileTest.php
  26. 2  lib/Cake/Test/Case/Utility/ValidationTest.php
  27. 14  lib/Cake/Test/Case/View/Helper/FormHelperTest.php
  28. 2  lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
  29. 2  lib/Cake/Test/Case/View/Helper/JsHelperTest.php
  30. 4  lib/Cake/Test/Case/View/HelperTest.php
  31. 10  lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
  32. 2  lib/Cake/TestSuite/ControllerTestCase.php
  33. 2  lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
  34. 2  lib/Cake/View/Helper/NumberHelper.php
2  lib/Cake/Console/Command/Task/BakeTask.php
@@ -52,7 +52,7 @@ class BakeTask extends AppShell {
52 52
  *
53 53
  * @return void
54 54
  */
55  
-	function startup() {
  55
+	public function startup() {
56 56
 		Configure::write('debug', 2);
57 57
 		Configure::write('Cache.disable', 1);
58 58
 		parent::startup();
2  lib/Cake/Model/Datasource/Database/Postgres.php
@@ -898,7 +898,7 @@ public function renderStatement($type, $data) {
898 898
  *
899 899
  * @return string The schema name
900 900
  */
901  
-	function getSchemaName() {
  901
+	public function getSchemaName() {
902 902
 		return $this->config['schema'];
903 903
 	}
904 904
 
2  lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php
@@ -78,7 +78,7 @@ public function testReadAndWriteCache() {
78 78
  *
79 79
  * @return void
80 80
  */
81  
-	function testReadWriteDurationZero() {
  81
+	public function testReadWriteDurationZero() {
82 82
 		Cache::config('apc', array('engine' => 'Apc', 'duration' => 0, 'prefix' => 'cake_'));
83 83
 		Cache::write('zero', 'Should save', 'apc');
84 84
 		sleep(1);
2  lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
@@ -169,7 +169,7 @@ public function testParseServerStringNonLatin() {
169 169
  *
170 170
  * @return void
171 171
  */
172  
-	function testParseServerStringUnix() {
  172
+	public function testParseServerStringUnix() {
173 173
 		$Memcache =& new TestMemcacheEngine();
174 174
 		$result = $Memcache->parseServerString('unix:///path/to/memcached.sock');
175 175
 		$this->assertEquals($result, array('unix:///path/to/memcached.sock', 0));
2  lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
@@ -177,7 +177,7 @@ public function testImportOptionsAlternateConnection() {
177 177
  *
178 178
  * @return void
179 179
  */
180  
-	function testImportRecordsNoEscaping() {
  180
+	public function testImportRecordsNoEscaping() {
181 181
 		$db = ConnectionManager::getDataSource('test');
182 182
 		if ($db instanceof Sqlserver) {
183 183
 			$this->markTestSkipped('This test does not run on SQLServer');
4  lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
@@ -42,7 +42,7 @@ class TestAuthComponent extends AuthComponent {
42 42
  *
43 43
  * @return void
44 44
  */
45  
-	function _stop($status = 0) {
  45
+	protected function _stop($status = 0) {
46 46
 		$this->testStop = true;
47 47
 	}
48 48
 
@@ -117,7 +117,7 @@ class AuthTestController extends Controller {
117 117
  *
118 118
  * @return void
119 119
  */
120  
-	function __construct($request, $response) {
  120
+	public function __construct($request, $response) {
121 121
 		$request->addParams(Router::parse('/auth_test'));
122 122
 		$request->here = '/auth_test';
123 123
 		$request->webroot = '/';
4  lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php
@@ -539,7 +539,7 @@ public function testDeleteRemovesChildren() {
539 539
  *
540 540
  * @return void
541 541
  */
542  
-	function testDeleteChildrenNotExist() {
  542
+	public function testDeleteChildrenNotExist() {
543 543
 		$this->assertNull($this->Cookie->delete('NotFound'));
544 544
 		$this->assertNull($this->Cookie->delete('Not.Found'));
545 545
 	}
@@ -573,7 +573,7 @@ protected function _implode(array $array) {
573 573
  * @param mixed $value
574 574
  * @return string
575 575
  */
576  
-	function __encrypt($value) {
  576
+	protected function __encrypt($value) {
577 577
 		if (is_array($value)) {
578 578
 			$value = $this->_implode($value);
579 579
 		}
6  lib/Cake/Test/Case/Controller/Component/DbAclTest.php
@@ -155,7 +155,7 @@ class DbAclTwoTest extends DbAcl {
155 155
  *
156 156
  * @return void
157 157
  */
158  
-	function __construct() {
  158
+	public function __construct() {
159 159
 		$this->Aro = new AroTwoTest();
160 160
 		$this->Aro->Permission = new PermissionTwoTest();
161 161
 		$this->Aco = new AcoTwoTest();
@@ -480,7 +480,7 @@ public function testRevoke() {
480 480
  * @param bool $treesToo
481 481
  * @return void
482 482
  */
483  
-	function __debug ($printTreesToo = false) {
  483
+	protected function __debug ($printTreesToo = false) {
484 484
 		$this->Acl->Aro->displayField = 'alias';
485 485
 		$this->Acl->Aco->displayField = 'alias';
486 486
 		$aros = $this->Acl->Aro->find('list', array('order' => 'lft'));
@@ -527,7 +527,7 @@ function __debug ($printTreesToo = false) {
527 527
  * @param int $len
528 528
  * @return void
529 529
  */
530  
-	function __pad($string = '', $len = 14) {
  530
+	protected function __pad($string = '', $len = 14) {
531 531
 		return str_pad($string, $len);
532 532
 	}
533 533
 }
2  lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
@@ -861,7 +861,7 @@ public function testPaginateMaxLimit() {
861 861
  *
862 862
  * @return void
863 863
  */
864  
-	function testPaginateOrderVirtualFieldSharedWithRealField() {
  864
+	public function testPaginateOrderVirtualFieldSharedWithRealField() {
865 865
 		$Controller =& new Controller($this->request);
866 866
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
867 867
 		$Controller->constructClasses();
2  lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -107,7 +107,7 @@ public function setUp() {
107 107
  *
108 108
  * @return void
109 109
  */
110  
-	function _init() {
  110
+	protected function _init() {
111 111
 		$request = new CakeRequest('controller_posts/index');
112 112
 		$response = new CakeResponse();
113 113
 		$this->Controller = new RequestHandlerTestController($request, $response);
6  lib/Cake/Test/Case/Controller/ScaffoldTest.php
@@ -90,7 +90,7 @@ class TestScaffoldMock extends Scaffold {
90 90
  *
91 91
  * @param unknown_type $params
92 92
  */
93  
-	function _scaffold(CakeRequest $request) {
  93
+	protected function _scaffold(CakeRequest $request) {
94 94
 		$this->_params = $request;
95 95
 	}
96 96
 
@@ -99,7 +99,7 @@ function _scaffold(CakeRequest $request) {
99 99
  *
100 100
  * @return unknown
101 101
  */
102  
-	function getParams() {
  102
+	public function getParams() {
103 103
 		return $this->_params;
104 104
 	}
105 105
 }
@@ -277,7 +277,7 @@ public function testScaffoldFlashMessages() {
277 277
  *
278 278
  * @return void
279 279
  */
280  
-	function testHabtmFieldAdditionWithScaffoldForm() {
  280
+	public function testHabtmFieldAdditionWithScaffoldForm() {
281 281
 		CakePlugin::unload();
282 282
 		$params = array(
283 283
 			'plugin' => null,
8  lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
@@ -3511,7 +3511,7 @@ public function testResetMultipleHabtmAssociations() {
3511 3511
 /**
3512 3512
  * test that bindModel and unbindModel work with find() calls in between.
3513 3513
  */
3514  
-	function testBindMultipleTimesWithFind() {
  3514
+	public function testBindMultipleTimesWithFind() {
3515 3515
 		$binding = array(
3516 3516
 			'hasOne' => array(
3517 3517
 				'ArticlesTag' => array(
@@ -3624,7 +3624,7 @@ public function testLazyLoad() {
3624 3624
  * @param array $contain
3625 3625
  * @return void
3626 3626
  */
3627  
-	function __containments(&$Model, $contain = array()) {
  3627
+	protected function __containments(&$Model, $contain = array()) {
3628 3628
 		if (!is_array($Model)) {
3629 3629
 			$result = $Model->containments($contain);
3630 3630
 			return $this->__containments($result['models']);
@@ -3645,7 +3645,7 @@ function __containments(&$Model, $contain = array()) {
3645 3645
  * @param array $expected
3646 3646
  * @return void
3647 3647
  */
3648  
-	function __assertBindings(&$Model, $expected = array()) {
  3648
+	protected function __assertBindings(&$Model, $expected = array()) {
3649 3649
 		$expected = array_merge(array('belongsTo' => array(), 'hasOne' => array(), 'hasMany' => array(), 'hasAndBelongsToMany' => array()), $expected);
3650 3650
 
3651 3651
 		foreach ($expected as $binding => $expect) {
@@ -3661,7 +3661,7 @@ function __assertBindings(&$Model, $expected = array()) {
3661 3661
  * @param bool $output
3662 3662
  * @return void
3663 3663
  */
3664  
-	function __bindings(&$Model, $extra = array(), $output = true) {
  3664
+	protected function __bindings(&$Model, $extra = array(), $output = true) {
3665 3665
 		$relationTypes = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
3666 3666
 
3667 3667
 		$debug = '[';
2  lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
@@ -63,7 +63,7 @@ public function tearDown() {
63 63
  *
64 64
  * @return void
65 65
  */
66  
-	function testCountWithConditions() {
  66
+	public function testCountWithConditions() {
67 67
 		$this->loadFixtures('Translate', 'TranslatedItem');
68 68
 
69 69
 		$Model =& new TranslatedItem();
6  lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
@@ -178,7 +178,7 @@ public function testLocalizedFloats() {
178 178
  *
179 179
  * @return void
180 180
  */
181  
-	function testScientificNotation() {
  181
+	public function testScientificNotation() {
182 182
 		$result = $this->db->value(2.2E-54, 'float');
183 183
 		$this->assertEquals('2.2E-54', (string)$result);
184 184
 
@@ -1055,7 +1055,7 @@ public function testGenerateAssociationQuerySelfJoin() {
1055 1055
  * @param mixed $model
1056 1056
  * @return void
1057 1057
  */
1058  
-	function _buildRelatedModels($model) {
  1058
+	protected function _buildRelatedModels($model) {
1059 1059
 		foreach ($model->associations() as $type) {
1060 1060
 			foreach ($model->{$type} as $assoc => $assocData) {
1061 1061
 				if (is_string($assocData)) {
@@ -1077,7 +1077,7 @@ function _buildRelatedModels($model) {
1077 1077
  * @param mixed $binding
1078 1078
  * @return void
1079 1079
  */
1080  
-	function &_prepareAssociationQuery($model, &$queryData, $binding) {
  1080
+	protected function &_prepareAssociationQuery($model, &$queryData, $binding) {
1081 1081
 		$type = $binding['type'];
1082 1082
 		$assoc = $binding['model'];
1083 1083
 		$assocData = $model->{$type}[$assoc];
4  lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
@@ -43,7 +43,7 @@ class DboPostgresTestDb extends Postgres {
43 43
  * @param mixed $sql
44 44
  * @return void
45 45
  */
46  
-	function _execute($sql, $params = array(), $prepareOptions = array()) {
  46
+	protected function _execute($sql, $params = array(), $prepareOptions = array()) {
47 47
 		$this->simulated[] = $sql;
48 48
 		return null;
49 49
 	}
@@ -757,7 +757,7 @@ public function testVirtualFields() {
757 757
  *
758 758
  * @return void
759 759
  */
760  
-	function testVirtualFieldAsAConstant() {
  760
+	public function testVirtualFieldAsAConstant() {
761 761
 		$this->loadFixtures('Article', 'Comment');
762 762
 		$Article = ClassRegistry::init('Article');
763 763
 		$Article->virtualFields = array(
2  lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
@@ -42,7 +42,7 @@ class DboSqliteTestDb extends Sqlite {
42 42
  * @param mixed $sql
43 43
  * @return void
44 44
  */
45  
-	function _execute($sql, $params = array(), $prepareOptions = array()) {
  45
+	protected function _execute($sql, $params = array(), $prepareOptions = array()) {
46 46
 		$this->simulated[] = $sql;
47 47
 		return null;
48 48
 	}
4  lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
@@ -790,7 +790,7 @@ public function testFieldsUsingMethodCache() {
790 790
  *
791 791
  * @return void
792 792
  */
793  
-	function testGroupNoModel() {
  793
+	public function testGroupNoModel() {
794 794
 		$result = $this->db->group('created');
795 795
 		$this->assertEquals(' GROUP BY created', $result);
796 796
 	}
@@ -798,7 +798,7 @@ function testGroupNoModel() {
798 798
 /**
799 799
  * Test getting the last error.
800 800
  */
801  
-	function testLastError() {
  801
+	public function testLastError() {
802 802
 		$stmt = $this->getMock('PDOStatement');
803 803
 		$stmt->expects($this->any())
804 804
 			->method('errorInfo')
2  lib/Cake/Test/Case/Model/DbAclTest.php
@@ -214,7 +214,7 @@ class TestDbAcl extends DbAcl {
214 214
  *
215 215
  * @return void
216 216
  */
217  
-	function __construct() {
  217
+	public function __construct() {
218 218
 		$this->Aro = new DbAroTest();
219 219
 		$this->Aro->Permission = new DbPermissionTest();
220 220
 		$this->Aco = new DbAcoTest();
24  lib/Cake/Test/Case/Model/ModelIntegrationTest.php
@@ -240,7 +240,7 @@ public function testDynamicBehaviorAttachment() {
240 240
  * @access public
241 241
  * @return void
242 242
  */
243  
-	function testFindWithJoinsOption() {
  243
+	public function testFindWithJoinsOption() {
244 244
 		$this->loadFixtures('Article', 'User');
245 245
 		$TestUser =& new User();
246 246
 
@@ -626,7 +626,7 @@ public function testCrossDatabaseJoins() {
626 626
  *
627 627
  * @return void
628 628
  */
629  
-	function testHABTMKeepExisting() {
  629
+	public function testHABTMKeepExisting() {
630 630
 		$this->loadFixtures('Site', 'Domain', 'DomainsSite');
631 631
 
632 632
 		$Site = new Site();
@@ -674,8 +674,8 @@ function testHABTMKeepExisting() {
674 674
 		$results = $Site->Domain->DomainsSite->find('count', array(
675 675
 			'conditions' => array(
676 676
 				'DomainsSite.active' => true,
677  
-				),
678  
-			));
  677
+			),
  678
+		));
679 679
 		$expected = 5;
680 680
 		$this->assertEquals($expected, $results);
681 681
 
@@ -687,8 +687,8 @@ function testHABTMKeepExisting() {
687 687
 		$results = $Site->DomainsSite->find('count', array(
688 688
 			'conditions' => array(
689 689
 				'DomainsSite.active' => true,
690  
-				),
691  
-			));
  690
+			),
  691
+		));
692 692
 		$expected = 6;
693 693
 		$this->assertEquals($expected, $results);
694 694
 
@@ -697,8 +697,8 @@ function testHABTMKeepExisting() {
697 697
 			'Site' => array('id' => 1, 'name' => 'cakephp (modified)'),
698 698
 			'Domain' => array(
699 699
 				'Domain' => array(3),
700  
-				)
701  
-			);
  700
+			)
  701
+		);
702 702
 		$Site->create($data);
703 703
 		$Site->save($data);
704 704
 
@@ -715,12 +715,12 @@ function testHABTMKeepExisting() {
715 715
  *
716 716
  * @return void
717 717
  */
718  
-	function testHABTMKeepExistingWithThreeDbs() {
  718
+	public function testHABTMKeepExistingWithThreeDbs() {
719 719
 		$config = ConnectionManager::enumConnectionObjects();
720 720
 		$this->skipIf(
721 721
 			!isset($config['test']) || !isset($config['test2']) || !isset($config['test_database_three']),
722 722
 			'Primary, secondary, and tertiary test databases not configured, skipping test.  To run this test define $test, $test2, and $test_database_three in your database configuration.'
723  
-			);
  723
+		);
724 724
 
725 725
 		$this->loadFixtures('Player', 'Guild', 'GuildsPlayer', 'Armor', 'ArmorsPlayer');
726 726
 		$Player = ClassRegistry::init('Player');
@@ -729,9 +729,9 @@ function testHABTMKeepExistingWithThreeDbs() {
729 729
 				'Armor' => array(
730 730
 					'with' => 'ArmorsPlayer',
731 731
 					'unique' => 'keepExisting',
732  
-					),
733 732
 				),
734  
-			), false);
  733
+			),
  734
+		), false);
735 735
 		$this->assertEquals('test', $Player->useDbConfig);
736 736
 		$this->assertEquals('test', $Player->Guild->useDbConfig);
737 737
 		$this->assertEquals('test2', $Player->Guild->GuildsPlayer->useDbConfig);
2  lib/Cake/Test/Case/Model/ModelValidationTest.php
@@ -766,7 +766,7 @@ public function testValidationMessageAsArray() {
766 766
  *
767 767
  * @return void
768 768
  */
769  
-	function testStateValidation() {
  769
+	public function testStateValidation() {
770 770
 		$this->loadFixtures('Article');
771 771
 		$Article = new Article();
772 772
 
4  lib/Cake/Test/Case/Network/CakeRequestTest.php
@@ -815,7 +815,7 @@ public function testAddDetector() {
815 815
  *
816 816
  * @return void
817 817
  */
818  
-	function _detectCallback($request) {
  818
+	protected function _detectCallback($request) {
819 819
 		return $request->return == true;
820 820
 	}
821 821
 
@@ -1709,7 +1709,7 @@ public function testIsRequested() {
1709 1709
  * @param mixed $env
1710 1710
  * @return void
1711 1711
  */
1712  
-	function __loadEnvironment($env) {
  1712
+	protected function __loadEnvironment($env) {
1713 1713
 		if (isset($env['App'])) {
1714 1714
 			Configure::write('App', $env['App']);
1715 1715
 		}
8  lib/Cake/Test/Case/Routing/DispatcherTest.php
@@ -1492,7 +1492,7 @@ public function testHttpMethodOverrides() {
1492 1492
  *
1493 1493
  * @return void
1494 1494
  */
1495  
-	function __backupEnvironment() {
  1495
+	protected function __backupEnvironment() {
1496 1496
 		return array(
1497 1497
 			'App' => Configure::read('App'),
1498 1498
 			'GET' => $_GET,
@@ -1506,7 +1506,7 @@ function __backupEnvironment() {
1506 1506
  *
1507 1507
  * @return void
1508 1508
  */
1509  
-	function __reloadEnvironment() {
  1509
+	protected function __reloadEnvironment() {
1510 1510
 		foreach ($_GET as $key => $val) {
1511 1511
 			unset($_GET[$key]);
1512 1512
 		}
@@ -1525,7 +1525,7 @@ function __reloadEnvironment() {
1525 1525
  * @param mixed $env
1526 1526
  * @return void
1527 1527
  */
1528  
-	function __loadEnvironment($env) {
  1528
+	protected function __loadEnvironment($env) {
1529 1529
 		if ($env['reload']) {
1530 1530
 			$this->__reloadEnvironment();
1531 1531
 		}
@@ -1559,7 +1559,7 @@ function __loadEnvironment($env) {
1559 1559
  * @param mixed $her
1560 1560
  * @return string
1561 1561
  */
1562  
-	function __cachePath($here) {
  1562
+	protected function __cachePath($here) {
1563 1563
 		$path = $here;
1564 1564
 		if ($here == '/') {
1565 1565
 			$path = 'home';
2  lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
@@ -424,7 +424,7 @@ public function testInsert() {
424 424
  * @param string $values
425 425
  * @return boolean true
426 426
  */
427  
-	function _insertCallback($table, $fields, $values) {
  427
+	protected function _insertCallback($table, $fields, $values) {
428 428
 		$this->insertMulti['table'] = $table;
429 429
 		$this->insertMulti['fields'] = $fields;
430 430
 		$this->insertMulti['values'] = $values;
2  lib/Cake/Test/Case/Utility/ClassRegistryTest.php
@@ -150,7 +150,7 @@ class RegisterPrefixedDs extends ClassRegisterModel {
150 150
  */
151 151
 interface ClassRegistryInterfaceTest {
152 152
 
153  
-	function doSomething();
  153
+	public function doSomething();
154 154
 }
155 155
 
156 156
 /**
4  lib/Cake/Test/Case/Utility/FileTest.php
@@ -427,7 +427,7 @@ public function testDelete() {
427 427
  *
428 428
  * @return void
429 429
  */
430  
-	function testDeleteAfterRead() {
  430
+	public function testDeleteAfterRead() {
431 431
 		if (!$tmpFile = $this->_getTmpFile()) {
432 432
 			return false;
433 433
 		}
@@ -484,7 +484,7 @@ public function testMime() {
484 484
  * @param bool $paintSkip
485 485
  * @return void
486 486
  */
487  
-	function _getTmpFile($paintSkip = true) {
  487
+	protected function _getTmpFile($paintSkip = true) {
488 488
 		$tmpFile = TMP . 'tests' . DS . 'cakephp.file.test.tmp';
489 489
 		if (is_writable(dirname($tmpFile)) && (!file_exists($tmpFile) || is_writable($tmpFile))) {
490 490
 			return $tmpFile;
2  lib/Cake/Test/Case/Utility/ValidationTest.php
@@ -2100,7 +2100,7 @@ public function testUserDefined() {
2100 2100
  *
2101 2101
  * @return void
2102 2102
  */
2103  
-	function testDatetime() {
  2103
+	public function testDatetime() {
2104 2104
 		$this->assertTrue(Validation::datetime('27-12-2006 01:00', 'dmy'));
2105 2105
 		$this->assertTrue(Validation::datetime('27-12-2006 01:00', array('dmy')));
2106 2106
 		$this->assertFalse(Validation::datetime('27-12-2006 1:00', 'dmy'));
14  lib/Cake/Test/Case/View/Helper/FormHelperTest.php
@@ -1086,7 +1086,7 @@ public function testFormSecurityMultipleInputFields() {
1086 1086
  *
1087 1087
  * @return void
1088 1088
  */
1089  
-	function testFormSecurityArrayFields() {
  1089
+	public function testFormSecurityArrayFields() {
1090 1090
 		$key = 'testKey';
1091 1091
 
1092 1092
 		$this->Form->request->params['_Token']['key'] = $key;
@@ -1524,7 +1524,7 @@ public function testPasswordValidation() {
1524 1524
  * @access public
1525 1525
  * @return void
1526 1526
  */
1527  
-	function testEmptyErrorValidation() {
  1527
+	public function testEmptyErrorValidation() {
1528 1528
 		$this->Form->validationErrors['Contact']['password'] = '';
1529 1529
 		$result = $this->Form->input('Contact.password');
1530 1530
 		$expected = array(
@@ -1552,7 +1552,7 @@ function testEmptyErrorValidation() {
1552 1552
  * @access public
1553 1553
  * @return void
1554 1554
  */
1555  
-	function testEmptyInputErrorValidation() {
  1555
+	public function testEmptyInputErrorValidation() {
1556 1556
 		$this->Form->validationErrors['Contact']['password'] = 'Please provide a password';
1557 1557
 		$result = $this->Form->input('Contact.password', array('error' => ''));
1558 1558
 		$expected = array(
@@ -2222,7 +2222,7 @@ public function testInputTime() {
2222 2222
  *
2223 2223
  * @return void
2224 2224
  */
2225  
-	function testInputDatetime() {
  2225
+	public function testInputDatetime() {
2226 2226
 		extract($this->dateRegex);
2227 2227
 		$result = $this->Form->input('prueba', array(
2228 2228
 			'type' => 'datetime', 'timeFormat' => 24, 'dateFormat' => 'DMY', 'minYear' => 2008,
@@ -5216,7 +5216,7 @@ public function testFormDateTimeMulti() {
5216 5216
  *
5217 5217
  * @return void
5218 5218
  */
5219  
-	function testDateTimeLabelIdMatchesFirstInput() {
  5219
+	public function testDateTimeLabelIdMatchesFirstInput() {
5220 5220
 		$result = $this->Form->input('Model.date', array('type' => 'date'));
5221 5221
 		$this->assertContains('label for="ModelDateMonth"', $result);
5222 5222
 
@@ -6230,7 +6230,7 @@ public function testSubmitUnlockedByDefault() {
6230 6230
  *
6231 6231
  * @return void
6232 6232
  */
6233  
-	function testSubmitImageTimestamp() {
  6233
+	public function testSubmitImageTimestamp() {
6234 6234
 		Configure::write('Asset.timestamp', 'force');
6235 6235
 
6236 6236
 		$result = $this->Form->submit('cake.power.gif');
@@ -6785,7 +6785,7 @@ public function testEditFormWithData() {
6785 6785
  *
6786 6786
  * @return void
6787 6787
  */
6788  
-	function testFormInputRequiredDetection() {
  6788
+	public function testFormInputRequiredDetection() {
6789 6789
 		$this->Form->create('Contact');
6790 6790
 
6791 6791
 		$result = $this->Form->input('Contact.non_existing');
2  lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
@@ -902,7 +902,7 @@ public function testScriptWithBlocks() {
902 902
  *
903 903
  * @return void
904 904
  */
905  
-	function testScriptAssetFilter() {
  905
+	public function testScriptAssetFilter() {
906 906
 		Configure::write('Asset.filter.js', 'js.php');
907 907
 
908 908
 		$result = $this->Html->script('jquery-1.3');
2  lib/Cake/Test/Case/View/Helper/JsHelperTest.php
@@ -130,7 +130,7 @@ public function tearDown() {
130 130
  *
131 131
  * @return void
132 132
  */
133  
-	function _useMock() {
  133
+	protected function _useMock() {
134 134
 		$request = new CakeRequest(null, false);
135 135
 
136 136
 		if (!class_exists('TestJsEngineHelper', false)) {
4  lib/Cake/Test/Case/View/HelperTest.php
@@ -460,7 +460,7 @@ public function testValue() {
460 460
  *
461 461
  * @return void
462 462
  */
463  
-	function testValueWithDefault() {
  463
+	public function testValueWithDefault() {
464 464
 		$this->Helper->request->data = array('zero' => 0);
465 465
 		$this->Helper->setEntity('zero');
466 466
 		$result = $this->Helper->value(array('default' => 'something'), 'zero');
@@ -480,7 +480,7 @@ function testValueWithDefault() {
480 480
  *
481 481
  * @return void
482 482
  */
483  
-	function testValueHabtmKeys() {
  483
+	public function testValueHabtmKeys() {
484 484
 		$this->Helper->request->data = array(
485 485
 			'HelperTestTag' => array('HelperTestTag' => '')
486 486
 		);
10  lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
@@ -79,7 +79,7 @@ class CakeTestSuiteDispatcher {
79 79
  *
80 80
  * @return void
81 81
  */
82  
-	function __construct() {
  82
+	public function __construct() {
83 83
 		$this->_baseUrl = $_SERVER['PHP_SELF'];
84 84
 		$dir = rtrim(dirname($this->_baseUrl), '\\');
85 85
 		$this->_baseDir = ($dir === '/') ? $dir : $dir . '/';
@@ -161,7 +161,7 @@ public function loadTestFramework() {
161 161
  *
162 162
  * @return void
163 163
  */
164  
-	function _checkXdebug() {
  164
+	protected function _checkXdebug() {
165 165
 		if (!extension_loaded('xdebug')) {
166 166
 			$baseDir = $this->_baseDir;
167 167
 			include CAKE . 'TestSuite' . DS . 'templates' . DS . 'xdebug.php';
@@ -174,7 +174,7 @@ function _checkXdebug() {
174 174
  *
175 175
  * @return void
176 176
  */
177  
-	function _testCaseList() {
  177
+	protected function _testCaseList() {
178 178
 		$command = new CakeTestSuiteCommand('', $this->params);
179 179
 		$Reporter = $command->handleReporter($this->params['output']);
180 180
 		$Reporter->paintDocumentStart();
@@ -199,7 +199,7 @@ public function setParams($params) {
199 199
  *
200 200
  * @return void
201 201
  */
202  
-	function _parseParams() {
  202
+	protected function _parseParams() {
203 203
 		if (!$this->_paramsParsed) {
204 204
 			if (!isset($_SERVER['SERVER_NAME'])) {
205 205
 				$_SERVER['SERVER_NAME'] = '';
@@ -226,7 +226,7 @@ function _parseParams() {
226 226
  *
227 227
  * @return void
228 228
  */
229  
-	function _runTestCase() {
  229
+	protected function _runTestCase() {
230 230
 		$commandArgs = array(
231 231
 			'case' => $this->params['case'],
232 232
 			'core' => $this->params['core'],
2  lib/Cake/TestSuite/ControllerTestCase.php
@@ -50,7 +50,7 @@ class ControllerTestDispatcher extends Dispatcher {
50 50
  *
51 51
  * @return Controller
52 52
  */
53  
-	function _getController($request, $response) {
  53
+	protected function _getController($request, $response) {
54 54
 		if ($this->testController === null) {
55 55
 			$this->testController = parent::_getController($request, $response);
56 56
 		}
2  lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
@@ -60,7 +60,7 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
60 60
  * @param string $charset The character set to output with. Defaults to UTF-8
61 61
  * @param array $params Array of request parameters the reporter should use. See above.
62 62
  */
63  
-	function __construct($charset = 'utf-8', $params = array()) {
  63
+	public function __construct($charset = 'utf-8', $params = array()) {
64 64
 		if (!$charset) {
65 65
 			$charset = 'utf-8';
66 66
 		}
2  lib/Cake/View/Helper/NumberHelper.php
@@ -47,7 +47,7 @@ class NumberHelper extends AppHelper {
47 47
  * @param View $View The View this helper is being attached to.
48 48
  * @param array $settings Configuration settings for the helper
49 49
  */
50  
-	function __construct(View $View, $settings = array()) {
  50
+	public function __construct(View $View, $settings = array()) {
51 51
 		$settings = Set::merge(array('engine' => 'CakeNumber'), $settings);
52 52
 		parent::__construct($View, $settings);
53 53
 		list($plugin, $engineClass) = pluginSplit($settings['engine'], true);

0 notes on commit 45ec5d7

Please sign in to comment.
Something went wrong with that request. Please try again.