dynamic / silverstripe-flexslider

tests/Model/SlideTest.php

Indentation +117 added lines, -117 removed lines

@@ -12,124 +12,124 @@
  */
 class SlideTest extends SapphireTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = '../fixtures.yml';
-
-    /**
-     *
-     */
-    public function testCanCreate()
-    {
-        /** @var Member $canCreate */
-        $canCreate = $this->objFromFixture(Member::class, 'slide_author');
-        /** @var Member $canAdminister */
-        $canAdminister = $this->objFromFixture(Member::class, 'slide_admin');
-        /** @var Member $noPermission */
-        $noPermission = $this->objFromFixture(Member::class, 'slide_no_permission');
-
-        $this->logInAs($canCreate);
-        $slide = Slide::singleton();
-
-        $this->assertTrue($slide->canCreate());
-
-        $this->logOut();
-        $this->logInAs($canAdminister);
-
-        $this->assertTrue($slide->canCreate());
-
-        $this->logOut();
-        $this->logInAs($noPermission);
-
-        $this->assertFalse($slide->canCreate());
-        $this->logOut();
-    }
-
-    /**
-     *
-     */
-    public function testCanEdit()
-    {
-        /** @var Slide $slide */
-        $slide = $this->objFromFixture(Slide::class, 'base_slide');
-        /** @var Member $canCreate */
-        $canEdit = $this->objFromFixture(Member::class, 'slide_author');
-        /** @var Member $canAdminister */
-        $canAdminister = $this->objFromFixture(Member::class, 'slide_admin');
-        /** @var Member $noPermission */
-        $noPermission = $this->objFromFixture(Member::class, 'slide_no_permission');
-
-        $this->logInAs($canEdit);
-
-        $this->assertTrue($slide->canEdit());
-
-        $this->logOut();
-        $this->logInAs($canAdminister);
-
-        $this->assertTrue($slide->canEdit());
-
-        $this->logOut();
-        $this->logInAs($noPermission);
-
-        $this->assertFalse($slide->canEdit());
-        $this->logOut();
-    }
-
-    /**
-     *
-     */
-    public function testCanDelete()
-    {
-        /** @var Slide $slide */
-        $slide = $this->objFromFixture(Slide::class, 'base_slide');
-        /** @var Member $canCreate */
-        $noDelete = $this->objFromFixture(Member::class, 'slide_author');
-        /** @var Member $canAdminister */
-        $canAdminister = $this->objFromFixture(Member::class, 'slide_admin');
-        /** @var Member $noPermission */
-        $noPermission = $this->objFromFixture(Member::class, 'slide_no_permission');
-
-        $this->logInAs($noDelete);
-
-        $this->assertFalse($slide->canDelete());
-
-        $this->logOut();
-        $this->logInAs($canAdminister);
-
-        $this->assertTrue($slide->canDelete());
-
-        $this->logOut();
-        $this->logInAs($noPermission);
-
-        $this->assertFalse($slide->canDelete());
-        $this->logOut();
-    }
-
-    public function testCanPublish()
-    {
-        /** @var Slide $slide */
-        $slide = $this->objFromFixture(Slide::class, 'base_slide');
-        /** @var Member $canCreate */
-        $noPublish = $this->objFromFixture(Member::class, 'slide_author');
-        /** @var Member $canAdminister */
-        $canAdminister = $this->objFromFixture(Member::class, 'slide_admin');
-        /** @var Member $noPermission */
-        $noPermission = $this->objFromFixture(Member::class, 'slide_no_permission');
-
-        $this->logInAs($noPublish);
-
-        $this->assertFalse($slide->canPublish());
-
-        $this->logOut();
-        $this->logInAs($canAdminister);
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = '../fixtures.yml';
+
+	/**
+	 *
+	 */
+	public function testCanCreate()
+	{
+		/** @var Member $canCreate */
+		$canCreate = $this->objFromFixture(Member::class, 'slide_author');
+		/** @var Member $canAdminister */
+		$canAdminister = $this->objFromFixture(Member::class, 'slide_admin');
+		/** @var Member $noPermission */
+		$noPermission = $this->objFromFixture(Member::class, 'slide_no_permission');
+
+		$this->logInAs($canCreate);
+		$slide = Slide::singleton();
+
+		$this->assertTrue($slide->canCreate());
+
+		$this->logOut();
+		$this->logInAs($canAdminister);
+
+		$this->assertTrue($slide->canCreate());
+
+		$this->logOut();
+		$this->logInAs($noPermission);
+
+		$this->assertFalse($slide->canCreate());
+		$this->logOut();
+	}
+
+	/**
+	 *
+	 */
+	public function testCanEdit()
+	{
+		/** @var Slide $slide */
+		$slide = $this->objFromFixture(Slide::class, 'base_slide');
+		/** @var Member $canCreate */
+		$canEdit = $this->objFromFixture(Member::class, 'slide_author');
+		/** @var Member $canAdminister */
+		$canAdminister = $this->objFromFixture(Member::class, 'slide_admin');
+		/** @var Member $noPermission */
+		$noPermission = $this->objFromFixture(Member::class, 'slide_no_permission');
+
+		$this->logInAs($canEdit);
+
+		$this->assertTrue($slide->canEdit());
+
+		$this->logOut();
+		$this->logInAs($canAdminister);
+
+		$this->assertTrue($slide->canEdit());
+
+		$this->logOut();
+		$this->logInAs($noPermission);
+
+		$this->assertFalse($slide->canEdit());
+		$this->logOut();
+	}
+
+	/**
+	 *
+	 */
+	public function testCanDelete()
+	{
+		/** @var Slide $slide */
+		$slide = $this->objFromFixture(Slide::class, 'base_slide');
+		/** @var Member $canCreate */
+		$noDelete = $this->objFromFixture(Member::class, 'slide_author');
+		/** @var Member $canAdminister */
+		$canAdminister = $this->objFromFixture(Member::class, 'slide_admin');
+		/** @var Member $noPermission */
+		$noPermission = $this->objFromFixture(Member::class, 'slide_no_permission');
+
+		$this->logInAs($noDelete);
+
+		$this->assertFalse($slide->canDelete());
+
+		$this->logOut();
+		$this->logInAs($canAdminister);
+
+		$this->assertTrue($slide->canDelete());
+
+		$this->logOut();
+		$this->logInAs($noPermission);
+
+		$this->assertFalse($slide->canDelete());
+		$this->logOut();
+	}
+
+	public function testCanPublish()
+	{
+		/** @var Slide $slide */
+		$slide = $this->objFromFixture(Slide::class, 'base_slide');
+		/** @var Member $canCreate */
+		$noPublish = $this->objFromFixture(Member::class, 'slide_author');
+		/** @var Member $canAdminister */
+		$canAdminister = $this->objFromFixture(Member::class, 'slide_admin');
+		/** @var Member $noPermission */
+		$noPermission = $this->objFromFixture(Member::class, 'slide_no_permission');
+
+		$this->logInAs($noPublish);
+
+		$this->assertFalse($slide->canPublish());
+
+		$this->logOut();
+		$this->logInAs($canAdminister);
 
-        $this->assertTrue($slide->canPublish());
+		$this->assertTrue($slide->canPublish());
 
-        $this->logOut();
-        $this->logInAs($noPermission);
+		$this->logOut();
+		$this->logInAs($noPermission);
 
-        $this->assertFalse($slide->canPublish());
-        $this->logOut();
-    }
+		$this->assertFalse($slide->canPublish());
+		$this->logOut();
+	}
 }

src/ORM/FlexSlider.php

Indentation +202 added lines, -202 removed lines

