Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Make lines shorter to pass phpcs under includes/libs"

Browse source
This commit is contained in:
jenkins-bot 2015-09-26 18:45:48 +00:00 committed by Gerrit Code Review
commit 9268f95522
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/libs/BufferingStatsdDataFactory.php
View file

@ -57,7 +57,9 @@ class BufferingStatsdDataFactory extends StatsdDataFactory {
return str_replace( array( '._', '_.' ), '.', $key );
}
public function produceStatsdData( $key, $value = 1, $metric = StatsdDataInterface::STATSD_METRIC_COUNT ) {
public function produceStatsdData(
$key, $value = 1, $metric = StatsdDataInterface::STATSD_METRIC_COUNT
) {
$entity = $this->produceStatsdDataEntity();
if ( $key !== null ) {
$key = self::normalizeMetricKey( "{$this->prefix}.{$key}" );

12
includes/libs/CSSMin.php
View file

@ -304,7 +304,17 @@ class CSSMin {
// Check for global @embed comment and remove it. Allow other comments to be present
// before @embed (they have been replaced with placeholders at this point).
$embedAll = false;
$rule = preg_replace( '/^((?:\s+|' . CSSMin::PLACEHOLDER . '(\d+)x)*)' . CSSMin::EMBED_REGEX . '\s*/', '$1', $rule, 1, $embedAll );
$rule = preg_replace(
'/^((?:\s+|' .
CSSMin::PLACEHOLDER .
'(\d+)x)*)' .
CSSMin::EMBED_REGEX .
'\s*/',
'$1',
$rule,
1,
$embedAll
);
// Build two versions of current rule: with remapped URLs
// and with embedded data: URIs (where possible).