diff options
| author | Frédéric Guillot <fred@kanboard.net> | 2018-04-20 16:05:50 -0700 |
|---|---|---|
| committer | Frédéric Guillot <fred@kanboard.net> | 2018-04-20 16:05:50 -0700 |
| commit | bb406d57b1c1ad2736774be18b2f7b4d31abcf63 (patch) | |
| tree | a4a89775f5519c178679f99115dd3b84efd051cb | |
| parent | 32a95ce5ea08ec5b263224865b0695c7459928b0 (diff) | |
Update Parsedown library
123 files changed, 372 insertions, 1225 deletions
diff --git a/app/Core/Markdown.php b/app/Core/Markdown.php index 4487bf2a..b8fe618f 100644 --- a/app/Core/Markdown.php +++ b/app/Core/Markdown.php @@ -91,7 +91,7 @@ class Markdown extends Parsedown $user = $this->container['userCacheDecorator']->getByUsername($username); if (! empty($user)) { - $url = $this->container['helper']->url->href('UserViewController', 'profile', array('user_id' => $user['id'])); + $url = $this->container['helper']->url->to('UserViewController', 'profile', array('user_id' => $user['id'])); return array( 'extent' => strlen($username) + 1, @@ -124,14 +124,13 @@ class Markdown extends Parsedown $token = $this->container['memoryCache']->proxy($this->container['taskFinderModel'], 'getProjectToken', $task_id); if (! empty($token)) { - return $this->container['helper']->url->href( + return $this->container['helper']->url->to( 'TaskViewController', 'readonly', array( 'token' => $token, 'task_id' => $task_id, ), - false, '', true ); @@ -140,7 +139,7 @@ class Markdown extends Parsedown return ''; } - return $this->container['helper']->url->href( + return $this->container['helper']->url->to( 'TaskViewController', 'show', array('task_id' => $task_id) diff --git a/composer.json b/composer.json index 95a6e73f..45367a19 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "ext-session" : "*", "christian-riesen/otp" : "1.4.3", "eluceo/ical": "0.10.1", - "erusev/parsedown" : "1.6.0", + "erusev/parsedown" : "1.7.1", "fguillot/json-rpc" : "1.2.1", "fguillot/picodb" : "v1.0.18", "paragonie/random_compat": "2.0.11", diff --git a/composer.lock b/composer.lock index 31af6394..b6da3a71 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "bc94bc536e82cb9a522675ff6bed4dad", + "content-hash": "6bb506d8bbacef8a6eb542c564c5a3ab", "packages": [ { "name": "aferrandini/phpqrcode", @@ -48,6 +48,7 @@ "php", "qrcode" ], + "abandoned": "endroid/qr-code", "time": "2013-07-08T09:39:08+00:00" }, { @@ -210,18 +211,25 @@ }, { "name": "erusev/parsedown", - "version": "1.6.0", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7" + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7", - "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", "shasum": "" }, + "require": { + "ext-mbstring": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35" + }, "type": "library", "autoload": { "psr-0": { @@ -245,7 +253,7 @@ "markdown", "parser" ], - "time": "2015-10-04T16:44:32+00:00" + "time": "2018-03-08T01:11:30+00:00" }, { "name": "fguillot/json-rpc", @@ -817,16 +825,16 @@ }, { "name": "symfony/finder", - "version": "v3.4.7", + "version": "v3.4.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "7a2e1299cc0c4162996f18e347b6356729a55317" + "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/7a2e1299cc0c4162996f18e347b6356729a55317", - "reference": "7a2e1299cc0c4162996f18e347b6356729a55317", + "url": "https://api.github.com/repos/symfony/finder/zipball/bd14efe8b1fabc4de82bf50dce62f05f9a102433", + "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433", "shasum": "" }, "require": { @@ -862,7 +870,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-03-28T18:23:39+00:00" + "time": "2018-04-04T05:07:11+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -1172,23 +1180,23 @@ }, { "name": "phpspec/prophecy", - "version": "1.7.5", + "version": "1.7.6", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401" + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401", - "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", - "sebastian/comparator": "^1.1|^2.0", + "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { @@ -1231,7 +1239,7 @@ "spy", "stub" ], - "time": "2018-02-19T10:16:54+00:00" + "time": "2018-04-18T13:57:24+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 0c4445b7..2f61b8ef 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -691,7 +691,6 @@ return array( 'PHPQRCode\\QRstr' => $vendorDir . '/aferrandini/phpqrcode/lib/PHPQRCode/QRstr.php', 'PHPQRCode\\QRtools' => $vendorDir . '/aferrandini/phpqrcode/lib/PHPQRCode/QRtools.php', 'Parsedown' => $vendorDir . '/erusev/parsedown/Parsedown.php', - 'ParsedownTest' => $vendorDir . '/erusev/parsedown/test/ParsedownTest.php', 'PicoDb\\Builder\\BaseBuilder' => $vendorDir . '/fguillot/picodb/lib/PicoDb/Builder/BaseBuilder.php', 'PicoDb\\Builder\\ConditionBuilder' => $vendorDir . '/fguillot/picodb/lib/PicoDb/Builder/ConditionBuilder.php', 'PicoDb\\Builder\\InsertBuilder' => $vendorDir . '/fguillot/picodb/lib/PicoDb/Builder/InsertBuilder.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index bca69b0d..09d44e35 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -817,7 +817,6 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e 'PHPQRCode\\QRstr' => __DIR__ . '/..' . '/aferrandini/phpqrcode/lib/PHPQRCode/QRstr.php', 'PHPQRCode\\QRtools' => __DIR__ . '/..' . '/aferrandini/phpqrcode/lib/PHPQRCode/QRtools.php', 'Parsedown' => __DIR__ . '/..' . '/erusev/parsedown/Parsedown.php', - 'ParsedownTest' => __DIR__ . '/..' . '/erusev/parsedown/test/ParsedownTest.php', 'PicoDb\\Builder\\BaseBuilder' => __DIR__ . '/..' . '/fguillot/picodb/lib/PicoDb/Builder/BaseBuilder.php', 'PicoDb\\Builder\\ConditionBuilder' => __DIR__ . '/..' . '/fguillot/picodb/lib/PicoDb/Builder/ConditionBuilder.php', 'PicoDb\\Builder\\InsertBuilder' => __DIR__ . '/..' . '/fguillot/picodb/lib/PicoDb/Builder/InsertBuilder.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 2423a5dd..92bd01a7 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -43,7 +43,8 @@ "barcode", "php", "qrcode" - ] + ], + "abandoned": "endroid/qr-code" }, { "name": "christian-riesen/base32", @@ -210,47 +211,6 @@ ] }, { - "name": "erusev/parsedown", - "version": "1.6.0", - "version_normalized": "1.6.0.0", - "source": { - "type": "git", - "url": "https://github.com/erusev/parsedown.git", - "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7", - "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7", - "shasum": "" - }, - "time": "2015-10-04T16:44:32+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "Parsedown": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Emanuil Rusev", - "email": "hello@erusev.com", - "homepage": "http://erusev.com" - } - ], - "description": "Parser for Markdown.", - "homepage": "http://parsedown.org", - "keywords": [ - "markdown", - "parser" - ] - }, - { "name": "fguillot/json-rpc", "version": "v1.2.1", "version_normalized": "1.2.1.0", @@ -902,24 +862,72 @@ "homepage": "https://github.com/fguillot/picoDb" }, { + "name": "erusev/parsedown", + "version": "1.7.1", + "version_normalized": "1.7.1.0", + "source": { + "type": "git", + "url": "https://github.com/erusev/parsedown.git", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35" + }, + "time": "2018-03-08T01:11:30+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Parsedown": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Emanuil Rusev", + "email": "hello@erusev.com", + "homepage": "http://erusev.com" + } + ], + "description": "Parser for Markdown.", + "homepage": "http://parsedown.org", + "keywords": [ + "markdown", + "parser" + ] + }, + { "name": "symfony/finder", - "version": "v3.4.7", - "version_normalized": "3.4.7.0", + "version": "v3.4.8", + "version_normalized": "3.4.8.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "7a2e1299cc0c4162996f18e347b6356729a55317" + "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/7a2e1299cc0c4162996f18e347b6356729a55317", - "reference": "7a2e1299cc0c4162996f18e347b6356729a55317", + "url": "https://api.github.com/repos/symfony/finder/zipball/bd14efe8b1fabc4de82bf50dce62f05f9a102433", + "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8" }, - "time": "2018-03-28T18:23:39+00:00", + "time": "2018-04-04T05:07:11+00:00", "type": "library", "extra": { "branch-alias": { diff --git a/vendor/erusev/parsedown/.travis.yml b/vendor/erusev/parsedown/.travis.yml deleted file mode 100644 index 5df49dcb..00000000 --- a/vendor/erusev/parsedown/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -language: php - -php: - - 7.0 - - 5.6 - - 5.5 - - 5.4 - - 5.3 - - hhvm - - hhvm-nightly - -matrix: - fast_finish: true - allow_failures: - - php: 7.0 - - php: hhvm-nightly diff --git a/vendor/erusev/parsedown/LICENSE.txt b/vendor/erusev/parsedown/LICENSE.txt index baca86f5..8e7c764d 100644 --- a/vendor/erusev/parsedown/LICENSE.txt +++ b/vendor/erusev/parsedown/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2013 Emanuil Rusev, erusev.com +Copyright (c) 2013-2018 Emanuil Rusev, erusev.com 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 @@ -17,4 +17,4 @@ 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.
\ No newline at end of file +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/erusev/parsedown/Parsedown.php b/vendor/erusev/parsedown/Parsedown.php index c8c92a39..87d612ab 100755..100644 --- a/vendor/erusev/parsedown/Parsedown.php +++ b/vendor/erusev/parsedown/Parsedown.php @@ -17,7 +17,7 @@ class Parsedown { # ~ - const version = '1.6.0'; + const version = '1.7.1'; # ~ @@ -75,6 +75,32 @@ class Parsedown protected $urlsLinked = true; + function setSafeMode($safeMode) + { + $this->safeMode = (bool) $safeMode; + + return $this; + } + + protected $safeMode; + + protected $safeLinksWhitelist = array( + 'http://', + 'https://', + 'ftp://', + 'ftps://', + 'mailto:', + 'data:image/png;base64,', + 'data:image/gif;base64,', + 'data:image/jpeg;base64,', + 'irc:', + 'ircs:', + 'git:', + 'ssh:', + 'news:', + 'steam:', + ); + # # Lines # @@ -115,7 +141,7 @@ class Parsedown # Blocks # - private function lines(array $lines) + protected function lines(array $lines) { $CurrentBlock = null; @@ -175,7 +201,7 @@ class Parsedown } else { - if (method_exists($this, 'block'.$CurrentBlock['type'].'Complete')) + if ($this->isBlockCompletable($CurrentBlock['type'])) { $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock); } @@ -216,7 +242,7 @@ class Parsedown $Block['identified'] = true; } - if (method_exists($this, 'block'.$blockType.'Continue')) + if ($this->isBlockContinuable($blockType)) { $Block['continuable'] = true; } @@ -245,7 +271,7 @@ class Parsedown # ~ - if (isset($CurrentBlock['continuable']) and method_exists($this, 'block'.$CurrentBlock['type'].'Complete')) + if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type'])) { $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock); } @@ -278,6 +304,16 @@ class Parsedown return $markup; } + protected function isBlockContinuable($Type) + { + return method_exists($this, 'block'.$Type.'Continue'); + } + + protected function isBlockCompletable($Type) + { + return method_exists($this, 'block'.$Type.'Complete'); + } + # # Code @@ -332,8 +368,6 @@ class Parsedown { $text = $Block['element']['text']['text']; - $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8'); - $Block['element']['text']['text'] = $text; return $Block; @@ -344,7 +378,7 @@ class Parsedown protected function blockComment($Line) { - if ($this->markupEscaped) + if ($this->markupEscaped or $this->safeMode) { return; } @@ -386,7 +420,7 @@ class Parsedown protected function blockFencedCode($Line) { - if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches)) + if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([^`]+)?[ ]*$/', $Line['text'], $matches)) { $Element = array( 'name' => 'code', @@ -438,7 +472,7 @@ class Parsedown return $Block; } - $Block['element']['text']['text'] .= "\n".$Line['body'];; + $Block['element']['text']['text'] .= "\n".$Line['body']; return $Block; } @@ -447,8 +481,6 @@ class Parsedown { $text = $Block['element']['text']['text']; - $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8'); - $Block['element']['text']['text'] = $text; return $Block; @@ -505,6 +537,16 @@ class Parsedown ), ); + if($name === 'ol') + { + $listStart = stristr($matches[0], '.', true); + + if($listStart !== '1') + { + $Block['element']['attributes'] = array('start' => $listStart); + } + } + $Block['li'] = array( 'name' => 'li', 'handler' => 'li', @@ -527,6 +569,8 @@ class Parsedown { $Block['li']['text'] []= ''; + $Block['loose'] = true; + unset($Block['interrupted']); } @@ -575,6 +619,22 @@ class Parsedown } } + protected function blockListComplete(array $Block) + { + if (isset($Block['loose'])) + { + foreach ($Block['element']['text'] as &$li) + { + if (end($li['text']) !== '') + { + $li['text'] []= ''; + } + } + } + + return $Block; + } + # # Quote @@ -658,12 +718,12 @@ class Parsedown protected function blockMarkup($Line) { - if ($this->markupEscaped) + if ($this->markupEscaped or $this->safeMode) { return; } - if (preg_match('/^<(\w*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches)) + if (preg_match('/^<(\w[\w-]*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches)) { $element = strtolower($matches[1]); @@ -977,7 +1037,7 @@ class Parsedown # ~ # - public function line($text) + public function line($text, $nonNestables=array()) { $markup = ''; @@ -993,6 +1053,13 @@ class Parsedown foreach ($this->InlineTypes[$marker] as $inlineType) { + # check to see if the current inline type is nestable in the current context + + if ( ! empty($nonNestables) and in_array($inlineType, $nonNestables)) + { + continue; + } + $Inline = $this->{'inline'.$inlineType}($Excerpt); if ( ! isset($Inline)) @@ -1014,6 +1081,13 @@ class Parsedown $Inline['position'] = $markerPosition; } + # cause the new element to 'inherit' our non nestables + + foreach ($nonNestables as $non_nestable) + { + $Inline['element']['nonNestables'][] = $non_nestable; + } + # the text that comes before the inline $unmarkedText = substr($text, 0, $Inline['position']); @@ -1054,7 +1128,6 @@ class Parsedown if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(?<!'.$marker.')\1(?!'.$marker.')/s', $Excerpt['text'], $matches)) { $text = $matches[2]; - $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8'); $text = preg_replace("/[ ]*\n/", ' ', $text); return array( @@ -1173,6 +1246,7 @@ class Parsedown $Element = array( 'name' => 'a', 'handler' => 'line', + 'nonNestables' => array('Url', 'Link'), 'text' => null, 'attributes' => array( 'href' => null, @@ -1184,7 +1258,7 @@ class Parsedown $remainder = $Excerpt['text']; - if (preg_match('/\[((?:[^][]|(?R))*)\]/', $remainder, $matches)) + if (preg_match('/\[((?:[^][]++|(?R))*+)\]/', $remainder, $matches)) { $Element['text'] = $matches[1]; @@ -1197,7 +1271,7 @@ class Parsedown return; } - if (preg_match('/^[(]((?:[^ ()]|[(][^ )]+[)])+)(?:[ ]+("[^"]*"|\'[^\']*\'))?[)]/', $remainder, $matches)) + if (preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*"|\'[^\']*\'))?\s*[)]/', $remainder, $matches)) { $Element['attributes']['href'] = $matches[1]; @@ -1233,8 +1307,6 @@ class Parsedown $Element['attributes']['title'] = $Definition['title']; } - $Element['attributes']['href'] = str_replace(array('&', '<'), array('&', '<'), $Element['attributes']['href']); - return array( 'extent' => $extent, 'element' => $Element, @@ -1243,12 +1315,12 @@ class Parsedown protected function inlineMarkup($Excerpt) { - if ($this->markupEscaped or strpos($Excerpt['text'], '>') === false) + if ($this->markupEscaped or $this->safeMode or strpos($Excerpt['text'], '>') === false) { return; } - if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w*[ ]*>/s', $Excerpt['text'], $matches)) + if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w[\w-]*[ ]*>/s', $Excerpt['text'], $matches)) { return array( 'markup' => $matches[0], @@ -1264,7 +1336,7 @@ class Parsedown ); } - if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches)) + if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w[\w-]*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches)) { return array( 'markup' => $matches[0], @@ -1323,14 +1395,16 @@ class Parsedown if (preg_match('/\bhttps?:[\/]{2}[^\s<]+\b\/*/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE)) { + $url = $matches[0][0]; + $Inline = array( 'extent' => strlen($matches[0][0]), 'position' => $matches[0][1], 'element' => array( 'name' => 'a', - 'text' => $matches[0][0], + 'text' => $url, 'attributes' => array( - 'href' => $matches[0][0], + 'href' => $url, ), ), ); @@ -1343,7 +1417,7 @@ class Parsedown { if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $Excerpt['text'], $matches)) { - $url = str_replace(array('&', '<'), array('&', '<'), $matches[1]); + $url = $matches[1]; return array( 'extent' => strlen($matches[0]), @@ -1381,6 +1455,11 @@ class Parsedown protected function element(array $Element) { + if ($this->safeMode) + { + $Element = $this->sanitiseElement($Element); + } + $markup = '<'.$Element['name']; if (isset($Element['attributes'])) @@ -1392,7 +1471,7 @@ class Parsedown continue; } - $markup .= ' '.$name.'="'.$value.'"'; + $markup .= ' '.$name.'="'.self::escape($value).'"'; } } @@ -1400,13 +1479,18 @@ class Parsedown { $markup .= '>'; + if (!isset($Element['nonNestables'])) + { + $Element['nonNestables'] = array(); + } + if (isset($Element['handler'])) { - $markup .= $this->{$Element['handler']}($Element['text']); + $markup .= $this->{$Element['handler']}($Element['text'], $Element['nonNestables']); } else { - $markup .= $Element['text']; + $markup .= self::escape($Element['text'], true); } $markup .= '</'.$Element['name'].'>'; @@ -1465,10 +1549,77 @@ class Parsedown return $markup; } + protected function sanitiseElement(array $Element) + { + static $goodAttribute = '/^[a-zA-Z0-9][a-zA-Z0-9-_]*+$/'; + static $safeUrlNameToAtt = array( + 'a' => 'href', + 'img' => 'src', + ); + + if (isset($safeUrlNameToAtt[$Element['name']])) + { + $Element = $this->filterUnsafeUrlInAttribute($Element, $safeUrlNameToAtt[$Element['name']]); + } + + if ( ! empty($Element['attributes'])) + { + foreach ($Element['attributes'] as $att => $val) + { + # filter out badly parsed attribute + if ( ! preg_match($goodAttribute, $att)) + { + unset($Element['attributes'][$att]); + } + # dump onevent attribute + elseif (self::striAtStart($att, 'on')) + { + unset($Element['attributes'][$att]); + } + } + } + + return $Element; + } + + protected function filterUnsafeUrlInAttribute(array $Element, $attribute) + { + foreach ($this->safeLinksWhitelist as $scheme) + { + if (self::striAtStart($Element['attributes'][$attribute], $scheme)) + { + return $Element; + } + } + + $Element['attributes'][$attribute] = str_replace(':', '%3A', $Element['attributes'][$attribute]); + + return $Element; + } + # # Static Methods # + protected static function escape($text, $allowQuotes = false) + { + return htmlspecialchars($text, $allowQuotes ? ENT_NOQUOTES : ENT_QUOTES, 'UTF-8'); + } + + protected static function striAtStart($string, $needle) + { + $len = strlen($needle); + + if ($len > strlen($string)) + { + return false; + } + else + { + return strtolower(substr($string, 0, $len)) === strtolower($needle); + } + } + static function instance($name = 'default') { if (isset(self::$instances[$name])) @@ -1519,10 +1670,10 @@ class Parsedown 'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing', 'i', 'rp', 'del', 'code', 'strike', 'marquee', 'q', 'rt', 'ins', 'font', 'strong', - 's', 'tt', 'sub', 'mark', - 'u', 'xm', 'sup', 'nobr', - 'var', 'ruby', - 'wbr', 'span', - 'time', + 's', 'tt', 'kbd', 'mark', + 'u', 'xm', 'sub', 'nobr', + 'sup', 'ruby', + 'var', 'span', + 'wbr', 'time', ); } diff --git a/vendor/erusev/parsedown/README.md b/vendor/erusev/parsedown/README.md index 6f9f6498..b5d9ed2e 100644 --- a/vendor/erusev/parsedown/README.md +++ b/vendor/erusev/parsedown/README.md @@ -1,3 +1,5 @@ +> I also make [Caret](https://caret.io?ref=parsedown) - a Markdown editor for Mac and PC. + ## Parsedown [](https://travis-ci.org/erusev/parsedown) @@ -12,10 +14,12 @@ Better Markdown Parser in PHP ### Features +* One File +* No Dependencies * Super Fast -* [GitHub flavored](https://help.github.com/articles/github-flavored-markdown) * Extensible -* Tested in 5.3 to 5.6 +* [GitHub flavored](https://help.github.com/articles/github-flavored-markdown) +* Tested in 5.3 to 7.1 and in HHVM * [Markdown Extra extension](https://github.com/erusev/parsedown-extra) ### Installation @@ -32,11 +36,40 @@ echo $Parsedown->text('Hello _Parsedown_!'); # prints: <p>Hello <em>Parsedown</e More examples in [the wiki](https://github.com/erusev/parsedown/wiki/) and in [this video tutorial](http://youtu.be/wYZBY8DEikI). +### Security + +Parsedown is capable of escaping user-input within the HTML that it generates. Additionally Parsedown will apply sanitisation to additional scripting vectors (such as scripting link destinations) that are introduced by the markdown syntax itself. + +To tell Parsedown that it is processing untrusted user-input, use the following: +```php +$parsedown = new Parsedown; +$parsedown->setSafeMode(true); +``` + +If instead, you wish to allow HTML within untrusted user-input, but still want output to be free from XSS it is recommended that you make use of a HTML sanitiser that allows HTML tags to be whitelisted, like [HTML Purifier](http://htmlpurifier.org/). + +In both cases you should strongly consider employing defence-in-depth measures, like [deploying a Content-Security-Policy](https://scotthelme.co.uk/content-security-policy-an-introduction/) (a browser security feature) so that your page is likely to be safe even if an attacker finds a vulnerability in one of the first lines of defence above. + +#### Security of Parsedown Extensions + +Safe mode does not necessarily yield safe results when using extensions to Parsedown. Extensions should be evaluated on their own to determine their specific safety against XSS. + +### Escaping HTML +> ⚠️ **WARNING:** This method isn't safe from XSS! + +If you wish to escape HTML **in trusted input**, you can use the following: +```php +$parsedown = new Parsedown; +$parsedown->setMarkupEscaped(true); +``` + +Beware that this still allows users to insert unsafe scripting vectors, such as links like `[xss](javascript:alert%281%29)`. + ### Questions **How does Parsedown work?** -It tries to read Markdown like a human. First, it looks at the lines. It’s interested in how the lines start. This helps it recognise blocks. It knows, for example, that if a line start with a `-` then it perhaps belong to a list. Once it recognises the blocks, it continues to the content. As it reads, it watches out for special characters. This helps it recognise inline elements (or inlines). +It tries to read Markdown like a human. First, it looks at the lines. It’s interested in how the lines start. This helps it recognise blocks. It knows, for example, that if a line starts with a `-` then perhaps it belongs to a list. Once it recognises the blocks, it continues to the content. As it reads, it watches out for special characters. This helps it recognise inline elements (or inlines). We call this approach "line based". We believe that Parsedown is the first Markdown parser to use it. Since the release of Parsedown, other developers have used the same approach to develop other Markdown parsers in PHP and in other languages. @@ -46,12 +79,8 @@ It passes most of the CommonMark tests. Most of the tests that don't pass deal w **Who uses it?** -[phpDocumentor](http://www.phpdoc.org/), [October CMS](http://octobercms.com/), [Bolt CMS](http://bolt.cm/), [Kirby CMS](http://getkirby.com/), [Grav CMS](http://getgrav.org/), [Statamic CMS](http://www.statamic.com/), [RaspberryPi.org](http://www.raspberrypi.org/) and [more](https://www.versioneye.com/php/erusev:parsedown/references). +[Laravel Framework](https://laravel.com/), [Bolt CMS](http://bolt.cm/), [Grav CMS](http://getgrav.org/), [Herbie CMS](http://www.getherbie.org/), [Kirby CMS](http://getkirby.com/), [October CMS](http://octobercms.com/), [Pico CMS](http://picocms.org), [Statamic CMS](http://www.statamic.com/), [phpDocumentor](http://www.phpdoc.org/), [RaspberryPi.org](http://www.raspberrypi.org/), [Symfony demo](https://github.com/symfony/symfony-demo) and [more](https://packagist.org/packages/erusev/parsedown/dependents). **How can I help?** Use it, star it, share it and if you feel generous, [donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=528P3NZQMP8N2). - ---- - -You might also like [Caret](http://caret.io) - our Markdown editor for the desktop. diff --git a/vendor/erusev/parsedown/composer.json b/vendor/erusev/parsedown/composer.json index 1439b824..f8b40f8c 100644 --- a/vendor/erusev/parsedown/composer.json +++ b/vendor/erusev/parsedown/composer.json @@ -12,7 +12,22 @@ "homepage": "http://erusev.com" } ], + "require": { + "php": ">=5.3.0", + "ext-mbstring": "*" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35" + }, "autoload": { "psr-0": {"Parsedown": ""} + }, + "autoload-dev": { + "psr-0": { + "TestParsedown": "test/", + "ParsedownTest": "test/", + "CommonMarkTest": "test/", + "CommonMarkTestWeak": "test/" + } } -}
\ No newline at end of file +} diff --git a/vendor/erusev/parsedown/phpunit.xml.dist b/vendor/erusev/parsedown/phpunit.xml.dist deleted file mode 100644 index b2d5e9d4..00000000 --- a/vendor/erusev/parsedown/phpunit.xml.dist +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<phpunit bootstrap="test/bootstrap.php" colors="true"> - <testsuites> - <testsuite> - <file>test/ParsedownTest.php</file> - </testsuite> - </testsuites> -</phpunit>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/CommonMarkTest.php b/vendor/erusev/parsedown/test/CommonMarkTest.php deleted file mode 100644 index 9b8d1162..00000000 --- a/vendor/erusev/parsedown/test/CommonMarkTest.php +++ /dev/null @@ -1,74 +0,0 @@ -<?php - -/** - * Test Parsedown against the CommonMark spec. - * - * Some code based on the original JavaScript test runner by jgm. - * - * @link http://commonmark.org/ CommonMark - * @link http://git.io/8WtRvQ JavaScript test runner - */ -class CommonMarkTest extends PHPUnit_Framework_TestCase -{ - const SPEC_URL = 'https://raw.githubusercontent.com/jgm/stmd/master/spec.txt'; - - /** - * @dataProvider data - * @param $section - * @param $markdown - * @param $expectedHtml - */ - function test_($section, $markdown, $expectedHtml) - { - $Parsedown = new Parsedown(); - $Parsedown->setUrlsLinked(false); - - $actualHtml = $Parsedown->text($markdown); - $actualHtml = $this->normalizeMarkup($actualHtml); - - $this->assertEquals($expectedHtml, $actualHtml); - } - - function data() - { - $spec = file_get_contents(self::SPEC_URL); - $spec = strstr($spec, '<!-- END TESTS -->', true); - - $tests = array(); - $currentSection = ''; - - preg_replace_callback( - '/^\.\n([\s\S]*?)^\.\n([\s\S]*?)^\.$|^#{1,6} *(.*)$/m', - function($matches) use ( & $tests, & $currentSection, & $testCount) { - if (isset($matches[3]) and $matches[3]) { - $currentSection = $matches[3]; - } else { - $testCount++; - $markdown = $matches[1]; - $markdown = preg_replace('/→/', "\t", $markdown); - $expectedHtml = $matches[2]; - $expectedHtml = $this->normalizeMarkup($expectedHtml); - $tests []= array( - $currentSection, # section - $markdown, # markdown - $expectedHtml, # html - ); - } - }, - $spec - ); - - return $tests; - } - - private function normalizeMarkup($markup) - { - $markup = preg_replace("/\n+/", "\n", $markup); - $markup = preg_replace('/^\s+/m', '', $markup); - $markup = preg_replace('/^((?:<[\w]+>)+)\n/m', '$1', $markup); - $markup = preg_replace('/\n((?:<\/[\w]+>)+)$/m', '$1', $markup); - $markup = trim($markup); - - return $markup; - } -} diff --git a/vendor/erusev/parsedown/test/ParsedownTest.php b/vendor/erusev/parsedown/test/ParsedownTest.php deleted file mode 100644 index c922ab1f..00000000 --- a/vendor/erusev/parsedown/test/ParsedownTest.php +++ /dev/null @@ -1,159 +0,0 @@ -<?php - -class ParsedownTest extends PHPUnit_Framework_TestCase -{ - final function __construct($name = null, array $data = array(), $dataName = '') - { - $this->dirs = $this->initDirs(); - $this->Parsedown = $this->initParsedown(); - - parent::__construct($name, $data, $dataName); - } - - private $dirs, $Parsedown; - - /** - * @return array - */ - protected function initDirs() - { - $dirs []= dirname(__FILE__).'/data/'; - - return $dirs; - } - - /** - * @return Parsedown - */ - protected function initParsedown() - { - $Parsedown = new Parsedown(); - - return $Parsedown; - } - - /** - * @dataProvider data - * @param $test - * @param $dir - */ - function test_($test, $dir) - { - $markdown = file_get_contents($dir . $test . '.md'); - - $expectedMarkup = file_get_contents($dir . $test . '.html'); - - $expectedMarkup = str_replace("\r\n", "\n", $expectedMarkup); - $expectedMarkup = str_replace("\r", "\n", $expectedMarkup); - - $actualMarkup = $this->Parsedown->text($markdown); - - $this->assertEquals($expectedMarkup, $actualMarkup); - } - - function data() - { - $data = array(); - - foreach ($this->dirs as $dir) - { - $Folder = new DirectoryIterator($dir); - - foreach ($Folder as $File) - { - /** @var $File DirectoryIterator */ - - if ( ! $File->isFile()) - { - continue; - } - - $filename = $File->getFilename(); - - $extension = pathinfo($filename, PATHINFO_EXTENSION); - - if ($extension !== 'md') - { - continue; - } - - $basename = $File->getBasename('.md'); - - if (file_exists($dir . $basename . '.html')) - { - $data []= array($basename, $dir); - } - } - } - - return $data; - } - - public function test_no_markup() - { - $markdownWithHtml = <<<MARKDOWN_WITH_MARKUP -<div>_content_</div> - -sparse: - -<div> -<div class="inner"> -_content_ -</div> -</div> - -paragraph - -<style type="text/css"> - p { - color: red; - } -</style> - -comment - -<!-- html comment --> -MARKDOWN_WITH_MARKUP; - - $expectedHtml = <<<EXPECTED_HTML -<p><div><em>content</em></div></p> -<p>sparse:</p> -<p><div> -<div class="inner"> -<em>content</em> -</div> -</div></p> -<p>paragraph</p> -<p><style type="text/css"> -p { -color: red; -} -</style></p> -<p>comment</p> -<p><!-- html comment --></p> -EXPECTED_HTML; - $parsedownWithNoMarkup = new Parsedown(); - $parsedownWithNoMarkup->setMarkupEscaped(true); - $this->assertEquals($expectedHtml, $parsedownWithNoMarkup->text($markdownWithHtml)); - } - - public function testLateStaticBinding() - { - include 'test/TestParsedown.php'; - - $parsedown = Parsedown::instance(); - $this->assertInstanceOf('Parsedown', $parsedown); - - // After instance is already called on Parsedown - // subsequent calls with the same arguments return the same instance - $sameParsedown = TestParsedown::instance(); - $this->assertInstanceOf('Parsedown', $sameParsedown); - $this->assertSame($parsedown, $sameParsedown); - - $testParsedown = TestParsedown::instance('test late static binding'); - $this->assertInstanceOf('TestParsedown', $testParsedown); - - $sameInstanceAgain = TestParsedown::instance('test late static binding'); - $this->assertSame($testParsedown, $sameInstanceAgain); - } -} diff --git a/vendor/erusev/parsedown/test/TestParsedown.php b/vendor/erusev/parsedown/test/TestParsedown.php deleted file mode 100644 index 7024dfbc..00000000 --- a/vendor/erusev/parsedown/test/TestParsedown.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php - -class TestParsedown extends Parsedown -{ -} diff --git a/vendor/erusev/parsedown/test/bootstrap.php b/vendor/erusev/parsedown/test/bootstrap.php deleted file mode 100644 index 5f264d2f..00000000 --- a/vendor/erusev/parsedown/test/bootstrap.php +++ /dev/null @@ -1,3 +0,0 @@ -<?php - -include 'Parsedown.php';
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/aesthetic_table.html b/vendor/erusev/parsedown/test/data/aesthetic_table.html deleted file mode 100644 index 88e1c2bd..00000000 --- a/vendor/erusev/parsedown/test/data/aesthetic_table.html +++ /dev/null @@ -1,18 +0,0 @@ -<table> -<thead> -<tr> -<th>header 1</th> -<th>header 2</th> -</tr> -</thead> -<tbody> -<tr> -<td>cell 1.1</td> -<td>cell 1.2</td> -</tr> -<tr> -<td>cell 2.1</td> -<td>cell 2.2</td> -</tr> -</tbody> -</table>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/aesthetic_table.md b/vendor/erusev/parsedown/test/data/aesthetic_table.md deleted file mode 100644 index 5245e6c9..00000000 --- a/vendor/erusev/parsedown/test/data/aesthetic_table.md +++ /dev/null @@ -1,4 +0,0 @@ -| header 1 | header 2 | -| -------- | -------- | -| cell 1.1 | cell 1.2 | -| cell 2.1 | cell 2.2 |
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/aligned_table.html b/vendor/erusev/parsedown/test/data/aligned_table.html deleted file mode 100644 index c4acfcb6..00000000 --- a/vendor/erusev/parsedown/test/data/aligned_table.html +++ /dev/null @@ -1,21 +0,0 @@ -<table> -<thead> -<tr> -<th style="text-align: left;">header 1</th> -<th style="text-align: center;">header 2</th> -<th style="text-align: right;">header 2</th> -</tr> -</thead> -<tbody> -<tr> -<td style="text-align: left;">cell 1.1</td> -<td style="text-align: center;">cell 1.2</td> -<td style="text-align: right;">cell 1.3</td> -</tr> -<tr> -<td style="text-align: left;">cell 2.1</td> -<td style="text-align: center;">cell 2.2</td> -<td style="text-align: right;">cell 2.3</td> -</tr> -</tbody> -</table>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/aligned_table.md b/vendor/erusev/parsedown/test/data/aligned_table.md deleted file mode 100644 index 69a45f90..00000000 --- a/vendor/erusev/parsedown/test/data/aligned_table.md +++ /dev/null @@ -1,4 +0,0 @@ -| header 1 | header 2 | header 2 | -| :------- | :------: | -------: | -| cell 1.1 | cell 1.2 | cell 1.3 | -| cell 2.1 | cell 2.2 | cell 2.3 |
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/atx_heading.html b/vendor/erusev/parsedown/test/data/atx_heading.html deleted file mode 100644 index 751f8739..00000000 --- a/vendor/erusev/parsedown/test/data/atx_heading.html +++ /dev/null @@ -1,9 +0,0 @@ -<h1>h1</h1> -<h2>h2</h2> -<h3>h3</h3> -<h4>h4</h4> -<h5>h5</h5> -<h6>h6</h6> -<p>####### not a heading</p> -<h1>closed h1</h1> -<p>#</p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/atx_heading.md b/vendor/erusev/parsedown/test/data/atx_heading.md deleted file mode 100644 index ad97b44c..00000000 --- a/vendor/erusev/parsedown/test/data/atx_heading.md +++ /dev/null @@ -1,17 +0,0 @@ -# h1 - -## h2 - -### h3 - -#### h4 - -##### h5 - -###### h6 - -####### not a heading - -# closed h1 # - -#
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/automatic_link.html b/vendor/erusev/parsedown/test/data/automatic_link.html deleted file mode 100644 index 50a94ba0..00000000 --- a/vendor/erusev/parsedown/test/data/automatic_link.html +++ /dev/null @@ -1 +0,0 @@ -<p><a href="http://example.com">http://example.com</a></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/automatic_link.md b/vendor/erusev/parsedown/test/data/automatic_link.md deleted file mode 100644 index 08d3bf46..00000000 --- a/vendor/erusev/parsedown/test/data/automatic_link.md +++ /dev/null @@ -1 +0,0 @@ -<http://example.com>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/block-level_html.html b/vendor/erusev/parsedown/test/data/block-level_html.html deleted file mode 100644 index 6443a4a6..00000000 --- a/vendor/erusev/parsedown/test/data/block-level_html.html +++ /dev/null @@ -1,12 +0,0 @@ -<div>_content_</div> -<p>paragraph</p> -<div> - <div class="inner"> - _content_ - </div> -</div> -<style type="text/css"> - p {color: #789;} -</style> -<div> - <a href="/">home</a></div>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/block-level_html.md b/vendor/erusev/parsedown/test/data/block-level_html.md deleted file mode 100644 index 17cbc22d..00000000 --- a/vendor/erusev/parsedown/test/data/block-level_html.md +++ /dev/null @@ -1,16 +0,0 @@ -<div>_content_</div> - -paragraph - -<div> - <div class="inner"> - _content_ - </div> -</div> - -<style type="text/css"> - p {color: #789;} -</style> - -<div> - <a href="/">home</a></div>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/code_block.html b/vendor/erusev/parsedown/test/data/code_block.html deleted file mode 100644 index 889b02d9..00000000 --- a/vendor/erusev/parsedown/test/data/code_block.html +++ /dev/null @@ -1,8 +0,0 @@ -<pre><code><?php - -$message = 'Hello World!'; -echo $message;</code></pre> -<hr /> -<pre><code>> not a quote -- not a list item -[not a reference]: http://foo.com</code></pre>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/code_block.md b/vendor/erusev/parsedown/test/data/code_block.md deleted file mode 100644 index 2cfc953c..00000000 --- a/vendor/erusev/parsedown/test/data/code_block.md +++ /dev/null @@ -1,10 +0,0 @@ - <?php - - $message = 'Hello World!'; - echo $message; - ---- - - > not a quote - - not a list item - [not a reference]: http://foo.com
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/code_span.html b/vendor/erusev/parsedown/test/data/code_span.html deleted file mode 100644 index 5c4c231e..00000000 --- a/vendor/erusev/parsedown/test/data/code_span.html +++ /dev/null @@ -1,6 +0,0 @@ -<p>a <code>code span</code></p> -<p><code>this is also a codespan</code> trailing text</p> -<p><code>and look at this one!</code></p> -<p>single backtick in a code span: <code>`</code></p> -<p>backtick-delimited string in a code span: <code>`foo`</code></p> -<p><code>sth `` sth</code></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/code_span.md b/vendor/erusev/parsedown/test/data/code_span.md deleted file mode 100644 index c2f1a744..00000000 --- a/vendor/erusev/parsedown/test/data/code_span.md +++ /dev/null @@ -1,11 +0,0 @@ -a `code span` - -`this is also a codespan` trailing text - -`and look at this one!` - -single backtick in a code span: `` ` `` - -backtick-delimited string in a code span: `` `foo` `` - -`sth `` sth`
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/compound_blockquote.html b/vendor/erusev/parsedown/test/data/compound_blockquote.html deleted file mode 100644 index 37afb57a..00000000 --- a/vendor/erusev/parsedown/test/data/compound_blockquote.html +++ /dev/null @@ -1,9 +0,0 @@ -<blockquote> -<h2>header</h2> -<p>paragraph</p> -<ul> -<li>li</li> -</ul> -<hr /> -<p>paragraph</p> -</blockquote>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/compound_blockquote.md b/vendor/erusev/parsedown/test/data/compound_blockquote.md deleted file mode 100644 index 80c4aed1..00000000 --- a/vendor/erusev/parsedown/test/data/compound_blockquote.md +++ /dev/null @@ -1,10 +0,0 @@ -> header -> ------ -> -> paragraph -> -> - li -> -> --- -> -> paragraph
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/compound_emphasis.html b/vendor/erusev/parsedown/test/data/compound_emphasis.html deleted file mode 100644 index 178dd54b..00000000 --- a/vendor/erusev/parsedown/test/data/compound_emphasis.html +++ /dev/null @@ -1,2 +0,0 @@ -<p><em><code>code</code></em> <strong><code>code</code></strong></p> -<p><em><code>code</code><strong><code>code</code></strong><code>code</code></em></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/compound_emphasis.md b/vendor/erusev/parsedown/test/data/compound_emphasis.md deleted file mode 100644 index 6fe07f26..00000000 --- a/vendor/erusev/parsedown/test/data/compound_emphasis.md +++ /dev/null @@ -1,4 +0,0 @@ -_`code`_ __`code`__ - -*`code`**`code`**`code`* - diff --git a/vendor/erusev/parsedown/test/data/compound_list.html b/vendor/erusev/parsedown/test/data/compound_list.html deleted file mode 100644 index f5593c14..00000000 --- a/vendor/erusev/parsedown/test/data/compound_list.html +++ /dev/null @@ -1,12 +0,0 @@ -<ul> -<li> -<p>paragraph</p> -<p>paragraph</p> -</li> -<li> -<p>paragraph</p> -<blockquote> -<p>quote</p> -</blockquote> -</li> -</ul>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/compound_list.md b/vendor/erusev/parsedown/test/data/compound_list.md deleted file mode 100644 index ed7f0c60..00000000 --- a/vendor/erusev/parsedown/test/data/compound_list.md +++ /dev/null @@ -1,7 +0,0 @@ -- paragraph - - paragraph - -- paragraph - - > quote
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/deeply_nested_list.html b/vendor/erusev/parsedown/test/data/deeply_nested_list.html deleted file mode 100644 index d2c7e5ac..00000000 --- a/vendor/erusev/parsedown/test/data/deeply_nested_list.html +++ /dev/null @@ -1,12 +0,0 @@ -<ul> -<li>li -<ul> -<li>li -<ul> -<li>li</li> -<li>li</li> -</ul></li> -<li>li</li> -</ul></li> -<li>li</li> -</ul>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/deeply_nested_list.md b/vendor/erusev/parsedown/test/data/deeply_nested_list.md deleted file mode 100644 index 76b7552d..00000000 --- a/vendor/erusev/parsedown/test/data/deeply_nested_list.md +++ /dev/null @@ -1,6 +0,0 @@ -- li - - li - - li - - li - - li -- li
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/em_strong.html b/vendor/erusev/parsedown/test/data/em_strong.html deleted file mode 100644 index 323d60ae..00000000 --- a/vendor/erusev/parsedown/test/data/em_strong.html +++ /dev/null @@ -1,8 +0,0 @@ -<p><strong><em>em strong</em></strong></p> -<p><strong><em>em strong</em> strong</strong></p> -<p><strong>strong <em>em strong</em></strong></p> -<p><strong>strong <em>em strong</em> strong</strong></p> -<p><strong><em>em strong</em></strong></p> -<p><strong><em>em strong</em> strong</strong></p> -<p><strong>strong <em>em strong</em></strong></p> -<p><strong>strong <em>em strong</em> strong</strong></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/em_strong.md b/vendor/erusev/parsedown/test/data/em_strong.md deleted file mode 100644 index 9abeb3fd..00000000 --- a/vendor/erusev/parsedown/test/data/em_strong.md +++ /dev/null @@ -1,15 +0,0 @@ -___em strong___ - -___em strong_ strong__ - -__strong _em strong___ - -__strong _em strong_ strong__ - -***em strong*** - -***em strong* strong** - -**strong *em strong*** - -**strong *em strong* strong**
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/email.html b/vendor/erusev/parsedown/test/data/email.html deleted file mode 100644 index c40759c9..00000000 --- a/vendor/erusev/parsedown/test/data/email.html +++ /dev/null @@ -1 +0,0 @@ -<p>my email is <a href="mailto:me@example.com">me@example.com</a></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/email.md b/vendor/erusev/parsedown/test/data/email.md deleted file mode 100644 index 26b7b6cc..00000000 --- a/vendor/erusev/parsedown/test/data/email.md +++ /dev/null @@ -1 +0,0 @@ -my email is <me@example.com>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/emphasis.html b/vendor/erusev/parsedown/test/data/emphasis.html deleted file mode 100644 index 60ff4bd8..00000000 --- a/vendor/erusev/parsedown/test/data/emphasis.html +++ /dev/null @@ -1,8 +0,0 @@ -<p><em>underscore</em>, <em>asterisk</em>, <em>one two</em>, <em>three four</em>, <em>a</em>, <em>b</em></p> -<p><strong>strong</strong> and <em>em</em> and <strong>strong</strong> and <em>em</em></p> -<p><em>line -line -line</em></p> -<p>this_is_not_an_emphasis</p> -<p>an empty emphasis __ ** is not an emphasis</p> -<p>*mixed *<em>double and</em> single asterisk** spans</p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/emphasis.md b/vendor/erusev/parsedown/test/data/emphasis.md deleted file mode 100644 index 85b9d229..00000000 --- a/vendor/erusev/parsedown/test/data/emphasis.md +++ /dev/null @@ -1,13 +0,0 @@ -_underscore_, *asterisk*, _one two_, *three four*, _a_, *b* - -**strong** and *em* and **strong** and *em* - -_line -line -line_ - -this_is_not_an_emphasis - -an empty emphasis __ ** is not an emphasis - -*mixed **double and* single asterisk** spans
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/escaping.html b/vendor/erusev/parsedown/test/data/escaping.html deleted file mode 100644 index ab1c41fd..00000000 --- a/vendor/erusev/parsedown/test/data/escaping.html +++ /dev/null @@ -1,6 +0,0 @@ -<p>escaped *emphasis*.</p> -<p><code>escaped \*emphasis\* in a code span</code></p> -<pre><code>escaped \*emphasis\* in a code block</code></pre> -<p>\ ` * _ { } [ ] ( ) > # + - . !</p> -<p><em>one_two</em> <strong>one_two</strong></p> -<p><em>one*two</em> <strong>one*two</strong></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/escaping.md b/vendor/erusev/parsedown/test/data/escaping.md deleted file mode 100644 index 9f174e98..00000000 --- a/vendor/erusev/parsedown/test/data/escaping.md +++ /dev/null @@ -1,11 +0,0 @@ -escaped \*emphasis\*. - -`escaped \*emphasis\* in a code span` - - escaped \*emphasis\* in a code block - -\\ \` \* \_ \{ \} \[ \] \( \) \> \# \+ \- \. \! - -_one\_two_ __one\_two__ - -*one\*two* **one\*two**
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/fenced_code_block.html b/vendor/erusev/parsedown/test/data/fenced_code_block.html deleted file mode 100644 index 8bdabba9..00000000 --- a/vendor/erusev/parsedown/test/data/fenced_code_block.html +++ /dev/null @@ -1,6 +0,0 @@ -<pre><code><?php - -$message = 'fenced code block'; -echo $message;</code></pre> -<pre><code>tilde</code></pre> -<pre><code class="language-php">echo 'language identifier';</code></pre>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/fenced_code_block.md b/vendor/erusev/parsedown/test/data/fenced_code_block.md deleted file mode 100644 index cbed8ebb..00000000 --- a/vendor/erusev/parsedown/test/data/fenced_code_block.md +++ /dev/null @@ -1,14 +0,0 @@ -``` -<?php - -$message = 'fenced code block'; -echo $message; -``` - -~~~ -tilde -~~~ - -```php -echo 'language identifier'; -```
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/horizontal_rule.html b/vendor/erusev/parsedown/test/data/horizontal_rule.html deleted file mode 100644 index 68da03d0..00000000 --- a/vendor/erusev/parsedown/test/data/horizontal_rule.html +++ /dev/null @@ -1,5 +0,0 @@ -<hr /> -<hr /> -<hr /> -<hr /> -<hr />
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/horizontal_rule.md b/vendor/erusev/parsedown/test/data/horizontal_rule.md deleted file mode 100644 index bf461a92..00000000 --- a/vendor/erusev/parsedown/test/data/horizontal_rule.md +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- - - - - - - - - -*** - -___
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/html_comment.html b/vendor/erusev/parsedown/test/data/html_comment.html deleted file mode 100644 index 566dc3ad..00000000 --- a/vendor/erusev/parsedown/test/data/html_comment.html +++ /dev/null @@ -1,5 +0,0 @@ -<!-- single line --> -<p>paragraph</p> -<!-- - multiline --> -<p>paragraph</p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/html_comment.md b/vendor/erusev/parsedown/test/data/html_comment.md deleted file mode 100644 index 6ddfdb44..00000000 --- a/vendor/erusev/parsedown/test/data/html_comment.md +++ /dev/null @@ -1,8 +0,0 @@ -<!-- single line --> - -paragraph - -<!-- - multiline --> - -paragraph
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/html_entity.html b/vendor/erusev/parsedown/test/data/html_entity.html deleted file mode 100644 index 4d23e3cd..00000000 --- a/vendor/erusev/parsedown/test/data/html_entity.html +++ /dev/null @@ -1 +0,0 @@ -<p>& © {</p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/html_entity.md b/vendor/erusev/parsedown/test/data/html_entity.md deleted file mode 100644 index ff545ea5..00000000 --- a/vendor/erusev/parsedown/test/data/html_entity.md +++ /dev/null @@ -1 +0,0 @@ -& © {
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/image_reference.html b/vendor/erusev/parsedown/test/data/image_reference.html deleted file mode 100644 index 67fbd2c8..00000000 --- a/vendor/erusev/parsedown/test/data/image_reference.html +++ /dev/null @@ -1,2 +0,0 @@ -<p><img src="/md.png" alt="Markdown Logo" /></p> -<p>![missing reference]</p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/image_reference.md b/vendor/erusev/parsedown/test/data/image_reference.md deleted file mode 100644 index 1e11d947..00000000 --- a/vendor/erusev/parsedown/test/data/image_reference.md +++ /dev/null @@ -1,5 +0,0 @@ -![Markdown Logo][image] - -[image]: /md.png - -![missing reference]
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/image_title.html b/vendor/erusev/parsedown/test/data/image_title.html deleted file mode 100644 index 957c9505..00000000 --- a/vendor/erusev/parsedown/test/data/image_title.html +++ /dev/null @@ -1,2 +0,0 @@ -<p><img src="/md.png" alt="alt" title="title" /></p> -<p><img src="/md.png" alt="blank title" title="" /></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/image_title.md b/vendor/erusev/parsedown/test/data/image_title.md deleted file mode 100644 index 7ce2849a..00000000 --- a/vendor/erusev/parsedown/test/data/image_title.md +++ /dev/null @@ -1,3 +0,0 @@ - - -
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/implicit_reference.html b/vendor/erusev/parsedown/test/data/implicit_reference.html deleted file mode 100644 index 24b51c1b..00000000 --- a/vendor/erusev/parsedown/test/data/implicit_reference.html +++ /dev/null @@ -1,4 +0,0 @@ -<p>an <a href="http://example.com">implicit</a> reference link</p> -<p>an <a href="http://example.com">implicit</a> reference link with an empty link definition</p> -<p>an <a href="http://example.com">implicit</a> reference link followed by <a href="http://cnn.com">another</a></p> -<p>an <a href="http://example.com" title="Example">explicit</a> reference link with a title</p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/implicit_reference.md b/vendor/erusev/parsedown/test/data/implicit_reference.md deleted file mode 100644 index f850df96..00000000 --- a/vendor/erusev/parsedown/test/data/implicit_reference.md +++ /dev/null @@ -1,13 +0,0 @@ -an [implicit] reference link - -[implicit]: http://example.com - -an [implicit][] reference link with an empty link definition - -an [implicit][] reference link followed by [another][] - -[another]: http://cnn.com - -an [explicit][example] reference link with a title - -[example]: http://example.com "Example"
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/inline_link.html b/vendor/erusev/parsedown/test/data/inline_link.html deleted file mode 100644 index 5ad564aa..00000000 --- a/vendor/erusev/parsedown/test/data/inline_link.html +++ /dev/null @@ -1,6 +0,0 @@ -<p><a href="http://example.com">link</a></p> -<p><a href="/url-(parentheses)">link</a> with parentheses in URL </p> -<p>(<a href="/index.php">link</a>) in parentheses</p> -<p><a href="http://example.com"><code>link</code></a></p> -<p><a href="http://example.com"><img src="http://parsedown.org/md.png" alt="MD Logo" /></a></p> -<p><a href="http://example.com"><img src="http://parsedown.org/md.png" alt="MD Logo" /> and text</a></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/inline_link.md b/vendor/erusev/parsedown/test/data/inline_link.md deleted file mode 100644 index 6bac0b35..00000000 --- a/vendor/erusev/parsedown/test/data/inline_link.md +++ /dev/null @@ -1,11 +0,0 @@ -[link](http://example.com) - -[link](/url-(parentheses)) with parentheses in URL - -([link](/index.php)) in parentheses - -[`link`](http://example.com) - -[](http://example.com) - -[ and text](http://example.com)
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/inline_link_title.html b/vendor/erusev/parsedown/test/data/inline_link_title.html deleted file mode 100644 index ecdfd03d..00000000 --- a/vendor/erusev/parsedown/test/data/inline_link_title.html +++ /dev/null @@ -1,6 +0,0 @@ -<p><a href="http://example.com" title="Title">single quotes</a></p> -<p><a href="http://example.com" title="Title">double quotes</a></p> -<p><a href="http://example.com" title="">single quotes blank</a></p> -<p><a href="http://example.com" title="">double quotes blank</a></p> -<p><a href="http://example.com" title="2 Words">space</a></p> -<p><a href="http://example.com/url-(parentheses)" title="Title">parentheses</a></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/inline_link_title.md b/vendor/erusev/parsedown/test/data/inline_link_title.md deleted file mode 100644 index 6e1c5af9..00000000 --- a/vendor/erusev/parsedown/test/data/inline_link_title.md +++ /dev/null @@ -1,11 +0,0 @@ -[single quotes](http://example.com 'Title') - -[double quotes](http://example.com "Title") - -[single quotes blank](http://example.com '') - -[double quotes blank](http://example.com "") - -[space](http://example.com "2 Words") - -[parentheses](http://example.com/url-(parentheses) "Title")
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/inline_title.html b/vendor/erusev/parsedown/test/data/inline_title.html deleted file mode 100644 index bbab93b6..00000000 --- a/vendor/erusev/parsedown/test/data/inline_title.html +++ /dev/null @@ -1 +0,0 @@ -<p><a href="http://example.com" title="Example">single quotes</a> and <a href="http://example.com" title="Example">double quotes</a></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/inline_title.md b/vendor/erusev/parsedown/test/data/inline_title.md deleted file mode 100644 index cb09344a..00000000 --- a/vendor/erusev/parsedown/test/data/inline_title.md +++ /dev/null @@ -1 +0,0 @@ -[single quotes](http://example.com 'Example') and [double quotes](http://example.com "Example")
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/lazy_blockquote.html b/vendor/erusev/parsedown/test/data/lazy_blockquote.html deleted file mode 100644 index 0a2a2aaf..00000000 --- a/vendor/erusev/parsedown/test/data/lazy_blockquote.html +++ /dev/null @@ -1,6 +0,0 @@ -<blockquote> -<p>quote -the rest of it</p> -<p>another paragraph -the rest of it</p> -</blockquote>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/lazy_blockquote.md b/vendor/erusev/parsedown/test/data/lazy_blockquote.md deleted file mode 100644 index 48f645f9..00000000 --- a/vendor/erusev/parsedown/test/data/lazy_blockquote.md +++ /dev/null @@ -1,5 +0,0 @@ -> quote -the rest of it - -> another paragraph -the rest of it
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/lazy_list.html b/vendor/erusev/parsedown/test/data/lazy_list.html deleted file mode 100644 index 1a519924..00000000 --- a/vendor/erusev/parsedown/test/data/lazy_list.html +++ /dev/null @@ -1,4 +0,0 @@ -<ul> -<li>li -the rest of it</li> -</ul>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/lazy_list.md b/vendor/erusev/parsedown/test/data/lazy_list.md deleted file mode 100644 index 62ad9d71..00000000 --- a/vendor/erusev/parsedown/test/data/lazy_list.md +++ /dev/null @@ -1,2 +0,0 @@ -- li -the rest of it
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/line_break.html b/vendor/erusev/parsedown/test/data/line_break.html deleted file mode 100644 index 5f37d854..00000000 --- a/vendor/erusev/parsedown/test/data/line_break.html +++ /dev/null @@ -1,2 +0,0 @@ -<p>line<br /> -line</p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/line_break.md b/vendor/erusev/parsedown/test/data/line_break.md deleted file mode 100644 index 04dff43e..00000000 --- a/vendor/erusev/parsedown/test/data/line_break.md +++ /dev/null @@ -1,2 +0,0 @@ -line -line
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/multiline_list_paragraph.html b/vendor/erusev/parsedown/test/data/multiline_list_paragraph.html deleted file mode 100644 index 3247bd22..00000000 --- a/vendor/erusev/parsedown/test/data/multiline_list_paragraph.html +++ /dev/null @@ -1,7 +0,0 @@ -<ul> -<li> -<p>li</p> -<p>line -line</p> -</li> -</ul>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/multiline_list_paragraph.md b/vendor/erusev/parsedown/test/data/multiline_list_paragraph.md deleted file mode 100644 index f5b42729..00000000 --- a/vendor/erusev/parsedown/test/data/multiline_list_paragraph.md +++ /dev/null @@ -1,4 +0,0 @@ -- li - - line - line
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/nested_block-level_html.html b/vendor/erusev/parsedown/test/data/nested_block-level_html.html deleted file mode 100644 index bfbef54d..00000000 --- a/vendor/erusev/parsedown/test/data/nested_block-level_html.html +++ /dev/null @@ -1,10 +0,0 @@ -<div> -_parent_ -<div> -_child_ -</div> -<pre> -_adopted child_ -</pre> -</div> -<p><em>outside</em></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/nested_block-level_html.md b/vendor/erusev/parsedown/test/data/nested_block-level_html.md deleted file mode 100644 index 5e01e109..00000000 --- a/vendor/erusev/parsedown/test/data/nested_block-level_html.md +++ /dev/null @@ -1,11 +0,0 @@ -<div> -_parent_ -<div> -_child_ -</div> -<pre> -_adopted child_ -</pre> -</div> - -_outside_
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/ordered_list.html b/vendor/erusev/parsedown/test/data/ordered_list.html deleted file mode 100644 index b6c5216c..00000000 --- a/vendor/erusev/parsedown/test/data/ordered_list.html +++ /dev/null @@ -1,13 +0,0 @@ -<ol> -<li>one</li> -<li>two</li> -</ol> -<p>repeating numbers:</p> -<ol> -<li>one</li> -<li>two</li> -</ol> -<p>large numbers:</p> -<ol> -<li>one</li> -</ol>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/ordered_list.md b/vendor/erusev/parsedown/test/data/ordered_list.md deleted file mode 100644 index b307032c..00000000 --- a/vendor/erusev/parsedown/test/data/ordered_list.md +++ /dev/null @@ -1,11 +0,0 @@ -1. one -2. two - -repeating numbers: - -1. one -1. two - -large numbers: - -123. one
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/paragraph_list.html b/vendor/erusev/parsedown/test/data/paragraph_list.html deleted file mode 100644 index ced1c43e..00000000 --- a/vendor/erusev/parsedown/test/data/paragraph_list.html +++ /dev/null @@ -1,12 +0,0 @@ -<p>paragraph</p> -<ul> -<li>li</li> -<li>li</li> -</ul> -<p>paragraph</p> -<ul> -<li> -<p>li</p> -</li> -<li>li</li> -</ul>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/paragraph_list.md b/vendor/erusev/parsedown/test/data/paragraph_list.md deleted file mode 100644 index b973908c..00000000 --- a/vendor/erusev/parsedown/test/data/paragraph_list.md +++ /dev/null @@ -1,9 +0,0 @@ -paragraph -- li -- li - -paragraph - - * li - - * li
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/reference_title.html b/vendor/erusev/parsedown/test/data/reference_title.html deleted file mode 100644 index 8f2be944..00000000 --- a/vendor/erusev/parsedown/test/data/reference_title.html +++ /dev/null @@ -1,2 +0,0 @@ -<p><a href="http://example.com" title="example title">double quotes</a> and <a href="http://example.com" title="example title">single quotes</a> and <a href="http://example.com" title="example title">parentheses</a></p> -<p>[invalid title]: <a href="http://example.com">http://example.com</a> example title</p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/reference_title.md b/vendor/erusev/parsedown/test/data/reference_title.md deleted file mode 100644 index 43cb2170..00000000 --- a/vendor/erusev/parsedown/test/data/reference_title.md +++ /dev/null @@ -1,6 +0,0 @@ -[double quotes] and [single quotes] and [parentheses] - -[double quotes]: http://example.com "example title" -[single quotes]: http://example.com 'example title' -[parentheses]: http://example.com (example title) -[invalid title]: http://example.com example title
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/self-closing_html.html b/vendor/erusev/parsedown/test/data/self-closing_html.html deleted file mode 100644 index 4d072b43..00000000 --- a/vendor/erusev/parsedown/test/data/self-closing_html.html +++ /dev/null @@ -1,12 +0,0 @@ -<hr> -<p>paragraph</p> -<hr/> -<p>paragraph</p> -<hr /> -<p>paragraph</p> -<hr class="foo" id="bar" /> -<p>paragraph</p> -<hr class="foo" id="bar"/> -<p>paragraph</p> -<hr class="foo" id="bar" > -<p>paragraph</p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/self-closing_html.md b/vendor/erusev/parsedown/test/data/self-closing_html.md deleted file mode 100644 index acb20327..00000000 --- a/vendor/erusev/parsedown/test/data/self-closing_html.md +++ /dev/null @@ -1,12 +0,0 @@ -<hr> -paragraph -<hr/> -paragraph -<hr /> -paragraph -<hr class="foo" id="bar" /> -paragraph -<hr class="foo" id="bar"/> -paragraph -<hr class="foo" id="bar" > -paragraph
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/separated_nested_list.html b/vendor/erusev/parsedown/test/data/separated_nested_list.html deleted file mode 100644 index 80a5cae2..00000000 --- a/vendor/erusev/parsedown/test/data/separated_nested_list.html +++ /dev/null @@ -1,9 +0,0 @@ -<ul> -<li> -<p>li</p> -<ul> -<li>li</li> -<li>li</li> -</ul> -</li> -</ul>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/separated_nested_list.md b/vendor/erusev/parsedown/test/data/separated_nested_list.md deleted file mode 100644 index d7cd1af7..00000000 --- a/vendor/erusev/parsedown/test/data/separated_nested_list.md +++ /dev/null @@ -1,4 +0,0 @@ -- li - - - li - - li
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/setext_header.html b/vendor/erusev/parsedown/test/data/setext_header.html deleted file mode 100644 index 60aac081..00000000 --- a/vendor/erusev/parsedown/test/data/setext_header.html +++ /dev/null @@ -1,5 +0,0 @@ -<h1>h1</h1> -<h2>h2</h2> -<h2>single character</h2> -<p>not a header</p> -<hr />
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/setext_header.md b/vendor/erusev/parsedown/test/data/setext_header.md deleted file mode 100644 index c43b52c3..00000000 --- a/vendor/erusev/parsedown/test/data/setext_header.md +++ /dev/null @@ -1,12 +0,0 @@ -h1 -== - -h2 --- - -single character -- - -not a header - -------------
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/simple_blockquote.html b/vendor/erusev/parsedown/test/data/simple_blockquote.html deleted file mode 100644 index 8225d57c..00000000 --- a/vendor/erusev/parsedown/test/data/simple_blockquote.html +++ /dev/null @@ -1,11 +0,0 @@ -<blockquote> -<p>quote</p> -</blockquote> -<p>indented:</p> -<blockquote> -<p>quote</p> -</blockquote> -<p>no space after <code>></code>:</p> -<blockquote> -<p>quote</p> -</blockquote>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/simple_blockquote.md b/vendor/erusev/parsedown/test/data/simple_blockquote.md deleted file mode 100644 index 22b6b11a..00000000 --- a/vendor/erusev/parsedown/test/data/simple_blockquote.md +++ /dev/null @@ -1,7 +0,0 @@ -> quote - -indented: - > quote - -no space after `>`: ->quote
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/simple_table.html b/vendor/erusev/parsedown/test/data/simple_table.html deleted file mode 100644 index 237d7efb..00000000 --- a/vendor/erusev/parsedown/test/data/simple_table.html +++ /dev/null @@ -1,37 +0,0 @@ -<table> -<thead> -<tr> -<th>header 1</th> -<th>header 2</th> -</tr> -</thead> -<tbody> -<tr> -<td>cell 1.1</td> -<td>cell 1.2</td> -</tr> -<tr> -<td>cell 2.1</td> -<td>cell 2.2</td> -</tr> -</tbody> -</table> -<hr /> -<table> -<thead> -<tr> -<th style="text-align: left;">header 1</th> -<th>header 2</th> -</tr> -</thead> -<tbody> -<tr> -<td style="text-align: left;">cell 1.1</td> -<td>cell 1.2</td> -</tr> -<tr> -<td style="text-align: left;">cell 2.1</td> -<td>cell 2.2</td> -</tr> -</tbody> -</table>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/simple_table.md b/vendor/erusev/parsedown/test/data/simple_table.md deleted file mode 100644 index 466d140e..00000000 --- a/vendor/erusev/parsedown/test/data/simple_table.md +++ /dev/null @@ -1,11 +0,0 @@ -header 1 | header 2 --------- | -------- -cell 1.1 | cell 1.2 -cell 2.1 | cell 2.2 - ---- - -header 1 | header 2 -:------- | -------- -cell 1.1 | cell 1.2 -cell 2.1 | cell 2.2
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/span-level_html.html b/vendor/erusev/parsedown/test/data/span-level_html.html deleted file mode 100644 index f852a25a..00000000 --- a/vendor/erusev/parsedown/test/data/span-level_html.html +++ /dev/null @@ -1,5 +0,0 @@ -<p>an <b>important</b> <a href=''>link</a></p> -<p>broken<br/> -line</p> -<p><b>inline tag</b> at the beginning</p> -<p><span><a href="http://example.com">http://example.com</a></span></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/span-level_html.md b/vendor/erusev/parsedown/test/data/span-level_html.md deleted file mode 100644 index f2219655..00000000 --- a/vendor/erusev/parsedown/test/data/span-level_html.md +++ /dev/null @@ -1,8 +0,0 @@ -an <b>important</b> <a href=''>link</a> - -broken<br/> -line - -<b>inline tag</b> at the beginning - -<span>http://example.com</span>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/sparse_dense_list.html b/vendor/erusev/parsedown/test/data/sparse_dense_list.html deleted file mode 100644 index 095bc739..00000000 --- a/vendor/erusev/parsedown/test/data/sparse_dense_list.html +++ /dev/null @@ -1,7 +0,0 @@ -<ul> -<li> -<p>li</p> -</li> -<li>li</li> -<li>li</li> -</ul>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/sparse_dense_list.md b/vendor/erusev/parsedown/test/data/sparse_dense_list.md deleted file mode 100644 index 57684227..00000000 --- a/vendor/erusev/parsedown/test/data/sparse_dense_list.md +++ /dev/null @@ -1,4 +0,0 @@ -- li - -- li -- li
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/sparse_html.html b/vendor/erusev/parsedown/test/data/sparse_html.html deleted file mode 100644 index 9e896274..00000000 --- a/vendor/erusev/parsedown/test/data/sparse_html.html +++ /dev/null @@ -1,8 +0,0 @@ -<div> -line 1 - -line 2 -line 3 - -line 4 -</div>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/sparse_html.md b/vendor/erusev/parsedown/test/data/sparse_html.md deleted file mode 100644 index 9e896274..00000000 --- a/vendor/erusev/parsedown/test/data/sparse_html.md +++ /dev/null @@ -1,8 +0,0 @@ -<div> -line 1 - -line 2 -line 3 - -line 4 -</div>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/sparse_list.html b/vendor/erusev/parsedown/test/data/sparse_list.html deleted file mode 100644 index 452b2b86..00000000 --- a/vendor/erusev/parsedown/test/data/sparse_list.html +++ /dev/null @@ -1,15 +0,0 @@ -<ul> -<li> -<p>li</p> -</li> -<li>li</li> -</ul> -<hr /> -<ul> -<li> -<p>li</p> -<ul> -<li>indented li</li> -</ul> -</li> -</ul>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/sparse_list.md b/vendor/erusev/parsedown/test/data/sparse_list.md deleted file mode 100644 index 362a35f5..00000000 --- a/vendor/erusev/parsedown/test/data/sparse_list.md +++ /dev/null @@ -1,9 +0,0 @@ -- li - -- li - ---- - -- li - - - indented li
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/special_characters.html b/vendor/erusev/parsedown/test/data/special_characters.html deleted file mode 100644 index 3b652c33..00000000 --- a/vendor/erusev/parsedown/test/data/special_characters.html +++ /dev/null @@ -1,6 +0,0 @@ -<p>AT&T has an ampersand in their name</p> -<p>this & that</p> -<p>4 < 5 and 6 > 5</p> -<p><a href="http://example.com/autolink?a=1&b=2">http://example.com/autolink?a=1&b=2</a></p> -<p><a href="/script?a=1&b=2">inline link</a></p> -<p><a href="http://example.com/?a=1&b=2">reference link</a></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/special_characters.md b/vendor/erusev/parsedown/test/data/special_characters.md deleted file mode 100644 index 111b03b6..00000000 --- a/vendor/erusev/parsedown/test/data/special_characters.md +++ /dev/null @@ -1,13 +0,0 @@ -AT&T has an ampersand in their name - -this & that - -4 < 5 and 6 > 5 - -<http://example.com/autolink?a=1&b=2> - -[inline link](/script?a=1&b=2) - -[reference link][1] - -[1]: http://example.com/?a=1&b=2
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/strikethrough.html b/vendor/erusev/parsedown/test/data/strikethrough.html deleted file mode 100644 index 2a9da982..00000000 --- a/vendor/erusev/parsedown/test/data/strikethrough.html +++ /dev/null @@ -1,3 +0,0 @@ -<p><del>strikethrough</del></p> -<p>here's <del>one</del> followed by <del>another one</del></p> -<p>~~ this ~~ is not one neither is ~this~</p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/strikethrough.md b/vendor/erusev/parsedown/test/data/strikethrough.md deleted file mode 100644 index d169144d..00000000 --- a/vendor/erusev/parsedown/test/data/strikethrough.md +++ /dev/null @@ -1,5 +0,0 @@ -~~strikethrough~~ - -here's ~~one~~ followed by ~~another one~~ - -~~ this ~~ is not one neither is ~this~
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/strong_em.html b/vendor/erusev/parsedown/test/data/strong_em.html deleted file mode 100644 index b709c991..00000000 --- a/vendor/erusev/parsedown/test/data/strong_em.html +++ /dev/null @@ -1,6 +0,0 @@ -<p><em>em <strong>strong em</strong></em></p> -<p><em><strong>strong em</strong> em</em></p> -<p><em>em <strong>strong em</strong> em</em></p> -<p><em>em <strong>strong em</strong></em></p> -<p><em><strong>strong em</strong> em</em></p> -<p><em>em <strong>strong em</strong> em</em></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/strong_em.md b/vendor/erusev/parsedown/test/data/strong_em.md deleted file mode 100644 index f2aa3c78..00000000 --- a/vendor/erusev/parsedown/test/data/strong_em.md +++ /dev/null @@ -1,11 +0,0 @@ -*em **strong em*** - -***strong em** em* - -*em **strong em** em* - -_em __strong em___ - -___strong em__ em_ - -_em __strong em__ em_
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/tab-indented_code_block.html b/vendor/erusev/parsedown/test/data/tab-indented_code_block.html deleted file mode 100644 index 7c140de7..00000000 --- a/vendor/erusev/parsedown/test/data/tab-indented_code_block.html +++ /dev/null @@ -1,6 +0,0 @@ -<pre><code><?php - -$message = 'Hello World!'; -echo $message; - -echo "following a blank line";</code></pre>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/tab-indented_code_block.md b/vendor/erusev/parsedown/test/data/tab-indented_code_block.md deleted file mode 100644 index a405a160..00000000 --- a/vendor/erusev/parsedown/test/data/tab-indented_code_block.md +++ /dev/null @@ -1,6 +0,0 @@ - <?php - - $message = 'Hello World!'; - echo $message; - - echo "following a blank line";
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/table_inline_markdown.html b/vendor/erusev/parsedown/test/data/table_inline_markdown.html deleted file mode 100644 index f4cebecb..00000000 --- a/vendor/erusev/parsedown/test/data/table_inline_markdown.html +++ /dev/null @@ -1,22 +0,0 @@ -<table> -<thead> -<tr> -<th><em>header</em> 1</th> -<th>header 2</th> -</tr> -</thead> -<tbody> -<tr> -<td><em>cell</em> 1.1</td> -<td><del>cell</del> 1.2</td> -</tr> -<tr> -<td><code>|</code> 2.1</td> -<td>| 2.2</td> -</tr> -<tr> -<td><code>\|</code> 2.1</td> -<td><a href="/">link</a></td> -</tr> -</tbody> -</table>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/table_inline_markdown.md b/vendor/erusev/parsedown/test/data/table_inline_markdown.md deleted file mode 100644 index 2f3c6200..00000000 --- a/vendor/erusev/parsedown/test/data/table_inline_markdown.md +++ /dev/null @@ -1,5 +0,0 @@ -| _header_ 1 | header 2 | -| ------------ | ------------ | -| _cell_ 1.1 | ~~cell~~ 1.2 | -| `|` 2.1 | \| 2.2 | -| `\|` 2.1 | [link](/) |
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/text_reference.html b/vendor/erusev/parsedown/test/data/text_reference.html deleted file mode 100644 index 11e4d37f..00000000 --- a/vendor/erusev/parsedown/test/data/text_reference.html +++ /dev/null @@ -1,8 +0,0 @@ -<p><a href="http://example.com">reference link</a></p> -<p><a href="http://example.com">one</a> with a semantic name</p> -<p>[one][404] with no definition</p> -<p><a href="http://example.com">multiline -one</a> defined on 2 lines</p> -<p><a href="http://example.com">one</a> with a mixed case label and an upper case definition</p> -<p><a href="http://example.com">one</a> with the a label on the next line</p> -<p><a href="http://example.com"><code>link</code></a></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/text_reference.md b/vendor/erusev/parsedown/test/data/text_reference.md deleted file mode 100644 index 1a66a5cf..00000000 --- a/vendor/erusev/parsedown/test/data/text_reference.md +++ /dev/null @@ -1,21 +0,0 @@ -[reference link][1] - -[1]: http://example.com - -[one][website] with a semantic name - -[website]: http://example.com - -[one][404] with no definition - -[multiline -one][website] defined on 2 lines - -[one][Label] with a mixed case label and an upper case definition - -[LABEL]: http://example.com - -[one] -[1] with the a label on the next line - -[`link`][website]
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/unordered_list.html b/vendor/erusev/parsedown/test/data/unordered_list.html deleted file mode 100644 index cd95567b..00000000 --- a/vendor/erusev/parsedown/test/data/unordered_list.html +++ /dev/null @@ -1,10 +0,0 @@ -<ul> -<li>li</li> -<li>li</li> -</ul> -<p>mixed markers:</p> -<ul> -<li>li</li> -<li>li</li> -<li>li</li> -</ul>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/unordered_list.md b/vendor/erusev/parsedown/test/data/unordered_list.md deleted file mode 100644 index cf62c99f..00000000 --- a/vendor/erusev/parsedown/test/data/unordered_list.md +++ /dev/null @@ -1,8 +0,0 @@ -- li -- li - -mixed markers: - -* li -+ li -- li
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/untidy_table.html b/vendor/erusev/parsedown/test/data/untidy_table.html deleted file mode 100644 index 88e1c2bd..00000000 --- a/vendor/erusev/parsedown/test/data/untidy_table.html +++ /dev/null @@ -1,18 +0,0 @@ -<table> -<thead> -<tr> -<th>header 1</th> -<th>header 2</th> -</tr> -</thead> -<tbody> -<tr> -<td>cell 1.1</td> -<td>cell 1.2</td> -</tr> -<tr> -<td>cell 2.1</td> -<td>cell 2.2</td> -</tr> -</tbody> -</table>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/untidy_table.md b/vendor/erusev/parsedown/test/data/untidy_table.md deleted file mode 100644 index 8524eb18..00000000 --- a/vendor/erusev/parsedown/test/data/untidy_table.md +++ /dev/null @@ -1,4 +0,0 @@ -| header 1 | header 2 | -| ------------- | ----------- | -| cell 1.1 | cell 1.2 | -| cell 2.1 | cell 2.2 |
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/url_autolinking.html b/vendor/erusev/parsedown/test/data/url_autolinking.html deleted file mode 100644 index 58ca94c6..00000000 --- a/vendor/erusev/parsedown/test/data/url_autolinking.html +++ /dev/null @@ -1,3 +0,0 @@ -<p>an autolink <a href="http://example.com">http://example.com</a></p> -<p>inside of brackets [<a href="http://example.com">http://example.com</a>], inside of braces {<a href="http://example.com">http://example.com</a>}, inside of parentheses (<a href="http://example.com">http://example.com</a>)</p> -<p>trailing slash <a href="http://example.com/">http://example.com/</a> and <a href="http://example.com/path/">http://example.com/path/</a></p>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/url_autolinking.md b/vendor/erusev/parsedown/test/data/url_autolinking.md deleted file mode 100644 index 840f3540..00000000 --- a/vendor/erusev/parsedown/test/data/url_autolinking.md +++ /dev/null @@ -1,5 +0,0 @@ -an autolink http://example.com - -inside of brackets [http://example.com], inside of braces {http://example.com}, inside of parentheses (http://example.com) - -trailing slash http://example.com/ and http://example.com/path/
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/whitespace.html b/vendor/erusev/parsedown/test/data/whitespace.html deleted file mode 100644 index f2dd7a00..00000000 --- a/vendor/erusev/parsedown/test/data/whitespace.html +++ /dev/null @@ -1 +0,0 @@ -<pre><code>code</code></pre>
\ No newline at end of file diff --git a/vendor/erusev/parsedown/test/data/whitespace.md b/vendor/erusev/parsedown/test/data/whitespace.md deleted file mode 100644 index 4cf926a8..00000000 --- a/vendor/erusev/parsedown/test/data/whitespace.md +++ /dev/null @@ -1,5 +0,0 @@ - - - code - -
\ No newline at end of file diff --git a/vendor/symfony/finder/Finder.php b/vendor/symfony/finder/Finder.php index c28aaf74..278b9841 100644 --- a/vendor/symfony/finder/Finder.php +++ b/vendor/symfony/finder/Finder.php @@ -540,9 +540,9 @@ class Finder implements \IteratorAggregate, \Countable foreach ((array) $dirs as $dir) { if (is_dir($dir)) { - $resolvedDirs[] = $dir; + $resolvedDirs[] = $this->normalizeDir($dir); } elseif ($glob = glob($dir, (defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR)) { - $resolvedDirs = array_merge($resolvedDirs, $glob); + $resolvedDirs = array_merge($resolvedDirs, array_map(array($this, 'normalizeDir'), $glob)); } else { throw new \InvalidArgumentException(sprintf('The "%s" directory does not exist.', $dir)); } @@ -728,4 +728,16 @@ class Finder implements \IteratorAggregate, \Countable return $iterator; } + + /** + * Normalizes given directory names by removing trailing slashes. + * + * @param string $dir + * + * @return string + */ + private function normalizeDir($dir) + { + return rtrim($dir, '/'.\DIRECTORY_SEPARATOR); + } } diff --git a/vendor/symfony/finder/SplFileInfo.php b/vendor/symfony/finder/SplFileInfo.php index 2cf3a27f..19f95e26 100644 --- a/vendor/symfony/finder/SplFileInfo.php +++ b/vendor/symfony/finder/SplFileInfo.php @@ -28,7 +28,7 @@ class SplFileInfo extends \SplFileInfo */ public function __construct($file, $relativePath, $relativePathname) { - parent::__construct(realpath($file) ?: $file); + parent::__construct($file); $this->relativePath = $relativePath; $this->relativePathname = $relativePathname; } diff --git a/vendor/symfony/finder/Tests/FinderTest.php b/vendor/symfony/finder/Tests/FinderTest.php index 634f731a..c7908fa8 100644 --- a/vendor/symfony/finder/Tests/FinderTest.php +++ b/vendor/symfony/finder/Tests/FinderTest.php @@ -48,15 +48,40 @@ class FinderTest extends Iterator\RealIteratorTestCase public function testRemoveTrailingSlash() { - if ('\\' === \DIRECTORY_SEPARATOR) { - $this->markTestSkipped('This test cannot be run on Windows.'); + $finder = $this->buildFinder(); + + $expected = $this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py', 'foo bar')); + $in = self::$tmpDir.'//'; + + $this->assertIterator($expected, $finder->in($in)->files()->getIterator()); + } + + public function testSymlinksNotResolved() + { + if ('\\' === DIRECTORY_SEPARATOR) { + $this->markTestSkipped('symlinks are not supported on Windows'); } $finder = $this->buildFinder(); - $expected = $this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py', 'foo bar')); - $in = '//'.realpath(self::$tmpDir).'//'; + symlink($this->toAbsolute('foo'), $this->toAbsolute('baz')); + $expected = $this->toAbsolute(array('baz/bar.tmp')); + $in = self::$tmpDir.'/baz/'; + try { + $this->assertIterator($expected, $finder->in($in)->files()->getIterator()); + unlink($this->toAbsolute('baz')); + } catch (\Exception $e) { + unlink($this->toAbsolute('baz')); + throw $e; + } + } + + public function testBackPathNotNormalized() + { + $finder = $this->buildFinder(); + $expected = $this->toAbsolute(array('foo/../foo/bar.tmp')); + $in = self::$tmpDir.'/foo/../foo/'; $this->assertIterator($expected, $finder->in($in)->files()->getIterator()); } @@ -275,7 +300,7 @@ class FinderTest extends Iterator\RealIteratorTestCase public function testInWithGlob() { $finder = $this->buildFinder(); - $finder->in(array(__DIR__.'/Fixtures/*/B/C', __DIR__.'/Fixtures/*/*/B/C'))->getIterator(); + $finder->in(array(__DIR__.'/Fixtures/*/B/C/', __DIR__.'/Fixtures/*/*/B/C/'))->getIterator(); $this->assertIterator($this->toAbsoluteFixtures(array('A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy')), $finder); } @@ -528,8 +553,8 @@ class FinderTest extends Iterator\RealIteratorTestCase $finder->in($locations)->depth('< 10')->name('*.neon'); $expected = array( - __DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'c.neon', - __DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'d.neon', + __DIR__.'/Fixtures/one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'c.neon', + __DIR__.'/Fixtures/one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'d.neon', ); $this->assertIterator($expected, $finder); |