dynamic / silverstripe-flexslider

tests/SlideImageTest.php

Indentation +193 added lines, -193 removed lines

@@ -20,197 +20,197 @@
  */
 class SlideImageTest extends SapphireTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = 'fixtures.yml';
-
-    /**
-     *
-     */
-    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'));
-    }
-
-    /**
-     * @throws ValidationException
-     */
-    public function testValidateName()
-    {
-        $object = $this->objFromFixture(SlideImage::class, 'slide1');
-        $object->Name = '';
-        $object->ImageID = 1;
-        $this->setExpectedException(ValidationException::class);
-        $object->write();
-
-        $object->Name = 'Foo';
-        $this->assertGreaterThan(0, $object->write());
-    }
-
-    /**
-     * @throws ValidationException
-     */
-    public function testValidateImage()
-    {
-        $object = $this->objFromFixture(SlideImage::class, 'slide1');
-        $object->ImageID = null;
-        $this->setExpectedException(ValidationException::class);
-        $object->write();
-
-        $base->ImageID = 1;
-        $this->assertGreaterThan(0, $object->write());
-    }
-
-    /**
-     * @throws ValidationException
-     */
-    public function testValidateVideo()
-    {
-        $object = $this->objFromFixture(SlideImage::class, 'slide2');
-        $object->VideoID = null;
-        $this->setExpectedException(ValidationException::class);
-        $object->write();
-
-        $object->VideoID = 1;
-        $this->assertGreaterThan(0, $object->write());
-    }
-
-    /**
-     * @throws ValidationException
-     */
-    public function testValidateText()
-    {
-        $object = $this->objFromFixture(SlideImage::class, 'slide3');
-        $description = $object->Description;
-
-        $object->Description = null;
-        $this->setExpectedException(ValidationException::class);
-        $object->write();
-
-        $object->Description = $description;
-        $this->assertGreaterThan(0, $object->write());
-    }
-
-    /**
-     *
-     */
-    public function testProvidePermissions()
-    {
-        $object = SlideImage::singleton();
-
-        $expected = [
-            'Slide_EDIT' => 'Slide Edit',
-            'Slide_DELETE' => 'Slide Delete',
-            'Slide_CREATE' => 'Slide Create',
-        ];
-
-        $this->assertEquals($expected, $object->providePermissions());
-    }
-
-    /**
-     *
-     */
-    public function testCanCreate()
-    {
-        $object = $this->objFromFixture(SlideImage::class, 'slide1');
-        $admin = $this->objFromFixture(Member::class, 'admin');
-        $this->assertTrue($object->canCreate($admin));
-
-        $author = $this->objFromFixture(Member::class, 'author');
-        $this->assertTrue($object->canCreate($author));
-
-        $member = $this->objFromFixture(Member::class, 'default');
-        $this->assertFalse($object->canCreate($member));
-    }
-
-    /**
-     *
-     */
-    public function testCanEdit()
-    {
-        $object = $this->objFromFixture(SlideImage::class, 'slide1');
-        $admin = $this->objFromFixture(Member::class, 'admin');
-        $this->assertTrue($object->canEdit($admin));
-
-        $author = $this->objFromFixture(Member::class, 'author');
-        $this->assertTrue($object->canEdit($author));
-
-        $member = $this->objFromFixture(Member::class, 'default');
-        $this->assertFalse($object->canEdit($member));
-    }
-
-    /**
-     *
-     */
-    public function testCanDelete()
-    {
-        $object = $this->objFromFixture(SlideImage::class, 'slide1');
-        $admin = $this->objFromFixture(Member::class, 'admin');
-        $this->assertTrue($object->canDelete($admin));
-
-        $author = $this->objFromFixture(Member::class, 'author');
-        $this->assertTrue($object->canDelete($author));
-
-        $member = $this->objFromFixture(Member::class, 'default');
-        $this->assertFalse($object->canDelete($member));
-    }
-
-    /**
-     *
-     */
-    public function testCanView()
-    {
-        $object = $this->objFromFixture(SlideImage::class, 'slide1');
-        $admin = $this->objFromFixture(Member::class, 'admin');
-        $this->assertTrue($object->canView($admin));
-
-        $author = $this->objFromFixture(Member::class, 'author');
-        $this->assertTrue($object->canView($author));
-
-        $member = $this->objFromFixture(Member::class, 'default');
-        $this->assertTrue($object->canView($member));
-    }
-
-    /**
-     *
-     */
-    public function testImageSizeLimit()
-    {
-        $default = 512000;
-        $this->assertEquals(Config::modify()->get(SlideImage::class, 'image_size_limit'), $default);
-
-        $new = 1024000;
-        Config::modify()->update(SlideImage::class, 'image_size_limit', $new);
-        $this->assertEquals(Config::modify()->get(SlideImage::class, 'image_size_limit'), $new);
-    }
-
-    /**
-     *
-     */
-    public function testRenderWith()
-    {
-        $this->markTestSkipped("Todo SlideImageText::testRenderWith()");
-        //$slide = SlideImage::singleton();
-
-        //$this->assertInstanceOf(DBHTMLText::class, $slide->renderWith());
-    }
-
-    /**
-     *
-     */
-    public function testForTemplate()
-    {
-        $this->markTestSkipped("Todo SlideImageText::testForTemplate()");
-        //$slide = SlideImage::singleton();
-
-        //$this->assertInstanceOf(DBHTMLText::class, $slide->forTemplate());
-    }
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = 'fixtures.yml';
+
+	/**
+	 *
+	 */
+	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'));
+	}
+
+	/**
+	 * @throws ValidationException
+	 */
+	public function testValidateName()
+	{
+		$object = $this->objFromFixture(SlideImage::class, 'slide1');
+		$object->Name = '';
+		$object->ImageID = 1;
+		$this->setExpectedException(ValidationException::class);
+		$object->write();
+
+		$object->Name = 'Foo';
+		$this->assertGreaterThan(0, $object->write());
+	}
+
+	/**
+	 * @throws ValidationException
+	 */
+	public function testValidateImage()
+	{
+		$object = $this->objFromFixture(SlideImage::class, 'slide1');
+		$object->ImageID = null;
+		$this->setExpectedException(ValidationException::class);
+		$object->write();
+
+		$base->ImageID = 1;
+		$this->assertGreaterThan(0, $object->write());
+	}
+
+	/**
+	 * @throws ValidationException
+	 */
+	public function testValidateVideo()
+	{
+		$object = $this->objFromFixture(SlideImage::class, 'slide2');
+		$object->VideoID = null;
+		$this->setExpectedException(ValidationException::class);
+		$object->write();
+
+		$object->VideoID = 1;
+		$this->assertGreaterThan(0, $object->write());
+	}
+
+	/**
+	 * @throws ValidationException
+	 */
+	public function testValidateText()
+	{
+		$object = $this->objFromFixture(SlideImage::class, 'slide3');
+		$description = $object->Description;
+
+		$object->Description = null;
+		$this->setExpectedException(ValidationException::class);
+		$object->write();
+
+		$object->Description = $description;
+		$this->assertGreaterThan(0, $object->write());
+	}
+
+	/**
+	 *
+	 */
+	public function testProvidePermissions()
+	{
+		$object = SlideImage::singleton();
+
+		$expected = [
+			'Slide_EDIT' => 'Slide Edit',
+			'Slide_DELETE' => 'Slide Delete',
+			'Slide_CREATE' => 'Slide Create',
+		];
+
+		$this->assertEquals($expected, $object->providePermissions());
+	}
+
+	/**
+	 *
+	 */
+	public function testCanCreate()
+	{
+		$object = $this->objFromFixture(SlideImage::class, 'slide1');
+		$admin = $this->objFromFixture(Member::class, 'admin');
+		$this->assertTrue($object->canCreate($admin));
+
+		$author = $this->objFromFixture(Member::class, 'author');
+		$this->assertTrue($object->canCreate($author));
+
+		$member = $this->objFromFixture(Member::class, 'default');
+		$this->assertFalse($object->canCreate($member));
+	}
+
+	/**
+	 *
+	 */
+	public function testCanEdit()
+	{
+		$object = $this->objFromFixture(SlideImage::class, 'slide1');
+		$admin = $this->objFromFixture(Member::class, 'admin');
+		$this->assertTrue($object->canEdit($admin));
+
+		$author = $this->objFromFixture(Member::class, 'author');
+		$this->assertTrue($object->canEdit($author));
+
+		$member = $this->objFromFixture(Member::class, 'default');
+		$this->assertFalse($object->canEdit($member));
+	}
+
+	/**
+	 *
+	 */
+	public function testCanDelete()
+	{
+		$object = $this->objFromFixture(SlideImage::class, 'slide1');
+		$admin = $this->objFromFixture(Member::class, 'admin');
+		$this->assertTrue($object->canDelete($admin));
+
+		$author = $this->objFromFixture(Member::class, 'author');
+		$this->assertTrue($object->canDelete($author));
+
+		$member = $this->objFromFixture(Member::class, 'default');
+		$this->assertFalse($object->canDelete($member));
+	}
+
+	/**
+	 *
+	 */
+	public function testCanView()
+	{
+		$object = $this->objFromFixture(SlideImage::class, 'slide1');
+		$admin = $this->objFromFixture(Member::class, 'admin');
+		$this->assertTrue($object->canView($admin));
+
+		$author = $this->objFromFixture(Member::class, 'author');
+		$this->assertTrue($object->canView($author));
+
+		$member = $this->objFromFixture(Member::class, 'default');
+		$this->assertTrue($object->canView($member));
+	}
+
+	/**
+	 *
+	 */
+	public function testImageSizeLimit()
+	{
+		$default = 512000;
+		$this->assertEquals(Config::modify()->get(SlideImage::class, 'image_size_limit'), $default);
+
+		$new = 1024000;
+		Config::modify()->update(SlideImage::class, 'image_size_limit', $new);
+		$this->assertEquals(Config::modify()->get(SlideImage::class, 'image_size_limit'), $new);
+	}
+
+	/**
+	 *
+	 */
+	public function testRenderWith()
+	{
+		$this->markTestSkipped("Todo SlideImageText::testRenderWith()");
+		//$slide = SlideImage::singleton();
+
+		//$this->assertInstanceOf(DBHTMLText::class, $slide->renderWith());
+	}
+
+	/**
+	 *
+	 */
+	public function testForTemplate()
+	{
+		$this->markTestSkipped("Todo SlideImageText::testForTemplate()");
+		//$slide = SlideImage::singleton();
+
+		//$this->assertInstanceOf(DBHTMLText::class, $slide->forTemplate());
+	}
 }

