From 7036f125c4d972c7f2a1e2bbd15d3657383f6026 Mon Sep 17 00:00:00 2001 From: Danang Probo Sayekti Date: Sun, 20 Sep 2015 21:12:17 +0700 Subject: [PATCH] Update composer + sitemap bugs fixes --- composer.json | 4 +- composer.lock | 59 +- system/includes/functions.php | 4 +- system/vendor/composer/ClassLoader.php | 8 +- system/vendor/composer/LICENSE | 21 + system/vendor/composer/autoload_classmap.php | 13 + system/vendor/composer/autoload_namespaces.php | 2 +- system/vendor/composer/autoload_psr4.php | 2 +- system/vendor/composer/installed.json | 176 +- system/vendor/kanti/hub-updater/composer.json | 22 +- system/vendor/michelf/php-markdown/License.md | 4 +- .../michelf/php-markdown/Michelf/Markdown.php | 1768 ++------------------ .../michelf/php-markdown/Michelf/MarkdownExtra.php | 1608 +++++++++++++++++- .../php-markdown/Michelf/MarkdownInterface.php | 7 +- system/vendor/michelf/php-markdown/Readme.md | 42 +- system/vendor/michelf/php-markdown/composer.json | 4 +- system/vendor/suin/php-rss-writer/.gitignore | 3 + system/vendor/suin/php-rss-writer/.travis.yml | 16 +- system/vendor/suin/php-rss-writer/README.md | 28 +- system/vendor/suin/php-rss-writer/Tests/.gitignore | 3 + .../vendor/suin/php-rss-writer/Tests/Bootstrap.php | 8 +- system/vendor/suin/php-rss-writer/Tests/README.md | 1 - .../Tests/Suin/RSSWriter/ChannelTest.php | 374 ++--- .../Tests/Suin/RSSWriter/FeedTest.php | 114 +- .../Tests/Suin/RSSWriter/ItemTest.php | 329 ++-- .../vendor/suin/php-rss-writer/Tests/composer.json | 4 - .../suin/php-rss-writer/Tests/phpunit.xml.dist | 10 +- system/vendor/suin/php-rss-writer/composer.json | 4 +- .../suin/php-rss-writer/examples/simple-feed.php | 37 + .../php-rss-writer/src/Suin/RSSWriter/Channel.php | 193 +++ .../src/Suin/RSSWriter/ChannelInterface.php | 92 + .../php-rss-writer/src/Suin/RSSWriter/Feed.php | 55 + .../src/Suin/RSSWriter/FeedInterface.php | 29 + .../php-rss-writer/src/Suin/RSSWriter/Item.php | 136 ++ .../src/Suin/RSSWriter/ItemInterface.php | 83 + .../src/Suin/RSSWriter/SimpleXMLElement.php | 19 + 36 files changed, 3039 insertions(+), 2243 deletions(-) create mode 100644 system/vendor/composer/LICENSE create mode 100644 system/vendor/suin/php-rss-writer/.gitignore create mode 100644 system/vendor/suin/php-rss-writer/Tests/.gitignore create mode 100644 system/vendor/suin/php-rss-writer/examples/simple-feed.php create mode 100644 system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/Channel.php create mode 100644 system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/ChannelInterface.php create mode 100644 system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/Feed.php create mode 100644 system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/FeedInterface.php create mode 100644 system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/Item.php create mode 100644 system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/ItemInterface.php create mode 100644 system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/SimpleXMLElement.php diff --git a/composer.json b/composer.json index bd53801..fd36824 100644 --- a/composer.json +++ b/composer.json @@ -4,10 +4,10 @@ "optimize-autoloader": true }, "require": { - "michelf/php-markdown": "~1.4", "suin/php-rss-writer": "~1", "kanti/hub-updater": "~0.3", - "ircmaxell/password-compat": "^1.0" + "ircmaxell/password-compat": "^1.0", + "michelf/php-markdown": "^1.5" }, "autoload": { "files": [ diff --git a/composer.lock b/composer.lock index 09fe0f1..0487760 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "68eb4fad3ec95821f7b883c60043ed6e", + "hash": "7596d174acdf281f566feb7cbc72469d", + "content-hash": "6dabcc2db078cb3f7d2e8af75949f4ce", "packages": [ { "name": "ircmaxell/password-compat", @@ -50,25 +51,28 @@ }, { "name": "kanti/hub-updater", - "version": "v0.3.1", + "version": "v0.4", "source": { "type": "git", "url": "https://github.com/Kanti/hub-updater.git", - "reference": "105bf291983b1323c5916092cc4e170bf987b00c" + "reference": "81dae71f2b3ccd0e3425579ac932a8c6b7b58c5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Kanti/hub-updater/zipball/105bf291983b1323c5916092cc4e170bf987b00c", - "reference": "105bf291983b1323c5916092cc4e170bf987b00c", + "url": "https://api.github.com/repos/Kanti/hub-updater/zipball/81dae71f2b3ccd0e3425579ac932a8c6b7b58c5d", + "reference": "81dae71f2b3ccd0e3425579ac932a8c6b7b58c5d", "shasum": "" }, "require": { "php": ">=5.3.0" }, + "require-dev": { + "phpunit/phpunit": "~4.6@dev" + }, "type": "library", "autoload": { "psr-4": { - "Kanti\\": "" + "Kanti\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -84,20 +88,20 @@ } ], "description": "Simple Github Updater for Web Projects", - "time": "2014-12-27 13:59:09" + "time": "2015-02-03 09:53:58" }, { "name": "michelf/php-markdown", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6" + "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/de9a19c7bf352d41cc99ed86c3c0ef17e87394b6", - "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/e1aabe18173231ebcefc90e615565742fc1c7fd9", + "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9", "shasum": "" }, "require": { @@ -119,36 +123,36 @@ "BSD-3-Clause" ], "authors": [ + { + "name": "John Gruber", + "homepage": "http://daringfireball.net/" + }, { "name": "Michel Fortin", "email": "michel.fortin@michelf.ca", - "homepage": "http://michelf.ca/", + "homepage": "https://michelf.ca/", "role": "Developer" - }, - { - "name": "John Gruber", - "homepage": "http://daringfireball.net/" } ], "description": "PHP Markdown", - "homepage": "http://michelf.ca/projects/php-markdown/", + "homepage": "https://michelf.ca/projects/php-markdown/", "keywords": [ "markdown" ], - "time": "2014-05-05 02:43:50" + "time": "2015-03-01 12:03:08" }, { "name": "suin/php-rss-writer", - "version": "1.3", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/suin/php-rss-writer.git", - "reference": "82812ff988bb470f746d24e153cdc138e8838ff3" + "reference": "96ff59575442dbe23e15fe7ff56d0bf27486cff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/suin/php-rss-writer/zipball/82812ff988bb470f746d24e153cdc138e8838ff3", - "reference": "82812ff988bb470f746d24e153cdc138e8838ff3", + "url": "https://api.github.com/repos/suin/php-rss-writer/zipball/96ff59575442dbe23e15fe7ff56d0bf27486cff9", + "reference": "96ff59575442dbe23e15fe7ff56d0bf27486cff9", "shasum": "" }, "require": { @@ -157,7 +161,7 @@ "type": "library", "autoload": { "psr-0": { - "Suin\\RSSWriter": "Source" + "Suin\\RSSWriter": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -166,10 +170,8 @@ ], "authors": [ { - "name": "suin", - "email": "suinyeze@gmail.com", - "homepage": "https://www.facebook.com/suinyeze", - "role": "Developer, Renaming Specialist" + "name": "Hidehito Nozawa aka Suin", + "email": "suinyeze@gmail.com" } ], "description": "Yet another simple RSS writer library for PHP 5.3 or later.", @@ -177,10 +179,11 @@ "keywords": [ "feed", "generator", + "php", "rss", "writer" ], - "time": "2014-03-12 06:05:28" + "time": "2015-08-21 06:24:39" } ], "packages-dev": [], diff --git a/system/includes/functions.php b/system/includes/functions.php index 295d5c4..e2a2ecd 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -1835,7 +1835,7 @@ function sitemap_post_path() // Author string $str = explode('/', $replaced); - $author = $str[count($str) - 3]; + $author = $str[count($str) - 5]; $post->authorUrl = site_url() . 'author/' . $author; @@ -2480,7 +2480,7 @@ function remove_html_comments($content) // Google recaptcha function isCaptcha($reCaptchaResponse) { - if (config('google.reCaptcha') == 'false') { + if (config('google.reCaptcha') != 'true') { return true; } $url = "https://www.google.com/recaptcha/api/siteverify"; diff --git a/system/vendor/composer/ClassLoader.php b/system/vendor/composer/ClassLoader.php index 4e05d3b..5e1469e 100644 --- a/system/vendor/composer/ClassLoader.php +++ b/system/vendor/composer/ClassLoader.php @@ -351,7 +351,7 @@ class ClassLoader foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) { if (0 === strpos($class, $prefix)) { foreach ($this->prefixDirsPsr4[$prefix] as $dir) { - if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { return $file; } } @@ -361,7 +361,7 @@ class ClassLoader // PSR-4 fallback dirs foreach ($this->fallbackDirsPsr4 as $dir) { - if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { return $file; } } @@ -380,7 +380,7 @@ class ClassLoader foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { if (0 === strpos($class, $prefix)) { foreach ($dirs as $dir) { - if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { return $file; } } @@ -390,7 +390,7 @@ class ClassLoader // PSR-0 fallback dirs foreach ($this->fallbackDirsPsr0 as $dir) { - if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { return $file; } } diff --git a/system/vendor/composer/LICENSE b/system/vendor/composer/LICENSE new file mode 100644 index 0000000..c8d57af --- /dev/null +++ b/system/vendor/composer/LICENSE @@ -0,0 +1,21 @@ + +Copyright (c) 2015 Nils Adermann, Jordi Boggiano + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/system/vendor/composer/autoload_classmap.php b/system/vendor/composer/autoload_classmap.php index 71dd9c1..9e16dbb 100644 --- a/system/vendor/composer/autoload_classmap.php +++ b/system/vendor/composer/autoload_classmap.php @@ -6,4 +6,17 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname(dirname($vendorDir)); return array( + 'Kanti\\CacheOneFile' => $vendorDir . '/kanti/hub-updater/src/CacheOneFile.php', + 'Kanti\\HelperClass' => $vendorDir . '/kanti/hub-updater/src/HelperClass.php', + 'Kanti\\HubUpdater' => $vendorDir . '/kanti/hub-updater/src/HubUpdater.php', + 'Michelf\\Markdown' => $vendorDir . '/michelf/php-markdown/Michelf/Markdown.php', + 'Michelf\\MarkdownExtra' => $vendorDir . '/michelf/php-markdown/Michelf/MarkdownExtra.php', + 'Michelf\\MarkdownInterface' => $vendorDir . '/michelf/php-markdown/Michelf/MarkdownInterface.php', + 'Suin\\RSSWriter\\Channel' => $vendorDir . '/suin/php-rss-writer/src/Suin/RSSWriter/Channel.php', + 'Suin\\RSSWriter\\ChannelInterface' => $vendorDir . '/suin/php-rss-writer/src/Suin/RSSWriter/ChannelInterface.php', + 'Suin\\RSSWriter\\Feed' => $vendorDir . '/suin/php-rss-writer/src/Suin/RSSWriter/Feed.php', + 'Suin\\RSSWriter\\FeedInterface' => $vendorDir . '/suin/php-rss-writer/src/Suin/RSSWriter/FeedInterface.php', + 'Suin\\RSSWriter\\Item' => $vendorDir . '/suin/php-rss-writer/src/Suin/RSSWriter/Item.php', + 'Suin\\RSSWriter\\ItemInterface' => $vendorDir . '/suin/php-rss-writer/src/Suin/RSSWriter/ItemInterface.php', + 'Suin\\RSSWriter\\SimpleXMLElement' => $vendorDir . '/suin/php-rss-writer/src/Suin/RSSWriter/SimpleXMLElement.php', ); diff --git a/system/vendor/composer/autoload_namespaces.php b/system/vendor/composer/autoload_namespaces.php index c224afd..eb54122 100644 --- a/system/vendor/composer/autoload_namespaces.php +++ b/system/vendor/composer/autoload_namespaces.php @@ -6,6 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname(dirname($vendorDir)); return array( - 'Suin\\RSSWriter' => array($vendorDir . '/suin/php-rss-writer/Source'), + 'Suin\\RSSWriter' => array($vendorDir . '/suin/php-rss-writer/src'), 'Michelf' => array($vendorDir . '/michelf/php-markdown'), ); diff --git a/system/vendor/composer/autoload_psr4.php b/system/vendor/composer/autoload_psr4.php index 3f2650b..7e43120 100644 --- a/system/vendor/composer/autoload_psr4.php +++ b/system/vendor/composer/autoload_psr4.php @@ -6,5 +6,5 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname(dirname($vendorDir)); return array( - 'Kanti\\' => array($vendorDir . '/kanti/hub-updater'), + 'Kanti\\' => array($vendorDir . '/kanti/hub-updater/src'), ); diff --git a/system/vendor/composer/installed.json b/system/vendor/composer/installed.json index b219f2f..697cdfc 100644 --- a/system/vendor/composer/installed.json +++ b/system/vendor/composer/installed.json @@ -1,29 +1,29 @@ [ { - "name": "suin/php-rss-writer", - "version": "1.3", - "version_normalized": "1.3.0.0", + "name": "ircmaxell/password-compat", + "version": "v1.0.4", + "version_normalized": "1.0.4.0", "source": { "type": "git", - "url": "https://github.com/suin/php-rss-writer.git", - "reference": "82812ff988bb470f746d24e153cdc138e8838ff3" + "url": "https://github.com/ircmaxell/password_compat.git", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/suin/php-rss-writer/zipball/82812ff988bb470f746d24e153cdc138e8838ff3", - "reference": "82812ff988bb470f746d24e153cdc138e8838ff3", + "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", "shasum": "" }, - "require": { - "php": ">=5.3.0" + "require-dev": { + "phpunit/phpunit": "4.*" }, - "time": "2014-03-12 06:05:28", + "time": "2014-11-20 16:49:30", "type": "library", "installation-source": "dist", "autoload": { - "psr-0": { - "Suin\\RSSWriter": "Source" - } + "files": [ + "lib/password.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -31,156 +31,158 @@ ], "authors": [ { - "name": "suin", - "email": "suinyeze@gmail.com", - "homepage": "https://www.facebook.com/suinyeze", - "role": "Developer, Renaming Specialist" + "name": "Anthony Ferrara", + "email": "ircmaxell@php.net", + "homepage": "http://blog.ircmaxell.com" } ], - "description": "Yet another simple RSS writer library for PHP 5.3 or later.", - "homepage": "https://github.com/suin/php-rss-writer", + "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", + "homepage": "https://github.com/ircmaxell/password_compat", "keywords": [ - "feed", - "generator", - "rss", - "writer" + "hashing", + "password" ] }, { - "name": "kanti/hub-updater", - "version": "v0.3.1", - "version_normalized": "0.3.1.0", + "name": "michelf/php-markdown", + "version": "1.5.0", + "version_normalized": "1.5.0.0", "source": { "type": "git", - "url": "https://github.com/Kanti/hub-updater.git", - "reference": "105bf291983b1323c5916092cc4e170bf987b00c" + "url": "https://github.com/michelf/php-markdown.git", + "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Kanti/hub-updater/zipball/105bf291983b1323c5916092cc4e170bf987b00c", - "reference": "105bf291983b1323c5916092cc4e170bf987b00c", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/e1aabe18173231ebcefc90e615565742fc1c7fd9", + "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2014-12-27 13:59:09", + "time": "2015-03-01 12:03:08", "type": "library", + "extra": { + "branch-alias": { + "dev-lib": "1.4.x-dev" + } + }, "installation-source": "dist", "autoload": { - "psr-4": { - "Kanti\\": "" + "psr-0": { + "Michelf": "" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0" + "BSD-3-Clause" ], "authors": [ { - "name": "Kanti", - "email": "git@kanti.de", - "homepage": "https://kanti.de", + "name": "John Gruber", + "homepage": "http://daringfireball.net/" + }, + { + "name": "Michel Fortin", + "email": "michel.fortin@michelf.ca", + "homepage": "https://michelf.ca/", "role": "Developer" } ], - "description": "Simple Github Updater for Web Projects" + "description": "PHP Markdown", + "homepage": "https://michelf.ca/projects/php-markdown/", + "keywords": [ + "markdown" + ] }, { - "name": "michelf/php-markdown", - "version": "1.4.1", - "version_normalized": "1.4.1.0", + "name": "suin/php-rss-writer", + "version": "1.3.1", + "version_normalized": "1.3.1.0", "source": { "type": "git", - "url": "https://github.com/michelf/php-markdown.git", - "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6" + "url": "https://github.com/suin/php-rss-writer.git", + "reference": "96ff59575442dbe23e15fe7ff56d0bf27486cff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/de9a19c7bf352d41cc99ed86c3c0ef17e87394b6", - "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6", + "url": "https://api.github.com/repos/suin/php-rss-writer/zipball/96ff59575442dbe23e15fe7ff56d0bf27486cff9", + "reference": "96ff59575442dbe23e15fe7ff56d0bf27486cff9", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2014-05-05 02:43:50", + "time": "2015-08-21 06:24:39", "type": "library", - "extra": { - "branch-alias": { - "dev-lib": "1.4.x-dev" - } - }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { - "Michelf": "" + "Suin\\RSSWriter": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Michel Fortin", - "email": "michel.fortin@michelf.ca", - "homepage": "http://michelf.ca/", - "role": "Developer" - }, - { - "name": "John Gruber", - "homepage": "http://daringfireball.net/" + "name": "Hidehito Nozawa aka Suin", + "email": "suinyeze@gmail.com" } ], - "description": "PHP Markdown", - "homepage": "http://michelf.ca/projects/php-markdown/", + "description": "Yet another simple RSS writer library for PHP 5.3 or later.", + "homepage": "https://github.com/suin/php-rss-writer", "keywords": [ - "markdown" + "feed", + "generator", + "php", + "rss", + "writer" ] }, { - "name": "ircmaxell/password-compat", - "version": "v1.0.4", - "version_normalized": "1.0.4.0", + "name": "kanti/hub-updater", + "version": "v0.4", + "version_normalized": "0.4.0.0", "source": { "type": "git", - "url": "https://github.com/ircmaxell/password_compat.git", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" + "url": "https://github.com/Kanti/hub-updater.git", + "reference": "81dae71f2b3ccd0e3425579ac932a8c6b7b58c5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", + "url": "https://api.github.com/repos/Kanti/hub-updater/zipball/81dae71f2b3ccd0e3425579ac932a8c6b7b58c5d", + "reference": "81dae71f2b3ccd0e3425579ac932a8c6b7b58c5d", "shasum": "" }, + "require": { + "php": ">=5.3.0" + }, "require-dev": { - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "~4.6@dev" }, - "time": "2014-11-20 16:49:30", + "time": "2015-02-03 09:53:58", "type": "library", "installation-source": "dist", "autoload": { - "files": [ - "lib/password.php" - ] + "psr-4": { + "Kanti\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "GPL-2.0" ], "authors": [ { - "name": "Anthony Ferrara", - "email": "ircmaxell@php.net", - "homepage": "http://blog.ircmaxell.com" + "name": "Kanti", + "email": "git@kanti.de", + "homepage": "https://kanti.de", + "role": "Developer" } ], - "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", - "homepage": "https://github.com/ircmaxell/password_compat", - "keywords": [ - "hashing", - "password" - ] + "description": "Simple Github Updater for Web Projects" } ] diff --git a/system/vendor/kanti/hub-updater/composer.json b/system/vendor/kanti/hub-updater/composer.json index 6a915b5..9c30166 100644 --- a/system/vendor/kanti/hub-updater/composer.json +++ b/system/vendor/kanti/hub-updater/composer.json @@ -13,15 +13,23 @@ "support": { "forum": "https://github.com/Kanti/hub-updater/issues", "issues": "https://github.com/Kanti/hub-updater/issues", - "source": "https://github.com/Kanti/hub-updater" + "source": "https://github.com/Kanti/hub-updater" }, "minimum-stability": "dev", "require": { - "php": ">=5.3.0" - }, - "autoload": { - "psr-4": { - "Kanti\\": "" - } + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.6@dev" + }, + "autoload": { + "psr-4": { + "Kanti\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "Kanti\\Test\\": "tests" + } } } diff --git a/system/vendor/michelf/php-markdown/License.md b/system/vendor/michelf/php-markdown/License.md index 8a5b854..bcb5f2a 100644 --- a/system/vendor/michelf/php-markdown/License.md +++ b/system/vendor/michelf/php-markdown/License.md @@ -1,6 +1,6 @@ PHP Markdown Lib -Copyright (c) 2004-2014 Michel Fortin - +Copyright (c) 2004-2015 Michel Fortin + All rights reserved. Based on Markdown diff --git a/system/vendor/michelf/php-markdown/Michelf/Markdown.php b/system/vendor/michelf/php-markdown/Michelf/Markdown.php index 0d37012..5585d3c 100644 --- a/system/vendor/michelf/php-markdown/Michelf/Markdown.php +++ b/system/vendor/michelf/php-markdown/Michelf/Markdown.php @@ -3,8 +3,8 @@ # Markdown - A text-to-HTML conversion tool for web writers # # PHP Markdown -# Copyright (c) 2004-2014 Michel Fortin -# +# Copyright (c) 2004-2015 Michel Fortin +# # # Original Markdown # Copyright (c) 2004-2006 John Gruber @@ -21,7 +21,7 @@ class Markdown implements MarkdownInterface { ### Version ### - const MARKDOWNLIB_VERSION = "1.4.1"; + const MARKDOWNLIB_VERSION = "1.5.0"; ### Simple Function Interface ### @@ -59,6 +59,24 @@ class Markdown implements MarkdownInterface { public $predef_urls = array(); public $predef_titles = array(); + # Optional filter function for URLs + public $url_filter_func = null; + + # Optional header id="" generation callback function. + public $header_id_func = null; + + # Class attribute to toggle "enhanced ordered list" behaviour + # setting this to true will allow ordered lists to start from the index + # number that is defined first. For example: + # 2. List item two + # 3. List item three + # + # becomes + #
    + #
  1. List item two
    2. + #
  2. List item three
    3. + #
+ public $enhanced_ordered_list = false; ### Parser Implementation ### @@ -593,7 +611,7 @@ class Markdown implements MarkdownInterface { if (isset($this->urls[$link_id])) { $url = $this->urls[$link_id]; - $url = $this->encodeAttribute($url); + $url = $this->encodeURLAttribute($url); $result = "titles[$link_id] ) ) { @@ -623,7 +641,7 @@ class Markdown implements MarkdownInterface { if ($unhashed != $url) $url = preg_replace('/^<(.*)>$/', '\1', $unhashed); - $url = $this->encodeAttribute($url); + $url = $this->encodeURLAttribute($url); $result = "encodeAttribute($alt_text); if (isset($this->urls[$link_id])) { - $url = $this->encodeAttribute($this->urls[$link_id]); + $url = $this->encodeURLAttribute($this->urls[$link_id]); $result = "\"$alt_text\"";titles[$link_id])) { $title = $this->titles[$link_id]; @@ -728,7 +746,7 @@ class Markdown implements MarkdownInterface { $title =& $matches[7]; $alt_text = $this->encodeAttribute($alt_text); - $url = $this->encodeAttribute($url); + $url = $this->encodeURLAttribute($url); $result = "\"$alt_text\"";encodeAttribute($title); @@ -770,21 +788,46 @@ class Markdown implements MarkdownInterface { return $text; } + protected function _doHeaders_callback_setext($matches) { # Terrible hack to check we haven't found an empty list item. if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1])) return $matches[0]; $level = $matches[2]{0} == '=' ? 1 : 2; - $block = "".$this->runSpanGamut($matches[1]).""; + + # id attribute generation + $idAtt = $this->_generateIdFromHeaderValue($matches[1]); + + $block = "".$this->runSpanGamut($matches[1]).""; return "\n" . $this->hashBlock($block) . "\n\n"; } protected function _doHeaders_callback_atx($matches) { + + # id attribute generation + $idAtt = $this->_generateIdFromHeaderValue($matches[2]); + $level = strlen($matches[1]); - $block = "".$this->runSpanGamut($matches[2]).""; + $block = "".$this->runSpanGamut($matches[2]).""; return "\n" . $this->hashBlock($block) . "\n\n"; } + protected function _generateIdFromHeaderValue($headerValue) { + + # if a header_id_func property is set, we can use it to automatically + # generate an id attribute. + # + # This method returns a string in the form id="foo", or an empty string + # otherwise. + if (!is_callable($this->header_id_func)) { + return ""; + } + $idValue = call_user_func($this->header_id_func, $headerValue); + if (!$idValue) return ""; + + return ' id="' . $this->encodeAttribute($idValue) . '"'; + + } protected function doLists($text) { # @@ -856,16 +899,33 @@ class Markdown implements MarkdownInterface { $marker_ul_re = '[*+-]'; $marker_ol_re = '\d+[\.]'; $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)"; - + $marker_ol_start_re = '[0-9]+'; + $list = $matches[1]; $list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol"; - + $marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re ); - + $list .= "\n"; $result = $this->processListItems($list, $marker_any_re); - - $result = $this->hashBlock("<$list_type>\n" . $result . ""); + + $ol_start = 1; + if ($this->enhanced_ordered_list) { + # Get the start number for ordered list. + if ($list_type == 'ol') { + $ol_start_array = array(); + $ol_start_check = preg_match("/$marker_ol_start_re/", $matches[4], $ol_start_array); + if ($ol_start_check){ + $ol_start = $ol_start_array[0]; + } + } + } + + if ($ol_start > 1 && $list_type == 'ol'){ + $result = $this->hashBlock("<$list_type start=\"$ol_start\">\n" . $result . ""); + } else { + $result = $this->hashBlock("<$list_type>\n" . $result . ""); + } return "\n". $result ."\n\n"; } @@ -1260,6 +1320,33 @@ class Markdown implements MarkdownInterface { $text = str_replace('"', '"', $text); return $text; } + + + protected function encodeURLAttribute($url, &$text = null) { + # + # Encode text for a double-quoted HTML attribute containing a URL, + # applying the URL filter if set. Also generates the textual + # representation for the URL (removing mailto: or tel:) storing it in $text. + # This function is *not* suitable for attributes enclosed in single quotes. + # + if ($this->url_filter_func) + $url = call_user_func($this->url_filter_func, $url); + + if (preg_match('{^mailto:}i', $url)) + $url = $this->encodeEntityObfuscatedAttribute($url, $text, 7); + else if (preg_match('{^tel:}i', $url)) + { + $url = $this->encodeAttribute($url); + $text = substr($url, 4); + } + else + { + $url = $this->encodeAttribute($url); + $text = $url; + } + + return $url; + } protected function encodeAmpsAndAngles($text) { @@ -1284,7 +1371,7 @@ class Markdown implements MarkdownInterface { protected function doAutoLinks($text) { - $text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i', + $text = preg_replace_callback('{<((https?|ftp|dict|tel):[^\'">\s]+)>}i', array($this, '_doAutoLinks_url_callback'), $text); # Email addresses: @@ -1307,48 +1394,46 @@ class Markdown implements MarkdownInterface { > }xi', array($this, '_doAutoLinks_email_callback'), $text); - $text = preg_replace_callback('{<(tel:([^\'">\s]+))>}i',array($this, '_doAutoLinks_tel_callback'), $text); return $text; } - protected function _doAutoLinks_tel_callback($matches) { - $url = $this->encodeAttribute($matches[1]); - $tel = $this->encodeAttribute($matches[2]); - $link = "$tel"; - return $this->hashPart($link); - } protected function _doAutoLinks_url_callback($matches) { - $url = $this->encodeAttribute($matches[1]); - $link = "$url"; + $url = $this->encodeURLAttribute($matches[1], $text); + $link = "$text"; return $this->hashPart($link); } protected function _doAutoLinks_email_callback($matches) { - $address = $matches[1]; - $link = $this->encodeEmailAddress($address); + $addr = $matches[1]; + $url = $this->encodeURLAttribute("mailto:$addr", $text); + $link = "$text"; return $this->hashPart($link); } - protected function encodeEmailAddress($addr) { + protected function encodeEntityObfuscatedAttribute($text, &$tail = null, $head_length = 0) { # - # Input: an email address, e.g. "foo@example.com" + # Input: some text to obfuscate, e.g. "mailto:foo@example.com" # - # Output: the email address as a mailto link, with each character - # of the address encoded as either a decimal or hex entity, in - # the hopes of foiling most address harvesting spam bots. E.g.: + # Output: the same text but with most characters encoded as either a + # decimal or hex entity, in the hopes of foiling most address + # harvesting spam bots. E.g.: # - #

foo@exampl - # e.com

+ # m + # + # Note: the additional output $tail is assigned the same value as the + # ouput, minus the number of characters specified by $head_length. # # Based by a filter by Matthew Wickline, posted to BBEdit-Talk. - # With some optimizations by Milian Wolff. + # With some optimizations by Milian Wolff. Forced encoding of HTML + # attribute special characters by Allan Odgaard. # - $addr = "mailto:" . $addr; - $chars = preg_split('/(? $char) { $ord = ord($char); # Ignore non-ascii chars. @@ -1356,18 +1441,17 @@ class Markdown implements MarkdownInterface { $r = ($seed * (1 + $key)) % 100; # Pseudo-random function. # roughly 10% raw, 45% hex, 45% dec # '@' *must* be encoded. I insist. - # '"' has to be encoded inside the attribute - if ($r > 90 && $char != '@' && $char != '"') /* do nothing */; + # '"' and '>' have to be encoded inside the attribute + if ($r > 90 && strpos('@"&>', $char) === false) /* do nothing */; else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';'; else $chars[$key] = '&#'.$ord.';'; } } - - $addr = implode('', $chars); - $text = implode('', array_slice($chars, 7)); # text without `mailto:` - $addr = "$text"; - return $addr; + $text = implode('', $chars); + $tail = $head_length ? implode('', array_slice($chars, $head_length)) : $text; + + return $text; } @@ -1523,1595 +1607,3 @@ class Markdown implements MarkdownInterface { } } - - -# -# Temporary Markdown Extra Parser Implementation Class -# -# NOTE: DON'T USE THIS CLASS -# 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 -# one. -# - -abstract class _MarkdownExtra_TmpImpl extends \Michelf\Markdown { - - ### Configuration Variables ### - - # Prefix for footnote ids. - public $fn_id_prefix = ""; - - # Optional title attribute for footnote links and backlinks. - public $fn_link_title = ""; - public $fn_backlink_title = ""; - - # Optional class attribute for footnote links and backlinks. - public $fn_link_class = "footnote-ref"; - public $fn_backlink_class = "footnote-backref"; - - # Class name for table cell alignment (%% replaced left/center/right) - # For instance: 'go-%%' becomes 'go-left' or 'go-right' or 'go-center' - # If empty, the align attribute is used instead of a class name. - public $table_align_class_tmpl = ''; - - # Optional class prefix for fenced code block. - public $code_class_prefix = ""; - # Class attribute for code blocks goes on the `code` tag; - # setting this to true will put attributes on the `pre` tag instead. - public $code_attr_on_pre = false; - - # Predefined abbreviations. - public $predef_abbr = array(); - - - ### Parser Implementation ### - - public function __construct() { - # - # Constructor function. Initialize the parser object. - # - # Add extra escapable characters before parent constructor - # initialize the table. - $this->escape_chars .= ':|'; - - # Insert extra document, block, and span transformations. - # Parent constructor will do the sorting. - $this->document_gamut += array( - "doFencedCodeBlocks" => 5, - "stripFootnotes" => 15, - "stripAbbreviations" => 25, - "appendFootnotes" => 50, - ); - $this->block_gamut += array( - "doFencedCodeBlocks" => 5, - "doTables" => 15, - "doDefLists" => 45, - ); - $this->span_gamut += array( - "doFootnotes" => 5, - "doAbbreviations" => 70, - ); - - parent::__construct(); - } - - - # Extra variables used during extra transformations. - protected $footnotes = array(); - protected $footnotes_ordered = array(); - protected $footnotes_ref_count = array(); - protected $footnotes_numbers = array(); - protected $abbr_desciptions = array(); - protected $abbr_word_re = ''; - - # Give the current footnote number. - protected $footnote_counter = 1; - - - protected function setup() { - # - # Setting up Extra-specific variables. - # - parent::setup(); - - $this->footnotes = array(); - $this->footnotes_ordered = array(); - $this->footnotes_ref_count = array(); - $this->footnotes_numbers = array(); - $this->abbr_desciptions = array(); - $this->abbr_word_re = ''; - $this->footnote_counter = 1; - - foreach ($this->predef_abbr as $abbr_word => $abbr_desc) { - if ($this->abbr_word_re) - $this->abbr_word_re .= '|'; - $this->abbr_word_re .= preg_quote($abbr_word); - $this->abbr_desciptions[$abbr_word] = trim($abbr_desc); - } - } - - protected function teardown() { - # - # Clearing Extra-specific variables. - # - $this->footnotes = array(); - $this->footnotes_ordered = array(); - $this->footnotes_ref_count = array(); - $this->footnotes_numbers = array(); - $this->abbr_desciptions = array(); - $this->abbr_word_re = ''; - - parent::teardown(); - } - - - ### Extra Attribute Parser ### - - # Expression to use to catch attributes (includes the braces) - protected $id_class_attr_catch_re = '\{((?:[ ]*[#.][-_:a-zA-Z0-9]+){1,})[ ]*\}'; - # Expression to use when parsing in a context when no capture is desired - protected $id_class_attr_nocatch_re = '\{(?:[ ]*[#.][-_:a-zA-Z0-9]+){1,}[ ]*\}'; - - protected function doExtraAttributes($tag_name, $attr) { - # - # Parse attributes caught by the $this->id_class_attr_catch_re expression - # and return the HTML-formatted list of attributes. - # - # Currently supported attributes are .class and #id. - # - if (empty($attr)) return ""; - - # Split on components - preg_match_all('/[#.][-_:a-zA-Z0-9]+/', $attr, $matches); - $elements = $matches[0]; - - # handle classes and ids (only first id taken into account) - $classes = array(); - $id = false; - foreach ($elements as $element) { - if ($element{0} == '.') { - $classes[] = substr($element, 1); - } else if ($element{0} == '#') { - if ($id === false) $id = substr($element, 1); - } - } - - # compose attributes as string - $attr_str = ""; - if (!empty($id)) { - $attr_str .= ' id="'.$id.'"'; - } - if (!empty($classes)) { - $attr_str .= ' class="'.implode(" ", $classes).'"'; - } - return $attr_str; - } - - - protected function stripLinkDefinitions($text) { - # - # Strips link definitions from text, stores the URLs and titles in - # hash references. - # - $less_than_tab = $this->tab_width - 1; - - # Link defs are in the form: ^[id]: url "optional title" - $text = preg_replace_callback('{ - ^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?: # id = $1 - [ ]* - \n? # maybe *one* newline - [ ]* - (?: - <(.+?)> # url = $2 - | - (\S+?) # url = $3 - ) - [ ]* - \n? # maybe one newline - [ ]* - (?: - (?<=\s) # lookbehind for whitespace - ["(] - (.*?) # title = $4 - [")] - [ ]* - )? # title is optional - (?:[ ]* '.$this->id_class_attr_catch_re.' )? # $5 = extra id & class attr - (?:\n+|\Z) - }xm', - array($this, '_stripLinkDefinitions_callback'), - $text); - return $text; - } - protected function _stripLinkDefinitions_callback($matches) { - $link_id = strtolower($matches[1]); - $url = $matches[2] == '' ? $matches[3] : $matches[2]; - $this->urls[$link_id] = $url; - $this->titles[$link_id] =& $matches[4]; - $this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]); - return ''; # String that will replace the block - } - - - ### HTML Block Parser ### - - # Tags that are always treated as block tags: - protected $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|figure'; - - # Tags treated as block tags only if the opening tag is alone on its line: - protected $context_block_tags_re = 'script|noscript|style|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video'; - - # Tags where markdown="1" default to span mode: - protected $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address'; - - # Tags which must not have their contents modified, no matter where - # they appear: - protected $clean_tags_re = 'script|style|math|svg'; - - # Tags that do not need to be closed. - protected $auto_close_tags_re = 'hr|img|param|source|track'; - - - protected function hashHTMLBlocks($text) { - # - # Hashify HTML Blocks and "clean tags". - # - # We only want to do this for block-level HTML tags, such as headers, - # lists, and tables. That's because we still want to wrap

s around - # "paragraphs" that are wrapped in non-block-level tags, such as anchors, - # phrase emphasis, and spans. The list of tags we're looking for is - # hard-coded. - # - # This works by calling _HashHTMLBlocks_InMarkdown, which then calls - # _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" - # attribute is found within a tag, _HashHTMLBlocks_InHTML calls back - # _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag. - # These two functions are calling each other. It's recursive! - # - if ($this->no_markup) return $text; - - # - # Call the HTML-in-Markdown hasher. - # - list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text); - - return $text; - } - protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0, - $enclosing_tag_re = '', $span = false) - { - # - # Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags. - # - # * $indent is the number of space to be ignored when checking for code - # blocks. This is important because if we don't take the indent into - # account, something like this (which looks right) won't work as expected: - # - #

- #
- # Hello World. <-- Is this a Markdown code block or text? - #
<-- Is this a Markdown code block or a real tag? - #
- # - # If you don't like this, just don't indent the tag on which - # you apply the markdown="1" attribute. - # - # * If $enclosing_tag_re is not empty, stops at the first unmatched closing - # tag with that name. Nested tags supported. - # - # * If $span is true, text inside must treated as span. So any double - # newline will be replaced by a single newline so that it does not create - # paragraphs. - # - # Returns an array of that form: ( processed text , remaining text ) - # - if ($text === '') return array('', ''); - - # Regex to check for the presense of newlines around a block tag. - $newline_before_re = '/(?:^\n?|\n\n)*$/'; - $newline_after_re = - '{ - ^ # Start of text following the tag. - (?>[ ]*)? # Optional comment. - [ ]*\n # Must be followed by newline. - }xs'; - - # Regex to match any tag. - $block_tag_re = - '{ - ( # $2: Capture whole tag. - # Tag name. - '.$this->block_tags_re.' | - '.$this->context_block_tags_re.' | - '.$this->clean_tags_re.' | - (?!\s)'.$enclosing_tag_re.' - ) - (?: - (?=[\s"\'/a-zA-Z0-9]) # Allowed characters after tag name. - (?> - ".*?" | # Double quotes (can contain `>`) - \'.*?\' | # Single quotes (can contain `>`) - .+? # Anything but quotes and `>`. - )*? - )? - > # End of tag. - | - # HTML Comment - | - <\?.*?\?> | <%.*?%> # Processing instruction - | - # CData Block - '. ( !$span ? ' # If not in span. - | - # Indented code block - (?: ^[ ]*\n | ^ | \n[ ]*\n ) - [ ]{'.($indent+4).'}[^\n]* \n - (?> - (?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n - )* - | - # Fenced code block marker - (?<= ^ | \n ) - [ ]{0,'.($indent+3).'}(?:~{3,}|`{3,}) - [ ]* - (?: - \.?[-_:a-zA-Z0-9]+ # standalone class name - | - '.$this->id_class_attr_nocatch_re.' # extra attributes - )? - [ ]* - (?= \n ) - ' : '' ). ' # End (if not is span). - | - # Code span marker - # Note, this regex needs to go after backtick fenced - # code blocks but it should also be kept outside of the - # "if not in span" condition adding backticks to the parser - `+ - ) - }xs'; - - - $depth = 0; # Current depth inside the tag tree. - $parsed = ""; # Parsed text that will be returned. - - # - # Loop through every tag until we find the closing tag of the parent - # or loop until reaching the end of text if no parent tag specified. - # - do { - # - # Split the text using the first $tag_match pattern found. - # Text before pattern will be first in the array, text after - # pattern will be at the end, and between will be any catches made - # by the pattern. - # - $parts = preg_split($block_tag_re, $text, 2, - PREG_SPLIT_DELIM_CAPTURE); - - # If in Markdown span mode, add a empty-string span-level hash - # after each newline to prevent triggering any block element. - if ($span) { - $void = $this->hashPart("", ':'); - $newline = "$void\n"; - $parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void; - } - - $parsed .= $parts[0]; # Text before current tag. - - # If end of $text has been reached. Stop loop. - if (count($parts) < 3) { - $text = ""; - break; - } - - $tag = $parts[1]; # Tag to handle. - $text = $parts[2]; # Remaining text after current tag. - $tag_re = preg_quote($tag); # For use in a regular expression. - - # - # Check for: Fenced code block marker. - # Note: need to recheck the whole tag to disambiguate backtick - # fences from code spans - # - if (preg_match('{^\n?([ ]{0,'.($indent+3).'})(~{3,}|`{3,})[ ]*(?:\.?[-_:a-zA-Z0-9]+|'.$this->id_class_attr_nocatch_re.')?[ ]*\n?$}', $tag, $capture)) { - # Fenced code block marker: find matching end marker. - $fence_indent = strlen($capture[1]); # use captured indent in re - $fence_re = $capture[2]; # use captured fence in re - if (preg_match('{^(?>.*\n)*?[ ]{'.($fence_indent).'}'.$fence_re.'[ ]*(?:\n|$)}', $text, - $matches)) - { - # End marker found: pass text unchanged until marker. - $parsed .= $tag . $matches[0]; - $text = substr($text, strlen($matches[0])); - } - else { - # No end marker: just skip it. - $parsed .= $tag; - } - } - # - # Check for: Indented code block. - # - else if ($tag{0} == "\n" || $tag{0} == " ") { - # Indented code block: pass it unchanged, will be handled - # later. - $parsed .= $tag; - } - # - # Check for: Code span marker - # Note: need to check this after backtick fenced code blocks - # - else if ($tag{0} == "`") { - # Find corresponding end marker. - $tag_re = preg_quote($tag); - if (preg_match('{^(?>.+?|\n(?!\n))*?(?block_tags_re.')\b}', $tag) || - ( preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) && - preg_match($newline_before_re, $parsed) && - preg_match($newline_after_re, $text) ) - ) - { - # Need to parse tag and following text using the HTML parser. - list($block_text, $text) = - $this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true); - - # Make sure it stays outside of any paragraph by adding newlines. - $parsed .= "\n\n$block_text\n\n"; - } - # - # Check for: Clean tag (like script, math) - # HTML Comments, processing instructions. - # - else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) || - $tag{1} == '!' || $tag{1} == '?') - { - # Need to parse tag and following text using the HTML parser. - # (don't check for markdown attribute) - list($block_text, $text) = - $this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false); - - $parsed .= $block_text; - } - # - # Check for: Tag with same name as enclosing tag. - # - else if ($enclosing_tag_re !== '' && - # Same name as enclosing tag. - preg_match('{^= 0); - - return array($parsed, $text); - } - protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) { - # - # Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags. - # - # * Calls $hash_method to convert any blocks. - # * Stops when the first opening tag closes. - # * $md_attr indicate if the use of the `markdown="1"` attribute is allowed. - # (it is not inside clean tags) - # - # Returns an array of that form: ( processed text , remaining text ) - # - if ($text === '') return array('', ''); - - # Regex to match `markdown` attribute inside of a tag. - $markdown_attr_re = ' - { - \s* # Eat whitespace before the `markdown` attribute - markdown - \s*=\s* - (?> - (["\']) # $1: quote delimiter - (.*?) # $2: attribute value - \1 # matching delimiter - | - ([^\s>]*) # $3: unquoted attribute value - ) - () # $4: make $3 always defined (avoid warnings) - }xs'; - - # Regex to match any tag. - $tag_re = '{ - ( # $2: Capture whole tag. - - ".*?" | # Double quotes (can contain `>`) - \'.*?\' | # Single quotes (can contain `>`) - .+? # Anything but quotes and `>`. - )*? - )? - > # End of tag. - | - # HTML Comment - | - <\?.*?\?> | <%.*?%> # Processing instruction - | - # CData Block - ) - }xs'; - - $original_text = $text; # Save original text in case of faliure. - - $depth = 0; # Current depth inside the tag tree. - $block_text = ""; # Temporary text holder for current text. - $parsed = ""; # Parsed text that will be returned. - - # - # Get the name of the starting tag. - # (This pattern makes $base_tag_name_re safe without quoting.) - # - if (preg_match('/^<([\w:$]*)\b/', $text, $matches)) - $base_tag_name_re = $matches[1]; - - # - # Loop through every tag until we find the corresponding closing tag. - # - do { - # - # Split the text using the first $tag_match pattern found. - # Text before pattern will be first in the array, text after - # pattern will be at the end, and between will be any catches made - # by the pattern. - # - $parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE); - - if (count($parts) < 3) { - # - # End of $text reached with unbalenced tag(s). - # In that case, we return original text unchanged and pass the - # first character as filtered to prevent an infinite loop in the - # parent function. - # - return array($original_text{0}, substr($original_text, 1)); - } - - $block_text .= $parts[0]; # Text before current tag. - $tag = $parts[1]; # Tag to handle. - $text = $parts[2]; # Remaining text after current tag. - - # - # Check for: Auto-close tag (like
) - # Comments and Processing Instructions. - # - if (preg_match('{^auto_close_tags_re.')\b}', $tag) || - $tag{1} == '!' || $tag{1} == '?') - { - # Just add the tag to the block as if it was text. - $block_text .= $tag; - } - else { - # - # Increase/decrease nested tag count. Only do so if - # the tag's name match base tag's. - # - if (preg_match('{^mode = $attr_m[2] . $attr_m[3]; - $span_mode = $this->mode == 'span' || $this->mode != 'block' && - preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag); - - # Calculate indent before tag. - if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) { - $strlen = $this->utf8_strlen; - $indent = $strlen($matches[1], 'UTF-8'); - } else { - $indent = 0; - } - - # End preceding block with this tag. - $block_text .= $tag; - $parsed .= $this->$hash_method($block_text); - - # Get enclosing tag name for the ParseMarkdown function. - # (This pattern makes $tag_name_re safe without quoting.) - preg_match('/^<([\w:$]*)\b/', $tag, $matches); - $tag_name_re = $matches[1]; - - # Parse the content using the HTML-in-Markdown parser. - list ($block_text, $text) - = $this->_hashHTMLBlocks_inMarkdown($text, $indent, - $tag_name_re, $span_mode); - - # Outdent markdown text. - if ($indent > 0) { - $block_text = preg_replace("/^[ ]{1,$indent}/m", "", - $block_text); - } - - # Append tag content to parsed text. - if (!$span_mode) $parsed .= "\n\n$block_text\n\n"; - else $parsed .= "$block_text"; - - # Start over with a new block. - $block_text = ""; - } - else $block_text .= $tag; - } - - } while ($depth > 0); - - # - # Hash last block text that wasn't processed inside the loop. - # - $parsed .= $this->$hash_method($block_text); - - return array($parsed, $text); - } - - - protected function hashClean($text) { - # - # Called whenever a tag must be hashed when a function inserts a "clean" tag - # in $text, it passes through this function and is automaticaly escaped, - # blocking invalid nested overlap. - # - return $this->hashPart($text, 'C'); - } - - - protected function doAnchors($text) { - # - # Turn Markdown link shortcuts into XHTML tags. - # - if ($this->in_anchor) return $text; - $this->in_anchor = true; - - # - # First, handle reference-style links: [link text] [id] - # - $text = preg_replace_callback('{ - ( # wrap whole match in $1 - \[ - ('.$this->nested_brackets_re.') # link text = $2 - \] - - [ ]? # one optional space - (?:\n[ ]*)? # one optional newline followed by spaces - - \[ - (.*?) # id = $3 - \] - ) - }xs', - array($this, '_doAnchors_reference_callback'), $text); - - # - # Next, inline-style links: [link text](url "optional title") - # - $text = preg_replace_callback('{ - ( # wrap whole match in $1 - \[ - ('.$this->nested_brackets_re.') # link text = $2 - \] - \( # literal paren - [ \n]* - (?: - <(.+?)> # href = $3 - | - ('.$this->nested_url_parenthesis_re.') # href = $4 - ) - [ \n]* - ( # $5 - ([\'"]) # quote char = $6 - (.*?) # Title = $7 - \6 # matching quote - [ \n]* # ignore any spaces/tabs between closing quote and ) - )? # title is optional - \) - (?:[ ]? '.$this->id_class_attr_catch_re.' )? # $8 = id/class attributes - ) - }xs', - array($this, '_doAnchors_inline_callback'), $text); - - # - # Last, handle reference-style shortcuts: [link text] - # These must come last in case you've also got [link text][1] - # or [link text](/foo) - # - $text = preg_replace_callback('{ - ( # wrap whole match in $1 - \[ - ([^\[\]]+) # link text = $2; can\'t contain [ or ] - \] - ) - }xs', - array($this, '_doAnchors_reference_callback'), $text); - - $this->in_anchor = false; - return $text; - } - protected function _doAnchors_reference_callback($matches) { - $whole_match = $matches[1]; - $link_text = $matches[2]; - $link_id =& $matches[3]; - - if ($link_id == "") { - # for shortcut links like [this][] or [this]. - $link_id = $link_text; - } - - # lower-case and turn embedded newlines into spaces - $link_id = strtolower($link_id); - $link_id = preg_replace('{[ ]?\n}', ' ', $link_id); - - if (isset($this->urls[$link_id])) { - $url = $this->urls[$link_id]; - $url = $this->encodeAttribute($url); - - $result = "titles[$link_id] ) ) { - $title = $this->titles[$link_id]; - $title = $this->encodeAttribute($title); - $result .= " title=\"$title\""; - } - if (isset($this->ref_attr[$link_id])) - $result .= $this->ref_attr[$link_id]; - - $link_text = $this->runSpanGamut($link_text); - $result .= ">$link_text"; - $result = $this->hashPart($result); - } - else { - $result = $whole_match; - } - return $result; - } - protected function _doAnchors_inline_callback($matches) { - $whole_match = $matches[1]; - $link_text = $this->runSpanGamut($matches[2]); - $url = $matches[3] == '' ? $matches[4] : $matches[3]; - $title =& $matches[7]; - $attr = $this->doExtraAttributes("a", $dummy =& $matches[8]); - - // if the URL was of the form it got caught by the HTML - // tag parser and hashed. Need to reverse the process before using the URL. - $unhashed = $this->unhash($url); - if ($unhashed != $url) - $url = preg_replace('/^<(.*)>$/', '\1', $unhashed); - - $url = $this->encodeAttribute($url); - - $result = "encodeAttribute($title); - $result .= " title=\"$title\""; - } - $result .= $attr; - - $link_text = $this->runSpanGamut($link_text); - $result .= ">$link_text"; - - return $this->hashPart($result); - } - - - protected function doImages($text) { - # - # Turn Markdown image shortcuts into tags. - # - # - # First, handle reference-style labeled images: ![alt text][id] - # - $text = preg_replace_callback('{ - ( # wrap whole match in $1 - !\[ - ('.$this->nested_brackets_re.') # alt text = $2 - \] - - [ ]? # one optional space - (?:\n[ ]*)? # one optional newline followed by spaces - - \[ - (.*?) # id = $3 - \] - - ) - }xs', - array($this, '_doImages_reference_callback'), $text); - - # - # Next, handle inline images: ![alt text](url "optional title") - # Don't forget: encode * and _ - # - $text = preg_replace_callback('{ - ( # wrap whole match in $1 - !\[ - ('.$this->nested_brackets_re.') # alt text = $2 - \] - \s? # One optional whitespace character - \( # literal paren - [ \n]* - (?: - <(\S*)> # src url = $3 - | - ('.$this->nested_url_parenthesis_re.') # src url = $4 - ) - [ \n]* - ( # $5 - ([\'"]) # quote char = $6 - (.*?) # title = $7 - \6 # matching quote - [ \n]* - )? # title is optional - \) - (?:[ ]? '.$this->id_class_attr_catch_re.' )? # $8 = id/class attributes - ) - }xs', - array($this, '_doImages_inline_callback'), $text); - - return $text; - } - protected function _doImages_reference_callback($matches) { - $whole_match = $matches[1]; - $alt_text = $matches[2]; - $link_id = strtolower($matches[3]); - - if ($link_id == "") { - $link_id = strtolower($alt_text); # for shortcut links like ![this][]. - } - - $alt_text = $this->encodeAttribute($alt_text); - if (isset($this->urls[$link_id])) { - $url = $this->encodeAttribute($this->urls[$link_id]); - $result = "\"$alt_text\"";titles[$link_id])) { - $title = $this->titles[$link_id]; - $title = $this->encodeAttribute($title); - $result .= " title=\"$title\""; - } - if (isset($this->ref_attr[$link_id])) - $result .= $this->ref_attr[$link_id]; - $result .= $this->empty_element_suffix; - $result = $this->hashPart($result); - } - else { - # If there's no such link ID, leave intact: - $result = $whole_match; - } - - return $result; - } - protected function _doImages_inline_callback($matches) { - $whole_match = $matches[1]; - $alt_text = $matches[2]; - $url = $matches[3] == '' ? $matches[4] : $matches[3]; - $title =& $matches[7]; - $attr = $this->doExtraAttributes("img", $dummy =& $matches[8]); - - $alt_text = $this->encodeAttribute($alt_text); - $url = $this->encodeAttribute($url); - $result = "\"$alt_text\"";encodeAttribute($title); - $result .= " title=\"$title\""; # $title already quoted - } - $result .= $attr; - $result .= $this->empty_element_suffix; - - return $this->hashPart($result); - } - - - protected function doHeaders($text) { - # - # Redefined to add id and class attribute support. - # - # Setext-style headers: - # Header 1 {#header1} - # ======== - # - # Header 2 {#header2 .class1 .class2} - # -------- - # - $text = preg_replace_callback( - '{ - (^.+?) # $1: Header text - (?:[ ]+ '.$this->id_class_attr_catch_re.' )? # $3 = id/class attributes - [ ]*\n(=+|-+)[ ]*\n+ # $3: Header footer - }mx', - array($this, '_doHeaders_callback_setext'), $text); - - # atx-style headers: - # # Header 1 {#header1} - # ## Header 2 {#header2} - # ## Header 2 with closing hashes ## {#header3.class1.class2} - # ... - # ###### Header 6 {.class2} - # - $text = preg_replace_callback('{ - ^(\#{1,6}) # $1 = string of #\'s - [ ]* - (.+?) # $2 = Header text - [ ]* - \#* # optional closing #\'s (not counted) - (?:[ ]+ '.$this->id_class_attr_catch_re.' )? # $3 = id/class attributes - [ ]* - \n+ - }xm', - array($this, '_doHeaders_callback_atx'), $text); - - return $text; - } - protected function _doHeaders_callback_setext($matches) { - if ($matches[3] == '-' && preg_match('{^- }', $matches[1])) - return $matches[0]; - $level = $matches[3]{0} == '=' ? 1 : 2; - $attr = $this->doExtraAttributes("h$level", $dummy =& $matches[2]); - $block = "".$this->runSpanGamut($matches[1]).""; - return "\n" . $this->hashBlock($block) . "\n\n"; - } - protected function _doHeaders_callback_atx($matches) { - $level = strlen($matches[1]); - $attr = $this->doExtraAttributes("h$level", $dummy =& $matches[3]); - $block = "".$this->runSpanGamut($matches[2]).""; - return "\n" . $this->hashBlock($block) . "\n\n"; - } - - - protected function doTables($text) { - # - # Form HTML tables. - # - $less_than_tab = $this->tab_width - 1; - # - # Find tables with leading pipe. - # - # | Header 1 | Header 2 - # | -------- | -------- - # | Cell 1 | Cell 2 - # | Cell 3 | Cell 4 - # - $text = preg_replace_callback(' - { - ^ # Start of a line - [ ]{0,'.$less_than_tab.'} # Allowed whitespace. - [|] # Optional leading pipe (present) - (.+) \n # $1: Header row (at least one pipe) - - [ ]{0,'.$less_than_tab.'} # Allowed whitespace. - [|] ([ ]*[-:]+[-| :]*) \n # $2: Header underline - - ( # $3: Cells - (?> - [ ]* # Allowed whitespace. - [|] .* \n # Row content. - )* - ) - (?=\n|\Z) # Stop at final double newline. - }xm', - array($this, '_doTable_leadingPipe_callback'), $text); - - # - # Find tables without leading pipe. - # - # Header 1 | Header 2 - # -------- | -------- - # Cell 1 | Cell 2 - # Cell 3 | Cell 4 - # - $text = preg_replace_callback(' - { - ^ # Start of a line - [ ]{0,'.$less_than_tab.'} # Allowed whitespace. - (\S.*[|].*) \n # $1: Header row (at least one pipe) - - [ ]{0,'.$less_than_tab.'} # Allowed whitespace. - ([-:]+[ ]*[|][-| :]*) \n # $2: Header underline - - ( # $3: Cells - (?> - .* [|] .* \n # Row content - )* - ) - (?=\n|\Z) # Stop at final double newline. - }xm', - array($this, '_DoTable_callback'), $text); - - return $text; - } - protected function _doTable_leadingPipe_callback($matches) { - $head = $matches[1]; - $underline = $matches[2]; - $content = $matches[3]; - - # Remove leading pipe for each row. - $content = preg_replace('/^ *[|]/m', '', $content); - - return $this->_doTable_callback(array($matches[0], $head, $underline, $content)); - } - protected function _doTable_makeAlignAttr($alignname) - { - if (empty($this->table_align_class_tmpl)) - return " align=\"$alignname\""; - - $classname = str_replace('%%', $alignname, $this->table_align_class_tmpl); - return " class=\"$classname\""; - } - protected function _doTable_callback($matches) { - $head = $matches[1]; - $underline = $matches[2]; - $content = $matches[3]; - - # Remove any tailing pipes for each line. - $head = preg_replace('/[|] *$/m', '', $head); - $underline = preg_replace('/[|] *$/m', '', $underline); - $content = preg_replace('/[|] *$/m', '', $content); - - # Reading alignement from header underline. - $separators = preg_split('/ *[|] */', $underline); - foreach ($separators as $n => $s) { - if (preg_match('/^ *-+: *$/', $s)) - $attr[$n] = $this->_doTable_makeAlignAttr('right'); - else if (preg_match('/^ *:-+: *$/', $s)) - $attr[$n] = $this->_doTable_makeAlignAttr('center'); - else if (preg_match('/^ *:-+ *$/', $s)) - $attr[$n] = $this->_doTable_makeAlignAttr('left'); - else - $attr[$n] = ''; - } - - # Parsing span elements, including code spans, character escapes, - # and inline HTML tags, so that pipes inside those gets ignored. - $head = $this->parseSpan($head); - $headers = preg_split('/ *[|] */', $head); - $col_count = count($headers); - $attr = array_pad($attr, $col_count, ''); - - # Write column headers. - $text = "\n"; - $text .= "\n"; - $text .= "\n"; - foreach ($headers as $n => $header) - $text .= " ".$this->runSpanGamut(trim($header))."\n"; - $text .= "\n"; - $text .= "\n"; - - # Split content by row. - $rows = explode("\n", trim($content, "\n")); - - $text .= "\n"; - foreach ($rows as $row) { - # Parsing span elements, including code spans, character escapes, - # and inline HTML tags, so that pipes inside those gets ignored. - $row = $this->parseSpan($row); - - # Split row by cell. - $row_cells = preg_split('/ *[|] */', $row, $col_count); - $row_cells = array_pad($row_cells, $col_count, ''); - - $text .= "\n"; - foreach ($row_cells as $n => $cell) - $text .= " ".$this->runSpanGamut(trim($cell))."\n"; - $text .= "\n"; - } - $text .= "\n"; - $text .= "
"; - - return $this->hashBlock($text) . "\n"; - } - - - protected function doDefLists($text) { - # - # Form HTML definition lists. - # - $less_than_tab = $this->tab_width - 1; - - # Re-usable pattern to match any entire dl list: - $whole_list_re = '(?> - ( # $1 = whole list - ( # $2 - [ ]{0,'.$less_than_tab.'} - ((?>.*\S.*\n)+) # $3 = defined term - \n? - [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition - ) - (?s:.+?) - ( # $4 - \z - | - \n{2,} - (?=\S) - (?! # Negative lookahead for another term - [ ]{0,'.$less_than_tab.'} - (?: \S.*\n )+? # defined term - \n? - [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition - ) - (?! # Negative lookahead for another definition - [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition - ) - ) - ) - )'; // mx - - $text = preg_replace_callback('{ - (?>\A\n?|(?<=\n\n)) - '.$whole_list_re.' - }mx', - array($this, '_doDefLists_callback'), $text); - - return $text; - } - protected function _doDefLists_callback($matches) { - # Re-usable patterns to match list item bullets and number markers: - $list = $matches[1]; - - # Turn double returns into triple returns, so that we can make a - # paragraph for the last item in a list, if necessary: - $result = trim($this->processDefListItems($list)); - $result = "
\n" . $result . "\n
"; - return $this->hashBlock($result) . "\n\n"; - } - - - protected function processDefListItems($list_str) { - # - # Process the contents of a single definition list, splitting it - # into individual term and definition list items. - # - $less_than_tab = $this->tab_width - 1; - - # trim trailing blank lines: - $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str); - - # Process definition terms. - $list_str = preg_replace_callback('{ - (?>\A\n?|\n\n+) # leading line - ( # definition terms = $1 - [ ]{0,'.$less_than_tab.'} # leading whitespace - (?!\:[ ]|[ ]) # negative lookahead for a definition - # mark (colon) or more whitespace. - (?> \S.* \n)+? # actual term (not whitespace). - ) - (?=\n?[ ]{0,3}:[ ]) # lookahead for following line feed - # with a definition mark. - }xm', - array($this, '_processDefListItems_callback_dt'), $list_str); - - # Process actual definitions. - $list_str = preg_replace_callback('{ - \n(\n+)? # leading line = $1 - ( # marker space = $2 - [ ]{0,'.$less_than_tab.'} # whitespace before colon - \:[ ]+ # definition mark (colon) - ) - ((?s:.+?)) # definition text = $3 - (?= \n+ # stop at next definition mark, - (?: # next term or end of text - [ ]{0,'.$less_than_tab.'} \:[ ] | -
| \z - ) - ) - }xm', - array($this, '_processDefListItems_callback_dd'), $list_str); - - return $list_str; - } - protected function _processDefListItems_callback_dt($matches) { - $terms = explode("\n", trim($matches[1])); - $text = ''; - foreach ($terms as $term) { - $term = $this->runSpanGamut(trim($term)); - $text .= "\n
" . $term . "
"; - } - return $text . "\n"; - } - protected function _processDefListItems_callback_dd($matches) { - $leading_line = $matches[1]; - $marker_space = $matches[2]; - $def = $matches[3]; - - if ($leading_line || preg_match('/\n{2,}/', $def)) { - # Replace marker with the appropriate whitespace indentation - $def = str_repeat(' ', strlen($marker_space)) . $def; - $def = $this->runBlockGamut($this->outdent($def . "\n\n")); - $def = "\n". $def ."\n"; - } - else { - $def = rtrim($def); - $def = $this->runSpanGamut($this->outdent($def)); - } - - return "\n
" . $def . "
\n"; - } - - - protected function doFencedCodeBlocks($text) { - # - # Adding the fenced code block syntax to regular Markdown: - # - # ~~~ - # Code block - # ~~~ - # - $less_than_tab = $this->tab_width; - - $text = preg_replace_callback('{ - (?:\n|\A) - # 1: Opening marker - ( - (?:~{3,}|`{3,}) # 3 or more tildes/backticks. - ) - [ ]* - (?: - \.?([-_:a-zA-Z0-9]+) # 2: standalone class name - | - '.$this->id_class_attr_catch_re.' # 3: Extra attributes - )? - [ ]* \n # Whitespace and newline following marker. - - # 4: Content - ( - (?> - (?!\1 [ ]* \n) # Not a closing marker. - .*\n+ - )+ - ) - - # Closing marker. - \1 [ ]* (?= \n ) - }xm', - array($this, '_doFencedCodeBlocks_callback'), $text); - - return $text; - } - protected function _doFencedCodeBlocks_callback($matches) { - $classname =& $matches[2]; - $attrs =& $matches[3]; - $codeblock = $matches[4]; - $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES); - $codeblock = preg_replace_callback('/^\n+/', - array($this, '_doFencedCodeBlocks_newlines'), $codeblock); - - if ($classname != "") { - if ($classname{0} == '.') - $classname = substr($classname, 1); - $attr_str = ' class="'.$this->code_class_prefix.$classname.'"'; - } else { - $attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs); - } - $pre_attr_str = $this->code_attr_on_pre ? $attr_str : ''; - $code_attr_str = $this->code_attr_on_pre ? '' : $attr_str; - $codeblock = "$codeblock"; - - return "\n\n".$this->hashBlock($codeblock)."\n\n"; - } - protected function _doFencedCodeBlocks_newlines($matches) { - return str_repeat("empty_element_suffix", - strlen($matches[0])); - } - - - # - # Redefining emphasis markers so that emphasis by underscore does not - # work in the middle of a word. - # - protected $em_relist = array( - '' => '(?:(? '(? '(? '(?:(? '(? '(? '(?:(? '(? '(? tags - # - # Strip leading and trailing lines: - $text = preg_replace('/\A\n+|\n+\z/', '', $text); - - $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY); - - # - # Wrap

tags and unhashify HTML blocks - # - foreach ($grafs as $key => $value) { - $value = trim($this->runSpanGamut($value)); - - # Check if this should be enclosed in a paragraph. - # Clean tag hashes & block tag hashes are left alone. - $is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value); - - if ($is_p) { - $value = "

$value

"; - } - $grafs[$key] = $value; - } - - # Join grafs in one text, then unhash HTML tags. - $text = implode("\n\n", $grafs); - - # Finish by removing any tag hashes still present in $text. - $text = $this->unhash($text); - - return $text; - } - - - ### Footnotes - - protected function stripFootnotes($text) { - # - # Strips link definitions from text, stores the URLs and titles in - # hash references. - # - $less_than_tab = $this->tab_width - 1; - - # Link defs are in the form: [^id]: url "optional title" - $text = preg_replace_callback('{ - ^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?: # note_id = $1 - [ ]* - \n? # maybe *one* newline - ( # text = $2 (no blank lines allowed) - (?: - .+ # actual text - | - \n # newlines but - (?!\[.+?\][ ]?:\s)# negative lookahead for footnote or link definition marker. - (?!\n+[ ]{0,3}\S)# ensure line is not blank and followed - # by non-indented content - )* - ) - }xm', - array($this, '_stripFootnotes_callback'), - $text); - return $text; - } - protected function _stripFootnotes_callback($matches) { - $note_id = $this->fn_id_prefix . $matches[1]; - $this->footnotes[$note_id] = $this->outdent($matches[2]); - return ''; # String that will replace the block - } - - - protected function doFootnotes($text) { - # - # Replace footnote references in $text [^id] with a special text-token - # which will be replaced by the actual footnote marker in appendFootnotes. - # - if (!$this->in_anchor) { - $text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text); - } - return $text; - } - - - protected function appendFootnotes($text) { - # - # Append footnote list to text. - # - $text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', - array($this, '_appendFootnotes_callback'), $text); - - if (!empty($this->footnotes_ordered)) { - $text .= "\n\n"; - $text .= "
\n"; - $text .= "empty_element_suffix ."\n"; - $text .= "
    \n\n"; - - $attr = ""; - if ($this->fn_backlink_class != "") { - $class = $this->fn_backlink_class; - $class = $this->encodeAttribute($class); - $attr .= " class=\"$class\""; - } - if ($this->fn_backlink_title != "") { - $title = $this->fn_backlink_title; - $title = $this->encodeAttribute($title); - $attr .= " title=\"$title\""; - } - $num = 0; - - while (!empty($this->footnotes_ordered)) { - $footnote = reset($this->footnotes_ordered); - $note_id = key($this->footnotes_ordered); - unset($this->footnotes_ordered[$note_id]); - $ref_count = $this->footnotes_ref_count[$note_id]; - unset($this->footnotes_ref_count[$note_id]); - unset($this->footnotes[$note_id]); - - $footnote .= "\n"; # Need to append newline before parsing. - $footnote = $this->runBlockGamut("$footnote\n"); - $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', - array($this, '_appendFootnotes_callback'), $footnote); - - $attr = str_replace("%%", ++$num, $attr); - $note_id = $this->encodeAttribute($note_id); - - # Prepare backlink, multiple backlinks if multiple references - $backlink = "↩"; - for ($ref_num = 2; $ref_num <= $ref_count; ++$ref_num) { - $backlink .= " ↩"; - } - # Add backlink to last paragraph; create new paragraph if needed. - if (preg_match('{

    $}', $footnote)) { - $footnote = substr($footnote, 0, -4) . " $backlink

    "; - } else { - $footnote .= "\n\n

    $backlink

    "; - } - - $text .= "
  1. \n"; - $text .= $footnote . "\n"; - $text .= "
    2. \n\n"; - } - - $text .= "
