[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Bug: Composer extensions were no more loaded

2017-09-23 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/380002 )

Change subject: Bug: Composer extensions were no more loaded
..


Bug: Composer extensions were no more loaded

When fixing T168807 in 442efe5, it was mistakenly removed the loading
through Composer in early loading ($ExtensionRegistry === null). Only
Composer loading should be checked during this stage.

Change-Id: Id3a611c47a56d4feaf6516a2d455325076ce2684
---
M src/MediaWikiFarmConfiguration.php
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/src/MediaWikiFarmConfiguration.php 
b/src/MediaWikiFarmConfiguration.php
index 9d70f51..62d7eb6 100644
--- a/src/MediaWikiFarmConfiguration.php
+++ b/src/MediaWikiFarmConfiguration.php
@@ -434,9 +434,12 @@
$status = 'composer';
$value = true;
 
-   # MediaWiki still not loaded: we must wait before 
taking a decision
+   # MediaWiki still not loaded: we must wait before 
taking a decision except for Composer loading
} elseif( $ExtensionRegistry === null ) {
-   # nop
+   if( $this->detectComposer( $type, $name ) ) {
+   $status = 'composer';
+   $value = true;
+   }
 
# Mechanism require_once wanted
} elseif( $value === 'require_once' && 
$this->detectLoadingMechanism( $type, $name, true ) == $value ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/380002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3a611c47a56d4feaf6516a2d455325076ce2684
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Seb35 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Bug: Composer extensions were no more loaded

2017-09-23 Thread Seb35 (Code Review) 
Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380002 )

Change subject: Bug: Composer extensions were no more loaded
..

Bug: Composer extensions were no more loaded

When fixing T168807 in 442efe5, it was mistakenly removed the loading
through Composer in early loading ($ExtensionRegistry === null). Only
Composer loading should be checked during this stage.

Change-Id: Id3a611c47a56d4feaf6516a2d455325076ce2684
---
M src/MediaWikiFarmConfiguration.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/02/380002/1

diff --git a/src/MediaWikiFarmConfiguration.php 
b/src/MediaWikiFarmConfiguration.php
index 9d70f51..62d7eb6 100644
--- a/src/MediaWikiFarmConfiguration.php
+++ b/src/MediaWikiFarmConfiguration.php
@@ -434,9 +434,12 @@
$status = 'composer';
$value = true;
 
-   # MediaWiki still not loaded: we must wait before 
taking a decision
+   # MediaWiki still not loaded: we must wait before 
taking a decision except for Composer loading
} elseif( $ExtensionRegistry === null ) {
-   # nop
+   if( $this->detectComposer( $type, $name ) ) {
+   $status = 'composer';
+   $value = true;
+   }
 
# Mechanism require_once wanted
} elseif( $value === 'require_once' && 
$this->detectLoadingMechanism( $type, $name, true ) == $value ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/380002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3a611c47a56d4feaf6516a2d455325076ce2684
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits