Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ddev/config.quickstart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Recipe for AZ Quickstart local development
type: php
docroot: web
php_version: "8.4"
php_version: "8.5"
webserver_type: nginx-fpm

# Default application ports
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'
- name: composer version
run: composer --version
- name: composer validate
Expand All @@ -59,7 +59,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'
- name: Find the push source branch name
if: github.event_name != 'pull_request'
run: |
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
steps:
- uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'
tools: cs2pr, phpcs
- uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
Expand All @@ -153,7 +153,7 @@ jobs:
steps:
- uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'
tools: cs2pr, phpstan
- uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
steps:
- uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'
extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, soap, intl, gd, exif, iconv
- uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
Expand Down Expand Up @@ -289,7 +289,7 @@ jobs:
steps:
- uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'
extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, soap, intl, gd, exif, iconv
- uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
Expand Down Expand Up @@ -321,6 +321,7 @@ jobs:
curl -sS -o /dev/null http://127.0.0.1:8080/news
curl -sS -o /dev/null http://127.0.0.1:8080/calendar
curl -sS -o /dev/null http://127.0.0.1:8080/pages/annual-events
$GITHUB_WORKSPACE/az-quickstart-scaffolding/vendor/bin/drush -n watchdog:show --count=100 --type=php || true
if [ -z "$($GITHUB_WORKSPACE/az-quickstart-scaffolding/vendor/bin/drush -n watchdog:show --count=100 --type=php)" ]; then echo "No PHP notices/errors logged."; else echo "PHP notices/errors found in log." >&2 && exit 1; fi

upgrade-status:
Expand All @@ -339,7 +340,7 @@ jobs:
steps:
- uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'
extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, soap, intl, gd, exif, iconv
tools: cs2pr
- uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/review-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'

- name: Install Terminus and authenticate Terminus
uses: pantheon-systems/terminus-github-actions@8e024bd89ff46ed2aa4e0663c6b54c87a94344f8 # v1.2.7
Expand All @@ -35,7 +35,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'

- name: Set up SSH
run: |
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'

- name: Set up SSH
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'
- name: Find the push source branch name
if: ${{ github.event_name != 'pull_request' }}
run: echo "AZ_TRIMMED_REF=${GITHUB_REF#refs/*/}" >> ${GITHUB_ENV}
Expand Down
2 changes: 1 addition & 1 deletion .lando.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: az_quickstart
recipe: drupal11
config:
php: '8.4'
php: '8.5'
via: apache:2.4
webroot: web
database: mariadb:11.4
Expand Down
2 changes: 1 addition & 1 deletion .tugboat/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:

webserver:
image: tugboatqa/php:8.4-apache
image: tugboatqa/php:8.5-apache
default: true
depends: database
environment:
Expand Down
15 changes: 13 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,11 @@
"Fix PHP 8.4 nullable type deprecations (3518553)": "https://www.drupal.org/files/issues/2025-11-26/3518553-fix-php-8.4-3.patch"
},
"drupal/entity_embed": {
"Drupal 10.5/11.2 compatability (tooltip broken, cannot edit embedded entities) (3531672)": "https://www.drupal.org/files/issues/2025-08-08/entity_embed--fix-ckeditor-icon-reference--3531672-22.patch"
"Drupal 10.5/11.2 compatability (tooltip broken, cannot edit embedded entities) (3531672)": "https://www.drupal.org/files/issues/2025-08-08/entity_embed--fix-ckeditor-icon-reference--3531672-22.patch",
"Using null as an array offset is deprecated in PHP 8.5 (3577405)": "https://www.drupal.org/files/issues/2026-03-06/3577405-mr66-5.patch"
},
"drupal/google_tag": {
"PHP 8.5: Method SplObjectStorage::contains() is deprecated since 8.5 (3560958)": "https://www.drupal.org/files/issues/2026-03-06/3560958-mr129-11.patch"
},
"drupal/image_widget_crop": {
"Can't save image widget crop settings (ImmutableConfigException) (3491004)": "https://www.drupal.org/files/issues/2025-03-06/image_widget_crop_fix.patch",
Expand All @@ -222,6 +226,9 @@
"entity_lookup plugin fails if $value is empty (2830058)": "https://www.drupal.org/files/issues/2022-10-11/migrate_plus-lookup-2830058-10.patch",
"Using the XML Data Parser with a Predicate pulls in the final xml item regardless of if the predicate matches (2891964)": "https://www.drupal.org/files/issues/fix-ignored-predicate-2891964-2.patch"
},
"drupal/pathauto": {
"Deprecated error with PHP 8.5 on entity forms without pathauto patterns (3579655)": "https://www.drupal.org/files/issues/2026-04-13/pathauto-3579655-11-fix-deprecation-errors-on-8-1-14.patch"
},
"drupal/role_delegation": {
"Restrict access to cancel/remove accounts with non-assignable roles (3299201)": "https://www.drupal.org/files/issues/2022-07-25/3299201-4.patch"
},
Expand All @@ -240,7 +247,8 @@
"Content is assigned to wrong menu level if user does not have access to the current level (3187152)": "https://www.drupal.org/files/issues/2023-09-26/3187152-workbench_access-menu-default-20.patch"
},
"drupal/xmlsitemap": {
"Module incorrectly assumes string, triggering PHP 8 fatal error (3355204)": "https://www.drupal.org/files/issues/2023-04-19/3355204_metatag_2.patch"
"Module incorrectly assumes string, triggering PHP 8 fatal error (3355204)": "https://www.drupal.org/files/issues/2023-04-19/3355204_metatag_2.patch",
"Using null as an array offset is deprecated in PHP 8.5 (3571583)": "https://www.drupal.org/files/issues/2026-03-06/3571583-mr76-10.patch"
},
"npm-asset/slick-carousel": {
"Incompatibility with Drupal 11/jQuery 4 (3467129)": "https://www.drupal.org/files/issues/2025-02-17/compatibility_jQuery_4.patch"
Expand All @@ -250,6 +258,9 @@
},
"renanbr/bibtex-parser": {
"Parser performance issue": "https://gist.githubusercontent.com/tadean/39b90d00cd3edfff7c5653f907e15721/raw/8feb59cb4447b0f667fe5f4936a25c4d30211e1b/renanbr_bibtex_parser_performance.patch"
},
"seboettg/citeproc-php": {
"Switch to explicit nullable types (seboettg/citeproc-php#195)": "https://gist.githubusercontent.com/joeparsons/b7e598fe332a9f96aa5e74d47c0af7c0/raw/82e8268c196b082b281be3be84784e3c6c78ce55/seboettg-citeproc-php-195.diff"
}
},
"drupal-scaffold": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<?php

