Inspection of "Merge pull request #66 from creative-commoners/pul..." - silverstripe/cwp - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( b62e9a...a002f8 )

by Daniel

created 2018-04-04 12:23 UTC

Status

Indentation +133 added lines, -133 removed lines patch added patch discarded remove patch

@@ -26,137 +26,137 @@
 block discarded – undo
  */
 class BaseHomePage extends Page
 {
-    private static $icon = 'cwp/cwp:images/icons/sitetree_images/home.png';
-
-    private static $hide_ancestor = BaseHomePage::class;
-
-    private static $singular_name = 'Home Page';
-
-    private static $plural_name = 'Home Pages';
-
-    private static $table_name = 'BaseHomePage';
-
-    private static $db = [
-        'FeatureOneTitle' => 'Varchar(255)',
-        'FeatureOneCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
-        'FeatureOneContent' => 'HTMLText',
-        'FeatureOneButtonText' => 'Varchar(255)',
-        'FeatureTwoTitle' => 'Varchar(255)',
-        'FeatureTwoCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
-        'FeatureTwoContent' => 'HTMLText',
-        'FeatureTwoButtonText' => 'Varchar(255)'
-    ];
-
-    private static $has_one = [
-        'LearnMorePage' => SiteTree::class,
-        'FeatureOneLink' => SiteTree::class,
-        'FeatureTwoLink' => SiteTree::class,
-    ];
-
-    private static $has_many = [
-        'Quicklinks' => Quicklink::class . '.Parent',
-    ];
-
-    public function Quicklinks()
-    {
-        return $this->getComponents('Quicklinks')->sort('SortOrder');
-    }
-
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            // Main Content tab
-            $fields->addFieldToTab(
-                'Root.Main',
-                TreeDropdownField::create(
-                    'LearnMorePageID',
-                    _t(__CLASS__ . '.LearnMoreLink', 'Page to link the "Learn More" button to:'),
-                    SiteTree::class
-                ),
-                'Metadata'
-            );
-
-            $gridField = GridField::create(
-                'Quicklinks',
-                'Quicklinks',
-                $this->Quicklinks(),
-                GridFieldConfig_RelationEditor::create()
-            );
-            $gridConfig = $gridField->getConfig();
-            $gridConfig->getComponentByType(GridFieldAddNewButton::class)->setButtonName(
-                _t(__CLASS__ . '.AddNewButton', 'Add new')
-            );
-
-            $injector = Injector::inst();
-
-            $gridConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
-            $gridConfig->removeComponentsByType(GridFieldDeleteAction::class);
-            $gridConfig->addComponent($injector->create(GridFieldDeleteAction::class));
-            $gridConfig->addComponent($injector->create(GridFieldOrderableRows::class, 'SortOrder'));
-            $gridField->setModelClass(Quicklink::class);
-
-            $fields->addFieldToTab('Root.Quicklinks', $gridField);
-
-            $fields->removeByName('Import');
-
-            $fields->addFieldToTab(
-                'Root.Features',
-                ToggleCompositeField::create(
-                    'FeatureOne',
-                    _t(__CLASS__ . '.FeatureOne', 'Feature One'),
-                    array(
-                        TextField::create('FeatureOneTitle', _t(__CLASS__ . '.Title', 'Title')),
-                        $dropdownField = DropdownField::create(
-                            'FeatureOneCategory',
-                            _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
-                            singleton(BaseHomePage::class)->dbObject('FeatureOneCategory')->enumValues()
-                        ),
-                        HTMLEditorField::create(
-                            'FeatureOneContent',
-                            _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
-                        ),
-                        TextField::create(
-                            'FeatureOneButtonText',
-                            _t(__CLASS__ . '.FeatureButtonText', 'Button text')
-                        ),
-                        TreeDropdownField::create(
-                            'FeatureOneLinkID',
-                            _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
-                            SiteTree::class
-                        )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
-                    )
-                )->setHeadingLevel(3)
-            );
-            $dropdownField->setEmptyString('none');
-
-            $fields->addFieldToTab('Root.Features', ToggleCompositeField::create(
-                'FeatureTwo',
-                _t(__CLASS__ . '.FeatureTwo', 'Feature Two'),
-                array(
-                    TextField::create('FeatureTwoTitle', _t(__CLASS__ . '.Title', 'Title')),
-                    $dropdownField = DropdownField::create(
-                        'FeatureTwoCategory',
-                        _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
-                        singleton(BaseHomePage::class)->dbObject('FeatureTwoCategory')->enumValues()
-                    ),
-                    HTMLEditorField::create(
-                        'FeatureTwoContent',
-                        _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
-                    ),
-                    TextField::create(
-                        'FeatureTwoButtonText',
-                        _t(__CLASS__ . '.FeatureButtonText', 'Button text')
-                    ),
-                    TreeDropdownField::create(
-                        'FeatureTwoLinkID',
-                        _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
-                        SiteTree::class
-                    )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
-                )
-            )->setHeadingLevel(3));
-            $dropdownField->setEmptyString('none');
-        });
-
-        return parent::getCMSFields();
-    }
+	private static $icon = 'cwp/cwp:images/icons/sitetree_images/home.png';
+
+	private static $hide_ancestor = BaseHomePage::class;
+
+	private static $singular_name = 'Home Page';
+
+	private static $plural_name = 'Home Pages';
+
+	private static $table_name = 'BaseHomePage';
+
+	private static $db = [
+		'FeatureOneTitle' => 'Varchar(255)',
+		'FeatureOneCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
+		'FeatureOneContent' => 'HTMLText',
+		'FeatureOneButtonText' => 'Varchar(255)',
+		'FeatureTwoTitle' => 'Varchar(255)',
+		'FeatureTwoCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
+		'FeatureTwoContent' => 'HTMLText',
+		'FeatureTwoButtonText' => 'Varchar(255)'
+	];
+
+	private static $has_one = [
+		'LearnMorePage' => SiteTree::class,
+		'FeatureOneLink' => SiteTree::class,
+		'FeatureTwoLink' => SiteTree::class,
+	];
+
+	private static $has_many = [
+		'Quicklinks' => Quicklink::class . '.Parent',
+	];
+
+	public function Quicklinks()
+	{
+		return $this->getComponents('Quicklinks')->sort('SortOrder');
+	}
+
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			// Main Content tab
+			$fields->addFieldToTab(
+				'Root.Main',
+				TreeDropdownField::create(
+					'LearnMorePageID',
+					_t(__CLASS__ . '.LearnMoreLink', 'Page to link the "Learn More" button to:'),
+					SiteTree::class
+				),
+				'Metadata'
+			);
+
+			$gridField = GridField::create(
+				'Quicklinks',
+				'Quicklinks',
+				$this->Quicklinks(),
+				GridFieldConfig_RelationEditor::create()
+			);
+			$gridConfig = $gridField->getConfig();
+			$gridConfig->getComponentByType(GridFieldAddNewButton::class)->setButtonName(
+				_t(__CLASS__ . '.AddNewButton', 'Add new')
+			);
+
+			$injector = Injector::inst();
+
+			$gridConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
+			$gridConfig->removeComponentsByType(GridFieldDeleteAction::class);
+			$gridConfig->addComponent($injector->create(GridFieldDeleteAction::class));
+			$gridConfig->addComponent($injector->create(GridFieldOrderableRows::class, 'SortOrder'));
+			$gridField->setModelClass(Quicklink::class);
+
+			$fields->addFieldToTab('Root.Quicklinks', $gridField);
+
+			$fields->removeByName('Import');
+
+			$fields->addFieldToTab(
+				'Root.Features',
+				ToggleCompositeField::create(
+					'FeatureOne',
+					_t(__CLASS__ . '.FeatureOne', 'Feature One'),
+					array(
+						TextField::create('FeatureOneTitle', _t(__CLASS__ . '.Title', 'Title')),
+						$dropdownField = DropdownField::create(
+							'FeatureOneCategory',
+							_t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
+							singleton(BaseHomePage::class)->dbObject('FeatureOneCategory')->enumValues()
+						),
+						HTMLEditorField::create(
+							'FeatureOneContent',
+							_t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
+						),
+						TextField::create(
+							'FeatureOneButtonText',
+							_t(__CLASS__ . '.FeatureButtonText', 'Button text')
+						),
+						TreeDropdownField::create(
+							'FeatureOneLinkID',
+							_t(__CLASS__ . '.FeatureLink', 'Page to link to'),
+							SiteTree::class
+						)->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
+					)
+				)->setHeadingLevel(3)
+			);
+			$dropdownField->setEmptyString('none');
+
+			$fields->addFieldToTab('Root.Features', ToggleCompositeField::create(
+				'FeatureTwo',
+				_t(__CLASS__ . '.FeatureTwo', 'Feature Two'),
+				array(
+					TextField::create('FeatureTwoTitle', _t(__CLASS__ . '.Title', 'Title')),
+					$dropdownField = DropdownField::create(
+						'FeatureTwoCategory',
+						_t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
+						singleton(BaseHomePage::class)->dbObject('FeatureTwoCategory')->enumValues()
+					),
+					HTMLEditorField::create(
+						'FeatureTwoContent',
+						_t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
+					),
+					TextField::create(
+						'FeatureTwoButtonText',
+						_t(__CLASS__ . '.FeatureButtonText', 'Button text')
+					),
+					TreeDropdownField::create(
+						'FeatureTwoLinkID',
+						_t(__CLASS__ . '.FeatureLink', 'Page to link to'),
+						SiteTree::class
+					)->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
+				)
+			)->setHeadingLevel(3));
+			$dropdownField->setEmptyString('none');
+		});
+
+		return parent::getCMSFields();
+	}
 }

