Bump versions and remove outdated file (#583)

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>

.travis.yml

@@ -1,10 +1,9 @@
-sudo: false
+dist: bionic
-dist: trusty
 language: php
 php:
     - 7.2
     - 7.3
-    - 7.4snapshot
+    - 7.4
     - nightly
 
 env:
@@ -18,7 +17,7 @@ matrix:
     allow_failures:
         - env: CORE_BRANCH=master
         - php: nightly
-        - php: 7.4snapshot
+        - php: 7.4
     include:
         - php: 7.3
           env: DB=sqlite
@@ -40,13 +39,19 @@ before_install:
 before_script:
     - if [[ "$DB" == 'pgsql' ]]; then psql -c "CREATE ROLE oc_autotest LOGIN PASSWORD 'oc_autotest'" -U postgres; fi
     - if [[ "$DB" == 'pgsql' ]]; then psql -c "CREATE DATABASE oc_autotest OWNER oc_autotest;" -U postgres; fi
-    - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e 'CREATE DATABASE oc_autotest;'; fi
+    - if [[ "$DB" == 'mysql' ]]; then sudo mysql -u root -e 'CREATE DATABASE oc_autotest;'; fi
-    - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY 'oc_autotest';"; fi
+    - if [[ "$DB" == 'mysql' ]]; then sudo mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY 'oc_autotest';"; fi
-    - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "GRANT ALL ON oc_autotest.* TO 'oc_autotest'@'localhost';"; fi
+    - if [[ "$DB" == 'mysql' ]]; then sudo mysql -u root -e "GRANT ALL ON oc_autotest.* TO 'oc_autotest'@'localhost';"; fi
     # fill nextcloud with default configs and enable news
     - cd nextcloud
     - mkdir data
-    - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass="oc_autotest"
+    - ./occ maintenance:install
+      --admin-user="admin"
+      --admin-pass="admin"
+      --database "${DB}"
+      --database-name="oc_autotest"
+      --database-user="oc_autotest"
+      --database-pass="oc_autotest"
     - ./occ app:enable news
     - ./occ app:check-code news
     - ./occ background:cron  # enable default cron
@@ -65,5 +70,5 @@ after_success:
 
 addons:
     firefox: "latest-beta"
-    postgresql: "9.6"
+    postgresql: "10"
     mariadb: "10.4"

composer.json

@@ -41,11 +41,11 @@
     "source": "https://github.com/nextcloud/news/"
   },
   "require": {
-    "php": "^7.1",
+    "php": "^7.2",
-    "ezyang/htmlpurifier": "4.10.0",
+    "ezyang/htmlpurifier": "4.12.0",
     "pear/net_url2": "2.2.2",
     "riimu/kit-pathjoin": "1.2.0",
-    "debril/feed-io": "^4.3",
+    "debril/feed-io": "^4.4",
     "arthurhoaro/favicon": "^1.2",
     "ext-json": "*",
     "ext-simplexml": "*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1df92ada3f365f720fb91d2f7232a91f",
+    "content-hash": "03f971debae1540040f4920fa45fe92e",
     "packages": [
         {
             "name": "andreskrey/readability.php",
@@ -171,23 +171,23 @@
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.10.0",
+            "version": "v4.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "d85d39da4576a6934b72480be6978fb10c860021"
+                "reference": "a617e55bc62a87eec73bd456d146d134ad716f03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d85d39da4576a6934b72480be6978fb10c860021",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03",
-                "reference": "d85d39da4576a6934b72480be6978fb10c860021",
+                "reference": "a617e55bc62a87eec73bd456d146d134ad716f03",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2"
             },
             "require-dev": {
-                "simpletest/simpletest": "^1.1"
+                "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd"
             },
             "type": "library",
             "autoload": {
@@ -200,7 +200,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL"
+                "LGPL-2.1-or-later"
             ],
             "authors": [
                 {
@@ -214,7 +214,7 @@
             "keywords": [
                 "html"
             ],
-            "time": "2018-02-23T01:58:20+00:00"
+            "time": "2019-10-28T03:44:26+00:00"
         },
         {
             "name": "pear/net_url2",
@@ -2204,7 +2204,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.1",
+        "php": "^7.2",
         "ext-json": "*",
         "ext-simplexml": "*",
         "ext-libxml": "*"

issue_template.md

@@ -1,40 +0,0 @@
-# IMPORTANT
-
-Read and tick the following checkbox after you have created the issue or place an x inside the brackets ;)
-
-* [ ] I have read the [CONTRIBUTING.md](https://github.com/nextcloud/news/blob/master/CONTRIBUTING.md) and followed the provided tips
-
-
-## Explain the Problem
-What problem did you encounter?
-
-## Steps to Reproduce
-Explain what you did to encounter the issue
-1.
-2.
-3.
-
-## System Information
-* News app version:
-* Nextcloud version:
-* PHP version:
-* Database and version:
-* Browser and version:
-* Distribution and version:
-
-## Contents of nextcloud/data/nextcloud.log
-
-```json
-
-Paste output here
-
-```
-
-## Contents of Browser Error Console
-Read http://ggnome.com/wiki/Using_The_Browser_Error_Console if you are unsure what to put here
-
-```
-
-Paste output here
-
-```

js/README.md

@@ -27,7 +27,3 @@ The following tasks are available:
 * **Watch for changes and run JavaScript unit tests**:
 
         gulp watch-karma
-
-* **Watch for changes and run PHP unit tests**:
-
-        gulp watch-phpunit

js/gulpfile.js

@@ -16,13 +16,11 @@ const gulp = require('gulp'),
     terser = require('gulp-terser'),
     jshint = require('gulp-jshint'),
     KarmaServer = require('karma').Server,
-    phpunit = require('gulp-phpunit'),
     concat = require('gulp-concat'),
     sourcemaps = require('gulp-sourcemaps');
 
 // Configuration
 const buildTarget = 'app.min.js';
-const phpunitConfig = __dirname + '/../phpunit.xml';
 const karmaConfig = __dirname + '/karma.conf.js';
 const destinationFolder = __dirname + '/build/';
 const sources = [
@@ -42,7 +40,6 @@ const sources = [
     'directive/**/*.js'
 ];
 const testSources = ['tests/**/*.js'];
-const phpSources = ['../**/*.php', '!../js/**', '!../vendor/**'];
 const watchSources = sources.concat(testSources).concat(['*.js']);
 const lintSources = watchSources;
 
@@ -81,14 +78,3 @@ gulp.task('watch-karma', (done) => {
         autoWatch: true
     }, done).start();
 });
-
-gulp.task('phpunit', () => {
-    return gulp.src(phpSources)
-        .pipe(phpunit('phpunit', {
-            configurationFile: phpunitConfig
-        }));
-});
-
-gulp.task('watch-phpunit', () => {
-    gulp.watch(phpSources, ['phpunit']);
-});

js/package.json

@@ -38,26 +38,25 @@
     "gulp-concat": "^2.6.1",
     "gulp-jshint": "^2.1.0",
     "gulp-ng-annotate": "^2.1.0",
-    "gulp-phpunit": "^0.26.0",
     "gulp-sourcemaps": "^2.6.5",
     "gulp-terser": "^1.2.0",
     "jasmine-core": "^3.5.0",
     "jquery": "^3.4.1",
     "jshint": "^2.10.3",
     "karma": "^4.4.1",
-    "karma-chrome-launcher": "^2.2.0",
+    "karma-chrome-launcher": "^3.1.0",
-    "karma-coverage": "^1.1.2",
+    "karma-coverage": "^2.0.1",
     "karma-firefox-launcher": "^1.2.0",
     "karma-jasmine": "^2.0.1",
     "minimatch": "^3.0.4",
     "natives": "^1.1.6"
   },
   "dependencies": {
-    "angular": "^1.7.8",
+    "angular": "^1.7.9",
-    "angular-animate": "^1.7.8",
+    "angular-animate": "^1.7.9",
-    "angular-mocks": "^1.7.8",
+    "angular-mocks": "^1.7.9",
-    "angular-route": "^1.7.8",
+    "angular-route": "^1.7.9",
-    "angular-sanitize": "^1.7.8",
+    "angular-sanitize": "^1.7.9",
     "debug": "^4.1.1",
     "masonry-layout": "^4.2.2",
     "moment": "^2.24.0"