tests/TestPage.php

Indentation +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@
  */
 class TestPage extends \Page implements TestOnly
 {
-    private static $slide_tab_title = '';
+	private static $slide_tab_title = '';
 
-    private static $table_name = 'FlexsliderTestPage';
+	private static $table_name = 'FlexsliderTestPage';
 }

tests/FlexSliderTest.php

Indentation +78 added lines, -78 removed lines

@@ -12,91 +12,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());
+	}
 }

src/Task/DefaultSlideTypeTask.php

Indentation +49 added lines, -49 removed lines

@@ -12,61 +12,61 @@
  */
 class DefaultSlideTypeTask extends BuildTask
 {
-    /**
-     * @var string
-     */
-    private static $segment = 'default-slide-type-task';
+	/**
+	 * @var string
+	 */
+	private static $segment = 'default-slide-type-task';
 
-    /**
-     * @var string
-     */
-    protected $title = 'Flexslider - Default Slide Type Task';
+	/**
+	 * @var string
+	 */
+	protected $title = 'Flexslider - Default Slide Type Task';
 
-    /**
-     * @param \SilverStripe\Control\HTTPRequest $request
-     */
-    public function run($request)
-    {
-        $this->setDefaults();
-    }
+	/**
+	 * @param \SilverStripe\Control\HTTPRequest $request
+	 */
+	public function run($request)
+	{
+		$this->setDefaults();
+	}
 
-    /**
-     *
-     */
-    protected function setDefaults()
-    {
-        $default = SlideImage::singleton()->config()->get('defaults');
+	/**
+	 *
+	 */
+	protected function setDefaults()
+	{
+		$default = SlideImage::singleton()->config()->get('defaults');
 
-        if (isset($default['SlideType'])) {
-            $baseTable = SlideImage::singleton()->baseTable();
+		if (isset($default['SlideType'])) {
+			$baseTable = SlideImage::singleton()->baseTable();
 
-            $tables = [
-                $baseTable,
-                "{$baseTable}_Versions",
-                "{$baseTable}_Live",
-            ];
+			$tables = [
+				$baseTable,
+				"{$baseTable}_Versions",
+				"{$baseTable}_Live",
+			];
 
-            foreach ($tables as $table) {
-                $query = DB::query("SELECT * FROM \"{$table}\" WHERE \"SlideType\" IS NULL");
+			foreach ($tables as $table) {
+				$query = DB::query("SELECT * FROM \"{$table}\" WHERE \"SlideType\" IS NULL");
 
-                foreach ($this->yieldSingle($query) as $record) {
-                    DB::prepared_query(
-                        "UPDATE \"{$table}\" SET \"SlideType\" = ? WHERE \"ID\" = ?",
-                        [$default['SlideType'], $record['ID']]
-                    );
-                }
-            }
-        }
-    }
+				foreach ($this->yieldSingle($query) as $record) {
+					DB::prepared_query(
+						"UPDATE \"{$table}\" SET \"SlideType\" = ? WHERE \"ID\" = ?",
+						[$default['SlideType'], $record['ID']]
+					);
+				}
+			}
+		}
+	}
 
-    /**
-     * @param $list
-     * @return \Generator
-     */
-    protected function yieldSingle($list)
-    {
-        foreach ($list as $item) {
-            yield $item;
-        }
-    }
+	/**
+	 * @param $list
+	 * @return \Generator
+	 */
+	protected function yieldSingle($list)
+	{
+		foreach ($list as $item) {
+			yield $item;
+		}
+	}
 }

