From dd70c38481ad0ae26f0acd498b1828555ce17acf Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Fri, 24 Jul 2015 18:36:28 +0200
Subject: [PATCH] cleanup test loading and update jackalope and tests version

---
 composer.json       | 7 +++++--
 tests/bootstrap.php | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 295ec760..daf8aed8 100644
--- a/composer.json
+++ b/composer.json
@@ -21,19 +21,22 @@
         "ext-curl":"*",
         "phpcr/phpcr": "~2.1.2",
         "phpcr/phpcr-utils": "~1.2,>=1.2.6",
-        "jackalope/jackalope": "~1.2.1"
+        "jackalope/jackalope": "~1.2.2"
     },
     "provide": {
         "jackalope/jackalope-transport": "1.1.0"
     },
     "require-dev": {
         "psr/log": "~1.0",
-        "phpcr/phpcr-api-tests": "2.1.5",
+        "phpcr/phpcr-api-tests": "2.1.6",
         "symfony/console": "~2.0"
     },
     "autoload": {
         "psr-0": { "Jackalope\\": "src/" }
     },
+    "autoload-dev": {
+        "psr-0": { "Jackalope\\": "tests/" }
+    },
     "bin": ["bin/jackalope", "bin/jackrabbit.sh"],
     "extra": {
         "branch-alias": {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index d47e7a19..8bf00fa8 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 
-/** make sure we get ALL infos from php */
+/** Make sure we get ALL infos from php */
 error_reporting(E_ALL | E_STRICT);
 
 if (!$loader = @include __DIR__.'/../vendor/autoload.php') {
@@ -9,14 +9,14 @@
         'php composer.phar install'.PHP_EOL);
 }
 
-$loader->add('Jackalope\\Test', __DIR__);
+/** Make Jackalope base tests autoloadable */
 $loader->add('Jackalope', __DIR__.'/../vendor/jackalope/jackalope/tests');
 
-### Load the implementation loader class ###
+/** Load the implementation loader class */
 require_once __DIR__ . '/ImplementationLoader.php';
 require_once __DIR__ . '/JackrabbitFixtureLoader.php';
 
-/*
+/**
  * constants for the repository descriptor test for JCR 1.0/JSR-170 and JSR-283 specs
  */