Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Silverstripe 5.3 compatibility #8

Merged
merged 3 commits into from
Dec 11, 2024
Merged

Silverstripe 5.3 compatibility #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8200a0
feat: rename file to match classname
Cambis Dec 9, 2024
0061341
feat: complete annotations for TaxonomyTerm
Cambis Dec 9, 2024
6bba1a0
feat: update types for TaxonomyTrait
Cambis Dec 9, 2024
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
4 changes: 3 additions & 1 deletion src/Model/TaxonomyTerm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
* Represents a single taxonomy term. Can be re-ordered in the CMS, and the default sorting is to use the order as
* specified in the CMS.
*
* @property string $Name
* @property ?string $Name
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some existing annotations, added the remaining for completeness

* @property int $Sort
* @property bool $Protected
* @method TaxonomyType Type()
* @property int $TypeID
*/
class TaxonomyTerm extends DataObject implements PermissionProvider
Expand Down
0 src/Tasks/TruncateTaxonomyTask.php → src/Tasks/ClearTaxonomyTask.php
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions src/Traits/TaxonomyTrait.php
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should resolve #6

Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ trait TaxonomyTrait
/**
* Helper to find a taxonomy type either by ID or name
*
* @param int|String $type
* @return TaxonomyType
* @param int|string $type
* @return ?TaxonomyType
*/
public static function findTaxonomyType($type)
{
Expand All @@ -27,8 +27,8 @@ public static function findTaxonomyType($type)
/**
* Return taxonomy terms for a type specified as a string
*
* @param string $type
* @return DataList
* @param int|string $type
* @return ArrayList<TaxonomyTerm>|DataList<TaxonomyTerm>
*/
public static function getTermsForType($type)
{
Expand Down