From fb375a0765f63dde3aee51af9bf474446040d7bd Mon Sep 17 00:00:00 2001 From: David Grudl Date: Mon, 25 Jan 2021 00:55:12 +0100 Subject: [PATCH 1/3] updated workflows --- .github/workflows/tests.yml | 7 ++++--- tests/.coveralls.yml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 050cea9f4..73516285b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -53,7 +53,8 @@ jobs: coverage: none - run: composer install --no-progress --prefer-dist - - run: wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar - run: vendor/bin/tester -p phpdbg tests -s -C --coverage ./coverage.xml --coverage-src ./src - continue-on-error: true - - run: php coveralls.phar --verbose --config tests/.coveralls.yml + - run: wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.4.3/php-coveralls.phar + - env: + COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: php php-coveralls.phar --verbose --config tests/.coveralls.yml diff --git a/tests/.coveralls.yml b/tests/.coveralls.yml index 82764a3f5..845038250 100644 --- a/tests/.coveralls.yml +++ b/tests/.coveralls.yml @@ -1,4 +1,4 @@ # for php-coveralls -service_name: travis-ci +service_name: github-actions coverage_clover: coverage.xml json_path: coverage.json From ac5a0f8a228b62ea8742e0a1e6f2a37c0eda7a8a Mon Sep 17 00:00:00 2001 From: David Grudl Date: Mon, 25 Jan 2021 21:33:33 +0100 Subject: [PATCH 2/3] readme: removed badges --- readme.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/readme.md b/readme.md index 116f942bb..43bf190ab 100644 --- a/readme.md +++ b/readme.md @@ -1,13 +1,6 @@ Nette Forms: greatly facilitates web forms ========================================== -[![Downloads this Month](https://img.shields.io/packagist/dm/nette/forms.svg)](https://packagist.org/packages/nette/forms) -[![Build Status](https://travis-ci.org/nette/forms.svg?branch=master)](https://travis-ci.org/nette/forms) -[![Coverage Status](https://coveralls.io/repos/github/nette/forms/badge.svg?branch=master)](https://coveralls.io/github/nette/forms?branch=master) -[![Latest Stable Version](https://poser.pugx.org/nette/forms/v/stable)](https://github.com/nette/forms/releases) -[![License](https://img.shields.io/badge/license-New%20BSD-blue.svg)](https://github.com/nette/forms/blob/master/license.md) - - Introduction ------------ From 2749fd0babb87f7289ef262ea332e377222d41fb Mon Sep 17 00:00:00 2001 From: kotr7 <82367931+kotr7@users.noreply.github.com> Date: Mon, 12 Apr 2021 12:42:32 +0200 Subject: [PATCH 3/3] Form::addGroup() loose type (#269) Allow more types of $caption --- src/Forms/Form.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Forms/Form.php b/src/Forms/Form.php index 8b7d0aad9..e422c7ff2 100644 --- a/src/Forms/Form.php +++ b/src/Forms/Form.php @@ -227,8 +227,9 @@ public function addProtection(string $errorMessage = null): Controls\CsrfProtect /** * Adds fieldset group to the form. + * @param string|object $caption */ - public function addGroup(string $caption = null, bool $setAsCurrent = true): ControlGroup + public function addGroup($caption = null, bool $setAsCurrent = true): ControlGroup { $group = new ControlGroup; $group->setOption('label', $caption);