jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/396655 )
Change subject: Rename files to match classes
......................................................................
Rename files to match classes
Change-Id: I6e66abdf4f0eff0a24b96e543f2ce8f293bb7860
---
M .phpcs.xml
R GeSHi.php
R SyntaxHighlight.php
R SyntaxHighlightAce.php
R SyntaxHighlightGeSHiCompat.php
M extension.json
M maintenance/updateLexerList.php
7 files changed, 10 insertions(+), 11 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
Thiemo Kreuz (WMDE): Looks good to me, but someone else must approve
diff --git a/.phpcs.xml b/.phpcs.xml
index b66f9ed..370d4a0 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -3,11 +3,12 @@
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
- <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
- <exclude name="MediaWiki.Files.ClassMatchesFilename.WrongCase"
/>
<exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName"/>
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
</rule>
+ <rule ref="MediaWiki.Files.ClassMatchesFilename.WrongCase">
+ <exclude-pattern>*/maintenance/*</exclude-pattern>
+ </rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
<arg name="encoding" value="UTF-8"/>
diff --git a/SyntaxHighlight.GeSHi.php b/GeSHi.php
similarity index 100%
rename from SyntaxHighlight.GeSHi.php
rename to GeSHi.php
diff --git a/SyntaxHighlight.class.php b/SyntaxHighlight.php
similarity index 99%
rename from SyntaxHighlight.class.php
rename to SyntaxHighlight.php
index 35f7db5..df1a8b6 100644
--- a/SyntaxHighlight.class.php
+++ b/SyntaxHighlight.php
@@ -19,9 +19,7 @@
use MediaWiki\Shell\Shell;
use Symfony\Component\Process\ProcessBuilder;
-// @codingStandardsIgnoreStart
class SyntaxHighlight {
-// @codingStandardsIgnoreEnd
/** @var int The maximum number of lines that may be selected for
highlighting. **/
const HIGHLIGHT_MAX_LINES = 1000;
diff --git a/SyntaxHighlight.ace.php b/SyntaxHighlightAce.php
similarity index 100%
rename from SyntaxHighlight.ace.php
rename to SyntaxHighlightAce.php
diff --git a/SyntaxHighlight.GeSHi.compat.php b/SyntaxHighlightGeSHiCompat.php
similarity index 100%
rename from SyntaxHighlight.GeSHi.compat.php
rename to SyntaxHighlightGeSHiCompat.php
diff --git a/extension.json b/extension.json
index dd753f3..6c75514 100644
--- a/extension.json
+++ b/extension.json
@@ -22,11 +22,11 @@
]
},
"AutoloadClasses": {
- "SyntaxHighlight": "SyntaxHighlight.class.php",
- "SyntaxHighlight_GeSHi": "SyntaxHighlight.class.php",
- "GeSHi": "SyntaxHighlight.GeSHi.php",
- "SyntaxHighlightAce": "SyntaxHighlight.ace.php",
- "SyntaxHighlightGeSHiCompat":
"SyntaxHighlight.GeSHi.compat.php",
+ "SyntaxHighlight": "SyntaxHighlight.php",
+ "SyntaxHighlight_GeSHi": "SyntaxHighlight.php",
+ "GeSHi": "GeSHi.php",
+ "SyntaxHighlightAce": "SyntaxHighlightAce.php",
+ "SyntaxHighlightGeSHiCompat": "SyntaxHighlightGeSHiCompat.php",
"ResourceLoaderGeSHiVisualEditorModule":
"ResourceLoaderSyntaxHighlightVisualEditorModule.php",
"ResourceLoaderSyntaxHighlightVisualEditorModule":
"ResourceLoaderSyntaxHighlightVisualEditorModule.php"
},
diff --git a/maintenance/updateLexerList.php b/maintenance/updateLexerList.php
index 00ee8a4..114d8cb 100644
--- a/maintenance/updateLexerList.php
+++ b/maintenance/updateLexerList.php
@@ -28,7 +28,7 @@
require_once "$IP/maintenance/Maintenance.php";
-class UpdateLanguageList extends Maintenance {
+class UpdateLexerList extends Maintenance {
public function __construct() {
parent::__construct();
$this->addDescription( 'Update list of lexers supported by
SyntaxHighlight_GeSHi' );
@@ -72,5 +72,5 @@
}
}
-$maintClass = 'UpdateLanguageList';
+$maintClass = 'UpdateLexerList';
require_once RUN_MAINTENANCE_IF_MAIN;
--
To view, visit https://gerrit.wikimedia.org/r/396655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e66abdf4f0eff0a24b96e543f2ce8f293bb7860
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Thiemo Kreuz (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
