Update composer constraint, branch alias, namespace and add editorconfig

This commit is contained in:
Robbie Averill 2016-12-19 16:26:29 +13:00
parent 59f44984b8
commit 3cacb43934
24 changed files with 92 additions and 66 deletions

26
.editorconfig Normal file
View File

@ -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

View File

@ -1,42 +1,44 @@
{ {
"name": "silverstripe-australia/gridfieldextensions", "name": "silverstripe-australia/gridfieldextensions",
"description": "A collection of useful grid field components", "description": "A collection of useful grid field components",
"type": "silverstripe-module", "type": "silverstripe-module",
"homepage": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions", "homepage": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions",
"keywords": ["silverstripe", "gridfield"], "keywords": ["silverstripe", "gridfield"],
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"authors": [ "authors": [
{ {
"name": "Andrew Short", "name": "Andrew Short",
"email": "andrewjshort@gmail.com" "email": "andrewjshort@gmail.com"
}, },
{ {
"name": "Marcus Nyeholt", "name": "Marcus Nyeholt",
"email": "marcus@silverstripe.com.au" "email": "marcus@silverstripe.com.au"
} }
], ],
"support": { "support": {
"issues": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions/issues" "issues": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions/issues"
}, },
"require": { "require": {
"silverstripe/framework": "4.0.0-alpha3 as 3.4.1" "silverstripe/framework": "~4.0"
}, },
"extra": { "extra": {
"installer-name": "gridfieldextensions", "installer-name": "gridfieldextensions",
"branch-alias": { "branch-alias": {
"dev-master": "1.4.x-dev" "dev-master": "2.0.x-dev"
}, },
"screenshots": [ "screenshots": [
"docs/en/_images/editable-rows.png", "docs/en/_images/editable-rows.png",
"docs/en/_images/add-existing-search.png" "docs/en/_images/add-existing-search.png"
] ]
}, },
"replace": { "replace": {
"ajshort/silverstripe-gridfieldextensions": "self.version" "ajshort/silverstripe-gridfieldextensions": "self.version"
}, },
"autoload": { "autoload": {
"psr-4": {"SilverStripe\\Forms\\GridField\\": "code/"} "psr-4": {
}, "SilverStripe\\GridFieldExtensions\\": "src/"
"prefer-stable": true, }
"minimum-stability": "dev" },
"prefer-stable": true,
"minimum-stability": "dev"
} }

View File

@ -1,6 +1,6 @@
<?php <?php
namespace SilverStripe\Forms\GridField; namespace SilverStripe\GridFieldExtensions;
use SilverStripe\Forms\GridField\GridField_HTMLProvider; use SilverStripe\Forms\GridField\GridField_HTMLProvider;
use SilverStripe\Forms\GridField\GridField_URLHandler; use SilverStripe\Forms\GridField\GridField_URLHandler;
@ -11,9 +11,7 @@ use SilverStripe\View\ArrayData;
* A modal search dialog which uses search context to search for and add * A modal search dialog which uses search context to search for and add
* existing records to a grid field. * existing records to a grid field.
*/ */
class GridFieldAddExistingSearchButton implements class GridFieldAddExistingSearchButton implements GridField_HTMLProvider, GridField_URLHandler {
GridField_HTMLProvider,
GridField_URLHandler {
private static $allowed_actions = array( private static $allowed_actions = array(
'handleSearch' 'handleSearch'
@ -90,7 +88,7 @@ class GridFieldAddExistingSearchButton implements
)); ));
return array( return array(
$this->fragment => $data->renderWith('GridFieldAddExistingSearchButton'), $this->fragment => $data->renderWith('SilverStripe\\GridFieldExtensions\\GridFieldAddExistingSearchButton'),
); );
} }

View File

