Skip to content

Commit

Permalink
Fixing coding standard errors
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzo committed Dec 15, 2013
1 parent 1fc1c9c commit 0e7f306
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
3 changes: 1 addition & 2 deletions Cake/Test/TestCase/ORM/Association/BelongsToManyTest.php
Expand Up @@ -977,7 +977,6 @@ public function testReplaceLinkSuccess() {
];
$query1->setResult(new \ArrayIterator($existing));


$opts = ['markNew' => false];
$tags = [
new Entity(['id' => 2], $opts),
Expand All @@ -987,7 +986,7 @@ public function testReplaceLinkSuccess() {
$entity = new Entity(['id' => 1, 'test' => $tags], $opts);

$jointEntities = [
new Entity(['article_id' => 1, 'tag_id' => 2]),
new Entity(['article_id' => 1, 'tag_id' => 2])
];
$assoc->expects($this->once())->method('_collectJointEntities')
->with($entity, $tags)
Expand Down
11 changes: 5 additions & 6 deletions Cake/Test/TestCase/ORM/TableTest.php
Expand Up @@ -2571,7 +2571,6 @@ public function testSaveBelongsToWithValidationErrorInJointEntity() {
$this->assertNull($entity->tags[1]->extraInfo);
}


/**
* Tests saving belongsToMany records with a validation error in a joint entity
* and atomic set to false
Expand Down Expand Up @@ -2830,7 +2829,7 @@ public function testUnlinkBelongsToManyMultiple() {
$tagsTable = TableRegistry::get('tags');
$options = ['markNew' => false];

$article = new \Cake\ORM\Entity(['id' => 1,], $options);
$article = new \Cake\ORM\Entity(['id' => 1], $options);
$tags[] = new \TestApp\Model\Entity\Tag(['id' => 1], $options);
$tags[] = new \TestApp\Model\Entity\Tag(['id' => 2], $options);

Expand All @@ -2851,7 +2850,7 @@ public function testUnlinkBelongsToManyPassingJoint() {
$tagsTable = TableRegistry::get('tags');
$options = ['markNew' => false];

$article = new \Cake\ORM\Entity(['id' => 1,], $options);
$article = new \Cake\ORM\Entity(['id' => 1], $options);
$tags[] = new \TestApp\Model\Entity\Tag(['id' => 1], $options);
$tags[] = new \TestApp\Model\Entity\Tag(['id' => 2], $options);

Expand All @@ -2876,7 +2875,7 @@ public function testReplacelinksBelongsToMany() {
$tagsTable = TableRegistry::get('tags');
$options = ['markNew' => false];

$article = new \Cake\ORM\Entity(['id' => 1,], $options);
$article = new \Cake\ORM\Entity(['id' => 1], $options);
$tags[] = new \TestApp\Model\Entity\Tag(['id' => 2], $options);
$tags[] = new \TestApp\Model\Entity\Tag(['id' => 3], $options);
$tags[] = new \TestApp\Model\Entity\Tag(['name' => 'foo']);
Expand All @@ -2902,7 +2901,7 @@ public function testReplacelinksBelongsToManyWithEmpty() {
$tagsTable = TableRegistry::get('tags');
$options = ['markNew' => false];

$article = new \Cake\ORM\Entity(['id' => 1,], $options);
$article = new \Cake\ORM\Entity(['id' => 1], $options);
$tags = [];

$table->association('tags')->replaceLinks($article, $tags);
Expand All @@ -2923,7 +2922,7 @@ public function testReplacelinksBelongsToManyWithJoint() {
$tagsTable = TableRegistry::get('tags');
$options = ['markNew' => false];

$article = new \Cake\ORM\Entity(['id' => 1,], $options);
$article = new \Cake\ORM\Entity(['id' => 1], $options);
$tags[] = new \TestApp\Model\Entity\Tag([
'id' => 2,
'extraInfo' => new \Cake\ORM\Entity([
Expand Down

0 comments on commit 0e7f306

Please sign in to comment.