jenkins-bot has submitted this change and it was merged.
Change subject: reverse order for resolve collisions (v 2.2.0)
......................................................................
reverse order for resolve collisions (v 2.2.0)
* fix short usage for constants
If several extensions implement one and the same constant,
function, or object, for processing will be caused by extension
that is the late in LocalSettings.php
Change-Id: I9b1c2ad8f2fe3b53a0b6afcfc519db7124986bbd
---
M PhpTags.body.php
M PhpTags.php
M includes/Hooks.php
3 files changed, 6 insertions(+), 8 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PhpTags.body.php b/PhpTags.body.php
index 2847cc3..b699ac3 100644
--- a/PhpTags.body.php
+++ b/PhpTags.body.php
@@ -45,7 +45,7 @@
$value = $frame->expand( $value );
}
$command = "echo $command (" . implode( ',', $args ) .
');';
- } elseif ( preg_match( '/^\$\S+$/', $command ) == 1 ) {
+ } elseif ( preg_match( '/^\S+$/', $command ) == 1 ) {
$command = "echo $command;";
}
diff --git a/PhpTags.php b/PhpTags.php
index e2deb63..fd4ee33 100644
--- a/PhpTags.php
+++ b/PhpTags.php
@@ -16,7 +16,7 @@
}
define( 'PHPTAGS_MAJOR_VERSION', 2 );
-define( 'PHPTAGS_MINOR_VERSION', 1 );
+define( 'PHPTAGS_MINOR_VERSION', 2 );
define( 'PHPTAGS_RELEASE_VERSION', 0 );
define( 'PHPTAGS_VERSION', PHPTAGS_MAJOR_VERSION . '.' . PHPTAGS_MINOR_VERSION
. '.' . PHPTAGS_RELEASE_VERSION );
@@ -98,8 +98,6 @@
define( 'PHPTAGS_TRANSIT_PARSER', 'p' );
define( 'PHPTAGS_TRANSIT_PPFRAME', 'f' );
define( 'PHPTAGS_TRANSIT_EXCEPTION', '@' );
-
-define( 'PHPTAGS_GROUP_UNLIMITED_MEMORY', 1 );
/**
* You can specify the namespaces in which allowed to use this extension.
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 3cf75f2..295efa2 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -43,7 +43,7 @@
* @param array $constantValues
*/
public static function setConstantValues( array $constantValues ) {
- self::$constantValues += $constantValues;
+ self::$constantValues = $constantValues + self::$constantValues;
}
/**
@@ -52,7 +52,7 @@
* @param array $constantNames
*/
public static function setConstants( $className, array $constantNames )
{
- self::$constants += array_fill_keys( $constantNames, $className
);
+ self::$constants = array_fill_keys( $constantNames, $className
) + self::$constants;
}
/**
@@ -61,7 +61,7 @@
* @param array $functionNames List of the functions
*/
public static function setFunctions( $className, array $functionNames )
{
- self::$functions += array_fill_keys( $functionNames, $className
);
+ self::$functions = array_fill_keys( $functionNames, $className
) + self::$functions;
}
/**
@@ -69,7 +69,7 @@
* @param array $objects
*/
public static function setObjects( array $objects ) {
- self::$objects += $objects;
+ self::$objects = $objects + self::$objects;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/145226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b1c2ad8f2fe3b53a0b6afcfc519db7124986bbd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PhpTags
Gerrit-Branch: master
Gerrit-Owner: Pastakhov <pastak...@yandex.ru>
Gerrit-Reviewer: Pastakhov <pastak...@yandex.ru>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
