Skip to content

Commit 2d31a27

Browse files
committed
and rebase run entire contrib
� Conflicts: � .travis.yml
1 parent 86cf7cf commit 2d31a27

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/php.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,13 @@ jobs:
114114
cd ~/drupal
115115
COMPOSER_MEMORY_LIMIT=-1 composer require drupal/token drupal/blazy
116116
./vendor/bin/phpstan analyze web/modules/contrib/blazy --no-progress || if (($? == 255)); then false; else true; fi
117+
COMPOSER_MEMORY_LIMIT=-1 composer remove drupal/token drupal/blazy
118+
- name: 'Check "Cannot redeclare video_embed_media_media_bundle_insert()"'
119+
run: |
120+
cd ~/drupal
121+
COMPOSER_MEMORY_LIMIT=-1 composer require drupal/video_embed_field drupal/slick
122+
./vendor/bin/phpstan analyze web/modules/contrib --no-progress || if (($? == 255)); then false; else true; fi
123+
COMPOSER_MEMORY_LIMIT=-1 composer remove drupal/video_embed_field drupal/slick
117124
build_integration_no_phpunit:
118125
continue-on-error: ${{ matrix.experimental }}
119126
runs-on: "ubuntu-latest"

src/Drupal/DrupalAutoloader.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@ public function register(Container $container): void
9191

9292
$this->moduleData = array_merge($this->extensionDiscovery->scan('module'), $profiles);
9393
usort($this->moduleData, static function (Extension $a, Extension $b) {
94-
// revert for test.
95-
return $a->getName() === 'blazy_test' ? 10 : 0;
96-
// return strpos($a->getName(), '_test') !== false ? 10 : 0;
94+
return strpos($a->getName(), '_test') !== false ? 10 : 0;
9795
});
9896
$this->themeData = $this->extensionDiscovery->scan('theme');
9997
$this->addTestNamespaces();

0 commit comments

Comments
 (0)