Merge branch '10.x-dev' into 10.x

Author: johangant

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 
 default_docker_image: &docker_image
   docker:
-    - image: thecodingmachine/php:8.0-v4-apache-node12
+    - image: thecodingmachine/php:8.2-v4-apache-node12
       environment:
         PROJECT_ROOT: "/home/docker/project"
         PHP_EXTENSION_GD: 1
@@ -38,13 +38,13 @@ jobs:
           name: Fetch latest Drupal version
           command: |
             cd $PROJECT_ROOT
-            composer create-project drupal-composer/drupal-project:9.x-dev $PROJECT_ROOT --no-interaction
+            composer create-project drupal-composer/drupal-project:10.x-dev $PROJECT_ROOT --no-interaction
       - run:
           name: Download dependent contrib modules.
           command: |
             cd $PROJECT_ROOT
             composer require --no-interaction drupal/entity_embed mglaman/drupal-check \
-              drupal/search_api_solr drupal/structure_sync mglaman/phpstan-drupal:1.1.27
+              drupal/search_api_solr drupal/structure_sync -W
       - run:
           name: Move custom code into position
           command: |
@@ -55,9 +55,30 @@ jobs:
             cd $PROJECT_ROOT/web
             ../vendor/bin/drupal-check modules/custom
 
+  disallowed_functions:
+    <<: *docker_image
+    steps:
+      - checkout:
+          path: ~/nicsdru_unity_modules
+      - run:
+          name: Fetch latest Drupal core and other misc composer tools.
+          command: |
+            cd $PROJECT_ROOT
+            composer create-project drupal/recommended-project:10.1.x-dev $PROJECT_ROOT --no-interaction
+            composer require --dev phpstan/extension-installer spaze/phpstan-disallowed-calls
+      - run:
+          name: Move custom code into position
+          command: mv ~/nicsdru_unity_modules $PROJECT_ROOT/web/modules/custom
+      - run:
+          name: Check for disallowed function calls
+          command: |
+            CHECK_DIRS="$CHECK_DIRS ${PROJECT_ROOT}/web/modules/custom"
+            vendor/bin/phpstan analyse $CHECK_DIRS -c $PROJECT_ROOT/web/modules/custom/.circleci/phpstan.neon
+
 workflows:
   version: 2
   static_analysis:
     jobs:
       - coding_standards
       - deprecated_code
+      - disallowed_functions

.circleci/phpstan.neon

@@ -0,0 +1,33 @@
+# phpstan.neon
+
+parameters:
+  fileExtensions:
+    - module
+    - theme
+    - inc
+    - install
+    - profile
+    - engine
+  paths:
+    - src
+  disallowedFunctionCalls:
+    - function: var_dump
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: dump
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: kint
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: ksm
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: die
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: exit
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+  customRulesetUsed: true
+  reportUnmatchedIgnoredErrors: false
+  # Ignore phpstan-drupal extension's rules.
+  ignoreErrors:
+    - '#\Drupal calls should be avoided in classes, use dependency injection instead#'
+    - '#Plugin definitions cannot be altered.#'
+    - '#Missing cache backend declaration for performance.#'
+    - '#Plugin manager has cache backend specified but does not declare cache tags.#'

unity_breadcrumbs/unity_breadcrumbs.module

@@ -58,7 +58,7 @@ function unity_breadcrumbs_system_breadcrumb_alter(Breadcrumb &$breadcrumb, Rout
 
   if ($node instanceof NodeInterface) {
     // Append the page title to the end of Book pages.
-    if ($node->book) {
+    if ($node->get('book')) {
       $request = \Drupal::request();
       $title = \Drupal::service('title_resolver')
         ->getTitle($request, $route_match->getRouteObject());

unity_common/unity_common.module

@@ -133,7 +133,7 @@ function unity_common_preprocess_image_formatter(array &$variables) {
   if ($media_entity instanceof MediaInterface && $media_entity->bundle() === 'document') {
     $file_storage = \Drupal::entityTypeManager()->getStorage('file');
     // Get the underlying file associated with this document entity.
-    $file = $file_storage->load($media_entity->field_media_file->target_id);
+    $file = $file_storage->load($media_entity->get('field_media_file')->target_id);
 
     if ($file instanceof FileInterface === FALSE) {
       return;

unity_file_migrations/src/EventSubscriber/PostMigrationSubscriber.php

@@ -57,7 +57,16 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager,
                               LoggerChannelFactory $logger) {
     $this->entityTypeManager = $entity_type_manager;
     $this->logger = $logger->get('unity_file_migrations');
-    $this->dbConnD7 = Database::getConnection('default', 'liofa7');
+    // Open the Liofa legacy database if we are running inside the Liofa
+    // site and there is a connection to 'liofa7', otherwise just open
+    // 'default' twice and the Liofa check will fail in onMigratePostImport().
+    $legacy_db = 'default';
+    foreach (Database::getAllConnectionInfo() as $key => $targets) {
+      if ($key == 'liofa7') {
+        $legacy_db = $key;
+      }
+    }
+    $this->dbConnD7 = Database::getConnection('default', $legacy_db);
     $this->dbConnD10 = Database::getConnection('default', 'default');
   }
 

unity_file_migrations/src/MigrationProcessors.php

@@ -137,7 +137,7 @@ public function processNodeStatus(int $nid, string $status) {
       // If node was published on D7, make sure that it is published on D8.
       $node = $this->nodeStorage->load($nid);
       if ($node instanceof NodeInterface) {
-        $node->status = 1;
+        $node->set('status', 1);
         $node->set('moderation_state', 'published');
         $node->save();
       }

unity_file_migrations/src/PublicationLinkProcessor.php

@@ -62,11 +62,6 @@ public static function publicationLinks(array $content) {
           $file_target_id = $file->id();
           array_push($file_target_ids, $file_target_id);
         }
-        // This is handy for debugging if the filename doesn't match.
-        else {
-          var_dump('Nid: ' . $nid . ' filename: ' . $embedded_file_name);
-        }
-
       }
     }
     // Return the file ID's and load them into the media field.