From 5511f94645ccdab883168cddf8b163435ad806bc Mon Sep 17 00:00:00 2001 From: Michel Fortin Date: Mon, 21 Jan 2013 07:51:51 -0500 Subject: [PATCH] Changed namespace to Michelf (capitalized). --- {michelf => Michelf}/Markdown.php | 14 +++++++------- {michelf => Michelf}/MarkdownExtra.php | 8 ++++---- Readme.md | 20 +++++++++++++++----- 3 files changed, 26 insertions(+), 16 deletions(-) rename {michelf => Michelf}/Markdown.php (99%) rename {michelf => Michelf}/MarkdownExtra.php (79%) diff --git a/michelf/Markdown.php b/Michelf/Markdown.php similarity index 99% rename from michelf/Markdown.php rename to Michelf/Markdown.php index 7305a55..e9b61e8 100644 --- a/michelf/Markdown.php +++ b/Michelf/Markdown.php @@ -10,17 +10,17 @@ # Copyright (c) 2004-2006 John Gruber # # -namespace michelf; +namespace Michelf; # # The following constants are deprecated: avoid using them, they'll disappear # soon. # # You can get the parser's version using the constant inside of the parser -# class: \michelf\Markdown::MARKDOWN_VERSION. +# class: \Michelf\Markdown::MARKDOWN_VERSION. # -const MARKDOWNLIB_VERSION = "1.3-beta1"; # Sun 13 Jan 2013 +const MARKDOWNLIB_VERSION = "1.3-beta3"; # Mon 21 Jan 2013 const MARKDOWN_VERSION = "1.0.1p"; # Sun 13 Jan 2013 const MARKDOWNEXTRA_VERSION = "1.2.6"; # Sun 13 Jan 2013 @@ -33,7 +33,7 @@ class Markdown { ### Version ### - const MARKDOWN_VERSION = \michelf\MARKDOWN_VERSION; + const MARKDOWN_VERSION = \Michelf\MARKDOWN_VERSION; ### Simple Function Interface ### @@ -1531,12 +1531,12 @@ class Markdown { # Currently the implementation of of Extra resides here in this temporary class. # This makes it easier to propagate the changes between the three different # packaging styles of PHP Markdown. When this issue is resolved, this -# MarkdownExtra_TmpImpl class here will disappear and \michelf\MarkdownExtra -# will contain the code. So please use \michelf\MarkdownExtra and ignore this +# MarkdownExtra_TmpImpl class here will disappear and \Michelf\MarkdownExtra +# will contain the code. So please use \Michelf\MarkdownExtra and ignore this # one. # -class _MarkdownExtra_TmpImpl extends \michelf\Markdown { +class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { ### Configuration Variables ### diff --git a/michelf/MarkdownExtra.php b/Michelf/MarkdownExtra.php similarity index 79% rename from michelf/MarkdownExtra.php rename to Michelf/MarkdownExtra.php index 8b7c671..69b4119 100644 --- a/michelf/MarkdownExtra.php +++ b/Michelf/MarkdownExtra.php @@ -10,24 +10,24 @@ # Copyright (c) 2004-2006 John Gruber # # -namespace michelf; +namespace Michelf; # # Markdown Extra Parser Class # # Note: Currently the implementation resides in the temporary class -# \michelf\MarkdownExtra_TmpImpl (in the same file as \michelf\Markdown). +# \Michelf\MarkdownExtra_TmpImpl (in the same file as \Michelf\Markdown). # This makes it easier to propagate the changes between the three different # packaging styles of PHP Markdown. Once this issue is resolved, the # _MarkdownExtra_TmpImpl will disappear and this one will contain the code. # -class MarkdownExtra extends \michelf\_MarkdownExtra_TmpImpl { +class MarkdownExtra extends \Michelf\_MarkdownExtra_TmpImpl { ### Version ### - const MARKDOWNEXTRA_VERSION = \michelf\MARKDOWNEXTRA_VERSION; + const MARKDOWNEXTRA_VERSION = \Michelf\MARKDOWNEXTRA_VERSION; ### Parser Implementation ### diff --git a/Readme.md b/Readme.md index 04458b6..696cdf1 100644 --- a/Readme.md +++ b/Readme.md @@ -50,22 +50,22 @@ Usage ----- You can use PHP Markdown easily in your PHP program. This library package -is meant to be used with autoloading, so putting the 'michelf' folder +is meant to be used with autoloading, so putting the 'Michelf' folder in your include path should be enough for this to work: - use \michelf\Markdown; + use \Michelf\Markdown; $my_html = Markdown::defaultTransform($my_text); PHP Markdown Extra is also available the same way: - use \michelf\MarkdownExtra; + use \Michelf\MarkdownExtra; $my_html = MarkdownExtra::defaultTransform($my_text); If you wish to use PHP Markdown with another text filter function built to parse HTML, you should filter the text *after* the Markdown function call. This is an example with [PHP SmartyPants][psp]: - use \michelf\Markdown, \michelf\SmartyPants; + use \Michelf\Markdown, \Michelf\SmartyPants; $my_html = Markdown::defaultTransform($my_text); $my_html = SmartyPants::defaultTransform($my_html); @@ -73,7 +73,7 @@ All these examples are using the static `markdown` function found inside the parser class. If you want to customize the parser, you can also instantiate it directly and change some configuration variables: - use \michelf\MarkdownExtra; + use \Michelf\MarkdownExtra; $parser = new MarkdownExtra; $parser->fn_id_prefix = "post22-"; $my_html = $parser->transform($my_text); @@ -112,6 +112,16 @@ See Installation and Requirement above for details. Version History --------------- +Lib 1.3-beta3 (21 Jan 2013): + +* Changed namespace name from michelf (lowercase) to Michelf (capitalized). + + +Lib 1.3-beta2 (14 Jan 2013): + +* Fixed missing autoloading information for composer. + + Lib 1.3-beta1 (13 Jan 2013): Extra 1.2.6 (13 Jan 2013):