\n"; - $text .= "
"; - } - return $text; - } - protected function _appendFootnotes_callback($matches) { - $node_id = $this->fn_id_prefix . $matches[1]; - - # Create footnote marker only if it has a corresponding footnote *and* - # the footnote hasn't been used by another marker. - if (isset($this->footnotes[$node_id])) { - $num =& $this->footnotes_numbers[$node_id]; - if (!isset($num)) { - # Transfer footnote content to the ordered list and give it its - # number - $this->footnotes_ordered[$node_id] = $this->footnotes[$node_id]; - $this->footnotes_ref_count[$node_id] = 1; - $num = $this->footnote_counter++; - $ref_count_mark = ''; - } else { - $ref_count_mark = $this->footnotes_ref_count[$node_id] += 1; - } - - $attr = ""; - if ($this->fn_link_class != "") { - $class = $this->fn_link_class; - $class = $this->encodeAttribute($class); - $attr .= " class=\"$class\""; - } - if ($this->fn_link_title != "") { - $title = $this->fn_link_title; - $title = $this->encodeAttribute($title); - $attr .= " title=\"$title\""; - } - - $attr = str_replace("%%", $num, $attr); - $node_id = $this->encodeAttribute($node_id); - - return - "". - "$num". - ""; - } - - return "[^".$matches[1]."]"; - } - - - ### Abbreviations ### - - protected function stripAbbreviations($text) { - # - # Strips abbreviations from text, stores titles in hash references. - # - $less_than_tab = $this->tab_width - 1; - - # Link defs are in the form: [id]*: url "optional title" - $text = preg_replace_callback('{ - ^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?: # abbr_id = $1 - (.*) # text = $2 (no blank lines allowed) - }xm', - array($this, '_stripAbbreviations_callback'), - $text); - return $text; - } - protected function _stripAbbreviations_callback($matches) { - $abbr_word = $matches[1]; - $abbr_desc = $matches[2]; - if ($this->abbr_word_re) - $this->abbr_word_re .= '|'; - $this->abbr_word_re .= preg_quote($abbr_word); - $this->abbr_desciptions[$abbr_word] = trim($abbr_desc); - return ''; # String that will replace the block - } - - - protected function doAbbreviations($text) { - # - # Find defined abbreviations in text and wrap them in elements. - # - if ($this->abbr_word_re) { - // cannot use the /x modifier because abbr_word_re may - // contain significant spaces: - $text = preg_replace_callback('{'. - '(?abbr_word_re.')'. - '(?![\w\x1A])'. - '}', - array($this, '_doAbbreviations_callback'), $text); - } - return $text; - } - protected function _doAbbreviations_callback($matches) { - $abbr = $matches[0]; - if (isset($this->abbr_desciptions[$abbr])) { - $desc = $this->abbr_desciptions[$abbr]; - if (empty($desc)) { - return $this->hashPart("$abbr"); - } else { - $desc = $this->encodeAttribute($desc); - return $this->hashPart("$abbr"); - } - } else { - return $matches[0]; - } - } - -} diff --git a/system/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php b/system/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php index 89822e4..3107a79 100644 --- a/system/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php +++ b/system/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php @@ -3,8 +3,8 @@ # Markdown Extra - A text-to-HTML conversion tool for web writers # # PHP Markdown Extra -# Copyright (c) 2004-2014 Michel Fortin -# +# Copyright (c) 2004-2015 Michel Fortin +# # # Original Markdown # Copyright (c) 2004-2006 John Gruber @@ -13,26 +13,1602 @@ namespace Michelf; -# Just force Michelf/Markdown.php to load. This is needed to load -# the temporary implementation class. See below for details. -\Michelf\Markdown::MARKDOWNLIB_VERSION; - # # Markdown Extra Parser Class # -# Note: Currently the implementation resides in the temporary class -# \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\Markdown { + + ### Configuration Variables ### + + # Prefix for footnote ids. + public $fn_id_prefix = ""; + + # Optional title attribute for footnote links and backlinks. + public $fn_link_title = ""; + public $fn_backlink_title = ""; + + # Optional class attribute for footnote links and backlinks. + public $fn_link_class = "footnote-ref"; + public $fn_backlink_class = "footnote-backref"; + + # Class name for table cell alignment (%% replaced left/center/right) + # For instance: 'go-%%' becomes 'go-left' or 'go-right' or 'go-center' + # If empty, the align attribute is used instead of a class name. + public $table_align_class_tmpl = ''; + + # Optional class prefix for fenced code block. + public $code_class_prefix = ""; + # Class attribute for code blocks goes on the `code` tag; + # setting this to true will put attributes on the `pre` tag instead. + public $code_attr_on_pre = false; + + # Predefined abbreviations. + public $predef_abbr = array(); ### Parser Implementation ### - # Temporarily, the implemenation is in the _MarkdownExtra_TmpImpl class. - # See note above. + public function __construct() { + # + # Constructor function. Initialize the parser object. + # + # Add extra escapable characters before parent constructor + # initialize the table. + $this->escape_chars .= ':|'; + + # Insert extra document, block, and span transformations. + # Parent constructor will do the sorting. + $this->document_gamut += array( + "doFencedCodeBlocks" => 5, + "stripFootnotes" => 15, + "stripAbbreviations" => 25, + "appendFootnotes" => 50, + ); + $this->block_gamut += array( + "doFencedCodeBlocks" => 5, + "doTables" => 15, + "doDefLists" => 45, + ); + $this->span_gamut += array( + "doFootnotes" => 5, + "doAbbreviations" => 70, + ); + + $this->enhanced_ordered_list = true; + parent::__construct(); + } + + + # Extra variables used during extra transformations. + protected $footnotes = array(); + protected $footnotes_ordered = array(); + protected $footnotes_ref_count = array(); + protected $footnotes_numbers = array(); + protected $abbr_desciptions = array(); + protected $abbr_word_re = ''; + + # Give the current footnote number. + protected $footnote_counter = 1; + + + protected function setup() { + # + # Setting up Extra-specific variables. + # + parent::setup(); + + $this->footnotes = array(); + $this->footnotes_ordered = array(); + $this->footnotes_ref_count = array(); + $this->footnotes_numbers = array(); + $this->abbr_desciptions = array(); + $this->abbr_word_re = ''; + $this->footnote_counter = 1; + + foreach ($this->predef_abbr as $abbr_word => $abbr_desc) { + if ($this->abbr_word_re) + $this->abbr_word_re .= '|'; + $this->abbr_word_re .= preg_quote($abbr_word); + $this->abbr_desciptions[$abbr_word] = trim($abbr_desc); + } + } + + protected function teardown() { + # + # Clearing Extra-specific variables. + # + $this->footnotes = array(); + $this->footnotes_ordered = array(); + $this->footnotes_ref_count = array(); + $this->footnotes_numbers = array(); + $this->abbr_desciptions = array(); + $this->abbr_word_re = ''; + + parent::teardown(); + } + + + ### Extra Attribute Parser ### -} + # Expression to use to catch attributes (includes the braces) + protected $id_class_attr_catch_re = '\{((?:[ ]*[#.a-z][-_:a-zA-Z0-9=]+){1,})[ ]*\}'; + # Expression to use when parsing in a context when no capture is desired + protected $id_class_attr_nocatch_re = '\{(?:[ ]*[#.a-z][-_:a-zA-Z0-9=]+){1,}[ ]*\}'; + + protected function doExtraAttributes($tag_name, $attr, $defaultIdValue = null) { + # + # Parse attributes caught by the $this->id_class_attr_catch_re expression + # and return the HTML-formatted list of attributes. + # + # Currently supported attributes are .class and #id. + # + # In addition, this method also supports supplying a default Id value, + # which will be used to populate the id attribute in case it was not + # overridden. + if (empty($attr) && !$defaultIdValue) return ""; + + # Split on components + preg_match_all('/[#.a-z][-_:a-zA-Z0-9=]+/', $attr, $matches); + $elements = $matches[0]; + + # handle classes and ids (only first id taken into account) + $classes = array(); + $attributes = array(); + $id = false; + foreach ($elements as $element) { + if ($element{0} == '.') { + $classes[] = substr($element, 1); + } else if ($element{0} == '#') { + if ($id === false) $id = substr($element, 1); + } else if (strpos($element, '=') > 0) { + $parts = explode('=', $element, 2); + $attributes[] = $parts[0] . '="' . $parts[1] . '"'; + } + } + + if (!$id) $id = $defaultIdValue; + + # compose attributes as string + $attr_str = ""; + if (!empty($id)) { + $attr_str .= ' id="'.$this->encodeAttribute($id) .'"'; + } + if (!empty($classes)) { + $attr_str .= ' class="'. implode(" ", $classes) . '"'; + } + if (!$this->no_markup && !empty($attributes)) { + $attr_str .= ' '.implode(" ", $attributes); + } + return $attr_str; + } + + + protected function stripLinkDefinitions($text) { + # + # Strips link definitions from text, stores the URLs and titles in + # hash references. + # + $less_than_tab = $this->tab_width - 1; + + # Link defs are in the form: ^[id]: url "optional title" + $text = preg_replace_callback('{ + ^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?: # id = $1 + [ ]* + \n? # maybe *one* newline + [ ]* + (?: + <(.+?)> # url = $2 + | + (\S+?) # url = $3 + ) + [ ]* + \n? # maybe one newline + [ ]* + (?: + (?<=\s) # lookbehind for whitespace + ["(] + (.*?) # title = $4 + [")] + [ ]* + )? # title is optional + (?:[ ]* '.$this->id_class_attr_catch_re.' )? # $5 = extra id & class attr + (?:\n+|\Z) + }xm', + array($this, '_stripLinkDefinitions_callback'), + $text); + return $text; + } + protected function _stripLinkDefinitions_callback($matches) { + $link_id = strtolower($matches[1]); + $url = $matches[2] == '' ? $matches[3] : $matches[2]; + $this->urls[$link_id] = $url; + $this->titles[$link_id] =& $matches[4]; + $this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]); + return ''; # String that will replace the block + } + + + ### HTML Block Parser ### + + # Tags that are always treated as block tags: + protected $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|figure'; + + # Tags treated as block tags only if the opening tag is alone on its line: + protected $context_block_tags_re = 'script|noscript|style|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video'; + + # Tags where markdown="1" default to span mode: + protected $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address'; + + # Tags which must not have their contents modified, no matter where + # they appear: + protected $clean_tags_re = 'script|style|math|svg'; + + # Tags that do not need to be closed. + protected $auto_close_tags_re = 'hr|img|param|source|track'; + + + protected function hashHTMLBlocks($text) { + # + # Hashify HTML Blocks and "clean tags". + # + # We only want to do this for block-level HTML tags, such as headers, + # lists, and tables. That's because we still want to wrap

