Merge remote-tracking branch 'remotes/zf2/master' into test/feed-entr…

…y-type-detection
zendframework · Jul 5, 2012 · 59b30de · 59b30de
commit 59b30de
Show file tree

Hide file tree

Showing 16 changed files with 143 additions and 425 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/src/Helper/FormElement.php b/src/Helper/FormElement.php
diff --git a/src/Helper/HtmlList.php b/src/Helper/HtmlList.php
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HtmlList extends FormElement
+class HtmlList extends AbstractHtmlElement
 {
     /**
      * Generates a 'List' element.
@@ -68,10 +68,7 @@ public function __invoke(array $items, $ordered = false, $attribs = false, $esca
             $attribs = '';
         }
 
-        $tag = 'ul';
-        if ($ordered) {
-            $tag = 'ol';
-        }
+        $tag = ($ordered) ? 'ol' : 'ul';
 
         return '<' . $tag . $attribs . '>' . self::EOL . $list . '</' . $tag . '>' . self::EOL;
     }

diff --git a/src/Helper/Navigation/Sitemap.php b/src/Helper/Navigation/Sitemap.php
@@ -91,6 +91,13 @@ class Sitemap extends AbstractHelper
      */
     protected $serverUrl;
 
+    /**
+     * List of urls in the sitemap
+     *
+     * @var array
+     */
+    protected $urls = array();
+
     /**
      * Helper entry point
      *
@@ -284,11 +291,17 @@ public function url(AbstractPage $page)
             $curDoc         = $basePathHelper();
             $curDoc         = ('/' == $curDoc) ? '' : trim($curDoc, '/');
             $url            = rtrim($this->getServerUrl(), '/') . '/'
-                            . $curDoc
-                            . (empty($curDoc) ? '' : '/') . $href;
+                                                                . $curDoc
+                                                                . (empty($curDoc) ? '' : '/') . $href;
         }
 
-        return $this->xmlEscape($url);
+        if (! in_array($url, $this->urls)) {
+
+            $this->urls[] = $url;
+            return $this->xmlEscape($url);
+        }
+
+        return null;
     }
 
     /**
@@ -309,6 +322,9 @@ public function url(AbstractPage $page)
      */
     public function getDomSitemap(AbstractContainer $container = null)
     {
+        // Reset the urls
+        $this->urls = array();
+
         if (null === $container) {
             $container = $this->getContainer();
         }
@@ -353,6 +369,7 @@ public function getDomSitemap(AbstractContainer $container = null)
             // get absolute url from page
             if (!$url = $this->url($page)) {
                 // skip page if it has no url (rare case)
+                // or already is in the sitemap
                 continue;
             }
 
@@ -364,14 +381,14 @@ public function getDomSitemap(AbstractContainer $container = null)
                 && !$locValidator->isValid($url)
             ) {
                 throw new Exception\RuntimeException(sprintf(
-                        'Encountered an invalid URL for Sitemap XML: "%s"',
-                        $url
+                    'Encountered an invalid URL for Sitemap XML: "%s"',
+                    $url
                 ));
             }
 
             // put url in 'loc' element
             $urlNode->appendChild($dom->createElementNS(self::SITEMAP_NS,
-                                                        'loc', $url));
+                    'loc', $url));
 
             // add 'lastmod' element if a valid lastmod is set in page
             if (isset($page->lastmod)) {
@@ -386,7 +403,7 @@ public function getDomSitemap(AbstractContainer $container = null)
                     $lastmodValidator->isValid($lastmod)) {
                     $urlNode->appendChild(
                         $dom->createElementNS(self::SITEMAP_NS, 'lastmod',
-                                              $lastmod)
+                            $lastmod)
                     );
                 }
             }
@@ -398,7 +415,7 @@ public function getDomSitemap(AbstractContainer $container = null)
                     $changefreqValidator->isValid($changefreq)) {
                     $urlNode->appendChild(
                         $dom->createElementNS(self::SITEMAP_NS, 'changefreq',
-                                              $changefreq)
+                            $changefreq)
                     );
                 }
             }
@@ -410,7 +427,7 @@ public function getDomSitemap(AbstractContainer $container = null)
                     $priorityValidator->isValid($priority)) {
                     $urlNode->appendChild(
                         $dom->createElementNS(self::SITEMAP_NS, 'priority',
-                                              $priority)
+                            $priority)
                     );
                 }
             }
@@ -420,8 +437,8 @@ public function getDomSitemap(AbstractContainer $container = null)
         if ($this->getUseSchemaValidation()) {
             if (!@$dom->schemaValidate(self::SITEMAP_XSD)) {
                 throw new Exception\RuntimeException(sprintf(
-                        'Sitemap is invalid according to XML Schema at "%s"',
-                        self::SITEMAP_XSD
+                    'Sitemap is invalid according to XML Schema at "%s"',
+                    self::SITEMAP_XSD
                 ));
             }
         }
@@ -437,19 +454,17 @@ public function getDomSitemap(AbstractContainer $container = null)
      * Implements {@link HelperInterface::render()}.
      *
      * @param  link|AbstractContainer $container [optional] container to render. Default is
-     *                              to render the container registered in the 
+     *                              to render the container registered in the
      *                              helper.
      * @return string               helper output
      */
     public function render($container = null)
     {
         $dom = $this->getDomSitemap($container);
         $xml = $this->getUseXmlDeclaration() ?
-               $dom->saveXML() :
-               $dom->saveXML($dom->documentElement);
+            $dom->saveXML() :
+            $dom->saveXML($dom->documentElement);
 
-        // DOMDocument ends lines with a "\n" character. We want this to be the PHP_EOL character
-        // in order to keep unit tests working.
-        return str_replace("\n", PHP_EOL, rtrim($xml, PHP_EOL) );
+        return rtrim($xml, PHP_EOL);
     }
 }