src/Task/SlideLinkTask.php

Indentation +118 added lines, -118 removed lines

@@ -14,122 +14,122 @@
  */
 class SlideLinkTask extends BuildTask
 {
-    /**
-     * @var string
-     */
-    protected $title = 'Flexslider - Slide Link Migration Task';
-
-    /**
-     * @var string
-     */
-    private static $segment = 'slide-link-migration-task';
-
-    /**
-     * @var array
-     */
-    private $known_links = [];
-
-    /**
-     * @param \SilverStripe\Control\HTTPRequest $request
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    public function run($request)
-    {
-        $this->migrateLinks();
-    }
-
-    /**
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    protected function migrateLinks()
-    {
-        $baseTable = SlideImage::singleton()->baseTable();
-
-        $tables = [
-            $baseTable,
-            "{$baseTable}_Versions",
-            "{$baseTable}_Live",
-        ];
-
-        foreach ($tables as $table) {
-            foreach ($this->yieldSingle(DB::query("SELECT * FROM \"{$table}\"")) as $record) {
-                $linkID = $record['PageLinkID'];
-                $linkLabel = isset($record['LinkLabel']) ? $record['LinkLabel'] : null;
-
-                $slideLink = $this->findOrMakeLink($linkID, $linkLabel);
-
-                if ($slideLink !== false && $slideLink instanceof Link) {
-                    DB::prepared_query(
-                        "UPDATE \"{$table}\" SET \"SlideLinkID\" = ? WHERE \"ID\" = ?",
-                        [$slideLink->ID, $record['ID']]
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * @param $list
-     * @return \Generator
-     */
-    private function yieldSingle($list)
-    {
-        foreach ($list as $item) {
-            yield $item;
-        }
-    }
-
-    /**
-     * @param int $linkID
-     * @param string $linkLabel
-     * @return bool|mixed|Link
-     * @throws \SilverStripe\ORM\ValidationException
-     */
-    private function findOrMakeLink($linkID = 0, $linkLabel = '')
-    {
-        if (!$linkID || !($page = SiteTree::get()->byID($linkID))) {
-            return false;
-        }
-
-        if (isset($this->getKnownLinks()[$linkID])) {
-            return $this->getKnownLinks()[$linkID];
-        }
-
-        $link = Link::create();
-        $link->Type = 'SiteTree';
-        $link->SiteTreeID = $linkID;
-        $link->Template = 'button';
-
-        if ($linkLabel !== null && $linkLabel !== '') {
-            $link->Title = $linkLabel;
-        } else {
-            $link->Title = $page->Title;
-        }
-
-        $link->write();
-
-        $this->addKnownLink($linkID, $link);
-
-        return $link;
-    }
-
-    /**
-     * @param $linkID
-     * @param $linkableLinkID
-     * @return $this
-     */
-    private function addKnownLink($linkID, $linkableLinkID)
-    {
-        $this->known_links[$linkID] = $linkableLinkID;
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    private function getKnownLinks()
-    {
-        return $this->known_links;
-    }
+	/**
+	 * @var string
+	 */
+	protected $title = 'Flexslider - Slide Link Migration Task';
+
+	/**
+	 * @var string
+	 */
+	private static $segment = 'slide-link-migration-task';
+
+	/**
+	 * @var array
+	 */
+	private $known_links = [];
+
+	/**
+	 * @param \SilverStripe\Control\HTTPRequest $request
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	public function run($request)
+	{
+		$this->migrateLinks();
+	}
+
+	/**
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	protected function migrateLinks()
+	{
+		$baseTable = SlideImage::singleton()->baseTable();
+
+		$tables = [
+			$baseTable,
+			"{$baseTable}_Versions",
+			"{$baseTable}_Live",
+		];
+
+		foreach ($tables as $table) {
+			foreach ($this->yieldSingle(DB::query("SELECT * FROM \"{$table}\"")) as $record) {
+				$linkID = $record['PageLinkID'];
+				$linkLabel = isset($record['LinkLabel']) ? $record['LinkLabel'] : null;
+
+				$slideLink = $this->findOrMakeLink($linkID, $linkLabel);
+
+				if ($slideLink !== false && $slideLink instanceof Link) {
+					DB::prepared_query(
+						"UPDATE \"{$table}\" SET \"SlideLinkID\" = ? WHERE \"ID\" = ?",
+						[$slideLink->ID, $record['ID']]
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param $list
+	 * @return \Generator
+	 */
+	private function yieldSingle($list)
+	{
+		foreach ($list as $item) {
+			yield $item;
+		}
+	}
+
+	/**
+	 * @param int $linkID
+	 * @param string $linkLabel
+	 * @return bool|mixed|Link
+	 * @throws \SilverStripe\ORM\ValidationException
+	 */
+	private function findOrMakeLink($linkID = 0, $linkLabel = '')
+	{
+		if (!$linkID || !($page = SiteTree::get()->byID($linkID))) {
+			return false;
+		}
+
+		if (isset($this->getKnownLinks()[$linkID])) {
+			return $this->getKnownLinks()[$linkID];
+		}
+
+		$link = Link::create();
+		$link->Type = 'SiteTree';
+		$link->SiteTreeID = $linkID;
+		$link->Template = 'button';
+
+		if ($linkLabel !== null && $linkLabel !== '') {
+			$link->Title = $linkLabel;
+		} else {
+			$link->Title = $page->Title;
+		}
+
+		$link->write();
+
+		$this->addKnownLink($linkID, $link);
+
+		return $link;
+	}
+
+	/**
+	 * @param $linkID
+	 * @param $linkableLinkID
+	 * @return $this
+	 */
+	private function addKnownLink($linkID, $linkableLinkID)
+	{
+		$this->known_links[$linkID] = $linkableLinkID;
+
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	private function getKnownLinks()
+	{
+		return $this->known_links;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
 
                 $slideLink = $this->findOrMakeLink($linkID, $linkLabel);
 
-                if ($slideLink !== false && $slideLink instanceof Link) {
+                if ($slideLink!==false && $slideLink instanceof Link) {
                     DB::prepared_query(
                         "UPDATE \"{$table}\" SET \"SlideLinkID\" = ? WHERE \"ID\" = ?",
                         [$slideLink->ID, $record['ID']]
@@ -100,7 +100,7 @@ 
         $link->SiteTreeID = $linkID;
         $link->Template = 'button';
 
-        if ($linkLabel !== null && $linkLabel !== '') {
+        if ($linkLabel!==null && $linkLabel!=='') {
             $link->Title = $linkLabel;
         } else {
             $link->Title = $page->Title;

src/Task/SlideThumbnailNavMigrationTask.php

Indentation +78 added lines, -78 removed lines

@@ -16,91 +16,91 @@
  */
 class SlideThumbnailNavMigrationTask extends BuildTask
 {
-    /**
-     * @var string
-     */
-    protected $title = 'FlexSlider - Default Values';
+	/**
+	 * @var string
+	 */
+	protected $title = 'FlexSlider - Default Values';
 
-    /**
-     * @var string
-     */
-    protected $description = 'Set default values for slider after the thumbnail nav update';
+	/**
+	 * @var string
+	 */
+	protected $description = 'Set default values for slider after the thumbnail nav update';
 
-    /**
-     * @var string
-     */
-    private static $segment = 'slide-thumbnail-nav-migration-task';
+	/**
+	 * @var string
+	 */
+	private static $segment = 'slide-thumbnail-nav-migration-task';
 
-    /**
-     * @var bool
-     */
-    protected $enabled = true;
+	/**
+	 * @var bool
+	 */
+	protected $enabled = true;
 
-    /**
-     * @param $request
-     */
-    public function run($request)
-    {
-        $this->defaultSliderSettings();
-    }
+	/**
+	 * @param $request
+	 */
+	public function run($request)
+	{
+		$this->defaultSliderSettings();
+	}
 
-    /**
-     * @param $class
-     * @return \Generator
-     */
-    protected function getObjectSet($class)
-    {
-        foreach ($class::get() as $object) {
-            yield $object;
-        }
-    }
+	/**
+	 * @param $class
+	 * @return \Generator
+	 */
+	protected function getObjectSet($class)
+	{
+		foreach ($class::get() as $object) {
+			yield $object;
+		}
+	}
 
-    /**
-     *
-     */
-    public function defaultSliderSettings()
-    {
-        $ct = 0;
+	/**
+	 *
+	 */
+	public function defaultSliderSettings()
+	{
+		$ct = 0;
 
-        $objects = ClassInfo::subclassesFor(DataObject::class);
+		$objects = ClassInfo::subclassesFor(DataObject::class);
 
-        if ($objects) {
-            unset($objects[DataObject::class]);
-            foreach ($objects as $object) {
-                if ($object::singleton()->hasExtension(FlexSlider::class)) {
-                    foreach ($this->getObjectSet($object) as $result) {
-                        $result->Loop = 1;
-                        $result->Animate = 1;
-                        $result->SliderControlNav = 0;
-                        $result->SliderDirectionNav = 1;
-                        $result->CarouselControlNav = 0;
-                        $result->CarouselDirectionNav = 1;
-                        $result->CarouselThumbnailCt = 6;
-                        if ($result instanceof SiteTree || $object::singleton()->hasExtension(Versioned::class)) {
-                            $result->writeToStage('Stage');
-                            if ($result->isPublished()) {
-                                $result->publishRecursive();
-                            }
-                        } else {
-                            $result->write();
-                        }
-                        $ct++;
-                    }
-                }
-            }
-        }
-        static::write_message($ct . " Sliders updated");
-    }
+		if ($objects) {
+			unset($objects[DataObject::class]);
+			foreach ($objects as $object) {
+				if ($object::singleton()->hasExtension(FlexSlider::class)) {
+					foreach ($this->getObjectSet($object) as $result) {
+						$result->Loop = 1;
+						$result->Animate = 1;
+						$result->SliderControlNav = 0;
+						$result->SliderDirectionNav = 1;
+						$result->CarouselControlNav = 0;
+						$result->CarouselDirectionNav = 1;
+						$result->CarouselThumbnailCt = 6;
+						if ($result instanceof SiteTree || $object::singleton()->hasExtension(Versioned::class)) {
+							$result->writeToStage('Stage');
+							if ($result->isPublished()) {
+								$result->publishRecursive();
+							}
+						} else {
+							$result->write();
+						}
+						$ct++;
+					}
+				}
+			}
+		}
+		static::write_message($ct . " Sliders updated");
+	}
 
-    /**
-     * @param $message
-     */
-    protected static function write_message($message)
-    {
-        if (Director::is_cli()) {
-            echo "{$message}\n";
-        } else {
-            echo "{$message}<br><br>";
-        }
-    }
+	/**
+	 * @param $message
+	 */
+	protected static function write_message($message)
+	{
+		if (Director::is_cli()) {
+			echo "{$message}\n";
+		} else {
+			echo "{$message}<br><br>";
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
                 }
             }
         }
-        static::write_message($ct . " Sliders updated");
+        static::write_message($ct." Sliders updated");
     }
 
     /**

src/Model/SlideImage.php

Indentation +305 added lines, -305 removed lines

@@ -37,315 +37,315 @@
  */
 class SlideImage extends DataObject implements PermissionProvider
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Slide';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Slides';
-
-    /**
-     * @var array
-     */
-    private static $db = [
-        'Name' => 'Varchar(255)',
-        'Headline' => 'Varchar(255)',
-        'Description' => 'Text',
-        'SortOrder' => 'Int',
-        'SlideType' => 'Varchar',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $has_one = [
-        'Image' => Image::class,
-        //'Video' => Embed::class,
-        'Page' => \Page::class,
-        'PageLink' => SiteTree::class,
-        'SlideLink' => Link::class,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $owns = [
-        'Image',
-    ];
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'SlideImage';
-
-    /**
-     * @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 $defaults = [
-        'SlideType' => 'Image',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $summary_fields = [
-        'Image.CMSThumbnail' => 'Image',
-        'Name' => 'Name',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $searchable_fields = [
-        'Name',
-        'Headline',
-        'Description',
-    ];
-
-    /**
-     * @var int
-     */
-    private static $image_size_limit = 512000;
-
-    /**
-     * @var array
-     */
-    private static $slide_types = [
-        'Image',
-        'Video',
-        'Text',
-    ];
-
-    /**
-     * @param bool $includerelations
-     * @return array
-     */
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-
-        $labels['Name'] = _t(__CLASS__ . '.NAME', 'Name');
-        $labels['Headline'] = _t(__CLASS__ . '.HEADLINE', 'Headline');
-        $labels['Description'] = _t(__CLASS__ . '.DESCRIPTION', 'Description');
-        $labels['SlideLinkID'] =  _t(__CLASS__ . '.PAGE_LINK', "Call to action link");
-        $labels['Image'] = _t(__CLASS__ . '.IMAGE', 'Image');
-        $labels['SlideType'] = _t(__CLASS__ . '.SlideType', 'Image or Video');
-        $labels['Video'] = _t(__CLASS__ . '.VideoLabel', 'Video URL');
-
-        return $labels;
-    }
-
-    /**
-     * @return \SilverStripe\Forms\FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function ($fields) {
-            $fields->removeByName([
-                'ShowSlide',
-                'SortOrder',
-                'PageID',
-                'Image',
-                'SlideType',
-                'Video',
-                'VideoID',
-                'SlideLinkID',
-            ]);
-
-            // Name
-            $fields->dataFieldByName('Name')
-                ->setDescription(
-                    _t(__CLASS__ . '.INTERNAL_USE', 'for internal reference only')
-                );
-
-            // Headline
-            $fields->dataFieldByName('Headline')
-                ->setDescription(
-                    _t(__CLASS__ . '.USED_IN_TEMPLATE', 'optional, used in template')
-                );
-
-            // Description
-            $fields->dataFieldByName('Description')
-                ->setDescription(
-                    _t(__CLASS__ . '.USED_IN_TEMPLATE', 'optional, used in template')
-                );
-
-            // Page link
-            $fields->replaceField(
-                'PageLinkID',
-                LinkField::create('SlideLink', $this->fieldLabel('SlideLinkID'), $this)
-            );
-
-            // Image
-            $image = UploadField::create('Image', $this->fieldLabel('Image'))
-                ->setFolderName('Uploads/SlideImages');
-
-            $image->getValidator()->setAllowedExtensions(['jpg', 'jpeg', 'png', 'gif']);
-
-            $fields->addFieldToTab(
-                'Root.Main',
-                CompositeField::create(FieldList::create(
-                    DropdownField::create('SlideType', $this->fieldLabel('SlideType'))
-                        ->setSource($this->getTypeSource()),
-                    Wrapper::create(
-                        $image
-                    )->displayIf('SlideType')->isEqualTo('Image')->orIf('SlideType')->isEqualTo('Video')->end(),
-                    /*Wrapper::create(
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Slide';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Slides';
+
+	/**
+	 * @var array
+	 */
+	private static $db = [
+		'Name' => 'Varchar(255)',
+		'Headline' => 'Varchar(255)',
+		'Description' => 'Text',
+		'SortOrder' => 'Int',
+		'SlideType' => 'Varchar',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $has_one = [
+		'Image' => Image::class,
+		//'Video' => Embed::class,
+		'Page' => \Page::class,
+		'PageLink' => SiteTree::class,
+		'SlideLink' => Link::class,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $owns = [
+		'Image',
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'SlideImage';
+
+	/**
+	 * @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 $defaults = [
+		'SlideType' => 'Image',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $summary_fields = [
+		'Image.CMSThumbnail' => 'Image',
+		'Name' => 'Name',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $searchable_fields = [
+		'Name',
+		'Headline',
+		'Description',
+	];
+
+	/**
+	 * @var int
+	 */
+	private static $image_size_limit = 512000;
+
+	/**
+	 * @var array
+	 */
+	private static $slide_types = [
+		'Image',
+		'Video',
+		'Text',
+	];
+
+	/**
+	 * @param bool $includerelations
+	 * @return array
+	 */
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+
+		$labels['Name'] = _t(__CLASS__ . '.NAME', 'Name');
+		$labels['Headline'] = _t(__CLASS__ . '.HEADLINE', 'Headline');
+		$labels['Description'] = _t(__CLASS__ . '.DESCRIPTION', 'Description');
+		$labels['SlideLinkID'] =  _t(__CLASS__ . '.PAGE_LINK', "Call to action link");
+		$labels['Image'] = _t(__CLASS__ . '.IMAGE', 'Image');
+		$labels['SlideType'] = _t(__CLASS__ . '.SlideType', 'Image or Video');
+		$labels['Video'] = _t(__CLASS__ . '.VideoLabel', 'Video URL');
+
+		return $labels;
+	}
+
+	/**
+	 * @return \SilverStripe\Forms\FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function ($fields) {
+			$fields->removeByName([
+				'ShowSlide',
+				'SortOrder',
+				'PageID',
+				'Image',
+				'SlideType',
+				'Video',
+				'VideoID',
+				'SlideLinkID',
+			]);
+
+			// Name
+			$fields->dataFieldByName('Name')
+				->setDescription(
+					_t(__CLASS__ . '.INTERNAL_USE', 'for internal reference only')
+				);
+
+			// Headline
+			$fields->dataFieldByName('Headline')
+				->setDescription(
+					_t(__CLASS__ . '.USED_IN_TEMPLATE', 'optional, used in template')
+				);
+
+			// Description
+			$fields->dataFieldByName('Description')
+				->setDescription(
+					_t(__CLASS__ . '.USED_IN_TEMPLATE', 'optional, used in template')
+				);
+
+			// Page link
+			$fields->replaceField(
+				'PageLinkID',
+				LinkField::create('SlideLink', $this->fieldLabel('SlideLinkID'), $this)
+			);
+
+			// Image
+			$image = UploadField::create('Image', $this->fieldLabel('Image'))
+				->setFolderName('Uploads/SlideImages');
+
+			$image->getValidator()->setAllowedExtensions(['jpg', 'jpeg', 'png', 'gif']);
+
+			$fields->addFieldToTab(
+				'Root.Main',
+				CompositeField::create(FieldList::create(
+					DropdownField::create('SlideType', $this->fieldLabel('SlideType'))
+						->setSource($this->getTypeSource()),
+					Wrapper::create(
+						$image
+					)->displayIf('SlideType')->isEqualTo('Image')->orIf('SlideType')->isEqualTo('Video')->end(),
+					/*Wrapper::create(
                         $videoField = HasOneButtonField::create(
                             'Video',
                             'Video',
                             $this
                         )
                     )->displayIf('SlideType')->isEqualTo('Video')->end()*/
-                ))->setName('MediaFields'),
-                'Description'
-            );
-        });
-
-        $fields = parent::getCMSFields();
-
-        $this->extend('updateSlideImageFields', $fields);
-
-        return $fields;
-    }
-
-    /**
-     * @return \SilverStripe\ORM\ValidationResult
-     */
-    public function validate()
-    {
-        $result = parent::validate();
-
-        if (!$this->Name) {
-            $result->addError(
-                _t(__CLASS__ . '.NAME_REQUIRED', 'A Name is required before you can save')
-            );
-        }
-
-        $types = $this->getTypeSource();
-
-        if (isset($types['Video']) && $this->SlideType == 'Video' && !$this->VideoID) {
-            $result->addError(
-                _t(__CLASS__ . '.VIDEO_REQUIRED', 'An Video Link is required before you can save')
-            );
-        }
-
-        if (isset($types['Image']) && $this->SlideType == 'Image' && !$this->ImageID) {
-            $result->addError(
-                _t(__CLASS__ . '.IMAGE_REQUIRED', 'An Image is required before you can save')
-            );
-        }
-
-        if (isset($types['Text']) && $this->SlideType == 'Text' && !$this->Description) {
-            $result->addError(
-                _t(__CLASS__ . '.DESCRIPTION_REQUIRED', 'A Description is required before you can save')
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return array
-     */
-    public function providePermissions()
-    {
-        return [
-            'Slide_EDIT' => 'Slide Edit',
-            'Slide_DELETE' => 'Slide Delete',
-            'Slide_CREATE' => 'Slide Create',
-        ];
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     *
-     * @return bool|int
-     */
-    public function canCreate($member = null, $context = [])
-    {
-        return Permission::check('Slide_CREATE', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     *
-     * @return bool|int
-     */
-    public function canEdit($member = null, $context = [])
-    {
-        return Permission::check('Slide_EDIT', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     *
-     * @return bool|int
-     */
-    public function canDelete($member = null, $context = [])
-    {
-        return Permission::check('Slide_DELETE', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     *
-     * @return bool
-     */
-    public function canView($member = null, $context = [])
-    {
-        return true;
-    }
-
-    /**
-     * @return array
-     */
-    public function getTypeSource()
-    {
-        $types = $this->config()->get('slide_types');
-        asort($types);
-        return array_combine($types, $types);
-    }
-
-    /**
-     * @param null $template
-     * @param null $customFields
-     * @return \SilverStripe\ORM\FieldType\DBHTMLText
-     */
-    public function renderWith($template = null, $customFields = null)
-    {
-        if ($template === null) {
-            $template = static::class;
-            $template = ($this->SlideType) ? $template . "_{$this->SlideType}" : '';
-        }
-
-        return parent::renderWith($template);
-    }
-
-    /**
-     * @return \SilverStripe\ORM\FieldType\DBHTMLText
-     */
-    public function forTemplate()
-    {
-        return $this->renderWith();
-    }
+				))->setName('MediaFields'),
+				'Description'
+			);
+		});
+
+		$fields = parent::getCMSFields();
+
+		$this->extend('updateSlideImageFields', $fields);
+
+		return $fields;
+	}
+
+	/**
+	 * @return \SilverStripe\ORM\ValidationResult
+	 */
+	public function validate()
+	{
+		$result = parent::validate();
+
+		if (!$this->Name) {
+			$result->addError(
+				_t(__CLASS__ . '.NAME_REQUIRED', 'A Name is required before you can save')
+			);
+		}
+
+		$types = $this->getTypeSource();
+
+		if (isset($types['Video']) && $this->SlideType == 'Video' && !$this->VideoID) {
+			$result->addError(
+				_t(__CLASS__ . '.VIDEO_REQUIRED', 'An Video Link is required before you can save')
+			);
+		}
+
+		if (isset($types['Image']) && $this->SlideType == 'Image' && !$this->ImageID) {
+			$result->addError(
+				_t(__CLASS__ . '.IMAGE_REQUIRED', 'An Image is required before you can save')
+			);
+		}
+
+		if (isset($types['Text']) && $this->SlideType == 'Text' && !$this->Description) {
+			$result->addError(
+				_t(__CLASS__ . '.DESCRIPTION_REQUIRED', 'A Description is required before you can save')
+			);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return [
+			'Slide_EDIT' => 'Slide Edit',
+			'Slide_DELETE' => 'Slide Delete',
+			'Slide_CREATE' => 'Slide Create',
+		];
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 *
+	 * @return bool|int
+	 */
+	public function canCreate($member = null, $context = [])
+	{
+		return Permission::check('Slide_CREATE', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 *
+	 * @return bool|int
+	 */
+	public function canEdit($member = null, $context = [])
+	{
+		return Permission::check('Slide_EDIT', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 *
+	 * @return bool|int
+	 */
+	public function canDelete($member = null, $context = [])
+	{
+		return Permission::check('Slide_DELETE', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 *
+	 * @return bool
+	 */
+	public function canView($member = null, $context = [])
+	{
+		return true;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getTypeSource()
+	{
+		$types = $this->config()->get('slide_types');
+		asort($types);
+		return array_combine($types, $types);
+	}
+
+	/**
+	 * @param null $template
+	 * @param null $customFields
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
+	 */
+	public function renderWith($template = null, $customFields = null)
+	{
+		if ($template === null) {
+			$template = static::class;
+			$template = ($this->SlideType) ? $template . "_{$this->SlideType}" : '';
+		}
+
+		return parent::renderWith($template);
+	}
+
+	/**
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
+	 */
+	public function forTemplate()
+	{
+		return $this->renderWith();
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -139,13 +139,13 @@ 
     {
         $labels = parent::fieldLabels($includerelations);
 
-        $labels['Name'] = _t(__CLASS__ . '.NAME', 'Name');
-        $labels['Headline'] = _t(__CLASS__ . '.HEADLINE', 'Headline');
-        $labels['Description'] = _t(__CLASS__ . '.DESCRIPTION', 'Description');
-        $labels['SlideLinkID'] =  _t(__CLASS__ . '.PAGE_LINK', "Call to action link");
-        $labels['Image'] = _t(__CLASS__ . '.IMAGE', 'Image');
-        $labels['SlideType'] = _t(__CLASS__ . '.SlideType', 'Image or Video');
-        $labels['Video'] = _t(__CLASS__ . '.VideoLabel', 'Video URL');
+        $labels['Name'] = _t(__CLASS__.'.NAME', 'Name');
+        $labels['Headline'] = _t(__CLASS__.'.HEADLINE', 'Headline');
+        $labels['Description'] = _t(__CLASS__.'.DESCRIPTION', 'Description');
+        $labels['SlideLinkID'] = _t(__CLASS__.'.PAGE_LINK', "Call to action link");
+        $labels['Image'] = _t(__CLASS__.'.IMAGE', 'Image');
+        $labels['SlideType'] = _t(__CLASS__.'.SlideType', 'Image or Video');
+        $labels['Video'] = _t(__CLASS__.'.VideoLabel', 'Video URL');
 
         return $labels;
     }
@@ -155,7 +155,7 @@ 
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function ($fields) {
+        $this->beforeUpdateCMSFields(function($fields) {
             $fields->removeByName([
                 'ShowSlide',
                 'SortOrder',
@@ -170,19 +170,19 @@ 
             // Name
             $fields->dataFieldByName('Name')
                 ->setDescription(
-                    _t(__CLASS__ . '.INTERNAL_USE', 'for internal reference only')
+                    _t(__CLASS__.'.INTERNAL_USE', 'for internal reference only')
                 );
 
             // Headline
             $fields->dataFieldByName('Headline')
                 ->setDescription(
-                    _t(__CLASS__ . '.USED_IN_TEMPLATE', 'optional, used in template')
+                    _t(__CLASS__.'.USED_IN_TEMPLATE', 'optional, used in template')
                 );
 
             // Description
             $fields->dataFieldByName('Description')
                 ->setDescription(
-                    _t(__CLASS__ . '.USED_IN_TEMPLATE', 'optional, used in template')
+                    _t(__CLASS__.'.USED_IN_TEMPLATE', 'optional, used in template')
                 );
 
             // Page link
@@ -233,27 +233,27 @@ 
 
         if (!$this->Name) {
             $result->addError(
-                _t(__CLASS__ . '.NAME_REQUIRED', 'A Name is required before you can save')
+                _t(__CLASS__.'.NAME_REQUIRED', 'A Name is required before you can save')
             );
         }
 
         $types = $this->getTypeSource();
 
-        if (isset($types['Video']) && $this->SlideType == 'Video' && !$this->VideoID) {
+        if (isset($types['Video']) && $this->SlideType=='Video' && !$this->VideoID) {
             $result->addError(
-                _t(__CLASS__ . '.VIDEO_REQUIRED', 'An Video Link is required before you can save')
+                _t(__CLASS__.'.VIDEO_REQUIRED', 'An Video Link is required before you can save')
             );
         }
 
-        if (isset($types['Image']) && $this->SlideType == 'Image' && !$this->ImageID) {
+        if (isset($types['Image']) && $this->SlideType=='Image' && !$this->ImageID) {
             $result->addError(
-                _t(__CLASS__ . '.IMAGE_REQUIRED', 'An Image is required before you can save')
+                _t(__CLASS__.'.IMAGE_REQUIRED', 'An Image is required before you can save')
             );
         }
 
-        if (isset($types['Text']) && $this->SlideType == 'Text' && !$this->Description) {
+        if (isset($types['Text']) && $this->SlideType=='Text' && !$this->Description) {
             $result->addError(
-                _t(__CLASS__ . '.DESCRIPTION_REQUIRED', 'A Description is required before you can save')
+                _t(__CLASS__.'.DESCRIPTION_REQUIRED', 'A Description is required before you can save')
             );
         }
 
@@ -333,9 +333,9 @@ 
      */
     public function renderWith($template = null, $customFields = null)
     {
-        if ($template === null) {
+        if ($template===null) {
             $template = static::class;
-            $template = ($this->SlideType) ? $template . "_{$this->SlideType}" : '';
+            $template = ($this->SlideType) ? $template."_{$this->SlideType}" : '';
         }
 
         return parent::renderWith($template);

src/ORM/FlexSlider.php

Indentation +195 added lines, -195 removed lines

@@ -37,189 +37,189 @@ 
  */
 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' => SlideImage::class,
-    ];
+	/**
+	 * @var array
+	 */
+	private static $has_many = [
+		'Slides' => SlideImage::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
-     */
-    public function updateCMSFields(FieldList $fields)
-    {
-        $fields->removeByName([
-            'Animation',
-            'Loop',
-            'Animate',
-            'ThumbnailNav',
-            'SliderControlNav',
-            'SliderDirectionNav',
-            'CarouselControlNav',
-            'CarouselDirectionNav',
-            'CarouselThumbnailCt',
-            'FlexSliderSpeed',
-            'Slides',
-        ]);
+	/**
+	 * @param FieldList $fields
+	 */
+	public function updateCMSFields(FieldList $fields)
+	{
+		$fields->removeByName([
+			'Animation',
+			'Loop',
+			'Animate',
+			'ThumbnailNav',
+			'SliderControlNav',
+			'SliderDirectionNav',
+			'CarouselControlNav',
+			'CarouselDirectionNav',
+			'CarouselThumbnailCt',
+			'FlexSliderSpeed',
+			'Slides',
+		]);
 
-        // Slides
-        if ($this->owner->ID) {
-            $config = GridFieldConfig_RecordEditor::create();
-            $config->addComponent(new GridFieldOrderableRows('SortOrder'));
-            $config->removeComponentsByType([
-                GridFieldAddExistingAutocompleter::class,
-                GridFieldDeleteAction::class,
-            ]);
-            $SlidesField = GridField::create(
-                'Slides',
-                _t(__CLASS__ . '.SLIDES', 'Slides'),
-                $this->owner->Slides()->sort('SortOrder'),
-                $config
-            );
+		// Slides
+		if ($this->owner->ID) {
+			$config = GridFieldConfig_RecordEditor::create();
+			$config->addComponent(new GridFieldOrderableRows('SortOrder'));
+			$config->removeComponentsByType([
+				GridFieldAddExistingAutocompleter::class,
+				GridFieldDeleteAction::class,
+			]);
+			$SlidesField = GridField::create(
+				'Slides',
+				_t(__CLASS__ . '.SLIDES', 'Slides'),
+				$this->owner->Slides()->sort('SortOrder'),
+				$config
+			);
 
-            $slideTitle = $this->owner->slide_tab_title ?: _t(__CLASS__ . '.SLIDES', 'Slides');
+			$slideTitle = $this->owner->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){
 
@@ -265,39 +265,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

@@ -108,63 +108,63 @@ 
             ]);
             $SlidesField = GridField::create(
                 'Slides',
-                _t(__CLASS__ . '.SLIDES', 'Slides'),
+                _t(__CLASS__.'.SLIDES', 'Slides'),
                 $this->owner->Slides()->sort('SortOrder'),
                 $config
             );
 
-            $slideTitle = $this->owner->slide_tab_title ?: _t(__CLASS__ . '.SLIDES', 'Slides');
+            $slideTitle = $this->owner->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),
@@ -206,7 +206,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()
@@ -225,18 +225,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
                               });
@@ -244,22 +244,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.'
                             });
                         }
                     })