s around + # "paragraphs" that are wrapped in non-block-level tags, such as anchors, + # phrase emphasis, and spans. The list of tags we're looking for is + # hard-coded. + # + # This works by calling _HashHTMLBlocks_InMarkdown, which then calls + # _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" + # attribute is found within a tag, _HashHTMLBlocks_InHTML calls back + # _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag. + # These two functions are calling each other. It's recursive! + # + if ($this->no_markup) return $text; + + # + # Call the HTML-in-Markdown hasher. + # + list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text); + + return $text; + } + protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0, + $enclosing_tag_re = '', $span = false) + { + # + # Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags. + # + # * $indent is the number of space to be ignored when checking for code + # blocks. This is important because if we don't take the indent into + # account, something like this (which looks right) won't work as expected: + # + #

+ #
+ # Hello World. <-- Is this a Markdown code block or text? + #
<-- Is this a Markdown code block or a real tag? + #
+ # + # If you don't like this, just don't indent the tag on which + # you apply the markdown="1" attribute. + # + # * If $enclosing_tag_re is not empty, stops at the first unmatched closing + # tag with that name. Nested tags supported. + # + # * If $span is true, text inside must treated as span. So any double + # newline will be replaced by a single newline so that it does not create + # paragraphs. + # + # Returns an array of that form: ( processed text , remaining text ) + # + if ($text === '') return array('', ''); + + # Regex to check for the presense of newlines around a block tag. + $newline_before_re = '/(?:^\n?|\n\n)*$/'; + $newline_after_re = + '{ + ^ # Start of text following the tag. + (?>[ ]*)? # Optional comment. + [ ]*\n # Must be followed by newline. + }xs'; + + # Regex to match any tag. + $block_tag_re = + '{ + ( # $2: Capture whole tag. + # Tag name. + '.$this->block_tags_re.' | + '.$this->context_block_tags_re.' | + '.$this->clean_tags_re.' | + (?!\s)'.$enclosing_tag_re.' + ) + (?: + (?=[\s"\'/a-zA-Z0-9]) # Allowed characters after tag name. + (?> + ".*?" | # Double quotes (can contain `>`) + \'.*?\' | # Single quotes (can contain `>`) + .+? # Anything but quotes and `>`. + )*? + )? + > # End of tag. + | + # HTML Comment + | + <\?.*?\?> | <%.*?%> # Processing instruction + | + # CData Block + '. ( !$span ? ' # If not in span. + | + # Indented code block + (?: ^[ ]*\n | ^ | \n[ ]*\n ) + [ ]{'.($indent+4).'}[^\n]* \n + (?> + (?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n + )* + | + # Fenced code block marker + (?<= ^ | \n ) + [ ]{0,'.($indent+3).'}(?:~{3,}|`{3,}) + [ ]* + (?: + \.?[-_:a-zA-Z0-9]+ # standalone class name + | + '.$this->id_class_attr_nocatch_re.' # extra attributes + )? + [ ]* + (?= \n ) + ' : '' ). ' # End (if not is span). + | + # Code span marker + # Note, this regex needs to go after backtick fenced + # code blocks but it should also be kept outside of the + # "if not in span" condition adding backticks to the parser + `+ + ) + }xs'; + + + $depth = 0; # Current depth inside the tag tree. + $parsed = ""; # Parsed text that will be returned. + + # + # Loop through every tag until we find the closing tag of the parent + # or loop until reaching the end of text if no parent tag specified. + # + do { + # + # Split the text using the first $tag_match pattern found. + # Text before pattern will be first in the array, text after + # pattern will be at the end, and between will be any catches made + # by the pattern. + # + $parts = preg_split($block_tag_re, $text, 2, + PREG_SPLIT_DELIM_CAPTURE); + + # If in Markdown span mode, add a empty-string span-level hash + # after each newline to prevent triggering any block element. + if ($span) { + $void = $this->hashPart("", ':'); + $newline = "$void\n"; + $parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void; + } + + $parsed .= $parts[0]; # Text before current tag. + + # If end of $text has been reached. Stop loop. + if (count($parts) < 3) { + $text = ""; + break; + } + + $tag = $parts[1]; # Tag to handle. + $text = $parts[2]; # Remaining text after current tag. + $tag_re = preg_quote($tag); # For use in a regular expression. + + # + # Check for: Fenced code block marker. + # Note: need to recheck the whole tag to disambiguate backtick + # fences from code spans + # + if (preg_match('{^\n?([ ]{0,'.($indent+3).'})(~{3,}|`{3,})[ ]*(?:\.?[-_:a-zA-Z0-9]+|'.$this->id_class_attr_nocatch_re.')?[ ]*\n?$}', $tag, $capture)) { + # Fenced code block marker: find matching end marker. + $fence_indent = strlen($capture[1]); # use captured indent in re + $fence_re = $capture[2]; # use captured fence in re + if (preg_match('{^(?>.*\n)*?[ ]{'.($fence_indent).'}'.$fence_re.'[ ]*(?:\n|$)}', $text, + $matches)) + { + # End marker found: pass text unchanged until marker. + $parsed .= $tag . $matches[0]; + $text = substr($text, strlen($matches[0])); + } + else { + # No end marker: just skip it. + $parsed .= $tag; + } + } + # + # Check for: Indented code block. + # + else if ($tag{0} == "\n" || $tag{0} == " ") { + # Indented code block: pass it unchanged, will be handled + # later. + $parsed .= $tag; + } + # + # Check for: Code span marker + # Note: need to check this after backtick fenced code blocks + # + else if ($tag{0} == "`") { + # Find corresponding end marker. + $tag_re = preg_quote($tag); + if (preg_match('{^(?>.+?|\n(?!\n))*?(?block_tags_re.')\b}', $tag) || + ( preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) && + preg_match($newline_before_re, $parsed) && + preg_match($newline_after_re, $text) ) + ) + { + # Need to parse tag and following text using the HTML parser. + list($block_text, $text) = + $this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true); + + # Make sure it stays outside of any paragraph by adding newlines. + $parsed .= "\n\n$block_text\n\n"; + } + # + # Check for: Clean tag (like script, math) + # HTML Comments, processing instructions. + # + else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) || + $tag{1} == '!' || $tag{1} == '?') + { + # Need to parse tag and following text using the HTML parser. + # (don't check for markdown attribute) + list($block_text, $text) = + $this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false); + + $parsed .= $block_text; + } + # + # Check for: Tag with same name as enclosing tag. + # + else if ($enclosing_tag_re !== '' && + # Same name as enclosing tag. + preg_match('{^= 0); + + return array($parsed, $text); + } + protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) { + # + # Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags. + # + # * Calls $hash_method to convert any blocks. + # * Stops when the first opening tag closes. + # * $md_attr indicate if the use of the `markdown="1"` attribute is allowed. + # (it is not inside clean tags) + # + # Returns an array of that form: ( processed text , remaining text ) + # + if ($text === '') return array('', ''); + + # Regex to match `markdown` attribute inside of a tag. + $markdown_attr_re = ' + { + \s* # Eat whitespace before the `markdown` attribute + markdown + \s*=\s* + (?> + (["\']) # $1: quote delimiter + (.*?) # $2: attribute value + \1 # matching delimiter + | + ([^\s>]*) # $3: unquoted attribute value + ) + () # $4: make $3 always defined (avoid warnings) + }xs'; + + # Regex to match any tag. + $tag_re = '{ + ( # $2: Capture whole tag. + + ".*?" | # Double quotes (can contain `>`) + \'.*?\' | # Single quotes (can contain `>`) + .+? # Anything but quotes and `>`. + )*? + )? + > # End of tag. + | + # HTML Comment + | + <\?.*?\?> | <%.*?%> # Processing instruction + | + # CData Block + ) + }xs'; + + $original_text = $text; # Save original text in case of faliure. + + $depth = 0; # Current depth inside the tag tree. + $block_text = ""; # Temporary text holder for current text. + $parsed = ""; # Parsed text that will be returned. + + # + # Get the name of the starting tag. + # (This pattern makes $base_tag_name_re safe without quoting.) + # + if (preg_match('/^<([\w:$]*)\b/', $text, $matches)) + $base_tag_name_re = $matches[1]; + + # + # Loop through every tag until we find the corresponding closing tag. + # + do { + # + # Split the text using the first $tag_match pattern found. + # Text before pattern will be first in the array, text after + # pattern will be at the end, and between will be any catches made + # by the pattern. + # + $parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE); + + if (count($parts) < 3) { + # + # End of $text reached with unbalenced tag(s). + # In that case, we return original text unchanged and pass the + # first character as filtered to prevent an infinite loop in the + # parent function. + # + return array($original_text{0}, substr($original_text, 1)); + } + + $block_text .= $parts[0]; # Text before current tag. + $tag = $parts[1]; # Tag to handle. + $text = $parts[2]; # Remaining text after current tag. + + # + # Check for: Auto-close tag (like
) + # Comments and Processing Instructions. + # + if (preg_match('{^auto_close_tags_re.')\b}', $tag) || + $tag{1} == '!' || $tag{1} == '?') + { + # Just add the tag to the block as if it was text. + $block_text .= $tag; + } + else { + # + # Increase/decrease nested tag count. Only do so if + # the tag's name match base tag's. + # + if (preg_match('{^mode = $attr_m[2] . $attr_m[3]; + $span_mode = $this->mode == 'span' || $this->mode != 'block' && + preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag); + + # Calculate indent before tag. + if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) { + $strlen = $this->utf8_strlen; + $indent = $strlen($matches[1], 'UTF-8'); + } else { + $indent = 0; + } + + # End preceding block with this tag. + $block_text .= $tag; + $parsed .= $this->$hash_method($block_text); + + # Get enclosing tag name for the ParseMarkdown function. + # (This pattern makes $tag_name_re safe without quoting.) + preg_match('/^<([\w:$]*)\b/', $tag, $matches); + $tag_name_re = $matches[1]; + + # Parse the content using the HTML-in-Markdown parser. + list ($block_text, $text) + = $this->_hashHTMLBlocks_inMarkdown($text, $indent, + $tag_name_re, $span_mode); + + # Outdent markdown text. + if ($indent > 0) { + $block_text = preg_replace("/^[ ]{1,$indent}/m", "", + $block_text); + } + + # Append tag content to parsed text. + if (!$span_mode) $parsed .= "\n\n$block_text\n\n"; + else $parsed .= "$block_text"; + + # Start over with a new block. + $block_text = ""; + } + else $block_text .= $tag; + } + + } while ($depth > 0); + + # + # Hash last block text that wasn't processed inside the loop. + # + $parsed .= $this->$hash_method($block_text); + + return array($parsed, $text); + } + + + protected function hashClean($text) { + # + # Called whenever a tag must be hashed when a function inserts a "clean" tag + # in $text, it passes through this function and is automaticaly escaped, + # blocking invalid nested overlap. + # + return $this->hashPart($text, 'C'); + } + + + protected function doAnchors($text) { + # + # Turn Markdown link shortcuts into XHTML tags. + # + if ($this->in_anchor) return $text; + $this->in_anchor = true; + + # + # First, handle reference-style links: [link text] [id] + # + $text = preg_replace_callback('{ + ( # wrap whole match in $1 + \[ + ('.$this->nested_brackets_re.') # link text = $2 + \] + + [ ]? # one optional space + (?:\n[ ]*)? # one optional newline followed by spaces + + \[ + (.*?) # id = $3 + \] + ) + }xs', + array($this, '_doAnchors_reference_callback'), $text); + + # + # Next, inline-style links: [link text](url "optional title") + # + $text = preg_replace_callback('{ + ( # wrap whole match in $1 + \[ + ('.$this->nested_brackets_re.') # link text = $2 + \] + \( # literal paren + [ \n]* + (?: + <(.+?)> # href = $3 + | + ('.$this->nested_url_parenthesis_re.') # href = $4 + ) + [ \n]* + ( # $5 + ([\'"]) # quote char = $6 + (.*?) # Title = $7 + \6 # matching quote + [ \n]* # ignore any spaces/tabs between closing quote and ) + )? # title is optional + \) + (?:[ ]? '.$this->id_class_attr_catch_re.' )? # $8 = id/class attributes + ) + }xs', + array($this, '_doAnchors_inline_callback'), $text); + + # + # Last, handle reference-style shortcuts: [link text] + # These must come last in case you've also got [link text][1] + # or [link text](/foo) + # + $text = preg_replace_callback('{ + ( # wrap whole match in $1 + \[ + ([^\[\]]+) # link text = $2; can\'t contain [ or ] + \] + ) + }xs', + array($this, '_doAnchors_reference_callback'), $text); + + $this->in_anchor = false; + return $text; + } + protected function _doAnchors_reference_callback($matches) { + $whole_match = $matches[1]; + $link_text = $matches[2]; + $link_id =& $matches[3]; + + if ($link_id == "") { + # for shortcut links like [this][] or [this]. + $link_id = $link_text; + } + + # lower-case and turn embedded newlines into spaces + $link_id = strtolower($link_id); + $link_id = preg_replace('{[ ]?\n}', ' ', $link_id); + + if (isset($this->urls[$link_id])) { + $url = $this->urls[$link_id]; + $url = $this->encodeURLAttribute($url); + + $result = "titles[$link_id] ) ) { + $title = $this->titles[$link_id]; + $title = $this->encodeAttribute($title); + $result .= " title=\"$title\""; + } + if (isset($this->ref_attr[$link_id])) + $result .= $this->ref_attr[$link_id]; + + $link_text = $this->runSpanGamut($link_text); + $result .= ">$link_text"; + $result = $this->hashPart($result); + } + else { + $result = $whole_match; + } + return $result; + } + protected function _doAnchors_inline_callback($matches) { + $whole_match = $matches[1]; + $link_text = $this->runSpanGamut($matches[2]); + $url = $matches[3] == '' ? $matches[4] : $matches[3]; + $title =& $matches[7]; + $attr = $this->doExtraAttributes("a", $dummy =& $matches[8]); + + // if the URL was of the form it got caught by the HTML + // tag parser and hashed. Need to reverse the process before using the URL. + $unhashed = $this->unhash($url); + if ($unhashed != $url) + $url = preg_replace('/^<(.*)>$/', '\1', $unhashed); + + $url = $this->encodeURLAttribute($url); + + $result = "encodeAttribute($title); + $result .= " title=\"$title\""; + } + $result .= $attr; + + $link_text = $this->runSpanGamut($link_text); + $result .= ">$link_text"; + + return $this->hashPart($result); + } + + + protected function doImages($text) { + # + # Turn Markdown image shortcuts into tags. + # + # + # First, handle reference-style labeled images: ![alt text][id] + # + $text = preg_replace_callback('{ + ( # wrap whole match in $1 + !\[ + ('.$this->nested_brackets_re.') # alt text = $2 + \] + + [ ]? # one optional space + (?:\n[ ]*)? # one optional newline followed by spaces + + \[ + (.*?) # id = $3 + \] + + ) + }xs', + array($this, '_doImages_reference_callback'), $text); + + # + # Next, handle inline images: ![alt text](url "optional title") + # Don't forget: encode * and _ + # + $text = preg_replace_callback('{ + ( # wrap whole match in $1 + !\[ + ('.$this->nested_brackets_re.') # alt text = $2 + \] + \s? # One optional whitespace character + \( # literal paren + [ \n]* + (?: + <(\S*)> # src url = $3 + | + ('.$this->nested_url_parenthesis_re.') # src url = $4 + ) + [ \n]* + ( # $5 + ([\'"]) # quote char = $6 + (.*?) # title = $7 + \6 # matching quote + [ \n]* + )? # title is optional + \) + (?:[ ]? '.$this->id_class_attr_catch_re.' )? # $8 = id/class attributes + ) + }xs', + array($this, '_doImages_inline_callback'), $text); + + return $text; + } + protected function _doImages_reference_callback($matches) { + $whole_match = $matches[1]; + $alt_text = $matches[2]; + $link_id = strtolower($matches[3]); + if ($link_id == "") { + $link_id = strtolower($alt_text); # for shortcut links like ![this][]. + } + + $alt_text = $this->encodeAttribute($alt_text); + if (isset($this->urls[$link_id])) { + $url = $this->encodeURLAttribute($this->urls[$link_id]); + $result = "\"$alt_text\"";titles[$link_id])) { + $title = $this->titles[$link_id]; + $title = $this->encodeAttribute($title); + $result .= " title=\"$title\""; + } + if (isset($this->ref_attr[$link_id])) + $result .= $this->ref_attr[$link_id]; + $result .= $this->empty_element_suffix; + $result = $this->hashPart($result); + } + else { + # If there's no such link ID, leave intact: + $result = $whole_match; + } + + return $result; + } + protected function _doImages_inline_callback($matches) { + $whole_match = $matches[1]; + $alt_text = $matches[2]; + $url = $matches[3] == '' ? $matches[4] : $matches[3]; + $title =& $matches[7]; + $attr = $this->doExtraAttributes("img", $dummy =& $matches[8]); + + $alt_text = $this->encodeAttribute($alt_text); + $url = $this->encodeURLAttribute($url); + $result = "\"$alt_text\"";encodeAttribute($title); + $result .= " title=\"$title\""; # $title already quoted + } + $result .= $attr; + $result .= $this->empty_element_suffix; + + return $this->hashPart($result); + } + + + protected function doHeaders($text) { + # + # Redefined to add id and class attribute support. + # + # Setext-style headers: + # Header 1 {#header1} + # ======== + # + # Header 2 {#header2 .class1 .class2} + # -------- + # + $text = preg_replace_callback( + '{ + (^.+?) # $1: Header text + (?:[ ]+ '.$this->id_class_attr_catch_re.' )? # $3 = id/class attributes + [ ]*\n(=+|-+)[ ]*\n+ # $3: Header footer + }mx', + array($this, '_doHeaders_callback_setext'), $text); + + # atx-style headers: + # # Header 1 {#header1} + # ## Header 2 {#header2} + # ## Header 2 with closing hashes ## {#header3.class1.class2} + # ... + # ###### Header 6 {.class2} + # + $text = preg_replace_callback('{ + ^(\#{1,6}) # $1 = string of #\'s + [ ]* + (.+?) # $2 = Header text + [ ]* + \#* # optional closing #\'s (not counted) + (?:[ ]+ '.$this->id_class_attr_catch_re.' )? # $3 = id/class attributes + [ ]* + \n+ + }xm', + array($this, '_doHeaders_callback_atx'), $text); + + return $text; + } + protected function _doHeaders_callback_setext($matches) { + if ($matches[3] == '-' && preg_match('{^- }', $matches[1])) + return $matches[0]; + + $level = $matches[3]{0} == '=' ? 1 : 2; + + $defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[1]) : null; + + $attr = $this->doExtraAttributes("h$level", $dummy =& $matches[2], $defaultId); + $block = "".$this->runSpanGamut($matches[1]).""; + return "\n" . $this->hashBlock($block) . "\n\n"; + } + protected function _doHeaders_callback_atx($matches) { + $level = strlen($matches[1]); + + $defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[2]) : null; + $attr = $this->doExtraAttributes("h$level", $dummy =& $matches[3], $defaultId); + $block = "".$this->runSpanGamut($matches[2]).""; + return "\n" . $this->hashBlock($block) . "\n\n"; + } + + + protected function doTables($text) { + # + # Form HTML tables. + # + $less_than_tab = $this->tab_width - 1; + # + # Find tables with leading pipe. + # + # | Header 1 | Header 2 + # | -------- | -------- + # | Cell 1 | Cell 2 + # | Cell 3 | Cell 4 + # + $text = preg_replace_callback(' + { + ^ # Start of a line + [ ]{0,'.$less_than_tab.'} # Allowed whitespace. + [|] # Optional leading pipe (present) + (.+) \n # $1: Header row (at least one pipe) + + [ ]{0,'.$less_than_tab.'} # Allowed whitespace. + [|] ([ ]*[-:]+[-| :]*) \n # $2: Header underline + + ( # $3: Cells + (?> + [ ]* # Allowed whitespace. + [|] .* \n # Row content. + )* + ) + (?=\n|\Z) # Stop at final double newline. + }xm', + array($this, '_doTable_leadingPipe_callback'), $text); + + # + # Find tables without leading pipe. + # + # Header 1 | Header 2 + # -------- | -------- + # Cell 1 | Cell 2 + # Cell 3 | Cell 4 + # + $text = preg_replace_callback(' + { + ^ # Start of a line + [ ]{0,'.$less_than_tab.'} # Allowed whitespace. + (\S.*[|].*) \n # $1: Header row (at least one pipe) + + [ ]{0,'.$less_than_tab.'} # Allowed whitespace. + ([-:]+[ ]*[|][-| :]*) \n # $2: Header underline + + ( # $3: Cells + (?> + .* [|] .* \n # Row content + )* + ) + (?=\n|\Z) # Stop at final double newline. + }xm', + array($this, '_DoTable_callback'), $text); + + return $text; + } + protected function _doTable_leadingPipe_callback($matches) { + $head = $matches[1]; + $underline = $matches[2]; + $content = $matches[3]; + + # Remove leading pipe for each row. + $content = preg_replace('/^ *[|]/m', '', $content); + + return $this->_doTable_callback(array($matches[0], $head, $underline, $content)); + } + protected function _doTable_makeAlignAttr($alignname) + { + if (empty($this->table_align_class_tmpl)) + return " align=\"$alignname\""; + + $classname = str_replace('%%', $alignname, $this->table_align_class_tmpl); + return " class=\"$classname\""; + } + protected function _doTable_callback($matches) { + $head = $matches[1]; + $underline = $matches[2]; + $content = $matches[3]; + + # Remove any tailing pipes for each line. + $head = preg_replace('/[|] *$/m', '', $head); + $underline = preg_replace('/[|] *$/m', '', $underline); + $content = preg_replace('/[|] *$/m', '', $content); + + # Reading alignement from header underline. + $separators = preg_split('/ *[|] */', $underline); + foreach ($separators as $n => $s) { + if (preg_match('/^ *-+: *$/', $s)) + $attr[$n] = $this->_doTable_makeAlignAttr('right'); + else if (preg_match('/^ *:-+: *$/', $s)) + $attr[$n] = $this->_doTable_makeAlignAttr('center'); + else if (preg_match('/^ *:-+ *$/', $s)) + $attr[$n] = $this->_doTable_makeAlignAttr('left'); + else + $attr[$n] = ''; + } + + # Parsing span elements, including code spans, character escapes, + # and inline HTML tags, so that pipes inside those gets ignored. + $head = $this->parseSpan($head); + $headers = preg_split('/ *[|] */', $head); + $col_count = count($headers); + $attr = array_pad($attr, $col_count, ''); + + # Write column headers. + $text = "\n"; + $text .= "\n"; + $text .= "\n"; + foreach ($headers as $n => $header) + $text .= " ".$this->runSpanGamut(trim($header))."\n"; + $text .= "\n"; + $text .= "\n"; + + # Split content by row. + $rows = explode("\n", trim($content, "\n")); + + $text .= "\n"; + foreach ($rows as $row) { + # Parsing span elements, including code spans, character escapes, + # and inline HTML tags, so that pipes inside those gets ignored. + $row = $this->parseSpan($row); + + # Split row by cell. + $row_cells = preg_split('/ *[|] */', $row, $col_count); + $row_cells = array_pad($row_cells, $col_count, ''); + + $text .= "\n"; + foreach ($row_cells as $n => $cell) + $text .= " ".$this->runSpanGamut(trim($cell))."\n"; + $text .= "\n"; + } + $text .= "\n"; + $text .= "
"; + + return $this->hashBlock($text) . "\n"; + } + + + protected function doDefLists($text) { + # + # Form HTML definition lists. + # + $less_than_tab = $this->tab_width - 1; + + # Re-usable pattern to match any entire dl list: + $whole_list_re = '(?> + ( # $1 = whole list + ( # $2 + [ ]{0,'.$less_than_tab.'} + ((?>.*\S.*\n)+) # $3 = defined term + \n? + [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition + ) + (?s:.+?) + ( # $4 + \z + | + \n{2,} + (?=\S) + (?! # Negative lookahead for another term + [ ]{0,'.$less_than_tab.'} + (?: \S.*\n )+? # defined term + \n? + [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition + ) + (?! # Negative lookahead for another definition + [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition + ) + ) + ) + )'; // mx + + $text = preg_replace_callback('{ + (?>\A\n?|(?<=\n\n)) + '.$whole_list_re.' + }mx', + array($this, '_doDefLists_callback'), $text); + + return $text; + } + protected function _doDefLists_callback($matches) { + # Re-usable patterns to match list item bullets and number markers: + $list = $matches[1]; + + # Turn double returns into triple returns, so that we can make a + # paragraph for the last item in a list, if necessary: + $result = trim($this->processDefListItems($list)); + $result = "
\n" . $result . "\n
"; + return $this->hashBlock($result) . "\n\n"; + } + + + protected function processDefListItems($list_str) { + # + # Process the contents of a single definition list, splitting it + # into individual term and definition list items. + # + $less_than_tab = $this->tab_width - 1; + + # trim trailing blank lines: + $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str); + + # Process definition terms. + $list_str = preg_replace_callback('{ + (?>\A\n?|\n\n+) # leading line + ( # definition terms = $1 + [ ]{0,'.$less_than_tab.'} # leading whitespace + (?!\:[ ]|[ ]) # negative lookahead for a definition + # mark (colon) or more whitespace. + (?> \S.* \n)+? # actual term (not whitespace). + ) + (?=\n?[ ]{0,3}:[ ]) # lookahead for following line feed + # with a definition mark. + }xm', + array($this, '_processDefListItems_callback_dt'), $list_str); + + # Process actual definitions. + $list_str = preg_replace_callback('{ + \n(\n+)? # leading line = $1 + ( # marker space = $2 + [ ]{0,'.$less_than_tab.'} # whitespace before colon + \:[ ]+ # definition mark (colon) + ) + ((?s:.+?)) # definition text = $3 + (?= \n+ # stop at next definition mark, + (?: # next term or end of text + [ ]{0,'.$less_than_tab.'} \:[ ] | +
| \z + ) + ) + }xm', + array($this, '_processDefListItems_callback_dd'), $list_str); + + return $list_str; + } + protected function _processDefListItems_callback_dt($matches) { + $terms = explode("\n", trim($matches[1])); + $text = ''; + foreach ($terms as $term) { + $term = $this->runSpanGamut(trim($term)); + $text .= "\n
" . $term . "
"; + } + return $text . "\n"; + } + protected function _processDefListItems_callback_dd($matches) { + $leading_line = $matches[1]; + $marker_space = $matches[2]; + $def = $matches[3]; + + if ($leading_line || preg_match('/\n{2,}/', $def)) { + # Replace marker with the appropriate whitespace indentation + $def = str_repeat(' ', strlen($marker_space)) . $def; + $def = $this->runBlockGamut($this->outdent($def . "\n\n")); + $def = "\n". $def ."\n"; + } + else { + $def = rtrim($def); + $def = $this->runSpanGamut($this->outdent($def)); + } + + return "\n
" . $def . "
\n"; + } + + + protected function doFencedCodeBlocks($text) { + # + # Adding the fenced code block syntax to regular Markdown: + # + # ~~~ + # Code block + # ~~~ + # + $less_than_tab = $this->tab_width; + + $text = preg_replace_callback('{ + (?:\n|\A) + # 1: Opening marker + ( + (?:~{3,}|`{3,}) # 3 or more tildes/backticks. + ) + [ ]* + (?: + \.?([-_:a-zA-Z0-9]+) # 2: standalone class name + | + '.$this->id_class_attr_catch_re.' # 3: Extra attributes + )? + [ ]* \n # Whitespace and newline following marker. + + # 4: Content + ( + (?> + (?!\1 [ ]* \n) # Not a closing marker. + .*\n+ + )+ + ) + + # Closing marker. + \1 [ ]* (?= \n ) + }xm', + array($this, '_doFencedCodeBlocks_callback'), $text); + + return $text; + } + protected function _doFencedCodeBlocks_callback($matches) { + $classname =& $matches[2]; + $attrs =& $matches[3]; + $codeblock = $matches[4]; + $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES); + $codeblock = preg_replace_callback('/^\n+/', + array($this, '_doFencedCodeBlocks_newlines'), $codeblock); + + if ($classname != "") { + if ($classname{0} == '.') + $classname = substr($classname, 1); + $attr_str = ' class="'.$this->code_class_prefix.$classname.'"'; + } else { + $attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs); + } + $pre_attr_str = $this->code_attr_on_pre ? $attr_str : ''; + $code_attr_str = $this->code_attr_on_pre ? '' : $attr_str; + $codeblock = "$codeblock"; + + return "\n\n".$this->hashBlock($codeblock)."\n\n"; + } + protected function _doFencedCodeBlocks_newlines($matches) { + return str_repeat("empty_element_suffix", + strlen($matches[0])); + } + + + # + # Redefining emphasis markers so that emphasis by underscore does not + # work in the middle of a word. + # + protected $em_relist = array( + '' => '(?:(? '(? '(? '(?:(? '(? '(? '(?:(? '(? '(? tags + # + # Strip leading and trailing lines: + $text = preg_replace('/\A\n+|\n+\z/', '', $text); + + $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY); + + # + # Wrap

