diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4344f4d6..2dcee84a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
build:
working_directory: ~/project
docker:
- - image: cimg/php:8.1.18-browsers
+ - image: cimg/php:8.3-browsers
- image: cimg/mysql:5.7
command: --max_allowed_packet=16M
environment:
diff --git a/defaults.yml b/defaults.yml
index c0add94b..2baf9021 100644
--- a/defaults.yml
+++ b/defaults.yml
@@ -259,7 +259,7 @@ phpmd:
# Output format for phpmd.
format: text
# Comma-separated list of ruleset paths or names.
- rulesets: "${build.thebuild.dir}/defaults/standard/phpmd.xml"
+ rulesets: "${build.dir}/phpmd.xml"
# File extensions to review.
suffixes: php,inc,module,theme,profile,install,test
diff --git a/defaults/install/.circleci/config.yml b/defaults/install/.circleci/config.yml
index aa2064a4..64267d6f 100644
--- a/defaults/install/.circleci/config.yml
+++ b/defaults/install/.circleci/config.yml
@@ -9,7 +9,7 @@ jobs:
build:
working_directory: ~/${projectname}
docker:
- - image: cimg/php:8.1-browsers
+ - image: cimg/php:8.3-browsers
- image: cimg/mysql:5.7
command: --max_allowed_packet=16M
environment:
@@ -20,7 +20,7 @@ jobs:
environment:
- PALANTIR_ENVIRONMENT: circleci
- DRUPAL_ROOT: ${drupal.root}
- - NODE_VERSION: 8
+ - NODE_VERSION: 18
steps:
- run:
@@ -50,10 +50,11 @@ jobs:
name: Configure URL in /etc/hosts
command: echo 127.0.0.1 ${CIRCLE_PROJECT_REPONAME}.local | sudo tee -a /etc/hosts
- # Composer package cache
+ # Package cache
- restore_cache:
keys:
- - composer-v1-
+ - package-cache-v1-
+
# Source cache
- restore_cache:
keys:
@@ -64,15 +65,19 @@ jobs:
- run:
name: Composer install
command: composer install --no-interaction --prefer-dist
+ - run:
+ name: Yarn install
+ command: yarn install
- # Composer package cache - update when the contents of the Composer cache directory
- # change
- - run: ls -1R ~/.cache/composer/ > /tmp/composer-cache.txt
+ # Package cache. This is updated when the contents of the ~/.cache directory change.
+ # Both Composer and Yarn use this directory.
+ - run: ls -1R ~/.cache/ > /tmp/package-cache.txt
- save_cache:
- key: composer-v1-{{ checksum "/tmp/composer-cache.txt" }}
+ key: package-cache-v1-{{ checksum "/tmp/package-cache.txt" }}
paths:
- - ~/.cache/composer
- # Source cache - update when branch changes
+ - ~/.cache
+
+ # Source cache. This is updated for each different branch.
- save_cache:
key: source-v1-{{ .Branch }}
paths:
diff --git a/defaults/install/.circleci/deploy-acquia-example b/defaults/install/.circleci/deploy-acquia-example
index aab77b5a..0ac6a61f 100644
--- a/defaults/install/.circleci/deploy-acquia-example
+++ b/defaults/install/.circleci/deploy-acquia-example
@@ -21,9 +21,9 @@
deploy:
working_directory: ~/project
docker:
- - image: cimg/php:8.1-browsers
+ - image: cimg/php:8.3-browsers
environment:
- - NODE_VERSION: 8
+ - NODE_VERSION: 18
- GITHUB_PUBKEY: "github.com,192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="
- ACQUIA_PUBKEY: "svn-23450.prod.hosting.acquia.com,54.245.120.237 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDit0Rj8j59i9Gj2vOg2TXjIbPswIc27PwncapyBLi9R3FtECXq+md1BfykBJjME83m78CtqkTlWwNZu+LyhF+IYlshKo82JXQzV4kWwi5L9H7KpdyFDMDLVCNVYmU4EQY9ngRq1cwbMBYsfWxv4sSlbsvZv2C8U7luNoc4SiBY4sGpgiMJLFOHWRw6YvhOamLTKfxSoJUT8uRbfkamxas1EK21XjvrdUSN0Bf5LmTdvs/9iIaUH4AlYr0SW0tc2IbIuoFVxuvSzZj2GJjmtCcW1poDMQLTGq+EuO4Mk1WyoUSJC9L8CFonKH7++EPHopvIbPMinO4r2zLEot3lL5TH"
diff --git a/defaults/install/.circleci/deploy-pantheon.example b/defaults/install/.circleci/deploy-pantheon.example
index 544f0073..72f1598f 100644
--- a/defaults/install/.circleci/deploy-pantheon.example
+++ b/defaults/install/.circleci/deploy-pantheon.example
@@ -24,9 +24,9 @@
deploy:
working_directory: ~/project
docker:
- - image: cimg/php:8.1-browsers
+ - image: cimg/php:8.3-browsers
environment:
- - NODE_VERSION: 8
+ - NODE_VERSION: 18
- GITHUB_PUBKEY: "github.com,192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="
- PANTHEON_PUBKEY: "[codeserver.dev.56f20816-b4b7-4517-a90f-667b4785708d.drush.in]:2222,[35.193.151.123]:2222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSY3gnr0DrbqJJSnEFy6jazDmAdBm4Zs/EkWIQa7x31qgSYyYJMz5V+pk62lBf2BN42VtubwO83vW9G+yG2K1RGOvZJaK5GBvBb/Ws2ZPcp/4sNHpPzkdd75e5/Pk8AWA59XUbJcBWmrDrHMbWV1j2zqPPikxbqGeTTjSx4QR18LIRei5OwT6VQnaVnJqPAqFZ+oCbpr0DL96foL3UEY8EWT/6GH2cANEGZO4ppbhdDw4uG6TaI7S0lxWMQEVy+iwjCNH/nanjd73cwoYd90E0OVdgNDr3hVbIuE6sUW6UwlaAwuyOM/xJYPg1y0rF66958pyVJlZ9KD5A0kY3bHg7"
diff --git a/defaults/install/.platform.app.yaml b/defaults/install/.platform.app.yaml
index 85c86f91..cc15d342 100644
--- a/defaults/install/.platform.app.yaml
+++ b/defaults/install/.platform.app.yaml
@@ -3,7 +3,7 @@
# - https://github.com/platformsh/platformsh-example-drupal8/blob/master/.platform.app.yaml
name: 'app'
-type: 'php:7.2'
+type: 'php:8.3'
relationships:
database: 'mysqldb:mysql'
diff --git a/defaults/install/build.xml b/defaults/install/build.xml
index 192329a9..cdb6ca2c 100644
--- a/defaults/install/build.xml
+++ b/defaults/install/build.xml
@@ -121,9 +121,8 @@
-
-
-
+
+
@@ -150,7 +149,7 @@
-
+
@@ -163,28 +162,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/defaults/install/phpmd.xml b/defaults/install/phpmd.xml
new file mode 100644
index 00000000..c1a66cfc
--- /dev/null
+++ b/defaults/install/phpmd.xml
@@ -0,0 +1,78 @@
+
+
+
+ A PMD Ruleset for Drupal coding standards.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/targets/drupal.xml b/targets/drupal.xml
index b69405ce..aef4d1b6 100644
--- a/targets/drupal.xml
+++ b/targets/drupal.xml
@@ -296,12 +296,9 @@ Or, you can specify the export file directly:
the_build_utility
-
-
-
-
the_build_utility
+ standard
@@ -318,49 +315,6 @@ Or, you can specify the export file directly:
-
-
-
-
-
- core.extension
- profile
-
-
-
-
-
- core.extension
- module.${current_profile}
-
-
-
-
-
-
-
- core.extension
- module.${current_profile}
-
-
-
-
-
-
- core.extension
- module.${new_profile}
- 1000
-
-
-
-
- core.extension
- profile
- ${new_profile}
-
-
-
-
diff --git a/targets/install.xml b/targets/install.xml
index 4d342313..76c4901f 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -224,6 +224,27 @@
+
+ Updating phpmd.xml file for project root.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+