diff --git a/composer.json b/composer.json index 49de0c76..8960307f 100755 --- a/composer.json +++ b/composer.json @@ -37,16 +37,8 @@ }, "repositories": [ { - "type": "package", - "package": { - "name": "moodlehq/moodle-local_ci", - "version": "1.0.17", - "source": { - "url": "https://github.com/moodlehq/moodle-local_ci.git", - "type": "git", - "reference": "v1.0.17" - } - } + "type": "vcs", + "url": "https://github.com/moodlehq/moodle-local_ci.git" }, { "type": "package", @@ -64,7 +56,7 @@ "require": { "php": ">=7.0.8", "moodlehq/moodle-cs": "^3.3.3", - "moodlehq/moodle-local_ci": "^1.0.17", + "moodlehq/moodle-local_ci": "^1.0.21", "moodlehq/moodle-local_moodlecheck": "^1.1.4", "sebastian/phpcpd": "^3.0", "sebastian/version": "^2.0.1", @@ -114,7 +106,6 @@ "post-update-cmd": "@local-ci-install", "post-create-project-cmd": "@local-ci-install", "local-ci-install": [ - "@composer update --prefer-dist --optimize-autoloader --working-dir=vendor/moodlehq/moodle-local_ci", "cd vendor/moodlehq/moodle-local_ci && npm install --no-progress" ] } diff --git a/composer.lock b/composer.lock index 4b535d45..02e750dd 100644 --- a/composer.lock +++ b/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": "da1b9b2de12008e1037cba49d79d40ff", + "content-hash": "98f6872ebc9dc2daed9e92cf72355d43", "packages": [ { "name": "composer/ca-bundle", @@ -406,13 +406,41 @@ }, { "name": "moodlehq/moodle-local_ci", - "version": "1.0.17", + "version": "v1.0.21", "source": { "type": "git", "url": "https://github.com/moodlehq/moodle-local_ci.git", - "reference": "v1.0.17" + "reference": "5a901554521deb90fb6a2c8bdbcd783e060306ac" }, - "type": "library" + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/moodlehq/moodle-local_ci/zipball/5a901554521deb90fb6a2c8bdbcd783e060306ac", + "reference": "5a901554521deb90fb6a2c8bdbcd783e060306ac", + "shasum": "" + }, + "require": { + "moodlehq/moodle-cs": "^3.3.3", + "mustache/mustache": "^2.14.1", + "phpcompatibility/php-compatibility": "dev-develop#70e4ca24" + }, + "type": "library", + "license": [ + "GPL-3.0-or-later" + ], + "description": "Stuff run by Moodle CI integration servers.", + "keywords": [ + "automations", + "ci", + "integration", + "jenkins", + "jira", + "moodle" + ], + "support": { + "source": "https://github.com/moodlehq/moodle-local_ci/tree/v1.0.21", + "issues": "https://github.com/moodlehq/moodle-local_ci/issues" + }, + "time": "2023-09-02T14:37:53+00:00" }, { "name": "moodlehq/moodle-local_moodlecheck", @@ -424,6 +452,56 @@ }, "type": "library" }, + { + "name": "mustache/mustache", + "version": "v2.14.2", + "source": { + "type": "git", + "url": "https://github.com/bobthecow/mustache.php.git", + "reference": "e62b7c3849d22ec55f3ec425507bf7968193a6cb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/e62b7c3849d22ec55f3ec425507bf7968193a6cb", + "reference": "e62b7c3849d22ec55f3ec425507bf7968193a6cb", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~1.11", + "phpunit/phpunit": "~3.7|~4.0|~5.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Mustache": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Justin Hileman", + "email": "justin@justinhileman.info", + "homepage": "http://justinhileman.com" + } + ], + "description": "A Mustache implementation in PHP.", + "homepage": "https://github.com/bobthecow/mustache.php", + "keywords": [ + "mustache", + "templating" + ], + "support": { + "issues": "https://github.com/bobthecow/mustache.php/issues", + "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.2" + }, + "time": "2022-08-23T13:07:01+00:00" + }, { "name": "nikic/php-parser", "version": "v4.15.4", @@ -3946,5 +4024,5 @@ "platform-overrides": { "php": "7.0.8" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1ab0b56f..f85bbe5f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -9,6 +9,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). The format of this change log follows the advice given at [Keep a CHANGELOG](http://keepachangelog.com). ## [Unreleased] +### Changed +- Modified `moodle-local_ci` composer dependencies and manage them normally, removing some ancient bits that have [stopped working with Composer 2.6.0 and up](https://github.com/composer/composer/issues/11613). +- Updated project dependencies to current [moodle-local_ci](https://github.com/moodlehq/moodle-local_ci) version. ## [3.4.12] - 2023-05-03 ### Changed diff --git a/tests/FileUpdatesTest.php b/tests/FileUpdatesTest.php index 1556ea91..218f1743 100644 --- a/tests/FileUpdatesTest.php +++ b/tests/FileUpdatesTest.php @@ -17,7 +17,7 @@ class FileUpdatesTest extends \PHPUnit\Framework\TestCase public function testLocalCIPackageJSON() { $this->assertSame( - '060fde69ff2cc75b70fe560c998735b80e2e0942', + '4b37d67998dd06d21c89865641135ed435baf65d', sha1_file(__DIR__.'/../vendor/moodlehq/moodle-local_ci/package.json'), 'Check changes to vendor/moodlehq/moodle-local_ci/package.json and update MustacheCommand, etc if necessary' );