Skip to content
Snippets Groups Projects

Resolve "Introduce PSR-4 autoloading"

Merged Stein Magne Bjorklund requested to merge 12-introduce-psr-4-autoloading into master
1 file
+ 4
1
Compare changes
  • Side-by-side
  • Inline
+ 6
2
@@ -156,8 +156,8 @@ class Importer
private function createEndpoints($ep)
{
require('common.inc.php');
$endpoints = "";
try {
foreach ($ep as $k => $v) {
if ($conf['endpoint'][$k] != $v) {
@@ -169,13 +169,16 @@ class Importer
echo 'Caught exception while importing endpoints: ', $e->getMessage(), "\n";
exit(1);
}
return $endpoints;
}
private function createNamespaces($ns)
{
require('namespaces.php');
require_once LOADSPEAKR_ROOT . '/namespaces.php';
global $conf;
$namespaces = "";
try {
foreach ($ns as $k => $v) {
if ($conf["ns"][$k] != $v) {
@@ -192,6 +195,7 @@ class Importer
echo 'Caught exception while importing namespaces: ', $e->getMessage(), "\n";
exit(1);
}
return $namespaces;
}
Loading