From f80694517cc20ec3223dd7c280b1da8b2e8784be Mon Sep 17 00:00:00 2001 From: Andrew Hancox Date: Wed, 22 Mar 2023 14:58:46 +0000 Subject: [PATCH 1/3] Fix unit tests for Moodle 4.1 --- tests/fixtures/translator_testable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixtures/translator_testable.php b/tests/fixtures/translator_testable.php index 97a2aee..0a94164 100644 --- a/tests/fixtures/translator_testable.php +++ b/tests/fixtures/translator_testable.php @@ -25,7 +25,7 @@ namespace filter_translations; -use testable_core_string_manager; +use core\testable_core_string_manager; require_once("$CFG->dirroot/filter/translations/filter.php"); From bca372c493fb583a31c90b83fb0ce8956df186b7 Mon Sep 17 00:00:00 2001 From: david adamson Date: Fri, 23 Jun 2023 14:21:36 +1000 Subject: [PATCH 2/3] Fix #170 --- lib/diff/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/diff/composer.json b/lib/diff/composer.json index 59520e9..9be804f 100644 --- a/lib/diff/composer.json +++ b/lib/diff/composer.json @@ -33,7 +33,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } } } From ff222a4ae69040e25a1219b6f4c049a34cb837be Mon Sep 17 00:00:00 2001 From: Benjamin Walker Date: Wed, 12 Jun 2024 15:30:53 +1000 Subject: [PATCH 3/3] Remove unnecessary composer file --- lib/diff/composer.json | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 lib/diff/composer.json diff --git a/lib/diff/composer.json b/lib/diff/composer.json deleted file mode 100644 index 9be804f..0000000 --- a/lib/diff/composer.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "sebastian/diff", - "description": "Diff implementation", - "keywords": ["diff", "udiff", "unidiff", "unified diff"], - "homepage": "https://github.com/sebastianbergmann/diff", - "license": "BSD-3-Clause", - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - } - ], - "require": { - "php": "^7.1" - }, - "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "autoload-dev": { - "classmap": [ - "tests/" - ] - }, - "extra": { - "branch-alias": { - "dev-main": "3.0-dev" - } - } -}