summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a43e784)
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
41 files changed:
namespace Shaarli;
use Gettext\GettextTranslator;
namespace Shaarli;
use Gettext\GettextTranslator;
use Gettext\Translations;
use Gettext\Translator;
use Gettext\TranslatorInterface;
use Gettext\Translations;
use Gettext\Translator;
use Gettext\TranslatorInterface;
namespace Shaarli;
use Shaarli\Config\ConfigManager;
namespace Shaarli;
use Shaarli\Config\ConfigManager;
+use WebThumbnailer\Application\ConfigManager as WTConfigManager;
use WebThumbnailer\Exception\WebThumbnailerException;
use WebThumbnailer\WebThumbnailer;
use WebThumbnailer\Exception\WebThumbnailerException;
use WebThumbnailer\WebThumbnailer;
-use WebThumbnailer\Application\ConfigManager as WTConfigManager;
<?php
namespace Shaarli\Api;
<?php
namespace Shaarli\Api;
-use Shaarli\Api\Exceptions\ApiException;
use Shaarli\Api\Exceptions\ApiAuthorizationException;
use Shaarli\Api\Exceptions\ApiAuthorizationException;
+use Shaarli\Api\Exceptions\ApiException;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Request;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Request;
<?php
namespace Shaarli\Api;
<?php
namespace Shaarli\Api;
-use Shaarli\Http\Base64Url;
use Shaarli\Api\Exceptions\ApiAuthorizationException;
use Shaarli\Api\Exceptions\ApiAuthorizationException;
+use Shaarli\Http\Base64Url;
namespace Shaarli\Api\Controllers;
namespace Shaarli\Api\Controllers;
+use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
use Shaarli\Config\ConfigManager;
/**
* Abstract Class ApiController
/**
* Abstract Class ApiController
- * @var \Shaarli\Bookmark\LinkDB
*/
protected $linkDb;
/**
*/
protected $linkDb;
/**
- * @var \Shaarli\History
+ * @var HistoryController
*
* @package Shaarli\Api\Controllers
*/
*
* @package Shaarli\Api\Controllers
*/
-class History extends ApiController
+class HistoryController extends ApiController
{
/**
* Service providing operation regarding Shaarli datastore and settings.
{
/**
* Service providing operation regarding Shaarli datastore and settings.
use Shaarli\Api\ApiUtils;
use Shaarli\Api\Exceptions\ApiBadParametersException;
use Shaarli\Api\ApiUtils;
use Shaarli\Api\Exceptions\ApiBadParametersException;
-use Shaarli\Api\Exceptions\ApiLinkNotFoundException;
use Shaarli\Api\Exceptions\ApiTagNotFoundException;
use Slim\Http\Request;
use Slim\Http\Response;
use Shaarli\Api\Exceptions\ApiTagNotFoundException;
use Slim\Http\Request;
use Slim\Http\Response;
namespace Shaarli\Api\Exceptions;
namespace Shaarli\Api\Exceptions;
-use Slim\Http\Response;
-
/**
* Class ApiLinkNotFoundException
*
/**
* Class ApiLinkNotFoundException
*
namespace Shaarli\Api\Exceptions;
namespace Shaarli\Api\Exceptions;
-use Slim\Http\Response;
-
/**
* Class ApiTagNotFoundException
*
/**
* Class ApiTagNotFoundException
*
use Countable;
use DateTime;
use Iterator;
use Countable;
use DateTime;
use Iterator;
-use Shaarli\Bookmark\LinkFilter;
use Shaarli\Bookmark\Exception\LinkNotFoundException;
use Shaarli\Exceptions\IOException;
use Shaarli\FileUtils;
use Shaarli\Bookmark\Exception\LinkNotFoundException;
use Shaarli\Exceptions\IOException;
use Shaarli\FileUtils;
namespace Shaarli\Feed;
use DateTime;
namespace Shaarli\Feed;
use DateTime;
-use Shaarli\Bookmark\LinkDB;
use DateTime;
use DateTimeZone;
use Exception;
use DateTime;
use DateTimeZone;
use Exception;
+use Katzgrau\KLogger\Logger;
use Psr\Log\LogLevel;
use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
use Shaarli\History;
use Shaarli\NetscapeBookmarkParser\NetscapeBookmarkParser;
use Psr\Log\LogLevel;
use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
use Shaarli\History;
use Shaarli\NetscapeBookmarkParser\NetscapeBookmarkParser;
-use Katzgrau\KLogger\Logger;
/**
* Utilities to import and export bookmarks using the Netscape format
/**
* Utilities to import and export bookmarks using the Netscape format
namespace Shaarli\Render;
namespace Shaarli\Render;
-use Shaarli\ApplicationUtils;
-use Shaarli\Bookmark\LinkDB;
+use Shaarli\ApplicationUtils;
+use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
use Shaarli\Thumbnailer;
use Shaarli\Config\ConfigManager;
use Shaarli\Thumbnailer;
namespace Shaarli\Updater;
namespace Shaarli\Updater;
-use Shaarli\ApplicationUtils;
use Exception;
use RainTPL;
use ReflectionClass;
use ReflectionException;
use ReflectionMethod;
use Exception;
use RainTPL;
use ReflectionClass;
use ReflectionException;
use ReflectionMethod;
+use Shaarli\ApplicationUtils;
use Shaarli\Bookmark\LinkDB;
use Shaarli\Bookmark\LinkFilter;
use Shaarli\Config\ConfigJson;
use Shaarli\Bookmark\LinkDB;
use Shaarli\Bookmark\LinkFilter;
use Shaarli\Config\ConfigJson;
/**
* Class LanguagesTest.
*/
/**
* Class LanguagesTest.
*/
-class LanguagesTest extends \PHPUnit_Framework_TestCase
+class LanguagesTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string Config file path (without extension).
{
/**
* @var string Config file path (without extension).
/**
* Unitary tests for timezone utilities
*/
/**
* Unitary tests for timezone utilities
*/
-class TimeZoneTest extends PHPUnit_Framework_TestCase
+class TimeZoneTest extends PHPUnit\Framework\TestCase
{
/**
* @var array of timezones
{
/**
* @var array of timezones
/**
* Unitary tests for Shaarli utilities
*/
/**
* Unitary tests for Shaarli utilities
*/
-class UtilsTest extends PHPUnit_Framework_TestCase
+class UtilsTest extends PHPUnit\Framework\TestCase
{
// Log file
protected static $testLogFile = 'tests.log';
{
// Log file
protected static $testLogFile = 'tests.log';
namespace Shaarli\Api;
use Shaarli\Config\ConfigManager;
namespace Shaarli\Api;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
-class ApiMiddlewareTest extends \PHPUnit_Framework_TestCase
+class ApiMiddlewareTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string datastore to test write operations
{
/**
* @var string datastore to test write operations
/**
* Class ApiUtilsTest
*/
/**
* Class ApiUtilsTest
*/
-class ApiUtilsTest extends \PHPUnit_Framework_TestCase
+class ApiUtilsTest extends \PHPUnit\Framework\TestCase
{
/**
* Force the timezone for ISO datetimes.
{
/**
* Force the timezone for ISO datetimes.
namespace Shaarli\Api\Controllers;
use Shaarli\Config\ConfigManager;
namespace Shaarli\Api\Controllers;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
require_once 'tests/utils/ReferenceHistory.php';
require_once 'tests/utils/ReferenceHistory.php';
-class HistoryTest extends \PHPUnit_Framework_TestCase
+class HistoryTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string datastore to test write operations
{
/**
* @var string datastore to test write operations
protected $container;
/**
protected $container;
/**
- * @var History controller instance.
+ * @var HistoryController controller instance.
*/
protected $controller;
*/
protected $controller;
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container['db'] = true;
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container['db'] = true;
- $this->container['history'] = new \Shaarli\History(self::$testHistory);
+ $this->container['history'] = new History(self::$testHistory);
- $this->controller = new History($this->container);
+ $this->controller = new HistoryController($this->container);
$this->assertEquals($this->refHistory->count(), count($data));
$this->assertEquals($this->refHistory->count(), count($data));
- $this->assertEquals(\Shaarli\History::DELETED, $data[0]['event']);
+ $this->assertEquals(History::DELETED, $data[0]['event']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170303_121216')->format(\DateTime::ATOM),
$data[0]['datetime']
);
$this->assertEquals(124, $data[0]['id']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170303_121216')->format(\DateTime::ATOM),
$data[0]['datetime']
);
$this->assertEquals(124, $data[0]['id']);
- $this->assertEquals(\Shaarli\History::SETTINGS, $data[1]['event']);
+ $this->assertEquals(History::SETTINGS, $data[1]['event']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170302_121215')->format(\DateTime::ATOM),
$data[1]['datetime']
);
$this->assertNull($data[1]['id']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170302_121215')->format(\DateTime::ATOM),
$data[1]['datetime']
);
$this->assertNull($data[1]['id']);
- $this->assertEquals(\Shaarli\History::UPDATED, $data[2]['event']);
+ $this->assertEquals(History::UPDATED, $data[2]['event']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170301_121214')->format(\DateTime::ATOM),
$data[2]['datetime']
);
$this->assertEquals(123, $data[2]['id']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170301_121214')->format(\DateTime::ATOM),
$data[2]['datetime']
);
$this->assertEquals(123, $data[2]['id']);
- $this->assertEquals(\Shaarli\History::CREATED, $data[3]['event']);
+ $this->assertEquals(History::CREATED, $data[3]['event']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170201_121214')->format(\DateTime::ATOM),
$data[3]['datetime']
);
$this->assertEquals(124, $data[3]['id']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170201_121214')->format(\DateTime::ATOM),
$data[3]['datetime']
);
$this->assertEquals(124, $data[3]['id']);
- $this->assertEquals(\Shaarli\History::CREATED, $data[4]['event']);
+ $this->assertEquals(History::CREATED, $data[4]['event']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170101_121212')->format(\DateTime::ATOM),
$data[4]['datetime']
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170101_121212')->format(\DateTime::ATOM),
$data[4]['datetime']
$this->assertEquals(1, count($data));
$this->assertEquals(1, count($data));
- $this->assertEquals(\Shaarli\History::DELETED, $data[0]['event']);
+ $this->assertEquals(History::DELETED, $data[0]['event']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170303_121216')->format(\DateTime::ATOM),
$data[0]['datetime']
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170303_121216')->format(\DateTime::ATOM),
$data[0]['datetime']
$this->assertEquals(1, count($data));
$this->assertEquals(1, count($data));
- $this->assertEquals(\Shaarli\History::CREATED, $data[0]['event']);
+ $this->assertEquals(History::CREATED, $data[0]['event']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170101_121212')->format(\DateTime::ATOM),
$data[0]['datetime']
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170101_121212')->format(\DateTime::ATOM),
$data[0]['datetime']
$this->assertEquals(1, count($data));
$this->assertEquals(1, count($data));
- $this->assertEquals(\Shaarli\History::DELETED, $data[0]['event']);
+ $this->assertEquals(History::DELETED, $data[0]['event']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170303_121216')->format(\DateTime::ATOM),
$data[0]['datetime']
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170303_121216')->format(\DateTime::ATOM),
$data[0]['datetime']
$this->assertEquals(1, count($data));
$this->assertEquals(1, count($data));
- $this->assertEquals(\Shaarli\History::SETTINGS, $data[0]['event']);
+ $this->assertEquals(History::SETTINGS, $data[0]['event']);
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170302_121215')->format(\DateTime::ATOM),
$data[0]['datetime']
$this->assertEquals(
\DateTime::createFromFormat('Ymd_His', '20170302_121215')->format(\DateTime::ATOM),
$data[0]['datetime']
namespace Shaarli\Api\Controllers;
use Shaarli\Config\ConfigManager;
namespace Shaarli\Api\Controllers;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
*
* @package Api\Controllers
*/
*
* @package Api\Controllers
*/
-class InfoTest extends \PHPUnit_Framework_TestCase
+class InfoTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string datastore to test write operations
{
/**
* @var string datastore to test write operations
namespace Shaarli\Api\Controllers;
namespace Shaarli\Api\Controllers;
+use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Http\Response;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Http\Response;
-class DeleteLinkTest extends \PHPUnit_Framework_TestCase
+class DeleteLinkTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string datastore to test write operations
{
/**
* @var string datastore to test write operations
protected $refDB = null;
/**
protected $refDB = null;
/**
- * @var \Shaarli\Bookmark\LinkDB instance.
+ * @var LinkDB instance.
*/
protected $linkDB;
/**
*/
protected $linkDB;
/**
- * @var \Shaarli\History instance.
+ * @var HistoryController instance.
$this->conf = new ConfigManager('tests/utils/config/configJson');
$this->refDB = new \ReferenceLinkDB();
$this->refDB->write(self::$testDatastore);
$this->conf = new ConfigManager('tests/utils/config/configJson');
$this->refDB = new \ReferenceLinkDB();
$this->refDB->write(self::$testDatastore);
- $this->linkDB = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
+ $this->linkDB = new LinkDB(self::$testDatastore, true, false);
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
- $this->history = new \Shaarli\History(self::$testHistory);
+ $this->history = new History(self::$testHistory);
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container['db'] = $this->linkDB;
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container['db'] = $this->linkDB;
$this->assertEquals(204, $response->getStatusCode());
$this->assertEmpty((string) $response->getBody());
$this->assertEquals(204, $response->getStatusCode());
$this->assertEmpty((string) $response->getBody());
- $this->linkDB = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
+ $this->linkDB = new LinkDB(self::$testDatastore, true, false);
$this->assertFalse(isset($this->linkDB[$id]));
$historyEntry = $this->history->getHistory()[0];
$this->assertFalse(isset($this->linkDB[$id]));
$historyEntry = $this->history->getHistory()[0];
- $this->assertEquals(\Shaarli\History::DELETED, $historyEntry['event']);
+ $this->assertEquals(History::DELETED, $historyEntry['event']);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
/**
* Test DELETE link endpoint: reach not existing ID.
*
/**
* Test DELETE link endpoint: reach not existing ID.
*
- * @expectedException Shaarli\Api\Exceptions\ApiLinkNotFoundException
+ * @expectedException \Shaarli\Api\Exceptions\ApiLinkNotFoundException
*/
public function testDeleteLink404()
{
*/
public function testDeleteLink404()
{
namespace Shaarli\Api\Controllers;
use Shaarli\Config\ConfigManager;
namespace Shaarli\Api\Controllers;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
*
* @package Shaarli\Api\Controllers
*/
*
* @package Shaarli\Api\Controllers
*/
-class GetLinkIdTest extends \PHPUnit_Framework_TestCase
+class GetLinkIdTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string datastore to test write operations
{
/**
* @var string datastore to test write operations
<?php
namespace Shaarli\Api\Controllers;
<?php
namespace Shaarli\Api\Controllers;
+use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
*
* @package Shaarli\Api\Controllers
*/
*
* @package Shaarli\Api\Controllers
*/
-class GetLinksTest extends \PHPUnit_Framework_TestCase
+class GetLinksTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string datastore to test write operations
{
/**
* @var string datastore to test write operations
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container = new Container();
$this->container['conf'] = $this->conf;
- $this->container['db'] = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
+ $this->container['db'] = new LinkDB(self::$testDatastore, true, false);
$this->container['history'] = null;
$this->controller = new Links($this->container);
$this->container['history'] = null;
$this->controller = new Links($this->container);
$this->assertEquals('sTuff', $first['tags'][0]);
$this->assertEquals(false, $first['private']);
$this->assertEquals(
$this->assertEquals('sTuff', $first['tags'][0]);
$this->assertEquals(false, $first['private']);
$this->assertEquals(
- \DateTime::createFromFormat(\Shaarli\Bookmark\LinkDB::LINK_DATE_FORMAT, '20150310_114651')->format(\DateTime::ATOM),
+ \DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20150310_114651')->format(\DateTime::ATOM),
$first['created']
);
$this->assertEmpty($first['updated']);
$first['created']
);
$this->assertEmpty($first['updated']);
// Update date
$this->assertEquals(
// Update date
$this->assertEquals(
- \DateTime::createFromFormat(\Shaarli\Bookmark\LinkDB::LINK_DATE_FORMAT, '20160803_093033')->format(\DateTime::ATOM),
+ \DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20160803_093033')->format(\DateTime::ATOM),
use PHPUnit\Framework\TestCase;
use Shaarli\Config\ConfigManager;
use PHPUnit\Framework\TestCase;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
protected $refDB = null;
/**
protected $refDB = null;
/**
- * @var \Shaarli\History instance.
+ * @var HistoryController instance.
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
- $this->history = new \Shaarli\History(self::$testHistory);
+ $this->history = new History(self::$testHistory);
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container['db'] = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container['db'] = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
- $this->container['history'] = new \Shaarli\History(self::$testHistory);
+ $this->container['history'] = new History(self::$testHistory);
$this->controller = new Links($this->container);
$this->controller = new Links($this->container);
$this->assertEquals('', $data['updated']);
$historyEntry = $this->history->getHistory()[0];
$this->assertEquals('', $data['updated']);
$historyEntry = $this->history->getHistory()[0];
- $this->assertEquals(\Shaarli\History::CREATED, $historyEntry['event']);
+ $this->assertEquals(History::CREATED, $historyEntry['event']);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
namespace Shaarli\Api\Controllers;
use Shaarli\Config\ConfigManager;
namespace Shaarli\Api\Controllers;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Http\Response;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Http\Response;
-class PutLinkTest extends \PHPUnit_Framework_TestCase
+class PutLinkTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string datastore to test write operations
{
/**
* @var string datastore to test write operations
protected $refDB = null;
/**
protected $refDB = null;
/**
- * @var \Shaarli\History instance.
+ * @var HistoryController instance.
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
- $this->history = new \Shaarli\History(self::$testHistory);
+ $this->history = new History(self::$testHistory);
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container['db'] = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container['db'] = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
- $this->container['history'] = new \Shaarli\History(self::$testHistory);
+ $this->container['history'] = new History(self::$testHistory);
$this->controller = new Links($this->container);
$this->controller = new Links($this->container);
);
$historyEntry = $this->history->getHistory()[0];
);
$historyEntry = $this->history->getHistory()[0];
- $this->assertEquals(\Shaarli\History::UPDATED, $historyEntry['event']);
+ $this->assertEquals(History::UPDATED, $historyEntry['event']);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
namespace Shaarli\Api\Controllers;
namespace Shaarli\Api\Controllers;
+use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Http\Response;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Http\Response;
-class DeleteTagTest extends \PHPUnit_Framework_TestCase
+class DeleteTagTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string datastore to test write operations
{
/**
* @var string datastore to test write operations
protected $refDB = null;
/**
protected $refDB = null;
/**
- * @var \Shaarli\Bookmark\LinkDB instance.
+ * @var LinkDB instance.
*/
protected $linkDB;
/**
*/
protected $linkDB;
/**
- * @var \Shaarli\History instance.
+ * @var HistoryController instance.
$this->conf = new ConfigManager('tests/utils/config/configJson');
$this->refDB = new \ReferenceLinkDB();
$this->refDB->write(self::$testDatastore);
$this->conf = new ConfigManager('tests/utils/config/configJson');
$this->refDB = new \ReferenceLinkDB();
$this->refDB->write(self::$testDatastore);
- $this->linkDB = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
+ $this->linkDB = new LinkDB(self::$testDatastore, true, false);
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
- $this->history = new \Shaarli\History(self::$testHistory);
+ $this->history = new History(self::$testHistory);
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container['db'] = $this->linkDB;
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container['db'] = $this->linkDB;
$this->assertEquals(204, $response->getStatusCode());
$this->assertEmpty((string) $response->getBody());
$this->assertEquals(204, $response->getStatusCode());
$this->assertEmpty((string) $response->getBody());
- $this->linkDB = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
+ $this->linkDB = new LinkDB(self::$testDatastore, true, false);
$tags = $this->linkDB->linksCountPerTag();
$this->assertFalse(isset($tags[$tagName]));
// 2 links affected
$historyEntry = $this->history->getHistory()[0];
$tags = $this->linkDB->linksCountPerTag();
$this->assertFalse(isset($tags[$tagName]));
// 2 links affected
$historyEntry = $this->history->getHistory()[0];
- $this->assertEquals(\Shaarli\History::UPDATED, $historyEntry['event']);
+ $this->assertEquals(History::UPDATED, $historyEntry['event']);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
$historyEntry = $this->history->getHistory()[1];
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
$historyEntry = $this->history->getHistory()[1];
- $this->assertEquals(\Shaarli\History::UPDATED, $historyEntry['event']);
+ $this->assertEquals(History::UPDATED, $historyEntry['event']);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
$this->assertEquals(204, $response->getStatusCode());
$this->assertEmpty((string) $response->getBody());
$this->assertEquals(204, $response->getStatusCode());
$this->assertEmpty((string) $response->getBody());
- $this->linkDB = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
+ $this->linkDB = new LinkDB(self::$testDatastore, true, false);
$tags = $this->linkDB->linksCountPerTag();
$this->assertFalse(isset($tags[$tagName]));
$this->assertTrue($tags[strtolower($tagName)] > 0);
$historyEntry = $this->history->getHistory()[0];
$tags = $this->linkDB->linksCountPerTag();
$this->assertFalse(isset($tags[$tagName]));
$this->assertTrue($tags[strtolower($tagName)] > 0);
$historyEntry = $this->history->getHistory()[0];
- $this->assertEquals(\Shaarli\History::UPDATED, $historyEntry['event']);
+ $this->assertEquals(History::UPDATED, $historyEntry['event']);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
namespace Shaarli\Api\Controllers;
namespace Shaarli\Api\Controllers;
+use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
*
* @package Shaarli\Api\Controllers
*/
*
* @package Shaarli\Api\Controllers
*/
-class GetTagNameTest extends \PHPUnit_Framework_TestCase
+class GetTagNameTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string datastore to test write operations
{
/**
* @var string datastore to test write operations
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container = new Container();
$this->container['conf'] = $this->conf;
- $this->container['db'] = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
+ $this->container['db'] = new LinkDB(self::$testDatastore, true, false);
$this->container['history'] = null;
$this->controller = new Tags($this->container);
$this->container['history'] = null;
$this->controller = new Tags($this->container);
<?php
namespace Shaarli\Api\Controllers;
<?php
namespace Shaarli\Api\Controllers;
+use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
*
* @package Shaarli\Api\Controllers
*/
*
* @package Shaarli\Api\Controllers
*/
-class GetTagsTest extends \PHPUnit_Framework_TestCase
+class GetTagsTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string datastore to test write operations
{
/**
* @var string datastore to test write operations
protected $container;
/**
protected $container;
/**
- * @var \Shaarli\Bookmark\LinkDB instance.
+ * @var LinkDB instance.
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container = new Container();
$this->container['conf'] = $this->conf;
- $this->linkDB = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
+ $this->linkDB = new LinkDB(self::$testDatastore, true, false);
$this->container['db'] = $this->linkDB;
$this->container['history'] = null;
$this->container['db'] = $this->linkDB;
$this->container['history'] = null;
namespace Shaarli\Api\Controllers;
use Shaarli\Api\Exceptions\ApiBadParametersException;
namespace Shaarli\Api\Controllers;
use Shaarli\Api\Exceptions\ApiBadParametersException;
+use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Http\Response;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Http\Response;
-class PutTagTest extends \PHPUnit_Framework_TestCase
+class PutTagTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string datastore to test write operations
{
/**
* @var string datastore to test write operations
protected $refDB = null;
/**
protected $refDB = null;
/**
- * @var \Shaarli\History instance.
+ * @var HistoryController instance.
protected $container;
/**
protected $container;
/**
- * @var \Shaarli\Bookmark\LinkDB instance.
+ * @var LinkDB instance.
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
- $this->history = new \Shaarli\History(self::$testHistory);
+ $this->history = new History(self::$testHistory);
$this->container = new Container();
$this->container['conf'] = $this->conf;
$this->container = new Container();
$this->container['conf'] = $this->conf;
- $this->linkDB = new \Shaarli\Bookmark\LinkDB(self::$testDatastore, true, false);
+ $this->linkDB = new LinkDB(self::$testDatastore, true, false);
$this->container['db'] = $this->linkDB;
$this->container['history'] = $this->history;
$this->container['db'] = $this->linkDB;
$this->container['history'] = $this->history;
$this->assertEquals(2, $tags[$newName]);
$historyEntry = $this->history->getHistory()[0];
$this->assertEquals(2, $tags[$newName]);
$historyEntry = $this->history->getHistory()[0];
- $this->assertEquals(\Shaarli\History::UPDATED, $historyEntry['event']);
+ $this->assertEquals(History::UPDATED, $historyEntry['event']);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
$historyEntry = $this->history->getHistory()[1];
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
$historyEntry = $this->history->getHistory()[1];
- $this->assertEquals(\Shaarli\History::UPDATED, $historyEntry['event']);
+ $this->assertEquals(History::UPDATED, $historyEntry['event']);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
namespace Shaarli\Bookmark;
use DateTime;
namespace Shaarli\Bookmark;
use DateTime;
-use Shaarli\Bookmark\Exception\LinkNotFoundException;
use ReferenceLinkDB;
use ReflectionClass;
use Shaarli;
use ReferenceLinkDB;
use ReflectionClass;
use Shaarli;
/**
* Class ConfigJsonTest
*/
/**
* Class ConfigJsonTest
*/
-class ConfigJsonTest extends \PHPUnit_Framework_TestCase
+class ConfigJsonTest extends \PHPUnit\Framework\TestCase
* Note: it only test the manager with ConfigJson,
* ConfigPhp is only a workaround to handle the transition to JSON type.
*/
* Note: it only test the manager with ConfigJson,
* ConfigPhp is only a workaround to handle the transition to JSON type.
*/
-class ConfigManagerTest extends \PHPUnit_Framework_TestCase
+class ConfigManagerTest extends \PHPUnit\Framework\TestCase
{
/**
* @var ConfigManager
{
/**
* @var ConfigManager
/**
* Class ConfigPhpTest
*/
/**
* Class ConfigPhpTest
*/
-class ConfigPhpTest extends \PHPUnit_Framework_TestCase
+class ConfigPhpTest extends \PHPUnit\Framework\TestCase
/**
* Unitary tests for Shaarli config related functions
*/
/**
* Unitary tests for Shaarli config related functions
*/
-class ConfigPluginTest extends \PHPUnit_Framework_TestCase
+class ConfigPluginTest extends \PHPUnit\Framework\TestCase
{
/**
* Test save_plugin_config with valid data.
{
/**
* Test save_plugin_config with valid data.
namespace Shaarli\Feed;
use DateTime;
namespace Shaarli\Feed;
use DateTime;
-use Shaarli\Bookmark\LinkDB;
+use Shaarli\Bookmark\LinkDB;
/**
* FeedBuilderTest class.
/**
* FeedBuilderTest class.
-class LanguagesFrTest extends \PHPUnit_Framework_TestCase
+class LanguagesFrTest extends \PHPUnit\Framework\TestCase
{
/**
* @var string Config file path (without extension).
{
/**
* @var string Config file path (without extension).
<?php
namespace Shaarli\Plugin\Wallabag;
<?php
namespace Shaarli\Plugin\Wallabag;
-use Shaarli\Plugin\Wallabag\WallabagInstance;
-
/**
* Class WallabagInstanceTest
*/
/**
* Class WallabagInstanceTest
*/
-class ThemeUtilsTest extends \PHPUnit_Framework_TestCase
+class ThemeUtilsTest extends \PHPUnit\Framework\TestCase
{
/**
* Test getThemes() with existing theme directories.
{
/**
* Test getThemes() with existing theme directories.
namespace Shaarli\Security;
require_once 'tests/utils/FakeConfigManager.php';
namespace Shaarli\Security;
require_once 'tests/utils/FakeConfigManager.php';
-use \PHPUnit\Framework\TestCase;
+
+use PHPUnit\Framework\TestCase;
/**
* Test coverage for LoginManager
/**
* Test coverage for LoginManager
require_once 'tests/utils/ReferenceSessionIdHashes.php';
ReferenceSessionIdHashes::genAllHashes();
require_once 'tests/utils/ReferenceSessionIdHashes.php';
ReferenceSessionIdHashes::genAllHashes();
-use \Shaarli\Security\SessionManager;
-use \PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestCase;
+use Shaarli\Security\SessionManager;
/**
* Test coverage for SessionManager
/**
* Test coverage for SessionManager