[MediaWiki-commits] [Gerrit] Rebuild composer autoloader - change (mediawiki...vendor)

2015-04-06 Thread Awight (Code Review) 
Awight has submitted this change and it was merged.

Change subject: Rebuild composer autoloader
..


Rebuild composer autoloader

Using the latest version of composer and DonationInterface extension,
ran "composer dump-autoload".

See T85182 for some more details.

Change-Id: I8e3ceea418a52dcb26e08cc515760cfc8b4e9f92
---
M autoload.php
M composer/ClassLoader.php
M composer/autoload_classmap.php
M composer/autoload_real.php
4 files changed, 12 insertions(+), 7 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  Awight: Verified; Looks good to me, approved



diff --git a/autoload.php b/autoload.php
index b389c5f..fba3fe3 100644
--- a/autoload.php
+++ b/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit96f1a82cec8a6c628030122146461619::getLoader();
+return ComposerAutoloaderInit496326f024bb73fb2c54d7fcabb5462e::getLoader();
diff --git a/composer/ClassLoader.php b/composer/ClassLoader.php
index 4433649..70d78bc 100644
--- a/composer/ClassLoader.php
+++ b/composer/ClassLoader.php
@@ -56,7 +56,11 @@
 
 public function getPrefixes()
 {
-return call_user_func_array('array_merge', $this->prefixesPsr0);
+if (!empty($this->prefixesPsr0)) {
+return call_user_func_array('array_merge', $this->prefixesPsr0);
+}
+
+return array();
 }
 
 public function getPrefixesPsr4()
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index cd0aaa3..e2a55f3 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -30,6 +30,7 @@
 'MWException' => $baseDir . '/gateway_common/MWException.drupal.php',
 'NationalCurrencies' => $baseDir . 
'/gateway_common/NationalCurrencies.php',
 'PaymentMethod' => $baseDir . '/gateway_common/PaymentMethod.php',
+'PaymentResult' => $baseDir . '/gateway_common/PaymentResult.php',
 'PaypalAdapter' => $baseDir . '/paypal_gateway/paypal.adapter.php',
 'PaypalGateway' => $baseDir . '/paypal_gateway/paypal_gateway.body.php',
 'PaypalGatewayResult' => $baseDir . 
'/paypal_gateway/paypal_resultswitcher.body.php',
diff --git a/composer/autoload_real.php b/composer/autoload_real.php
index 114c6eb..ee18000 100644
--- a/composer/autoload_real.php
+++ b/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit96f1a82cec8a6c628030122146461619
+class ComposerAutoloaderInit496326f024bb73fb2c54d7fcabb5462e
 {
 private static $loader;
 
@@ -19,9 +19,9 @@
 return self::$loader;
 }
 
-
spl_autoload_register(array('ComposerAutoloaderInit96f1a82cec8a6c628030122146461619',
 'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit496326f024bb73fb2c54d7fcabb5462e',
 'loadClassLoader'), true, true);
 self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInit96f1a82cec8a6c628030122146461619',
 'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit496326f024bb73fb2c54d7fcabb5462e',
 'loadClassLoader'));
 
 $map = require __DIR__ . '/autoload_namespaces.php';
 foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@
 
 $includeFiles = require __DIR__ . '/autoload_files.php';
 foreach ($includeFiles as $file) {
-composerRequire96f1a82cec8a6c628030122146461619($file);
+composerRequire496326f024bb73fb2c54d7fcabb5462e($file);
 }
 
 return $loader;
 }
 }
 
-function composerRequire96f1a82cec8a6c628030122146461619($file)
+function composerRequire496326f024bb73fb2c54d7fcabb5462e($file)
 {
 require $file;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e3ceea418a52dcb26e08cc515760cfc8b4e9f92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface/vendor
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Ejegg 

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

[MediaWiki-commits] [Gerrit] Rebuild composer autoloader - change (mediawiki...vendor)

2015-04-06 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/202075

Change subject: Rebuild composer autoloader
..

Rebuild composer autoloader

Using the latest version of composer and DonationInterface extension,
ran "composer dump-autoload".

See T85182 for some more details.

Change-Id: I8e3ceea418a52dcb26e08cc515760cfc8b4e9f92
---
M autoload.php
M composer/ClassLoader.php
M composer/autoload_classmap.php
M composer/autoload_real.php
4 files changed, 12 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface/vendor 
refs/changes/75/202075/1

diff --git a/autoload.php b/autoload.php
index b389c5f..fba3fe3 100644
--- a/autoload.php
+++ b/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit96f1a82cec8a6c628030122146461619::getLoader();
+return ComposerAutoloaderInit496326f024bb73fb2c54d7fcabb5462e::getLoader();
diff --git a/composer/ClassLoader.php b/composer/ClassLoader.php
index 4433649..70d78bc 100644
--- a/composer/ClassLoader.php
+++ b/composer/ClassLoader.php
@@ -56,7 +56,11 @@
 
 public function getPrefixes()
 {
-return call_user_func_array('array_merge', $this->prefixesPsr0);
+if (!empty($this->prefixesPsr0)) {
+return call_user_func_array('array_merge', $this->prefixesPsr0);
+}
+
+return array();
 }
 
 public function getPrefixesPsr4()
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index cd0aaa3..e2a55f3 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -30,6 +30,7 @@
 'MWException' => $baseDir . '/gateway_common/MWException.drupal.php',
 'NationalCurrencies' => $baseDir . 
'/gateway_common/NationalCurrencies.php',
 'PaymentMethod' => $baseDir . '/gateway_common/PaymentMethod.php',
+'PaymentResult' => $baseDir . '/gateway_common/PaymentResult.php',
 'PaypalAdapter' => $baseDir . '/paypal_gateway/paypal.adapter.php',
 'PaypalGateway' => $baseDir . '/paypal_gateway/paypal_gateway.body.php',
 'PaypalGatewayResult' => $baseDir . 
'/paypal_gateway/paypal_resultswitcher.body.php',
diff --git a/composer/autoload_real.php b/composer/autoload_real.php
index 114c6eb..ee18000 100644
--- a/composer/autoload_real.php
+++ b/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit96f1a82cec8a6c628030122146461619
+class ComposerAutoloaderInit496326f024bb73fb2c54d7fcabb5462e
 {
 private static $loader;
 
@@ -19,9 +19,9 @@
 return self::$loader;
 }
 
-
spl_autoload_register(array('ComposerAutoloaderInit96f1a82cec8a6c628030122146461619',
 'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit496326f024bb73fb2c54d7fcabb5462e',
 'loadClassLoader'), true, true);
 self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInit96f1a82cec8a6c628030122146461619',
 'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit496326f024bb73fb2c54d7fcabb5462e',
 'loadClassLoader'));
 
 $map = require __DIR__ . '/autoload_namespaces.php';
 foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@
 
 $includeFiles = require __DIR__ . '/autoload_files.php';
 foreach ($includeFiles as $file) {
-composerRequire96f1a82cec8a6c628030122146461619($file);
+composerRequire496326f024bb73fb2c54d7fcabb5462e($file);
 }
 
 return $loader;
 }
 }
 
-function composerRequire96f1a82cec8a6c628030122146461619($file)
+function composerRequire496326f024bb73fb2c54d7fcabb5462e($file)
 {
 require $file;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e3ceea418a52dcb26e08cc515760cfc8b4e9f92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface/vendor
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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