Compare commits

...

37 Commits
4 ... 5.2.0-rc1

Author SHA1 Message Date
Guy Sartorelli 555ecd3d67
MNT Update release dependencies 2024-03-25 12:11:23 +13:00
Steve Boyd ac10f7bd37 MNT Update development dependencies 2024-03-05 14:41:14 +13:00
Steve Boyd 48648db803 MNT Update release dependencies 2024-03-05 14:41:11 +13:00
Steve Boyd 2743eb3a13 MNT Update development dependencies 2024-03-05 14:34:16 +13:00
Guy Sartorelli 06c5983dbc
MNT Run module-standardiser (#81) 2024-02-02 14:04:56 +13:00
Guy Sartorelli 9dbd01e704
ENH Add generic types (#79) 2024-01-18 10:21:43 +13:00
Guy Sartorelli e504a22c35
MNT Run module-standardiser (#78) 2023-12-21 16:22:13 +13:00
Guy Sartorelli 13ed3065a6
MNT Update development dependencies 2023-10-16 16:46:55 +13:00
Guy Sartorelli 986e49d211
Merge branch '5.1' into 5 2023-10-16 16:46:55 +13:00
Guy Sartorelli a1f6d4899b
MNT Update development dependencies 2023-10-16 16:23:53 +13:00
Guy Sartorelli 89f5b684de
MNT Update release dependencies 2023-10-16 16:23:49 +13:00
Guy Sartorelli b73369b84c
MNT Update development dependencies 2023-09-19 11:11:06 +12:00
Guy Sartorelli 73d8f2119a
MNT Update release dependencies 2023-09-19 11:11:03 +12:00
Guy Sartorelli 048407ad9a
MNT Update development dependencies 2023-09-01 09:41:26 +12:00
Guy Sartorelli 74a4a59642
MNT Update release dependencies 2023-09-01 09:41:23 +12:00
Guy Sartorelli 15a406f1b5
MNT Update development dependencies 2023-08-31 12:59:01 +12:00
Guy Sartorelli eb0aa9b900
Merge branch '5.0' into 5 2023-08-30 10:37:20 +12:00
Guy Sartorelli 942b0bc29b
Merge pull request #77 from creative-commoners/pulls/5.0/module-standardiser-1693278853
MNT Run module-standardiser
2023-08-29 17:07:49 +12:00
Steve Boyd 8a07c42493 MNT Run module-standardiser 2023-08-29 15:14:13 +12:00
Guy Sartorelli 54bdd6cbdc
Merge pull request #76 from creative-commoners/pulls/5/module-standardiser-1691550241
MNT Run module-standardiser
2023-08-15 12:26:54 +12:00
Steve Boyd 3c8a6ded76 MNT Run module-standardiser 2023-08-14 15:47:05 +12:00
Steve Boyd f7c60ce701 MNT Update development dependencies 2023-05-04 13:26:56 +12:00
Steve Boyd 712e6fcd86 Merge branch '5.0' into 5 2023-05-04 13:26:56 +12:00
Steve Boyd da53fa8ab7 MNT Update development dependencies 2023-05-04 12:35:46 +12:00
Steve Boyd ed2e1b829d MNT Update release dependencies 2023-05-04 12:35:40 +12:00
Guy Sartorelli 432a87efb9
Merge branch '4' into 5.0
# Conflicts:
#	composer.json
2023-04-27 14:38:01 +12:00
Steve Boyd 7355535fe9 MNT Update development dependencies 2023-04-05 14:54:20 +12:00
Steve Boyd 1bfcef461b MNT Update release dependencies 2023-04-05 14:54:16 +12:00
Steve Boyd 2e8e4b8a8a MNT Update development dependencies 2023-04-05 11:54:33 +12:00
Steve Boyd 62d9427773 MNT Update development dependencies 2023-02-09 15:04:32 +13:00
Steve Boyd 30dae8e7da MNT Update release dependencies 2023-02-09 15:04:28 +13:00
Steve Boyd b166df82c8 MNT Update development dependencies 2023-02-09 12:36:37 +13:00
Guy Sartorelli 9c8ca53d16
Merge branch '4' into 5 2023-02-08 15:26:33 +13:00
Guy Sartorelli 7bae3fb781
MNT Remove unnecessary .htaccess file (#65)
This file will be included via recipe-core
2022-12-16 10:06:31 +13:00
Guy Sartorelli 76b312bb42
Merge pull request #60 from creative-commoners/pulls/5/major-deps
DEP Update core dependencies for CMS 5
2022-08-09 10:06:53 +12:00
Guy Sartorelli b61004ebe1
ENH Remove resources-dir config from composer.json (#59) 2022-08-05 13:53:43 +12:00
Steve Boyd 6e7dce8f2e DEP Update core dependencies for CMS 5 2022-08-05 09:41:50 +12:00
11 changed files with 184 additions and 23 deletions

1
.github/ISSUE_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1 @@
<!-- Blank templates are for use by maintainers only! If you aren't a maintainer, please go back and pick one of the issue templates. -->

72
.github/ISSUE_TEMPLATE/1_bug_report.yml vendored Normal file
View File

@ -0,0 +1,72 @@
name: 🪳 Bug Report
description: Tell us if something isn't working the way it's supposed to
body:
- type: markdown
attributes:
value: |
We strongly encourage you to [submit a pull request](https://docs.silverstripe.org/en/contributing/code/) which fixes the issue.
Bug reports which are accompanied with a pull request are a lot more likely to be resolved quickly.
- type: input
id: affected-versions
attributes:
label: Module version(s) affected
description: |
What version of _this module_ have you reproduced this bug on?
Run `composer info` to see the specific version of each module installed in your project.
If you don't have access to that, check inside the help menu in the bottom left of the CMS.
placeholder: x.y.z
validations:
required: true
- type: textarea
id: description
attributes:
label: Description
description: A clear and concise description of the problem
validations:
required: true
- type: textarea
id: how-to-reproduce
attributes:
label: How to reproduce
description: |
⚠️ This is the most important part of the report ⚠️
Without a way to easily reproduce your issue, there is little chance we will be able to help you and work on a fix.
- Please, take the time to show us some code and/or configuration that is needed for others to reproduce the problem easily.
- If the bug is too complex to reproduce with some short code samples, please reproduce it in a public repository and provide a link to the repository along with steps for setting up and reproducing the bug using that repository.
- If part of the bug includes an error or exception, please provide a full stack trace.
- If any user interaction is required to reproduce the bug, please add an ordered list of steps that are required to reproduce it.
- Be as clear as you can, but don't miss any steps out. Simply saying "create a page" is less useful than guiding us through the steps you're taking to create a page, for example.
placeholder: |
#### Code sample
```php
```
#### Reproduction steps
1.
validations:
required: true
- type: textarea
id: possible-solution
attributes:
label: Possible Solution
description: |
*Optional: only if you have suggestions on a fix/reason for the bug*
Please consider [submitting a pull request](https://docs.silverstripe.org/en/contributing/code/) with your solution! It helps get faster feedback and greatly increases the chance of the bug being fixed.
- type: textarea
id: additional-context
attributes:
label: Additional Context
description: "*Optional: any other context about the problem: log messages, screenshots, etc.*"
- type: checkboxes
id: validations
attributes:
label: Validations
description: "Before submitting the issue, please make sure you do the following:"
options:
- label: Check that there isn't already an issue that reports the same bug
required: true
- label: Double check that your reproduction steps work in a fresh installation of [`silverstripe/installer`](https://github.com/silverstripe/silverstripe-installer) (with any code examples you've provided)
required: true

View File

@ -0,0 +1,35 @@
name: 🚀 Feature Request
description: Submit a feature request (but only if you're planning on implementing it)
body:
- type: markdown
attributes:
value: |
Please only submit feature requests if you plan on implementing the feature yourself.
See the [contributing code documentation](https://docs.silverstripe.org/en/contributing/code/#make-or-find-a-github-issue) for more guidelines about submitting feature requests.
- type: textarea
id: description
attributes:
label: Description
description: A clear and concise description of the new feature, and why it belongs in core
validations:
required: true
- type: textarea
id: more-info
attributes:
label: Additional context or points of discussion
description: |
*Optional: Any additional context, points of discussion, etc that might help validate and refine your idea*
- type: checkboxes
id: validations
attributes:
label: Validations
description: "Before submitting the issue, please confirm the following:"
options:
- label: You intend to implement the feature yourself
required: true
- label: You have read the [contributing guide](https://docs.silverstripe.org/en/contributing/code/)
required: true
- label: You strongly believe this feature should be in core, rather than being its own community module
required: true
- label: You have checked for existing issues or pull requests related to this feature (and didn't find any)
required: true

8
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@ -0,0 +1,8 @@
blank_issues_enabled: true
contact_links:
- name: Security Vulnerability
url: https://docs.silverstripe.org/en/contributing/issues_and_bugs/#reporting-security-issues
about: ⚠️ We do not use GitHub issues to track security vulnerability reports. Click "open" on the right to see how to report security vulnerabilities.
- name: Support Question
url: https://www.silverstripe.org/community/
about: We use GitHub issues only to discuss bugs and new features. For support questions, please use one of the support options available in our community channels.

39
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,39 @@
<!--
Thanks for contributing, you're awesome! ⭐
Please read https://docs.silverstripe.org/en/contributing/code/ if you haven't contributed to this project recently.
-->
## Description
<!--
Please describe expected and observed behaviour, and what you're fixing.
For visual fixes, please include tested browsers and screenshots.
-->
## Manual testing steps
<!--
Include any manual testing steps here which a reviewer can perform to validate your pull request works correctly.
Note that this DOES NOT replace unit or end-to-end tests.
-->
## Issues
<!--
List all issues here that this pull request fixes/resolves.
If there is no issue already, create a new one! You must link your pull request to at least one issue.
-->
- #
## Pull request checklist
<!--
PLEASE check each of these to ensure you have done everything you need to do!
If there's something in this list you need help with, please ask so that we can assist you.
-->
- [ ] The target branch is correct
- See [picking the right version](https://docs.silverstripe.org/en/contributing/code/#picking-the-right-version)
- [ ] All commits are relevant to the purpose of the PR (e.g. no debug statements, unrelated refactoring, or arbitrary linting)
- Small amounts of additional linting are usually okay, but if it makes it hard to concentrate on the relevant changes, ask for the unrelated changes to be reverted, and submitted as a separate PR.
- [ ] The commit messages follow our [commit message guidelines](https://docs.silverstripe.org/en/contributing/code/#commit-messages)
- [ ] The PR follows our [contribution guidelines](https://docs.silverstripe.org/en/contributing/code/)
- [ ] Code changes follow our [coding conventions](https://docs.silverstripe.org/en/contributing/coding_conventions/)
- [ ] This change is covered with tests (or tests aren't necessary for this change)
- [ ] Any relevant User Help/Developer documentation is updated; for impactful changes, information is added to the changelog for the intended release
- [ ] CI is green

View File

@ -1,10 +1,10 @@
name: Keepalive
on:
workflow_dispatch:
# The 4th of every month at 10:50am UTC
# At 1:05 PM UTC, on day 14 of the month
schedule:
- cron: '50 10 4 * *'
- cron: '5 13 14 * *'
workflow_dispatch:
jobs:
keepalive:

View File

@ -1,2 +0,0 @@
RewriteEngine On
RewriteRule ^(.*)$ public/$1

View File

@ -1,6 +1,6 @@
BSD 3-Clause License
Copyright (c) 2018, SilverStripe Ltd.
Copyright (c) 2018, Silverstripe Ltd.
All rights reserved.
Redistribution and use in source and binary forms, with or without

View File

@ -4,6 +4,10 @@ namespace {
use SilverStripe\CMS\Controllers\ContentController;
/**
* @template T of Page
* @extends ContentController<T>
*/
class PageController extends ContentController
{
/**

View File

@ -5,29 +5,30 @@
"homepage": "http://silverstripe.org",
"license": "BSD-3-Clause",
"require": {
"php": "^7.4 || ^8.0",
"silverstripe/recipe-plugin": "^1.7",
"silverstripe/recipe-core": "4.x-dev",
"silverstripe/admin": "1.x-dev",
"silverstripe/asset-admin": "1.x-dev",
"silverstripe/campaign-admin": "1.x-dev",
"silverstripe/versioned-admin": "1.x-dev",
"silverstripe/cms": "4.x-dev",
"silverstripe/errorpage": "1.x-dev",
"silverstripe/reports": "4.x-dev",
"silverstripe/siteconfig": "4.x-dev",
"silverstripe/versioned": "1.x-dev",
"silverstripe/graphql": "3.x-dev || 4.x-dev",
"silverstripe/session-manager": "1.x-dev"
"php": "^8.1",
"silverstripe/recipe-plugin": "~2.0.0@stable",
"silverstripe/recipe-core": "~5.2.0@rc",
"silverstripe/admin": "~2.2.0@rc",
"silverstripe/asset-admin": "~2.2.0@rc",
"silverstripe/campaign-admin": "~2.2.0@rc",
"silverstripe/versioned-admin": "~2.2.0@rc",
"silverstripe/cms": "~5.2.0@rc",
"silverstripe/errorpage": "~2.2.0@rc",
"silverstripe/reports": "~5.2.0@rc",
"silverstripe/siteconfig": "~5.2.0@rc",
"silverstripe/versioned": "~2.2.0@rc",
"silverstripe/graphql": "~5.2.0@rc",
"silverstripe/session-manager": "~2.2.0@rc"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
"phpunit/phpunit": "^9.6",
"silverstripe/standards": "^1",
"phpstan/extension-installer": "^1.3"
},
"extra": {
"project-files": [
"app/src/*"
],
"resources-dir": "_resources"
]
},
"config": {
"process-timeout": 600

3
phpstan.neon.dist Normal file
View File

@ -0,0 +1,3 @@
parameters:
paths:
- app/src