tags and unhashify HTML blocks + # + foreach ($grafs as $key => $value) { + $value = trim($this->runSpanGamut($value)); + + # Check if this should be enclosed in a paragraph. + # Clean tag hashes & block tag hashes are left alone. + $is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value); + + if ($is_p) { + $value = "

$value

"; + } + $grafs[$key] = $value; + } + + # Join grafs in one text, then unhash HTML tags. + $text = implode("\n\n", $grafs); + + # Finish by removing any tag hashes still present in $text. + $text = $this->unhash($text); + + return $text; + } + + + ### Footnotes + + protected function stripFootnotes($text) { + # + # Strips link definitions from text, stores the URLs and titles in + # hash references. + # + $less_than_tab = $this->tab_width - 1; + + # Link defs are in the form: [^id]: url "optional title" + $text = preg_replace_callback('{ + ^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?: # note_id = $1 + [ ]* + \n? # maybe *one* newline + ( # text = $2 (no blank lines allowed) + (?: + .+ # actual text + | + \n # newlines but + (?!\[.+?\][ ]?:\s)# negative lookahead for footnote or link definition marker. + (?!\n+[ ]{0,3}\S)# ensure line is not blank and followed + # by non-indented content + )* + ) + }xm', + array($this, '_stripFootnotes_callback'), + $text); + return $text; + } + protected function _stripFootnotes_callback($matches) { + $note_id = $this->fn_id_prefix . $matches[1]; + $this->footnotes[$note_id] = $this->outdent($matches[2]); + return ''; # String that will replace the block + } + + + protected function doFootnotes($text) { + # + # Replace footnote references in $text [^id] with a special text-token + # which will be replaced by the actual footnote marker in appendFootnotes. + # + if (!$this->in_anchor) { + $text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text); + } + return $text; + } + + + protected function appendFootnotes($text) { + # + # Append footnote list to text. + # + $text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', + array($this, '_appendFootnotes_callback'), $text); + + if (!empty($this->footnotes_ordered)) { + $text .= "\n\n"; + $text .= "
\n"; + $text .= "empty_element_suffix ."\n"; + $text .= "
    \n\n"; + + $attr = ""; + if ($this->fn_backlink_class != "") { + $class = $this->fn_backlink_class; + $class = $this->encodeAttribute($class); + $attr .= " class=\"$class\""; + } + if ($this->fn_backlink_title != "") { + $title = $this->fn_backlink_title; + $title = $this->encodeAttribute($title); + $attr .= " title=\"$title\""; + } + $num = 0; + + while (!empty($this->footnotes_ordered)) { + $footnote = reset($this->footnotes_ordered); + $note_id = key($this->footnotes_ordered); + unset($this->footnotes_ordered[$note_id]); + $ref_count = $this->footnotes_ref_count[$note_id]; + unset($this->footnotes_ref_count[$note_id]); + unset($this->footnotes[$note_id]); + + $footnote .= "\n"; # Need to append newline before parsing. + $footnote = $this->runBlockGamut("$footnote\n"); + $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', + array($this, '_appendFootnotes_callback'), $footnote); + + $attr = str_replace("%%", ++$num, $attr); + $note_id = $this->encodeAttribute($note_id); + + # Prepare backlink, multiple backlinks if multiple references + $backlink = "↩"; + for ($ref_num = 2; $ref_num <= $ref_count; ++$ref_num) { + $backlink .= " ↩"; + } + # Add backlink to last paragraph; create new paragraph if needed. + if (preg_match('{

    $}', $footnote)) { + $footnote = substr($footnote, 0, -4) . " $backlink

    "; + } else { + $footnote .= "\n\n

    $backlink

    "; + } + + $text .= "
  1. \n"; + $text .= $footnote . "\n"; + $text .= "
    2. \n\n"; + } + + $text .= "
