aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--composer.json1
-rw-r--r--plugins/wallabag/WallabagInstance.php1
-rw-r--r--plugins/wallabag/wallabag.php5
-rw-r--r--tests/plugins/PluginAddlinkTest.php1
-rw-r--r--tests/plugins/PluginArchiveorgTest.php3
-rw-r--r--tests/plugins/PluginIssoTest.php4
-rw-r--r--tests/plugins/PluginMarkdownTest.php4
-rw-r--r--tests/plugins/PluginPlayvideosTest.php4
-rw-r--r--tests/plugins/PluginPubsubhubbubTest.php5
-rw-r--r--tests/plugins/PluginQrcodeTest.php5
-rw-r--r--tests/plugins/PluginWallabagTest.php6
-rw-r--r--tests/plugins/WallabagInstanceTest.php5
12 files changed, 26 insertions, 18 deletions
diff --git a/composer.json b/composer.json
index a2df466a..8a98cfb6 100644
--- a/composer.json
+++ b/composer.json
@@ -48,6 +48,7 @@
48 "Shaarli\\Netscape\\": "application/netscape", 48 "Shaarli\\Netscape\\": "application/netscape",
49 "Shaarli\\Plugin\\": "application/plugin", 49 "Shaarli\\Plugin\\": "application/plugin",
50 "Shaarli\\Plugin\\Exception\\": "application/plugin/exception", 50 "Shaarli\\Plugin\\Exception\\": "application/plugin/exception",
51 "Shaarli\\Plugin\\Wallabag\\": "plugins/wallabag",
51 "Shaarli\\Render\\": "application/render", 52 "Shaarli\\Render\\": "application/render",
52 "Shaarli\\Security\\": "application/security", 53 "Shaarli\\Security\\": "application/security",
53 "Shaarli\\Updater\\": "application/updater", 54 "Shaarli\\Updater\\": "application/updater",
diff --git a/plugins/wallabag/WallabagInstance.php b/plugins/wallabag/WallabagInstance.php
index eb8ab618..f4a0a92b 100644
--- a/plugins/wallabag/WallabagInstance.php
+++ b/plugins/wallabag/WallabagInstance.php
@@ -1,4 +1,5 @@
1<?php 1<?php
2namespace Shaarli\Plugin\Wallabag;
2 3
3/** 4/**
4 * Class WallabagInstance. 5 * Class WallabagInstance.
diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php
index 5ba1611d..bc35df08 100644
--- a/plugins/wallabag/wallabag.php
+++ b/plugins/wallabag/wallabag.php
@@ -1,12 +1,11 @@
1<?php 1<?php
2
3/** 2/**
4 * Plugin Wallabag. 3 * Wallabag plugin
5 */ 4 */
6 5
7require_once 'WallabagInstance.php';
8use Shaarli\Config\ConfigManager; 6use Shaarli\Config\ConfigManager;
9use Shaarli\Plugin\PluginManager; 7use Shaarli\Plugin\PluginManager;
8use Shaarli\Plugin\Wallabag\WallabagInstance;
10 9
11/** 10/**
12 * Init function, return an error if the server is not set. 11 * Init function, return an error if the server is not set.
diff --git a/tests/plugins/PluginAddlinkTest.php b/tests/plugins/PluginAddlinkTest.php
index e0a0107d..d052f8b9 100644
--- a/tests/plugins/PluginAddlinkTest.php
+++ b/tests/plugins/PluginAddlinkTest.php
@@ -1,4 +1,5 @@
1<?php 1<?php
2namespace Shaarli\Plugin\Addlink;
2 3
3use Shaarli\Plugin\PluginManager; 4use Shaarli\Plugin\PluginManager;
4use Shaarli\Router; 5use Shaarli\Router;
diff --git a/tests/plugins/PluginArchiveorgTest.php b/tests/plugins/PluginArchiveorgTest.php
index d06bfa59..510288bb 100644
--- a/tests/plugins/PluginArchiveorgTest.php
+++ b/tests/plugins/PluginArchiveorgTest.php
@@ -1,4 +1,5 @@
1<?php 1<?php
2namespace Shaarli\Plugin\Archiveorg;
2 3
3/** 4/**
4 * PluginArchiveorgTest.php 5 * PluginArchiveorgTest.php
@@ -12,7 +13,7 @@ require_once 'plugins/archiveorg/archiveorg.php';
12 * Class PluginArchiveorgTest 13 * Class PluginArchiveorgTest
13 * Unit test for the archiveorg plugin 14 * Unit test for the archiveorg plugin
14 */ 15 */
15class PluginArchiveorgTest extends PHPUnit_Framework_TestCase 16class PluginArchiveorgTest extends \PHPUnit\Framework\TestCase
16{ 17{
17 /** 18 /**
18 * Reset plugin path 19 * Reset plugin path
diff --git a/tests/plugins/PluginIssoTest.php b/tests/plugins/PluginIssoTest.php
index 7aee2197..bdfab439 100644
--- a/tests/plugins/PluginIssoTest.php
+++ b/tests/plugins/PluginIssoTest.php
@@ -1,5 +1,7 @@
1<?php 1<?php
2namespace Shaarli\Plugin\Isso;
2 3
4use DateTime;
3use Shaarli\Bookmark\LinkDB; 5use Shaarli\Bookmark\LinkDB;
4use Shaarli\Config\ConfigManager; 6use Shaarli\Config\ConfigManager;
5use Shaarli\Plugin\PluginManager; 7use Shaarli\Plugin\PluginManager;
@@ -11,7 +13,7 @@ require_once 'plugins/isso/isso.php';
11 * 13 *
12 * Test the Isso plugin (comment system). 14 * Test the Isso plugin (comment system).
13 */ 15 */
14class PluginIssoTest extends PHPUnit_Framework_TestCase 16class PluginIssoTest extends \PHPUnit\Framework\TestCase
15{ 17{
16 /** 18 /**
17 * Reset plugin path 19 * Reset plugin path
diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php
index 90a19e7b..5e7c02b0 100644
--- a/tests/plugins/PluginMarkdownTest.php
+++ b/tests/plugins/PluginMarkdownTest.php
@@ -1,4 +1,6 @@
1<?php 1<?php
2namespace Shaarli\Plugin\Markdown;
3
2use Shaarli\Config\ConfigManager; 4use Shaarli\Config\ConfigManager;
3use Shaarli\Plugin\PluginManager; 5use Shaarli\Plugin\PluginManager;
4 6
@@ -14,7 +16,7 @@ require_once 'plugins/markdown/markdown.php';
14 * Class PluginMarkdownTest 16 * Class PluginMarkdownTest
15 * Unit test for the Markdown plugin 17 * Unit test for the Markdown plugin
16 */ 18 */
17class PluginMarkdownTest extends PHPUnit_Framework_TestCase 19class PluginMarkdownTest extends \PHPUnit\Framework\TestCase
18{ 20{
19 /** 21 /**
20 * @var ConfigManager instance. 22 * @var ConfigManager instance.
diff --git a/tests/plugins/PluginPlayvideosTest.php b/tests/plugins/PluginPlayvideosTest.php
index aa3ad143..51472617 100644
--- a/tests/plugins/PluginPlayvideosTest.php
+++ b/tests/plugins/PluginPlayvideosTest.php
@@ -1,4 +1,5 @@
1<?php 1<?php
2namespace Shaarli\Plugin\Playvideos;
2 3
3/** 4/**
4 * PluginPlayvideosTest.php 5 * PluginPlayvideosTest.php
@@ -8,13 +9,12 @@ use Shaarli\Plugin\PluginManager;
8use Shaarli\Router; 9use Shaarli\Router;
9 10
10require_once 'plugins/playvideos/playvideos.php'; 11require_once 'plugins/playvideos/playvideos.php';
11require_once 'application/Router.php';
12 12
13/** 13/**
14 * Class PluginPlayvideosTest 14 * Class PluginPlayvideosTest
15 * Unit test for the PlayVideos plugin 15 * Unit test for the PlayVideos plugin
16 */ 16 */
17class PluginPlayvideosTest extends PHPUnit_Framework_TestCase 17class PluginPlayvideosTest extends \PHPUnit\Framework\TestCase
18{ 18{
19 /** 19 /**
20 * Reset plugin path 20 * Reset plugin path
diff --git a/tests/plugins/PluginPubsubhubbubTest.php b/tests/plugins/PluginPubsubhubbubTest.php
index 4680513e..a7bd8fc9 100644
--- a/tests/plugins/PluginPubsubhubbubTest.php
+++ b/tests/plugins/PluginPubsubhubbubTest.php
@@ -1,16 +1,17 @@
1<?php 1<?php
2namespace Shaarli\Plugin\Pubsubhubbub;
3
2use Shaarli\Config\ConfigManager; 4use Shaarli\Config\ConfigManager;
3use Shaarli\Plugin\PluginManager; 5use Shaarli\Plugin\PluginManager;
4use Shaarli\Router; 6use Shaarli\Router;
5 7
6require_once 'plugins/pubsubhubbub/pubsubhubbub.php'; 8require_once 'plugins/pubsubhubbub/pubsubhubbub.php';
7require_once 'application/Router.php';
8 9
9/** 10/**
10 * Class PluginPubsubhubbubTest 11 * Class PluginPubsubhubbubTest
11 * Unit test for the pubsubhubbub plugin 12 * Unit test for the pubsubhubbub plugin
12 */ 13 */
13class PluginPubsubhubbubTest extends PHPUnit_Framework_TestCase 14class PluginPubsubhubbubTest extends \PHPUnit\Framework\TestCase
14{ 15{
15 /** 16 /**
16 * @var string Config file path (without extension). 17 * @var string Config file path (without extension).
diff --git a/tests/plugins/PluginQrcodeTest.php b/tests/plugins/PluginQrcodeTest.php
index 325e3109..0c61e14a 100644
--- a/tests/plugins/PluginQrcodeTest.php
+++ b/tests/plugins/PluginQrcodeTest.php
@@ -1,4 +1,6 @@
1<?php 1<?php
2namespace Shaarli\Plugin\Qrcode;
3
2/** 4/**
3 * PluginQrcodeTest.php 5 * PluginQrcodeTest.php
4 */ 6 */
@@ -7,13 +9,12 @@ use Shaarli\Plugin\PluginManager;
7use Shaarli\Router; 9use Shaarli\Router;
8 10
9require_once 'plugins/qrcode/qrcode.php'; 11require_once 'plugins/qrcode/qrcode.php';
10require_once 'application/Router.php';
11 12
12/** 13/**
13 * Class PluginQrcodeTest 14 * Class PluginQrcodeTest
14 * Unit test for the QR-Code plugin 15 * Unit test for the QR-Code plugin
15 */ 16 */
16class PluginQrcodeTest extends PHPUnit_Framework_TestCase 17class PluginQrcodeTest extends \PHPUnit\Framework\TestCase
17{ 18{
18 /** 19 /**
19 * Reset plugin path 20 * Reset plugin path
diff --git a/tests/plugins/PluginWallabagTest.php b/tests/plugins/PluginWallabagTest.php
index 4e445efb..79751921 100644
--- a/tests/plugins/PluginWallabagTest.php
+++ b/tests/plugins/PluginWallabagTest.php
@@ -1,11 +1,9 @@
1<?php 1<?php
2namespace Shaarli\Plugin\Wallabag;
3
2use Shaarli\Config\ConfigManager; 4use Shaarli\Config\ConfigManager;
3use Shaarli\Plugin\PluginManager; 5use Shaarli\Plugin\PluginManager;
4 6
5/**
6 * PluginWallabagTest.php.php
7 */
8
9require_once 'plugins/wallabag/wallabag.php'; 7require_once 'plugins/wallabag/wallabag.php';
10 8
11/** 9/**
diff --git a/tests/plugins/WallabagInstanceTest.php b/tests/plugins/WallabagInstanceTest.php
index 2c466871..bcc01604 100644
--- a/tests/plugins/WallabagInstanceTest.php
+++ b/tests/plugins/WallabagInstanceTest.php
@@ -1,11 +1,12 @@
1<?php 1<?php
2namespace Shaarli\Plugin\Wallabag;
2 3
3require_once 'plugins/wallabag/WallabagInstance.php'; 4use Shaarli\Plugin\Wallabag\WallabagInstance;
4 5
5/** 6/**
6 * Class WallabagInstanceTest 7 * Class WallabagInstanceTest
7 */ 8 */
8class WallabagInstanceTest extends PHPUnit_Framework_TestCase 9class WallabagInstanceTest extends \PHPUnit\Framework\TestCase
9{ 10{
10 /** 11 /**
11 * @var string wallabag url. 12 * @var string wallabag url.