From d1812b68010f504056c590fe0b7ab9459c78bd0e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 17:42:44 +0000 Subject: [PATCH 1/2] [Security] Bump angular from 1.7.9 to 1.8.0 in /js Bumps [angular](https://github.com/angular/angular.js) from 1.7.9 to 1.8.0. **This update includes a security fix.** - [Release notes](https://github.com/angular/angular.js/releases) - [Changelog](https://github.com/angular/angular.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/angular/angular.js/compare/v1.7.9...v1.8.0) Signed-off-by: dependabot-preview[bot] --- js/package-lock.json | 6 +++--- js/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/package-lock.json b/js/package-lock.json index 7f851a4fe..527a8a287 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -1708,9 +1708,9 @@ "dev": true }, "angular": { - "version": "1.7.9", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.9.tgz", - "integrity": "sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/angular/-/angular-1.8.0.tgz", + "integrity": "sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg==" }, "angular-animate": { "version": "1.7.9", diff --git a/js/package.json b/js/package.json index d0dd40f20..164c4d81b 100644 --- a/js/package.json +++ b/js/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@uirouter/angularjs": "^1.0.26", - "angular": "^1.7.9", + "angular": "^1.8.0", "angular-animate": "^1.7.9", "angular-file-upload": "^2.5.0", "angular-markdown-it": "^0.6.1", From ccc02e23b635fa41ffa031224a4a4c8b09d08a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 26 Jun 2020 10:53:04 +0200 Subject: [PATCH 2/2] Make 0.8.2 17 only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .drone.yml | 22 ++++++++++----------- .travis.yml | 2 +- Makefile | 12 ++--------- appinfo/info.xml | 4 ++-- composer.json | 2 +- tests/unit/Activity/ActivityManagerTest.php | 2 +- 6 files changed, 18 insertions(+), 26 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0d7fc4e35..a8b11bf78 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ steps: image: nextcloudci/php7.2:php7.2-13 environment: APP_NAME: deck - CORE_BRANCH: master + CORE_BRANCH: stable17 DB: sqlite commands: # Pre-setup steps @@ -20,7 +20,7 @@ steps: image: nextcloudci/php7.2:php7.2-13 environment: APP_NAME: deck - CORE_BRANCH: master + CORE_BRANCH: stable17 DB: sqlite commands: - composer install @@ -29,7 +29,7 @@ steps: image: nextcloudci/php7.3:php7.3-2 environment: APP_NAME: deck - CORE_BRANCH: master + CORE_BRANCH: stable17 DB: sqlite commands: - composer install @@ -38,7 +38,7 @@ steps: image: nextcloudci/php7.4:2 environment: APP_NAME: deck - CORE_BRANCH: master + CORE_BRANCH: stable17 DB: sqlite commands: - composer install @@ -58,7 +58,7 @@ steps: image: nextcloudci/php7.2:php7.2-13 environment: APP_NAME: deck - CORE_BRANCH: master + CORE_BRANCH: stable17 DB: sqlite commands: # Pre-setup steps @@ -68,8 +68,8 @@ steps: - php occ app:enable deck - cd apps/$APP_NAME - composer install - - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml - - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml + - ./vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml + - ./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml trigger: branch: - master @@ -85,7 +85,7 @@ steps: image: nextcloudci/php7.3:php7.3-5 environment: APP_NAME: deck - CORE_BRANCH: master + CORE_BRANCH: stable17 DB: sqlite commands: # Pre-setup steps @@ -95,8 +95,8 @@ steps: - php occ app:enable deck - cd apps/$APP_NAME - composer install - - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml - - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml + - ./vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml + - ./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml trigger: branch: - master @@ -112,7 +112,7 @@ steps: image: nextcloudci/php7.2:php7.2-13 environment: APP_NAME: deck - CORE_BRANCH: master + CORE_BRANCH: stable17 DB: sqlite commands: # Pre-setup steps diff --git a/.travis.yml b/.travis.yml index 3d15d0800..283ecafeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ php: - 7.2 - 7.3 env: - - CORE_BRANCH=master DB=mysql + - CORE_BRANCH=stable17 DB=mysql before_install: - export PATH="$PWD/vendor/bin:$PATH" diff --git a/Makefile b/Makefile index 29aa5327c..f0658df21 100644 --- a/Makefile +++ b/Makefile @@ -81,16 +81,8 @@ test: test-unit test-integration test-unit: mkdir -p build/ -ifeq (, $(shell which phpunit 2> /dev/null)) - @echo "No phpunit command available, downloading a copy from the web" - mkdir -p $(build_tools_directory) - curl -sSL https://phar.phpunit.de/phpunit-8.2.phar -o $(build_tools_directory)/phpunit.phar - php $(build_tools_directory)/phpunit.phar -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml - php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml -else - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml -endif + ./vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml + ./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml test-integration: cd tests/integration && ./run.sh diff --git a/appinfo/info.xml b/appinfo/info.xml index 2cc3a38aa..174d358c6 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -17,7 +17,7 @@ - 🚀 Get your project organized - 0.8.1 + 0.8.2 agpl Julius Härtl Deck @@ -36,7 +36,7 @@ pgsql sqlite mysql - + OCA\Deck\Cron\DeleteCron diff --git a/composer.json b/composer.json index 52017f826..5762e672d 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,6 @@ "roave/security-advisories": "dev-master", "christophwurst/nextcloud": "^17", "jakub-onderka/php-parallel-lint": "^1.0.0", - "phpunit/phpunit": "^8" + "phpunit/phpunit": "6.5.*" } } diff --git a/tests/unit/Activity/ActivityManagerTest.php b/tests/unit/Activity/ActivityManagerTest.php index 7e541aa55..9fcf30029 100644 --- a/tests/unit/Activity/ActivityManagerTest.php +++ b/tests/unit/Activity/ActivityManagerTest.php @@ -97,7 +97,7 @@ class ActivityManagerTest extends TestCase { if (strpos($constant, 'SUBJECT') === 0) { $format = $this->activityManager->getActivityFormat($value, [], false); if ($format !== '') { - $this->assertStringContainsString('{user}', $format); + $this->assertContains('{user}', $format); } else { /** @noinspection ForgottenDebugOutputInspection */ print_r('No activity string found for '. $constant . PHP_EOL);