@@ -43,199 +43,199 @@ 
  */
 class FlexSlider extends DataExtension
 {
-    use Configurable;
+	use Configurable;
 
-    /**
-     * @var array
-     */
-    private static $db = [
-        'Animation' => "Enum('slide, fade', 'slide')",
-        'Loop' => 'Boolean',
-        'Animate' => 'Boolean',
-        'ThumbnailNav' => 'Boolean',
-        'SliderControlNav' => 'Boolean',
-        'SliderDirectionNav' => 'Boolean',
-        'CarouselControlNav' => 'Boolean',
-        'CarouselDirectionNav' => 'Boolean',
-        'CarouselThumbnailCt' => 'Int',
-        'FlexSliderSpeed' => 'Double',
-    ];
+	/**
+	 * @var array
+	 */
+	private static $db = [
+		'Animation' => "Enum('slide, fade', 'slide')",
+		'Loop' => 'Boolean',
+		'Animate' => 'Boolean',
+		'ThumbnailNav' => 'Boolean',
+		'SliderControlNav' => 'Boolean',
+		'SliderDirectionNav' => 'Boolean',
+		'CarouselControlNav' => 'Boolean',
+		'CarouselDirectionNav' => 'Boolean',
+		'CarouselThumbnailCt' => 'Int',
+		'FlexSliderSpeed' => 'Double',
+	];
 
-    /**
-     * @var array
-     */
-    private static $has_many = [
-        'Slides' => Slide::class,
-    ];
+	/**
+	 * @var array
+	 */
+	private static $has_many = [
+		'Slides' => Slide::class,
+	];
 
-    /**
-     *
-     */
-    public function populateDefaults()
-    {
-        $this->owner->Loop = 1;
-        $this->owner->Animate = 1;
-        $this->owner->SliderControlNav = 0;
-        $this->owner->SliderDirectionNav = 1;
-        $this->owner->CarouselControlNav = 0;
-        $this->owner->CarouselDirectionNav = 1;
-        $this->owner->CarouselThumbnailCt = 6;
-        $this->owner->FlexSliderSpeed = $this->getDefaultSpeed();
+	/**
+	 *
+	 */
+	public function populateDefaults()
+	{
+		$this->owner->Loop = 1;
+		$this->owner->Animate = 1;
+		$this->owner->SliderControlNav = 0;
+		$this->owner->SliderDirectionNav = 1;
+		$this->owner->CarouselControlNav = 0;
+		$this->owner->CarouselDirectionNav = 1;
+		$this->owner->CarouselThumbnailCt = 6;
+		$this->owner->FlexSliderSpeed = $this->getDefaultSpeed();
 
-        return parent::populateDefaults();
-    }
+		return parent::populateDefaults();
+	}
 
-    /**
-     * @param FieldList $fields
-     * @throws \ReflectionException
-     */
-    public function updateCMSFields(FieldList $fields)
-    {
-        $fields->removeByName([
-            'Animation',
-            'Loop',
-            'Animate',
-            'ThumbnailNav',
-            'SliderControlNav',
-            'SliderDirectionNav',
-            'CarouselControlNav',
-            'CarouselDirectionNav',
-            'CarouselThumbnailCt',
-            'FlexSliderSpeed',
-            'Slides',
-        ]);
+	/**
+	 * @param FieldList $fields
+	 * @throws \ReflectionException
+	 */
+	public function updateCMSFields(FieldList $fields)
+	{
+		$fields->removeByName([
+			'Animation',
+			'Loop',
+			'Animate',
+			'ThumbnailNav',
+			'SliderControlNav',
+			'SliderDirectionNav',
+			'CarouselControlNav',
+			'CarouselDirectionNav',
+			'CarouselThumbnailCt',
+			'FlexSliderSpeed',
+			'Slides',
+		]);
 
-        // Slides
-        if ($this->owner->ID) {
-            $availableSlides = [];
-            foreach (ClassInfo::subclassesFor(Slide::class, false) as $class) {
-                $availableSlides[$class] = $class::singleton()->i18n_singular_name();
-            };
+		// Slides
+		if ($this->owner->ID) {
+			$availableSlides = [];
+			foreach (ClassInfo::subclassesFor(Slide::class, false) as $class) {
+				$availableSlides[$class] = $class::singleton()->i18n_singular_name();
+			};
 
-            $config = GridFieldConfig_RecordEditor::create();
-            $config->addComponent(new GridFieldOrderableRows('SortOrder'));
-            $config->removeComponentsByType([
-                GridFieldAddExistingAutocompleter::class,
-                GridFieldDeleteAction::class,
-                GridFieldAddNewButton::class,
-            ])->addComponent($multiClass = new GridFieldAddNewMultiClass());
+			$config = GridFieldConfig_RecordEditor::create();
+			$config->addComponent(new GridFieldOrderableRows('SortOrder'));
+			$config->removeComponentsByType([
+				GridFieldAddExistingAutocompleter::class,
+				GridFieldDeleteAction::class,
+				GridFieldAddNewButton::class,
+			])->addComponent($multiClass = new GridFieldAddNewMultiClass());
 
-            $multiClass->setClasses($availableSlides);
+			$multiClass->setClasses($availableSlides);
 
-            $SlidesField = GridField::create(
-                'Slides',
-                _t(__CLASS__ . '.SLIDES', 'Slides'),
-                $this->owner->Slides()->sort('SortOrder'),
-                $config
-            );
+			$SlidesField = GridField::create(
+				'Slides',
+				_t(__CLASS__ . '.SLIDES', 'Slides'),
+				$this->owner->Slides()->sort('SortOrder'),
+				$config
+			);
 
-            $slideTitle = $this->owner->stat('slide_tab_title') ?: _t(__CLASS__ . '.SLIDES', 'Slides');
+			$slideTitle = $this->owner->stat('slide_tab_title') ?: _t(__CLASS__ . '.SLIDES', 'Slides');
 
-            $animations = [];
-            $animationOptions = $this->owner->dbObject('Animation')->getEnum();
-            foreach ($animationOptions as $value) {
-                $animations[$value] = _t(__CLASS__ . ".$value", $value);
-            }
+			$animations = [];
+			$animationOptions = $this->owner->dbObject('Animation')->getEnum();
+			foreach ($animationOptions as $value) {
+				$animations[$value] = _t(__CLASS__ . ".$value", $value);
+			}
 
-            $fields->addFieldsToTab("Root.{$slideTitle}", [
-                $SlidesField,
-                ToggleCompositeField::create('ConfigHD', _t(__CLASS__ . '.SettingsLabel', 'Slider Settings'), [
-                    DropdownField::create(
-                        'Animation',
-                        _t(__CLASS__ . '.ANIMATION_OPTION', 'Animation option'),
-                        $animations
-                    ),
-                    CheckboxField::create(
-                        'Animate',
-                        _t(__CLASS__ . '.ANIMATE', 'Animate automatically')
-                    ),
-                    CheckboxField::create(
-                        'Loop',
-                        _t(__CLASS__ . '.LOOP', 'Loop the carousel')
-                    ),
-                    CheckboxField::create(
-                        'SliderControlNav',
-                        _t(__CLASS__ . '.CONTROL_NAV', 'Show ControlNav')
-                    ),
-                    CheckboxField::create(
-                        'SliderDirectionNav',
-                        _t(__CLASS__ . '.DIRECTION_NAV', 'Show DirectionNav')
-                    ),
-                    CheckboxField::create(
-                        'ThumbnailNav',
-                        _t(__CLASS__ . '.THUMBNAIL_NAV', 'Thumbnail Navigation')
-                    ),
-                    //DisplayLogicWrapper::create(
-                    CheckboxField::create(
-                        'CarouselControlNav',
-                        _t(__CLASS__ . '.CAROUSEL_CONTROL_NAV', 'Show Carousel ControlNav')
-                    ),
-                    CheckboxField::create(
-                        'CarouselDirectionNav',
-                        _t(__CLASS__ . '.CAROUSEL_DIRECTION_NAV', 'Show Carousel DirectionNav')
-                    ),
-                    NumericField::create(
-                        'CarouselThumbnailCt',
-                        _t(__CLASS__ . '.CAROUSEL_THUMBNAIL_COUNT', 'Number of thumbnails')
-                    ),
-                    NumericField::create(
-                        'FlexSliderSpeed',
-                        _t(__CLASS__ . '.SLIDER_SPEED', 'Slider Speed')
-                    )
-                        ->setDescription('In Seconds')
-                        ->setScale(2),
-                ]),
-            ]);
-        }
-    }
+			$fields->addFieldsToTab("Root.{$slideTitle}", [
+				$SlidesField,
+				ToggleCompositeField::create('ConfigHD', _t(__CLASS__ . '.SettingsLabel', 'Slider Settings'), [
+					DropdownField::create(
+						'Animation',
+						_t(__CLASS__ . '.ANIMATION_OPTION', 'Animation option'),
+						$animations
+					),
+					CheckboxField::create(
+						'Animate',
+						_t(__CLASS__ . '.ANIMATE', 'Animate automatically')
+					),
+					CheckboxField::create(
+						'Loop',
+						_t(__CLASS__ . '.LOOP', 'Loop the carousel')
+					),
+					CheckboxField::create(
+						'SliderControlNav',
+						_t(__CLASS__ . '.CONTROL_NAV', 'Show ControlNav')
+					),
+					CheckboxField::create(
+						'SliderDirectionNav',
+						_t(__CLASS__ . '.DIRECTION_NAV', 'Show DirectionNav')
+					),
+					CheckboxField::create(
+						'ThumbnailNav',
+						_t(__CLASS__ . '.THUMBNAIL_NAV', 'Thumbnail Navigation')
+					),
+					//DisplayLogicWrapper::create(
+					CheckboxField::create(
+						'CarouselControlNav',
+						_t(__CLASS__ . '.CAROUSEL_CONTROL_NAV', 'Show Carousel ControlNav')
+					),
+					CheckboxField::create(
+						'CarouselDirectionNav',
+						_t(__CLASS__ . '.CAROUSEL_DIRECTION_NAV', 'Show Carousel DirectionNav')
+					),
+					NumericField::create(
+						'CarouselThumbnailCt',
+						_t(__CLASS__ . '.CAROUSEL_THUMBNAIL_COUNT', 'Number of thumbnails')
+					),
+					NumericField::create(
+						'FlexSliderSpeed',
+						_t(__CLASS__ . '.SLIDER_SPEED', 'Slider Speed')
+					)
+						->setDescription('In Seconds')
+						->setScale(2),
+				]),
+			]);
+		}
+	}
 
-    /**
-     * @return mixed
-     */
-    public function getSlideShow()
-    {
-        $owner = $this->owner;
+	/**
+	 * @return mixed
+	 */
+	public function getSlideShow()
+	{
+		$owner = $this->owner;
 
-        if (!($owner instanceof SiteTree)) {
-            $this->getCustomScript();
-        }
+		if (!($owner instanceof SiteTree)) {
+			$this->getCustomScript();
+		}
 
-        return $this->owner->Slides()->sort('SortOrder');
-    }
+		return $this->owner->Slides()->sort('SortOrder');
+	}
 
-    /**
-     * add requirements to PageController init()
-     */
-    public function contentcontrollerInit()
-    {
-        // only call custom script if page has Slides and DataExtension
-        if (DataObject::has_extension($this->owner->Classname, FlexSlider::class)) {
-            if ($this->owner->getSlideShow()->exists()) {
-                $this->getCustomScript();
-            }
-        }
-    }
+	/**
+	 * add requirements to PageController init()
+	 */
+	public function contentcontrollerInit()
+	{
+		// only call custom script if page has Slides and DataExtension
+		if (DataObject::has_extension($this->owner->Classname, FlexSlider::class)) {
+			if ($this->owner->getSlideShow()->exists()) {
+				$this->getCustomScript();
+			}
+		}
+	}
 
-    /**
-     *
-     */
-    public function getCustomScript()
-    {
-        // Flexslider options
-        $sync = ($this->owner->ThumbnailNav == true) ? "sync: '.fs-carousel:eq('+index+')'," : '';
+	/**
+	 *
+	 */
+	public function getCustomScript()
+	{
+		// Flexslider options
+		$sync = ($this->owner->ThumbnailNav == true) ? "sync: '.fs-carousel:eq('+index+')'," : '';
 
-        $before = $this->owner->hasMethod('flexSliderBeforeAction')
-            ? $this->owner->flexSliderBeforeAction()
-            : 'function(){}';
+		$before = $this->owner->hasMethod('flexSliderBeforeAction')
+			? $this->owner->flexSliderBeforeAction()
+			: 'function(){}';
 
-        $after = $this->owner->hasMethod('flexSliderAfterAction')
-            ? $this->owner->flexSliderAfterAction()
-            : 'function(){}';
+		$after = $this->owner->hasMethod('flexSliderAfterAction')
+			? $this->owner->flexSliderAfterAction()
+			: 'function(){}';
 
-        $speed = $this->getSlideshowSpeed();
+		$speed = $this->getSlideshowSpeed();
 
-        Requirements::customScript(
-            "(function($) {
+		Requirements::customScript(
+			"(function($) {
                 $(document).ready(function(){
                     jQuery('.flexslider').each(function(index){
 
@@ -281,39 +281,39 @@ 
                     })
                 });
             }(jQuery));'
-        );
-    }
+		);
+	}
 
-    /**
-     * @return int
-     */
-    public function getSlideshowSpeed()
-    {
-        $speed = $this->owner->FlexSliderSpeed > 0
-            ? $this->owner->FlexSliderSpeed
-            : $this->getDefaultSpeed();
+	/**
+	 * @return int
+	 */
+	public function getSlideshowSpeed()
+	{
+		$speed = $this->owner->FlexSliderSpeed > 0
+			? $this->owner->FlexSliderSpeed
+			: $this->getDefaultSpeed();
 
-        return $speed * 1000;
-    }
+		return $speed * 1000;
+	}
 
-    /**
-     * @return mixed
-     */
-    protected function getDefaultSpeed()
-    {
-        return $this->owner->config()->get('flex_slider_speed')
-            ?: Config::inst()->get(FlexSlider::class, 'flex_slider_speed');
-    }
+	/**
+	 * @return mixed
+	 */
+	protected function getDefaultSpeed()
+	{
+		return $this->owner->config()->get('flex_slider_speed')
+			?: Config::inst()->get(FlexSlider::class, 'flex_slider_speed');
+	}
 
-    /**
-     *
-     */
-    public function onBeforeWrite()
-    {
-        parent::onBeforeWrite();
+	/**
+	 *
+	 */
+	public function onBeforeWrite()
+	{
+		parent::onBeforeWrite();
 
-        if (!$this->owner->CarouselThumbnailCt) {
-            $this->owner->CarouselThumbnailCt = 6;
-        }
-    }
+		if (!$this->owner->CarouselThumbnailCt) {
+			$this->owner->CarouselThumbnailCt = 6;
+		}
+	}
 }

Spacing +31 added lines, -31 removed lines

@@ -124,63 +124,63 @@ 
 
             $SlidesField = GridField::create(
                 'Slides',
-                _t(__CLASS__ . '.SLIDES', 'Slides'),
+                _t(__CLASS__.'.SLIDES', 'Slides'),
                 $this->owner->Slides()->sort('SortOrder'),
                 $config
             );
 
