Update php-markdown to 1.7.0

makotokw · Nov 21, 2016 · e260bb3 · e260bb3
1 parent 763b11a
commit e260bb3
Show file tree

Hide file tree

Showing 18 changed files with 1,627 additions and 1,114 deletions.
diff --git a/composer.json b/composer.json
@@ -1,18 +1,19 @@
 {
-	"name": "makotokw/wp-gfm",
-	"authors": [
-		{
-			"name": "Makoto Kawasaki",
-			"email": "makoto.kw@gmail.com"
-		}
-	],
-	"require": {
-		"php": ">=5.3",
-		"michelf/php-markdown": "1.6.*@dev"
-	},
-	"autoload": {
-		"psr-0": {
-			"": "src/"
-		}
-	}
+  "name": "makotokw/wp-gfm",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Makoto Kawasaki",
+      "email": "makoto.kw@gmail.com"
+    }
+  ],
+  "require": {
+    "php": ">=5.3",
+    "michelf/php-markdown": "1.7.*@dev"
+  },
+  "autoload": {
+    "psr-0": {
+      "Gfm\\Markdown\\": "src/"
+    }
+  }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit9facfe8654e0f473520ec5a6fb803482::getLoader();
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
@@ -53,8 +53,8 @@ class ClassLoader
 
     private $useIncludePath = false;
     private $classMap = array();
-
     private $classMapAuthoritative = false;
+    private $missingClasses = array();
 
     public function getPrefixes()
     {
@@ -322,20 +322,20 @@ public function findFile($class)
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
         }
-        if ($this->classMapAuthoritative) {
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
             return false;
         }
 
         $file = $this->findFileWithExtension($class, '.php');
 
         // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
+        if (false === $file && defined('HHVM_VERSION')) {
             $file = $this->findFileWithExtension($class, '.hh');
         }
 
-        if ($file === null) {
+        if (false === $file) {
             // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
+            $this->missingClasses[$class] = true;
         }
 
         return $file;
@@ -399,6 +399,8 @@ private function findFileWithExtension($class, $ext)
         if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
             return $file;
         }
+
+        return false;
     }
 }
 

diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE
@@ -1,5 +1,5 @@
 
-Copyright (c) 2015 Nils Adermann, Jordi Boggiano
+Copyright (c) 2016 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

diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
@@ -7,5 +7,5 @@
 
 return array(
     'Michelf' => array($vendorDir . '/michelf/php-markdown'),
-    '' => array($baseDir . '/src'),
+    'Gfm\\Markdown\\' => array($baseDir . '/src'),
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -23,19 +23,26 @@ public static function getLoader()
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInit9facfe8654e0f473520ec5a6fb803482', 'loadClassLoader'));
 
-        $map = require __DIR__ . '/autoload_namespaces.php';
-        foreach ($map as $namespace => $path) {
-            $loader->set($namespace, $path);
-        }
-
-        $map = require __DIR__ . '/autoload_psr4.php';
-        foreach ($map as $namespace => $path) {
-            $loader->setPsr4($namespace, $path);
-        }
-
-        $classMap = require __DIR__ . '/autoload_classmap.php';
-        if ($classMap) {
-            $loader->addClassMap($classMap);
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
+        if ($useStaticLoader) {
+            require_once __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInit9facfe8654e0f473520ec5a6fb803482::getInitializer($loader));
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                $loader->set($namespace, $path);
+            }
+
+            $map = require __DIR__ . '/autoload_psr4.php';
+            foreach ($map as $namespace => $path) {
+                $loader->setPsr4($namespace, $path);
+            }
+
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
         }
 
         $loader->register(true);

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -0,0 +1,33 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInit9facfe8654e0f473520ec5a6fb803482
+{
+    public static $prefixesPsr0 = array (
+        'M' => 
+        array (
+            'Michelf' => 
+            array (
+                0 => __DIR__ . '/..' . '/michelf/php-markdown',
+            ),
+        ),
+        'G' => 
+        array (
+            'Gfm\\Markdown\\' => 
+            array (
+                0 => __DIR__ . '/../..' . '/src',
+            ),
+        ),
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->prefixesPsr0 = ComposerStaticInit9facfe8654e0f473520ec5a6fb803482::$prefixesPsr0;
+
+        }, null, ClassLoader::class);
+    }
+}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -1,23 +1,23 @@
 [
     {
         "name": "michelf/php-markdown",
-        "version": "1.6.0",
-        "version_normalized": "1.6.0.0",
+        "version": "1.7.0",
+        "version_normalized": "1.7.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/michelf/php-markdown.git",
-            "reference": "156e56ee036505ec637d761ee62dc425d807183c"
+            "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/michelf/php-markdown/zipball/156e56ee036505ec637d761ee62dc425d807183c",
-            "reference": "156e56ee036505ec637d761ee62dc425d807183c",
+            "url": "https://api.github.com/repos/michelf/php-markdown/zipball/1f51cc520948f66cd2af8cbc45a5ee175e774220",
+            "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.0"
         },
-        "time": "2015-12-24 01:37:31",
+        "time": "2016-10-29 18:58:20",
         "type": "library",
         "extra": {
             "branch-alias": {

diff --git a/vendor/michelf/php-markdown/License.md b/vendor/michelf/php-markdown/License.md
@@ -1,5 +1,5 @@
 PHP Markdown Lib  
-Copyright (c) 2004-2015 Michel Fortin  
+Copyright (c) 2004-2016 Michel Fortin  
 <https://michelf.ca/>  
 All rights reserved.
 

diff --git a/vendor/michelf/php-markdown/Michelf/Markdown.inc.php b/vendor/michelf/php-markdown/Michelf/Markdown.inc.php
@@ -1,10 +1,10 @@
 <?php
 
-# Use this file if you cannot use class autoloading. It will include all the
-# files needed for the Markdown parser.
-#
-# Take a look at the PSR-0-compatible class autoloading implementation
-# in the Readme.php file if you want a simple autoloader setup.
+// Use this file if you cannot use class autoloading. It will include all the
+// files needed for the Markdown parser.
+//
+// Take a look at the PSR-0-compatible class autoloading implementation
+// in the Readme.php file if you want a simple autoloader setup.
 
 require_once dirname(__FILE__) . '/MarkdownInterface.php';
 require_once dirname(__FILE__) . '/Markdown.php';