Skip to content

Commit b442ba3

Browse files
committed
Updated composer packages
1 parent 86c28aa commit b442ba3

16 files changed

Lines changed: 131 additions & 81 deletions

File tree

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
"algo26-matthias/idna-convert": "^v3.1.1",
1212
"enshrined/svg-sanitize": "^0.19.0",
1313
"netcarver/textile": "v4.1.1",
14-
"league/commonmark": "^2.5.1",
14+
"league/commonmark": "^2.5.3",
1515
"ezyang/htmlpurifier": "^v4.17.0",
1616
"openpsa/universalfeedcreator": "^v1.9.0",
1717
"phpmailer/phpmailer": "^v6.9.1",
1818
"phpoffice/phpspreadsheet": "^1.29.0",
1919
"simplepie/simplepie": "@dev",
2020
"ext-intl": "*",
21-
"html2text/html2text": "^4.3.1",
21+
"html2text/html2text": "^4.3.2",
2222
"ext-gd": "*",
2323
"ext-mysqli": "*",
2424
"ext-mbstring": "*",

include/inc_lib/revision/revision.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
*
1010
**/
1111

12-
const PHPWCMS_VERSION = '1.9.41-dev';
13-
const PHPWCMS_RELEASE_DATE = '2024/08/08';
12+
const PHPWCMS_VERSION = '1.9.42-dev';
13+
const PHPWCMS_RELEASE_DATE = '2024/08/24';
1414
const PHPWCMS_REVISION = '553';

include/vendor/composer/autoload_psr4.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'),
2525
'League\\Config\\' => array($vendorDir . '/league/config/src'),
2626
'League\\CommonMark\\' => array($vendorDir . '/league/commonmark/src'),
27-
'Html2Text\\' => array($vendorDir . '/html2text/html2text/src', $vendorDir . '/html2text/html2text/test'),
27+
'Html2Text\\' => array($vendorDir . '/html2text/html2text/src'),
2828
'Dflydev\\DotAccessData\\' => array($vendorDir . '/dflydev/dot-access-data/src'),
2929
'Complex\\' => array($vendorDir . '/markbaker/complex/classes/src'),
3030
'Algo26\\IdnaConvert\\' => array($vendorDir . '/algo26-matthias/idna-convert/src'),

