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
+ 4
1
@@ -175,8 +175,10 @@ class Importer
@@ -175,8 +175,10 @@ class Importer
private function createNamespaces($ns)
private function createNamespaces($ns)
{
{
require('namespaces.php');
require_once LOADSPEAKR_ROOT . '/namespaces.php';
 
global $conf;
$namespaces = "";
$namespaces = "";
 
try {
try {
foreach ($ns as $k => $v) {
foreach ($ns as $k => $v) {
if ($conf["ns"][$k] != $v) {
if ($conf["ns"][$k] != $v) {
@@ -193,6 +195,7 @@ class Importer
@@ -193,6 +195,7 @@ class Importer
echo 'Caught exception while importing namespaces: ', $e->getMessage(), "\n";
echo 'Caught exception while importing namespaces: ', $e->getMessage(), "\n";
exit(1);
exit(1);
}
}
 
return $namespaces;
return $namespaces;
}
}
Loading