Commit cff44fab authored by narendraR's avatar narendraR Committed by Tim Plunkett
Browse files

Issue #3274701 by narendraR, tim.plunkett: Project Browser not compatible with D10

parent 8850220f

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
    "prefer-stable": true,

    "require": {

        "php": ">=7.3",

        "guzzlehttp/guzzle": "^6",

        "guzzlehttp/guzzle": "^6 || ^7",

        "composer/semver": "^3.2",

        "kevinrob/guzzle-cache-middleware": "^3.3",

        "doctrine/cache": "^1.10",

drupalci.yml

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ build: 
          - sed -i "s/--exclude=vendor/--exclude=vendor --exclude=commit-code-check.sh/" modules/contrib/project_browser/commit-code-check.sh

          # When constructing $FILES, exclude files `sveltejs/*`.

          - sed -i "s/git diff --name-only HEAD~1 HEAD/git diff --name-only HEAD~1 HEAD '\:\!\:sveltejs\/**'/" modules/contrib/project_browser/commit-code-check.sh

          # vendor/bin/phpcs now needs to be prefixed. And $TOP_LEVEL/vendor needs to be rewritten.

          - sed -i "s/vendor\/bin\/phpcs/\/var\/www\/html\/vendor\/bin\/phpcs/" modules/contrib/project_browser/commit-code-check.sh

          # vendor/bin now needs to be prefixed. And $TOP_LEVEL/vendor needs to be rewritten.

          - sed -i "s/vendor\/bin/\/var\/www\/html\/vendor\/bin/" modules/contrib/project_browser/commit-code-check.sh

          - sed -i "s/\$TOP_LEVEL\/vendor/\/var\/www\/html\/vendor/" modules/contrib/project_browser/commit-code-check.sh

          # Stop not requiring ES6 files for core's Nightwatch tests, instead don't for *our* Nightwatch tests.

          - sed -i "s/\^core\/tests\/Drupal\/Nightwatch/\^tests\/src\/Nightwatch/" modules/contrib/project_browser/commit-code-check.sh

src/Controller/BrowserController.php

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Drupal\project_browser\Controller; 


use Drupal\Core\Controller\ControllerBase;

use Drupal\Core\Extension\InfoParserException;

use Drupal\Core\Extension\ModuleExtensionList;



/**

 * Defines a controller to provide the Project Browser UI.
@@ -56,7 +57,7 @@ class BrowserController extends ControllerBase { 
      // The module list needs to be reset so that it can re-scan and include

      // any new modules that may have been added directly into the filesystem.

      $modules = $module_service->reset()->getList();

      uasort($modules, 'system_sort_modules_by_info_name');

      uasort($modules, [ModuleExtensionList::class, 'sortByName']);

    }

    catch (InfoParserException $e) {

      $this->messenger()->addError($this->t('Modules could not be listed due to an error: %error', ['%error' => $e->getMessage()]));