include/vendor/composer/autoload_static.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ class ComposerStaticInit95ad66835bf12809290dc5d76be58922
152152
'Html2Text\\' =>
153153
array (
154154
0 => __DIR__ . '/..' . '/html2text/html2text/src',
155-
1 => __DIR__ . '/..' . '/html2text/html2text/test',
156155
),
157156
'Dflydev\\DotAccessData\\' =>
158157
array (

include/vendor/composer/installed.json

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -251,35 +251,32 @@
251251
},
252252
{
253253
"name": "html2text/html2text",
254-
"version": "4.3.1",
255-
"version_normalized": "4.3.1.0",
254+
"version": "4.3.2",
255+
"version_normalized": "4.3.2.0",
256256
"source": {
257257
"type": "git",
258258
"url": "https://github.com/mtibben/html2text.git",
259-
"reference": "61ad68e934066a6f8df29a3d23a6460536d0855c"
259+
"reference": "3b443cbe302b52eb5806a21a9dbd79524203970a"
260260
},
261261
"dist": {
262262
"type": "zip",
263-
"url": "https://api.github.com/repos/mtibben/html2text/zipball/61ad68e934066a6f8df29a3d23a6460536d0855c",
264-
"reference": "61ad68e934066a6f8df29a3d23a6460536d0855c",
263+
"url": "https://api.github.com/repos/mtibben/html2text/zipball/3b443cbe302b52eb5806a21a9dbd79524203970a",
264+
"reference": "3b443cbe302b52eb5806a21a9dbd79524203970a",
265265
"shasum": ""
266266
},
267267
"require-dev": {
268-
"phpunit/phpunit": "~4"
268+
"phpunit/phpunit": "~4|^9.0"
269269
},
270270
"suggest": {
271271
"ext-mbstring": "For best performance",
272272
"symfony/polyfill-mbstring": "If you can't install ext-mbstring"
273273
},
274-
"time": "2020-04-16T23:44:31+00:00",
274+
"time": "2024-08-20T02:43:29+00:00",
275275
"type": "library",
276276
"installation-source": "dist",
277277
"autoload": {
278278
"psr-4": {
279-
"Html2Text\\": [
280-
"src/",
281-
"test/"
282-
]
279+
"Html2Text\\": "src/"
283280
}
284281
},
285282
"notification-url": "https://packagist.org/downloads/",
@@ -289,7 +286,7 @@
289286
"description": "Converts HTML to formatted plain text",
290287
"support": {
291288
"issues": "https://github.com/mtibben/html2text/issues",
292-
"source": "https://github.com/mtibben/html2text/tree/4.3.1"
289+
"source": "https://github.com/mtibben/html2text/tree/4.3.2"
293290
},
294291
"install-path": "../html2text/html2text"
295292
},
@@ -335,17 +332,17 @@
335332
},
336333
{
337334
"name": "league/commonmark",
338-
"version": "2.5.1",
339-
"version_normalized": "2.5.1.0",
335+
"version": "2.5.3",
336+
"version_normalized": "2.5.3.0",
340337
"source": {
341338
"type": "git",
342339
"url": "https://github.com/thephpleague/commonmark.git",
343-
"reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c"
340+
"reference": "b650144166dfa7703e62a22e493b853b58d874b0"
344341
},
345342
"dist": {
346343
"type": "zip",
347-
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/ac815920de0eff6de947eac0a6a94e5ed0fb147c",
348-
"reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c",
344+
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
345+
"reference": "b650144166dfa7703e62a22e493b853b58d874b0",
349346
"shasum": ""
350347
},
351348
"require": {
@@ -358,8 +355,8 @@
358355
},
359356
"require-dev": {
360357
"cebe/markdown": "^1.0",
361-
"commonmark/cmark": "0.31.0",
362-
"commonmark/commonmark.js": "0.31.0",
358+
"commonmark/cmark": "0.31.1",
359+
"commonmark/commonmark.js": "0.31.1",
363360
"composer/package-versions-deprecated": "^1.8",
364361
"embed/embed": "^4.4",
365362
"erusev/parsedown": "^1.0",
@@ -378,7 +375,7 @@
378375
"suggest": {
379376
"symfony/yaml": "v2.3+ required if using the Front Matter extension"
380377
},
381-
"time": "2024-07-24T12:52:09+00:00",
378+
"time": "2024-08-16T11:46:16+00:00",
382379
"type": "library",
383380
"extra": {
384381
"branch-alias": {

include/vendor/composer/installed.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => '__root__',
44
'pretty_version' => 'dev-master',
55
'version' => 'dev-master',
6-
'reference' => '0b7426fa0cf1d719254623738be8b31be97081f4',
6+
'reference' => '86c28aa8bc9618b190e1aa719cd9b1d665104fcc',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => 'dev-master',
1515
'version' => 'dev-master',
16-
'reference' => '0b7426fa0cf1d719254623738be8b31be97081f4',
16+
'reference' => '86c28aa8bc9618b190e1aa719cd9b1d665104fcc',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../../',
1919
'aliases' => array(),
@@ -56,9 +56,9 @@
5656
'dev_requirement' => false,
5757
),
5858
'html2text/html2text' => array(
59-
'pretty_version' => '4.3.1',
60-
'version' => '4.3.1.0',
61-
'reference' => '61ad68e934066a6f8df29a3d23a6460536d0855c',
59+
'pretty_version' => '4.3.2',
60+
'version' => '4.3.2.0',
61+
'reference' => '3b443cbe302b52eb5806a21a9dbd79524203970a',
6262
'type' => 'library',
6363
'install_path' => __DIR__ . '/../html2text/html2text',
6464
'aliases' => array(),
@@ -74,9 +74,9 @@
7474
'dev_requirement' => false,
7575
),
7676
'league/commonmark' => array(
77-
'pretty_version' => '2.5.1',
78-
'version' => '2.5.1.0',
79-
'reference' => 'ac815920de0eff6de947eac0a6a94e5ed0fb147c',
77+
'pretty_version' => '2.5.3',
78+
'version' => '2.5.3.0',
79+
'reference' => 'b650144166dfa7703e62a22e493b853b58d874b0',
8080
'type' => 'library',
8181
'install_path' => __DIR__ . '/../league/commonmark',
8282
'aliases' => array(),
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: CI Tests
2+
on: [push, pull_request]
3+
4+
jobs:
5+
PHPUnit:
6+
runs-on: ${{ matrix.os }}
7+
strategy:
8+
matrix:
9+
os:
10+
- ubuntu-latest
11+
php:
12+
- 5.4
13+
- 5.5
14+
- 5.6
15+
- 7.0
16+
- 7.1
17+
- 7.2
18+
- 7.3
19+
- 7.4
20+
- 8.0
21+
- 8.1
22+
- 8.2
23+
- 8.3
24+
- 8.4
25+
26+
steps:
27+
- uses: actions/checkout@v2
28+
29+
- name: Setup PHP
30+
uses: shivammathur/setup-php@v2
31+
with:
32+
php-version: ${{ matrix.php }}
33+
34+
- name: Install dependencies
35+
run: composer install
36+
37+
- name: Run PHPUnit
38+
run: vendor/bin/phpunit

include/vendor/html2text/html2text/.travis.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

include/vendor/html2text/html2text/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
A PHP library for converting HTML to formatted plain text.
44

5-
[![Build Status](https://travis-ci.org/mtibben/html2text.png?branch=master)](https://travis-ci.org/mtibben/html2text)
5+
[![Build status](https://github.com/mtibben/html2text/actions/workflows/ci.yml/badge.svg)](https://github.com/mtibben/html2text/actions/workflows/ci.yml)
66

77
## Installing
88

include/vendor/html2text/html2text/composer.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
"type": "library",
55
"license": "GPL-2.0-or-later",
66
"autoload": {
7-
"psr-4": { "Html2Text\\": ["src/", "test/"] }
7+
"psr-4": {
8+
"Html2Text\\": "src/"
9+
}
10+
},
11+
"autoload-dev": {
12+
"psr-4": {
13+
"Html2Text\\": "test/"
14+
}
815
},
916
"require-dev": {
10-
"phpunit/phpunit": "~4"
17+
"phpunit/phpunit": "~4|^9.0"
1118
},
1219
"suggest": {
1320
"ext-mbstring": "For best performance",
1421
"symfony/polyfill-mbstring": "If you can't install ext-mbstring"
1522
}
16-
}
23+
}

0 commit comments

Comments
 (0)