Merge ccb89f7 into e358727

composer.json

@@ -18,19 +18,20 @@
   },
   "require": {
     "php": ">=5.4.0",
-    "ext-imagick": ">=2.0",
+    "ext-imagick": ">=3.0.1",
     "symfony/http-foundation": "2.*"
   },
   "require-dev": {
     "mikey179/vfsStream": "1.*",
-    "doctrine/dbal": "2.*",
     "phpunit/phpunit": "3.*",
     "behat/behat": "2.*",
-    "guzzle/guzzle": "3.*"
+    "guzzle/guzzle": "3.*",
+    "doctrine/dbal": "2.*"
   },
   "suggest": {
-    "ext-mongo": ">=1.3.0",
-    "ext-memcached": ">=2.0.0"
+    "ext-mongo": "Enables usage of MongoDB and GridFS as database and store. Recommended version: >=1.4.0",
+    "ext-memcached": "Enables usage of the Memcached cache adapter for custom event listeners. Recommended version: >=2.0.0",
+    "doctrine/dbal": "Enables usage of using RDMS for storing data (and optionally images). Recommended version: >=2.3"
   },
   "autoload": {
     "psr-0": {

config/config.default.php

@@ -153,18 +153,18 @@
      * @var array
      */
     'eventListeners' => array(
-        'auth' => function() {
-            return new EventListener\Authenticate();
-        },
         'accessToken' => function() {
             return new EventListener\AccessToken();
         },
+        'auth' => function() {
+            return new EventListener\Authenticate();
+        },
         'statsAccess' => function() {
             return new EventListener\StatsAccess(array(
-                'whitelist' => array('127.0.0.1'),
+                'whitelist' => array('127.0.0.1', '::1'),
                 'blacklist' => array(),
             ));
-        }
+        },
     ),
 
     /**
@@ -241,25 +241,30 @@
         },
     ),
 
+
     /**
-     * Custom routes for Imbo
+     * Custom resources for Imbo
      *
+     * @link http://docs.imbo-project.org
      * @var array
      */
-    'routes' => array(),
+    'resources' => array(),
 
     /**
-     * Custom resources for Imbo
+     * Custom routes for Imbo
      *
+     * @link http://docs.imbo-project.org
      * @var array
      */
-    'resources' => array(),
+    'routes' => array(),
 );
 
-if (file_exists(__DIR__ . '/../../../../config/config.php')) {
+if (is_dir(__DIR__ . '/../../../../config')) {
     // Someone has installed Imbo via a custom composer.json, so the custom config is outside of
-    // the vendor dir
-    $config = array_replace_recursive($config, require __DIR__ . '/../../../../config/config.php');
+    // the vendor dir. Loop through all available php files in the config dir
+    foreach (glob(__DIR__ . '/../../../../config/*.php') as $file) {
+        $config = array_replace_recursive($config, require $file);
+    }
 } else if (file_exists(__DIR__ . '/config.php')) {
     $config = array_replace_recursive($config, require __DIR__ . '/config.php');
 }

config/config.testing.php

@@ -13,7 +13,6 @@
 use Imbo\Image\Transformation,
     Imbo\Cache,
     Imbo\Resource\ResourceInterface,
-    Imbo\EventListener\ListenerInterface,
     Imbo\EventListener\ListenerDefinition,
     Imbo\EventManager\EventInterface,
     Imbo\Model\ArrayModel,
@@ -24,7 +23,7 @@
 // Require composer autoloader
 require __DIR__ . '/../vendor/autoload.php';
 
-class CustomResource implements ResourceInterface, ListenerInterface {
+class CustomResource implements ResourceInterface {
     public function getAllowedMethods() {
         return array('GET');
     }
@@ -45,7 +44,7 @@ public function get(EventInterface $event) {
     }
 }
 
-class CustomResource2 implements ResourceInterface, ListenerInterface {
+class CustomResource2 implements ResourceInterface {
     public function getAllowedMethods() {
         return array('GET', 'PUT');
     }

config/imbo.apache.conf.dist

@@ -6,14 +6,14 @@
     # ServerAlias imbo1 imbo2 imbo3
 
     # Document root where the index.php file is located
-    DocumentRoot /path/to/imbo/public
+    DocumentRoot /path/to/install/vendor/imbo/imbo/public
 
     # Logging
     # CustomLog /var/log/apache2/imbo.access_log combined
     # ErrorLog /var/log/apache2/imbo.error_log
 
     # Rewrite rules that rewrite all requests to the index.php script
-    <Directory /path/to/imbo/public>
+    <Directory /path/to/install/vendor/imbo/imbo/public>
         RewriteEngine on
         RewriteCond %{REQUEST_FILENAME} !-f
         RewriteRule .* index.php

config/imbo.nginx.conf.dist

@@ -9,7 +9,7 @@ server {
     # server_name imbo imbo1 imbo2 imbo3;
 
     # Path to the public directory where index.php is located
-    root /path/to/imbo/public;
+    root /path/to/install/vendor/imbo/imbo/public;
     index index.php;
 
     # Logs
@@ -21,7 +21,7 @@ server {
         location ~ \.php$ {
             fastcgi_pass 127.0.0.1:9000;
             fastcgi_index index.php;
-            fastcgi_param SCRIPT_FILENAME /path/to/imbo/public/index.php;
+            fastcgi_param SCRIPT_FILENAME /path/to/install/vendor/imbo/imbo/public/index.php;
             include fastcgi_params;
         }
     }