From 281f4691f27ba99ecaf17679231800dd7b718ca1 Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Wed, 4 Dec 2019 21:35:23 +0000 Subject: [PATCH 1/7] Bump npm to match .nvmrc in Moodle master (14.0.0). --- .travis.dist.yml | 4 ++-- .travis.yml | 4 ++-- docs/TravisFileExplained.md | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.dist.yml b/.travis.dist.yml index ac41af7b..5ac5a8e8 100644 --- a/.travis.dist.yml +++ b/.travis.dist.yml @@ -27,8 +27,8 @@ env: before_install: - phpenv config-rm xdebug.ini - - nvm install 8.9 - - nvm use 8.9 + - nvm install 14.0.0 + - nvm use 14.0.0 - cd ../.. - composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2 - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH" diff --git a/.travis.yml b/.travis.yml index 0b943805..30ca70e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,8 @@ env: before_install: - phpenv config-rm xdebug.ini - - nvm install 8.9 - - nvm use 8.9 + - nvm install 14.0.0 + - nvm use 14.0.0 - make init # Mimic how a Moodle plugin would be run. - cp -R tests/Fixture/moodle-local_travis ../moodle-local_travis diff --git a/docs/TravisFileExplained.md b/docs/TravisFileExplained.md index 254edd43..d99cfe50 100644 --- a/docs/TravisFileExplained.md +++ b/docs/TravisFileExplained.md @@ -56,9 +56,10 @@ env: before_install: # This disables XDebug which should speed up the build. - phpenv config-rm xdebug.ini -# This installs NodeJS which is used by Grunt, etc. - - nvm install 8.9 - - nvm use 8.9 +# This installs NodeJS which is used by Grunt, adjust according to `.nvmrc` file +# in your Moodle installation. + - nvm install 14.0.0 + - nvm use 14.0.0 # Currently we are inside of the clone of your repository. We move up two # directories to build the project. - cd ../.. From 040ffa3053bf2aa4d6644a6b54542898c51e717b Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Mon, 29 Jun 2020 23:26:25 +0100 Subject: [PATCH 2/7] Composer rebuild and minor changes. --- composer.json | 4 +- composer.lock | 641 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 439 insertions(+), 206 deletions(-) diff --git a/composer.json b/composer.json index 45e84ed6..16772973 100644 --- a/composer.json +++ b/composer.json @@ -75,8 +75,8 @@ "symfony/console": "^3.3", "symfony/yaml": "^3.3", "symfony/process": "^3.3", - "jakub-onderka/php-parallel-lint": "^0.9", - "jakub-onderka/php-console-highlighter": "^0.3", + "php-parallel-lint/php-parallel-lint": "^0.9", + "php-parallel-lint/php-console-highlighter": "^0.3", "psr/log": "^1.0", "nikic/php-parser": "^3.0", "stecman/symfony-console-completion": "^0.7.0", diff --git a/composer.lock b/composer.lock index fbfae0c4..ad8e8861 100644 --- a/composer.lock +++ b/composer.lock @@ -4,31 +4,31 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5daa174ad53783108f138609623f9e54", + "content-hash": "a70c62378c71990f35e1961d5d4d6b11", "packages": [ { "name": "composer/ca-bundle", - "version": "1.1.4", + "version": "1.2.7", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d" + "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d", - "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd", + "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd", "shasum": "" }, "require": { "ext-openssl": "*", "ext-pcre": "*", - "php": "^5.3.2 || ^7.0" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5", + "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", "psr/log": "^1.0", - "symfony/process": "^2.5 || ^3.0 || ^4.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" }, "type": "library", "extra": { @@ -60,126 +60,105 @@ "ssl", "tls" ], - "time": "2019-01-28T09:30:10+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2020-04-08T08:27:21+00:00" }, { - "name": "jakub-onderka/php-console-color", - "version": "v0.2", + "name": "composer/xdebug-handler", + "version": "1.4.2", "source": { "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Color.git", - "reference": "d5deaecff52a0d61ccb613bb3804088da0307191" + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191", - "reference": "d5deaecff52a0d61ccb613bb3804088da0307191", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", + "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": "^5.3.2 || ^7.0 || ^8.0", + "psr/log": "^1.0" }, "require-dev": { - "jakub-onderka/php-code-style": "1.0", - "jakub-onderka/php-parallel-lint": "1.0", - "jakub-onderka/php-var-dump-check": "0.*", - "phpunit/phpunit": "~4.3", - "squizlabs/php_codesniffer": "1.*" + "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8" }, "type": "library", "autoload": { "psr-4": { - "JakubOnderka\\PhpConsoleColor\\": "src/" + "Composer\\XdebugHandler\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-2-Clause" + "MIT" ], "authors": [ { - "name": "Jakub Onderka", - "email": "jakub.onderka@gmail.com" + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" } ], - "time": "2018-09-29T17:23:10+00:00" - }, - { - "name": "jakub-onderka/php-console-highlighter", - "version": "v0.3.2", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5", - "shasum": "" - }, - "require": { - "jakub-onderka/php-console-color": "~0.1", - "php": ">=5.3.0" - }, - "require-dev": { - "jakub-onderka/php-code-style": "~1.0", - "jakub-onderka/php-parallel-lint": "~0.5", - "jakub-onderka/php-var-dump-check": "~0.1", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "autoload": { - "psr-0": { - "JakubOnderka\\PhpConsoleHighlighter": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" ], - "authors": [ + "funding": [ { - "name": "Jakub Onderka", - "email": "acci@acci.cz", - "homepage": "http://www.acci.cz/" + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" } ], - "time": "2015-04-20T18:58:01+00:00" + "time": "2020-06-04T11:16:35+00:00" }, { - "name": "jakub-onderka/php-parallel-lint", - "version": "v0.9.2", + "name": "jakub-onderka/php-console-color", + "version": "v0.2", "source": { "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Parallel-Lint.git", - "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa" + "url": "https://github.com/JakubOnderka/PHP-Console-Color.git", + "reference": "d5deaecff52a0d61ccb613bb3804088da0307191" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Parallel-Lint/zipball/2ead2e4043ab125bee9554f356e0a86742c2d4fa", - "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa", + "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191", + "reference": "d5deaecff52a0d61ccb613bb3804088da0307191", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.4.0" }, "require-dev": { - "jakub-onderka/php-console-highlighter": "~0.3", - "nette/tester": "~1.3" - }, - "suggest": { - "jakub-onderka/php-console-highlighter": "Highlight syntax in code snippet" + "jakub-onderka/php-code-style": "1.0", + "jakub-onderka/php-parallel-lint": "1.0", + "jakub-onderka/php-var-dump-check": "0.*", + "phpunit/phpunit": "~4.3", + "squizlabs/php_codesniffer": "1.*" }, - "bin": [ - "parallel-lint" - ], "type": "library", "autoload": { - "classmap": [ - "./" - ] + "psr-4": { + "JakubOnderka\\PhpConsoleColor\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -191,9 +170,8 @@ "email": "jakub.onderka@gmail.com" } ], - "description": "This tool check syntax of PHP files about 20x faster than serial check.", - "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint", - "time": "2015-12-15T10:42:16+00:00" + "abandoned": "php-parallel-lint/php-console-color", + "time": "2018-09-29T17:23:10+00:00" }, { "name": "marcj/topsort", @@ -382,7 +360,7 @@ "homepage": "http://blog.astrumfutura.com" }, { - "name": "Théo Fidry", + "name": "Théo FIDRY", "email": "theo.fidry@gmail.com" } ], @@ -452,32 +430,39 @@ }, { "name": "pdepend/pdepend", - "version": "2.5.2", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239" + "reference": "c64472f8e76ca858c79ad9a4cf1e2734b3f8cc38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/9daf26d0368d4a12bed1cacae1a9f3a6f0adf239", - "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/c64472f8e76ca858c79ad9a4cf1e2734b3f8cc38", + "reference": "c64472f8e76ca858c79ad9a4cf1e2734b3f8cc38", "shasum": "" }, "require": { "php": ">=5.3.7", - "symfony/config": "^2.3.0|^3|^4", - "symfony/dependency-injection": "^2.3.0|^3|^4", - "symfony/filesystem": "^2.3.0|^3|^4" + "symfony/config": "^2.3.0|^3|^4|^5", + "symfony/dependency-injection": "^2.3.0|^3|^4|^5", + "symfony/filesystem": "^2.3.0|^3|^4|^5" }, "require-dev": { - "phpunit/phpunit": "^4.8|^5.7", + "easy-doc/easy-doc": "0.0.0 || ^1.2.3", + "gregwar/rst": "^1.0", + "phpunit/phpunit": "^4.8.35|^5.7", "squizlabs/php_codesniffer": "^2.0.0" }, "bin": [ "src/bin/pdepend" ], "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, "autoload": { "psr-4": { "PDepend\\": "src/main/php/PDepend" @@ -488,35 +473,136 @@ "BSD-3-Clause" ], "description": "Official version of pdepend to be handled with Composer", - "time": "2017-12-13T13:21:38+00:00" + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/pdepend/pdepend", + "type": "tidelift" + } + ], + "time": "2020-06-20T10:53:13+00:00" + }, + { + "name": "php-parallel-lint/php-console-highlighter", + "version": "v0.3.2", + "source": { + "type": "git", + "url": "https://github.com/php-parallel-lint/PHP-Console-Highlighter.git", + "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5", + "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5", + "shasum": "" + }, + "require": { + "jakub-onderka/php-console-color": "~0.1", + "php": ">=5.3.0" + }, + "require-dev": { + "jakub-onderka/php-code-style": "~1.0", + "jakub-onderka/php-parallel-lint": "~0.5", + "jakub-onderka/php-var-dump-check": "~0.1", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~1.5" + }, + "type": "library", + "autoload": { + "psr-0": { + "JakubOnderka\\PhpConsoleHighlighter": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jakub Onderka", + "email": "acci@acci.cz", + "homepage": "http://www.acci.cz/" + } + ], + "time": "2015-04-20T18:58:01+00:00" + }, + { + "name": "php-parallel-lint/php-parallel-lint", + "version": "v0.9.2", + "source": { + "type": "git", + "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git", + "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/2ead2e4043ab125bee9554f356e0a86742c2d4fa", + "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "jakub-onderka/php-console-highlighter": "~0.3", + "nette/tester": "~1.3" + }, + "suggest": { + "jakub-onderka/php-console-highlighter": "Highlight syntax in code snippet" + }, + "bin": [ + "parallel-lint" + ], + "type": "library", + "autoload": { + "classmap": [ + "./" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Jakub Onderka", + "email": "jakub.onderka@gmail.com" + } + ], + "description": "This tool check syntax of PHP files about 20x faster than serial check.", + "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint", + "time": "2015-12-15T10:42:16+00:00" }, { "name": "phpmd/phpmd", - "version": "2.6.0", + "version": "2.8.2", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374" + "reference": "714629ed782537f638fe23c4346637659b779a77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/4e9924b2c157a3eb64395460fcf56b31badc8374", - "reference": "4e9924b2c157a3eb64395460fcf56b31badc8374", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/714629ed782537f638fe23c4346637659b779a77", + "reference": "714629ed782537f638fe23c4346637659b779a77", "shasum": "" }, "require": { + "composer/xdebug-handler": "^1.0", "ext-xml": "*", - "pdepend/pdepend": "^2.5", + "pdepend/pdepend": "^2.7.1", "php": ">=5.3.9" }, "require-dev": { - "phpunit/phpunit": "^4.0", + "easy-doc/easy-doc": "0.0.0 || ^1.3.2", + "gregwar/rst": "^1.0", + "mikey179/vfsstream": "^1.6.4", + "phpunit/phpunit": "^4.8.36 || ^5.7.27", "squizlabs/php_codesniffer": "^2.0" }, "bin": [ "src/bin/phpmd" ], - "type": "project", + "type": "library", "autoload": { "psr-0": { "PHPMD\\": "src/main/php" @@ -533,20 +619,20 @@ "homepage": "https://github.com/manuelpichler", "role": "Project Founder" }, - { - "name": "Other contributors", - "homepage": "https://github.com/phpmd/phpmd/graphs/contributors", - "role": "Contributors" - }, { "name": "Marc Würth", "email": "ravage@bluewin.ch", "homepage": "https://github.com/ravage84", "role": "Project Maintainer" + }, + { + "name": "Other contributors", + "homepage": "https://github.com/phpmd/phpmd/graphs/contributors", + "role": "Contributors" } ], "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.", - "homepage": "http://phpmd.org/", + "homepage": "https://phpmd.org/", "keywords": [ "mess detection", "mess detector", @@ -554,7 +640,7 @@ "phpmd", "pmd" ], - "time": "2017-01-20T14:41:10+00:00" + "time": "2020-02-16T20:15:50+00:00" }, { "name": "phpunit/php-timer", @@ -656,16 +742,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -674,7 +760,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -699,7 +785,7 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "sebastian/finder-facade", @@ -880,16 +966,16 @@ }, { "name": "symfony/config", - "version": "v3.4.22", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "c9bc510c217075d42d4a927e285917d0c2001cf4" + "reference": "cd61db31cbd19cbe4ba9f6968f13c9076e1372ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/c9bc510c217075d42d4a927e285917d0c2001cf4", - "reference": "c9bc510c217075d42d4a927e285917d0c2001cf4", + "url": "https://api.github.com/repos/symfony/config/zipball/cd61db31cbd19cbe4ba9f6968f13c9076e1372ab", + "reference": "cd61db31cbd19cbe4ba9f6968f13c9076e1372ab", "shasum": "" }, "require": { @@ -940,20 +1026,34 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2019-01-30T11:33:42+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-22T10:56:48+00:00" }, { "name": "symfony/console", - "version": "v3.4.22", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "069bf3f0e8f871a2169a06e43d9f3f03f355e9be" + "reference": "bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/069bf3f0e8f871a2169a06e43d9f3f03f355e9be", - "reference": "069bf3f0e8f871a2169a06e43d9f3f03f355e9be", + "url": "https://api.github.com/repos/symfony/console/zipball/bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13", + "reference": "bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13", "shasum": "" }, "require": { @@ -1012,20 +1112,34 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-01-25T10:42:12+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-30T18:58:05+00:00" }, { "name": "symfony/debug", - "version": "v3.4.22", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "667a26c4dd6bc75c67f06bc9bcd015bdecc7cbb8" + "reference": "518c6a00d0872da30bd06aee3ea59a0a5cf54d6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/667a26c4dd6bc75c67f06bc9bcd015bdecc7cbb8", - "reference": "667a26c4dd6bc75c67f06bc9bcd015bdecc7cbb8", + "url": "https://api.github.com/repos/symfony/debug/zipball/518c6a00d0872da30bd06aee3ea59a0a5cf54d6d", + "reference": "518c6a00d0872da30bd06aee3ea59a0a5cf54d6d", "shasum": "" }, "require": { @@ -1068,20 +1182,34 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-01-25T10:19:25+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-22T18:25:20+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.4.35", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "0ea4d39ca82409a25a43b61ce828048a90000920" + "reference": "e39380b7104b0ec538a075ae919f00c7e5267bac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0ea4d39ca82409a25a43b61ce828048a90000920", - "reference": "0ea4d39ca82409a25a43b61ce828048a90000920", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e39380b7104b0ec538a075ae919f00c7e5267bac", + "reference": "e39380b7104b0ec538a075ae919f00c7e5267bac", "shasum": "" }, "require": { @@ -1139,27 +1267,41 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2019-11-08T16:18:30+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-30T21:06:01+00:00" }, { "name": "symfony/dotenv", - "version": "v3.4.22", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", - "reference": "47c2020b21b46889fa647ec9568831284af6faff" + "reference": "22577db70b4fbd2e93d6b331ce2ae5f3d49f20e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/47c2020b21b46889fa647ec9568831284af6faff", - "reference": "47c2020b21b46889fa647ec9568831284af6faff", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/22577db70b4fbd2e93d6b331ce2ae5f3d49f20e6", + "reference": "22577db70b4fbd2e93d6b331ce2ae5f3d49f20e6", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8" }, "require-dev": { - "symfony/process": "~3.2|~4.0" + "symfony/process": "^3.4.2|^4.0" }, "type": "library", "extra": { @@ -1196,20 +1338,20 @@ "env", "environment" ], - "time": "2019-01-21T13:02:53+00:00" + "time": "2020-01-07T20:29:45+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.22", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b52454ec66fe5082b7a66a491339d1f1da9a5a0d" + "reference": "0f625d0cb1e59c8c4ba61abb170125175218ff10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b52454ec66fe5082b7a66a491339d1f1da9a5a0d", - "reference": "b52454ec66fe5082b7a66a491339d1f1da9a5a0d", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0f625d0cb1e59c8c4ba61abb170125175218ff10", + "reference": "0f625d0cb1e59c8c4ba61abb170125175218ff10", "shasum": "" }, "require": { @@ -1246,20 +1388,34 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-01-16T13:27:11+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-30T17:48:24+00:00" }, { "name": "symfony/finder", - "version": "v3.4.22", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "7c0c627220308928e958a87c293108e5891cde1d" + "reference": "5ec813ccafa8164ef21757e8c725d3a57da59200" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/7c0c627220308928e958a87c293108e5891cde1d", - "reference": "7c0c627220308928e958a87c293108e5891cde1d", + "url": "https://api.github.com/repos/symfony/finder/zipball/5ec813ccafa8164ef21757e8c725d3a57da59200", + "reference": "5ec813ccafa8164ef21757e8c725d3a57da59200", "shasum": "" }, "require": { @@ -1295,20 +1451,34 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-01-16T13:43:35+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-02-14T07:34:21+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.10.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", "shasum": "" }, "require": { @@ -1320,7 +1490,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -1336,13 +1510,13 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - }, { "name": "Gert de Pagter", "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony polyfill for ctype functions", @@ -1353,20 +1527,34 @@ "polyfill", "portable" ], - "time": "2018-08-06T14:22:27+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.10.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" + "reference": "7110338d81ce1cbc3e273136e4574663627037a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", - "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7", + "reference": "7110338d81ce1cbc3e273136e4574663627037a7", "shasum": "" }, "require": { @@ -1378,7 +1566,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -1412,20 +1604,34 @@ "portable", "shim" ], - "time": "2018-09-21T13:07:52+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/process", - "version": "v3.4.22", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "009f8dda80930e89e8344a4e310b08f9ff07dd2e" + "reference": "8a895f0c92a7c4b10db95139bcff71bdf66d4d21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/009f8dda80930e89e8344a4e310b08f9ff07dd2e", - "reference": "009f8dda80930e89e8344a4e310b08f9ff07dd2e", + "url": "https://api.github.com/repos/symfony/process/zipball/8a895f0c92a7c4b10db95139bcff71bdf66d4d21", + "reference": "8a895f0c92a7c4b10db95139bcff71bdf66d4d21", "shasum": "" }, "require": { @@ -1461,20 +1667,34 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-01-16T13:27:11+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-23T17:05:51+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.22", + "version": "v3.4.42", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d" + "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/ba11776e9e6c15ad5759a07bffb15899bac75c2d", - "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb", + "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb", "shasum": "" }, "require": { @@ -1520,7 +1740,21 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-01-16T10:59:17+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-11T07:51:54+00:00" }, { "name": "theseer/fdomdocument", @@ -1811,38 +2045,38 @@ }, { "name": "phpspec/prophecy", - "version": "1.8.0", + "version": "v1.10.3", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06" + "reference": "451c3cd1418cf640de218914901e51b064abb093" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06", - "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093", + "reference": "451c3cd1418cf640de218914901e51b064abb093", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", - "sebastian/comparator": "^1.1|^2.0|^3.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0" + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", + "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" }, "require-dev": { - "phpspec/phpspec": "^2.5|^3.2", + "phpspec/phpspec": "^2.5 || ^3.2", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.10.x-dev" } }, "autoload": { - "psr-0": { - "Prophecy\\": "src/" + "psr-4": { + "Prophecy\\": "src/Prophecy" } }, "notification-url": "https://packagist.org/downloads/", @@ -1870,7 +2104,7 @@ "spy", "stub" ], - "time": "2018-08-05T17:53:17+00:00" + "time": "2020-03-05T15:02:03+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2686,32 +2920,30 @@ }, { "name": "webmozart/assert", - "version": "1.4.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9" + "reference": "9dc4f203e36f2b486149058bade43c851dd97451" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9", - "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9", + "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451", + "reference": "9dc4f203e36f2b486149058bade43c851dd97451", "shasum": "" }, "require": { "php": "^5.3.3 || ^7.0", "symfony/polyfill-ctype": "^1.8" }, + "conflict": { + "phpstan/phpstan": "<0.12.20", + "vimeo/psalm": "<3.9.1" + }, "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" + "phpunit/phpunit": "^4.8.36 || ^7.5.13" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, "autoload": { "psr-4": { "Webmozart\\Assert\\": "src/" @@ -2733,7 +2965,7 @@ "check", "validate" ], - "time": "2018-12-25T11:19:39+00:00" + "time": "2020-06-16T10:16:42+00:00" } ], "aliases": [], @@ -2747,5 +2979,6 @@ "platform-dev": [], "platform-overrides": { "php": "5.6" - } + }, + "plugin-api-version": "1.1.0" } From 849b6199b20ced054c24b18a4f7b399a88bc273e Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Tue, 30 Jun 2020 14:20:03 +0100 Subject: [PATCH 3/7] Fix Psalm issues --- psalm.xml | 20 ++++++++++++++++++-- src/Bridge/MoodlePlugin.php | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/psalm.xml b/psalm.xml index a39fc8d6..ef82177b 100644 --- a/psalm.xml +++ b/psalm.xml @@ -47,13 +47,29 @@ - + + + + + + + + - + + + + + + + + + + diff --git a/src/Bridge/MoodlePlugin.php b/src/Bridge/MoodlePlugin.php index 792fcc13..793fbd84 100644 --- a/src/Bridge/MoodlePlugin.php +++ b/src/Bridge/MoodlePlugin.php @@ -42,7 +42,7 @@ class MoodlePlugin * EG: this is the command name and it should only * be used for reading configs. * - * @var string + * @var string|null */ public $context = ''; From a6326377192bf86999c033ca933aed01d1169bfd Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Mon, 29 Jun 2020 21:48:20 +0100 Subject: [PATCH 4/7] Travis file cleanup and default build bump to 3.9. --- .travis.dist.yml | 7 +++--- .travis.yml | 23 ++++--------------- docs/CHANGELOG.md | 6 ++--- docs/TravisFileExplained.md | 13 +++++------ .../moodle-local_travis-widget-min.js | 2 +- 5 files changed, 17 insertions(+), 34 deletions(-) diff --git a/.travis.dist.yml b/.travis.dist.yml index 5ac5a8e8..5f35ea69 100644 --- a/.travis.dist.yml +++ b/.travis.dist.yml @@ -1,7 +1,7 @@ language: php addons: - postgresql: "9.4" + postgresql: "9.5" services: - mysql @@ -14,13 +14,12 @@ cache: - $HOME/.npm php: - - 7.1 - 7.2 - 7.3 env: global: - - MOODLE_BRANCH=MOODLE_38_STABLE + - MOODLE_BRANCH=MOODLE_39_STABLE matrix: - DB=pgsql - DB=mysqli @@ -30,7 +29,7 @@ before_install: - nvm install 14.0.0 - nvm use 14.0.0 - cd ../.. - - composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2 + - composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^2 - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH" - docker run -d -p 127.0.0.1:4444:4444 --net=host --shm-size=2g -v $HOME/build/moodle:$HOME/build/moodle selenium/standalone-firefox:2.53.1 diff --git a/.travis.yml b/.travis.yml index 30ca70e4..770c2207 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ script: - moodle-plugin-ci validate - moodle-plugin-ci savepoints - moodle-plugin-ci mustache - - moodle-plugin-ci grunt || [ "$MOODLE_BRANCH" != 'master' -a "$MOODLE_BRANCH" != 'MOODLE_38_STABLE' ] + - moodle-plugin-ci grunt || [ "$MOODLE_BRANCH" != 'master' -a "$MOODLE_BRANCH" != 'MOODLE_39_STABLE' ] - moodle-plugin-ci phpdoc - moodle-plugin-ci phpunit --coverage-text - moodle-plugin-ci behat --profile chrome @@ -58,33 +58,18 @@ script: jobs: include: - stage: Tests + php: 7.3 addons: skip install: - make init script: - make validate - stage: Integration tests + - php: 7.3 + env: MOODLE_BRANCH=MOODLE_39_STABLE - php: 7.3 env: MOODLE_BRANCH=MOODLE_38_STABLE - php: 7.3 env: MOODLE_BRANCH=MOODLE_37_STABLE - - php: 7.2 - env: MOODLE_BRANCH=MOODLE_36_STABLE - php: 7.2 env: MOODLE_BRANCH=MOODLE_35_STABLE - - stage: Deploy - addons: skip - install: skip - script: skip - before_deploy: - - make build/moodle-plugin-ci.phar - - php build/moodle-plugin-ci.phar list - deploy: - provider: releases - api_key: - secure: 1A6XanGYBX2fjDfQF96LK8otHz9Sh9g29eq7O+4ntAFyN5hYTVxJBdtp6LFkoeEHeQJtHpl/vmw+htavL5UXcYHqLsX+suXH8JML0Bg5sTA/HIhksetl226PtbdJabD/5AerLzqf+PiHGagzBBqscUqkVl7DdHEVkC/OQCDNcB5onFNqSRlCP50WFyXHBr4TccrUuvHK+jKcG4AFMLU7f2Bo2j5NBQW+ucY/RdNczXrRo4et9JHZJRocPFxQMpOnV7fTrQaHlt+HQe5FikNM28Vh44uVj7ZGYLWZNmtQb9K3Fq9t+atObMcYjsjBbnqypzm8BUNDx2YfsZvcpNOEtksYx6rE58EXQgJCBod7azjt4ulIrKPNOK64A9s6SX/ZQ68VEGYCYlC412kWC6SwPp77iDRLv4Z0MpmvtZfJ1LbkvMx22SRJGBSD24INvLxh4XnfUN0qQ021HUNIbTQ8cBuTGzMWf7W2nYjEGbTVV1fTMcFFy8IXOhnodM1s5kbMDRjASxkNpMBbbhfh4b3WnBhoi+Ecqjq4DFhU7YLHdjLF1pkuRHoBn1I7vNbO+JaEMtTQHokDxBGe4hIehkGxs04Q//2tI7DsWyVLhCTStoC9OqQMTZmAJCUUVV/L9HV7HS6ZqgkBlPBvpld3g8cMqRVN19p4B09WyMQcK8usJEw= - file: build/moodle-plugin-ci.phar - skip_cleanup: true - on: - repo: blackboard-open-source/moodle-plugin-ci - tags: true diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 232fd66d..85f0db08 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -15,11 +15,11 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt [#91](https://github.com/blackboard-open-source/moodle-plugin-ci/issues/91). - Updated verion of `moodlehq/moodle-local_ci` to fix Mustache linting. See [#91](https://github.com/blackboard-open-source/moodle-plugin-ci/issues/91). -- Updated [.travis.dist.yml] to build Moodle 3.8: removed PHP 7.0 and added - 7.2 and 7.3 (per release notes). - Replaced Selenium in-built functionality with docker image for Selenium Standalone server. See [#99](https://github.com/blackboard-open-source/moodle-plugin-ci/issues/99). -- Updated version of `moodlehq/moodle-local_codechecker`. +- Updated version of `moodlehq/moodle-local_codechecker` to 2.9.6 +- Updated [.travis.dist.yml] to build Moodle 3.9 +- Updated [.travis.dist.yml] to use nvm 14.0.0 ### Added - New help document: [CLI commands and options](CLI.md) diff --git a/docs/TravisFileExplained.md b/docs/TravisFileExplained.md index d99cfe50..054cbe7a 100644 --- a/docs/TravisFileExplained.md +++ b/docs/TravisFileExplained.md @@ -13,7 +13,7 @@ language: php # Installs the updated version of PostgreSQL and extra APT packages. addons: - postgresql: "9.4" + postgresql: "9.5" # Ensure DB services are running. services: @@ -30,7 +30,6 @@ cache: # listed here will create a separate build and run the tests against that # version of PHP. php: - - 7.1 - 7.2 - 7.3 @@ -38,12 +37,12 @@ php: env: global: # This line determines which version branch of Moodle to test against. - - MOODLE_BRANCH=MOODLE_38_STABLE + - MOODLE_BRANCH=MOODLE_39_STABLE # This matrix is used for testing against multiple databases. So for # each version of PHP being tested, one build will be created for each -# database listed here. EG: for PHP 7.1, one build will be created -# using PHP 7.1 and pgsql. In addition, another build will be created -# using PHP 7.1 and mysqli. +# database listed here. EG: for PHP 7.3, one build will be created +# using PHP 7.3 and pgsql. In addition, another build will be created +# using PHP 7.3 and mysqli. matrix: - DB=pgsql - DB=mysqli @@ -64,7 +63,7 @@ before_install: # directories to build the project. - cd ../.. # Install this project into a directory called "ci". - - composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2 + - composer create-project -n --no-dev --prefer-dist moodlehq/plugin-ci ci ^2 # Update the $PATH so scripts from this project can be called easily. - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH" # Start Selenium Standalone server with Chrome/Firefox installed. If you diff --git a/tests/Fixture/moodle-local_travis/yui/build/moodle-local_travis-widget/moodle-local_travis-widget-min.js b/tests/Fixture/moodle-local_travis/yui/build/moodle-local_travis-widget/moodle-local_travis-widget-min.js index 0f68775c..11dbc4a8 100644 --- a/tests/Fixture/moodle-local_travis/yui/build/moodle-local_travis-widget/moodle-local_travis-widget-min.js +++ b/tests/Fixture/moodle-local_travis/yui/build/moodle-local_travis-widget/moodle-local_travis-widget-min.js @@ -1 +1 @@ -YUI.add("moodle-local_travis-widget",function(e,t){function n(){n.superclass.constructor.apply(this,arguments)}n.NAME="moodle-local_travis-widget",n.ATTRS={contextId:{value:undefined}},e.extend(n,e.Base,{initializer:function(){e.delegate("click",this.handle_click,document,".local_travis .widget",this)},handle_click:function(e){e.preventDefault()}}),M.local_travis.Widget=n,M.local_travis.init_widget=function(e){new n(e)}},"@VERSION@",{requires:["base","node","event"]}); +YUI.add("moodle-local_travis-widget",function(e,t){function i(){i.superclass.constructor.apply(this,arguments)}i.NAME="moodle-local_travis-widget",i.ATTRS={contextId:{value:undefined}},e.extend(i,e.Base,{initializer:function(){e.delegate("click",this.handle_click,document,".local_travis .widget",this)},handle_click:function(e){e.preventDefault()}}),M.local_travis.Widget=i,M.local_travis.init_widget=function(e){new i(e)}},"@VERSION@",{requires:["base","node","event"]}); \ No newline at end of file From 88afc00e4738c797c50271a2cd3269e6b1e5a4bf Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Thu, 9 Jul 2020 14:34:33 +0100 Subject: [PATCH 5/7] Rename blackboard-open-source > moodlehq --- composer.json | 2 +- composer.lock | 14 +++++++------- docs/CLI.md | 2 +- docs/Help.md | 6 ++---- docs/TravisFileExplained.md | 2 +- docs/UPGRADE-2.0.md | 8 ++++---- docs/_config.yml | 2 +- docs/index.md | 6 +++--- src/Command/SelfUpdateCommand.php | 2 +- 9 files changed, 21 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index 16772973..48339eb0 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "blackboard-open-source/moodle-plugin-ci", + "name": "moodlehq/moodle-plugin-ci", "description": "Assists with running Moodle plugins in Travis CI", "keywords": ["moodle", "travis", "ci", "testing"], "type": "project", diff --git a/composer.lock b/composer.lock index ad8e8861..67834d24 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": "a70c62378c71990f35e1961d5d4d6b11", + "content-hash": "32e6db45852b062940620273f44ce637", "packages": [ { "name": "composer/ca-bundle", @@ -2920,20 +2920,20 @@ }, { "name": "webmozart/assert", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "9dc4f203e36f2b486149058bade43c851dd97451" + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451", - "reference": "9dc4f203e36f2b486149058bade43c851dd97451", + "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0", + "php": "^5.3.3 || ^7.0 || ^8.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { @@ -2965,7 +2965,7 @@ "check", "validate" ], - "time": "2020-06-16T10:16:42+00:00" + "time": "2020-07-08T17:02:28+00:00" } ], "aliases": [], diff --git a/docs/CLI.md b/docs/CLI.md index f8606e86..efac979a 100644 --- a/docs/CLI.md +++ b/docs/CLI.md @@ -2011,4 +2011,4 @@ Do not ask any interactive question * Accept value: no * Is value required: no * Is multiple: no -* Default: `false` +* Default: `false` \ No newline at end of file diff --git a/docs/Help.md b/docs/Help.md index de575b91..b777208b 100644 --- a/docs/Help.md +++ b/docs/Help.md @@ -24,8 +24,6 @@ changed. Also a good place to look for new goodies. ## Other help -If the above links do not help you, maybe someone -[asked it already](https://github.com/blackboard-open-source/moodle-plugin-ci/issues?q=is%3Aissue%20label%3Aquestion). -If you still cannot find an answer, and Google has failed you as well, then please feel free -to submit an [new issue](https://github.com/blackboard-open-source/moodle-plugin-ci/issues/new) providing +If the above links do not help you, and Google has failed you as well, then please feel free +to submit an [new issue](https://github.com/moodlehq/moodle-plugin-ci/issues/new) providing as many relevant details as possible. diff --git a/docs/TravisFileExplained.md b/docs/TravisFileExplained.md index 054cbe7a..278c6909 100644 --- a/docs/TravisFileExplained.md +++ b/docs/TravisFileExplained.md @@ -3,7 +3,7 @@ layout: page title: Travis CI file explained --- -Below is the [.travis.dist.yml](https://github.com/blackboard-open-source/moodle-plugin-ci/blob/master/.travis.dist.yml) +Below is the [.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml) file but with comments added to explain what each section is doing. For additional help, see [Travis CI's documentation](http://docs.travis-ci.com/user/getting-started/). diff --git a/docs/UPGRADE-2.0.md b/docs/UPGRADE-2.0.md index 28c5586e..71d339ad 100644 --- a/docs/UPGRADE-2.0.md +++ b/docs/UPGRADE-2.0.md @@ -15,7 +15,7 @@ Detailed information about what changed in Version 2 can be found in the [change ## Step 3: Review the Travis CI configuration file -Review the updated [.travis.dist.yml](https://github.com/blackboard-open-source/moodle-plugin-ci/blob/master/.travis.dist.yml) +Review the updated [.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml) and update your `.travis.yml` file in your plugin. For detailed information about the contents of `.travis.dist.yml` file, please see this [help document](TravisFileExplained.md). **Please carefully** review the updated `.travis.dist.yml` as some steps have been removed and others added, like installation of Java 8, @@ -25,7 +25,7 @@ upgrade of NodeJS, etc. ### What is happening to Version 1? -Version 1 still exists in the [v1](https://github.com/blackboard-open-source/moodle-plugin-ci/tree/v1) branch. You can continue +Version 1 still exists in the [v1](https://github.com/moodlehq/moodle-plugin-ci/tree/v1) branch. You can continue to use it, but it is no longer getting new features and may not receive additional updates. In addition, it may start breaking in Moodle 3.2 or later. @@ -53,8 +53,8 @@ env: before_install: # You must install the correct version of this project: - - if [ "$V2" = false ]; then composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^1; fi - - if [ "$V2" = true ]; then composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2; fi + - if [ "$V2" = false ]; then composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^1; fi + - if [ "$V2" = true ]; then composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^2; fi script: # Example of a Version 2 only command: diff --git a/docs/_config.yml b/docs/_config.yml index d5ef7fb0..da93c6f8 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,6 +1,6 @@ title: Moodle Plugin CI description: Moodle plugin + Travis CI -github_username: blackboard-open-source +github_username: moodlehq theme: minima header_pages: - CHANGELOG.md diff --git a/docs/index.md b/docs/index.md index 3ced68f3..d72acece 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In addition, the plugin being tested must have a [version.php](https://docs.mood and `$plugin->component` must be defined within it. If you need to run your plugin in earlier versions of Moodle, then please use Version 1 of this tool. Documentation -and more information about Version 1 can be found in the [v1](https://github.com/blackboard-open-source/moodle-plugin-ci/tree/v1) +and more information about Version 1 can be found in the [v1](https://github.com/moodlehq/moodle-plugin-ci/tree/v1) branch. Please know that Version 1 is no longer getting new features and may not receive additional updates. ## Getting started @@ -47,7 +47,7 @@ run a build to make sure nothing broke. ### Step 2 -Copy the [.travis.dist.yml](https://github.com/blackboard-open-source/moodle-plugin-ci/blob/master/.travis.dist.yml) file into the +Copy the [.travis.dist.yml](https://github.com/moodlehq/moodle-plugin-ci/blob/master/.travis.dist.yml) file into the root of your plugin and rename it to `.travis.yml`. Now might be a good time to review the `.travis.yml` contents and remove anything that is not needed. See this [help document](TravisFileExplained.md) for an explanation about the contents of the this file. Once you have added the `.travis.yml` file, commit and push up to GitHub, to trigger a @@ -87,4 +87,4 @@ Semantic Versioning. ## License This project is licensed under the GNU GPL v3 or later. See the -[LICENSE](https://github.com/blackboard-open-source/moodle-plugin-ci/blob/master/LICENSE) file for details. +[LICENSE](https://github.com/moodlehq/moodle-plugin-ci/blob/master/LICENSE) file for details. diff --git a/src/Command/SelfUpdateCommand.php b/src/Command/SelfUpdateCommand.php index 155dd115..6b9d6296 100644 --- a/src/Command/SelfUpdateCommand.php +++ b/src/Command/SelfUpdateCommand.php @@ -44,7 +44,7 @@ protected function execute(InputInterface $input, OutputInterface $output) } $strategy = new GithubStrategy(); - $strategy->setPackageName('blackboard-open-source/moodle-plugin-ci'); + $strategy->setPackageName('moodlehq/moodle-plugin-ci'); $strategy->setPharName('moodle-plugin-ci.phar'); $strategy->setCurrentLocalVersion($this->getApplication()->getVersion()); $strategy->setStability($stability); From 38eba8cadb6a8e00b50778891746e01628ccbb87 Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Thu, 9 Jul 2020 18:40:27 +0100 Subject: [PATCH 6/7] Bring Deploy stage back for compliance with past releases. --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.travis.yml b/.travis.yml index 770c2207..535b24a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,3 +73,19 @@ jobs: env: MOODLE_BRANCH=MOODLE_37_STABLE - php: 7.2 env: MOODLE_BRANCH=MOODLE_35_STABLE + - stage: Deploy + addons: skip + install: skip + script: skip + before_deploy: + - make build/moodle-plugin-ci.phar + - php build/moodle-plugin-ci.phar list + deploy: + provider: releases + api_key: + secure: $GITHUB_OAUTH_ENCRYPTED_TOKEN + file: build/moodle-plugin-ci.phar + skip_cleanup: true + on: + repo: moodlehq/moodle-plugin-ci + tags: true From 92847e321779f89fb3b6437b99eb46e62f99906e Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Thu, 9 Jul 2020 21:48:17 +0100 Subject: [PATCH 7/7] Make .travis.yml dplv2 compliant. --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 535b24a3..4df29b05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ jobs: include: - stage: Tests php: 7.3 - addons: skip + before_install: skip install: - make init script: @@ -74,7 +74,7 @@ jobs: - php: 7.2 env: MOODLE_BRANCH=MOODLE_35_STABLE - stage: Deploy - addons: skip + before_install: skip install: skip script: skip before_deploy: @@ -82,10 +82,9 @@ jobs: - php build/moodle-plugin-ci.phar list deploy: provider: releases - api_key: - secure: $GITHUB_OAUTH_ENCRYPTED_TOKEN + token: $GITHUB_OAUTH_ENCRYPTED_TOKEN file: build/moodle-plugin-ci.phar - skip_cleanup: true + cleanup: false on: repo: moodlehq/moodle-plugin-ci tags: true