Merge pull request #39 from dof-dss/development

Unity release

Author: DuttonMa

.circleci/config.yml

@@ -1,62 +1,59 @@
-# PHP CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-php/ for more details
 version: 2.1
 
+default_docker_image: &docker_image
+  docker:
+    - image: thecodingmachine/php:8.0-v4-apache-node12
+      environment:
+        PROJECT_ROOT: "/home/docker/project"
+        PHP_EXTENSION_GD: 1
+        PHP_INI_MEMORY_LIMIT: 1g
+
 jobs:
   # Test that coding standards fit drupal.org definitions.
   coding_standards:
-    docker:
-      - image: circleci/php:8.0-apache-browsers
+    <<: *docker_image
     steps:
       - checkout
       - run:
           name: Fetch phpcs and dependencies
           command: |
-            composer require drupal/coder --prefer-stable --no-interaction --optimize-autoloader
+            composer require drupal/coder
             # Move vendor directory up a level as we don't want to code-check all of that.
             mv vendor ../
       - run:
           name: Fetch phpcs convenience script
           command: |
-            curl https://raw.githubusercontent.com/dof-dss/nidirect-drupal/development/phpcs.sh -o /home/circleci/project/phpcs.sh
-            chmod +x /home/circleci/project/phpcs.sh
+            curl https://raw.githubusercontent.com/dof-dss/nidirect-drupal/development/phpcs.sh -o $PROJECT_ROOT/phpcs.sh
+            chmod +x $PROJECT_ROOT/phpcs.sh
       - run:
           name: PHPCS analysis
-          command: /home/circleci/project/phpcs.sh /home/circleci "/home/circleci/project"
+          command: $PROJECT_ROOT/phpcs.sh ~/ "${PROJECT_ROOT}"
 
   deprecated_code:
-    docker:
-      - image: circleci/php:8.0-apache-browsers
+    <<: *docker_image
     steps:
       - checkout:
-          path: /home/circleci/origins_modules
-      - run:
-          name: Add OS and PHP extensions/config
-          command: |
-            sudo cp /home/circleci/origins_modules/.circleci/docker-php-circleci.ini /usr/local/etc/php/conf.d/
-            wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-            sudo apt --allow-releaseinfo-change update
-            sudo apt install -y libpng-dev
-            sudo docker-php-ext-install gd
+          path: ~/nicsdru_unity_modules
       - run:
           name: Fetch latest Drupal version
           command: |
-            cd /home/circleci
-            composer create-project drupal-composer/drupal-project:9.x-dev /home/circleci/project --no-interaction
+            cd $PROJECT_ROOT
+            composer create-project drupal-composer/drupal-project:9.x-dev $PROJECT_ROOT --no-interaction
       - run:
           name: Download dependent contrib modules.
           command: |
-            cd /home/circleci/project
-            composer require drupal/entity_embed mglaman/drupal-check:1.3.0 composer/xdebug-handler:2.0.1 --no-interaction
+            cd $PROJECT_ROOT
+            composer require --no-interaction drupal/core-dev drupal/entity_embed mglaman/drupal-check \
+              drupal/search_api_solr drupal/structure_sync
       - run:
           name: Move custom code into position
-          command: mv /home/circleci/origins_modules /home/circleci/project/web/modules/origins
+          command: |
+            mv ~/nicsdru_unity_modules $PROJECT_ROOT/web/modules/custom
       - run:
           name: Deprecated code check
           command: |
-            cd /home/circleci/project/web
-            ../vendor/bin/drupal-check modules/origins -e "*/tests/*"
+            cd $PROJECT_ROOT/web
+            ../vendor/bin/drupal-check modules/custom
 
 workflows:
   version: 2

.circleci/docker-php-circleci.ini

@@ -4,6 +4,12 @@
   "type": "drupal-module",
   "license": "MIT",
   "require": {
-    "composer/installers": "^1.6"
+    "composer/installers": "^1.9"
+  },
+  "config": {
+    "allow-plugins": {
+        "composer/installers": true,
+        "dealerdirect/phpcodesniffer-composer-installer": true
+    }
   }
 }

composer.json

@@ -7,6 +7,7 @@
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Field\FieldItemListInterface;
 
 /**
  * Implements hook_entity_presave().
@@ -19,8 +20,8 @@ function unity_internal_link_checker_entity_presave(EntityInterface $entity) {
   }
   if ($entity instanceof ContentEntityInterface) {
     if ($entity->hasField('body')) {
-      $body = $entity->get('body')->value;
-      $format = $entity->get('body')->format;
+      $body = $entity->get('body')->value ?? '';
+      $format = $entity->get('body')->format ?? '';
       // Get list of urls to exclude (these have been added at /admin/config/unity_internal_link_checker/link_checker_form).
       $config = \Drupal::config('unity_internal_link_checker.linksettings');
       // Make sure the array items are clean.
@@ -43,7 +44,7 @@ function unity_internal_link_checker_entity_presave(EntityInterface $entity) {
               }
             }
           }
-          $entity->body->setValue(['value' => $body, 'format' => $format]);
+          $entity->set('body', ['value' => $body, 'format' => $format]);
         }
       }
     }
@@ -98,6 +99,8 @@ function unity_internal_link_checker__urls_to_replace(): string {
       $host = $matches[0];
     }
   }
+  // Strip 'www' from hostname.
+  $host = str_replace('www.', '', $host);
   // List all domain protocols and extensions for our platform and local environments.
   $protocols = ['http://', 'http://www.', 'https://', 'https://www.'];
   $extensions = [