Skip to content

Commit 54a1203

Browse files
shawnmjonesshawnmjones
committed
merged changes from MediaWiki gerrit repository
2 parents 5c549f6 + d7b20cd commit 54a1203

File tree

72 files changed

+7476
-1304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+7476
-1304
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
.DS_Store
2+
/node_modules
3+
/vendor
4+
/composer.lock
5+
build
6+
.vscode

‎.gitmodules‎

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

‎.gitreview‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[gerrit]
2+
host=gerrit.wikimedia.org
3+
port=29418
4+
project=mediawiki/extensions/Memento.git
5+
track=1
6+
defaultrebase=0

‎.phpcs.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0"?>
2+
<ruleset>
3+
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
4+
<exclude name="Generic.Files.LineLength.TooLong" />
5+
<exclude name="MediaWiki.Commenting.MissingCovers.MissingCovers" />
6+
<exclude name="MediaWiki.Commenting.PhpunitAnnotations.NotTestFunction" />
7+
<exclude name="Generic.PHP.BacktickOperator.Found" />
8+
<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
9+
<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
10+
<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
11+
<exclude name="Squiz.Scope.MethodScope.Missing" />
12+
<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
13+
<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
14+
<exclude name="MediaWiki.NamingConventions.PrefixedGlobalFunctions.wfPrefix" />
15+
<exclude name="MediaWiki.NamingConventions.ValidGlobalName.allowedPrefix" />
16+
</rule>
17+
<file>.</file>
18+
<arg name="bootstrap" value="./vendor/mediawiki/mediawiki-codesniffer/utils/bootstrap-ci.php"/>
19+
<arg name="extensions" value="php,php5,inc"/>
20+
<arg name="encoding" value="UTF-8"/>
21+
<exclude-pattern type="relative">^Memento\.php</exclude-pattern>
22+
</ruleset>

‎CODE_OF_CONDUCT.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Special:MyLanguage/Code_of_Conduct).

‎Gruntfile.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
module.exports = function ( grunt ) {
2+
grunt.loadNpmTasks( 'grunt-jsonlint' );
3+
grunt.loadNpmTasks( 'grunt-banana-checker' );
4+
5+
grunt.initConfig( {
6+
banana: {
7+
all: 'Memento/i18n/'
8+
},
9+
jsonlint: {
10+
all: [
11+
'**/*.json',
12+
'!node_modules/**',
13+
'!vendor/**'
14+
]
15+
}
16+
} );
17+
18+
grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
19+
grunt.registerTask( 'default', 'test' );
20+
};

‎Makefile‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file is part of the Memento Extension to MediaWiki
2-
# http://www.mediawiki.org/wiki/Extension:Memento
2+
# https://www.mediawiki.org/wiki/Extension:Memento
33
#
44
# LICENSE
55
# This program is free software; you can redistribute it and/or modify
@@ -150,15 +150,15 @@ endif
150150
# Pre-requisites: export TESTHOST=<hostname of the host under test>
151151
#
152152

153-
defaults-integration-test: standard-integration-test 302-style-time-negotiation-recommended-headers-integration-test friendly-error-integration-test
153+
defaults-integration-test: standard-integration-test 302-style-time-negotiation-recommended-headers-integration-test friendly-error-integration-test timemap-integration-test
154154

155155
# run tests on all non-configurable items
156156
standard-integration-test: check-integration-env ${TESTOUTPUTDIR}
157157
@echo "standard-integration-test"
158158
@echo ""
159159
@echo "#########################"
160160
@echo "Running standard integration tests that apply in all cases"
161-
cd ${TESTOUTPUTDIR}; phpunit --include-path "${STARTINGDIR}/../../Memento:${STARTINGDIR}/../../tests/lib:${TESTDATADIR}" --group all ${STARTINGDIR}/../../tests/integration
161+
cd ${TESTOUTPUTDIR}; phpunit --include-path "${STARTINGDIR}/../../Memento:${STARTINGDIR}/../../tests/lib:${TESTDATADIR}" --group all "${STARTINGDIR}/../../tests/integration"
162162
@echo "Done with integration tests"
163163
@echo "#########################"
164164
@echo ""
@@ -169,18 +169,30 @@ standard-integration-test: check-integration-env ${TESTOUTPUTDIR}
169169
@echo ""
170170
@echo "#########################"
171171
@echo "Running 302-style time negotiation integration with recommended headers tests"
172-
cd ${TESTOUTPUTDIR}; phpunit --include-path "${STARTINGDIR}/../../Memento:${STARTINGDIR}/../../tests/lib:${TESTDATADIR}" --group 302-style-recommended-headers ${STARTINGDIR}/../../tests/integration
172+
cd ${TESTOUTPUTDIR}; phpunit --include-path "${STARTINGDIR}/../../Memento:${STARTINGDIR}/../../tests/lib:${TESTDATADIR}" --group 302-style-recommended-headers "${STARTINGDIR}/../../tests/integration"
173173
@echo "Done with integration tests"
174174
@echo "#########################"
175175
@echo ""
176176

177+
# run all of the tests on timemaps
178+
timemap-integration-test: check-integration-env ${TESTOUTPUTDIR}
179+
@echo "timemap-integration-test"
180+
@echo ""
181+
@echo "#########################"
182+
@echo "Running timemap integration tests"
183+
cd ${TESTOUTPUTDIR}; phpunit --include-path "${STARTINGDIR}/../../Memento:${STARTINGDIR}/../../tests/lib:${TESTDATADIR}" --group timemap "${STARTINGDIR}/../../tests/integration"
184+
@echo "Done with integration tests"
185+
@echo "#########################"
186+
@echo ""
187+
188+
177189
# run all of the friendly error integration tests
178190
friendly-error-integration-test: check-integration-env ${TESTOUTPUTDIR}
179191
@echo "friendly-error-integration-test"
180192
@echo ""
181193
@echo "#########################"
182194
@echo "Running friendly error integration tests"
183-
cd ${TESTOUTPUTDIR}; phpunit --include-path "${STARTINGDIR}/../../Memento:${STARTINGDIR}/../../tests/lib:${TESTDATADIR}" --group friendlyErrorPages ${STARTINGDIR}/../../tests/integration
195+
cd ${TESTOUTPUTDIR}; phpunit --include-path "${STARTINGDIR}/../../Memento:${STARTINGDIR}/../../tests/lib:${TESTDATADIR}" --group friendlyErrorPages "${STARTINGDIR}/../../tests/integration"
184196
@echo "Done with integration tests"
185197
@echo "#########################"
186198
@echo ""

‎Memento/Memento.body.php‎

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

‎Memento/Memento.i18n.php‎

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

0 commit comments

Comments
 (0)