Skip to content

Commit

Permalink
php5 corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
euromark authored and markstory committed Feb 26, 2012
1 parent 42762ff commit 973dce9
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
Expand Up @@ -170,7 +170,7 @@ public function testParseServerStringNonLatin() {
* @return void
*/
public function testParseServerStringUnix() {
$Memcache =& new TestMemcacheEngine();
$Memcache = new TestMemcacheEngine();
$result = $Memcache->parseServerString('unix:///path/to/memcached.sock');
$this->assertEquals($result, array('unix:///path/to/memcached.sock', 0));
}
Expand Down Expand Up @@ -385,7 +385,7 @@ public function testZeroDuration() {
* @return void
*/
public function testLongDurationEqualToZero() {
$memcache =& new TestMemcacheEngine();
$memcache = new TestMemcacheEngine();
$memcache->settings['compress'] = false;

$mock = $this->getMock('Memcache');
Expand Down
Expand Up @@ -862,7 +862,7 @@ public function testPaginateMaxLimit() {
* @return void
*/
public function testPaginateOrderVirtualFieldSharedWithRealField() {
$Controller =& new Controller($this->request);
$Controller = new Controller($this->request);
$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
$Controller->constructClasses();
$Controller->PaginatorControllerComment->virtualFields = array(
Expand Down
Expand Up @@ -66,7 +66,7 @@ public function tearDown() {
public function testCountWithConditions() {
$this->loadFixtures('Translate', 'TranslatedItem');

$Model =& new TranslatedItem();
$Model = new TranslatedItem();
$Model->locale = 'eng';
$result = $Model->find('count', array(
'conditions' => array(
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Test/Case/Model/ModelIntegrationTest.php
Expand Up @@ -242,7 +242,7 @@ public function testDynamicBehaviorAttachment() {
*/
public function testFindWithJoinsOption() {
$this->loadFixtures('Article', 'User');
$TestUser =& new User();
$TestUser = new User();

$options = array(
'fields' => array(
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Test/Case/Utility/FileTest.php
Expand Up @@ -434,7 +434,7 @@ public function testDeleteAfterRead() {
if (!file_exists($tmpFile)) {
touch($tmpFile);
}
$File =& new File($tmpFile);
$File = new File($tmpFile);
$File->read();
$this->assertTrue($File->delete());
}
Expand Down

0 comments on commit 973dce9

Please sign in to comment.