Zend_Navigation: Switched from setFragementIdentifier to setFragment for getters/mutators for consistency

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24454 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Navigation/Page.php

@@ -53,7 +53,7 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container
      * 
      * @var string|null
      */
-    protected $_fragmentIdentifier;
+    protected $_fragment;
 
     /**
      * Page id
@@ -358,19 +358,19 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container
     /**
      * Sets a fragment identifier
      *
-     * @param  string $fragmentIdentifier   new fragment identifier
+     * @param  string $fragment   new fragment identifier
      * @return Zend_Navigation_Page         fluent interface, returns self
      * @throws Zend_Navigation_Exception    if empty/no string is given
      */
-    public function setFragmentIdentifier($fragmentIdentifier)
+    public function setFragment($fragment)
     {
-        if (null !== $fragmentIdentifier && !is_string($fragmentIdentifier)) {
+        if (null !== $fragment && !is_string($fragment)) {
             require_once 'Zend/Navigation/Exception.php';
             throw new Zend_Navigation_Exception(
-                    'Invalid argument: $fragmentIdentifier must be a string or null');
+                    'Invalid argument: $fragment must be a string or null');
         }
  
-        $this->_fragmentIdentifier = $fragmentIdentifier;
+        $this->_fragment = $fragment;
         return $this;
     }
     
@@ -379,9 +379,9 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container
      *
      * @return string|null  fragment identifier
      */
-    public function getFragmentIdentifier()
+    public function getFragment()
     {
-        return $this->_fragmentIdentifier;
+        return $this->_fragment;
     }
 
     /**
@@ -1183,7 +1183,7 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container
             $this->getCustomProperties(),
             array(
                 'label'     => $this->getlabel(),
-                'fragmentIdentifier' => $this->getFragmentIdentifier(),
+                'fragment' => $this->getFragment(),
                 'id'        => $this->getId(),
                 'class'     => $this->getClass(),
                 'title'     => $this->getTitle(),

library/Zend/Navigation/Page/Mvc.php

@@ -227,9 +227,9 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page
                                       $this->getEncodeUrl());
 
         // Add the fragment identifier if it is set
-        $fragmentIdentifier = $this->getFragmentIdentifier();       
-        if (null !== $fragmentIdentifier) {
-            $url .= '#' . $fragmentIdentifier;
+        $fragment = $this->getFragment();       
+        if (null !== $fragment) {
+            $url .= '#' . $fragment;
         }         
         
          return $this->_hrefCache = $url;

library/Zend/Navigation/Page/Uri.php

@@ -81,12 +81,12 @@ class Zend_Navigation_Page_Uri extends Zend_Navigation_Page
     {
         $uri = $this->getUri();
         
-        $fragmentIdentifier = $this->getFragmentIdentifier();       
-        if (null !== $fragmentIdentifier) {
+        $fragment = $this->getFragment();       
+        if (null !== $fragment) {
             if ('#' == substr($uri, -1)) {
-                return $uri . $fragmentIdentifier;
+                return $uri . $fragment;
             } else {                
-                return $uri . '#' . $fragmentIdentifier;
+                return $uri . '#' . $fragment;
             }
         }
         

tests/Zend/Navigation/Page/MvcTest.php

@@ -111,7 +111,7 @@ class Zend_Navigation_Page_MvcTest extends PHPUnit_Framework_TestCase
     {
         $page = new Zend_Navigation_Page_Mvc(array(
             'label'              => 'foo',
-            'fragmentIdentifier' => 'qux',
+            'fragment' => 'qux',
             'controller'         => 'mycontroller',
             'action'             => 'myaction',
             'route'              => 'myroute',
@@ -434,7 +434,7 @@ class Zend_Navigation_Page_MvcTest extends PHPUnit_Framework_TestCase
             'action' => 'index',
             'controller' => 'index',
             'module' => 'test',
-            'fragmentIdentifier' => 'bar',
+            'fragment' => 'bar',
             'id' => 'my-id',
             'class' => 'my-class',
             'title' => 'my-title',

tests/Zend/Navigation/Page/UriTest.php

@@ -110,7 +110,7 @@ class Zend_Navigation_Page_UriTest extends PHPUnit_Framework_TestCase
         
         $page = new Zend_Navigation_Page_Uri();
         $page->setUri($uri);
-        $page->setFragmentIdentifier('bar');
+        $page->setFragment('bar');
         
         $this->assertEquals($uri . '#bar', $page->getHref());
         

tests/Zend/Navigation/PageTest.php

@@ -169,23 +169,23 @@ class Zend_Navigation_PageTest extends PHPUnit_Framework_TestCase
     {
         $page = Zend_Navigation_Page::factory(array(
             'uri'                => '#',
-            'fragmentIdentifier' => 'foo',
+            'fragment'           => 'foo',
         ));
         
-        $this->assertEquals('foo', $page->getFragmentIdentifier());
+        $this->assertEquals('foo', $page->getFragment());
         
-        $page->setFragmentIdentifier('bar');
-        $this->assertEquals('bar', $page->getFragmentIdentifier());
+        $page->setFragment('bar');
+        $this->assertEquals('bar', $page->getFragment());
         
         $invalids = array(42, (object) null);
         foreach ($invalids as $invalid) {
             try {
-                $page->setFragmentIdentifier($invalid);
+                $page->setFragment($invalid);
                 $this->fail('An invalid value was set, but a ' .
                             'Zend_Navigation_Exception was not thrown');
             } catch (Zend_Navigation_Exception $e) {
                 $this->assertContains(
-                    'Invalid argument: $fragmentIdentifier', $e->getMessage()
+                    'Invalid argument: $fragment', $e->getMessage()
                 );
             }
         }
@@ -1161,7 +1161,7 @@ class Zend_Navigation_PageTest extends PHPUnit_Framework_TestCase
         $options = array(
             'label'    => 'foo',
             'uri'      => 'http://www.example.com/foo.html',
-            'fragmentIdentifier' => 'bar',
+            'fragment' => 'bar',
             'id'       => 'my-id',
             'class'    => 'my-class',
             'title'    => 'my-title',
@@ -1208,7 +1208,7 @@ class Zend_Navigation_PageTest extends PHPUnit_Framework_TestCase
 
         // tweak options to what we expect sub page 1 to be
         $options['label'] = 'foo.bar';
-        $options['fragmentIdentifier'] = null;
+        $options['fragment'] = null;
         $options['order'] = null;
         $options['id'] = null;
         $options['class'] = null;