From 1b72d45adf4cf1f4fe89843a0651e8e2a44c67b2 Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Sun, 1 Oct 2017 09:33:49 -0400
Subject: [PATCH] Relegate bootstrap.php to testing; fixes #117

---
 arsse.php                                |  7 ++++++-
 bootstrap.php                            | 10 ----------
 build.xml                                |  1 -
 lib/Arsse.php                            |  2 ++
 lib/CLI.php                              |  2 +-
 lib/Feed.php                             |  4 ++--
 lib/REST/NextCloudNews/V1_2.php          |  4 ++--
 tests/REST/NextCloudNews/TestNCNV1_2.php |  4 ++--
 tests/bootstrap.php                      |  8 ++++++++
 tests/phpunit.xml                        |  2 +-
 tests/server.php                         |  2 +-
 11 files changed, 25 insertions(+), 21 deletions(-)
 delete mode 100644 bootstrap.php
 create mode 100644 tests/bootstrap.php

diff --git a/arsse.php b/arsse.php
index 8634bf57..c1fd5086 100644
--- a/arsse.php
+++ b/arsse.php
@@ -1,7 +1,12 @@
 <?php
 namespace JKingWeb\Arsse;
 
-require_once __DIR__.DIRECTORY_SEPARATOR."bootstrap.php";
+const BASE = __DIR__.DIRECTORY_SEPARATOR;
+const NS_BASE = __NAMESPACE__."\\";
+
+require_once BASE."vendor".DIRECTORY_SEPARATOR."autoload.php";
+ignore_user_abort(true);
+
 
 if (\PHP_SAPI=="cli") {
     // initialize the CLI; this automatically handles --help and --version
diff --git a/bootstrap.php b/bootstrap.php
deleted file mode 100644
index 04b4f0b1..00000000
--- a/bootstrap.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace JKingWeb\Arsse;
-
-const BASE = __DIR__.DIRECTORY_SEPARATOR;
-const NS_BASE = __NAMESPACE__."\\";
-const VERSION = "0.1.1";
-
-require_once BASE."vendor".DIRECTORY_SEPARATOR."autoload.php";
-ignore_user_abort(true);
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 25753f7f..32f5a6cc 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,6 @@
                 <include name="dist/**"/>
                 <include name="composer.*"/>
                 <include name="arsse.php"/>
-                <include name="bootstrap.php"/>
                 <include name="CHANGELOG"/>
                 <include name="LICENSE"/>
                 <include name="README.md"/>
diff --git a/lib/Arsse.php b/lib/Arsse.php
index 2475ed63..a453bd7e 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 971197fc..36aa8db6 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 ee6114cb..f256016b 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 8ece274b..bab902e1 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 713267b8..0d8e08ed 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 00000000..c74e5515
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,8 @@
+<?php
+declare(strict_types=1);
+namespace JKingWeb\Arsse;
+
+const NS_BASE = __NAMESPACE__."\\";
+define(NS_BASE."BASE", dirname(__DIR__).DIRECTORY_SEPARATOR);
+
+require_once BASE."vendor".DIRECTORY_SEPARATOR."autoload.php";
\ No newline at end of file
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 1e30465b..44ec358e 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <phpunit
     colors="true"
-    bootstrap="../bootstrap.php"
+    bootstrap="bootstrap.php"
     convertErrorsToExceptions="false"
     convertNoticesToExceptions="false"
     convertWarningsToExceptions="false"
diff --git a/tests/server.php b/tests/server.php
index f0b6920f..b8bdf5ca 100644
--- a/tests/server.php
+++ b/tests/server.php
@@ -2,7 +2,7 @@
 declare(strict_types=1);
 namespace JKingWeb\Arsse;
 
-require_once __DIR__."/../bootstrap.php";
+require_once __DIR__."/bootstrap.php";
 
 /*