Commit f3673701 authored by Robert Nix's avatar Robert Nix

Merge branch 'update/133/CirrusSearch' into 'master'

Update CirrusSearch for 1.33

See merge request !60
parents 6831daac 82f299e0

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

{
"extends": "wikimedia/"
}
......@@ -6,4 +6,3 @@
node_modules/
vendor/
composer.lock
/tests/phan/issues
# Everything in this directory is just test data.
tests/integration/articles/*
{
// Enforcing
"bitwise": true,
"eqeqeq": true,
"freeze": true,
"latedef": true,
"noarg": true,
"nonew": true,
"undef": true,
"unused": true,
"strict": false,
// Relaxing
"es5": false,
// Environment
"browser": true,
"jquery": true,
"globals": {
"mediaWiki": false
}
}
<?php
$cfg = require __DIR__ . '/../../vendor/mediawiki/mediawiki-phan-config/src/config.php';
$cfg = require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.php';
$cfg['directory_list'] = array_merge(
$cfg['directory_list'],
[
'profiles/',
'./../../extensions/Elastica',
'./../../extensions/BetaFeatures',
'./../../extensions/SiteMatrix',
'../../extensions/Elastica',
'../../extensions/BetaFeatures',
'../../extensions/SiteMatrix',
]
);
$cfg['exclude_analysis_directory_list'] = array_merge(
$cfg['exclude_analysis_directory_list'],
[
'./../../extensions/Elastica',
'./../../extensions/BetaFeatures',
'./../../extensions/SiteMatrix',
'../../extensions/Elastica',
'../../extensions/BetaFeatures',
'../../extensions/SiteMatrix',
]
);
......
......@@ -7,12 +7,11 @@
<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
<exclude name="PSR2.Methods.MethodDeclaration.Underscore" />
<exclude name="Squiz.Scope.MethodScope.Missing" />
<exclude name="PSR2.Classes.PropertyDeclaration.Underscore"/>
<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName"/>
<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
<exclude name="MediaWiki.Usage.DeprecatedGlobalVariables.Deprecated$wgContLang" />
<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
<exclude name="MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals"/>
<exclude name="MediaWiki.Commenting.MissingCovers.MissingCovers"/>
</rule>
<rule ref="MediaWiki.NamingConventions.ValidGlobalName">
<properties>
......@@ -26,7 +25,7 @@
</rule>
<rule ref="Generic.Files.LineLength">
<properties>
<property name="lineLimit" value="170" />
<property name="lineLimit" value="140" />
</properties>
<exclude-pattern>tests/phpunit/resources/wmf</exclude-pattern>
</rule>
......
The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Special:MyLanguage/Code_of_Conduct).
This diff is collapsed.
# Configuration file for Doxygen
PROJECT_NAME = CirrusSearch
PROJECT_BRIEF = Elasticsearch-powered search for MediaWiki
OUTPUT_DIRECTORY = docs
HTML_OUTPUT = php
JAVADOC_AUTOBRIEF = YES
QT_AUTOBRIEF = YES
WARN_NO_PARAMDOC = YES
INPUT = README ./
EXCLUDE_PATTERNS = */vendor/*
EXCLUDE_PATTERNS += */docs/*
EXCLUDE_PATTERNS += */node_modules/*
EXCLUDE_PATTERNS += */tests/*
FILE_PATTERNS = *.php
RECURSIVE = YES
# Requires doxygen 1.8.3+
HTML_DYNAMIC_SECTIONS = YES
GENERATE_TREEVIEW = YES
TREEVIEW_WIDTH = 250
GENERATE_LATEX = NO
HAVE_DOT = YES
DOT_FONTNAME = Helvetica
DOT_FONTSIZE = 10
TEMPLATE_RELATIONS = YES
CALL_GRAPH = NO
CALLER_GRAPH = NO
# Makes dot run faster. Requires graphviz >1.8.10
DOT_MULTI_TARGETS = YES
/*jshint esversion: 6, node:true */
/*!
* Grunt file
*
* @package CirrusSearch
*/
/* eslint-env node, es6 */
const path = require( 'path' );
/*jshint node:true */
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
var WebdriverIOconfigFile;
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.loadNpmTasks( 'grunt-webdriver' );
var WebdriverIOconfigFile;
if ( process.env.JENKINS_HOME ) {
WebdriverIOconfigFile = './tests/integration/config/wdio.conf.jenkins.js';
} else if ( process.env.MWV_LABS_HOSTNAME ) {
......@@ -26,9 +26,9 @@ module.exports = function ( grunt ) {
}
grunt.initConfig( {
jshint: {
eslint: {
options: {
jshintrc: true
reportUnusedDisableDirectives: true
},
all: [
'**/*.js',
......@@ -38,7 +38,8 @@ module.exports = function ( grunt ) {
},
banana: {
all: [
'i18n/'
'i18n/',
'i18n/api/'
]
},