Merge branch '4.7' into exclude-phpsessions

craftcms · Jan 23, 2024 · daac132 · daac132
2 parents a098bd2 + cb276fb
commit daac132
Show file tree

Hide file tree

Showing 354 changed files with 8,795 additions and 2,668 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -23,17 +23,15 @@ comment: off
 github_checks:
   annotations: false
 ignore:
-  - 'src/web/assets'
-  - 'src/test/internal'
+  - 'bootstrap'
+  - 'lib'
   - 'src/config'
   - 'src/icons'
-  - 'src/test/internal'
   - 'src/migrations'
   - 'src/templates'
+  - 'src/test/internal'
   - 'src/translations'
   - 'src/views'
   - 'src/web/assets'
-  - 'bootstrap'
-  - 'lib'
   - 'tests'
   - 'vendor'
diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT-V5.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT-V5.yml
@@ -0,0 +1,60 @@
+name: Bug Report – Craft 5
+description: Report an issue or unexpected behavior pertaining to Craft 5
+title: '[5.x]: '
+labels:
+  - bug
+  - craft5
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to submit a bug report! Please fill out the fields to the best of your knowledge, so we can get to the bottom of the issue as quickly as possible.
+  - type: textarea
+    id: body
+    attributes:
+      label: What happened?
+      value: |
+        ### Description
+
+
+
+        ### Steps to reproduce
+
+        1.
+
+        ### Expected behavior
+
+
+
+        ### Actual behavior
+
+    validations:
+      required: true
+  - type: input
+    id: cmsVersion
+    attributes:
+      label: Craft CMS version
+    validations:
+      required: true
+  - type: input
+    id: phpVersion
+    attributes:
+      label: PHP version
+  - type: input
+    id: os
+    attributes:
+      label: Operating system and version
+  - type: input
+    id: db
+    attributes:
+      label: Database type and version
+  - type: input
+    id: imageDriver
+    attributes:
+      label: Image driver and version
+  - type: textarea
+    id: plugins
+    attributes:
+      label: Installed plugins and versions
+      value: |
+        -
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,9 +4,8 @@ on:
   push:
     branches:
       - develop
+      - '4.7'
   pull_request:
-    types:
-      - opened
 permissions:
   contents: read
 concurrency:

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -35,6 +35,14 @@ jobs:
           php-version: 8.0.2
           tools: composer:v2
 
+      - name: 'Set up PHP for Craft 5'
+        uses: shivammathur/setup-php@2.23.0
+        if: ${{ startsWith(github.event.client_payload.version, '5.') }}
+        with:
+          extensions: bcmath, curl, dom, json, intl, mbstring, mcrypt, openssl, pcre, pdo, zip
+          php-version: 8.2.0
+          tools: composer:v2
+
       - name: 'Initialize Craft 3 starter project'
         if: ${{ startsWith(github.event.client_payload.version, '3.') }}
         run: 'composer create-project craftcms/craft=^1 ${{ env.PROJECT_DIRECTORY }}'
@@ -43,6 +51,10 @@ jobs:
         if: ${{ startsWith(github.event.client_payload.version, '4.') }}
         run: 'composer create-project craftcms/craft ${{ env.PROJECT_DIRECTORY }}'
 
+      - name: 'Initialize Craft 5 starter project'
+        if: ${{ startsWith(github.event.client_payload.version, '5.') }}
+        run: 'composer create-project craftcms/craft=^5.0.0-alpha.1 ${{ env.PROJECT_DIRECTORY }}'
+
       - name: 'Install specific Craft version'
         working-directory: ${{ env.PROJECT_DIRECTORY }}
         run: 'composer require craftcms/cms:${{ github.event.client_payload.version }} --update-with-dependencies'
@@ -61,6 +73,13 @@ jobs:
           sed -i 's/CRAFT_SECURITY_KEY=.*/CRAFT_SECURITY_KEY=/g' .env
           sed -i 's/CRAFT_APP_ID=.*/CRAFT_APP_ID=/g' .env
 
+      - name: 'Update Craft 5 .env'
+        if: ${{ startsWith(github.event.client_payload.version, '5.') }}
+        working-directory: ${{ env.PROJECT_DIRECTORY }}
+        run: |
+          sed -i 's/CRAFT_SECURITY_KEY=.*/CRAFT_SECURITY_KEY=/g' .env
+          sed -i 's/CRAFT_APP_ID=.*/CRAFT_APP_ID=/g' .env
+
       - name: 'Create zip'
         working-directory: ${{ env.PROJECT_DIRECTORY }}
         run: 'zip -r ../${{ env.BUNDLE_ZIP_FILENAME }} ./'

diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
@@ -0,0 +1,21 @@
+# Release Notes for Craft CMS 4.7 (WIP)
+
+### Content Management
+- Admin tables now have sticky footers. ([#14149](https://github.com/craftcms/cms/pull/14149))
+
+### Administration
+- Added “Save and continue editing” actions to all core settings pages with full-page forms. ([#14168](https://github.com/craftcms/cms/discussions/14168))
+- It’s no longer possible to select the temp asset volume within Assets fields. ([#11405](https://github.com/craftcms/cms/issues/11405), [#14141](https://github.com/craftcms/cms/pull/14141))
+- Added the `utils/prune-orphaned-matrix-blocks` command. ([#14154](https://github.com/craftcms/cms/pull/14154))
+
+### Extensibility
+- Added `craft\base\ElementInterface::beforeDeleteForSite()`.
+- Added `craft\base\ElementInterface::afterDeleteForSite()`.
+- Added `craft\base\FieldInterface::beforeElementDeleteForSite()`.
+- Added `craft\base\FieldInterface::afterElementDeleteForSite()`.
+
+### System
+- Reduced the system font file size, and prevented the flash of unstyled type for it. ([#13879](https://github.com/craftcms/cms/pull/13879))
+- Log message timestamps are now set to the system time zone. ([#13341](https://github.com/craftcms/cms/issues/13341))
+- Selectize inputs now use the `auto_position` plugin. ([#14160](https://github.com/craftcms/cms/pull/14160))
+- Fixed a bug where deleting an entry for a site wasn’t propagating to Matrix blocks for that entry/site. ([#13948](https://github.com/craftcms/cms/issues/13948))