From eafdbaea0d23539a8b04b346fd46303d345e4a9f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 30 Nov 2016 16:04:00 +0100
Subject: [PATCH] updated geshi
---
composer.lock | 15 ++--
vendor/autoload.php | 2 +-
vendor/composer/ClassLoader.php | 5 ++
vendor/composer/installed.json | 98 +++++++++++------------
vendor/easybook/geshi/geshi/css.php | 32 +++++---
vendor/easybook/geshi/geshi/php-brief.php | 2 +-
vendor/easybook/geshi/geshi/php.php | 2 +-
7 files changed, 87 insertions(+), 69 deletions(-)
diff --git a/composer.lock b/composer.lock
index 9a35ea729..6867fd698 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,21 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
+ "hash": "762e5a22135332cb4b2e6e74eaed4f84",
"content-hash": "203c74fd2582945e08dcab4324b70d55",
"packages": [
{
"name": "easybook/geshi",
- "version": "v1.0.8.17",
+ "version": "v1.0.8.18",
"source": {
"type": "git",
"url": "https://github.com/easybook/geshi.git",
- "reference": "0fced4f530c0a1726588651f04c2bf2a3073c9c0"
+ "reference": "4b06bfe8c6fbedd6aad0a0700d650f591386e287"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/easybook/geshi/zipball/0fced4f530c0a1726588651f04c2bf2a3073c9c0",
- "reference": "0fced4f530c0a1726588651f04c2bf2a3073c9c0",
+ "url": "https://api.github.com/repos/easybook/geshi/zipball/4b06bfe8c6fbedd6aad0a0700d650f591386e287",
+ "reference": "4b06bfe8c6fbedd6aad0a0700d650f591386e287",
"shasum": ""
},
"require": {
@@ -50,7 +51,7 @@
"highlighter",
"syntax"
],
- "time": "2016-03-29T13:15:17+00:00"
+ "time": "2016-10-05 07:15:42"
},
{
"name": "paragonie/random_compat",
@@ -98,7 +99,7 @@
"pseudorandom",
"random"
],
- "time": "2016-11-07T23:38:38+00:00"
+ "time": "2016-11-07 23:38:38"
},
{
"name": "splitbrain/php-archive",
@@ -145,7 +146,7 @@
"unzip",
"zip"
],
- "time": "2015-08-12T13:24:34+00:00"
+ "time": "2015-08-12 13:24:34"
}
],
"packages-dev": [],
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 521b48559..88c7fd93b 100644
--- 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 ComposerAutoloaderInita19a915ee98347a0c787119619d2ff9b::getLoader();
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 126b53882..ac67d302a 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -313,6 +313,11 @@ class ClassLoader
*/
public function findFile($class)
{
+ // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
+ if ('\\' == $class[0]) {
+ $class = substr($class, 1);
+ }
+
// class map lookup
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 7f256f1a5..a42d646f2 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -20,7 +20,7 @@
"require-dev": {
"phpunit/phpunit": "4.5.*"
},
- "time": "2015-08-12T13:24:34+00:00",
+ "time": "2015-08-12 13:24:34",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -49,101 +49,101 @@
]
},
{
- "name": "easybook/geshi",
- "version": "v1.0.8.17",
- "version_normalized": "1.0.8.17",
+ "name": "paragonie/random_compat",
+ "version": "v2.0.4",
+ "version_normalized": "2.0.4.0",
"source": {
"type": "git",
- "url": "https://github.com/easybook/geshi.git",
- "reference": "0fced4f530c0a1726588651f04c2bf2a3073c9c0"
+ "url": "https://github.com/paragonie/random_compat.git",
+ "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/easybook/geshi/zipball/0fced4f530c0a1726588651f04c2bf2a3073c9c0",
- "reference": "0fced4f530c0a1726588651f04c2bf2a3073c9c0",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
+ "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
"shasum": ""
},
"require": {
- "php": ">4.3.0"
+ "php": ">=5.2.0"
},
- "time": "2016-03-29T13:15:17+00:00",
+ "require-dev": {
+ "phpunit/phpunit": "4.*|5.*"
+ },
+ "suggest": {
+ "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+ },
+ "time": "2016-11-07 23:38:38",
"type": "library",
"installation-source": "dist",
"autoload": {
- "classmap": [
- "./"
+ "files": [
+ "lib/random.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "GPL-2.0"
+ "MIT"
],
"authors": [
{
- "name": "Nigel McNie",
- "email": "nigel@geshi.org"
- },
- {
- "name": "Benny Baumann",
- "email": "BenBE@geshi.org"
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com",
+ "homepage": "https://paragonie.com"
}
],
- "description": "GeSHi - Generic Syntax Highlighter. This is an unmodified port of GeSHi project code found on SourceForge.",
- "homepage": "http://qbnz.com/highlighter",
+ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
"keywords": [
- "highlight",
- "highlighter",
- "syntax"
+ "csprng",
+ "pseudorandom",
+ "random"
]
},
{
- "name": "paragonie/random_compat",
- "version": "v2.0.4",
- "version_normalized": "2.0.4.0",
+ "name": "easybook/geshi",
+ "version": "v1.0.8.18",
+ "version_normalized": "1.0.8.18",
"source": {
"type": "git",
- "url": "https://github.com/paragonie/random_compat.git",
- "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e"
+ "url": "https://github.com/easybook/geshi.git",
+ "reference": "4b06bfe8c6fbedd6aad0a0700d650f591386e287"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
- "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
+ "url": "https://api.github.com/repos/easybook/geshi/zipball/4b06bfe8c6fbedd6aad0a0700d650f591386e287",
+ "reference": "4b06bfe8c6fbedd6aad0a0700d650f591386e287",
"shasum": ""
},
"require": {
- "php": ">=5.2.0"
- },
- "require-dev": {
- "phpunit/phpunit": "4.*|5.*"
- },
- "suggest": {
- "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+ "php": ">4.3.0"
},
- "time": "2016-11-07T23:38:38+00:00",
+ "time": "2016-10-05 07:15:42",
"type": "library",
"installation-source": "dist",
"autoload": {
- "files": [
- "lib/random.php"
+ "classmap": [
+ "./"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "GPL-2.0"
],
"authors": [
{
- "name": "Paragon Initiative Enterprises",
- "email": "security@paragonie.com",
- "homepage": "https://paragonie.com"
+ "name": "Nigel McNie",
+ "email": "nigel@geshi.org"
+ },
+ {
+ "name": "Benny Baumann",
+ "email": "BenBE@geshi.org"
}
],
- "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+ "description": "GeSHi - Generic Syntax Highlighter. This is an unmodified port of GeSHi project code found on SourceForge.",
+ "homepage": "http://qbnz.com/highlighter",
"keywords": [
- "csprng",
- "pseudorandom",
- "random"
+ "highlight",
+ "highlighter",
+ "syntax"
]
}
]
diff --git a/vendor/easybook/geshi/geshi/css.php b/vendor/easybook/geshi/geshi/css.php
index cd15a20f6..6f923a8eb 100644
--- a/vendor/easybook/geshi/geshi/css.php
+++ b/vendor/easybook/geshi/geshi/css.php
@@ -69,27 +69,37 @@ $language_data = array (
),
'KEYWORDS' => array(
1 => array(
+ 'align-items', 'align-self', 'align-content',
'aqua', 'azimuth', 'background-attachment', 'background-color',
'background-image', 'background-position', 'background-repeat',
'background', 'black', 'blue', 'border-bottom-color',
'border-radius', 'border-top-left-radius', 'border-top-right-radius',
'border-bottom-right-radius', 'border-bottom-left-radius',
- 'border-bottom-style', 'border-bottom-width', 'border-left-color',
+ 'border-bottom-style', 'border-bottom-width', 'border-image-source',
+ 'border-image-slice', 'border-image-width', 'border-image-outset',
+ 'border-image-repeat', 'border-image', 'border-left-color',
'border-left-style', 'border-left-width', 'border-right',
'border-right-color', 'border-right-style', 'border-right-width',
'border-top-color', 'border-top-style',
'border-top-width','border-bottom', 'border-collapse',
'border-left', 'border-width', 'border-color', 'border-spacing',
- 'border-style', 'border-top', 'border', 'caption-side', 'clear',
+ 'border-style', 'border-top', 'border', 'box-shadow',
+ 'break-after', 'break-before', 'break-inside', 'column-count',
+ 'column-fill', 'column-gap', 'column-rule', 'column-rule-color',
+ 'column-rule-style', 'column-rule-width', 'columns', 'column-span',
+ 'column-width', 'caption-side', 'clear',
'clip', 'color', 'content', 'counter-increment', 'counter-reset',
'cue-after', 'cue-before', 'cue', 'cursor', 'direction', 'display',
- 'elevation', 'empty-cells', 'float', 'font-family', 'font-size',
+ 'elevation', 'empty-cells', 'flex-direction', 'flex-grow',
+ 'flex-wrap', 'flex-shrink', 'flex-basis', 'flex-flow', 'flex',
+
+ 'float', 'font-family', 'font-size',
'font-size-adjust', 'font-stretch', 'font-style', 'font-variant',
- 'font-weight', 'font', 'line-height', 'letter-spacing',
+ 'font-weight', 'font', 'justify-content', 'line-height', 'letter-spacing',
'list-style', 'list-style-image', 'list-style-position',
'list-style-type', 'margin-bottom', 'margin-left', 'margin-right',
'margin-top', 'margin', 'marker-offset', 'marks', 'max-height',
- 'max-width', 'min-height', 'min-width', 'orphans', 'outline',
+ 'max-width', 'min-height', 'min-width', 'order', 'orphans', 'outline',
'outline-color', 'outline-style', 'outline-width', 'overflow',
'padding-bottom', 'padding-left', 'padding-right', 'padding-top',
'padding', 'page', 'page-break-after', 'page-break-before',
@@ -108,12 +118,13 @@ $language_data = array (
'avoid', 'baseline', 'behind', 'below', 'bidi-override', 'blink',
'block', 'bold', 'bolder', 'both', 'capitalize', 'center-left',
'center-right', 'center', 'circle', 'cjk-ideographic',
- 'close-quote', 'collapse', 'condensed', 'continuous', 'crop',
+ 'close-quote', 'collapse', 'column', 'column-reverse', 'condensed', 'continuous', 'crop',
'crosshair', 'cross', 'cursive', 'dashed', 'decimal-leading-zero',
'decimal', 'default', 'digits', 'disc', 'dotted', 'double',
+ 'ease-in', 'ease-out',
'e-resize', 'embed', 'extra-condensed', 'extra-expanded',
'expanded', 'fantasy', 'far-left', 'far-right', 'faster', 'fast',
- 'fixed', 'fuchsia', 'georgian', 'gray', 'green', 'groove',
+ 'fixed', 'flex-end', 'flex-start', 'fuchsia', 'georgian', 'gray', 'green', 'groove',
'hebrew', 'help', 'hidden', 'hide', 'higher', 'high',
'hiragana-iroha', 'hiragana', 'icon', 'inherit', 'inline-table',
'inline', 'inset', 'inside', 'invert', 'italic', 'justify',
@@ -127,18 +138,19 @@ $language_data = array (
'nw-resize', 'oblique', 'olive', 'once', 'open-quote', 'outset',
'outside', 'overline', 'pointer', 'portrait', 'purple', 'px',
'red', 'relative', 'repeat-x', 'repeat-y', 'repeat', 'rgb',
- 'ridge', 'right-side', 'rightwards', 's-resize', 'sans-serif',
+ 'ridge', 'right-side', 'rightwards', 'row', 'row-reverse', 's-resize', 'sans-serif',
'scroll', 'se-resize', 'semi-condensed', 'semi-expanded',
'separate', 'serif', 'show', 'silent', 'silver', 'slow', 'slower',
'small-caps', 'small-caption', 'smaller', 'soft', 'solid',
- 'spell-out', 'square', 'static', 'status-bar', 'super',
+ 'space-around', 'space-between',
+ 'spell-out', 'square', 'static', 'status-bar', 'stretch', 'super',
'sw-resize', 'table-caption', 'table-cell', 'table-column',
'table-column-group', 'table-footer-group', 'table-header-group',
'table-row', 'table-row-group', 'teal', 'text', 'text-bottom',
'text-top', 'thick', 'thin', 'transparent', 'ultra-condensed',
'ultra-expanded', 'underline', 'upper-alpha', 'upper-latin',
'upper-roman', 'uppercase', 'url', 'visible', 'w-resize', 'wait',
- 'white', 'wider', 'x-fast', 'x-high', 'x-large', 'x-loud',
+ 'white', 'wider', 'wrap', 'wrap-reverse', 'x-fast', 'x-high', 'x-large', 'x-loud',
'x-low', 'x-small', 'x-soft', 'xx-large', 'xx-small', 'yellow',
'yes'
)
diff --git a/vendor/easybook/geshi/geshi/php-brief.php b/vendor/easybook/geshi/geshi/php-brief.php
index dc93282ab..c88e7cbdf 100644
--- a/vendor/easybook/geshi/geshi/php-brief.php
+++ b/vendor/easybook/geshi/geshi/php-brief.php
@@ -160,7 +160,7 @@ $language_data = array (
'URLS' => array(
1 => '',
2 => '',
- 3 => 'http://php.net/{FNAMEL}'
+ 3 => 'http://www.php.net/{FNAMEL}'
),
'OOLANG' => true,
'OBJECT_SPLITTERS' => array(
diff --git a/vendor/easybook/geshi/geshi/php.php b/vendor/easybook/geshi/geshi/php.php
index c8fbc3ad4..7b5c16e18 100644
--- a/vendor/easybook/geshi/geshi/php.php
+++ b/vendor/easybook/geshi/geshi/php.php
@@ -1052,7 +1052,7 @@ $language_data = array(
'URLS' => array(
1 => '',
2 => '',
- 3 => 'http://php.net/{FNAMEL}',
+ 3 => 'http://www.php.net/{FNAMEL}',
4 => ''
),
'OOLANG' => true,
--
GitLab