diff --git a/arsse.php b/arsse.php
index 8634bf5..c1fd508 100644
--- a/arsse.php
+++ b/arsse.php
@@ -1,7 +1,12 @@
-
diff --git a/lib/Arsse.php b/lib/Arsse.php
index 2475ed6..a453bd7 100644
--- a/lib/Arsse.php
+++ b/lib/Arsse.php
@@ -3,6 +3,8 @@ declare(strict_types=1);
namespace JKingWeb\Arsse;
class Arsse {
+ const VERSION = "0.1.1";
+
/** @var Lang */
public static $lang;
/** @var Conf */
diff --git a/lib/CLI.php b/lib/CLI.php
index 971197f..36aa8db 100644
--- a/lib/CLI.php
+++ b/lib/CLI.php
@@ -27,7 +27,7 @@ USAGE_TEXT;
$this->args = \Docopt::handle($this->usage(), [
'argv' => $argv,
'help' => true,
- 'version' => VERSION,
+ 'version' => Arsse::VERSION,
]);
}
diff --git a/lib/Feed.php b/lib/Feed.php
index ee6114c..f256016 100644
--- a/lib/Feed.php
+++ b/lib/Feed.php
@@ -20,11 +20,11 @@ class Feed {
public $nextFetch;
public $newItems = [];
public $changedItems = [];
-
+
public function __construct(int $feedID = null, string $url, string $lastModified = '', string $etag = '', string $username = '', string $password = '', bool $scrape = false, bool $discover = false) {
// set the configuration
$userAgent = Arsse::$conf->fetchUserAgentString ?? sprintf('Arsse/%s (%s %s; %s; https://code.jkingweb.ca/jking/arsse) PicoFeed (https://github.com/fguillot/picoFeed)',
- VERSION, // Arsse version
+ Arsse::VERSION, // Arsse version
php_uname('s'), // OS
php_uname('r'), // OS version
php_uname('m') // platform architecture
diff --git a/lib/REST/NextCloudNews/V1_2.php b/lib/REST/NextCloudNews/V1_2.php
index 8ece274..bab902e 100644
--- a/lib/REST/NextCloudNews/V1_2.php
+++ b/lib/REST/NextCloudNews/V1_2.php
@@ -691,14 +691,14 @@ class V1_2 extends \JKingWeb\Arsse\REST\AbstractHandler {
protected function serverVersion(array $url, array $data): Response {
return new Response(200, [
'version' => self::VERSION,
- 'arsse_version' => \JKingWeb\Arsse\VERSION,
+ 'arsse_version' => Arsse::VERSION,
]);
}
protected function serverStatus(array $url, array $data): Response {
return new Response(200, [
'version' => self::VERSION,
- 'arsse_version' => \JKingWeb\Arsse\VERSION,
+ 'arsse_version' => Arsse::VERSION,
'warnings' => [
'improperlyConfiguredCron' => !Service::hasCheckedIn(),
]
diff --git a/tests/REST/NextCloudNews/TestNCNV1_2.php b/tests/REST/NextCloudNews/TestNCNV1_2.php
index 713267b..0d8e08e 100644
--- a/tests/REST/NextCloudNews/TestNCNV1_2.php
+++ b/tests/REST/NextCloudNews/TestNCNV1_2.php
@@ -458,7 +458,7 @@ class TestNCNV1_2 extends Test\AbstractTest {
public function testRetrieveServerVersion() {
$exp = new Response(200, [
- 'arsse_version' => \JKingWeb\Arsse\VERSION,
+ 'arsse_version' => Arsse::VERSION,
'version' => REST\NextCloudNews\V1_2::VERSION,
]);
$this->assertEquals($exp, $this->h->dispatch(new Request("GET", "/version")));
@@ -842,7 +842,7 @@ class TestNCNV1_2 extends Test\AbstractTest {
Phake::when(Arsse::$db)->metaGet("service_last_checkin")->thenReturn(Date::transform($valid, "sql"))->thenReturn(Date::transform($invalid, "sql"));
$arr1 = $arr2 = [
'version' => REST\NextCloudNews\V1_2::VERSION,
- 'arsse_version' => VERSION,
+ 'arsse_version' => Arsse::VERSION,
'warnings' => [
'improperlyConfiguredCron' => false,
]
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..c74e551
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,8 @@
+