Merge branch 'master' into dependabot/npm_and_yarn/braces-3.0.3

gesinn-it-gea · web-flow · commit 2ea5a1595dfd · 2025-03-13T17:12:47.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,40 +11,51 @@ jobs:
 
   test:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     continue-on-error: ${{ matrix.experimental }}
 
     strategy:
       matrix:
         include:
-          - mediawiki_version: '1.35'
-            smw_version: '4.1.2'
-            php_version: 7.4
+          - mediawiki_version: '1.39'
+            php_version: 8.1
             database_type: mysql
-            database_image: "mysql:5.7"
+            database_image: "mariadb:11.2"
+            coverage: false
+            experimental: false
+          - mediawiki_version: '1.39'
+            php_version: 8.1
+            database_type: mysql
+            database_image: "mysql:8"
+            coverage: false
+            experimental: false
+          - mediawiki_version: '1.40'
+            php_version: 8.1
+            database_type: mysql
+            database_image: "mariadb:11.2"
             coverage: true
             experimental: false
-          - mediawiki_version: '1.35'
+          - mediawiki_version: '1.41'
             smw_version: dev-master
-            php_version: 7.4
+            php_version: 8.1
             database_type: mysql
-            database_image: "mysql:5.7"
+            database_image: "mariadb:11.2"
             coverage: false
             experimental: false
-          - mediawiki_version: '1.39'
+          - mediawiki_version: '1.42'
             smw_version: dev-master
             php_version: 8.1
             database_type: mysql
-            database_image: "mariadb:latest"
+            database_image: "mariadb:11.2"
             coverage: false
             experimental: false
-          - mediawiki_version: '1.40'
-            smw_version: 'dev-master'
+          - mediawiki_version: '1.43'
+            smw_version: dev-master
             php_version: 8.1
             database_type: mysql
-            database_image: "mariadb:latest"
+            database_image: "mariadb:11.2"
             coverage: false
-            experimental: true
+            experimental: false
 
 
     env:
@@ -73,7 +84,8 @@ jobs:
         if: matrix.coverage == true
 
       - name: Upload code coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage/php/coverage.xml
         if: matrix.coverage == true
diff --git a/Makefile b/Makefile
@@ -11,13 +11,13 @@ endif
 EXTENSION=Mermaid
 
 # docker images
-MW_VERSION?=1.35
-PHP_VERSION?=7.4
-DB_TYPE?=sqlite
-DB_IMAGE?=""
+MW_VERSION?=1.39
+PHP_VERSION?=8.1
+DB_TYPE?=mysql
+DB_IMAGE?="mariadb:11.2"
 
 # extensions
-SMW_VERSION?=4.1.2
+SMW_VERSION?=4.2.0
 
 # composer
 # Enables "composer update" inside of extension
diff --git a/README.md b/README.md
@@ -18,10 +18,10 @@ This extension provides the `#mermaid` parser function to support the generation
 
 ## Requirements
 
-Requirements for Mermaid 3.x:
+Requirements for Mermaid 4.x:
 
-- PHP 7.0 or later
-- MediaWiki 1.33 or later
+- PHP 7.4 or later
+- MediaWiki 1.39 or later
 
 You can use an older version of Mermaid for older versions of MediaWiki and/or PHP.
 
