Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/90114
Change subject: mediawiki/conf.d/_join.php minor fix + comment update ...................................................................... mediawiki/conf.d/_join.php minor fix + comment update Follow up 1d5d362 https://gerrit.wikimedia.org/r/#/c/89837/ Change-Id: I2f61d02a9770c31f2313698dcdad16ad37f9e542 --- M mediawiki/conf.d/_join.php 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/14/90114/1 diff --git a/mediawiki/conf.d/_join.php b/mediawiki/conf.d/_join.php index b96f41c..49ac935 100644 --- a/mediawiki/conf.d/_join.php +++ b/mediawiki/conf.d/_join.php @@ -7,7 +7,7 @@ * @license GPL v2.0 */ -$settingFiles = new GlobIterator( __DIR__ . '/[0-9][0-9]*.php'); +$settingFiles = new GlobIterator( __DIR__ . '/[0-9][0-9]*.php' ); $content = ''; foreach( $settingFiles as $settingFile ) { @@ -21,14 +21,14 @@ # Files must start with T_OPEN_TAG $tokens = token_get_all($source); - if( $tokens[0][0] !== T_OPEN_TAG) { + if( $tokens[0][0] !== T_OPEN_TAG ) { fwrite( STDERR, "File '$fname' does not start with '<?php' .. skipping.\n" ); continue; } # Files must not contains a T_CLOSE_TAG since we are appending them $hasCloseTag = false; - foreach($tokens as $token) { + foreach( $tokens as $token ) { if( $token[0] === T_CLOSE_TAG ) { $hasCloseTag = true; break; @@ -43,6 +43,7 @@ $content .= $source . "\n?>"; } -# Ideally we should make sure the resulting source code is valid php but I am -# too lazy. +# On Wikimedia CI Jenkins, the resulting PHP will be appended to +# LocalSettings.php by the bin/mw-apply-settings.sh script. That one also run +# php -l on LocalSettings.php to ensure it is valid. print $content; -- To view, visit https://gerrit.wikimedia.org/r/90114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f61d02a9770c31f2313698dcdad16ad37f9e542 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
