Skip to content

Commit

Permalink
Merge pull request #150 from FriendsOfREDAXO/vendor_updates
Browse files Browse the repository at this point in the history
VendorUpdate to 4.1.2
  • Loading branch information
alxndr-w authored Sep 2, 2024
2 parents c50a06c + 6e35762 commit 97e507d
Show file tree
Hide file tree
Showing 13 changed files with 219 additions and 197 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"require": {
"netcarver/textile": "^3.7.6"
"netcarver/textile": ">=3"
}
}
22 changes: 11 additions & 11 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/netcarver/textile/CHANGELOG.textile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,28 @@ h1. Changelog

Here's a summary of changes in each release. The list doesn't include some small changes or updates to test cases.

h2. "Version 4.1.2 - 2024/08/29":https://github.com/textile/php-textile/releases/tag/v4.1.2

* Fix PHP 8.4 compatibility issues (closes "#227":https://github.com/textile/php-textile/issues/227).

h2. "Version 4.1.1 - 2024/06/07":https://github.com/textile/php-textile/releases/tag/v4.1.1

* Links are now rendered when block tags are disabled (closes "#225":https://github.com/textile/php-textile/issues/225).

h2. "Version 4.1.0 - 2024/01/02":https://github.com/textile/php-textile/releases/tag/v4.1.0

* Support @:@ and @!@ characters in CSS class names (closes "#224":https://github.com/textile/php-textile/issues/224).
* Support including textile escape sequences inside link title attribute (closes "#223":https://github.com/textile/php-textile/issues/223).

h2. "Version 4.0.0 - 2022/12/03":https://github.com/textile/php-textile/releases/tag/v4.0.0

* HTML void tags render a self-closing slash based on the given document type. If @Parser::setDocumentType()@ is given @Parser::DOCTYPE_XHTML@, self-closing tags are used, otherwise not.

h2. "Version 3.8.0 - 2022/12/03":https://github.com/textile/php-textile/releases/tag/v3.8.0

* Added @Parser::setAlignClasses()@ and @Parser::isAlignClassesEnabled()@. This can be used to enable img alignment classes in XHTML output document mode, instead of the default align attribute.
* Added @Parser::DOCTYPE_HTML5@ and @Parser::DOCTYPE_XHTML@ constants. These can be used with @Parser::setDocumentType()@ to specify the output document type.

h2. "Version 3.7.7 - 2022/05/01":https://github.com/textile/php-textile/releases/tag/v3.7.7

* Fix deprecation errors that appear on PHP >= 8.1 about preg_split limit argument's NULL value.
Expand Down
2 changes: 1 addition & 1 deletion vendor/netcarver/textile/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Additions and fixes Copyright (c) 2010 Stef Dawson https://stefdawson.c
Additions and fixes Copyright (c) 2010-17 Netcarver https://github.com/netcarver
Additions and fixes Copyright (c) 2011 Jeff Soo http://ipsedixit.net/
Additions and fixes Copyright (c) 2012 Robert Wetzlmayr https://wetzlmayr.com/
Additions and fixes Copyright (c) 2012-19 Jukka Svahn https://rahforum.biz/
Additions and fixes Copyright (c) 2012-24 Jukka Svahn https://rahforum.biz/

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Expand Down
82 changes: 0 additions & 82 deletions vendor/netcarver/textile/Makefile

This file was deleted.

4 changes: 4 additions & 0 deletions vendor/netcarver/textile/README.textile
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,7 @@ $parser
h2. Getting in contact

The PHP-Textile project welcomes constructive input and bug reports from users. Please "open an issue":https://github.com/textile/php-textile/issues on the repository for a comment, feature request or bug.

h2. Development

See "CONTRIBUTING.textile":https://github.com/textile/php-textile/blob/master/.github/CONTRIBUTING.textile.
13 changes: 7 additions & 6 deletions vendor/netcarver/textile/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"homepage": "https://github.com/textile/php-textile",
"keywords": ["php-textile", "textile", "parser", "markup", "language", "html", "format", "plaintext", "document"],
"support": {
"irc": "irc://irc.freenode.net/textile",
"wiki": "https://github.com/textile/php-textile/wiki",
"issues": "https://github.com/textile/php-textile/issues",
"source": "https://github.com/textile/php-textile"
Expand All @@ -24,14 +23,15 @@
"php": ">=5.3.0"
},
"require-dev": {
"phpstan/phpstan": "1.6.3",
"phpstan/phpstan": "1.12.0",
"phpunit/phpunit": "^9.5.20",
"squizlabs/php_codesniffer": "3.*",
"symfony/yaml": "^4.4.3"
"symfony/yaml": "^5.4.40",
"psy/psysh": "^0.12.4"
},
"extra": {
"branch-alias": {
"dev-master": "3.7-dev"
"dev-master": "4.1-dev"
}
},
"scripts": {
Expand All @@ -40,10 +40,11 @@
"@composer test:static",
"@composer test:unit"
],
"bump": "@php ./scripts/release.php",
"bump-dev": "@php ./scripts/release.php --dev",
"project:bump": "@php ./scripts/release.php",
"project:bump-dev": "@php ./scripts/release.php --dev",
"lint": "phpcs",
"lint-fix": "phpcbf",
"repl": "psysh",
"test:static": "phpstan analyse --level 8 src",
"test:unit": "XDEBUG_MODE=coverage phpunit"
}
Expand Down
14 changes: 0 additions & 14 deletions vendor/netcarver/textile/docker-compose.yml

This file was deleted.

6 changes: 0 additions & 6 deletions vendor/netcarver/textile/phpstan.neon

This file was deleted.

8 changes: 0 additions & 8 deletions vendor/netcarver/textile/sonar-project.properties

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/netcarver/textile/src/Netcarver/Textile/DataBag.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class DataBag
*
* @param array<string, string|int>|null $data The initial data array stored in the bag
*/
public function __construct(array $data = null)
public function __construct($data = null)
{
$this->data = (array) $data;
}
Expand Down
Loading

0 comments on commit 97e507d

Please sign in to comment.