From d1379696731e50755ace6e92fa04ae24fe34651b Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 22 Sep 2015 10:54:01 +0200
Subject: [PATCH] fix includes

---
 lib/autoload.php                         | 2 +-
 tests/lib/pq/Gateway/CellTest.php        | 2 +-
 tests/lib/pq/Gateway/RowTest.php         | 2 +-
 tests/lib/pq/Gateway/RowsetTest.php      | 2 +-
 tests/lib/pq/Gateway/TableTest.php       | 2 +-
 tests/lib/pq/Query/AsyncExecutorTest.php | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/autoload.php b/lib/autoload.php
index cc5e906..e45fd2c 100644
--- a/lib/autoload.php
+++ b/lib/autoload.php
@@ -1,7 +1,7 @@
 <?php
 
 spl_autoload_register(function($c) {
-	if (substr($c, 0, 10) === "pq\\Gateway" || substr($c, 0, 8) === "pq\\Query") {
+	if (substr($c, 0, 11) === "pq\\Gateway\\" || substr($c, 0, 9) === "pq\\Query\\" || substr($c, 0, 10) === "pq\\Mapper\\") {
 		return include __DIR__ . "/" . strtr($c, "\\", "/") . ".php";
 	}
 });
diff --git a/tests/lib/pq/Gateway/CellTest.php b/tests/lib/pq/Gateway/CellTest.php
index 35ee6a0..f18163a 100644
--- a/tests/lib/pq/Gateway/CellTest.php
+++ b/tests/lib/pq/Gateway/CellTest.php
@@ -2,7 +2,7 @@
 
 namespace pq\Gateway;
 
-include __DIR__."/../../../setup.inc";
+require_once __DIR__."/../../../setup.inc";
 
 class CellTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/tests/lib/pq/Gateway/RowTest.php b/tests/lib/pq/Gateway/RowTest.php
index bee2dbe..4d539a0 100644
--- a/tests/lib/pq/Gateway/RowTest.php
+++ b/tests/lib/pq/Gateway/RowTest.php
@@ -2,7 +2,7 @@
 
 namespace pq\Gateway;
 
-include_once __DIR__."/../../../setup.inc";
+require_once __DIR__."/../../../setup.inc";
 
 class RowTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/tests/lib/pq/Gateway/RowsetTest.php b/tests/lib/pq/Gateway/RowsetTest.php
index 61f6b11..84981a6 100644
--- a/tests/lib/pq/Gateway/RowsetTest.php
+++ b/tests/lib/pq/Gateway/RowsetTest.php
@@ -2,7 +2,7 @@
 
 namespace pq\Gateway;
 
-include_once __DIR__."/../../../setup.inc";
+require_once __DIR__."/../../../setup.inc";
 
 class RowsetTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/tests/lib/pq/Gateway/TableTest.php b/tests/lib/pq/Gateway/TableTest.php
index 03f71f7..c9bf19f 100644
--- a/tests/lib/pq/Gateway/TableTest.php
+++ b/tests/lib/pq/Gateway/TableTest.php
@@ -2,7 +2,7 @@
 
 namespace pq\Gateway;
 
-include_once __DIR__."/../../../setup.inc";
+require_once __DIR__."/../../../setup.inc";
 
 class TableTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/tests/lib/pq/Query/AsyncExecutorTest.php b/tests/lib/pq/Query/AsyncExecutorTest.php
index ad68a91..9a913e5 100644
--- a/tests/lib/pq/Query/AsyncExecutorTest.php
+++ b/tests/lib/pq/Query/AsyncExecutorTest.php
@@ -2,7 +2,7 @@
 
 namespace pq\Query;
 
-include_once __DIR__."/../../../setup.inc";
+require_once __DIR__."/../../../setup.inc";
 
 use pq\Connection;
 use React\Promise\Deferred as Reacted;
-- 
2.30.2