diff --git a/build b/build
@@ -1 +1 @@
-Subproject commit 91d00523e3a9e5b7b334562d6a7aed5a300c3787
+Subproject commit 2b67c6758a1c2799d2783f16ce0fb88e22357b7e
diff --git a/composer.json b/composer.json
@@ -20,12 +20,18 @@
 		}
 	],
 	"require": {
-		"php": ">=7.0.0",
-		"composer/installers": "1.*,>=1.0.1"
+		"php": ">=7.4",
+		"composer/installers": "^2.2.0|^1.0.1"
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.x-dev"
+			"dev-master": "4.x-dev"
+		}
+	},
+	"config": {
+		"process-timeout": 0,
+		"allow-plugins": {
+			"composer/installers": true
 		}
 	},
 	"scripts":{
diff --git a/docs/USAGE.md b/docs/USAGE.md
@@ -41,7 +41,7 @@ Note that is is also possible to further adapt the graph using CSS, e.g. to add
 }
 ```
 
-Further [examples][examplesmw] have been created on wiki.
+Further [examples][examplesmw] have been created on wiki. See also [Drawing Diagrams and Charts with Mermaid](https://www.pro.wiki/help/draw-mermaid-diagrams-charts-in-mediawiki)
 
 
 [readme]: https://github.com/SemanticMediaWiki/Mermaid/blob/master/README.md
diff --git a/extension.json b/extension.json
@@ -1,6 +1,6 @@
 {
 	"name": "Mermaid",
-	"version": "3.1.1-beta",
+	"version": "4.0.0-alpha",
 	"author": [
 			"James Hong Kong",
 			"Tyler Gibson"
@@ -10,7 +10,7 @@
 	"license-name": "GPL-2.0-or-later",
 	"type": "parserhook",
 	"requires": {
-		"MediaWiki": ">= 1.33"
+		"MediaWiki": ">= 1.39"
 	},
 	"ExtensionMessagesFiles": {
 		"MermaidMagic": "i18n/extra/Mermaid.magic.php"
@@ -23,6 +23,10 @@
 	"AutoloadNamespaces": {
 		"Mermaid\\": "src/"
 	},
+	"TestAutoloadNamespaces": {
+  		"Mermaid\\Tests\\": "tests/phpunit/Unit/",
+ 		"Mermaid\\Tests\\Integration\\": "tests/phpunit/Integration/"
+  	},
 	"ResourceModules": {
 		"ext.mermaid": {
 			"scripts": [
diff --git a/i18n/ja.json b/i18n/ja.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Yukkuri Shambis"
+		]
+	},
+	"mermaid-desc": "[https://mermaidjs.github.io/ mermaid]というスクリプト言語を使用して、図表やフローチャートを生成するのに役立つパーサー関数を提供します"
+}
diff --git a/i18n/krc.json b/i18n/krc.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Къарачайлы"
+		]
+	},
+	"mermaid-desc": "[https://mermaidjs.github.io/ Mermaid] скрипт тилни хайырланыб диаграммала эмда блок-схемала болдурургъа болушур ючюн парсер функцияны береди"
+}
diff --git a/tests/phpunit/Integration/I18nJsonFileIntegrityTest.php b/tests/phpunit/Integration/I18nJsonFileIntegrityTest.php
@@ -11,7 +11,7 @@
  *
  * @author mwjames
  */
-class I18nJsonFileIntegrityTest extends \PHPUnit_Framework_TestCase {
+class I18nJsonFileIntegrityTest extends \PHPUnit\Framework\TestCase {
 
 	/**
 	 * @dataProvider i18nFileProvider
diff --git a/tests/phpunit/Unit/ConfigTest.php b/tests/phpunit/Unit/ConfigTest.php
@@ -4,7 +4,7 @@
 
 use Mermaid\Config;
 
-class ConfigTest extends \PHPUnit_Framework_TestCase
+class ConfigTest extends \PHPUnit\Framework\TestCase
 {
 
 	public function testGetDefaultThemeWithNoValueInGlobal()
diff --git a/tests/phpunit/Unit/MermaidConfigExtractorTest.php b/tests/phpunit/Unit/MermaidConfigExtractorTest.php
@@ -13,7 +13,7 @@
  *
  * @author howlowck
  */
-class MermaidConfigExtractorTest extends \PHPUnit_Framework_TestCase
+class MermaidConfigExtractorTest extends \PHPUnit\Framework\TestCase
 {
 	/**
 	 * @dataProvider caseProvider
diff --git a/tests/phpunit/Unit/MermaidParserFunctionTest.php b/tests/phpunit/Unit/MermaidParserFunctionTest.php
@@ -13,7 +13,7 @@
  *
  * @author mwjames
  */
-class MermaidParserFunctionTest extends \PHPUnit_Framework_TestCase
+class MermaidParserFunctionTest extends \PHPUnit\Framework\TestCase
 {
 	public function testCanConstruct()
 	{
diff --git a/yarn.lock b/yarn.lock
@@ -102,7 +102,7 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-braces@^3.0.1:
+braces@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -1072,12 +1072,12 @@ mermaid@8.14.0:
     stylis "^4.0.10"
 
 micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
+    braces "^3.0.3"
+    picomatch "^2.3.1"
 
 mime-db@1.44.0:
   version "1.44.0"
@@ -1156,11 +1156,16 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.5, picomatch@^2.2.1:
+picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
+picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
 psl@^1.1.28:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ Note that is is also possible to further adapt the graph using CSS, e.g. to add`
`41`	`41`	`}`
`42`	`42`	```
`43`	`43`
`44`		`-Further [examples][examplesmw] have been created on wiki.`
	`44`	`+Further [examples][examplesmw] have been created on wiki. See also [Drawing Diagrams and Charts with Mermaid](https://www.pro.wiki/help/draw-mermaid-diagrams-charts-in-mediawiki)`
`45`	`45`
`46`	`46`
`47`	`47`	`[readme]: https://github.com/SemanticMediaWiki/Mermaid/blob/master/README.md`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`* @author mwjames`
`13`	`13`	`*/`
`14`		`-class I18nJsonFileIntegrityTest extends \PHPUnit_Framework_TestCase {`
	`14`	`+class I18nJsonFileIntegrityTest extends \PHPUnit\Framework\TestCase {`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* @dataProvider i18nFileProvider`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Mermaid\Config;`
`6`	`6`
`7`		`-class ConfigTest extends \PHPUnit_Framework_TestCase`
	`7`	`+class ConfigTest extends \PHPUnit\Framework\TestCase`
`8`	`8`	`{`
`9`	`9`
`10`	`10`	`public function testGetDefaultThemeWithNoValueInGlobal()`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`* @author howlowck`
`15`	`15`	`*/`
`16`		`-class MermaidConfigExtractorTest extends \PHPUnit_Framework_TestCase`
	`16`	`+class MermaidConfigExtractorTest extends \PHPUnit\Framework\TestCase`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* @dataProvider caseProvider`