Skip to content
This repository
Browse code

php5 corrections

  • Loading branch information...
commit 973dce916ad396f3e63ce061137db59ee63afde3 1 parent 42762ff
Mark authored February 23, 2012 markstory committed February 25, 2012
4  lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
@@ -170,7 +170,7 @@ public function testParseServerStringNonLatin() {
170 170
  * @return void
171 171
  */
172 172
 	public function testParseServerStringUnix() {
173  
-		$Memcache =& new TestMemcacheEngine();
  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));
176 176
 	}
@@ -385,7 +385,7 @@ public function testZeroDuration() {
385 385
  * @return void
386 386
  */
387 387
 	public function testLongDurationEqualToZero() {
388  
-		$memcache =& new TestMemcacheEngine();
  388
+		$memcache = new TestMemcacheEngine();
389 389
 		$memcache->settings['compress'] = false;
390 390
 
391 391
 		$mock = $this->getMock('Memcache');
2  lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
@@ -862,7 +862,7 @@ public function testPaginateMaxLimit() {
862 862
  * @return void
863 863
  */
864 864
 	public function testPaginateOrderVirtualFieldSharedWithRealField() {
865  
-		$Controller =& new Controller($this->request);
  865
+		$Controller = new Controller($this->request);
866 866
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
867 867
 		$Controller->constructClasses();
868 868
 		$Controller->PaginatorControllerComment->virtualFields = array(
2  lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
@@ -66,7 +66,7 @@ public function tearDown() {
66 66
 	public function testCountWithConditions() {
67 67
 		$this->loadFixtures('Translate', 'TranslatedItem');
68 68
 
69  
-		$Model =& new TranslatedItem();
  69
+		$Model = new TranslatedItem();
70 70
 		$Model->locale = 'eng';
71 71
 		$result = $Model->find('count', array(
72 72
 			'conditions' => array(
2  lib/Cake/Test/Case/Model/ModelIntegrationTest.php
@@ -242,7 +242,7 @@ public function testDynamicBehaviorAttachment() {
242 242
  */
243 243
 	public function testFindWithJoinsOption() {
244 244
 		$this->loadFixtures('Article', 'User');
245  
-		$TestUser =& new User();
  245
+		$TestUser = new User();
246 246
 
247 247
 		$options = array(
248 248
 			'fields' => array(
2  lib/Cake/Test/Case/Utility/FileTest.php
@@ -434,7 +434,7 @@ public function testDeleteAfterRead() {
434 434
 		if (!file_exists($tmpFile)) {
435 435
 			touch($tmpFile);
436 436
 		}
437  
-		$File =& new File($tmpFile);
  437
+		$File = new File($tmpFile);
438 438
 		$File->read();
439 439
 		$this->assertTrue($File->delete());
440 440
 	}

0 notes on commit 973dce9

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