joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-20 11:05:08 +00:00
Code Packages Releases Activity

[4.3] php-diff line endings (#40070)

Browse Source
This commit is contained in:
Brian Teeman 2023-03-12 12:39:26 +00:00 committed by GitHub
parent 40b00ade90
commit 26b53bae7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
administrator/components/com_templates/tmpl/template/default.php
View File

@ -150,7 +150,10 @@ if ($this->type == 'font') {
$this->source->coreFile,
$this->source->filePath,
ComponentHelper::getParams('com_templates')->get('difference', 'SideByside'),
['context' => 1],
[
'context' => 1,
'ignoreLineEnding' => true,
],
[
'language' => [
'old_version' => Text::_('COM_TEMPLATES_DIFF_CORE'),

2
composer.json
View File

@ -99,7 +99,7 @@
"lcobucci/jwt": "^3.4.6",
"web-token/signature-pack": "^2.2.11",
"phpseclib/bcmath_compat": "^2.0.1",
"jfcherng/php-diff": "^6.10.8",
"jfcherng/php-diff": "^6.10.10",
"voku/portable-utf8": "6.0.12 as 5.4.0"
},
"require-dev": {

89
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "dc01dab47679873cf96a6ab67b348137",
"content-hash": "7d7e4fcd000cdf5d9b8388545e5318f1",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@ -812,16 +812,16 @@
},
{
"name": "jfcherng/php-diff",
"version": "6.10.8",
"version": "6.10.10",
"source": {
"type": "git",
"url": "https://github.com/jfcherng/php-diff.git",
"reference": "1dfc245316db88e403b486f55f356acddaf94cd0"
"reference": "01254df95a22d9da8338091695ada04ff1b56b8c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jfcherng/php-diff/zipball/1dfc245316db88e403b486f55f356acddaf94cd0",
"reference": "1dfc245316db88e403b486f55f356acddaf94cd0",
"url": "https://api.github.com/repos/jfcherng/php-diff/zipball/01254df95a22d9da8338091695ada04ff1b56b8c",
"reference": "01254df95a22d9da8338091695ada04ff1b56b8c",
"shasum": ""
},
"require": {
@ -866,7 +866,7 @@
],
"support": {
"issues": "https://github.com/jfcherng/php-diff/issues",
"source": "https://github.com/jfcherng/php-diff/tree/6.10.8"
"source": "https://github.com/jfcherng/php-diff/tree/6.10.10"
},
"funding": [
{
@ -874,7 +874,7 @@
"type": "custom"
}
],
"time": "2023-01-18T16:51:03+00:00"
"time": "2023-03-11T07:31:27+00:00"
},
{
"name": "jfcherng/php-mb-string",
@ -930,16 +930,16 @@
},
{
"name": "jfcherng/php-sequence-matcher",
"version": "3.2.8",
"version": "3.2.9",
"source": {
"type": "git",
"url": "https://github.com/jfcherng/php-sequence-matcher.git",
"reference": "410519ca07cd7989f450d6e2aa40975dbd1be048"
"reference": "5de2243aa611a66395d85ba1a9169b439bd13e4d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jfcherng/php-sequence-matcher/zipball/410519ca07cd7989f450d6e2aa40975dbd1be048",
"reference": "410519ca07cd7989f450d6e2aa40975dbd1be048",
"url": "https://api.github.com/repos/jfcherng/php-sequence-matcher/zipball/5de2243aa611a66395d85ba1a9169b439bd13e4d",
"reference": "5de2243aa611a66395d85ba1a9169b439bd13e4d",
"shasum": ""
},
"require": {
@ -947,7 +947,6 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.19",
"liip/rmt": "^1.6",
"phan/phan": "^2.5 || ^3 || ^4 || ^5",
"phpunit/phpunit": ">=7 <10",
"squizlabs/php_codesniffer": "^3.5"
@ -975,7 +974,7 @@
"description": "A longest sequence matcher. The logic is primarily based on the Python difflib package.",
"support": {
"issues": "https://github.com/jfcherng/php-sequence-matcher/issues",
"source": "https://github.com/jfcherng/php-sequence-matcher/tree/3.2.8"
"source": "https://github.com/jfcherng/php-sequence-matcher/tree/3.2.9"
},
"funding": [
{
@ -983,7 +982,7 @@
"type": "custom"
}
],
"time": "2021-09-02T04:02:02+00:00"
"time": "2023-03-11T06:56:44+00:00"
},
{
"name": "joomla/application",
@ -2088,16 +2087,16 @@
},
{
"name": "joomla/registry",
"version": "2.0.3",
"version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/registry.git",
"reference": "70d0fecd186f0ef1253fb3f7d27583a2b97da309"
"reference": "299ea7651f402ddcc6f50308c98a2057e05f1856"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/registry/zipball/70d0fecd186f0ef1253fb3f7d27583a2b97da309",
"reference": "70d0fecd186f0ef1253fb3f7d27583a2b97da309",
"url": "https://api.github.com/repos/joomla-framework/registry/zipball/299ea7651f402ddcc6f50308c98a2057e05f1856",
"reference": "299ea7651f402ddcc6f50308c98a2057e05f1856",
"shasum": ""
},
"require": {
@ -2141,7 +2140,7 @@
],
"support": {
"issues": "https://github.com/joomla-framework/registry/issues",
"source": "https://github.com/joomla-framework/registry/tree/2.0.3"
"source": "https://github.com/joomla-framework/registry/tree/2.0.4"
},
"funding": [
{
@ -2153,7 +2152,7 @@
"type": "github"
}
],
"time": "2023-02-23T19:32:06+00:00"
"time": "2023-03-02T14:13:06+00:00"
},
{
"name": "joomla/router",
@ -3102,16 +3101,16 @@
},
{
"name": "phpmailer/phpmailer",
"version": "v6.7.1",
"version": "v6.8.0",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "49cd7ea3d2563f028d7811f06864a53b1f15ff55"
"reference": "df16b615e371d81fb79e506277faea67a1be18f1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/49cd7ea3d2563f028d7811f06864a53b1f15ff55",
"reference": "49cd7ea3d2563f028d7811f06864a53b1f15ff55",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/df16b615e371d81fb79e506277faea67a1be18f1",
"reference": "df16b615e371d81fb79e506277faea67a1be18f1",
"shasum": ""
},
"require": {
@ -3170,7 +3169,7 @@
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
"support": {
"issues": "https://github.com/PHPMailer/PHPMailer/issues",
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.7.1"
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.8.0"
},
"funding": [
{
@ -3178,7 +3177,7 @@
"type": "github"
}
],
"time": "2022-12-08T13:30:06+00:00"
"time": "2023-03-06T14:43:22+00:00"
},
{
"name": "phpseclib/bcmath_compat",
@ -3244,16 +3243,16 @@
},
{
"name": "phpseclib/phpseclib",
"version": "3.0.18",
"version": "3.0.19",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "f28693d38ba21bb0d9f0c411ee5dae2b178201da"
"reference": "cc181005cf548bfd8a4896383bb825d859259f95"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/f28693d38ba21bb0d9f0c411ee5dae2b178201da",
"reference": "f28693d38ba21bb0d9f0c411ee5dae2b178201da",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95",
"reference": "cc181005cf548bfd8a4896383bb825d859259f95",
"shasum": ""
},
"require": {
@ -3334,7 +3333,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.18"
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.19"
},
"funding": [
{
@ -3350,7 +3349,7 @@
"type": "tidelift"
}
],
"time": "2022-12-17T18:26:50+00:00"
"time": "2023-03-05T17:13:09+00:00"
},
{
"name": "psr/container",
@ -8150,16 +8149,16 @@
},
{
"name": "guzzlehttp/psr7",
"version": "2.4.3",
"version": "2.4.4",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "67c26b443f348a51926030c83481b85718457d3d"
"reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d",
"reference": "67c26b443f348a51926030c83481b85718457d3d",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf",
"reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf",
"shasum": ""
},
"require": {
@ -8249,7 +8248,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.4.3"
"source": "https://github.com/guzzle/psr7/tree/2.4.4"
},
"funding": [
{
@ -8265,7 +8264,7 @@
"type": "tidelift"
}
],
"time": "2022-10-26T14:07:24+00:00"
"time": "2023-03-09T13:19:02+00:00"
},
{
"name": "hoa/consistency",
@ -9203,16 +9202,16 @@
},
{
"name": "myclabs/deep-copy",
"version": "1.11.0",
"version": "1.11.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
"reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
"reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
"reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
"shasum": ""
},
"require": {
@ -9250,7 +9249,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
"source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
"source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
},
"funding": [
{
@ -9258,7 +9257,7 @@
"type": "tidelift"
}
],
"time": "2022-03-03T13:19:32+00:00"
"time": "2023-03-08T13:26:56+00:00"
},
{
"name": "netresearch/jsonmapper",
@ -12082,5 +12081,5 @@
"platform-overrides": {
"php": "7.2.5"
},
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.1.0"
}