diff options
| -rw-r--r-- | app/common.php | 2 | ||||
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | vendor/autoload.php | 2 | ||||
| -rw-r--r-- | vendor/composer/autoload_files.php | 2 | ||||
| -rw-r--r-- | vendor/composer/autoload_real.php | 10 |
5 files changed, 9 insertions, 13 deletions
diff --git a/app/common.php b/app/common.php index 613d4501..45169d70 100644 --- a/app/common.php +++ b/app/common.php @@ -3,6 +3,8 @@ // Common file between cli and web interface require 'vendor/autoload.php'; +require __DIR__.'/functions.php'; +require __DIR__.'/helpers.php'; // Include custom config file if (file_exists('config.php')) { diff --git a/composer.json b/composer.json index 1f7009ab..04e6e4a1 100644 --- a/composer.json +++ b/composer.json @@ -9,10 +9,6 @@ "lusitanian/oauth": "0.3.5" }, "autoload": { - "psr-0": {"": "app/"}, - "files": [ - "app/helpers.php", - "app/functions.php" - ] + "psr-0": {"": "app/"} } } diff --git a/vendor/autoload.php b/vendor/autoload.php index b09bfaf4..d11d39f5 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInitdca459c5d320c1273e90aa3e7abc662b::getLoader(); +return ComposerAutoloaderInit8e418b286e770f921cf7fca23662d2ad::getLoader(); diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index e4e62fbe..d938f0f4 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -8,6 +8,4 @@ $baseDir = dirname($vendorDir); return array( $vendorDir . '/ircmaxell/password-compat/lib/password.php', $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php', - $baseDir . '/app/helpers.php', - $baseDir . '/app/functions.php', ); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 3f14898f..55cc0caf 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitdca459c5d320c1273e90aa3e7abc662b +class ComposerAutoloaderInit8e418b286e770f921cf7fca23662d2ad { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInitdca459c5d320c1273e90aa3e7abc662b 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(); - spl_autoload_unregister(array('ComposerAutoloaderInitdca459c5d320c1273e90aa3e7abc662b', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit8e418b286e770f921cf7fca23662d2ad', 'loadClassLoader')); $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -42,14 +42,14 @@ class ComposerAutoloaderInitdca459c5d320c1273e90aa3e7abc662b $includeFiles = require __DIR__ . '/autoload_files.php'; foreach ($includeFiles as $file) { - composerRequiredca459c5d320c1273e90aa3e7abc662b($file); + composerRequire8e418b286e770f921cf7fca23662d2ad($file); } return $loader; } } -function composerRequiredca459c5d320c1273e90aa3e7abc662b($file) +function composerRequire8e418b286e770f921cf7fca23662d2ad($file) { require $file; } |