gordonbanderson / weboftalent-sitemap

code/SiteMap.php

Indentation +36 added lines, -36 removed lines

@@ -11,45 +11,45 @@
 
 class SiteMap_Controller extends Page_Controller
 {
-	/**
-	* This function will return a unordered list of all pages on the site.
-	* Watch for the switch between $page and $child in the second line of the
-	* foreach().
-	*
-	* Note that this will only skip ErrorPage's at the top/root level of the site.
-	* If you have an ErrorPage class somewhere else in the hierarchy, it will be
-	* displayed.
-	*/
-	public function SiteMap()
-	{
-		// Pages at the root level only
-		$rootLevel = Page::get()->filter('ParentID', 0);
-		$output = '';
-		$output = $this->makeList($rootLevel);
-		return $output;
-	}
+ /**
+  * This function will return a unordered list of all pages on the site.
+  * Watch for the switch between $page and $child in the second line of the
+  * foreach().
+  *
+  * Note that this will only skip ErrorPage's at the top/root level of the site.
+  * If you have an ErrorPage class somewhere else in the hierarchy, it will be
+  * displayed.
+  */
+ public function SiteMap()
+ {
+  // Pages at the root level only
+  $rootLevel = Page::get()->filter('ParentID', 0);
+  $output = '';
+  $output = $this->makeList($rootLevel);
+  return $output;
+ }
 
-	private function makeList($pages)
-	{
-		$output = '';
-		if (count($pages)) {
-			$output = '
+ private function makeList($pages)
+ {
+  $output = '';
+  if (count($pages)) {
+   $output = '
 			<ul class="sitemap-list">';
-			foreach ($pages as $page) {
-				if (!($page instanceof ErrorPage) && $page->ShowInMenus && $page->Title != $this->Title) {
-					$output .= '
+   foreach ($pages as $page) {
+    if (!($page instanceof ErrorPage) && $page->ShowInMenus && $page->Title != $this->Title) {
+     $output .= '
 					<li><a href="'.$page->URLSegment.'" title="Go to the '.Convert::raw2xml($page->Title).' page">'.Convert::raw2xml($page->MenuTitle).'</a>';
-					$whereStatement = 'ParentID = '.$page->ID;
-					//$childPages = new DataObjectSet();
-					$childPages = DataObject::get('Page', $whereStatement);
-					$output .= $this->makeList($childPages);
-					$output .= '
+     $whereStatement = 'ParentID = '.$page->ID;
+     //$childPages = new DataObjectSet();
+     $childPages = DataObject::get('Page', $whereStatement);
+     $output .= $this->makeList($childPages);
+     $output .= '
 					</li>';
-				}
-			}
-			$output .= '
+    }
+   }
+   $output .= '
 			</ul>';
-		}
-		return $output;
-	}
+  }
+  return $output;
+ }
 }

tests/SiteMapTest.php

Indentation +9 added lines, -9 removed lines

@@ -8,23 +8,23 @@
     {
         $this->logInWithPermission('ADMIN');
         // pages need published, fixtures are not
-		foreach (Page::get() as $page) {
-			$page->doPublish();
-		}
-		$response = $this->get('/sitemap/');
+  foreach (Page::get() as $page) {
+   $page->doPublish();
+  }
+  $response = $this->get('/sitemap/');
         $this->assertEquals(200, $response->getStatusCode());
         $positions = array();
         $body = $response->getBody();
 
         // assert is a sitemap
         $count = substr_count($body, '<ul class="sitemap-list">');
-       	$this->assertEquals(2, $count);
+        $this->assertEquals(2, $count);
 
-       	// assert root level pages
+        // assert root level pages
         for ($i=1; $i <= 4; $i++) {
-        	$row = '<li><a href="page-' . $i . '" title="Go to the Page ' . $i . ' page">Page ' . $i . '</a>';
-        	$this->assertContains($row, $body);
-        	$positions["{$i}"] = strpos($body, $row);
+         $row = '<li><a href="page-' . $i . '" title="Go to the Page ' . $i . ' page">Page ' . $i . '</a>';
+         $this->assertContains($row, $body);
+         $positions["{$i}"] = strpos($body, $row);
         }
 
         //assert order

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
        	$this->assertEquals(2, $count);
 
        	// assert root level pages
-        for ($i=1; $i <= 4; $i++) {
-        	$row = '<li><a href="page-' . $i . '" title="Go to the Page ' . $i . ' page">Page ' . $i . '</a>';
+        for ($i = 1; $i <= 4; $i++) {
+        	$row = '<li><a href="page-'.$i.'" title="Go to the Page '.$i.' page">Page '.$i.'</a>';
         	$this->assertContains($row, $body);
         	$positions["{$i}"] = strpos($body, $row);
         }