@ -1,6 +1,6 @@
<?php <?php
namespace SilverStripe\Forms\GridField; namespace SilverStripe\GridFieldExtensions;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Control\RequestHandler; use SilverStripe\Control\RequestHandler;
@ -46,7 +46,7 @@ class GridFieldAddExistingSearchHandler extends RequestHandler {
} }
public function index() { public function index() {
return $this->renderWith('GridFieldAddExistingSearchHandler'); return $this->renderWith('SilverStripe\\GridFieldExtensions\\GridFieldAddExistingSearchHandler');
} }
public function add($request) { public function add($request) {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace SilverStripe\Forms\GridField; namespace SilverStripe\GridFieldExtensions;
use SilverStripe\Core\Convert; use SilverStripe\Core\Convert;
use SilverStripe\Core\Object; use SilverStripe\Core\Object;
@ -139,7 +139,7 @@ class GridFieldAddNewInlineButton implements GridField_HTMLProvider, GridField_S
))); )));
} }
return $columns->renderWith('GridFieldAddNewInlineRow'); return $columns->renderWith('SilverStripe\\GridFieldExtensions\\GridFieldAddNewInlineRow');
} }
public function handleSave(GridField $grid, DataObjectInterface $record) { public function handleSave(GridField $grid, DataObjectInterface $record) {
@ -152,9 +152,9 @@ class GridFieldAddNewInlineButton implements GridField_HTMLProvider, GridField_S
$class = $grid->getModelClass(); $class = $grid->getModelClass();
/** @var GridFieldEditableColumns $editable */ /** @var GridFieldEditableColumns $editable */
$editable = $grid->getConfig()->getComponentByType('GridFieldEditableColumns'); $editable = $grid->getConfig()->getComponentByType('SilverStripe\\GridFieldExtensions\\GridFieldEditableColumns');
/** @var GridFieldOrderableRows $sortable */ /** @var GridFieldOrderableRows $sortable */
$sortable = $grid->getConfig()->getComponentByType('GridFieldOrderableRows'); $sortable = $grid->getConfig()->getComponentByType('SilverStripe\\GridFieldExtensions\\GridFieldOrderableRows');
$form = $editable->getForm($grid, $record); $form = $editable->getForm($grid, $record);
if(!singleton($class)->canCreate()) { if(!singleton($class)->canCreate()) {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace SilverStripe\Forms\GridField; namespace SilverStripe\GridFieldExtensions;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Control\HTTPResponse_Exception; use SilverStripe\Control\HTTPResponse_Exception;
@ -204,7 +204,7 @@ class GridFieldAddNewMultiClass implements GridField_HTMLProvider, GridField_URL
GridFieldExtensions::include_requirements(); GridFieldExtensions::include_requirements();
$field = new DropdownField(sprintf('%s[ClassName]', __CLASS__), '', $classes, $this->defaultClass); $field = new DropdownField(sprintf('%s[ClassName]', __CLASS__), '', $classes, $this->defaultClass);
if (Config::inst()->get('GridFieldAddNewMultiClass', 'showEmptyString')) { if (Config::inst()->get(__CLASS__, 'showEmptyString')) {
$field->setEmptyString(_t('GridFieldExtensions.SELECTTYPETOCREATE', '(Select type to create)')); $field->setEmptyString(_t('GridFieldExtensions.SELECTTYPETOCREATE', '(Select type to create)'));
} }
$field->addExtraClass('no-change-track'); $field->addExtraClass('no-change-track');

View File

@ -1,6 +1,6 @@
<?php <?php
namespace SilverStripe\Forms\GridField; namespace SilverStripe\GridFieldExtensions;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest; use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace SilverStripe\Forms\GridField; namespace SilverStripe\GridFieldExtensions;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Control\HTTPResponse_Exception; use SilverStripe\Control\HTTPResponse_Exception;
@ -111,7 +111,7 @@ class GridFieldEditableColumns extends GridFieldDataColumns implements
} }
/** @var GridFieldOrderableRows $sortable */ /** @var GridFieldOrderableRows $sortable */
$sortable = $grid->getConfig()->getComponentByType('GridFieldOrderableRows'); $sortable = $grid->getConfig()->getComponentByType('SilverStripe\\GridFieldExtensions\\GridFieldOrderableRows');
$form = $this->getForm($grid, $record); $form = $this->getForm($grid, $record);

View File

@ -1,6 +1,6 @@
<?php <?php
namespace SilverStripe\Forms\GridField; namespace SilverStripe\GridFieldExtensions;
use SilverStripe\View\Requirements; use SilverStripe\View\Requirements;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace SilverStripe\Forms\GridField; namespace SilverStripe\GridFieldExtensions;
use SilverStripe\Forms\GridField\GridFieldDataColumns; use SilverStripe\Forms\GridField\GridFieldDataColumns;
use SilverStripe\View\ArrayData; use SilverStripe\View\ArrayData;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace SilverStripe\Forms\GridField; namespace SilverStripe\GridFieldExtensions;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Control\RequestHandler; use SilverStripe\Control\RequestHandler;
@ -233,7 +233,7 @@ class GridFieldOrderableRows extends RequestHandler implements
return ViewableData::create()->customise(array( return ViewableData::create()->customise(array(
'SortField' => $sortField 'SortField' => $sortField
))->renderWith('GridFieldOrderableRowsDragHandle'); ))->renderWith('SilverStripe\\GridFieldExtensions\\GridFieldOrderableRowsDragHandle');
} }
public function getColumnAttributes($grid, $record, $col) { public function getColumnAttributes($grid, $record, $col) {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace SilverStripe\Forms\GridField; namespace SilverStripe\GridFieldExtensions;
use SilverStripe\Admin\LeftAndMain; use SilverStripe\Admin\LeftAndMain;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace SilverStripe\Forms\GridField; namespace SilverStripe\GridFieldExtensions;
use SilverStripe\Forms\GridField\GridField_HTMLProvider; use SilverStripe\Forms\GridField\GridField_HTMLProvider;
use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\ArrayList;
@ -24,7 +24,7 @@ class GridFieldTitleHeader implements GridField_HTMLProvider {
} }
return array( return array(
'header' => $cols->renderWith('GridFieldTitleHeader'), 'header' => $cols->renderWith(__CLASS__)
); );
} }

View File

@ -2,7 +2,7 @@
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\Dev\TestOnly; use SilverStripe\Dev\TestOnly;
use SilverStripe\Forms\GridField\GridField; use SilverStripe\GridFieldExtensions\GridField;
/** /**
* Tests for {@link GridFieldAddNewMultiClass}. * Tests for {@link GridFieldAddNewMultiClass}.

View File

@ -2,8 +2,8 @@
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\Dev\TestOnly; use SilverStripe\Dev\TestOnly;
use SilverStripe\Forms\GridField\GridField; use SilverStripe\GridFieldExtensions\GridField;
use SilverStripe\Forms\GridField\GridFieldConfig_RelationEditor; use SilverStripe\GridFieldExtensions\GridFieldConfig_RelationEditor;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
/** /**