git.cweiske.de
/
phorkie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
46bdb6a
)
use lib/ as include path when PEAR-installed dependencies are in it
author
Christian Weiske
<cweiske@cweiske.de>
Fri, 4 Jul 2014 05:30:05 +0000
(07:30 +0200)
committer
Christian Weiske
<cweiske@cweiske.de>
Fri, 4 Jul 2014 05:30:05 +0000
(07:30 +0200)
src/phorkie/autoload.php
patch
|
blob
|
history
diff --git
a/src/phorkie/autoload.php
b/src/phorkie/autoload.php
index 189cde48a7fc263232e8f64464221db94ddb6b2e..6441a1a71790fc8b7ab13494f701c7e5cb3589fd 100644
(file)
--- a/
src/phorkie/autoload.php
+++ b/
src/phorkie/autoload.php
@@
-4,7
+4,14
@@
*
* @author Christian Weiske <cweiske@cweiske.de>
*/
*
* @author Christian Weiske <cweiske@cweiske.de>
*/
-if (file_exists(__DIR__ . '/../../lib/autoload.php')) {
+if (file_exists(__DIR__ . '/../../lib/PEAR.php')) {
+ //phing-installed dependencies available ("phing collectdeps")
+ set_include_path(
+ __DIR__ . '/../'
+ . PATH_SEPARATOR . __DIR__ . '/../../lib/'
+ . PATH_SEPARATOR . '.'
+ );
+} else if (file_exists(__DIR__ . '/../../lib/autoload.php')) {
//composer-installed dependencies available
set_include_path(
__DIR__ . '/../'
//composer-installed dependencies available
set_include_path(
__DIR__ . '/../'