SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

Pico::loadComposerPlugins(): Use Pico::getVendorDir() instead of Pico::$vendorDir

Browse Source
This commit is contained in:
Daniel Rudolf 2017-06-14 17:43:23 +02:00
parent 23ad80b98a
commit 21051fe08b
No known key found for this signature in database
GPG Key ID: A061F02CD8DE4538
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Pico.php
View File

@ -570,12 +570,12 @@ class Pico
protected function loadComposerPlugins() protected function loadComposerPlugins()
{ {
$composerPlugins = array(); $composerPlugins = array();
if (file_exists($this->vendorDir . 'vendor/pico-plugin.php')) { if (file_exists($this->getVendorDir() . 'vendor/pico-plugin.php')) {
// composer root package // composer root package
$composerPlugins = require($this->vendorDir . 'vendor/pico-plugin.php') ?: array(); $composerPlugins = require($this->getVendorDir() . 'vendor/pico-plugin.php') ?: array();
} elseif (file_exists($this->vendorDir . '../../../vendor/pico-plugin.php')) { } elseif (file_exists($this->getVendorDir() . '../../../vendor/pico-plugin.php')) {
// composer dependency package // composer dependency package
$composerPlugins = require($this->vendorDir . '../../../vendor/pico-plugin.php') ?: array(); $composerPlugins = require($this->getVendorDir() . '../../../vendor/pico-plugin.php') ?: array();
} }
foreach ($composerPlugins as $package => $classNames) { foreach ($composerPlugins as $package => $classNames) {