Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'cs/zendframework/zendframework#7029-no-space-before-arg…
Browse files Browse the repository at this point in the history 
…ument-list-comma' into develop

Close zendframework/zendframework#7029
  • Loading branch information
@Ocramius
Ocramius committed Dec 16, 2014
4 parents 5924992 + 929f993 + 5b35f97 + 1e7776c commit 2bc9f4c
Show file tree
Hide file tree
Showing 9 changed files with 137 additions and 137 deletions.
4 changes: 2 additions & 2 deletions test/Reader/Entry/AtomStandaloneEntryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function testGetsAuthorFromAtom10()
$entry = Reader\Reader::importString(
file_get_contents($this->feedSamplePath . '/author/atom10.xml')
);
$this->assertEquals(array('name'=>'Joe Bloggs','email'=>'joe@example.com','uri'=>'http://www.example.com'), $entry->getAuthor());
$this->assertEquals(array('name'=>'Joe Bloggs', 'email'=>'joe@example.com', 'uri'=>'http://www.example.com'), $entry->getAuthor());
}

/**
Expand Down Expand Up @@ -264,6 +264,6 @@ public function testGetsCategoriesFromAtom10()
file_get_contents($this->feedSamplePath.'/category/atom10.xml')
);
$this->assertEquals($this->expectedCats, (array) $entry->getCategories());
$this->assertEquals(array('topic1','Cat & Dog'), array_values($entry->getCategories()->getValues()));
$this->assertEquals(array('topic1', 'Cat & Dog'), array_values($entry->getCategories()->getValues()));
}
}
12 changes: 6 additions & 6 deletions test/Reader/Entry/AtomTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public function testGetsAuthorFromAtom03()
file_get_contents($this->feedSamplePath . '/author/plain/atom03.xml')
);
$entry = $feed->current();
$this->assertEquals(array('name'=>'Joe Bloggs','email'=>'joe@example.com','uri'=>'http://www.example.com'), $entry->getAuthor());
$this->assertEquals(array('name'=>'Joe Bloggs', 'email'=>'joe@example.com', 'uri'=>'http://www.example.com'), $entry->getAuthor());
}

public function testGetsAuthorFromAtom10()
Expand All @@ -227,7 +227,7 @@ public function testGetsAuthorFromAtom10()
file_get_contents($this->feedSamplePath . '/author/plain/atom10.xml')
);
$entry = $feed->current();
$this->assertEquals(array('name'=>'Joe Bloggs','email'=>'joe@example.com','uri'=>'http://www.example.com'), $entry->getAuthor());
$this->assertEquals(array('name'=>'Joe Bloggs', 'email'=>'joe@example.com', 'uri'=>'http://www.example.com'), $entry->getAuthor());
}

/**
Expand Down Expand Up @@ -451,7 +451,7 @@ public function testGetsCategoriesFromAtom10()
);
$entry = $feed->current();
$this->assertEquals($this->expectedCats, (array) $entry->getCategories());
$this->assertEquals(array('topic1','Cat & Dog'), array_values($entry->getCategories()->getValues()));
$this->assertEquals(array('topic1', 'Cat & Dog'), array_values($entry->getCategories()->getValues()));
}

public function testGetsCategoriesFromAtom03_Atom10Extension()
Expand All @@ -461,7 +461,7 @@ public function testGetsCategoriesFromAtom03_Atom10Extension()
);
$entry = $feed->current();
$this->assertEquals($this->expectedCats, (array) $entry->getCategories());
$this->assertEquals(array('topic1','Cat & Dog'), array_values($entry->getCategories()->getValues()));
$this->assertEquals(array('topic1', 'Cat & Dog'), array_values($entry->getCategories()->getValues()));
}

// DC 1.0/1.1 for Atom 0.3
Expand All @@ -473,7 +473,7 @@ public function testGetsCategoriesFromAtom03_Dc10()
);
$entry = $feed->current();
$this->assertEquals($this->expectedCatsDc, (array) $entry->getCategories());
$this->assertEquals(array('topic1','topic2'), array_values($entry->getCategories()->getValues()));
$this->assertEquals(array('topic1', 'topic2'), array_values($entry->getCategories()->getValues()));
}

public function testGetsCategoriesFromAtom03_Dc11()
Expand All @@ -483,7 +483,7 @@ public function testGetsCategoriesFromAtom03_Dc11()
);
$entry = $feed->current();
$this->assertEquals($this->expectedCatsDc, (array) $entry->getCategories());
$this->assertEquals(array('topic1','topic2'), array_values($entry->getCategories()->getValues()));
$this->assertEquals(array('topic1', 'topic2'), array_values($entry->getCategories()->getValues()));
}

// No Categories In Entry
Expand Down
74 changes: 37 additions & 37 deletions test/Reader/Entry/RssTest.php
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/Reader/Feed/AtomSourceTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function testGetsSingleAuthorFromAtom10()
);
$source = $feed->current()->getSource();

$this->assertEquals(array('name'=>'Joe Bloggs','email'=>'joe@example.com','uri'=>'http://www.example.com'), $feed->getAuthor());
$this->assertEquals(array('name'=>'Joe Bloggs', 'email'=>'joe@example.com', 'uri'=>'http://www.example.com'), $feed->getAuthor());
}

/**
Expand Down Expand Up @@ -266,6 +266,6 @@ public function testGetsCategoriesFromAtom10()
);
$source = $feed->current()->getSource();
$this->assertEquals($this->expectedCats, (array) $source->getCategories());
$this->assertEquals(array('topic1','Cat & Dog'), array_values($source->getCategories()->getValues()));
$this->assertEquals(array('topic1', 'Cat & Dog'), array_values($source->getCategories()->getValues()));
}
}
12 changes: 6 additions & 6 deletions test/Reader/Feed/AtomTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public function testGetsSingleAuthorFromAtom03()
file_get_contents($this->feedSamplePath.'/author/plain/atom03.xml')
);

$this->assertEquals(array('name'=>'Joe Bloggs','email'=>'joe@example.com','uri'=>'http://www.example.com'), $feed->getAuthor());
$this->assertEquals(array('name'=>'Joe Bloggs', 'email'=>'joe@example.com', 'uri'=>'http://www.example.com'), $feed->getAuthor());
}

public function testGetsSingleAuthorFromAtom10()
Expand All @@ -138,7 +138,7 @@ public function testGetsSingleAuthorFromAtom10()
file_get_contents($this->feedSamplePath.'/author/plain/atom10.xml')
);

$this->assertEquals(array('name'=>'Joe Bloggs','email'=>'joe@example.com','uri'=>'http://www.example.com'), $feed->getAuthor());
$this->assertEquals(array('name'=>'Joe Bloggs', 'email'=>'joe@example.com', 'uri'=>'http://www.example.com'), $feed->getAuthor());
}

/**
Expand Down Expand Up @@ -421,7 +421,7 @@ public function testGetsCategoriesFromAtom10()
file_get_contents($this->feedSamplePath.'/category/plain/atom10.xml')
);
$this->assertEquals($this->expectedCats, (array) $feed->getCategories());
$this->assertEquals(array('topic1','Cat & Dog'), array_values($feed->getCategories()->getValues()));
$this->assertEquals(array('topic1', 'Cat & Dog'), array_values($feed->getCategories()->getValues()));
}

public function testGetsCategoriesFromAtom03_Atom10Extension()
Expand All @@ -430,7 +430,7 @@ public function testGetsCategoriesFromAtom03_Atom10Extension()
file_get_contents($this->feedSamplePath.'/category/plain/atom03.xml')
);
$this->assertEquals($this->expectedCats, (array) $feed->getCategories());
$this->assertEquals(array('topic1','Cat & Dog'), array_values($feed->getCategories()->getValues()));
$this->assertEquals(array('topic1', 'Cat & Dog'), array_values($feed->getCategories()->getValues()));
}

// DC 1.0/1.1 for Atom 0.3
Expand All @@ -441,7 +441,7 @@ public function testGetsCategoriesFromAtom03_Dc10()
file_get_contents($this->feedSamplePath.'/category/plain/dc10/atom03.xml')
);
$this->assertEquals($this->expectedCatsDc, (array) $feed->getCategories());
$this->assertEquals(array('topic1','topic2'), array_values($feed->getCategories()->getValues()));
$this->assertEquals(array('topic1', 'topic2'), array_values($feed->getCategories()->getValues()));
}

public function testGetsCategoriesFromAtom03_Dc11()
Expand All @@ -450,7 +450,7 @@ public function testGetsCategoriesFromAtom03_Dc11()
file_get_contents($this->feedSamplePath.'/category/plain/dc11/atom03.xml')
);
$this->assertEquals($this->expectedCatsDc, (array) $feed->getCategories());
$this->assertEquals(array('topic1','topic2'), array_values($feed->getCategories()->getValues()));
$this->assertEquals(array('topic1', 'topic2'), array_values($feed->getCategories()->getValues()));
}

// No Categories In Entry
Expand Down
Loading

0 comments on commit 2bc9f4c

Please sign in to comment.