\n"; + $text .= "
"; + } + return $text; + } + protected function _appendFootnotes_callback($matches) { + $node_id = $this->fn_id_prefix . $matches[1]; + + # Create footnote marker only if it has a corresponding footnote *and* + # the footnote hasn't been used by another marker. + if (isset($this->footnotes[$node_id])) { + $num =& $this->footnotes_numbers[$node_id]; + if (!isset($num)) { + # Transfer footnote content to the ordered list and give it its + # number + $this->footnotes_ordered[$node_id] = $this->footnotes[$node_id]; + $this->footnotes_ref_count[$node_id] = 1; + $num = $this->footnote_counter++; + $ref_count_mark = ''; + } else { + $ref_count_mark = $this->footnotes_ref_count[$node_id] += 1; + } + + $attr = ""; + if ($this->fn_link_class != "") { + $class = $this->fn_link_class; + $class = $this->encodeAttribute($class); + $attr .= " class=\"$class\""; + } + if ($this->fn_link_title != "") { + $title = $this->fn_link_title; + $title = $this->encodeAttribute($title); + $attr .= " title=\"$title\""; + } + + $attr = str_replace("%%", $num, $attr); + $node_id = $this->encodeAttribute($node_id); + + return + "". + "$num". + ""; + } + + return "[^".$matches[1]."]"; + } + + + ### Abbreviations ### + + protected function stripAbbreviations($text) { + # + # Strips abbreviations from text, stores titles in hash references. + # + $less_than_tab = $this->tab_width - 1; + + # Link defs are in the form: [id]*: url "optional title" + $text = preg_replace_callback('{ + ^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?: # abbr_id = $1 + (.*) # text = $2 (no blank lines allowed) + }xm', + array($this, '_stripAbbreviations_callback'), + $text); + return $text; + } + protected function _stripAbbreviations_callback($matches) { + $abbr_word = $matches[1]; + $abbr_desc = $matches[2]; + if ($this->abbr_word_re) + $this->abbr_word_re .= '|'; + $this->abbr_word_re .= preg_quote($abbr_word); + $this->abbr_desciptions[$abbr_word] = trim($abbr_desc); + return ''; # String that will replace the block + } + + + protected function doAbbreviations($text) { + # + # Find defined abbreviations in text and wrap them in elements. + # + if ($this->abbr_word_re) { + // cannot use the /x modifier because abbr_word_re may + // contain significant spaces: + $text = preg_replace_callback('{'. + '(?abbr_word_re.')'. + '(?![\w\x1A])'. + '}', + array($this, '_doAbbreviations_callback'), $text); + } + return $text; + } + protected function _doAbbreviations_callback($matches) { + $abbr = $matches[0]; + if (isset($this->abbr_desciptions[$abbr])) { + $desc = $this->abbr_desciptions[$abbr]; + if (empty($desc)) { + return $this->hashPart("$abbr"); + } else { + $desc = $this->encodeAttribute($desc); + return $this->hashPart("$abbr"); + } + } else { + return $matches[0]; + } + } +} diff --git a/system/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php b/system/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php index f8367ed..0fc163a 100644 --- a/system/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php +++ b/system/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php @@ -3,8 +3,8 @@ # Markdown - A text-to-HTML conversion tool for web writers # # PHP Markdown -# Copyright (c) 2004-2014 Michel Fortin -# +# Copyright (c) 2004-2015 Michel Fortin +# # # Original Markdown # Copyright (c) 2004-2006 John Gruber @@ -32,6 +32,3 @@ interface MarkdownInterface { public function transform($text); } - - -?> \ No newline at end of file diff --git a/system/vendor/michelf/php-markdown/Readme.md b/system/vendor/michelf/php-markdown/Readme.md index 0bccd69..fa7fe58 100644 --- a/system/vendor/michelf/php-markdown/Readme.md +++ b/system/vendor/michelf/php-markdown/Readme.md @@ -1,10 +1,10 @@ PHP Markdown ============ -PHP Markdown Lib 1.4.1 - 4 May 2013 +PHP Markdown Lib 1.5.0 - 1 Mar 2015 by Michel Fortin - + based on Markdown by John Gruber @@ -25,10 +25,10 @@ software tool, originally written in Perl, that converts the plain text markup to HTML. PHP Markdown is a port to PHP of the original Markdown program by John Gruber. -* [Full documentation of the Markdown syntax]() - - Daring Fireball (John Gruber) -* [Markdown Extra syntax additions]() - - Michel Fortin +* [Full documentation of the Markdown syntax]() + — Daring Fireball (John Gruber) +* [Markdown Extra syntax additions]() + — Michel Fortin Requirement @@ -83,7 +83,7 @@ configuration variables: To learn more, see the full list of [configuration variables]. - [configuration variables]: http://michelf.ca/projects/php-markdown/configuration/ + [configuration variables]: https://michelf.ca/projects/php-markdown/configuration/ ### Usage without an autoloader @@ -174,6 +174,28 @@ PHP Markdown, please visit [michelf.ca/donate] or send Bitcoin to Version History --------------- +PHP Markdown Lib 1.5.0 (1 Mar 2015) + +* Added the ability start ordered lists with a number different from 1 and + and have that reflected in the HTML output. This can be enabled with + the `enhanced_ordered_lists` configuration variable for the Markdown + parser; it is enabled by default for Markdown Extra. + Credits to Matt Gorle for providing the implementation. + +* Added the ability to insert custom HTML attributes with simple values + everywhere an extra attribute block is allowed (links, images, headers). + The value must be unquoted, cannot contains spaces and is limited to + alphanumeric ASCII characters. + Credits to Peter Droogmans for providing the implementation. + +* Added a `header_id_func` configuration variable which takes a function + that can generate an `id` attribute value from the header text. + Credits to Evert Pot for providing the implementation. + +* Added a `url_filter_func` configuration variable which takes a function + that can rewrite any link or image URL to something different. + + PHP Markdown Lib 1.4.1 (4 May 2014) * The HTML block parser will now treat `
` as a block-level element @@ -229,7 +251,7 @@ PHP Markdown Extra 1.2.6: * Plugin interface for WordPress and other systems is no longer present in the Lib package. The classic package is still available if you need it: - + * Added `public` and `protected` protection attributes, plus a section about what is "public API" and what isn't in the Readme file. @@ -267,8 +289,8 @@ Copyright and License --------------------- PHP Markdown Lib -Copyright (c) 2004-2014 Michel Fortin - +Copyright (c) 2004-2015 Michel Fortin + All rights reserved. Based on Markdown diff --git a/system/vendor/michelf/php-markdown/composer.json b/system/vendor/michelf/php-markdown/composer.json index 45abc67..ec0e170 100644 --- a/system/vendor/michelf/php-markdown/composer.json +++ b/system/vendor/michelf/php-markdown/composer.json @@ -2,14 +2,14 @@ "name": "michelf/php-markdown", "type": "library", "description": "PHP Markdown", - "homepage": "http://michelf.ca/projects/php-markdown/", + "homepage": "https://michelf.ca/projects/php-markdown/", "keywords": ["markdown"], "license": "BSD-3-Clause", "authors": [ { "name": "Michel Fortin", "email": "michel.fortin@michelf.ca", - "homepage": "http://michelf.ca/", + "homepage": "https://michelf.ca/", "role": "Developer" }, { diff --git a/system/vendor/suin/php-rss-writer/.gitignore b/system/vendor/suin/php-rss-writer/.gitignore new file mode 100644 index 0000000..78b6bc4 --- /dev/null +++ b/system/vendor/suin/php-rss-writer/.gitignore @@ -0,0 +1,3 @@ +.idea/ +.phpmake +.DS_Store diff --git a/system/vendor/suin/php-rss-writer/.travis.yml b/system/vendor/suin/php-rss-writer/.travis.yml index faa00ec..eddea83 100644 --- a/system/vendor/suin/php-rss-writer/.travis.yml +++ b/system/vendor/suin/php-rss-writer/.travis.yml @@ -1,11 +1,19 @@ +sudo: false language: php php: - 5.3 - 5.4 + - 5.5 + - 5.6 + - hhvm before_script: - - cd Tests - - wget http://getcomposer.org/composer.phar - - php composer.phar install + - cd tests + - composer install -n -script: ./phpunit --coverage-text --configuration phpunit.xml.dist +script: phpunit --coverage-text --configuration phpunit.xml.dist + +cache: + directories: + - tests/vendor + - $HOME/.composer/cache \ No newline at end of file diff --git a/system/vendor/suin/php-rss-writer/README.md b/system/vendor/suin/php-rss-writer/README.md index 5c7fa7f..64d19a8 100644 --- a/system/vendor/suin/php-rss-writer/README.md +++ b/system/vendor/suin/php-rss-writer/README.md @@ -61,9 +61,14 @@ Output: ## Installation -You can install via Composer. +### Easy installation +You can install directly via [Composer](https://getcomposer.org/): +```bash +$ composer require suin/php-rss-writer +``` -At first create `composer.json` file: +### Manual installation +Add the following code to your `composer.json` file: ```json { @@ -73,24 +78,23 @@ At first create `composer.json` file: } ``` -Run composer to install. - -``` +...and run composer to install it: +```bash $ composer install ``` -Finally, include `vendor/autoload.php` in your product. - -``` +Finally, include `vendor/autoload.php` in your product: +```php +assertSame($channel, $channel->title($title)); - $this->assertAttributeSame($title, 'title', $channel); - } - - public function testUrl() - { - $url = uniqid(); - $channel = new Channel(); - $this->assertSame($channel, $channel->url($url)); - $this->assertAttributeSame($url, 'url', $channel); - } - - public function testDescription() - { - $description = uniqid(); - $channel = new Channel(); - $this->assertSame($channel, $channel->description($description)); - $this->assertAttributeSame($description, 'description', $channel); - } - - public function testLanguage() - { - $language = uniqid(); - $channel = new Channel(); - $this->assertSame($channel, $channel->language($language)); - $this->assertAttributeSame($language, 'language', $channel); - } - - public function testCopyright() - { - $copyright = uniqid(); - $channel = new Channel(); - $this->assertSame($channel, $channel->copyright($copyright)); - $this->assertAttributeSame($copyright, 'copyright', $channel); - } - - public function testPubDate() - { - $pubDate = mt_rand(0, 9999999); - $channel = new Channel(); - $this->assertSame($channel, $channel->pubDate($pubDate)); - $this->assertAttributeSame($pubDate, 'pubDate', $channel); - } - - public function testLastBuildDate() - { - $lastBuildDate = mt_rand(0, 9999999); - $channel = new Channel(); - $this->assertSame($channel, $channel->lastBuildDate($lastBuildDate)); - $this->assertAttributeSame($lastBuildDate, 'lastBuildDate', $channel); - } - - public function testTtl() - { - $ttl = mt_rand(0, 99999999); - $channel = new Channel(); - $this->assertSame($channel, $channel->ttl($ttl)); - $this->assertAttributeSame($ttl, 'ttl', $channel); - } - - public function testAddItem() - { - $item = $this->getMock($this->itemInterface); - $channel = new Channel(); - $this->assertSame($channel, $channel->addItem($item)); - $this->assertAttributeSame(array($item), 'items', $channel); - } - - public function testAppendTo() - { - $channel = new Channel(); - $feed = $this->getMock($this->feedInterface); - $feed->expects($this->once())->method('addChannel')->with($channel); - $this->assertSame($channel, $channel->appendTo($feed)); - } - - /** - * @param $expect - * @param array $data - * @dataProvider dataForAsXML - */ - public function testAsXML($expect, array $data) - { - $data = (object) $data; - $channel = new Channel(); - - foreach ( $data as $key => $value ) - { - $this->reveal($channel)->attr($key, $value); - } - - $this->assertXmlStringEqualsXmlString($expect, $channel->asXML()->asXML()); - } - - public static function dataForAsXML() - { - $now = time(); - $nowString = date(DATE_RSS, $now); - - return array( - array( - " + private $itemInterface = '\Suin\RSSWriter\ItemInterface'; + private $feedInterface = '\Suin\RSSWriter\FeedInterface'; + + public function testTitle() + { + $title = uniqid(); + $channel = new Channel(); + $this->assertSame($channel, $channel->title($title)); + $this->assertAttributeSame($title, 'title', $channel); + } + + public function testUrl() + { + $url = uniqid(); + $channel = new Channel(); + $this->assertSame($channel, $channel->url($url)); + $this->assertAttributeSame($url, 'url', $channel); + } + + public function testDescription() + { + $description = uniqid(); + $channel = new Channel(); + $this->assertSame($channel, $channel->description($description)); + $this->assertAttributeSame($description, 'description', $channel); + } + + public function testLanguage() + { + $language = uniqid(); + $channel = new Channel(); + $this->assertSame($channel, $channel->language($language)); + $this->assertAttributeSame($language, 'language', $channel); + } + + public function testCopyright() + { + $copyright = uniqid(); + $channel = new Channel(); + $this->assertSame($channel, $channel->copyright($copyright)); + $this->assertAttributeSame($copyright, 'copyright', $channel); + } + + public function testPubDate() + { + $pubDate = mt_rand(0, 9999999); + $channel = new Channel(); + $this->assertSame($channel, $channel->pubDate($pubDate)); + $this->assertAttributeSame($pubDate, 'pubDate', $channel); + } + + public function testLastBuildDate() + { + $lastBuildDate = mt_rand(0, 9999999); + $channel = new Channel(); + $this->assertSame($channel, $channel->lastBuildDate($lastBuildDate)); + $this->assertAttributeSame($lastBuildDate, 'lastBuildDate', $channel); + } + + public function testTtl() + { + $ttl = mt_rand(0, 99999999); + $channel = new Channel(); + $this->assertSame($channel, $channel->ttl($ttl)); + $this->assertAttributeSame($ttl, 'ttl', $channel); + } + + public function testAddItem() + { + $item = $this->getMock($this->itemInterface); + $channel = new Channel(); + $this->assertSame($channel, $channel->addItem($item)); + $this->assertAttributeSame(array($item), 'items', $channel); + } + + public function testAppendTo() + { + $channel = new Channel(); + $feed = $this->getMock($this->feedInterface); + $feed->expects($this->once())->method('addChannel')->with($channel); + $this->assertSame($channel, $channel->appendTo($feed)); + } + + /** + * @param $expect + * @param array $data + * @dataProvider dataForAsXML + */ + public function testAsXML($expect, array $data) + { + $data = (object)$data; + $channel = new Channel(); + + foreach ($data as $key => $value) { + $this->reveal($channel)->attr($key, $value); + } + + $this->assertXmlStringEqualsXmlString($expect, $channel->asXML()->asXML()); + } + + public static function dataForAsXML() + { + $now = time(); + $nowString = date(DATE_RSS, $now); + + return array( + array( + " GoUpstate.com News Headlines http://www.goupstate.com/ The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site. ", - array( - 'title' => "GoUpstate.com News Headlines", - 'url' => 'http://www.goupstate.com/', - 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", - ) - ), - array( - " + array( + 'title' => "GoUpstate.com News Headlines", + 'url' => 'http://www.goupstate.com/', + 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", + ) + ), + array( + " GoUpstate.com News Headlines http://www.goupstate.com/ @@ -134,15 +133,15 @@ class ChannelTest extends \XoopsUnit\TestCase en-us ", - array( - 'title' => "GoUpstate.com News Headlines", - 'url' => 'http://www.goupstate.com/', - 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", - 'language' => 'en-us', - ) - ), - array( - " + array( + 'title' => "GoUpstate.com News Headlines", + 'url' => 'http://www.goupstate.com/', + 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", + 'language' => 'en-us', + ) + ), + array( + " GoUpstate.com News Headlines http://www.goupstate.com/ @@ -150,15 +149,15 @@ class ChannelTest extends \XoopsUnit\TestCase {$nowString} ", - array( - 'title' => "GoUpstate.com News Headlines", - 'url' => 'http://www.goupstate.com/', - 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", - 'pubDate' => $now, - ) - ), - array( - " + array( + 'title' => "GoUpstate.com News Headlines", + 'url' => 'http://www.goupstate.com/', + 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", + 'pubDate' => $now, + ) + ), + array( + " GoUpstate.com News Headlines http://www.goupstate.com/ @@ -166,15 +165,15 @@ class ChannelTest extends \XoopsUnit\TestCase {$nowString} ", - array( - 'title' => "GoUpstate.com News Headlines", - 'url' => 'http://www.goupstate.com/', - 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", - 'lastBuildDate' => $now, - ) - ), - array( - " + array( + 'title' => "GoUpstate.com News Headlines", + 'url' => 'http://www.goupstate.com/', + 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", + 'lastBuildDate' => $now, + ) + ), + array( + " GoUpstate.com News Headlines http://www.goupstate.com/ @@ -182,15 +181,15 @@ class ChannelTest extends \XoopsUnit\TestCase 60 ", - array( - 'title' => "GoUpstate.com News Headlines", - 'url' => 'http://www.goupstate.com/', - 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", - 'ttl' => 60, - ) - ), - array( - " + array( + 'title' => "GoUpstate.com News Headlines", + 'url' => 'http://www.goupstate.com/', + 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", + 'ttl' => 60, + ) + ), + array( + " GoUpstate.com News Headlines http://www.goupstate.com/ @@ -198,39 +197,38 @@ class ChannelTest extends \XoopsUnit\TestCase Copyright 2002, Spartanburg Herald-Journal ", - array( - 'title' => "GoUpstate.com News Headlines", - 'url' => 'http://www.goupstate.com/', - 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", - 'copyright' => "Copyright 2002, Spartanburg Herald-Journal", - ) - ), - ); - } - - - public function testAppendTo_with_items() - { - $channel = new Channel(); - - $xml1 = new SimpleXMLElement('item1'); - $xml2 = new SimpleXMLElement('item2'); - $xml3 = new SimpleXMLElement('item3'); - - $item1 = $this->getMock($this->itemInterface); - $item1->expects($this->once())->method('asXML')->will($this->returnValue($xml1)); - $item2= $this->getMock($this->itemInterface); - $item2->expects($this->once())->method('asXML')->will($this->returnValue($xml2)); - $item3 = $this->getMock($this->itemInterface); - $item3->expects($this->once())->method('asXML')->will($this->returnValue($xml3)); - - $this->reveal($channel) - ->attr('title', "GoUpstate.com News Headlines") - ->attr('url', 'http://www.goupstate.com/') - ->attr('description', "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.") - ->attr('items', array($item1, $item2, $item3)); - - $expect = ' + array( + 'title' => "GoUpstate.com News Headlines", + 'url' => 'http://www.goupstate.com/', + 'description' => "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.", + 'copyright' => "Copyright 2002, Spartanburg Herald-Journal", + ) + ), + ); + } + + public function testAppendTo_with_items() + { + $channel = new Channel(); + + $xml1 = new SimpleXMLElement('item1'); + $xml2 = new SimpleXMLElement('item2'); + $xml3 = new SimpleXMLElement('item3'); + + $item1 = $this->getMock($this->itemInterface); + $item1->expects($this->once())->method('asXML')->will($this->returnValue($xml1)); + $item2 = $this->getMock($this->itemInterface); + $item2->expects($this->once())->method('asXML')->will($this->returnValue($xml2)); + $item3 = $this->getMock($this->itemInterface); + $item3->expects($this->once())->method('asXML')->will($this->returnValue($xml3)); + + $this->reveal($channel) + ->attr('title', "GoUpstate.com News Headlines") + ->attr('url', 'http://www.goupstate.com/') + ->attr('description', "The latest news from GoUpstate.com, a Spartanburg Herald-Journal Web site.") + ->attr('items', array($item1, $item2, $item3)); + + $expect = ' GoUpstate.com News Headlines http://www.goupstate.com/ @@ -247,6 +245,6 @@ class ChannelTest extends \XoopsUnit\TestCase '; - $this->assertXmlStringEqualsXmlString($expect, $channel->asXML()->asXML()); - } + $this->assertXmlStringEqualsXmlString($expect, $channel->asXML()->asXML()); + } } diff --git a/system/vendor/suin/php-rss-writer/Tests/Suin/RSSWriter/FeedTest.php b/system/vendor/suin/php-rss-writer/Tests/Suin/RSSWriter/FeedTest.php index 60f030a..a949584 100644 --- a/system/vendor/suin/php-rss-writer/Tests/Suin/RSSWriter/FeedTest.php +++ b/system/vendor/suin/php-rss-writer/Tests/Suin/RSSWriter/FeedTest.php @@ -2,57 +2,57 @@ namespace Suin\RSSWriter; -use \Mockery; +use Mockery; class FeedTest extends \XoopsUnit\TestCase { - private $channelInterface = '\Suin\RSSWriter\ChannelInterface'; + private $channelInterface = '\Suin\RSSWriter\ChannelInterface'; - public function testAddChannel() - { - $channel = Mockery::mock($this->channelInterface); - $feed = new Feed(); - $this->assertSame($feed, $feed->addChannel($channel)); - $this->assertAttributeSame(array($channel), 'channels', $feed); - } + public function testAddChannel() + { + $channel = Mockery::mock($this->channelInterface); + $feed = new Feed(); + $this->assertSame($feed, $feed->addChannel($channel)); + $this->assertAttributeSame(array($channel), 'channels', $feed); + } - public function testRender() - { - $feed = new Feed(); - $xml1 = new SimpleXMLElement('channel1'); - $xml2 = new SimpleXMLElement('channel2'); - $xml3 = new SimpleXMLElement('channel3'); - $channel1 = $this->getMock($this->channelInterface); - $channel1->expects($this->once())->method('asXML')->will($this->returnValue($xml1)); - $channel2 = $this->getMock($this->channelInterface); - $channel2->expects($this->once())->method('asXML')->will($this->returnValue($xml2)); - $channel3 = $this->getMock($this->channelInterface); - $channel3->expects($this->once())->method('asXML')->will($this->returnValue($xml3)); - $this->reveal($feed)->attr('channels', array($channel1, $channel2, $channel3)); - $expect = ' + public function testRender() + { + $feed = new Feed(); + $xml1 = new SimpleXMLElement('channel1'); + $xml2 = new SimpleXMLElement('channel2'); + $xml3 = new SimpleXMLElement('channel3'); + $channel1 = $this->getMock($this->channelInterface); + $channel1->expects($this->once())->method('asXML')->will($this->returnValue($xml1)); + $channel2 = $this->getMock($this->channelInterface); + $channel2->expects($this->once())->method('asXML')->will($this->returnValue($xml2)); + $channel3 = $this->getMock($this->channelInterface); + $channel3->expects($this->once())->method('asXML')->will($this->returnValue($xml3)); + $this->reveal($feed)->attr('channels', array($channel1, $channel2, $channel3)); + $expect = ' channel1 channel2 channel3 '; - $this->assertXmlStringEqualsXmlString($expect, $feed->render()); - } + $this->assertXmlStringEqualsXmlString($expect, $feed->render()); + } - public function testRender_with_japanese() - { - $feed = new Feed(); - $xml1 = new SimpleXMLElement('日本語1'); - $xml2 = new SimpleXMLElement('日本語2'); - $xml3 = new SimpleXMLElement('日本語3'); - $channel1 = $this->getMock($this->channelInterface); - $channel1->expects($this->once())->method('asXML')->will($this->returnValue($xml1)); - $channel2 = $this->getMock($this->channelInterface); - $channel2->expects($this->once())->method('asXML')->will($this->returnValue($xml2)); - $channel3 = $this->getMock($this->channelInterface); - $channel3->expects($this->once())->method('asXML')->will($this->returnValue($xml3)); - $this->reveal($feed)->attr('channels', array($channel1, $channel2, $channel3)); - $expect = <<< 'XML' + public function testRender_with_japanese() + { + $feed = new Feed(); + $xml1 = new SimpleXMLElement('日本語1'); + $xml2 = new SimpleXMLElement('日本語2'); + $xml3 = new SimpleXMLElement('日本語3'); + $channel1 = $this->getMock($this->channelInterface); + $channel1->expects($this->once())->method('asXML')->will($this->returnValue($xml1)); + $channel2 = $this->getMock($this->channelInterface); + $channel2->expects($this->once())->method('asXML')->will($this->returnValue($xml2)); + $channel3 = $this->getMock($this->channelInterface); + $channel3->expects($this->once())->method('asXML')->will($this->returnValue($xml3)); + $this->reveal($feed)->attr('channels', array($channel1, $channel2, $channel3)); + $expect = <<< 'XML' @@ -67,30 +67,30 @@ class FeedTest extends \XoopsUnit\TestCase XML; - $this->assertSame($expect, $feed->render()); + $this->assertSame($expect, $feed->render()); - } + } - public function test__toString() - { - $feed = new Feed(); - $xml1 = new SimpleXMLElement('channel1'); - $xml2 = new SimpleXMLElement('channel2'); - $xml3 = new SimpleXMLElement('channel3'); - $channel1 = $this->getMock($this->channelInterface); - $channel1->expects($this->once())->method('asXML')->will($this->returnValue($xml1)); - $channel2 = $this->getMock($this->channelInterface); - $channel2->expects($this->once())->method('asXML')->will($this->returnValue($xml2)); - $channel3 = $this->getMock($this->channelInterface); - $channel3->expects($this->once())->method('asXML')->will($this->returnValue($xml3)); - $this->reveal($feed)->attr('channels', array($channel1, $channel2, $channel3)); - $expect = ' + public function test__toString() + { + $feed = new Feed(); + $xml1 = new SimpleXMLElement('channel1'); + $xml2 = new SimpleXMLElement('channel2'); + $xml3 = new SimpleXMLElement('channel3'); + $channel1 = $this->getMock($this->channelInterface); + $channel1->expects($this->once())->method('asXML')->will($this->returnValue($xml1)); + $channel2 = $this->getMock($this->channelInterface); + $channel2->expects($this->once())->method('asXML')->will($this->returnValue($xml2)); + $channel3 = $this->getMock($this->channelInterface); + $channel3->expects($this->once())->method('asXML')->will($this->returnValue($xml3)); + $this->reveal($feed)->attr('channels', array($channel1, $channel2, $channel3)); + $expect = ' channel1 channel2 channel3 '; - $this->assertXmlStringEqualsXmlString($expect, $feed); - } + $this->assertXmlStringEqualsXmlString($expect, $feed); + } } diff --git a/system/vendor/suin/php-rss-writer/Tests/Suin/RSSWriter/ItemTest.php b/system/vendor/suin/php-rss-writer/Tests/Suin/RSSWriter/ItemTest.php index b9bfd14..7318256 100644 --- a/system/vendor/suin/php-rss-writer/Tests/Suin/RSSWriter/ItemTest.php +++ b/system/vendor/suin/php-rss-writer/Tests/Suin/RSSWriter/ItemTest.php @@ -2,131 +2,141 @@ namespace Suin\RSSWriter; -class ItemTest extends \XoopsUnit\TestCase +use XoopsUnit\TestCase; + +class ItemTest extends TestCase { - private $channelInterface = '\Suin\RSSWriter\ChannelInterface'; - - public function testTitle() - { - $title = uniqid(); - $item = new Item(); - $this->assertSame($item, $item->title($title)); - $this->assertAttributeSame($title, 'title', $item); - } - - public function testUrl() - { - $url = uniqid(); - $item = new Item(); - $this->assertSame($item, $item->url($url)); - $this->assertAttributeSame($url, 'url', $item); - } - - public function testDescription() - { - $description = uniqid(); - $item = new Item(); - $this->assertSame($item, $item->description($description)); - $this->assertAttributeSame($description, 'description', $item); - } - - public function testCategory() - { - $category = uniqid(); - $item = new Item(); - $this->assertSame($item, $item->category($category)); - $this->assertAttributeSame(array( - array($category, null), - ), 'categories', $item); - } - - public function testCategory_with_domain() - { - $category = uniqid(); - $domain = uniqid(); - $item = new Item(); - $this->assertSame($item, $item->category($category, $domain)); - $this->assertAttributeSame(array( - array($category, $domain), - ), 'categories', $item); - } - - public function testGuid() - { - $guid = uniqid(); - $item = new Item(); - $this->assertSame($item, $item->guid($guid)); - $this->assertAttributeSame($guid, 'guid', $item); - } - - public function testGuid_with_permalink() - { - $item = new Item(); - $item->guid('guid', true); - $this->assertAttributeSame(true, 'isPermalink', $item); - - $item->guid('guid', false); - $this->assertAttributeSame(false, 'isPermalink', $item); - - $item->guid('guid'); // default - $this->assertAttributeSame(false, 'isPermalink', $item); - } - - public function testPubDate() - { - $pubDate = mt_rand(1000000, 9999999); - $item = new Item(); - $this->assertSame($item, $item->pubDate($pubDate)); - $this->assertAttributeSame($pubDate, 'pubDate', $item); - } - - public function testAppendTo() - { - $item = new Item(); - $channel = $this->getMock($this->channelInterface); - $channel->expects($this->once())->method('addItem')->with($item); - $this->assertSame($item, $item->appendTo($channel)); - } - - public function testEnclosure() - { - $url = uniqid(); + private $channelInterface = '\Suin\RSSWriter\ChannelInterface'; + + public function testTitle() + { + $title = uniqid(); + $item = new Item(); + $this->assertSame($item, $item->title($title)); + $this->assertAttributeSame($title, 'title', $item); + } + + public function testUrl() + { + $url = uniqid(); + $item = new Item(); + $this->assertSame($item, $item->url($url)); + $this->assertAttributeSame($url, 'url', $item); + } + + public function testDescription() + { + $description = uniqid(); + $item = new Item(); + $this->assertSame($item, $item->description($description)); + $this->assertAttributeSame($description, 'description', $item); + } + + public function testCategory() + { + $category = uniqid(); + $item = new Item(); + $this->assertSame($item, $item->category($category)); + $this->assertAttributeSame(array( + array($category, null), + ), 'categories', $item); + } + + public function testCategory_with_domain() + { + $category = uniqid(); + $domain = uniqid(); + $item = new Item(); + $this->assertSame($item, $item->category($category, $domain)); + $this->assertAttributeSame(array( + array($category, $domain), + ), 'categories', $item); + } + + public function testGuid() + { + $guid = uniqid(); + $item = new Item(); + $this->assertSame($item, $item->guid($guid)); + $this->assertAttributeSame($guid, 'guid', $item); + } + + public function testGuid_with_permalink() + { + $item = new Item(); + $item->guid('guid', true); + $this->assertAttributeSame(true, 'isPermalink', $item); + + $item->guid('guid', false); + $this->assertAttributeSame(false, 'isPermalink', $item); + + $item->guid('guid'); // default + $this->assertAttributeSame(false, 'isPermalink', $item); + } + + public function testPubDate() + { + $pubDate = mt_rand(1000000, 9999999); + $item = new Item(); + $this->assertSame($item, $item->pubDate($pubDate)); + $this->assertAttributeSame($pubDate, 'pubDate', $item); + } + + public function testAppendTo() + { + $item = new Item(); + $channel = $this->getMock($this->channelInterface); + $channel->expects($this->once())->method('addItem')->with($item); + $this->assertSame($item, $item->appendTo($channel)); + } + + public function testEnclosure() + { + $url = uniqid(); $enclosure = array('url' => $url, 'length' => 0, 'type' => 'audio/mpeg'); - $item = new Item(); - $this->assertSame($item, $item->enclosure($url)); - $this->assertAttributeSame($enclosure, 'enclosure', $item); - } - - public function testAsXML() - { - $now = time(); - $nowString = date(DATE_RSS, $now); - - $data = array( - 'title' => "Venice Film Festival Tries to Quit Sinking", - 'url' => 'http://nytimes.com/2004/12/07FEST.html', - 'description' => "Some of the most heated chatter at the Venice Film Festival this week was about the way that the arrival of the stars at the Palazzo del Cinema was being staged.", - 'categories' => array( - array("Grateful Dead", null), - array("MSFT", 'http://www.fool.com/cusips'), - ), - 'guid' => "http://inessential.com/2002/09/01.php#a2", - 'isPermalink' => true, - 'pubDate' => $now, + $item = new Item(); + $this->assertSame($item, $item->enclosure($url)); + $this->assertAttributeSame($enclosure, 'enclosure', $item); + } + + public function testAuthor() + { + $author = uniqid(); + $item = new Item(); + $this->assertSame($item, $item->author($author)); + $this->assertAttributeSame($author, 'author', $item); + } + + public function testAsXML() + { + $now = time(); + $nowString = date(DATE_RSS, $now); + + $data = array( + 'title' => "Venice Film Festival Tries to Quit Sinking", + 'url' => 'http://nytimes.com/2004/12/07FEST.html', + 'description' => "Some of the most heated chatter at the Venice Film Festival this week was about the way that the arrival of the stars at the Palazzo del Cinema was being staged.", + 'categories' => array( + array("Grateful Dead", null), + array("MSFT", 'http://www.fool.com/cusips'), + ), + 'guid' => "http://inessential.com/2002/09/01.php#a2", + 'isPermalink' => true, + 'pubDate' => $now, 'enclosure' => array( - 'url' => 'http://link-to-audio-file.com/test.mp3', + 'url' => 'http://link-to-audio-file.com/test.mp3', 'length' => 4992, - 'type' => 'audio/mpeg') - ); + 'type' => 'audio/mpeg'), + 'author' => 'Hidehito Nozawa aka Suin' + ); - $item = new Item(); + $item = new Item(); - foreach ( $data as $key => $value ) - { - $this->reveal($item)->attr($key, $value); - } + foreach ($data as $key => $value) { + $this->reveal($item)->attr($key, $value); + } - $expect =" + $expect = " {$data['title']} {$data['url']} @@ -135,31 +145,28 @@ class ItemTest extends \XoopsUnit\TestCase {$data['categories'][1][0]} {$data['guid']} {$nowString} - + + {$data['author']} "; - $this->assertXmlStringEqualsXmlString($expect, $item->asXML()->asXML()); - } - - public function testAsXML_test_Japanese() - { - $now = time(); - $nowString = date(DATE_RSS, $now); + $this->assertXmlStringEqualsXmlString($expect, $item->asXML()->asXML()); + } - $data = array( - 'title' => "Venice Film Festival", - 'url' => 'http://nytimes.com/2004/12/07FEST.html', - 'description' => "Some of the most heated chatter at the Venice Film Festival this week was about the way that the arrival of the stars at the Palazzo del Cinema was being staged.", - ); + public function testAsXML_test_Japanese() + { + $data = array( + 'title' => "Venice Film Festival", + 'url' => 'http://nytimes.com/2004/12/07FEST.html', + 'description' => "Some of the most heated chatter at the Venice Film Festival this week was about the way that the arrival of the stars at the Palazzo del Cinema was being staged.", + ); - $item = new Item(); + $item = new Item(); - foreach ( $data as $key => $value ) - { - $this->reveal($item)->attr($key, $value); - } + foreach ($data as $key => $value) { + $this->reveal($item)->attr($key, $value); + } - $expect = " + $expect = " {$data['title']} {$data['url']} @@ -167,34 +174,34 @@ class ItemTest extends \XoopsUnit\TestCase "; - $this->assertXmlStringEqualsXmlString($expect, $item->asXML()->asXML()); - } - - public function test_with_amp() - { - $item = new Item(); - $item - ->title('test&test') - ->url('url&url') - ->description('desc&desc'); - $expect = ' + $this->assertXmlStringEqualsXmlString($expect, $item->asXML()->asXML()); + } + + public function test_with_amp() + { + $item = new Item(); + $item + ->title('test&test') + ->url('url&url') + ->description('desc&desc'); + $expect = ' test&testurl&urldesc&desc '; - $this->assertSame($expect, $item->asXML()->asXML()); - } - - public function test_fail_safe_against_invalid_string() - { - $item = new Item(); - $item - ->title("test\0test") - ->url("url\0test") - ->description("desc\0desc"); - $expect = ' + $this->assertSame($expect, $item->asXML()->asXML()); + } + + public function test_fail_safe_against_invalid_string() + { + $item = new Item(); + $item + ->title("test\0test") + ->url("url\0test") + ->description("desc\0desc"); + $expect = ' testurldesc '; - $this->assertSame($expect, $item->asXML()->asXML()); - } + $this->assertSame($expect, $item->asXML()->asXML()); + } } diff --git a/system/vendor/suin/php-rss-writer/Tests/composer.json b/system/vendor/suin/php-rss-writer/Tests/composer.json index 2303f08..400e9db 100644 --- a/system/vendor/suin/php-rss-writer/Tests/composer.json +++ b/system/vendor/suin/php-rss-writer/Tests/composer.json @@ -1,8 +1,4 @@ { - "config": { - "bin-dir": ".", - "vendor-dir": "Vendor" - }, "require": { "php": ">=5.3.2", "EHER/PHPUnit": ">=1.6", diff --git a/system/vendor/suin/php-rss-writer/Tests/phpunit.xml.dist b/system/vendor/suin/php-rss-writer/Tests/phpunit.xml.dist index 08d42e4..906121d 100644 --- a/system/vendor/suin/php-rss-writer/Tests/phpunit.xml.dist +++ b/system/vendor/suin/php-rss-writer/Tests/phpunit.xml.dist @@ -20,23 +20,21 @@ highlight="false" lowUpperBound="35" highLowerBound="70" /> - - ../Source - + ../src ../Public/index.php - ../Source + ../src - ../Vendor + ../vendor - + diff --git a/system/vendor/suin/php-rss-writer/composer.json b/system/vendor/suin/php-rss-writer/composer.json index 82e2123..dcffdb7 100644 --- a/system/vendor/suin/php-rss-writer/composer.json +++ b/system/vendor/suin/php-rss-writer/composer.json @@ -2,7 +2,7 @@ "name": "suin/php-rss-writer", "type": "library", "description": "Yet another simple RSS writer library for PHP 5.3 or later.", - "keywords": ["rss", "generator", "writer", "feed"], + "keywords": ["rss", "generator", "writer", "feed", "php"], "homepage": "https://github.com/suin/php-rss-writer", "license": "MIT", "authors": [ @@ -15,6 +15,6 @@ "php": ">=5.3.0" }, "autoload": { - "psr-0": { "Suin\\RSSWriter": "Source" } + "psr-0": { "Suin\\RSSWriter": "src" } } } diff --git a/system/vendor/suin/php-rss-writer/examples/simple-feed.php b/system/vendor/suin/php-rss-writer/examples/simple-feed.php new file mode 100644 index 0000000..7e12210 --- /dev/null +++ b/system/vendor/suin/php-rss-writer/examples/simple-feed.php @@ -0,0 +1,37 @@ +title("Channel Title") + ->description("Channel Description") + ->url('http://blog.example.com') + ->language('en-US') + ->copyright('Copyright 2012, Foo Bar') + ->pubDate(strtotime('Tue, 21 Aug 2012 19:50:37 +0900')) + ->lastBuildDate(strtotime('Tue, 21 Aug 2012 19:50:37 +0900')) + ->ttl(60) + ->appendTo($feed); + +$item = new Item(); +$item + ->title("Blog Entry Title") + ->description("
Blog body
") + ->url('http://blog.example.com/2012/08/21/blog-entry/') + ->pubDate(strtotime('Tue, 21 Aug 2012 19:50:37 +0900')) + ->guid('http://blog.example.com/2012/08/21/blog-entry/', true) + ->appendTo($channel); + + +echo $feed; // or echo $feed->render(); \ No newline at end of file diff --git a/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/Channel.php b/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/Channel.php new file mode 100644 index 0000000..0c97f92 --- /dev/null +++ b/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/Channel.php @@ -0,0 +1,193 @@ +title = $title; + return $this; + } + + /** + * Set channel URL + * @param string $url + * @return $this + */ + public function url($url) + { + $this->url = $url; + return $this; + } + + /** + * Set channel description + * @param string $description + * @return $this + */ + public function description($description) + { + $this->description = $description; + return $this; + } + + /** + * Set ISO639 language code + * + * The language the channel is written in. This allows aggregators to group all + * Italian language sites, for example, on a single page. A list of allowable + * values for this element, as provided by Netscape, is here. You may also use + * values defined by the W3C. + * + * @param string $language + * @return $this + */ + public function language($language) + { + $this->language = $language; + return $this; + } + + /** + * Set channel copyright + * @param string $copyright + * @return $this + */ + public function copyright($copyright) + { + $this->copyright = $copyright; + return $this; + } + + /** + * Set channel published date + * @param int $pubDate Unix timestamp + * @return $this + */ + public function pubDate($pubDate) + { + $this->pubDate = $pubDate; + return $this; + } + + /** + * Set channel last build date + * @param int $lastBuildDate Unix timestamp + * @return $this + */ + public function lastBuildDate($lastBuildDate) + { + $this->lastBuildDate = $lastBuildDate; + return $this; + } + + /** + * Set channel ttl (minutes) + * @param int $ttl + * @return $this + */ + public function ttl($ttl) + { + $this->ttl = $ttl; + return $this; + } + + /** + * Add item object + * @param ItemInterface $item + * @return $this + */ + public function addItem(ItemInterface $item) + { + $this->items[] = $item; + return $this; + } + + /** + * Append to feed + * @param FeedInterface $feed + * @return $this + */ + public function appendTo(FeedInterface $feed) + { + $feed->addChannel($this); + return $this; + } + + /** + * Return XML object + * @return SimpleXMLElement + */ + public function asXML() + { + $xml = new SimpleXMLElement('', LIBXML_NOERROR | LIBXML_ERR_NONE | LIBXML_ERR_FATAL); + $xml->addChild('title', $this->title); + $xml->addChild('link', $this->url); + $xml->addChild('description', $this->description); + + if ($this->language !== null) { + $xml->addChild('language', $this->language); + } + + if ($this->copyright !== null) { + $xml->addChild('copyright', $this->copyright); + } + + if ($this->pubDate !== null) { + $xml->addChild('pubDate', date(DATE_RSS, $this->pubDate)); + } + + if ($this->lastBuildDate !== null) { + $xml->addChild('lastBuildDate', date(DATE_RSS, $this->lastBuildDate)); + } + + if ($this->ttl !== null) { + $xml->addChild('ttl', $this->ttl); + } + + foreach ($this->items as $item) { + $toDom = dom_import_simplexml($xml); + $fromDom = dom_import_simplexml($item->asXML()); + $toDom->appendChild($toDom->ownerDocument->importNode($fromDom, true)); + } + + return $xml; + } +} diff --git a/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/ChannelInterface.php b/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/ChannelInterface.php new file mode 100644 index 0000000..445ba0d --- /dev/null +++ b/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/ChannelInterface.php @@ -0,0 +1,92 @@ +channels[] = $channel; + return $this; + } + + /** + * Render XML + * @return string + */ + public function render() + { + $xml = new SimpleXMLElement('', LIBXML_NOERROR | LIBXML_ERR_NONE | LIBXML_ERR_FATAL); + + foreach ($this->channels as $channel) { + $toDom = dom_import_simplexml($xml); + $fromDom = dom_import_simplexml($channel->asXML()); + $toDom->appendChild($toDom->ownerDocument->importNode($fromDom, true)); + } + + $dom = new DOMDocument('1.0', 'UTF-8'); + $dom->appendChild($dom->importNode(dom_import_simplexml($xml), true)); + $dom->formatOutput = true; + return $dom->saveXML(); + } + + /** + * Render XML + * @return string + */ + public function __toString() + { + return $this->render(); + } +} diff --git a/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/FeedInterface.php b/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/FeedInterface.php new file mode 100644 index 0000000..afaf518 --- /dev/null +++ b/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/FeedInterface.php @@ -0,0 +1,29 @@ +title = $title; + return $this; + } + + public function url($url) + { + $this->url = $url; + return $this; + } + + public function description($description) + { + $this->description = $description; + return $this; + } + + public function category($name, $domain = null) + { + $this->categories[] = array($name, $domain); + return $this; + } + + public function guid($guid, $isPermalink = false) + { + $this->guid = $guid; + $this->isPermalink = $isPermalink; + return $this; + } + + public function pubDate($pubDate) + { + $this->pubDate = $pubDate; + return $this; + } + + public function enclosure($url, $length = 0, $type = 'audio/mpeg') + { + $this->enclosure = array('url' => $url, 'length' => $length, 'type' => $type); + return $this; + } + + public function author($author) + { + $this->author = $author; + return $this; + } + + public function appendTo(ChannelInterface $channel) + { + $channel->addItem($this); + return $this; + } + + public function asXML() + { + $xml = new SimpleXMLElement('', LIBXML_NOERROR | LIBXML_ERR_NONE | LIBXML_ERR_FATAL); + $xml->addChild('title', $this->title); + $xml->addChild('link', $this->url); + $xml->addChild('description', $this->description); + + foreach ($this->categories as $category) { + $element = $xml->addChild('category', $category[0]); + + if (isset($category[1])) { + $element->addAttribute('domain', $category[1]); + } + } + + if ($this->guid) { + $guid = $xml->addChild('guid', $this->guid); + + if ($this->isPermalink) { + $guid->addAttribute('isPermaLink', 'true'); + } + } + + if ($this->pubDate !== null) { + $xml->addChild('pubDate', date(DATE_RSS, $this->pubDate)); + } + + if (is_array($this->enclosure) && (count($this->enclosure) == 3)) { + $element = $xml->addChild('enclosure'); + $element->addAttribute('url', $this->enclosure['url']); + $element->addAttribute('type', $this->enclosure['type']); + + if ($this->enclosure['length']) { + $element->addAttribute('length', $this->enclosure['length']); + } + } + + if (!empty($this->author)) { + $xml->addChild('author', $this->author); + } + + return $xml; + } +} diff --git a/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/ItemInterface.php b/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/ItemInterface.php new file mode 100644 index 0000000..744ffa1 --- /dev/null +++ b/system/vendor/suin/php-rss-writer/src/Suin/RSSWriter/ItemInterface.php @@ -0,0 +1,83 @@ +