summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-03-08 19:26:00 +0100
committerFlorian Pritz <bluewind@xinu.at>2015-03-08 19:26:00 +0100
commitf4f108a41281037370eaec6c7b8fb3e6e35a30f5 (patch)
tree52116a3d10fd58743f249264a16d5df9c915dea9
parent5fa6b2110039670b2cd0504b95d54a79b272a299 (diff)
Add mockery
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--.gitmodules3
-rw-r--r--application/libraries/Customautoloader.php1
m---------application/third_party/mockery0
3 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..7209fd166
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "application/third_party/mockery"]
+ path = application/third_party/mockery
+ url = https://github.com/padraic/mockery.git
diff --git a/application/libraries/Customautoloader.php b/application/libraries/Customautoloader.php
index 91be09066..c59847eb3 100644
--- a/application/libraries/Customautoloader.php
+++ b/application/libraries/Customautoloader.php
@@ -18,6 +18,7 @@ class CustomAutoloader{
{
$base_paths = array(
APPPATH,
+ APPPATH."/third_party/mockery/library/",
);
foreach ($base_paths as $base_path) {
diff --git a/application/third_party/mockery b/application/third_party/mockery
new file mode 160000
+Subproject d141c5b1b302d4d746e38ccc95ffe215129a855