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

Commit

Permalink
Merge branch 'hotfix/cs'
Browse files Browse the repository at this point in the history 
Fixes failing php-cs-fixer notices.
  • Loading branch information
@weierophinney
weierophinney committed Sep 21, 2012
2 parents e12fe2d + d9206e0 commit e34a942
Show file tree
Hide file tree
Showing 23 changed files with 25 additions and 33 deletions.
2 changes: 1 addition & 1 deletion src/Helper/Placeholder/Container/AbstractStandalone.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function setEscaper(Escaper $escaper)
$this->escapers[$encoding] = $escaper;
return $this;
}

/**
* Get Escaper instance
*
Expand Down
1 change: 0 additions & 1 deletion test/Helper/DoctypeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,4 +202,3 @@ public function testStringificationReturnsDoctypeString()
$this->assertEquals('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">', $string);
}
}

1 change: 0 additions & 1 deletion test/Helper/HeadLinkTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,4 +410,3 @@ public function testIdAttributeIsSupported()
$this->assertContains('id="foo"', $this->helper->toString());
}
}

1 change: 0 additions & 1 deletion test/Helper/HeadMetaTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,4 +488,3 @@ public function testConditional()
}

}

1 change: 0 additions & 1 deletion test/Helper/HtmlFlashTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,3 @@ public function testMakeHtmlFlash()
$this->assertContains('</object>', $htmlFlash);
}
}

22 changes: 11 additions & 11 deletions test/Helper/Navigation/SitemapTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ public function testNullingOutNavigation()

public function testRenderSuppliedContainerWithoutInterfering()
{
$rendered1 = $this->_getExpected('sitemap/default1.xml');
$rendered2 = $this->_getExpected('sitemap/default2.xml');
$rendered1 = trim($this->_getExpected('sitemap/default1.xml'));
$rendered2 = trim($this->_getExpected('sitemap/default2.xml'));

$expected = array(
'registered' => $rendered1,
Expand All @@ -126,7 +126,7 @@ public function testUseAclRoles()
$this->_helper->setRole($acl['role']);

$expected = $this->_getExpected('sitemap/acl.xml');
$this->assertEquals($expected, $this->_helper->render());
$this->assertEquals(trim($expected), $this->_helper->render());
}

public function testUseAclButNoRole()
Expand All @@ -136,39 +136,39 @@ public function testUseAclButNoRole()
$this->_helper->setRole(null);

$expected = $this->_getExpected('sitemap/acl2.xml');
$this->assertEquals($expected, $this->_helper->render());
$this->assertEquals(trim($expected), $this->_helper->render());
}

public function testSettingMaxDepth()
{
$this->_helper->setMaxDepth(0);

$expected = $this->_getExpected('sitemap/depth1.xml');
$this->assertEquals($expected, $this->_helper->render());
$this->assertEquals(trim($expected), $this->_helper->render());
}

public function testSettingMinDepth()
{
$this->_helper->setMinDepth(1);

$expected = $this->_getExpected('sitemap/depth2.xml');
$this->assertEquals($expected, $this->_helper->render());
$this->assertEquals(trim($expected), $this->_helper->render());
}

public function testSettingBothDepths()
{
$this->_helper->setMinDepth(1)->setMaxDepth(2);

$expected = $this->_getExpected('sitemap/depth3.xml');
$this->assertEquals($expected, $this->_helper->render());
$this->assertEquals(trim($expected), $this->_helper->render());
}

public function testDropXmlDeclaration()
{
$this->_helper->setUseXmlDeclaration(false);

$expected = $this->_getExpected('sitemap/nodecl.xml');
$this->assertEquals($expected, $this->_helper->render($this->_nav2));
$this->assertEquals(trim($expected), $this->_helper->render($this->_nav2));
}

public function testThrowExceptionOnInvalidLoc()
Expand Down Expand Up @@ -198,7 +198,7 @@ public function testDisablingValidators()
$this->_helper->setUseSitemapValidators(false);

$expected = $this->_getExpected('sitemap/invalid.xml');
$this->assertEquals($expected, $this->_helper->render($nav));
$this->assertEquals(trim($expected), $this->_helper->render($nav));
}

public function testSetServerUrlRequiresValidUri()
Expand All @@ -218,15 +218,15 @@ public function testSetServerUrlWithSchemeAndHost()
$this->_helper->setServerUrl('http://sub.example.org');

$expected = $this->_getExpected('sitemap/serverurl1.xml');
$this->assertEquals($expected, $this->_helper->render());
$this->assertEquals(trim($expected), $this->_helper->render());
}

public function testSetServerUrlWithSchemeAndPortAndHostAndPath()
{
$this->_helper->setServerUrl('http://sub.example.org:8080/foo/');

$expected = $this->_getExpected('sitemap/serverurl2.xml');
$this->assertEquals($expected, $this->_helper->render());
$this->assertEquals(trim($expected), $this->_helper->render());
}

public function testGetUserSchemaValidation()
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/expected/sitemap/acl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@
<url>
<loc>http://www.zym-project.com/</loc>
</url>
</urlset>
</urlset>
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/expected/sitemap/acl2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
<url>
<loc>http://www.zym-project.com/</loc>
</url>
</urlset>
</urlset>
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/expected/sitemap/default1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
<url>
<loc>http://www.zym-project.com/</loc>
</url>
</urlset>
</urlset>
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/expected/sitemap/default2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
<url>
<loc>http://localhost/site3</loc>
</url>
</urlset>
</urlset>
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/expected/sitemap/depth1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
<url>
<loc>http://www.zym-project.com/</loc>
</url>
</urlset>
</urlset>
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/expected/sitemap/depth2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@
<url>
<loc>http://localhost/page3/page3_3/page3_3_2</loc>
</url>
</urlset>
</urlset>
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/expected/sitemap/depth3.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@
<url>
<loc>http://localhost/page3/page3_3/page3_3_2</loc>
</url>
</urlset>
</urlset>
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/expected/sitemap/invalid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
<url>
<loc>http://w.</loc>
</url>
</urlset>
</urlset>
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/expected/sitemap/nodecl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
<url>
<loc>http://localhost/site3</loc>
</url>
</urlset>
</urlset>
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/expected/sitemap/serverurl1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
<url>
<loc>http://www.zym-project.com/</loc>
</url>
</urlset>
</urlset>
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/expected/sitemap/serverurl2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
<url>
<loc>http://www.zym-project.com/</loc>
</url>
</urlset>
</urlset>
2 changes: 1 addition & 1 deletion test/Helper/Navigation/_files/navigation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,4 @@

</nav_test2>

</navigation_test>
</navigation_test>
1 change: 0 additions & 1 deletion test/Helper/PaginationControlTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,3 @@ public function testCanUseObjectForScrollingStyle()
$this->assertContains('page count (11) equals pages in range (11)', $output, $output);
}
}

1 change: 0 additions & 1 deletion test/Helper/PartialLoopTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,4 +454,3 @@ public function toArray()
return $this->_info;
}
}

1 change: 0 additions & 1 deletion test/Helper/Placeholder/ContainerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,4 +412,3 @@ public function testIndentationIsHonored()
$this->assertTrue((strstr($string, "\n </ul>")) ? true : false);
}
}

1 change: 0 additions & 1 deletion test/Helper/RenderToPlaceholderTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ public function testDefaultEmpty()
}

}

2 changes: 1 addition & 1 deletion test/Model/TestAsset/Variable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ public function rewind()
public function valid()
{
}
}
}

0 comments on commit e34a942

Please sign in to comment.