ENH Add generic types (#94)

This commit is contained in:
Guy Sartorelli 2024-01-19 10:58:29 +13:00 committed by GitHub
parent 5071f0e449
commit b7b4ff8fbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 12 deletions

View File

@ -13,10 +13,13 @@ use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\View\Parsers\HtmlDiff; use SilverStripe\View\Parsers\HtmlDiff;
use SilverStripe\CMS\Model\SiteTree; use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Versioned\Versioned_Version;
/**
* @extends Extension<SiteTree&static>
*/
class VersionFeed extends SiteTreeExtension class VersionFeed extends SiteTreeExtension
{ {
private static $db = array( private static $db = array(
'PublicHistory' => 'Boolean(true)' 'PublicHistory' => 'Boolean(true)'
); );
@ -68,7 +71,7 @@ class VersionFeed extends SiteTreeExtension
* @param int $highestVersion Top version number to consider. * @param int $highestVersion Top version number to consider.
* @param int $limit Limit to the amount of items returned. * @param int $limit Limit to the amount of items returned.
* *
* @returns ArrayList List of cleaned records. * @return ArrayList<Versioned_Version> List of cleaned records.
*/ */
public function getDiffList($highestVersion = null, $limit = 100) public function getDiffList($highestVersion = null, $limit = 100)
{ {
@ -156,7 +159,7 @@ class VersionFeed extends SiteTreeExtension
* Return a single diff representing this version. * Return a single diff representing this version.
* Returns the initial version if there is nothing to compare to. * Returns the initial version if there is nothing to compare to.
* *
* @return DataObject|null Object with relevant fields diffed. * @return Versioned_Version|null Object with relevant fields diffed.
*/ */
public function getDiff() public function getDiff()
{ {

View File

@ -11,11 +11,15 @@ use SilverStripe\ORM\DB;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\ArrayList;
use SilverStripe\CMS\Model\SiteTree; use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Control\Controller;
use SilverStripe\Core\Convert; use SilverStripe\Core\Convert;
use SilverStripe\View\Requirements; use SilverStripe\View\Requirements;
use SilverStripe\Core\Extension; use SilverStripe\Core\Extension;
use SilverStripe\VersionFeed\Filters\ContentFilter; use SilverStripe\VersionFeed\Filters\ContentFilter;
/**
* @extends Extension<Controller&static>
*/
class VersionFeedController extends Extension class VersionFeedController extends Extension
{ {
private static $allowed_actions = array( private static $allowed_actions = array(

View File

@ -7,13 +7,15 @@ use SilverStripe\Forms\CheckboxField;
use SilverStripe\Forms\FieldGroup; use SilverStripe\Forms\FieldGroup;
use SilverStripe\Forms\FieldList; use SilverStripe\Forms\FieldList;
use SilverStripe\ORM\DataExtension; use SilverStripe\ORM\DataExtension;
use SilverStripe\SiteConfig\SiteConfig;
/** /**
* Allows global configuration of all changes * Allows global configuration of all changes
*
* @extends DataExtension<SiteConfig>
*/ */
class VersionFeedSiteConfig extends DataExtension class VersionFeedSiteConfig extends DataExtension
{ {
private static $db = array( private static $db = array(
'AllChangesEnabled' => 'Boolean(true)' 'AllChangesEnabled' => 'Boolean(true)'
); );