and rebase run entire contrib

� Conflicts: � .travis.yml
mglaman · May 12, 2021 · 2d31a27 · 2d31a27
1 parent 86cf7cf
commit 2d31a27
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -114,6 +114,13 @@ jobs:
           cd ~/drupal
           COMPOSER_MEMORY_LIMIT=-1 composer require drupal/token drupal/blazy
           ./vendor/bin/phpstan analyze web/modules/contrib/blazy --no-progress || if (($? == 255)); then false; else true; fi
+          COMPOSER_MEMORY_LIMIT=-1 composer remove drupal/token drupal/blazy
+      - name: 'Check "Cannot redeclare video_embed_media_media_bundle_insert()"'
+        run: |
+          cd ~/drupal
+          COMPOSER_MEMORY_LIMIT=-1 composer require drupal/video_embed_field drupal/slick
+          ./vendor/bin/phpstan analyze web/modules/contrib --no-progress || if (($? == 255)); then false; else true; fi
+          COMPOSER_MEMORY_LIMIT=-1 composer remove drupal/video_embed_field drupal/slick
   build_integration_no_phpunit:
     continue-on-error: ${{ matrix.experimental }}
     runs-on: "ubuntu-latest"

diff --git a/src/Drupal/DrupalAutoloader.php b/src/Drupal/DrupalAutoloader.php
@@ -91,9 +91,7 @@ public function register(Container $container): void
 
         $this->moduleData = array_merge($this->extensionDiscovery->scan('module'), $profiles);
         usort($this->moduleData, static function (Extension $a, Extension $b) {
-            // revert for test.
-            return $a->getName() === 'blazy_test' ? 10 : 0;
-            // return strpos($a->getName(), '_test') !== false ? 10 : 0;
+            return strpos($a->getName(), '_test') !== false ? 10 : 0;
         });
         $this->themeData = $this->extensionDiscovery->scan('theme');
         $this->addTestNamespaces();