Fix helper include

This commit is contained in:
Frederic Guillot 2015-01-11 11:26:55 -05:00
parent 0f62f81d9e
commit 16945c3649
7 changed files with 16 additions and 14 deletions

View File

@ -11,6 +11,7 @@
}, },
"autoload": { "autoload": {
"files": [ "files": [
"lib/helpers.php",
"lib/Translator.php", "lib/Translator.php",
"models/config.php", "models/config.php",
"models/service.php", "models/service.php",

View File

@ -1,6 +1,5 @@
<?php <?php
require __DIR__.'/lib/helpers.php';
require __DIR__.'/common.php'; require __DIR__.'/common.php';
require __DIR__.'/vendor/fguillot/picofarad/lib/PicoFarad/Template.php'; require __DIR__.'/vendor/fguillot/picofarad/lib/PicoFarad/Template.php';
require __DIR__.'/vendor/fguillot/picofarad/lib/PicoFarad/Response.php'; require __DIR__.'/vendor/fguillot/picofarad/lib/PicoFarad/Response.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 ComposerAutoloaderInit4bf0deb5f320870196e18154b9d8e434::getLoader(); return ComposerAutoloaderInit14b220c217b5c0a54b55656dba0c7ad0::getLoader();

View File

@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);
return array( return array(
$baseDir . '/lib/helpers.php',
$baseDir . '/lib/Translator.php', $baseDir . '/lib/Translator.php',
$baseDir . '/models/config.php', $baseDir . '/models/config.php',
$baseDir . '/models/service.php', $baseDir . '/models/service.php',

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInit4bf0deb5f320870196e18154b9d8e434 class ComposerAutoloaderInit14b220c217b5c0a54b55656dba0c7ad0
{ {
private static $loader; private static $loader;
@ -19,9 +19,9 @@ class ComposerAutoloaderInit4bf0deb5f320870196e18154b9d8e434
return self::$loader; return self::$loader;
} }
spl_autoload_register(array('ComposerAutoloaderInit4bf0deb5f320870196e18154b9d8e434', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInit14b220c217b5c0a54b55656dba0c7ad0', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit4bf0deb5f320870196e18154b9d8e434', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInit14b220c217b5c0a54b55656dba0c7ad0', '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 ComposerAutoloaderInit4bf0deb5f320870196e18154b9d8e434
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) { foreach ($includeFiles as $file) {
composerRequire4bf0deb5f320870196e18154b9d8e434($file); composerRequire14b220c217b5c0a54b55656dba0c7ad0($file);
} }
return $loader; return $loader;
} }
} }
function composerRequire4bf0deb5f320870196e18154b9d8e434($file) function composerRequire14b220c217b5c0a54b55656dba0c7ad0($file)
{ {
require $file; require $file;
} }

View File

@ -162,18 +162,18 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fguillot/picoFeed.git", "url": "https://github.com/fguillot/picoFeed.git",
"reference": "b25b74c8aee8e6af3d9c1b15e0772628ea313e0c" "reference": "efe811fcf56644df4664370815bccab90c289b13"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fguillot/picoFeed/zipball/b25b74c8aee8e6af3d9c1b15e0772628ea313e0c", "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/efe811fcf56644df4664370815bccab90c289b13",
"reference": "b25b74c8aee8e6af3d9c1b15e0772628ea313e0c", "reference": "efe811fcf56644df4664370815bccab90c289b13",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.0" "php": ">=5.3.0"
}, },
"time": "2015-01-07 01:50:53", "time": "2015-01-10 22:07:07",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {

View File

@ -6,7 +6,8 @@ Versions
- Development version: master - Development version: master
- Available versions: - Available versions:
- v0.1.0 (stable) - v0.1.1 (stable)
- v0.1.0
- v0.0.2 - v0.0.2
- v0.0.1 - v0.0.1
@ -20,7 +21,7 @@ Configure your `composer.json`:
```json ```json
{ {
"require": { "require": {
"fguillot/picofeed": "0.1.0" "fguillot/picofeed": "0.1.1"
} }
} }
``` ```
@ -28,7 +29,7 @@ Configure your `composer.json`:
Or simply: Or simply:
```bash ```bash
composer require fguillot/picofeed:0.1.0 composer require fguillot/picofeed:0.1.1
``` ```
And download the code: And download the code: