sheadawson / silverstripe-blocks

src/model/Block.php

Doc Comments +4 added lines, -4 removed lines

@@ -126,7 +126,7 @@ 
     protected $controller;
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getTypeForGridfield()
     {
@@ -237,7 +237,7 @@ 
      * looks for templates that match BlockClassName_AreaName
      * falls back to BlockClassName.
      *
-     * @return string
+     * @return DBHTMLText
      **/
     public function forTemplate()
     {
@@ -253,7 +253,7 @@ 
     }
 
     /**
-     * @return string
+     * @return DBHTMLText
      */
     public function BlockHTML()
     {
@@ -428,7 +428,7 @@ 
     /**
      * Check if this block has been published.
      *
-     * @return bool True if this page has been published.
+     * @return string True if this page has been published.
      */
     public function isPublishedNice()
     {

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 class Block extends DataObject implements PermissionProvider
 {
 
-	private static $table_name = 'Block';
+    private static $table_name = 'Block';
 
     /**
      * @var array

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
 
     public function fieldLabels($includerelations = true)
     {
-        $labels =  parent::fieldLabels($includerelations);
+        $labels = parent::fieldLabels($includerelations);
 
         $labels = array_merge($labels, [
             'singular_name' => _t('Block.BlockType', 'Block Type'),
@@ -138,7 +138,7 @@ 
         $self = $this;
         $this->beforeUpdateCMSFields(function($fields) use($self) {
             /** @var FieldList $fields */
-            Requirements::add_i18n_javascript(BLOCKS_DIR . '/javascript/lang');
+            Requirements::add_i18n_javascript(BLOCKS_DIR.'/javascript/lang');
 
             // this line is a temporary patch until I can work out why this dependency isn't being
             // loaded in some cases...
@@ -445,9 +445,9 @@ 
     {
         $obj = DBHTMLText::create();
         if ($this->isPublished()) {
-            $obj->setValue('<img src="' . FRAMEWORK_ADMIN_DIR . '/images/alert-good.gif" />');
+            $obj->setValue('<img src="'.FRAMEWORK_ADMIN_DIR.'/images/alert-good.gif" />');
         } else {
-            $obj->setValue('<img src="' . FRAMEWORK_ADMIN_DIR . '/images/alert-bad.gif" />');
+            $obj->setValue('<img src="'.FRAMEWORK_ADMIN_DIR.'/images/alert-bad.gif" />');
         }
         return $obj;
     }

src/model/BlockSet.php

Doc Comments +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
     /**
      * Returns a list of pages this BlockSet features on.
      *
-     * @return DataList
+     * @return \SilverStripe\ORM\DataList
      */
     public function Pages()
     {

Unused Use Statements -2 removed lines

@@ -2,13 +2,11 @@
 
 namespace SheaDawson\Blocks\Model;
 
-use SheaDawson\Blocks\Forms\GridFieldConfigBlockManager;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\ArrayLib;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Security\PermissionProvider;
 use SilverStripe\Security\Permission;
-use SilverStripe\Security\Group;
 use SilverStripe\Forms\TreeMultiselectField;
 use SilverStripe\Forms\CheckboxField;
 use SilverStripe\Forms\HeaderField;

Indentation +2 added lines, -2 removed lines

@@ -89,8 +89,8 @@
         $fields->removeFieldFromTab('Root', 'Blocks');
 
         /**
-        * @todo - change relation editor back to the custom block manager config and fix issues when 'creating' Blocks from a BlockSet.
-		*/
+         * @todo - change relation editor back to the custom block manager config and fix issues when 'creating' Blocks from a BlockSet.
+         */
         $gridConfig = GridFieldConfig_RelationEditor::create();
         $gridConfig->addComponent(new GridFieldOrderableRows('Sort'));
         $gridConfig->addComponent(new GridFieldDeleteAction());

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
         $fields->addFieldToTab('Root.Main', MultiValueCheckboxField::create('PageTypes', _t('BlockSet.OnlyApplyToThesePageTypes', 'Only apply to these Page Types:'), $this->pageTypeOptions())
                 ->setDescription(_t('BlockSet.OnlyApplyToThesePageTypesDescription', 'Selected Page Types will inherit this Block Set automatically. Leave all unchecked to apply to all page types.')));
         $fields->addFieldToTab('Root.Main', TreeMultiselectField::create('PageParents', _t('BlockSet.OnlyApplyToChildrenOfThesePages', 'Only apply to children of these Pages:'), 'SilverStripe\\CMS\\Model\\SiteTree'));
-        $fields->addFieldToTab('Root.Main', CheckboxField::create('IncludePageParent', _t('BlockSet.ApplyBlockSetToSelectedPageParentsAsWellAsChildren','Apply block set to selected page parents as well as children')));
+        $fields->addFieldToTab('Root.Main', CheckboxField::create('IncludePageParent', _t('BlockSet.ApplyBlockSetToSelectedPageParentsAsWellAsChildren', 'Apply block set to selected page parents as well as children')));
 
         if (!$this->ID) {
             $fields->addFieldToTab('Root.Main', LiteralField::create('NotSaved', "<p class='message warning'>"._t('BlockSet.YouCanAddBlocksToThisSetOnceYouHaveSavedIt', 'You can add Blocks to this set once you have saved it for the first time').'</p>'));
@@ -168,15 +168,15 @@ 
     {
         return [
             'BLOCKSET_EDIT' => [
-                'name' => _t('BlockSet.EditBlockSet','Edit a Block Set'),
+                'name' => _t('BlockSet.EditBlockSet', 'Edit a Block Set'),
                 'category' => _t('Block.PermissionCategory', 'Blocks'),
             ],
             'BLOCKSET_DELETE' => [
-                'name' => _t('BlockSet.DeleteBlockSet','Delete a Block Set'),
+                'name' => _t('BlockSet.DeleteBlockSet', 'Delete a Block Set'),
                 'category' => _t('Block.PermissionCategory', 'Blocks'),
             ],
             'BLOCKSET_CREATE' => [
-                'name' => _t('BlockSet.CreateBlockSet','Create a Block Set'),
+                'name' => _t('BlockSet.CreateBlockSet', 'Create a Block Set'),
                 'category' => _t('Block.PermissionCategory', 'Blocks'),
             ],
         ];

tests/BlockSetTest.php

Spacing +3 added lines, -3 removed lines

@@ -80,15 +80,15 @@
         $object = singleton(BlockSet::class);
         $expected = [
             'BLOCKSET_EDIT' => [
-                'name' => _t('BlockSet.EditBlockSet','Edit a Block Set'),
+                'name' => _t('BlockSet.EditBlockSet', 'Edit a Block Set'),
                 'category' => _t('Block.PermissionCategory', 'Blocks'),
             ],
             'BLOCKSET_DELETE' => [
-                'name' => _t('BlockSet.DeleteBlockSet','Delete a Block Set'),
+                'name' => _t('BlockSet.DeleteBlockSet', 'Delete a Block Set'),
                 'category' => _t('Block.PermissionCategory', 'Blocks'),
             ],
             'BLOCKSET_CREATE' => [
-                'name' => _t('BlockSet.CreateBlockSet','Create a Block Set'),
+                'name' => _t('BlockSet.CreateBlockSet', 'Create a Block Set'),
                 'category' => _t('Block.PermissionCategory', 'Blocks'),
             ],
         ];