Clean up linker.php

composer.json

@@ -415,7 +415,15 @@
     },
     "autoload": {
         "classmap": [
-            "composer.scripts.php"
+            "composer.scripts.php",
+            "classes",
+            "classes/DB",
+            "classes/DB/DBModel",
+            "classes/DB/TimePeriodGenerators",
+            "classes/ExtJS",
+            "classes/Rest",
+            "classes/User",
+            "classes/ReportTemplates"
         ]
     }
 }

configuration/linker.json

@@ -1,22 +1,5 @@
 {
-    "autoloaders": [
-        "vendor/autoload.php"
-    ],
     "include_dirs": [
-        "classes",
-        "classes/DB",
-        "classes/DB/TACCStatsIngestors",
-        "classes/DB/TGcDBIngestors",
-        "classes/DB/POPSIngestors",
-        "classes/DB/XRASIngestors",
-        "classes/DB/Aggregators",
-        "classes/DB/DBModel",
-        "classes/DB/TimePeriodGenerators",
-        "classes/ExtJS",
-        "classes/REST",
-        "classes/User",
-        "classes/ReportTemplates",
-        "classes/AppKernel",
-        "libraries/HighRoller_1.0.5"
+        "classes"
     ]
 }

configuration/linker.php

@@ -4,36 +4,10 @@
 $baseDir = dirname($dir);
 
 require_once($dir . '/constants.php');
+require_once($baseDir . '/libraries/utilities.php');
+require_once($baseDir . "/vendor/autoload.php");
 
-// ---------------------------
-
-// If present, load linker configuration from linker.json and linker.d.
-require_once("$baseDir/classes/CCR/Json.php");
-
-try {
-    $linkerConfigFilePath = implode(
-        DIRECTORY_SEPARATOR,
-        array(
-            CONFIG_DIR,
-            'linker.json'
-        )
-    );
-    $linkerConfig = CCR\Json::loadFile(
-        $linkerConfigFilePath
-    );
-} catch (Exception $e) {
-    $configDir = $config->getConfigDirPath();
-    echo "Could not find valid \"linker.json\" or \"linker.d\" files in \"$configDir\".\n";
-    echo "Please set up valid linker configuration files and try again.\n";
-    exit(1);
-}
-
-// Load configured autoloaders.
-if (isset($linkerConfig['autoloaders'])) {
-    foreach ($linkerConfig['autoloaders'] as $autoloaderPath) {
-        require_once("$baseDir/$autoloaderPath");
-    }
-}
+$linkerConfig = \Configuration\XdmodConfiguration::assocArrayFactory('linker.json', CONFIG_DIR);
 
 // Update PHP's include path to include certain XDMoD directories.
 if (isset($linkerConfig['include_dirs'])) {
@@ -71,10 +45,6 @@ function xdmodAutoload($className)
 
 spl_autoload_register('xdmodAutoload');
 
-// Libraries ---------------------------
-
-require_once($baseDir . '/libraries/utilities.php');
-
 $libraries = scandir($baseDir . '/libraries');
 
 foreach ($libraries as $library) {