From 3cacb43934eaaf10ecafaca7ae9af61d8b1651b9 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 19 Dec 2016 16:26:29 +1300 Subject: [PATCH] Update composer constraint, branch alias, namespace and add editorconfig --- .editorconfig | 26 ++++++ composer.json | 82 ++++++++++--------- .../GridFieldAddExistingSearchButton.php | 8 +- .../GridFieldAddExistingSearchHandler.php | 4 +- {code => src}/GridFieldAddNewInlineButton.php | 8 +- {code => src}/GridFieldAddNewMultiClass.php | 4 +- .../GridFieldAddNewMultiClassHandler.php | 2 +- {code => src}/GridFieldEditableColumns.php | 4 +- {code => src}/GridFieldExtensions.php | 2 +- {code => src}/GridFieldExternalLink.php | 2 +- {code => src}/GridFieldOrderableRows.php | 4 +- {code => src}/GridFieldRequestHandler.php | 2 +- {code => src}/GridFieldTitleHeader.php | 4 +- .../GridFieldAddExistingSearchButton.ss | 0 .../GridFieldAddExistingSearchHandler.ss | 0 .../GridFieldAddNewInlineButton.ss | 0 .../GridFieldAddNewInlineRow.ss | 0 .../GridFieldAddNewMultiClass.ss | 0 .../GridFieldExternalLink.ss | 0 .../GridFieldOrderableRowsDragHandle.ss | 0 .../GridFieldRequestHandler.ss | 0 .../GridFieldTitleHeader.ss | 0 tests/GridFieldAddNewMultiClassTest.php | 2 +- tests/GridFieldOrderableRowsTest.php | 4 +- 24 files changed, 92 insertions(+), 66 deletions(-) create mode 100644 .editorconfig rename {code => src}/GridFieldAddExistingSearchButton.php (88%) rename {code => src}/GridFieldAddExistingSearchHandler.php (94%) rename {code => src}/GridFieldAddNewInlineButton.php (92%) rename {code => src}/GridFieldAddNewMultiClass.php (98%) rename {code => src}/GridFieldAddNewMultiClassHandler.php (92%) rename {code => src}/GridFieldEditableColumns.php (98%) rename {code => src}/GridFieldExtensions.php (91%) rename {code => src}/GridFieldExternalLink.php (97%) rename {code => src}/GridFieldOrderableRows.php (99%) rename {code => src}/GridFieldRequestHandler.php (98%) rename {code => src}/GridFieldTitleHeader.php (84%) rename templates/SilverStripe/{Forms/GridField => GridFieldExtensions}/GridFieldAddExistingSearchButton.ss (100%) rename templates/SilverStripe/{Forms/GridField => GridFieldExtensions}/GridFieldAddExistingSearchHandler.ss (100%) rename templates/SilverStripe/{Forms/GridField => GridFieldExtensions}/GridFieldAddNewInlineButton.ss (100%) rename templates/SilverStripe/{Forms/GridField => GridFieldExtensions}/GridFieldAddNewInlineRow.ss (100%) rename templates/SilverStripe/{Forms/GridField => GridFieldExtensions}/GridFieldAddNewMultiClass.ss (100%) rename templates/SilverStripe/{Forms/GridField => GridFieldExtensions}/GridFieldExternalLink.ss (100%) rename templates/{ => SilverStripe/GridFieldExtensions}/GridFieldOrderableRowsDragHandle.ss (100%) rename templates/SilverStripe/{Forms/GridField => GridFieldExtensions}/GridFieldRequestHandler.ss (100%) rename templates/SilverStripe/{Forms/GridField => GridFieldExtensions}/GridFieldTitleHeader.ss (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..2be6131 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,26 @@ +# For more information about the properties used in +# this file, please see the EditorConfig documentation: +# http://editorconfig.org/ + +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.yml] +indent_size = 2 +indent_style = space + +[{.travis.yml,package.json}] +# The indent size used in the `package.json` file cannot be changed +# https://github.com/npm/npm/pull/3180#issuecomment-16336516 +indent_size = 2 +indent_style = space \ No newline at end of file diff --git a/composer.json b/composer.json index 8764453..9235195 100644 --- a/composer.json +++ b/composer.json @@ -1,42 +1,44 @@ { - "name": "silverstripe-australia/gridfieldextensions", - "description": "A collection of useful grid field components", - "type": "silverstripe-module", - "homepage": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions", - "keywords": ["silverstripe", "gridfield"], - "license": "BSD-3-Clause", - "authors": [ - { - "name": "Andrew Short", - "email": "andrewjshort@gmail.com" - }, - { - "name": "Marcus Nyeholt", - "email": "marcus@silverstripe.com.au" - } - ], - "support": { - "issues": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions/issues" - }, - "require": { - "silverstripe/framework": "4.0.0-alpha3 as 3.4.1" - }, - "extra": { - "installer-name": "gridfieldextensions", - "branch-alias": { - "dev-master": "1.4.x-dev" - }, - "screenshots": [ - "docs/en/_images/editable-rows.png", - "docs/en/_images/add-existing-search.png" - ] - }, - "replace": { - "ajshort/silverstripe-gridfieldextensions": "self.version" - }, - "autoload": { - "psr-4": {"SilverStripe\\Forms\\GridField\\": "code/"} - }, - "prefer-stable": true, - "minimum-stability": "dev" + "name": "silverstripe-australia/gridfieldextensions", + "description": "A collection of useful grid field components", + "type": "silverstripe-module", + "homepage": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions", + "keywords": ["silverstripe", "gridfield"], + "license": "BSD-3-Clause", + "authors": [ + { + "name": "Andrew Short", + "email": "andrewjshort@gmail.com" + }, + { + "name": "Marcus Nyeholt", + "email": "marcus@silverstripe.com.au" + } + ], + "support": { + "issues": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions/issues" + }, + "require": { + "silverstripe/framework": "~4.0" + }, + "extra": { + "installer-name": "gridfieldextensions", + "branch-alias": { + "dev-master": "2.0.x-dev" + }, + "screenshots": [ + "docs/en/_images/editable-rows.png", + "docs/en/_images/add-existing-search.png" + ] + }, + "replace": { + "ajshort/silverstripe-gridfieldextensions": "self.version" + }, + "autoload": { + "psr-4": { + "SilverStripe\\GridFieldExtensions\\": "src/" + } + }, + "prefer-stable": true, + "minimum-stability": "dev" } diff --git a/code/GridFieldAddExistingSearchButton.php b/src/GridFieldAddExistingSearchButton.php similarity index 88% rename from code/GridFieldAddExistingSearchButton.php rename to src/GridFieldAddExistingSearchButton.php index c6a47c4..77788a9 100755 --- a/code/GridFieldAddExistingSearchButton.php +++ b/src/GridFieldAddExistingSearchButton.php @@ -1,6 +1,6 @@ fragment => $data->renderWith('GridFieldAddExistingSearchButton'), + $this->fragment => $data->renderWith('SilverStripe\\GridFieldExtensions\\GridFieldAddExistingSearchButton'), ); } diff --git a/code/GridFieldAddExistingSearchHandler.php b/src/GridFieldAddExistingSearchHandler.php similarity index 94% rename from code/GridFieldAddExistingSearchHandler.php rename to src/GridFieldAddExistingSearchHandler.php index 33b0a68..e6ec15f 100644 --- a/code/GridFieldAddExistingSearchHandler.php +++ b/src/GridFieldAddExistingSearchHandler.php @@ -1,6 +1,6 @@ renderWith('GridFieldAddExistingSearchHandler'); + return $this->renderWith('SilverStripe\\GridFieldExtensions\\GridFieldAddExistingSearchHandler'); } public function add($request) { diff --git a/code/GridFieldAddNewInlineButton.php b/src/GridFieldAddNewInlineButton.php similarity index 92% rename from code/GridFieldAddNewInlineButton.php rename to src/GridFieldAddNewInlineButton.php index 6074da2..aa2cc38 100755 --- a/code/GridFieldAddNewInlineButton.php +++ b/src/GridFieldAddNewInlineButton.php @@ -1,6 +1,6 @@ renderWith('GridFieldAddNewInlineRow'); + return $columns->renderWith('SilverStripe\\GridFieldExtensions\\GridFieldAddNewInlineRow'); } public function handleSave(GridField $grid, DataObjectInterface $record) { @@ -152,9 +152,9 @@ class GridFieldAddNewInlineButton implements GridField_HTMLProvider, GridField_S $class = $grid->getModelClass(); /** @var GridFieldEditableColumns $editable */ - $editable = $grid->getConfig()->getComponentByType('GridFieldEditableColumns'); + $editable = $grid->getConfig()->getComponentByType('SilverStripe\\GridFieldExtensions\\GridFieldEditableColumns'); /** @var GridFieldOrderableRows $sortable */ - $sortable = $grid->getConfig()->getComponentByType('GridFieldOrderableRows'); + $sortable = $grid->getConfig()->getComponentByType('SilverStripe\\GridFieldExtensions\\GridFieldOrderableRows'); $form = $editable->getForm($grid, $record); if(!singleton($class)->canCreate()) { diff --git a/code/GridFieldAddNewMultiClass.php b/src/GridFieldAddNewMultiClass.php similarity index 98% rename from code/GridFieldAddNewMultiClass.php rename to src/GridFieldAddNewMultiClass.php index 0b0945a..55cd1b1 100755 --- a/code/GridFieldAddNewMultiClass.php +++ b/src/GridFieldAddNewMultiClass.php @@ -1,6 +1,6 @@ defaultClass); - if (Config::inst()->get('GridFieldAddNewMultiClass', 'showEmptyString')) { + if (Config::inst()->get(__CLASS__, 'showEmptyString')) { $field->setEmptyString(_t('GridFieldExtensions.SELECTTYPETOCREATE', '(Select type to create)')); } $field->addExtraClass('no-change-track'); diff --git a/code/GridFieldAddNewMultiClassHandler.php b/src/GridFieldAddNewMultiClassHandler.php similarity index 92% rename from code/GridFieldAddNewMultiClassHandler.php rename to src/GridFieldAddNewMultiClassHandler.php index e30dc6a..b554ac8 100644 --- a/code/GridFieldAddNewMultiClassHandler.php +++ b/src/GridFieldAddNewMultiClassHandler.php @@ -1,6 +1,6 @@ getConfig()->getComponentByType('GridFieldOrderableRows'); + $sortable = $grid->getConfig()->getComponentByType('SilverStripe\\GridFieldExtensions\\GridFieldOrderableRows'); $form = $this->getForm($grid, $record); diff --git a/code/GridFieldExtensions.php b/src/GridFieldExtensions.php similarity index 91% rename from code/GridFieldExtensions.php rename to src/GridFieldExtensions.php index c6aa7e2..ed6bc95 100644 --- a/code/GridFieldExtensions.php +++ b/src/GridFieldExtensions.php @@ -1,6 +1,6 @@ customise(array( 'SortField' => $sortField - ))->renderWith('GridFieldOrderableRowsDragHandle'); + ))->renderWith('SilverStripe\\GridFieldExtensions\\GridFieldOrderableRowsDragHandle'); } public function getColumnAttributes($grid, $record, $col) { diff --git a/code/GridFieldRequestHandler.php b/src/GridFieldRequestHandler.php similarity index 98% rename from code/GridFieldRequestHandler.php rename to src/GridFieldRequestHandler.php index 26f013e..a6a74c5 100644 --- a/code/GridFieldRequestHandler.php +++ b/src/GridFieldRequestHandler.php @@ -1,6 +1,6 @@ $cols->renderWith('GridFieldTitleHeader'), + 'header' => $cols->renderWith(__CLASS__) ); } diff --git a/templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchButton.ss b/templates/SilverStripe/GridFieldExtensions/GridFieldAddExistingSearchButton.ss similarity index 100% rename from templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchButton.ss rename to templates/SilverStripe/GridFieldExtensions/GridFieldAddExistingSearchButton.ss diff --git a/templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchHandler.ss b/templates/SilverStripe/GridFieldExtensions/GridFieldAddExistingSearchHandler.ss similarity index 100% rename from templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchHandler.ss rename to templates/SilverStripe/GridFieldExtensions/GridFieldAddExistingSearchHandler.ss diff --git a/templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineButton.ss b/templates/SilverStripe/GridFieldExtensions/GridFieldAddNewInlineButton.ss similarity index 100% rename from templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineButton.ss rename to templates/SilverStripe/GridFieldExtensions/GridFieldAddNewInlineButton.ss diff --git a/templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineRow.ss b/templates/SilverStripe/GridFieldExtensions/GridFieldAddNewInlineRow.ss similarity index 100% rename from templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineRow.ss rename to templates/SilverStripe/GridFieldExtensions/GridFieldAddNewInlineRow.ss diff --git a/templates/SilverStripe/Forms/GridField/GridFieldAddNewMultiClass.ss b/templates/SilverStripe/GridFieldExtensions/GridFieldAddNewMultiClass.ss similarity index 100% rename from templates/SilverStripe/Forms/GridField/GridFieldAddNewMultiClass.ss rename to templates/SilverStripe/GridFieldExtensions/GridFieldAddNewMultiClass.ss diff --git a/templates/SilverStripe/Forms/GridField/GridFieldExternalLink.ss b/templates/SilverStripe/GridFieldExtensions/GridFieldExternalLink.ss similarity index 100% rename from templates/SilverStripe/Forms/GridField/GridFieldExternalLink.ss rename to templates/SilverStripe/GridFieldExtensions/GridFieldExternalLink.ss diff --git a/templates/GridFieldOrderableRowsDragHandle.ss b/templates/SilverStripe/GridFieldExtensions/GridFieldOrderableRowsDragHandle.ss similarity index 100% rename from templates/GridFieldOrderableRowsDragHandle.ss rename to templates/SilverStripe/GridFieldExtensions/GridFieldOrderableRowsDragHandle.ss diff --git a/templates/SilverStripe/Forms/GridField/GridFieldRequestHandler.ss b/templates/SilverStripe/GridFieldExtensions/GridFieldRequestHandler.ss similarity index 100% rename from templates/SilverStripe/Forms/GridField/GridFieldRequestHandler.ss rename to templates/SilverStripe/GridFieldExtensions/GridFieldRequestHandler.ss diff --git a/templates/SilverStripe/Forms/GridField/GridFieldTitleHeader.ss b/templates/SilverStripe/GridFieldExtensions/GridFieldTitleHeader.ss similarity index 100% rename from templates/SilverStripe/Forms/GridField/GridFieldTitleHeader.ss rename to templates/SilverStripe/GridFieldExtensions/GridFieldTitleHeader.ss diff --git a/tests/GridFieldAddNewMultiClassTest.php b/tests/GridFieldAddNewMultiClassTest.php index 0f1aa2f..3deb4ef 100644 --- a/tests/GridFieldAddNewMultiClassTest.php +++ b/tests/GridFieldAddNewMultiClassTest.php @@ -2,7 +2,7 @@ use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\TestOnly; -use SilverStripe\Forms\GridField\GridField; +use SilverStripe\GridFieldExtensions\GridField; /** * Tests for {@link GridFieldAddNewMultiClass}. diff --git a/tests/GridFieldOrderableRowsTest.php b/tests/GridFieldOrderableRowsTest.php index d55c619..272526c 100644 --- a/tests/GridFieldOrderableRowsTest.php +++ b/tests/GridFieldOrderableRowsTest.php @@ -2,8 +2,8 @@ use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\TestOnly; -use SilverStripe\Forms\GridField\GridField; -use SilverStripe\Forms\GridField\GridFieldConfig_RelationEditor; +use SilverStripe\GridFieldExtensions\GridField; +use SilverStripe\GridFieldExtensions\GridFieldConfig_RelationEditor; use SilverStripe\ORM\DataObject; /**