[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Ensure project name is set on 2nd loop when saving

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399774 )

Change subject: Ensure project name is set on 2nd loop when saving
..


Ensure project name is set on 2nd loop when saving

Also move top-level and other classes into a common namespace.

Bug: T182937
Change-Id: I1a5ef32df6c3164ff0f9bf8d2a0260d6d1a9c935
---
M extension.json
R src/Hooks.php
M src/NamespaceSelect.php
R src/PageAssessmentsDAO.php
M src/SpecialPage.php
M tests/phpunit/PageAssessmentsTest.php
6 files changed, 87 insertions(+), 24 deletions(-)

Approvals:
  jenkins-bot: Verified
  Kaldari: Looks good to me, approved



diff --git a/extension.json b/extension.json
index 7387269..cfa78a8 100644
--- a/extension.json
+++ b/extension.json
@@ -19,13 +19,13 @@
"pageassessments": "ApiQueryPageAssessments"
},
"AutoloadClasses": {
-   "PageAssessmentsHooks": "PageAssessmentsHooks.php",
-   "PageAssessmentsBody": "PageAssessmentsBody.php",
"ApiQueryPageAssessments": "api/ApiQueryPageAssessments.php",
"ApiQueryProjectPages": "api/ApiQueryProjectPages.php",
"ApiQueryProjects": "api/ApiQueryProjects.php",
-   "PageAssessments\\SpecialPage": "src/SpecialPage.php",
-   "PageAssessments\\NamespaceSelect": "src/NamespaceSelect.php"
+   "MediaWiki\\Extension\\PageAssessments\\Hooks": "src/Hooks.php",
+   "MediaWiki\\Extension\\PageAssessments\\NamespaceSelect": 
"src/NamespaceSelect.php",
+   "MediaWiki\\Extension\\PageAssessments\\PageAssessmentsDAO": 
"src/PageAssessmentsDAO.php",
+   "MediaWiki\\Extension\\PageAssessments\\SpecialPage": 
"src/SpecialPage.php"
},
"ExtensionMessagesFiles": {
"PageAssessmentsMagic": "PageAssessments.i18n.magic.php",
@@ -33,16 +33,16 @@
},
"Hooks": {
"ParserFirstCallInit": [
-   "PageAssessmentsHooks::onParserFirstCallInit"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onParserFirstCallInit"
],
"LoadExtensionSchemaUpdates": [
-   "PageAssessmentsHooks::onLoadExtensionSchemaUpdates"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onLoadExtensionSchemaUpdates"
],
"LinksUpdateComplete": [
-   "PageAssessmentsHooks::onLinksUpdateComplete"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onLinksUpdateComplete"
],
"ArticleDeleteComplete": [
-   "PageAssessmentsHooks::onArticleDeleteComplete"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onArticleDeleteComplete"
]
},
"MessagesDirs": {
@@ -64,7 +64,7 @@
}
},
"SpecialPages": {
-   "PageAssessments": "PageAssessments\\SpecialPage"
+   "PageAssessments": 
"MediaWiki\\Extension\\PageAssessments\\SpecialPage"
},
"config": {
"PageAssessmentsOnTalkPages": true,
diff --git a/PageAssessmentsHooks.php b/src/Hooks.php
similarity index 84%
rename from PageAssessmentsHooks.php
rename to src/Hooks.php
index fae597b..80a17d7 100644
--- a/PageAssessmentsHooks.php
+++ b/src/Hooks.php
@@ -17,17 +17,30 @@
  *
  * Hooks for PageAssessments extension
  *
+ * @file
  * @ingroup Extensions
  */
 
-class PageAssessmentsHooks {
+namespace MediaWiki\Extension\PageAssessments;
+
+use Article;
+use Content;
+use DatabaseUpdater;
+use LinksUpdate;
+use LogEntry;
+use Parser;
+use RequestContext;
+use User;
+
+class Hooks {
 
/**
 * Register the parser function hook
 * @param Parser &$parser
 */
-   public static function onParserFirstCallInit( &$parser ) {
-   $parser->setFunctionHook( 'assessment', 
'PageAssessmentsBody::cacheAssessment' );
+   public static function onParserFirstCallInit( Parser &$parser ) {
+   $callback = PageAssessmentsDAO::class . '::cacheAssessment';
+   $parser->setFunctionHook( 'assessment', $callback );
}
 
/**
@@ -57,7 +70,7 @@
if ( $title->isTalkPage() ) {
$title = $title->getSubjectPage();
}
-   PageAssessmentsBody::doUpdates( $title, 
$assessmentData, $ticket );
+   PageAssessmentsDAO::doUpdates( $title, $assessmentData, 
$ticket );
}
}
 
@@ -66,7 +79,7 @@
 * @param DatabaseUpdater $updater DatabaseUpdater object
 */
public static function onLoadExtensionSchemaUpdates( DatabaseUpdater 
$updater = null ) {
-   $dbDir = __DIR__ . '/db';
+   $dbDir = __DIR__ . '/../db';
   

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Ensure project name is set on 2nd loop when saving

[Samwilson (Code Review)]

Samwilson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399774 )

Change subject: Ensure project name is set on 2nd loop when saving
..

Ensure project name is set on 2nd loop when saving

Also move top-level and other classes into a common namespace.

Change-Id: I1a5ef32df6c3164ff0f9bf8d2a0260d6d1a9c935
---
M extension.json
R src/Hooks.php
M src/NamespaceSelect.php
R src/PageAssessmentsDAO.php
M src/SpecialPage.php
M tests/phpunit/PageAssessmentsTest.php
6 files changed, 85 insertions(+), 22 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments 
refs/changes/74/399774/1

diff --git a/extension.json b/extension.json
index 7387269..cfa78a8 100644
--- a/extension.json
+++ b/extension.json
@@ -19,13 +19,13 @@
"pageassessments": "ApiQueryPageAssessments"
},
"AutoloadClasses": {
-   "PageAssessmentsHooks": "PageAssessmentsHooks.php",
-   "PageAssessmentsBody": "PageAssessmentsBody.php",
"ApiQueryPageAssessments": "api/ApiQueryPageAssessments.php",
"ApiQueryProjectPages": "api/ApiQueryProjectPages.php",
"ApiQueryProjects": "api/ApiQueryProjects.php",
-   "PageAssessments\\SpecialPage": "src/SpecialPage.php",
-   "PageAssessments\\NamespaceSelect": "src/NamespaceSelect.php"
+   "MediaWiki\\Extension\\PageAssessments\\Hooks": "src/Hooks.php",
+   "MediaWiki\\Extension\\PageAssessments\\NamespaceSelect": 
"src/NamespaceSelect.php",
+   "MediaWiki\\Extension\\PageAssessments\\PageAssessmentsDAO": 
"src/PageAssessmentsDAO.php",
+   "MediaWiki\\Extension\\PageAssessments\\SpecialPage": 
"src/SpecialPage.php"
},
"ExtensionMessagesFiles": {
"PageAssessmentsMagic": "PageAssessments.i18n.magic.php",
@@ -33,16 +33,16 @@
},
"Hooks": {
"ParserFirstCallInit": [
-   "PageAssessmentsHooks::onParserFirstCallInit"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onParserFirstCallInit"
],
"LoadExtensionSchemaUpdates": [
-   "PageAssessmentsHooks::onLoadExtensionSchemaUpdates"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onLoadExtensionSchemaUpdates"
],
"LinksUpdateComplete": [
-   "PageAssessmentsHooks::onLinksUpdateComplete"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onLinksUpdateComplete"
],
"ArticleDeleteComplete": [
-   "PageAssessmentsHooks::onArticleDeleteComplete"
+   
"MediaWiki\\Extension\\PageAssessments\\Hooks::onArticleDeleteComplete"
]
},
"MessagesDirs": {
@@ -64,7 +64,7 @@
}
},
"SpecialPages": {
-   "PageAssessments": "PageAssessments\\SpecialPage"
+   "PageAssessments": 
"MediaWiki\\Extension\\PageAssessments\\SpecialPage"
},
"config": {
"PageAssessmentsOnTalkPages": true,
diff --git a/PageAssessmentsHooks.php b/src/Hooks.php
similarity index 86%
rename from PageAssessmentsHooks.php
rename to src/Hooks.php
index fae597b..e31fb6d 100644
--- a/PageAssessmentsHooks.php
+++ b/src/Hooks.php
@@ -17,17 +17,30 @@
  *
  * Hooks for PageAssessments extension
  *
+ * @file
  * @ingroup Extensions
  */
 
-class PageAssessmentsHooks {
+namespace MediaWiki\Extension\PageAssessments;
+
+use Article;
+use Content;
+use DatabaseUpdater;
+use LinksUpdate;
+use LogEntry;
+use Parser;
+use RequestContext;
+use User;
+
+class Hooks {
 
/**
 * Register the parser function hook
 * @param Parser &$parser
 */
public static function onParserFirstCallInit( &$parser ) {
-   $parser->setFunctionHook( 'assessment', 
'PageAssessmentsBody::cacheAssessment' );
+   $parser->setFunctionHook( 'assessment', 
+   
\MediaWiki\Extension\PageAssessments\PageAssessmentsDAO::class.'::cacheAssessment'
 );
}
 
/**
@@ -57,7 +70,7 @@
if ( $title->isTalkPage() ) {
$title = $title->getSubjectPage();
}
-   PageAssessmentsBody::doUpdates( $title, 
$assessmentData, $ticket );
+   PageAssessmentsDAO::doUpdates( $title, $assessmentData, 
$ticket );
}
}
 
@@ -87,7 +100,7 @@
public static function onArticleDeleteComplete(
&$article, &$user, $reason, $id, $content = null, $logEntry
) {
-   PageAssessmentsBody::deleteRecordsForPage( $id );
+   PageAssessmentsDAO::deleteRecordsForPage( $id );
}
 
 }
diff --git a/sr