Change composer include files

This commit is contained in:
Frédéric Guillot
2014-11-06 06:52:19 -05:00
parent c80c15dcc3
commit 4b60e16c5e
5 changed files with 9 additions and 13 deletions

View File

@@ -3,6 +3,8 @@
// Common file between cli and web interface // Common file between cli and web interface
require 'vendor/autoload.php'; require 'vendor/autoload.php';
require __DIR__.'/functions.php';
require __DIR__.'/helpers.php';
// Include custom config file // Include custom config file
if (file_exists('config.php')) { if (file_exists('config.php')) {

View File

@@ -9,10 +9,6 @@
"lusitanian/oauth": "0.3.5" "lusitanian/oauth": "0.3.5"
}, },
"autoload": { "autoload": {
"psr-0": {"": "app/"}, "psr-0": {"": "app/"}
"files": [
"app/helpers.php",
"app/functions.php"
]
} }
} }

2
vendor/autoload.php vendored
View File

@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php'; require_once __DIR__ . '/composer' . '/autoload_real.php';
return ComposerAutoloaderInitdca459c5d320c1273e90aa3e7abc662b::getLoader(); return ComposerAutoloaderInit8e418b286e770f921cf7fca23662d2ad::getLoader();

View File

@@ -8,6 +8,4 @@ $baseDir = dirname($vendorDir);
return array( return array(
$vendorDir . '/ircmaxell/password-compat/lib/password.php', $vendorDir . '/ircmaxell/password-compat/lib/password.php',
$vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php', $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
$baseDir . '/app/helpers.php',
$baseDir . '/app/functions.php',
); );

View File

@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInitdca459c5d320c1273e90aa3e7abc662b class ComposerAutoloaderInit8e418b286e770f921cf7fca23662d2ad
{ {
private static $loader; private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitdca459c5d320c1273e90aa3e7abc662b
return self::$loader; return self::$loader;
} }
spl_autoload_register(array('ComposerAutoloaderInitdca459c5d320c1273e90aa3e7abc662b', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInit8e418b286e770f921cf7fca23662d2ad', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitdca459c5d320c1273e90aa3e7abc662b', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInit8e418b286e770f921cf7fca23662d2ad', 'loadClassLoader'));
$map = require __DIR__ . '/autoload_namespaces.php'; $map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) { foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@ class ComposerAutoloaderInitdca459c5d320c1273e90aa3e7abc662b
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) { foreach ($includeFiles as $file) {
composerRequiredca459c5d320c1273e90aa3e7abc662b($file); composerRequire8e418b286e770f921cf7fca23662d2ad($file);
} }
return $loader; return $loader;
} }
} }
function composerRequiredca459c5d320c1273e90aa3e7abc662b($file) function composerRequire8e418b286e770f921cf7fca23662d2ad($file)
{ {
require $file; require $file;
} }