Robert Vogel has submitted this change and it was merged.
Change subject: Add missing classes to autoload
..
Add missing classes to autoload
Classes are:
BsValidatorResponse
BsValidatorEmailPlugin
BsValidatorUrlPlugin
BsValidatorPositiveIntegerPlugin
BsValidatorIntegerRangePlugin
BsValidatorArgCountPlugin
BsValidatorCategoryPlugin
BsValidatorSetItemPlugin
BsExtJSSortParam
HTMLCheckFieldOverride
XmlMultiSelect
Also remove copies from classes ORAField and ORAResult, there are part
of mediawiki/core with the exact name and with the same code (just
whitespaces and comments where changed).
Found by tests, see
https://integration.wikimedia.org/ci/job/mwext-BlueSpiceFoundation-testextension-zend/6/console
Change-Id: I361f4cc835e7eba57d4bd8cfce733d3ff8698472
---
M includes/AutoLoader.php
M includes/db/DatabaseOracleBase.php
2 files changed, 11 insertions(+), 156 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index fc00905..03fbc59 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -19,6 +19,14 @@
$GLOBALS['wgAutoloadClasses']['BsValidator'] =
__DIR__./validator/Validator.class.php;
$GLOBALS['wgAutoloadClasses']['BsValidatorPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorResponse'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorEmailPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorUrlPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorPositiveIntegerPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorIntegerRangePlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorArgCountPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorCategoryPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorSetItemPlugin'] =
__DIR__./validator/Validator.class.php;
$GLOBALS['wgAutoloadClasses']['BsValidatorMwGroupnamePlugin'] =
__DIR__./validator/plugins/BsValidator/BsValidatorMwGroupnamePlugin.class.php;
$GLOBALS['wgAutoloadClasses']['BsValidatorMwNamespacePlugin'] =
__DIR__./validator/plugins/BsValidator/BsValidatorMwNamespacePlugin.class.php;
$GLOBALS['wgAutoloadClasses']['BsValidatorMwUsernamePlugin'] =
__DIR__./validator/plugins/BsValidator/BsValidatorMwUsernamePlugin.class.php;
@@ -40,6 +48,7 @@
$GLOBALS['wgAutoloadClasses']['BsCAResponse'] = __DIR__./CAResponse.php;
$GLOBALS['wgAutoloadClasses']['BsCAIResponse'] = __DIR__./CAResponse.php;
$GLOBALS['wgAutoloadClasses']['BsExtJSStoreParams'] =
__DIR__./ExtJSStoreParams.php;
+$GLOBALS['wgAutoloadClasses']['BsExtJSSortParam'] =
__DIR__./ExtJSStoreParams.php;
//api
$GLOBALS['wgAutoloadClasses']['BsApiBase'] = __DIR__./api/BsApiBase.php;
@@ -54,7 +63,9 @@
$GLOBALS['wgAutoloadClasses']['HTMLTextFieldOverride'] =
__DIR__./html/htmlformfields/HTMLFormFieldOverrides.php;
$GLOBALS['wgAutoloadClasses']['HTMLIntFieldOverride'] =
__DIR__./html/htmlformfields/HTMLFormFieldOverrides.php;
$GLOBALS['wgAutoloadClasses']['HTMLStaticImageFieldOverride'] =
__DIR__./html/htmlformfields/HTMLFormFieldOverrides.php;
+$GLOBALS['wgAutoloadClasses']['HTMLCheckFieldOverride'] =
__DIR__./html/htmlformfields/HTMLFormFieldOverrides.php;
$GLOBALS['wgAutoloadClasses']['HTMLMultiSelectEx'] =
__DIR__./html/htmlformfields/HTMLMultiSelectEx.php;
+$GLOBALS['wgAutoloadClasses']['XmlMultiSelect'] =
__DIR__./html/htmlformfields/HTMLMultiSelectEx.php;
$GLOBALS['wgAutoloadClasses']['HTMLMultiSelectPlusAdd'] =
__DIR__./html/htmlformfields/HTMLMultiSelectPlusAdd.php;
$GLOBALS['wgAutoloadClasses']['HTMLMultiSelectSortList'] =
__DIR__./html/htmlformfields/HTMLMultiSelectSortList.php;
@@ -119,9 +130,6 @@
$GLOBALS['wgAutoloadClasses']['DatabaseOracle'] =
__DIR__./db/DatabaseOraclePre120.php;
}
$GLOBALS['wgAutoloadClasses']['BSOracleHooks'] =
__DIR__./db/BSOracleHooks.php;
-
-$GLOBALS['wgAutoloadClasses']['ORAField'] =
__DIR__./db/DatabaseOracleBase.php;
-$GLOBALS['wgAutoloadClasses']['ORAResult'] =
__DIR__./db/DatabaseOracleBase.php;
//Special pages
$GLOBALS['wgAutoloadClasses']['SpecialDiagnostics'] = __DIR__ .
'/specials/SpecialDiagnostics.class.php';
diff --git a/includes/db/DatabaseOracleBase.php
b/includes/db/DatabaseOracleBase.php
index 31fd6c6..f5795d5 100644
--- a/includes/db/DatabaseOracleBase.php
+++ b/includes/db/DatabaseOracleBase.php
@@ -7,159 +7,6 @@
*/
/**
- * The oci8 extension is fairly weak and doesn't support oci_num_rows, among
- * other things. We use a wrapper class to handle that and other
- * Oracle-specific bits, like converting column names back to lowercase.
- * @ingroup Database
- */
-class ORAResult {
-
