Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support multiple plugin paths #14051

Merged
merged 36 commits into from
Mar 14, 2019
Merged

Support multiple plugin paths #14051

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
cfc147e
do not hard code plugins directory
tsteur Jan 29, 2019
5333bf7
remove method that is not needed for now
tsteur Jan 29, 2019
fe67c2b
use plugins directory in more places
tsteur Jan 29, 2019
b54c966
some work on supporting multiple plugin directories
tsteur Jan 30, 2019
9c9cc94
use more unique name
tsteur Jan 30, 2019
1966259
couple fixes
tsteur Jan 30, 2019
0e2c2d0
and another fix
tsteur Jan 30, 2019
1820b73
sort plugins
tsteur Jan 30, 2019
420b04d
adjust languagesmanager
tsteur Jan 30, 2019
cee5130
Merge branch '3.x-dev' into multipluginpaths
tsteur Jan 30, 2019
8e64fa3
adjust more usages
tsteur Jan 30, 2019
0ff06e5
Update Manager.php
tsteur Feb 3, 2019
2f9cb52
adding a plugin to test
tsteur Feb 5, 2019
f0cfaa6
more tests
tsteur Feb 5, 2019
8fc08d3
make sure plugin resources can be located in custom directory
tsteur Feb 6, 2019
6abd286
adding more tests
tsteur Feb 6, 2019
a724048
rewrite image paths
tsteur Feb 6, 2019
f30c6d1
handle more cases
tsteur Feb 6, 2019
def1ca4
add tests
tsteur Feb 6, 2019
4ac8246
make sure to load plugin
tsteur Feb 6, 2019
4c3fd77
trying to fix test
tsteur Feb 7, 2019
0280aaa
trying it this way
tsteur Feb 7, 2019
a3c832c
load plugin
tsteur Feb 7, 2019
b334967
fix ui test?
tsteur Feb 7, 2019
aa42da0
testing if tests succeed this way
tsteur Feb 7, 2019
c27b86d
another test
tsteur Feb 7, 2019
48e1df3
load custom dir plugin
tsteur Feb 7, 2019
a6f4170
load plugin in ui fixture
tsteur Feb 7, 2019
2d64fb4
change the update statement
tsteur Feb 7, 2019
8447bed
remove update script
tsteur Feb 7, 2019
9baa3f9
delete column
tsteur Feb 7, 2019
5a5f04e
fix ui test
tsteur Feb 7, 2019
e45e782
make it work for tests
tsteur Feb 8, 2019
f5e0b70
fix some tests
tsteur Feb 8, 2019
bb347dd
Merge branch '3.x-dev' into multipluginpaths
diosmosis Mar 14, 2019
0e4361c
Fix merge.
diosmosis Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/PHPUnit/Fixtures/UITestFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ public function __construct()

public function setUp()
{
$this->extraPluginsToLoad[] = 'CustomDirPlugin';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think you'll have to add it to top of performSetUp()

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you @diosmosis will try

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn't help... https://travis-ci.org/matomo-org/matomo/jobs/489864454#L1203 will need to see tmrw and otherwise just remove all possible updates from that plugin


parent::setUp();

self::resetPluginsInstalledConfig();
Expand Down