Merge "objectcache: make RedisBagOStuff pass all tests"

[lhc/web/wiklou.git] / includes / api / ApiModuleManager.php

diff --git a/includes/api/ApiModuleManager.php b/includes/api/ApiModuleManager.php
index 2619a7c..fec55aa 100644 (file)
--- a/includes/api/ApiModuleManager.php
+++ b/includes/api/ApiModuleManager.php
@@ -78,12 +78,12 @@ class ApiModuleManager extends ContextSource {
         * @code
         *  $modules['foo'] = 'ApiFoo';
         *  $modules['bar'] = [
-        *      'class' => 'ApiBar',
+        *      'class' => ApiBar::class,
         *      'factory' => function( $main, $name ) { ... }
         *  ];
         *  $modules['xyzzy'] = [
-        *      'class' => 'ApiXyzzy',
-        *      'factory' => [ 'XyzzyFactory', 'newApiModule' ]
+        *      'class' => ApiXyzzy::class,
+        *      'factory' => [ XyzzyFactory::class, 'newApiModule' ]
         *  ];
         * @endcode
         *
@@ -96,7 +96,7 @@ class ApiModuleManager extends ContextSource {
                foreach ( $modules as $name => $moduleSpec ) {
                        if ( is_array( $moduleSpec ) ) {
                                $class = $moduleSpec['class'];
-                               $factory = ( isset( $moduleSpec['factory'] ) ? $moduleSpec['factory'] : null );
+                               $factory = ( $moduleSpec['factory'] ?? null );
                        } else {
                                $class = $moduleSpec;
                                $factory = null;