From 882400576748b3f3084fb0c016d01c68d7703d57 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Tue, 14 Mar 2023 10:45:51 +0100 Subject: [PATCH] Bump moodle-cs to 3.3.3 And revert some changes that were done for previous release, about spacing before assignment, they aren't needed any more. See: https://github.com/moodlehq/moodle-cs/pull/44 Also the js / map files because the NodeJS bump in core has been now reverted. See: https://tracker.moodle.org/browse/MDL-77559 --- composer.json | 2 +- composer.lock | 26 +++++++++---------- .../moodle-local_ci/amd/build/keys.min.js.map | 2 +- tests/Fixture/moodle-local_ci/db/access.php | 8 +++--- tests/Fixture/moodle-local_ci/version.php | 8 +++--- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index 348cddd0..49de0c76 100755 --- a/composer.json +++ b/composer.json @@ -63,7 +63,7 @@ ], "require": { "php": ">=7.0.8", - "moodlehq/moodle-cs": "^3.3.2", + "moodlehq/moodle-cs": "^3.3.3", "moodlehq/moodle-local_ci": "^1.0.17", "moodlehq/moodle-local_moodlecheck": "^1.1.4", "sebastian/phpcpd": "^3.0", diff --git a/composer.lock b/composer.lock index 751751d4..4b535d45 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": "5923ad86c8f429a744f5adc94196d93a", + "content-hash": "da1b9b2de12008e1037cba49d79d40ff", "packages": [ { "name": "composer/ca-bundle", @@ -347,16 +347,16 @@ }, { "name": "moodlehq/moodle-cs", - "version": "v3.3.2", + "version": "v3.3.3", "source": { "type": "git", "url": "https://github.com/moodlehq/moodle-cs.git", - "reference": "f1f5538278f815cdeddc7f2ea95686e1a727e4e1" + "reference": "1dbc536d792b6ef3b3470958e7f1831f511a4044" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/moodlehq/moodle-cs/zipball/f1f5538278f815cdeddc7f2ea95686e1a727e4e1", - "reference": "f1f5538278f815cdeddc7f2ea95686e1a727e4e1", + "url": "https://api.github.com/repos/moodlehq/moodle-cs/zipball/1dbc536d792b6ef3b3470958e7f1831f511a4044", + "reference": "1dbc536d792b6ef3b3470958e7f1831f511a4044", "shasum": "" }, "require": { @@ -402,7 +402,7 @@ "source": "https://github.com/moodlehq/moodle-cs", "wiki": "https://github.com/moodlehq/moodle-cs/wiki" }, - "time": "2023-02-13T08:03:29+00:00" + "time": "2023-03-14T07:54:37+00:00" }, { "name": "moodlehq/moodle-local_ci", @@ -426,16 +426,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.3", + "version": "v4.15.4", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039" + "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039", - "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", "shasum": "" }, "require": { @@ -476,9 +476,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4" }, - "time": "2023-01-16T22:05:37+00:00" + "time": "2023-03-05T19:49:14+00:00" }, { "name": "padraic/humbug_get_contents", @@ -899,7 +899,7 @@ "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues", "source": "https://github.com/PHPCompatibility/PHPCompatibility" }, - "time": "2023-02-11T00:52:13+00:00" + "time": "2023-03-08T13:51:55+00:00" }, { "name": "phpcsstandards/phpcsutils", diff --git a/tests/Fixture/moodle-local_ci/amd/build/keys.min.js.map b/tests/Fixture/moodle-local_ci/amd/build/keys.min.js.map index 3eee452b..d2181cd8 100644 --- a/tests/Fixture/moodle-local_ci/amd/build/keys.min.js.map +++ b/tests/Fixture/moodle-local_ci/amd/build/keys.min.js.map @@ -1 +1 @@ -{"version":3,"file":"keys.min.js","sources":["../src/keys.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see .\n\n/**\n * This is copied from mod/lti.\n *\n * @module local_ci/keys\n * @class keys\n * @copyright 2015 Ryan Wyllie \n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since 3.1\n */\ndefine([], function ()\n{\n return /** @alias module:local_ci/keys */ {\n ENTER: 13,\n SPACE: 32\n };\n});\n"],"names":["define","ENTER","SPACE"],"mappings":";;;;;;;;;AAwBAA,OAAM,gBAAC,IAAI,WAEP,MAA0C,CACtCC,MAAO,GACPC,MAAO,GAEf"} \ No newline at end of file +{"version":3,"file":"keys.min.js","sources":["../src/keys.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see .\n\n/**\n * This is copied from mod/lti.\n *\n * @module local_ci/keys\n * @class keys\n * @copyright 2015 Ryan Wyllie \n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since 3.1\n */\ndefine([], function ()\n{\n return /** @alias module:local_ci/keys */ {\n ENTER: 13,\n SPACE: 32\n };\n});\n"],"names":["define","ENTER","SPACE"],"mappings":";;;;;;;;;AAwBAA,uBAAO,IAAI,iBAEmC,CACtCC,MAAO,GACPC,MAAO"} \ No newline at end of file diff --git a/tests/Fixture/moodle-local_ci/db/access.php b/tests/Fixture/moodle-local_ci/db/access.php index 09eff0c4..5ca6fccf 100644 --- a/tests/Fixture/moodle-local_ci/db/access.php +++ b/tests/Fixture/moodle-local_ci/db/access.php @@ -26,12 +26,12 @@ $capabilities = [ 'local/travis:view' => [ - 'captype' => 'read', + 'captype' => 'read', 'contextlevel' => CONTEXT_SYSTEM, - 'archetypes' => [ - 'teacher' => CAP_ALLOW, + 'archetypes' => [ + 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'manager' => CAP_ALLOW, + 'manager' => CAP_ALLOW, ], ], ]; diff --git a/tests/Fixture/moodle-local_ci/version.php b/tests/Fixture/moodle-local_ci/version.php index 8882d942..a96328a1 100644 --- a/tests/Fixture/moodle-local_ci/version.php +++ b/tests/Fixture/moodle-local_ci/version.php @@ -25,8 +25,8 @@ defined('MOODLE_INTERNAL') || die(); /** @var object $plugin */ -$plugin->version = 2015071000; -$plugin->requires = 2014051200; // Moodle 2.7. -$plugin->component = 'local_ci'; +$plugin->version = 2015071000; +$plugin->requires = 2014051200; // Moodle 2.7. +$plugin->component = 'local_ci'; $plugin->dependencies = ['mod_forum' => ANY_VERSION]; -$plugin->maturity = MATURITY_STABLE; +$plugin->maturity = MATURITY_STABLE;