Skip to content

Commit

Permalink
Move enlightn/security-checker to "suggest" (#5078)
Browse files Browse the repository at this point in the history
* Move enlightn/security-checker to "suggest"

* Update to grasmash/expander 2.0.1

* Prepare for league/container ^4

* Can't have more than one test class named CoreTest

* Update dependencies

* Maybe this might fix Drupal 10, maybe it might break other versions.

* Code style

* Rename test class

* The function "module_load_install()" was marked as deprecated in Drupal 9.4,
and will be removed in Drupal 10.0.0.  See https://www.drupal.org/node/3220952
for more information.

This commit implements a call to ModuleHandler::loadInclude() instead.

* Install enlightn/security-checker for Windows tests. Skip security checker tests on Drupal 10.

* Stop using deprecated drupal_get_installed_schema_version when new replacement update hook registry service is available.

* Put update script name into a method

* Avoid using drupal_set_installed_schema_version, removed in Drupal 10

* Code style

* Fix update to requirements check implementation.

* Code style

* Update dependencies and remove an optional backslash

* Correctly skip security tests on Drupal 10

Co-authored-by: Lisa Ridley <lisa@codementality.com>
  • Loading branch information
greg-1-anderson and lhridley committed Feb 21, 2022
1 parent 4011628 commit d3deb23
Show file tree
Hide file tree
Showing 13 changed files with 327 additions and 304 deletions.
4 changes: 3 additions & 1 deletion .circleci/config.yml
Expand Up @@ -18,7 +18,8 @@ test_74_steps: &test74steps
steps:
- checkout
- run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
- run: composer -n install
- run: composer -n require enlightn/security-checker --no-update
- run: composer -n update
- run: mkdir -p /tmp/results
- run: composer -n lint
- run: composer -n unit -- --log-junit /tmp/results/unit.junit.xml
Expand Down Expand Up @@ -103,6 +104,7 @@ jobs:
- run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
- run: composer -n require --dev drupal/core-recommended:9.2.8 --no-update
- run: composer -n require symfony/polyfill-php80:"1.23 as 1.20" --no-update
- run: composer -n require enlightn/security-checker --no-update
- run: php --version
- run: composer -n update
- run: composer -n phpunit -- --testsuite integration --filter=testInsecureDrupalPackage --stop-on-skipped
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Expand Up @@ -55,6 +55,7 @@ install:
- php -r "readfile('http://getcomposer.org/installer');" | php
#Install dependencies via Composer
- php composer.phar install --prefer-dist -n
- php composer.phar require enlightn/security-checker -n
- SET PATH=%APPVEYOR_BUILD_FOLDER%;%APPVEYOR_BUILD_FOLDER%/vendor/bin;%PATH%
# Uncomment this and on_finish line below to enable RDP into build machine https://www.appveyor.com/docs/how-to/rdp-to-build-worker/
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
Expand Down
10 changes: 6 additions & 4 deletions composer.json
Expand Up @@ -37,12 +37,11 @@
"consolidation/annotated-command": "^4.5",
"consolidation/config": "^2",
"consolidation/filter-via-dot-access-data": "^2",
"consolidation/robo": "^3",
"consolidation/robo": "^3.0.9",
"consolidation/site-alias": "^3.1.3",
"consolidation/site-process": "^4.1.3",
"enlightn/security-checker": "^1",
"consolidation/site-process": "^4.1.3 || ^5",
"guzzlehttp/guzzle": "^6.3 || ^7.0",
"league/container": "^3.4",
"league/container": "^3.4 || ^4",
"psr/log": "~1.0",
"psy/psysh": "~0.11",
"symfony/event-dispatcher": "^4.0 || ^5.0 || ^6.0",
Expand All @@ -65,6 +64,9 @@
"vlucas/phpdotenv": "^2.4",
"yoast/phpunit-polyfills": "^0.2.0"
},
"suggest": {
"enlightn/security-checker": "Required to use pm:security command"
},
"conflict": {
"drupal/core": "< 9.2",
"drupal/migrate_run": "*",
Expand Down

0 comments on commit d3deb23

Please sign in to comment.