-            $slideTitle = $this->owner->stat('slide_tab_title') ?: _t(__CLASS__ . '.SLIDES', 'Slides');
+            $slideTitle = $this->owner->stat('slide_tab_title') ?: _t(__CLASS__.'.SLIDES', 'Slides');
 
             $animations = [];
             $animationOptions = $this->owner->dbObject('Animation')->getEnum();
             foreach ($animationOptions as $value) {
-                $animations[$value] = _t(__CLASS__ . ".$value", $value);
+                $animations[$value] = _t(__CLASS__.".$value", $value);
             }
 
             $fields->addFieldsToTab("Root.{$slideTitle}", [
                 $SlidesField,
-                ToggleCompositeField::create('ConfigHD', _t(__CLASS__ . '.SettingsLabel', 'Slider Settings'), [
+                ToggleCompositeField::create('ConfigHD', _t(__CLASS__.'.SettingsLabel', 'Slider Settings'), [
                     DropdownField::create(
                         'Animation',
-                        _t(__CLASS__ . '.ANIMATION_OPTION', 'Animation option'),
+                        _t(__CLASS__.'.ANIMATION_OPTION', 'Animation option'),
                         $animations
                     ),
                     CheckboxField::create(
                         'Animate',
-                        _t(__CLASS__ . '.ANIMATE', 'Animate automatically')
+                        _t(__CLASS__.'.ANIMATE', 'Animate automatically')
                     ),
                     CheckboxField::create(
                         'Loop',
-                        _t(__CLASS__ . '.LOOP', 'Loop the carousel')
+                        _t(__CLASS__.'.LOOP', 'Loop the carousel')
                     ),
                     CheckboxField::create(
                         'SliderControlNav',
-                        _t(__CLASS__ . '.CONTROL_NAV', 'Show ControlNav')
+                        _t(__CLASS__.'.CONTROL_NAV', 'Show ControlNav')
                     ),
                     CheckboxField::create(
                         'SliderDirectionNav',
-                        _t(__CLASS__ . '.DIRECTION_NAV', 'Show DirectionNav')
+                        _t(__CLASS__.'.DIRECTION_NAV', 'Show DirectionNav')
                     ),
                     CheckboxField::create(
                         'ThumbnailNav',
-                        _t(__CLASS__ . '.THUMBNAIL_NAV', 'Thumbnail Navigation')
+                        _t(__CLASS__.'.THUMBNAIL_NAV', 'Thumbnail Navigation')
                     ),
                     //DisplayLogicWrapper::create(
                     CheckboxField::create(
                         'CarouselControlNav',
-                        _t(__CLASS__ . '.CAROUSEL_CONTROL_NAV', 'Show Carousel ControlNav')
+                        _t(__CLASS__.'.CAROUSEL_CONTROL_NAV', 'Show Carousel ControlNav')
                     ),
                     CheckboxField::create(
                         'CarouselDirectionNav',
-                        _t(__CLASS__ . '.CAROUSEL_DIRECTION_NAV', 'Show Carousel DirectionNav')
+                        _t(__CLASS__.'.CAROUSEL_DIRECTION_NAV', 'Show Carousel DirectionNav')
                     ),
                     NumericField::create(
                         'CarouselThumbnailCt',
-                        _t(__CLASS__ . '.CAROUSEL_THUMBNAIL_COUNT', 'Number of thumbnails')
+                        _t(__CLASS__.'.CAROUSEL_THUMBNAIL_COUNT', 'Number of thumbnails')
                     ),
                     NumericField::create(
                         'FlexSliderSpeed',
-                        _t(__CLASS__ . '.SLIDER_SPEED', 'Slider Speed')
+                        _t(__CLASS__.'.SLIDER_SPEED', 'Slider Speed')
                     )
                         ->setDescription('In Seconds')
                         ->setScale(2),
@@ -222,7 +222,7 @@ 
     public function getCustomScript()
     {
         // Flexslider options
-        $sync = ($this->owner->ThumbnailNav == true) ? "sync: '.fs-carousel:eq('+index+')'," : '';
+        $sync = ($this->owner->ThumbnailNav==true) ? "sync: '.fs-carousel:eq('+index+')'," : '';
 
         $before = $this->owner->hasMethod('flexSliderBeforeAction')
             ? $this->owner->flexSliderBeforeAction()
@@ -241,18 +241,18 @@ 
 
                          if(jQuery('.fs-carousel').eq(index).length) {
                              jQuery('.fs-carousel').eq(index).flexslider({
-                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean() . ",
+                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean().",
                                 animation: 'slide',
-                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean() . ",
-                                controlNav: " . $this->owner->obj('CarouselControlNav')->NiceAsBoolean() . ",
-                                directionNav: " . $this->owner->obj('CarouselDirectionNav')->NiceAsBoolean() . ",
+                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean().",
+                                controlNav: " . $this->owner->obj('CarouselControlNav')->NiceAsBoolean().",
+                                directionNav: " . $this->owner->obj('CarouselDirectionNav')->NiceAsBoolean().",
                                 prevText: '',
                                 nextText: '',
                                 pausePlay: false,
                                 asNavFor: '.flexslider:eq('+index+')',
-                                minItems: " . $this->owner->obj('CarouselThumbnailCt') . ",
-                                maxItems: " . $this->owner->obj('CarouselThumbnailCt') . ",
-                                move: " . $this->owner->obj('CarouselThumbnailCt') . ",
+                                minItems: " . $this->owner->obj('CarouselThumbnailCt').",
+                                maxItems: " . $this->owner->obj('CarouselThumbnailCt').",
+                                move: " . $this->owner->obj('CarouselThumbnailCt').",
                                 itemWidth: 100,
                                 itemMargin: 10
                               });
@@ -260,22 +260,22 @@ 
 
                         if(jQuery('.flexslider').eq(index).length){
                             jQuery('.flexslider').eq(index).flexslider({
-                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean() . ",
-                                animation: '" . $this->owner->Animation . "',
-                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean() . ",
-                                controlNav: " . $this->owner->obj('SliderControlNav')->NiceAsBoolean() . ",
-                                directionNav: " . $this->owner->obj('SliderDirectionNav')->NiceAsBoolean() . ",
+                                slideshow: " . $this->owner->obj('Animate')->NiceAsBoolean().",
+                                animation: '" . $this->owner->Animation."',
+                                animationLoop: " . $this->owner->obj('Loop')->NiceAsBoolean().",
+                                controlNav: " . $this->owner->obj('SliderControlNav')->NiceAsBoolean().",
+                                directionNav: " . $this->owner->obj('SliderDirectionNav')->NiceAsBoolean().",
                                 prevText: '',
                                 nextText: '',
                                 pauseOnAction: true,
                                 pauseOnHover: true,
-                                " . $sync . "
+                                " . $sync."
                                 start: function(slider){
                                   $('body').removeClass('loading');
                                 },
-                                before: " . $before . ',
-                                after: ' . $after . ',
-                                slideshowSpeed: ' . $speed . '
+                                before: " . $before.',
+                                after: ' . $after.',
+                                slideshowSpeed: ' . $speed.'
                             });
                         }
                     })

src/Model/VideoEmbedSlide.php

Indentation +38 added lines, -38 removed lines

@@ -14,42 +14,42 @@
  */
 class VideoEmbedSlide extends Slide
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Video Embed Slide';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Video Embed Slides';
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'VideoEmbedSlide';
-
-    /**
-     * @var array
-     */
-    private static $has_one = [
-        'Video' => EmbeddedObject::class,
-    ];
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->removeByName(['VideoID']);
-            $fields->addFieldToTab(
-                'Root.Main',
-                EmbeddedObjectField::create('Video', 'Video', $this->Video()),
-                'Content'
-            );
-        });
-
-        return parent::getCMSFields();
-    }
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Video Embed Slide';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Video Embed Slides';
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'VideoEmbedSlide';
+
+	/**
+	 * @var array
+	 */
+	private static $has_one = [
+		'Video' => EmbeddedObject::class,
+	];
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->removeByName(['VideoID']);
+			$fields->addFieldToTab(
+				'Root.Main',
+				EmbeddedObjectField::create('Video', 'Video', $this->Video()),
+				'Content'
+			);
+		});
+
+		return parent::getCMSFields();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->removeByName(['VideoID']);
             $fields->addFieldToTab(
                 'Root.Main',

src/Model/VideoSlide.php

Indentation +47 added lines, -47 removed lines

@@ -12,51 +12,51 @@
  */
 class VideoSlide extends Slide
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Video Slide';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Video Slides';
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'VideoSlide';
-
-    /**
-     * @var array
-     */
-    private static $has_one = [
-        'Video' => File::class,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $owns = [
-        'Video',
-    ];
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->addFieldToTab(
-                'Root.Main',
-                UploadField::create('Video')
-                    ->setTitle('Video')
-                    ->setDescription('mp4 format')
-                    ->setAllowedExtensions(['mp4']),
-                'Content'
-            );
-        });
-
-        return parent::getCMSFields();
-    }
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Video Slide';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Video Slides';
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'VideoSlide';
+
+	/**
+	 * @var array
+	 */
+	private static $has_one = [
+		'Video' => File::class,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $owns = [
+		'Video',
+	];
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->addFieldToTab(
+				'Root.Main',
+				UploadField::create('Video')
+					->setTitle('Video')
+					->setDescription('mp4 format')
+					->setAllowedExtensions(['mp4']),
+				'Content'
+			);
+		});
+
+		return parent::getCMSFields();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->addFieldToTab(
                 'Root.Main',
                 UploadField::create('Video')

src/Model/Slide.php

Indentation +340 added lines, -340 removed lines

@@ -23,344 +23,344 @@
  */
 class Slide extends DataObject implements PermissionProvider, SlideInterface
 {
-    /**
-     * The Create permission
-     */
-    const SLIDE_CREATE = 'SLIDE_CREATE';
-
-    /**
-     * The Publish permission
-     */
-    const SLIDE_PUBLISH = 'SLIDE_PUBLISH';
-
-    /**
-     * The Edit permission
-     */
-    const SLIDE_EDIT = 'SLIDE_EDIT';
-
-    /**
-     * The Delete permission
-     */
-    const SLIDE_DELETE = 'SLIDE_DELETE';
-
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Slide';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Slides';
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'Slide';
-
-    /**
-     * @var array
-     */
-    private static $db = [
-        'Title' => 'Varchar(255)',
-        'ShowTitle' => 'Boolean',
-        'Content' => 'HTMLText',
-        'SortOrder' => 'Int',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $has_one = [
-        'Page' => \Page::class,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $extensions = [
-        Versioned::class,
-        InheritedPermissionsExtension::class,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $versioning = [
-        "Stage", "Live",
-    ];
-
-
-    /**
-     * @var string
-     */
-    private static $default_sort = 'SortOrder';
-
-    /**
-     * Adds Publish button to SlideImage record
-     *
-     * @var bool
-     */
-    private static $versioned_gridfield_extensions = true;
-
-    /**
-     * @var array
-     */
-    private static $searchable_fields = [
-        'Title',
-        'Content',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $summary_fields = [
-        'SlideType',
-        'Title',
-    ];
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $viewInherit = $fields->dataFieldByName('CanViewType');
-            $editInherit = $fields->dataFieldByName('CanEditType');
-
-            $fields->removeByName([
-                'Title',
-                'ShowTitle',
-                'SortOrder',
-                'CanViewType',
-                'CanEditType',
-                'PageID',
-            ]);
-
-            $fields->addFieldToTab(
-                'Root.Main',
-                TextCheckboxGroupField::create(),
-                'Content'
-            );
-
-            $fields->addFieldsToTab(
-                'Root.Permissions',
-                [
-                    $viewInherit,
-                    $editInherit,
-                ]
-            );
-        });
-
-        return parent::getCMSFields();
-    }
-
-    /**
-     * @return array
-     */
-    public function providePermissions()
-    {
-        return [
-            static::SLIDE_CREATE => [
-                'name' => _t(__CLASS__ . '.PERMISSION_CREATE_DESCRIPTION', 'Create Slides'),
-                'help' => _t(__CLASS__ . '.PERMISSION_CREATE_HELP', 'Allow creating slides'),
-                'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
-                'sort' => 100,
-            ],
-            static::SLIDE_PUBLISH => [
-                'name' => _t(__CLASS__ . '.PERMISSION_PUBLISH_DESCRIPTION', 'Publish Slides'),
-                'help' => _t(__CLASS__ . '.PERMISSION_PUBLISH_HELP', 'Allow publishing slides'),
-                'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
-                'sort' => 100,
-            ],
-            static::SLIDE_EDIT => [
-                'name' => _t(__CLASS__ . '.PERMISSION_EDIT_DESCRIPTION', 'Edit Slides'),
-                'help' => _t(__CLASS__ . '.PERMISSION_EDIT_HELP', 'Allow editing slides'),
-                'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
-                'sort' => 100,
-            ],
-            static::SLIDE_DELETE => [
-                'name' => _t(__CLASS__ . '.PERMISSION_DELETE_DESCRIPTION', 'Delete Slides'),
-                'help' => _t(__CLASS__ . '.PERMISSION_DELETE_HELP', 'Allow deleting slides'),
-                'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
-                'sort' => 100,
-            ],
-        ];
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool|int
-     */
-    public function canCreate($member = null, $context = [])
-    {
-        if (!$member) {
-            $member = Security::getCurrentUser();
-        }
-
-        // Standard mechanism for accepting permission changes from extensions
-        $extended = $this->extendedCan(__FUNCTION__, $member, $context);
-        if ($extended !== null) {
-            return $extended;
-        }
-
-        // Check permission
-        if ($member && Permission::checkMember($member, "ADMIN") || Permission::checkMember($member, static::SLIDE_CREATE)) {
-            return true;
-        }
-
-        // This doesn't necessarily mean we are creating a root page, but that
-        // we don't know if there is a parent, so default to this permission
-        return SiteConfig::current_site_config()->canCreateTopLevel($member);
-    }
-
-    /**
-     * @param null $member
-     * @return bool|int
-     */
-    public function canPublish($member = null)
-    {
-        if (!$member) {
-            $member = Security::getCurrentUser();
-        }
-
-        // Check extension
-        $extended = $this->extendedCan('canPublish', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-
-        if (Permission::checkMember($member, "ADMIN") || Permission::checkMember($member, static::SLIDE_PUBLISH)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param null $member
-     * @return bool|int
-     */
-    public function canEdit($member = null)
-    {
-        if (!$member) {
-            $member = Security::getCurrentUser();
-        }
-
-        // Standard mechanism for accepting permission changes from extensions
-        $extended = $this->extendedCan('canEdit', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-
-        // Default permissions
-        if (Permission::checkMember($member, "ADMIN") || Permission::checkMember($member, static::SLIDE_EDIT)) {
-            return true;
-        }
-
-
-        return false;
-    }
-
-    /**
-     * @param null $member
-     * @return bool|null
-     */
-    public function canView($member = null)
-    {
-        if (!$member) {
-            $member = Security::getCurrentUser();
-        }
-
-        // Standard mechanism for accepting permission changes from extensions
-        $extended = $this->extendedCan('canView', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-
-        // admin override
-        if ($member && Permission::checkMember($member, ["ADMIN", "SITETREE_VIEW_ALL"])) {
-            return true;
-        }
-
-        // Note: getInheritedPermissions() is disused in this instance
-        // to allow parent canView extensions to influence subpage canView()
-
-        // check for empty spec
-        if (!$this->CanViewType || $this->CanViewType === InheritedPermissions::ANYONE) {
-            return true;
-        }
-
-        // check for inherit
-        if ($this->CanViewType === InheritedPermissions::INHERIT) {
-            return $this->getSiteConfig()->canViewPages($member);
-        }
-
-        // check for any logged-in users
-        if ($this->CanViewType === InheritedPermissions::LOGGED_IN_USERS && $member && $member->ID) {
-            return true;
-        }
-
-        // check for specific groups
-        if ($this->CanViewType === InheritedPermissions::ONLY_THESE_USERS
-            && $member
-            && $member->inGroups($this->ViewerGroups())
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param null $member
-     * @return bool|int
-     */
-    public function canDelete($member = null)
-    {
-        if (!$member) {
-            $member = Security::getCurrentUser();
-        }
-
-        // Standard mechanism for accepting permission changes from extensions
-        $extended = $this->extendedCan('canDelete', $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-
-        if (!$member) {
-            return false;
-        }
-
-        // Default permission check
-        if (Permission::checkMember($member, ["ADMIN", static::SLIDE_DELETE])) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Stub method to get the site config, unless the current class can provide an alternate.
-     *
-     * @return SiteConfig
-     */
-    public function getSiteConfig()
-    {
-        $configs = $this->invokeWithExtensions('alternateSiteConfig');
-        foreach (array_filter($configs) as $config) {
-            return $config;
-        }
-
-        return SiteConfig::current_site_config();
-    }
-
-    /**
-     * @return string
-     */
-    public function getSlideType()
-    {
-        return static::i18n_singular_name();
-    }
+	/**
+	 * The Create permission
+	 */
+	const SLIDE_CREATE = 'SLIDE_CREATE';
+
+	/**
+	 * The Publish permission
+	 */
+	const SLIDE_PUBLISH = 'SLIDE_PUBLISH';
+
+	/**
+	 * The Edit permission
+	 */
+	const SLIDE_EDIT = 'SLIDE_EDIT';
+
+	/**
+	 * The Delete permission
+	 */
+	const SLIDE_DELETE = 'SLIDE_DELETE';
+
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Slide';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Slides';
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'Slide';
+
+	/**
+	 * @var array
+	 */
+	private static $db = [
+		'Title' => 'Varchar(255)',
+		'ShowTitle' => 'Boolean',
+		'Content' => 'HTMLText',
+		'SortOrder' => 'Int',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $has_one = [
+		'Page' => \Page::class,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $extensions = [
+		Versioned::class,
+		InheritedPermissionsExtension::class,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $versioning = [
+		"Stage", "Live",
+	];
+
+
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'SortOrder';
+
+	/**
+	 * Adds Publish button to SlideImage record
+	 *
+	 * @var bool
+	 */
+	private static $versioned_gridfield_extensions = true;
+
+	/**
+	 * @var array
+	 */
+	private static $searchable_fields = [
+		'Title',
+		'Content',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $summary_fields = [
+		'SlideType',
+		'Title',
+	];
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$viewInherit = $fields->dataFieldByName('CanViewType');
+			$editInherit = $fields->dataFieldByName('CanEditType');
+
+			$fields->removeByName([
+				'Title',
+				'ShowTitle',
+				'SortOrder',
+				'CanViewType',
+				'CanEditType',
+				'PageID',
+			]);
+
+			$fields->addFieldToTab(
+				'Root.Main',
+				TextCheckboxGroupField::create(),
+				'Content'
+			);
+
+			$fields->addFieldsToTab(
+				'Root.Permissions',
+				[
+					$viewInherit,
+					$editInherit,
+				]
+			);
+		});
+
+		return parent::getCMSFields();
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return [
+			static::SLIDE_CREATE => [
+				'name' => _t(__CLASS__ . '.PERMISSION_CREATE_DESCRIPTION', 'Create Slides'),
+				'help' => _t(__CLASS__ . '.PERMISSION_CREATE_HELP', 'Allow creating slides'),
+				'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
+				'sort' => 100,
+			],
+			static::SLIDE_PUBLISH => [
+				'name' => _t(__CLASS__ . '.PERMISSION_PUBLISH_DESCRIPTION', 'Publish Slides'),
+				'help' => _t(__CLASS__ . '.PERMISSION_PUBLISH_HELP', 'Allow publishing slides'),
+				'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
+				'sort' => 100,
+			],
+			static::SLIDE_EDIT => [
+				'name' => _t(__CLASS__ . '.PERMISSION_EDIT_DESCRIPTION', 'Edit Slides'),
+				'help' => _t(__CLASS__ . '.PERMISSION_EDIT_HELP', 'Allow editing slides'),
+				'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
+				'sort' => 100,
+			],
+			static::SLIDE_DELETE => [
+				'name' => _t(__CLASS__ . '.PERMISSION_DELETE_DESCRIPTION', 'Delete Slides'),
+				'help' => _t(__CLASS__ . '.PERMISSION_DELETE_HELP', 'Allow deleting slides'),
+				'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
+				'sort' => 100,
+			],
+		];
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool|int
+	 */
+	public function canCreate($member = null, $context = [])
+	{
+		if (!$member) {
+			$member = Security::getCurrentUser();
+		}
+
+		// Standard mechanism for accepting permission changes from extensions
+		$extended = $this->extendedCan(__FUNCTION__, $member, $context);
+		if ($extended !== null) {
+			return $extended;
+		}
+
+		// Check permission
+		if ($member && Permission::checkMember($member, "ADMIN") || Permission::checkMember($member, static::SLIDE_CREATE)) {
+			return true;
+		}
+
+		// This doesn't necessarily mean we are creating a root page, but that
+		// we don't know if there is a parent, so default to this permission
+		return SiteConfig::current_site_config()->canCreateTopLevel($member);
+	}
+
+	/**
+	 * @param null $member
+	 * @return bool|int
+	 */
+	public function canPublish($member = null)
+	{
+		if (!$member) {
+			$member = Security::getCurrentUser();
+		}
+
+		// Check extension
+		$extended = $this->extendedCan('canPublish', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
+
+		if (Permission::checkMember($member, "ADMIN") || Permission::checkMember($member, static::SLIDE_PUBLISH)) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param null $member
+	 * @return bool|int
+	 */
+	public function canEdit($member = null)
+	{
+		if (!$member) {
+			$member = Security::getCurrentUser();
+		}
+
+		// Standard mechanism for accepting permission changes from extensions
+		$extended = $this->extendedCan('canEdit', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
+
+		// Default permissions
+		if (Permission::checkMember($member, "ADMIN") || Permission::checkMember($member, static::SLIDE_EDIT)) {
+			return true;
+		}
+
+
+		return false;
+	}
+
+	/**
+	 * @param null $member
+	 * @return bool|null
+	 */
+	public function canView($member = null)
+	{
+		if (!$member) {
+			$member = Security::getCurrentUser();
+		}
+
+		// Standard mechanism for accepting permission changes from extensions
+		$extended = $this->extendedCan('canView', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
+
+		// admin override
+		if ($member && Permission::checkMember($member, ["ADMIN", "SITETREE_VIEW_ALL"])) {
+			return true;
+		}
+
+		// Note: getInheritedPermissions() is disused in this instance
+		// to allow parent canView extensions to influence subpage canView()
+
+		// check for empty spec
+		if (!$this->CanViewType || $this->CanViewType === InheritedPermissions::ANYONE) {
+			return true;
+		}
+
+		// check for inherit
+		if ($this->CanViewType === InheritedPermissions::INHERIT) {
+			return $this->getSiteConfig()->canViewPages($member);
+		}
+
+		// check for any logged-in users
+		if ($this->CanViewType === InheritedPermissions::LOGGED_IN_USERS && $member && $member->ID) {
+			return true;
+		}
+
+		// check for specific groups
+		if ($this->CanViewType === InheritedPermissions::ONLY_THESE_USERS
+			&& $member
+			&& $member->inGroups($this->ViewerGroups())
+		) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param null $member
+	 * @return bool|int
+	 */
+	public function canDelete($member = null)
+	{
+		if (!$member) {
+			$member = Security::getCurrentUser();
+		}
+
+		// Standard mechanism for accepting permission changes from extensions
+		$extended = $this->extendedCan('canDelete', $member);
+		if ($extended !== null) {
+			return $extended;
+		}
+
+		if (!$member) {
+			return false;
+		}
+
+		// Default permission check
+		if (Permission::checkMember($member, ["ADMIN", static::SLIDE_DELETE])) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Stub method to get the site config, unless the current class can provide an alternate.
+	 *
+	 * @return SiteConfig
+	 */
+	public function getSiteConfig()
+	{
+		$configs = $this->invokeWithExtensions('alternateSiteConfig');
+		foreach (array_filter($configs) as $config) {
+			return $config;
+		}
+
+		return SiteConfig::current_site_config();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSlideType()
+	{
+		return static::i18n_singular_name();
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -124,7 +124,7 @@ 
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $viewInherit = $fields->dataFieldByName('CanViewType');
             $editInherit = $fields->dataFieldByName('CanEditType');
 
@@ -162,27 +162,27 @@ 
     {
         return [
             static::SLIDE_CREATE => [
-                'name' => _t(__CLASS__ . '.PERMISSION_CREATE_DESCRIPTION', 'Create Slides'),
-                'help' => _t(__CLASS__ . '.PERMISSION_CREATE_HELP', 'Allow creating slides'),
-                'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
+                'name' => _t(__CLASS__.'.PERMISSION_CREATE_DESCRIPTION', 'Create Slides'),
+                'help' => _t(__CLASS__.'.PERMISSION_CREATE_HELP', 'Allow creating slides'),
+                'category' => _t(__CLASS__.'.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
                 'sort' => 100,
             ],
             static::SLIDE_PUBLISH => [
-                'name' => _t(__CLASS__ . '.PERMISSION_PUBLISH_DESCRIPTION', 'Publish Slides'),
-                'help' => _t(__CLASS__ . '.PERMISSION_PUBLISH_HELP', 'Allow publishing slides'),
-                'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
+                'name' => _t(__CLASS__.'.PERMISSION_PUBLISH_DESCRIPTION', 'Publish Slides'),
+                'help' => _t(__CLASS__.'.PERMISSION_PUBLISH_HELP', 'Allow publishing slides'),
+                'category' => _t(__CLASS__.'.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
                 'sort' => 100,
             ],
             static::SLIDE_EDIT => [
-                'name' => _t(__CLASS__ . '.PERMISSION_EDIT_DESCRIPTION', 'Edit Slides'),
-                'help' => _t(__CLASS__ . '.PERMISSION_EDIT_HELP', 'Allow editing slides'),
-                'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
+                'name' => _t(__CLASS__.'.PERMISSION_EDIT_DESCRIPTION', 'Edit Slides'),
+                'help' => _t(__CLASS__.'.PERMISSION_EDIT_HELP', 'Allow editing slides'),
+                'category' => _t(__CLASS__.'.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
                 'sort' => 100,
             ],
             static::SLIDE_DELETE => [
-                'name' => _t(__CLASS__ . '.PERMISSION_DELETE_DESCRIPTION', 'Delete Slides'),
-                'help' => _t(__CLASS__ . '.PERMISSION_DELETE_HELP', 'Allow deleting slides'),
-                'category' => _t(__CLASS__ . '.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
+                'name' => _t(__CLASS__.'.PERMISSION_DELETE_DESCRIPTION', 'Delete Slides'),
+                'help' => _t(__CLASS__.'.PERMISSION_DELETE_HELP', 'Allow deleting slides'),
+                'category' => _t(__CLASS__.'.PERMISSIONS_CATEGORY', 'FlexSlider Permissions'),
                 'sort' => 100,
             ],
         ];
@@ -201,7 +201,7 @@ 
 
         // Standard mechanism for accepting permission changes from extensions
         $extended = $this->extendedCan(__FUNCTION__, $member, $context);
-        if ($extended !== null) {
+        if ($extended!==null) {
             return $extended;
         }
 
@@ -227,7 +227,7 @@ 
 
         // Check extension
         $extended = $this->extendedCan('canPublish', $member);
-        if ($extended !== null) {
+        if ($extended!==null) {
             return $extended;
         }
 
@@ -250,7 +250,7 @@ 
 
         // Standard mechanism for accepting permission changes from extensions
         $extended = $this->extendedCan('canEdit', $member);
-        if ($extended !== null) {
+        if ($extended!==null) {
             return $extended;
         }
 
@@ -275,7 +275,7 @@ 
 
         // Standard mechanism for accepting permission changes from extensions
         $extended = $this->extendedCan('canView', $member);
-        if ($extended !== null) {
+        if ($extended!==null) {
             return $extended;
         }
 
@@ -288,22 +288,22 @@ 
         // to allow parent canView extensions to influence subpage canView()
 
         // check for empty spec
-        if (!$this->CanViewType || $this->CanViewType === InheritedPermissions::ANYONE) {
+        if (!$this->CanViewType || $this->CanViewType===InheritedPermissions::ANYONE) {
             return true;
         }
 
         // check for inherit
-        if ($this->CanViewType === InheritedPermissions::INHERIT) {
+        if ($this->CanViewType===InheritedPermissions::INHERIT) {
             return $this->getSiteConfig()->canViewPages($member);
         }
 
         // check for any logged-in users
-        if ($this->CanViewType === InheritedPermissions::LOGGED_IN_USERS && $member && $member->ID) {
+        if ($this->CanViewType===InheritedPermissions::LOGGED_IN_USERS && $member && $member->ID) {
             return true;
         }
 
         // check for specific groups
-        if ($this->CanViewType === InheritedPermissions::ONLY_THESE_USERS
+        if ($this->CanViewType===InheritedPermissions::ONLY_THESE_USERS
             && $member
             && $member->inGroups($this->ViewerGroups())
         ) {
@@ -325,7 +325,7 @@ 
 
         // Standard mechanism for accepting permission changes from extensions
         $extended = $this->extendedCan('canDelete', $member);
-        if ($extended !== null) {
+        if ($extended!==null) {
             return $extended;
         }
 

src/Model/ImageSlide.php

Indentation +45 added lines, -45 removed lines

@@ -13,49 +13,49 @@
  */
 class ImageSlide extends Slide
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Image Slide';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Image Slides';
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'ImageSlide';
-
-    /**
-     * @var array
-     */
-    private static $has_one = [
-        'Image' => Image::class,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $owns = [
-        'Image',
-    ];
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->addFieldToTab(
-                'Root.Main',
-                ImageUploadField::create('Image')
-                    ->setTitle('Image'),
-                'Content'
-            );
-        });
-
-        return parent::getCMSFields();
-    }
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Image Slide';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Image Slides';
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'ImageSlide';
+
+	/**
+	 * @var array
+	 */
+	private static $has_one = [
+		'Image' => Image::class,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $owns = [
+		'Image',
+	];
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->addFieldToTab(
+				'Root.Main',
+				ImageUploadField::create('Image')
+					->setTitle('Image'),
+				'Content'
+			);
+		});
+
+		return parent::getCMSFields();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
+        $this->beforeUpdateCMSFields(function(FieldList $fields) {
             $fields->addFieldToTab(
                 'Root.Main',
                 ImageUploadField::create('Image')

src/Interfaces/SlideInterface.php

Indentation +4 added lines, -4 removed lines

@@ -9,8 +9,8 @@
 interface SlideInterface
 {
 
-    /**
-     * @return string
-     */
-    public function getSlideType();
+	/**
+	 * @return string
+	 */
+	public function getSlideType();
 }

tests/ORM/FlexSliderTest.php

Indentation +78 added lines, -78 removed lines

@@ -17,91 +17,91 @@
  */
 class FlexSliderTest extends SapphireTest
 {
-    /**
-     * @var array
-     */
-    protected static $extra_dataobjects = [
-        TestPage::class,
-    ];
+	/**
+	 * @var array
+	 */
+	protected static $extra_dataobjects = [
+		TestPage::class,
+	];
 
-    /**
-     * @var string
-     */
-    protected static $fixture_file = '../fixtures.yml';
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = '../fixtures.yml';
 
-    /**
-     * @var array
-     */
-    protected static $required_extensions = [
-        TestPage::class => [
-            FlexSlider::class,
-        ],
-    ];
+	/**
+	 * @var array
+	 */
+	protected static $required_extensions = [
+		TestPage::class => [
+			FlexSlider::class,
+		],
+	];
 
-    /**
-     *
-     */
-    public function testTabNameConfig()
-    {
-        $page = TestPage::create();
-        $page->write();
-        $pageFields = $page->getCMSFields();
-        $this->assertNotNull($pageFields->dataFieldByName('Slides'));
+	/**
+	 *
+	 */
+	public function testTabNameConfig()
+	{
+		$page = TestPage::create();
+		$page->write();
+		$pageFields = $page->getCMSFields();
+		$this->assertNotNull($pageFields->dataFieldByName('Slides'));
 
-        Config::modify()
-            ->update(TestPage::class, 'slide_tab_title', 'MyCustomSlideTitle');
-        $page2 = TestPage::create();
-        $page2->write();
-        $page2Fields = $page2->getCMSFields();
-        $this->assertNull($page2Fields->fieldByName('Root.Slides'));
-        $this->assertNotNull($page2Fields->fieldByName('Root.MyCustomSlideTitle'));
-    }
+		Config::modify()
+			->update(TestPage::class, 'slide_tab_title', 'MyCustomSlideTitle');
+		$page2 = TestPage::create();
+		$page2->write();
+		$page2Fields = $page2->getCMSFields();
+		$this->assertNull($page2Fields->fieldByName('Root.Slides'));
+		$this->assertNotNull($page2Fields->fieldByName('Root.MyCustomSlideTitle'));
+	}
 
-    /**
-     *
-     */
-    public function testUpdateCMSFields()
-    {
-        $object = TestPage::create();
-        $fields = $object->getCMSFields();
-        $this->assertNull($fields->dataFieldByName('Slides'));
+	/**
+	 *
+	 */
+	public function testUpdateCMSFields()
+	{
+		$object = TestPage::create();
+		$fields = $object->getCMSFields();
+		$this->assertNull($fields->dataFieldByName('Slides'));
 
-        $object->write();
-        $fields = $object->getCMSFields();
-        $this->assertInstanceOf(FieldList::class, $fields);
-        $this->assertNotNull($fields->dataFieldbyName('Slides'));
-    }
+		$object->write();
+		$fields = $object->getCMSFields();
+		$this->assertInstanceOf(FieldList::class, $fields);
+		$this->assertNotNull($fields->dataFieldbyName('Slides'));
+	}
 
-    /**
-     *
-     */
-    public function testGetSlideshow()
-    {
-        $object = TestPage::create();
-        $object->write();
-        $slide1 = $this->objFromFixture(SlideImage::class, 'slide1');
-        $image = $this->objFromFixture(Image::class, 'image1');
-        $slide1->ImageID = $image->ID;
-        $object->Slides()->add($slide1);
-        $slides = $object->getSlideShow();
-        $this->assertInstanceOf(DataList::class, $slides);
-    }
+	/**
+	 *
+	 */
+	public function testGetSlideshow()
+	{
+		$object = TestPage::create();
+		$object->write();
+		$slide1 = $this->objFromFixture(SlideImage::class, 'slide1');
+		$image = $this->objFromFixture(Image::class, 'image1');
+		$slide1->ImageID = $image->ID;
+		$object->Slides()->add($slide1);
+		$slides = $object->getSlideShow();
+		$this->assertInstanceOf(DataList::class, $slides);
+	}
 
-    /**
-     *
-     */
-    public function testGetSlideshowSpeed()
-    {
-        /** @var \Dynamic\FlexSlider\ORM\FlexSlider|\Page $object */
-        $object = TestPage::create();
-        $object->FlexSliderSpeed = 0;
-        $this->assertEquals(
-            Config::inst()->get(FlexSlider::class, 'flex_slider_speed') * 1000,
-            $object->getSlideshowSpeed()
-        );
+	/**
+	 *
+	 */
+	public function testGetSlideshowSpeed()
+	{
+		/** @var \Dynamic\FlexSlider\ORM\FlexSlider|\Page $object */
+		$object = TestPage::create();
+		$object->FlexSliderSpeed = 0;
+		$this->assertEquals(
+			Config::inst()->get(FlexSlider::class, 'flex_slider_speed') * 1000,
+			$object->getSlideshowSpeed()
+		);
 
-        $object->FlexSliderSpeed = 0.5;
-        $object->write();
-        $this->assertEquals(500, $object->getSlideshowSpeed());
-    }
+		$object->FlexSliderSpeed = 0.5;
+		$object->write();
+		$this->assertEquals(500, $object->getSlideshowSpeed());
+	}
 }

tests/Model/SlideImageTest.php

Indentation +17 added lines, -17 removed lines

@@ -16,23 +16,23 @@
  */
 class SlideImageTest extends SapphireTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = '../fixtures.yml';
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = '../fixtures.yml';
 
-    /**
-     *
-     */
-    public function testGetCMSFields()
-    {
-        $object = SlideImage::singleton();
-        $fields = $object->getCMSFields();
+	/**
+	 *
+	 */
+	public function testGetCMSFields()
+	{
+		$object = SlideImage::singleton();
+		$fields = $object->getCMSFields();
 
-        $this->assertInstanceOf(FieldList::class, $fields);
-        $this->assertInstanceOf(TextField::class, $fields->dataFieldByName('Name'));
-        $this->assertInstanceOf(UploadField::class, $fields->dataFieldByName('Image'));
-        $this->assertInstanceOf(EmbeddedObjectField::class, $fields->dataFieldByName('Video'));
-        $this->assertInstanceOf(TextareaField::class, $fields->dataFieldByName('Description'));
-    }
+		$this->assertInstanceOf(FieldList::class, $fields);
+		$this->assertInstanceOf(TextField::class, $fields->dataFieldByName('Name'));
+		$this->assertInstanceOf(UploadField::class, $fields->dataFieldByName('Image'));
+		$this->assertInstanceOf(EmbeddedObjectField::class, $fields->dataFieldByName('Video'));
+		$this->assertInstanceOf(TextareaField::class, $fields->dataFieldByName('Description'));
+	}
 }