Skip to content

Commit

Permalink
Merge pull request #821 from creative-commoners/pulls/7/module-standa…
Browse files Browse the repository at this point in the history
…rdiser-1706667883

MNT Run module-standardiser
  • Loading branch information
GuySartorelli authored Feb 12, 2024
2 parents 599479d + ebf89ad commit 34a32b2
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 6 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/dispatch-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Dispatch CI

on:
# At 8:40 PM UTC, only on Saturday and Sunday
schedule:
- cron: '40 20 * * 6,0'

jobs:
dispatch-ci:
name: Dispatch CI
# Only run cron on the tractorcow-farm account
if: (github.event_name == 'schedule' && github.repository_owner == 'tractorcow-farm') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1
17 changes: 17 additions & 0 deletions .github/workflows/update-js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Update JS

on:
workflow_dispatch:
# Run on a schedule of once per quarter
schedule:
- cron: '40 20 1 */3 *'

jobs:
update-js:
name: Update JS
# Only run cron on the tractorcow-farm account
if: (github.event_name == 'schedule' && github.repository_owner == 'tractorcow-farm') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Update JS
uses: silverstripe/gha-update-js@v1
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@
"silverstripe/cms": "Localise pages"
},
"require-dev": {
"silverstripe/recipe-testing": "^3"
"silverstripe/recipe-testing": "^3",
"silverstripe/standards": "^1",
"phpstan/extension-installer": "^1.3"
},
"extra": {
"branch-alias": {
Expand Down
3 changes: 3 additions & 0 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
parameters:
paths:
- src
4 changes: 2 additions & 2 deletions src/Extension/FluentFilteredExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\GridField\GridFieldConfig;
use SilverStripe\ORM\DataExtension;
use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataQuery;
use SilverStripe\ORM\ManyManyList;
use SilverStripe\ORM\Queries\SQLSelect;
use SilverStripe\Versioned\Versioned;
use TractorCow\Fluent\Extension\Traits\FluentObjectTrait;
Expand All @@ -17,7 +17,7 @@
use TractorCow\Fluent\State\FluentState;

/**
* @method DataList|Locale[] FilteredLocales()
* @method ManyManyList<Locale> FilteredLocales()
*
* @extends DataExtension<DataObject&static>
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Model/Domain.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/**
* @property string $Domain
* @property int $DefaultLocaleID
* @method HasManyList Locales()
* @method HasManyList<Locale> Locales()
*/
class Domain extends DataObject
{
Expand Down
4 changes: 2 additions & 2 deletions src/Model/Locale.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\HasManyList;
use SilverStripe\ORM\ManyManyList;
use SilverStripe\ORM\ManyManyThroughList;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
use SilverStripe\Security\PermissionProvider;
Expand All @@ -44,7 +44,7 @@
* @property bool $UseDefaultCode
* @property string $Timezone
* @method HasManyList<FallbackLocale> FallbackLocales()
* @method ManyManyList<Locale> Fallbacks()
* @method ManyManyThroughList<Locale> Fallbacks()
* @method Domain Domain() Raw SQL Domain (unfiltered by domain mode)
*/
class Locale extends DataObject implements PermissionProvider
Expand Down

0 comments on commit 34a32b2

Please sign in to comment.