Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove problematic dependency injection #2

Merged
merged 13 commits into from
Aug 18, 2022
Merged

Remove problematic dependency injection #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e15c2cc
Remove dependency injection that is causing issues with config_transl…
pyrello Aug 17, 2022
e5d7aa4
Update composer.json to handle Composer 2.2 authorized plugins change.
pyrello Aug 17, 2022
9dd06e5
Moving composer change to test composer.json.
pyrello Aug 17, 2022
1d2038f
Adding another allow-plugin exception.
pyrello Aug 17, 2022
9d734be
Another entry.
pyrello Aug 17, 2022
4da9dce
Adding another required entry.
pyrello Aug 17, 2022
172a32a
Syntax error.
pyrello Aug 17, 2022
66aa86e
PHPCS.
pyrello Aug 17, 2022
1fec73a
Trying to pin the version of drupal-check.
pyrello Aug 17, 2022
c410494
Trying to pin the version of drupal-check more precisely.
pyrello Aug 17, 2022
f6146f5
Trying a different way of locking drupal-check.
pyrello Aug 17, 2022
8dc2f00
One more attempt.
pyrello Aug 17, 2022
548d4d7
Trying the last known version.
pyrello Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions src/ConfigOverride/SamlauthOverride.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,11 @@
use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Config\ConfigFactoryOverrideInterface;
use Drupal\Core\Config\StorageInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;

/**
* Samlauth configuration overrides.
*/
class SamlauthOverride implements ConfigFactoryOverrideInterface {
/**
* The entity_type.manager service.
*
* @var \Drupal\Core\Entity\EntityTypeManagerInterface
*/
protected $entityTypeManager;

/**
* {@inheritdoc}
*/
public function __construct(EntityTypeManagerInterface $entityTypeManager) {
$this->entityTypeManager = $entityTypeManager;
}

/**
* {@inheritdoc}
Expand All @@ -34,7 +20,7 @@ public function loadOverrides($names) {
// Allow all roles to be linkable.
if (in_array('samlauth.authentication', $names)) {

$roles = $this->entityTypeManager->getStorage('user_role')->loadMultiple();
$roles = \Drupal::service('entity_type.manager')->getStorage('user_role')->loadMultiple();
$allowed = [];

/** @var \Drupal\user\Entity\Role $role */
Expand Down
10 changes: 9 additions & 1 deletion tests/build/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"symfony/phpunit-bridge": "^5.2",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
"drupal/coder": "^8.3",
"mglaman/drupal-check": "^1.1",
"mglaman/drupal-check": "~1.3.1",
"oomphinc/composer-installers-extender": "^2.0",
"phpspec/prophecy-phpunit": "^2.0"
},
Expand Down Expand Up @@ -50,5 +50,13 @@
"Drupal\\uiowa_auth\\": "docroot/modules/custom/uiowa_auth/src/",
"Drupal\\Tests\\uiowa_auth\\": "docroot/modules/custom/uiowa_auth/tests/"
}
},
"config": {
"allow-plugins": {
"composer/installers": true,
"drupal/core-composer-scaffold": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"oomphinc/composer-installers-extender": true
}
}
}
1 change: 0 additions & 1 deletion uiowa_auth.services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ services:
- { name: event_subscriber }
uiowa_auth.samlauth_override:
class: Drupal\uiowa_auth\ConfigOverride\SamlauthOverride
arguments: [ '@entity_type.manager' ]
tags:
- { name: config.factory.override }