Pwirth has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393727 )
Change subject: BSFoundation: Used BS prefix for all bluespice services
......................................................................
BSFoundation: Used BS prefix for all bluespice services
Change-Id: I7f9c5da2e04336391cbed21d4d57374a313a7fe8
---
M dynamic_file.php
M includes/ServiceWiring.php
M includes/outputhandler/views/view.UserMiniProfile.php
M src/Data/Entity/Schema.php
M src/Entity.php
M src/EntityConfig.php
M src/EntityConfigFactory.php
M src/EntityRegistry.php
M src/Hook/BSEntityRegister.php
9 files changed, 31 insertions(+), 31 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/27/393727/1
diff --git a/dynamic_file.php b/dynamic_file.php
index aae5d81..0ebc15f 100644
--- a/dynamic_file.php
+++ b/dynamic_file.php
@@ -27,7 +27,7 @@
$fileDispatcher = null;
try {
$dfdFactory = \MediaWiki\MediaWikiServices::getInstance()->getService(
- 'DynamicFileDispatcherFactory'
+ 'BSDynamicFileDispatcherFactory'
);
$dfd = $dfdFactory->newFromParams(
new \BlueSpice\DynamicFileDispatcher\RequestParams( [],
\RequestContext::getMain()->getRequest() ),
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index d090d07..865a084 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -4,36 +4,36 @@
return [
- 'DynamicFileDispatcherFactory' => function ( MediaWikiServices
$services ) {
+ 'BSDynamicFileDispatcherFactory' => function ( MediaWikiServices
$services ) {
return new \BlueSpice\DynamicFileDispatcher\Factory(
$services->getConfigFactory()->makeConfig( 'bsg' )
);
},
- 'DynamicFileDispatcherUrlBuilder' => function ( MediaWikiServices
$services ) {
+ 'BSDynamicFileDispatcherUrlBuilder' => function ( MediaWikiServices
$services ) {
return new \BlueSpice\DynamicFileDispatcher\UrlBuilder(
- $services->getService( 'DynamicFileDispatcherFactory' ),
+ $services->getService( 'BSDynamicFileDispatcherFactory'
),
$services->getConfigFactory()->makeConfig( 'bsg' )
);
},
- 'EntityRegistry' => function ( MediaWikiServices $services ) {
+ 'BSEntityRegistry' => function ( MediaWikiServices $services ) {
return new \BlueSpice\EntityRegistry(
$services->getConfigFactory()->makeConfig( 'bsg' )
);
},
- 'EntityConfigFactory' => function ( MediaWikiServices $services ) {
+ 'BSEntityConfigFactory' => function ( MediaWikiServices $services ) {
return new \BlueSpice\EntityConfigFactory(
- $services->getService( 'EntityRegistry' ),
+ $services->getService( 'BSEntityRegistry' ),
$services->getConfigFactory()->makeConfig( 'bsg' )
);
},
- 'EntityFactory' => function ( MediaWikiServices $services ) {
+ 'BSEntityFactory' => function ( MediaWikiServices $services ) {
return new \BlueSpice\EntityFactory(
- $services->getService( 'EntityRegistry' ),
- $services->getService( 'EntityConfigFactory' ),
+ $services->getService( 'BSEntityRegistry' ),
+ $services->getService( 'BSEntityConfigFactory' ),
$services->getConfigFactory()->makeConfig( 'bsg' )
);
},
diff --git a/includes/outputhandler/views/view.UserMiniProfile.php
b/includes/outputhandler/views/view.UserMiniProfile.php
index ecc40e5..5bc65b1 100644
--- a/includes/outputhandler/views/view.UserMiniProfile.php
+++ b/includes/outputhandler/views/view.UserMiniProfile.php
@@ -35,7 +35,7 @@
'username' => $this->mOptions['user']->getName(),
]);
$dfdUrlBuilder = MediaWikiServices::getInstance()->getService(
- 'DynamicFileDispatcherUrlBuilder'
+ 'BSDynamicFileDispatcherUrlBuilder'
);
$url = $dfdUrlBuilder->build(
new Params( $params )
diff --git a/src/Data/Entity/Schema.php b/src/Data/Entity/Schema.php
index 571932a..3f5c4f4 100644
--- a/src/Data/Entity/Schema.php
+++ b/src/Data/Entity/Schema.php
@@ -37,10 +37,10 @@
protected function getEntityConfigs() {
$entityConfigs = [];
$entityRegistry = MediaWikiServices::getInstance()->getService(
- 'EntityRegistry'
+ 'BSEntityRegistry'
);
$configFactory = MediaWikiServices::getInstance()->getService(
- 'EntityConfigFactory'
+ 'BSEntityConfigFactory'
);
foreach( $entityRegistry->getTypes() as $type ) {
if( !$entityConfig = $configFactory->newFromType( $type
) ) {
diff --git a/src/Entity.php b/src/Entity.php
index e072219..c31ad18 100644
--- a/src/Entity.php
+++ b/src/Entity.php
@@ -59,7 +59,7 @@
protected function __construct( \stdClass $oStdClass, EntityConfig
$oConfig, EntityFactory $entityFactory = null ) {
if( !$entityFactory ) {
$entityFactory =
MediaWikiServices::getInstance()->getService(
- 'EntityFactory'
+ 'BSEntityFactory'
);
}
@@ -87,7 +87,7 @@
/**
* Returns the instance - Should not be used directly. This is a
workaround
* as all entity __construc methods are private. Use mediawiki service
- * 'EntityFactory' instead
+ * 'BSEntityFactory' instead
* @param \stdClass $data
* @param \BlueSpice\EntityConfig $oConfig
* @param \BlueSpice\EntityFactory $entityFactory
@@ -100,14 +100,14 @@
/**
* Get Entity by EntityContent Object, wrapper for newFromObject
* @deprecated since version 3.0.0 - Use mediawiki service
- * ('EntityFactory')->newFromContent() instead
+ * ('BSEntityFactory')->newFromContent() instead
* @param EntityContent $sContent
* @return Entity
*/
public static function newFromContent( EntityContent $sContent ) {
wfDeprecated( __METHOD__, '3.0.0' );
$entityFactory = MediaWikiServices::getInstance()->getService(
- 'EntityFactory'
+ 'BSEntityFactory'
);
return $entityFactory->newFromContent( $sContent );
}
@@ -115,14 +115,14 @@
/**
* Get Entity by Json Object
* @deprecated since version 3.0.0 - Use mediawiki service
- * ('EntityFactory')->newFromObject() instead
+ * ('BSEntityFactory')->newFromObject() instead
* @param Object $oObject
* @return Entity
*/
public static function newFromObject( $oObject ) {
wfDeprecated( __METHOD__, '3.0.0' );
$entityFactory = MediaWikiServices::getInstance()->getService(
- 'EntityFactory'
+ 'BSEntityFactory'
);
return $entityFactory->newFromObject( $oObject );
}
@@ -162,7 +162,7 @@
/**
* Get Entity from ID, wrapper for newFromTitle
* @deprecated since version 3.0.0 - Use mediawiki service
- * ('EntityFactory')->newFromID() instead
+ * ('BSEntityFactory')->newFromID() instead
* @param int $iID
* @param boolean $bForceReload
* @return Entity | null
@@ -170,7 +170,7 @@
public static function newFromID( $iID, $bForceReload = false ) {
wfDeprecated( __METHOD__, '3.0.0' );
$entityFactory = MediaWikiServices::getInstance()->getService(
- 'EntityFactory'
+ 'BSEntityFactory'
);
return $entityFactory->newFromID( $iID, static::NS,
$bForceReload );
}
@@ -178,7 +178,7 @@
/**
* Main method for getting a Entity from a Title
* @deprecated since version 3.0.0 - Use mediawiki service
- * ('EntityFactory')->newFromSourceTitle() instead
+ * ('BSEntityFactory')->newFromSourceTitle() instead
* @param \Title $oTitle
* @param boolean $bForceReload
* @return Entity
@@ -186,7 +186,7 @@
public static function newFromTitle( \Title $oTitle, $bForceReload =
false ) {
wfDeprecated( __METHOD__, '3.0.0' );
$entityFactory = MediaWikiServices::getInstance()->getService(
- 'EntityFactory'
+ 'BSEntityFactory'
);
return $entityFactory->newFromSourceTitle( $oTitle,
$bForceReload );
}
diff --git a/src/EntityConfig.php b/src/EntityConfig.php
index e84bb1a..f7ecc0b 100644
--- a/src/EntityConfig.php
+++ b/src/EntityConfig.php
@@ -73,7 +73,7 @@
public static function factory( $type ) {
wfDeprecated( __METHOD__, '3.0.0' );
$configFactory = MediaWikiServices::getInstance()->getService(
- 'EntityConfigFactory'
+ 'BSEntityConfigFactory'
);
return $configFactory->newFromType( $type );
}
diff --git a/src/EntityConfigFactory.php b/src/EntityConfigFactory.php
index 3e0610d..8b7dd7d 100644
--- a/src/EntityConfigFactory.php
+++ b/src/EntityConfigFactory.php
@@ -62,7 +62,7 @@
$this->entityConfigs = [];
//TODO: Check params and classes
$entityRegistry = MediaWikiServices::getInstance()->getService(
- 'EntityRegistry'
+ 'BSEntityRegistry'
);
$entityDefinitions = $entityRegistry->getEntityDefinitions();
$defaults = [];
diff --git a/src/EntityRegistry.php b/src/EntityRegistry.php
index f1f157c..bd45894 100644
--- a/src/EntityRegistry.php
+++ b/src/EntityRegistry.php
@@ -133,7 +133,7 @@
public static function getRegisteredEntities() {
wfDeprecated( __METHOD__, '3.0.0' );
$entityRegistry = MediaWikiServices::getInstance()->getService(
- 'EntityRegistry'
+ 'BSEntityRegistry'
);
return $entityRegistry->getEntityDefinitions();
}
@@ -147,7 +147,7 @@
public static function isRegisteredType( $sType ) {
wfDeprecated( __METHOD__, '3.0.0' );
$entityRegistry = MediaWikiServices::getInstance()->getService(
- 'EntityRegistry'
+ 'BSEntityRegistry'
);
return $entityRegistry->hasType( $sType );
}
@@ -162,7 +162,7 @@
public static function getRegisteredEntityByType( $sType ) {
wfDeprecated( __METHOD__, '3.0.0' );
$entityRegistry = MediaWikiServices::getInstance()->getService(
- 'EntityRegistry'
+ 'BSEntityRegistry'
);
return $entityRegistry->getEntityByType( $sType );
}
@@ -175,7 +175,7 @@
public static function getRegisterdTypeKeys() {
wfDeprecated( __METHOD__, '3.0.0' );
$entityRegistry = MediaWikiServices::getInstance()->getService(
- 'EntityRegistry'
+ 'BSEntityRegistry'
);
return $entityRegistry->getTypes();
}
diff --git a/src/Hook/BSEntityRegister.php b/src/Hook/BSEntityRegister.php
index 3007178..dc8a56b 100644
--- a/src/Hook/BSEntityRegister.php
+++ b/src/Hook/BSEntityRegister.php
@@ -28,7 +28,7 @@
use BlueSpice\Hook;
/**
- * @deprecated since version 3.0.0 - Use 'EntityRegistry' config in
+ * @deprecated since version 3.0.0 - Use 'BSEntityRegistry' config in
* extension.josn instead
*/
abstract class BSEntityRegister extends Hook {
@@ -42,7 +42,7 @@
/**
* Located in \BlueSpice\EntityRegistry::runRegister. Collects all
entity
* configs and instantiates them.
- * @deprecated since version 3.0.0 - Use 'EntityRegistry' config in
+ * @deprecated since version 3.0.0 - Use 'BSEntityRegistry' config in
* extension.josn instead
* @param array $entityRegistrations
* @return boolean
--
To view, visit https://gerrit.wikimedia.org/r/393727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f9c5da2e04336391cbed21d4d57374a313a7fe8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth <wi...@hallowelt.biz>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