namespace Drupal\Tests\az_flexible_page\Functional;

use Drupal\Tests\az_core\Functional\QuickstartFunctionalTestBase;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;

/**
* Run tests of paragraph bundles.
*/
#[Group('az_flexible_page')]
#[RunTestsInSeparateProcesses]
class FlexiblePageTest extends QuickstartFunctionalTestBase {

use ContentTypeCreationTrait;

/**
* The profile to install as a basis for testing.
*
* @var string
*/
protected $profile = 'az_quickstart';

/**
* @var bool
*/
protected $strictConfigSchema = FALSE;

/**
* @var string
*/
protected $defaultTheme = 'az_barrio';

/**
* Modules to enable.
*
* @var string[]
*/
protected static $modules = [
'az_paragraphs',
'az_paragraphs_html',
'az_paragraphs_text',
'az_flexible_page',
'node',
];

/**
* A user with permission to work with pages.
*
* @var \Drupal\user\UserInterface
*/
protected $user;

/**
* {@inheritdoc}
*/
protected function setUp(): void {
parent::setUp();

// Set up our initial permissions.
$this->user = $this->drupalCreateUser([
'create az_flexible_page content',
]);

$this->drupalLogin($this->user);
}

/**
* Test the process of creating a flexible page node.
*/
public function testFlexiblePageCreation() {
$this->drupalGet('node/add/az_flexible_page');
$this->assertSession()->statusCodeEquals(200);
$this->assertSession()->addressEquals('node/add/az_flexible_page');
// Create a Flexible page.
$edit = [];
$edit['title[0][value]'] = $this->randomMachineName(8);
$this->drupalGet('node/add/az_flexible_page');
$this->submitForm($edit, 'Save');

// Check that the Flexible page has been created.
$this->assertSession()->pageTextContains('Page ' . $edit['title[0][value]'] . ' has been created.');

// Check that the Flexible page exists in the database.
$node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
$this->assertNotEmpty($node, 'Flexible page found in database.');

// Verify that Flexible page loads with the correct title.
$this->drupalGet('node/' . $node->id());
$this->assertSession()->pageTextContains($edit['title[0][value]']);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/**
* Tests the Quickstart Global Footer.
*/
#[Group('az_migration')]
#[Group('az_global_footer')]
#[RunTestsInSeparateProcesses]
class MigrateExceptionsTest extends BrowserTestBase {
Expand Down Expand Up @@ -41,9 +42,8 @@ class MigrateExceptionsTest extends BrowserTestBase {

/**
* Tests that the Quickstart Global Footer module can be installed.
*
* @group regression
*/
#[Group('regression')]
public function testGlobalFooterMigration() {
// Install the az_global_footer module.
$this->container
Expand Down
1 change: 0 additions & 1 deletion modules/custom/az_publication/az_publication.install
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ function az_publication_update_1020702() {
// Normally this is a protected value so we must use reflection.
$rc = new \ReflectionClass($field_storage_definitions[$field_name]);
$schema_property = $rc->getProperty('schema');
$schema_property->setAccessible(TRUE);
Comment thread
joeparsons marked this conversation as resolved.
$schema = $schema_property->getValue($field_storage_definitions[$field_name]);
$schema['columns']['value']['length'] = $field_length;
$schema_property->setValue($field_storage_definitions[$field_name], $schema);
Expand Down
4 changes: 2 additions & 2 deletions modules/custom/az_publication/az_publication.module
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ function _az_publication_publication_date_object(EntityInterface $entity) {
$slices = 2;
break;

default;
default:
$slices = 3;
break;
}
Expand Down Expand Up @@ -640,7 +640,7 @@ function _az_publication_form_revisions(array &$form, FormStateInterface $form_s
$placeholder = 'YYYY';
break;

default;
default:
$format = 'Y-m-d';
$viewmode = 'default';
$placeholder = 'YYYY-MM-DD';
Expand Down
2 changes: 1 addition & 1 deletion phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ parameters:
paragraphs_type:
class: Drupal\paragraphs\Entity\ParagraphsType

phpVersion: 80300
phpVersion: 80500
level: 2