Change composer include files

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')) {

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/"}
     }
 }

vendor/autoload.php

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

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',
 );

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;
 }