Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

HTML/URL switch to mixed case

- Switch ACRONYM casing to MixedCase for "HTML" and "URL" subcomponents
  • Loading branch information...
commit 004fa93d15d7a1cdcb17a75a0a490c774dafc2e3 1 parent 922afa9
@weierophinney weierophinney authored
View
2  library/Zend/Markup/Markup.php
@@ -122,7 +122,7 @@ public static function addRendererPath($prefix, $path)
* @param array $options
* @return \Zend\Markup\Renderer\AbstractRenderer
*/
- public static function factory($parser, $renderer = 'HTML', array $options = array())
+ public static function factory($parser, $renderer = 'Html', array $options = array())
{
$parserClass = self::getParserLoader()->load($parser);
$rendererClass = self::getRendererLoader()->load($renderer);
View
24 library/Zend/Markup/Parser/Textile.php
@@ -561,4 +561,28 @@ protected function _extractAttributes(array $matches)
return $attributes;
}
+ /**
+ * Build a tree with a certain strategy
+ *
+ * @todo IMPLEMENT
+ * @param array $tokens
+ * @param string $strategy
+ *
+ * @return \Zend\Markup\TokenList
+ */
+ public function buildTree(array $tokens, $strategy = 'default')
+ {
+ }
+
+ /**
+ * Tokenize a string
+ *
+ * @param string $value
+ *
+ * @todo IMPLEMENT
+ * @return array
+ */
+ public function tokenize($value)
+ {
+ }
}
View
8 library/Zend/Markup/Renderer/HTML.php → library/Zend/Markup/Renderer/Html.php
@@ -43,7 +43,7 @@
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-class HTML extends AbstractRenderer
+class Html extends AbstractRenderer
{
/**
@@ -95,7 +95,7 @@ public function __construct($options = array())
}
$this->_pluginLoader = new PluginLoader(array(
- 'Zend\Markup\Renderer\Markup\HTML' => 'Zend/Markup/Renderer/Markup/HTML/'
+ 'Zend\Markup\Renderer\Markup\Html' => 'Zend/Markup/Renderer/Markup/Html/'
));
if (!isset($options['useDefaultMarkups']) && isset($options['useDefaultTags'])) {
@@ -220,10 +220,6 @@ protected function _defineDefaultMarkups()
),
// callback tags
'url' => array(
- 'type' => 16, // self::TYPE_ALIAS
- 'name' => 'URL',
- ),
- 'URL' => array(
'type' => 6, // self::TYPE_CALLBACK | self::TAG_NORMAL
'callback' => null,
'group' => 'inline',
View
12 ...Zend/Markup/Renderer/Markup/HTML/AbstractHTML.php → ...Zend/Markup/Renderer/Markup/Html/AbstractHtml.php
@@ -22,7 +22,7 @@
/**
* @namespace
*/
-namespace Zend\Markup\Renderer\Markup\HTML;
+namespace Zend\Markup\Renderer\Markup\Html;
use Zend\Markup\Renderer\Markup\AbstractMarkup,
Zend\Markup;
@@ -34,11 +34,11 @@
* @uses \Zend\Markup\Renderer\AbstractRenderer
* @category Zend
* @package Zend_Markup
- * @subpackage Renderer_Markup_HTML
+ * @subpackage Renderer_Markup_Html
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-abstract class AbstractHTML extends AbstractMarkup
+abstract class AbstractHtml extends AbstractMarkup
{
/**
@@ -54,7 +54,7 @@
*
* @param array $attributes
*
- * @return \Zend\Markup\Renderer\Markup\HTML\AbstractHTML
+ * @return \Zend\Markup\Renderer\Markup\Html\AbstractHtml
*/
public function setAttributes(array $attributes)
{
@@ -69,7 +69,7 @@ public function setAttributes(array $attributes)
* @param string $name
* @param string $value
*
- * @return \Zend\Markup\Renderer\Markup\HTML\AbstractHTML
+ * @return \Zend\Markup\Renderer\Markup\Html\AbstractHtml
*/
public function addAttribute($name, $value)
{
@@ -83,7 +83,7 @@ public function addAttribute($name, $value)
*
* @param string $name
*
- * @return \Zend\Markup\Renderer\Markup\HTML\AbstractHTML
+ * @return \Zend\Markup\Renderer\Markup\Html\AbstractHtml
*/
public function removeAttribute($name)
{
View
6 library/Zend/Markup/Renderer/Markup/HTML/Code.php → library/Zend/Markup/Renderer/Markup/Html/Code.php
@@ -23,13 +23,13 @@
/**
* @namespace
*/
-namespace Zend\Markup\Renderer\Markup\HTML;
+namespace Zend\Markup\Renderer\Markup\Html;
use Zend\Markup;
/**
* Code markup for HTML
*
- * @uses \Zend\Markup\Renderer\Markup\HTML\AbstractHTML
+ * @uses \Zend\Markup\Renderer\Markup\Html\AbstractHtml
* @uses \Zend\Markup\Token
* @category Zend
* @package Zend_Markup
@@ -37,7 +37,7 @@
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-class Code extends AbstractHTML
+class Code extends AbstractHtml
{
/**
View
10 library/Zend/Markup/Renderer/Markup/HTML/Img.php → library/Zend/Markup/Renderer/Markup/Html/Img.php
@@ -23,15 +23,15 @@
/**
* @namespace
*/
-namespace Zend\Markup\Renderer\Markup\HTML;
+namespace Zend\Markup\Renderer\Markup\Html;
use Zend\Markup\Renderer\Markup;
use Zend\Markup\Token;
/**
* Image markup for HTML
*
- * @uses \Zend\Markup\Renderer\HTML
- * @uses \Zend\Markup\Renderer\Markup\HTML\AbstractHTML
+ * @uses \Zend\Markup\Renderer\Html
+ * @uses \Zend\Markup\Renderer\Markup\Html\AbstractHtml
* @uses \Zend\Markup\Token
* @category Zend
* @package Zend_Markup
@@ -39,7 +39,7 @@
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-class Img extends AbstractHTML
+class Img extends AbstractHtml
{
/**
@@ -60,7 +60,7 @@ public function __invoke(Token $token, $text)
// check if the URL is valid
// TODO: use \Zend\Uri for this
- if (!\Zend\Markup\Renderer\HTML::isValidUri($uri)) {
+ if (!\Zend\Markup\Renderer\Html::isValidUri($uri)) {
return $text;
}
View
6 ...ary/Zend/Markup/Renderer/Markup/HTML/ListItem.php → ...ary/Zend/Markup/Renderer/Markup/Html/ListItem.php
@@ -23,13 +23,13 @@
/**
* @namespace
*/
-namespace Zend\Markup\Renderer\Markup\HTML;
+namespace Zend\Markup\Renderer\Markup\Html;
use Zend\Markup;
/**
* List item markup
*
- * @uses \Zend\Markup\Renderer\Markup\HTML\AbstractHTML
+ * @uses \Zend\Markup\Renderer\Markup\Html\AbstractHtml
* @uses \Zend\Markup\Token
* @category Zend
* @package Zend_Markup
@@ -37,7 +37,7 @@
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-class ListItem extends AbstractHTML
+class ListItem extends AbstractHtml
{
/**
View
6 library/Zend/Markup/Renderer/Markup/HTML/Replace.php → library/Zend/Markup/Renderer/Markup/Html/Replace.php
@@ -22,13 +22,13 @@
/**
* @namespace
*/
-namespace Zend\Markup\Renderer\Markup\HTML;
+namespace Zend\Markup\Renderer\Markup\Html;
use Zend\Markup;
/**
* Simple replace markup for HTML
*
- * @uses \Zend\Markup\Renderer\Markup\HTML\AbstractHTML
+ * @uses \Zend\Markup\Renderer\Markup\Html\AbstractHtml
* @uses \Zend\Markup\Token
* @category Zend
* @package Zend_Markup
@@ -36,7 +36,7 @@
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-class Replace extends AbstractHTML
+class Replace extends AbstractHtml
{
/**
View
10 library/Zend/Markup/Renderer/Markup/HTML/URL.php → library/Zend/Markup/Renderer/Markup/Html/Url.php
@@ -23,14 +23,14 @@
/**
* @namespace
*/
-namespace Zend\Markup\Renderer\Markup\HTML;
+namespace Zend\Markup\Renderer\Markup\Html;
use Zend\Markup\Token;
/**
* URL markup for HTML
*
- * @uses \Zend\Markup\Renderer\HTML
- * @uses \Zend\Markup\Renderer\Markup\HTML\AbstractHTML
+ * @uses \Zend\Markup\Renderer\Html
+ * @uses \Zend\Markup\Renderer\Markup\Html\AbstractHtml
* @uses \Zend\Markup\Token
* @category Zend
* @package Zend_Markup
@@ -38,7 +38,7 @@
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-class URL extends AbstractHTML
+class Url extends AbstractHtml
{
/**
@@ -63,7 +63,7 @@ public function __invoke(Token $token, $text)
// check if the URL is valid
// TODO: use the new Zend\Uri for this
- if (!\Zend\Markup\Renderer\HTML::isValidUri($uri)) {
+ if (!\Zend\Markup\Renderer\Html::isValidUri($uri)) {
return $text;
}
View
8 tests/Zend/Markup/BBCodeAndHTMLTest.php
@@ -26,7 +26,7 @@
namespace ZendTest\Markup;
use Zend\Markup\Renderer\AbstractRenderer,
- Zend\Markup\Renderer\HTML as HTMLRenderer,
+ Zend\Markup\Renderer\Html as HTMLRenderer,
Zend\Filter;
/**
@@ -55,7 +55,7 @@ class BbcodeAndHtmlTest extends \PHPUnit_Framework_TestCase
*/
public function setUp()
{
- $this->_markup = \Zend\Markup\Markup::factory('Bbcode', 'HTML');
+ $this->_markup = \Zend\Markup\Markup::factory('Bbcode', 'Html');
}
/**
@@ -131,8 +131,8 @@ public function testExceptionParserEmptyInput()
public function testAddTags()
{
$this->_markup->getPluginLoader()->addPrefixPath(
- 'ZendTest\Markup\TestAsset\Renderer\HTML',
- 'Zend/Markup/TestAsset/Renderer/HTML'
+ 'ZendTest\Markup\TestAsset\Renderer\Html',
+ 'Zend/Markup/TestAsset/Renderer/Html'
);
$this->_markup->addMarkup(
View
8 tests/Zend/Markup/TestAsset/Parser/MockParser.php
@@ -82,4 +82,12 @@ public function parse($value)
return $tree;
}
+
+ public function buildTree(array $tokens, $strategy = 'default')
+ {
+ }
+
+ public function tokenize($value)
+ {
+ }
}
View
2  tests/Zend/Markup/TestAsset/Renderer/HTML/Bar.php → tests/Zend/Markup/TestAsset/Renderer/Html/Bar.php
@@ -23,7 +23,7 @@
/**
* @namespace
*/
-namespace ZendTest\Markup\TestAsset\Renderer\HTML;
+namespace ZendTest\Markup\TestAsset\Renderer\Html;
use Zend\Markup\Renderer\AbstractRenderer;
Please sign in to comment.
Something went wrong with that request. Please try again.