Skip to content

Commit

Permalink
Merge pull request #144 from stronk7/various_own_ci_fixes
Browse files Browse the repository at this point in the history
Various own ci fixes
  • Loading branch information
andrewnicols authored Apr 28, 2021
2 parents 9b609eb + c95285b commit 5e596a5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 19 deletions.
7 changes: 0 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,6 @@ jobs:
- php: 7.2
moodle-branch: MOODLE_35_STABLE
database: pgsql

- php: 7.1
moodle-branch: MOODLE_38_STABLE
database: pgsql
- php: 7.1
moodle-branch: MOODLE_37_STABLE
database: mariadb
steps:
- name: Check out repository code
uses: actions/checkout@v2
Expand Down
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ jobs:
- php: 7.2
env: MOODLE_BRANCH=MOODLE_35_STABLE DB=pgsql

- php: 7.1
env: MOODLE_BRANCH=MOODLE_38_STABLE DB=pgsql
- php: 7.1
env: MOODLE_BRANCH=MOODLE_37_STABLE DB=mysqli

# Cannot test with Moodle 3.2 and 3.3 any more because the new composer 2
# does require all components to be named properly (case-sensitively) and
# those branches have phpunit/Dbunit, failing. See MDL-64725.
Expand Down Expand Up @@ -91,5 +86,5 @@ script:
- moodle-plugin-ci mustache
- moodle-plugin-ci grunt
- moodle-plugin-ci phpdoc
- moodle-plugin-ci phpunit --coverage-text
- moodle-plugin-ci phpunit
- moodle-plugin-ci behat
5 changes: 1 addition & 4 deletions classes/privacy/provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,13 @@
*/
class provider implements \core_privacy\local\metadata\null_provider {

// To provide php 5.6 (33_STABLE) and up support.
use \core_privacy\local\legacy_polyfill;

/**
* Get the language string identifier with the component's language
* file to explain why this plugin stores no data.
*
* @return string
*/
public static function _get_reason() {
public static function get_reason(): string {
return 'privacy:metadata';
}
}
8 changes: 6 additions & 2 deletions tests/coverage.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.

defined('MOODLE_INTERNAL') || die();

/**
* Coverage information for the local_codechecker plugin.
*
Expand All @@ -24,6 +22,12 @@
* @copyright 2021 onwards Eloy Lafuente (stronk7) {@link https://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

defined('MOODLE_INTERNAL') || die();

/**
* Anonymous phpunit_coverage_info returning the areas to include and exclude.
*/
return new class extends phpunit_coverage_info {
/** @var array The list of folders relative to the plugin root to include in coverage generation. */
protected $includelistfolders = [
Expand Down

0 comments on commit 5e596a5

Please sign in to comment.