Please login to merge, or discard this patch.

		@@ -26,137 +26,137 @@
		block discarded – undo
26	26	*/
27	27	class BaseHomePage extends Page
28	28	{
29		- private static $icon = 'cwp/cwp:images/icons/sitetree_images/home.png';
30		-
31		- private static $hide_ancestor = BaseHomePage::class;
32		-
33		- private static $singular_name = 'Home Page';
34		-
35		- private static $plural_name = 'Home Pages';
36		-
37		- private static $table_name = 'BaseHomePage';
38		-
39		- private static $db = [
40		- 'FeatureOneTitle' => 'Varchar(255)',
41		- 'FeatureOneCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
42		- 'FeatureOneContent' => 'HTMLText',
43		- 'FeatureOneButtonText' => 'Varchar(255)',
44		- 'FeatureTwoTitle' => 'Varchar(255)',
45		- 'FeatureTwoCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
46		- 'FeatureTwoContent' => 'HTMLText',
47		- 'FeatureTwoButtonText' => 'Varchar(255)'
48		- ];
49		-
50		- private static $has_one = [
51		- 'LearnMorePage' => SiteTree::class,
52		- 'FeatureOneLink' => SiteTree::class,
53		- 'FeatureTwoLink' => SiteTree::class,
54		- ];
55		-
56		- private static $has_many = [
57		- 'Quicklinks' => Quicklink::class . '.Parent',
58		- ];
59		-
60		- public function Quicklinks()
61		- {
62		- return $this->getComponents('Quicklinks')->sort('SortOrder');
63		- }
64		-
65		- public function getCMSFields()
66		- {
67		- $this->beforeUpdateCMSFields(function (FieldList $fields) {
68		- // Main Content tab
69		- $fields->addFieldToTab(
70		- 'Root.Main',
71		- TreeDropdownField::create(
72		- 'LearnMorePageID',
73		- _t(__CLASS__ . '.LearnMoreLink', 'Page to link the "Learn More" button to:'),
74		- SiteTree::class
75		- ),
76		- 'Metadata'
77		- );
78		-
79		- $gridField = GridField::create(
80		- 'Quicklinks',
81		- 'Quicklinks',
82		- $this->Quicklinks(),
83		- GridFieldConfig_RelationEditor::create()
84		- );
85		- $gridConfig = $gridField->getConfig();
86		- $gridConfig->getComponentByType(GridFieldAddNewButton::class)->setButtonName(
87		- _t(__CLASS__ . '.AddNewButton', 'Add new')
88		- );
89		-
90		- $injector = Injector::inst();
91		-
92		- $gridConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
93		- $gridConfig->removeComponentsByType(GridFieldDeleteAction::class);
94		- $gridConfig->addComponent($injector->create(GridFieldDeleteAction::class));
95		- $gridConfig->addComponent($injector->create(GridFieldOrderableRows::class, 'SortOrder'));
96		- $gridField->setModelClass(Quicklink::class);
97		-
98		- $fields->addFieldToTab('Root.Quicklinks', $gridField);
99		-
100		- $fields->removeByName('Import');
101		-
102		- $fields->addFieldToTab(
103		- 'Root.Features',
104		- ToggleCompositeField::create(
105		- 'FeatureOne',
106		- _t(__CLASS__ . '.FeatureOne', 'Feature One'),
107		- array(
108		- TextField::create('FeatureOneTitle', _t(__CLASS__ . '.Title', 'Title')),
109		- $dropdownField = DropdownField::create(
110		- 'FeatureOneCategory',
111		- _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
112		- singleton(BaseHomePage::class)->dbObject('FeatureOneCategory')->enumValues()
113		- ),
114		- HTMLEditorField::create(
115		- 'FeatureOneContent',
116		- _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
117		- ),
118		- TextField::create(
119		- 'FeatureOneButtonText',
120		- _t(__CLASS__ . '.FeatureButtonText', 'Button text')
121		- ),
122		- TreeDropdownField::create(
123		- 'FeatureOneLinkID',
124		- _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
125		- SiteTree::class
126		- )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
127		- )
128		- )->setHeadingLevel(3)
129		- );
130		- $dropdownField->setEmptyString('none');
131		-
132		- $fields->addFieldToTab('Root.Features', ToggleCompositeField::create(
133		- 'FeatureTwo',
134		- _t(__CLASS__ . '.FeatureTwo', 'Feature Two'),
135		- array(
136		- TextField::create('FeatureTwoTitle', _t(__CLASS__ . '.Title', 'Title')),
137		- $dropdownField = DropdownField::create(
138		- 'FeatureTwoCategory',
139		- _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
140		- singleton(BaseHomePage::class)->dbObject('FeatureTwoCategory')->enumValues()
141		- ),
142		- HTMLEditorField::create(
143		- 'FeatureTwoContent',
144		- _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
145		- ),
146		- TextField::create(
147		- 'FeatureTwoButtonText',
148		- _t(__CLASS__ . '.FeatureButtonText', 'Button text')
149		- ),
150		- TreeDropdownField::create(
151		- 'FeatureTwoLinkID',
152		- _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
153		- SiteTree::class
154		- )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
155		- )
156		- )->setHeadingLevel(3));
157		- $dropdownField->setEmptyString('none');
158		- });
159		-
160		- return parent::getCMSFields();
161		- }
	29	+ private static $icon = 'cwp/cwp:images/icons/sitetree_images/home.png';
	30	+
	31	+ private static $hide_ancestor = BaseHomePage::class;
	32	+
	33	+ private static $singular_name = 'Home Page';
	34	+
	35	+ private static $plural_name = 'Home Pages';
	36	+
	37	+ private static $table_name = 'BaseHomePage';
	38	+
	39	+ private static $db = [
	40	+ 'FeatureOneTitle' => 'Varchar(255)',
	41	+ 'FeatureOneCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
	42	+ 'FeatureOneContent' => 'HTMLText',
	43	+ 'FeatureOneButtonText' => 'Varchar(255)',
	44	+ 'FeatureTwoTitle' => 'Varchar(255)',
	45	+ 'FeatureTwoCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
	46	+ 'FeatureTwoContent' => 'HTMLText',
	47	+ 'FeatureTwoButtonText' => 'Varchar(255)'
	48	+ ];
	49	+
	50	+ private static $has_one = [
	51	+ 'LearnMorePage' => SiteTree::class,
	52	+ 'FeatureOneLink' => SiteTree::class,
	53	+ 'FeatureTwoLink' => SiteTree::class,
	54	+ ];
	55	+
	56	+ private static $has_many = [
	57	+ 'Quicklinks' => Quicklink::class . '.Parent',
	58	+ ];
	59	+
	60	+ public function Quicklinks()
	61	+ {
	62	+ return $this->getComponents('Quicklinks')->sort('SortOrder');
	63	+ }
	64	+
	65	+ public function getCMSFields()
	66	+ {
	67	+ $this->beforeUpdateCMSFields(function (FieldList $fields) {
	68	+ // Main Content tab
	69	+ $fields->addFieldToTab(
	70	+ 'Root.Main',
	71	+ TreeDropdownField::create(
	72	+ 'LearnMorePageID',
	73	+ _t(__CLASS__ . '.LearnMoreLink', 'Page to link the "Learn More" button to:'),
	74	+ SiteTree::class
	75	+ ),
	76	+ 'Metadata'
	77	+ );
	78	+
	79	+ $gridField = GridField::create(
	80	+ 'Quicklinks',
	81	+ 'Quicklinks',
	82	+ $this->Quicklinks(),
	83	+ GridFieldConfig_RelationEditor::create()
	84	+ );
	85	+ $gridConfig = $gridField->getConfig();
	86	+ $gridConfig->getComponentByType(GridFieldAddNewButton::class)->setButtonName(
	87	+ _t(__CLASS__ . '.AddNewButton', 'Add new')
	88	+ );
	89	+
	90	+ $injector = Injector::inst();
	91	+
	92	+ $gridConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
	93	+ $gridConfig->removeComponentsByType(GridFieldDeleteAction::class);
	94	+ $gridConfig->addComponent($injector->create(GridFieldDeleteAction::class));
	95	+ $gridConfig->addComponent($injector->create(GridFieldOrderableRows::class, 'SortOrder'));
	96	+ $gridField->setModelClass(Quicklink::class);
	97	+
	98	+ $fields->addFieldToTab('Root.Quicklinks', $gridField);
	99	+
	100	+ $fields->removeByName('Import');
	101	+
	102	+ $fields->addFieldToTab(
	103	+ 'Root.Features',
	104	+ ToggleCompositeField::create(
	105	+ 'FeatureOne',
	106	+ _t(__CLASS__ . '.FeatureOne', 'Feature One'),
	107	+ array(
	108	+ TextField::create('FeatureOneTitle', _t(__CLASS__ . '.Title', 'Title')),
	109	+ $dropdownField = DropdownField::create(
	110	+ 'FeatureOneCategory',
	111	+ _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
	112	+ singleton(BaseHomePage::class)->dbObject('FeatureOneCategory')->enumValues()
	113	+ ),
	114	+ HTMLEditorField::create(
	115	+ 'FeatureOneContent',
	116	+ _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
	117	+ ),
	118	+ TextField::create(
	119	+ 'FeatureOneButtonText',
	120	+ _t(__CLASS__ . '.FeatureButtonText', 'Button text')
	121	+ ),
	122	+ TreeDropdownField::create(
	123	+ 'FeatureOneLinkID',
	124	+ _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
	125	+ SiteTree::class
	126	+ )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
	127	+ )
	128	+ )->setHeadingLevel(3)
	129	+ );
	130	+ $dropdownField->setEmptyString('none');
	131	+
	132	+ $fields->addFieldToTab('Root.Features', ToggleCompositeField::create(
	133	+ 'FeatureTwo',
	134	+ _t(__CLASS__ . '.FeatureTwo', 'Feature Two'),
	135	+ array(
	136	+ TextField::create('FeatureTwoTitle', _t(__CLASS__ . '.Title', 'Title')),
	137	+ $dropdownField = DropdownField::create(
	138	+ 'FeatureTwoCategory',
	139	+ _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
	140	+ singleton(BaseHomePage::class)->dbObject('FeatureTwoCategory')->enumValues()
	141	+ ),
	142	+ HTMLEditorField::create(
	143	+ 'FeatureTwoContent',
	144	+ _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
	145	+ ),
	146	+ TextField::create(
	147	+ 'FeatureTwoButtonText',
	148	+ _t(__CLASS__ . '.FeatureButtonText', 'Button text')
	149	+ ),
	150	+ TreeDropdownField::create(
	151	+ 'FeatureTwoLinkID',
	152	+ _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
	153	+ SiteTree::class
	154	+ )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
	155	+ )
	156	+ )->setHeadingLevel(3));
	157	+ $dropdownField->setEmptyString('none');
	158	+ });
	159	+
	160	+ return parent::getCMSFields();
	161	+ }
162	162	}

silverstripe / cwp

Push — master ( b62e9a...a002f8 )

Status

Category

Indentation +133 added lines, -133 removed lines patch added patch discarded remove patch