From aafa524d40b260284270a5e4c592309a857e8edd Mon Sep 17 00:00:00 2001 From: Jason Irish Date: Tue, 27 Mar 2018 13:32:05 -0500 Subject: [PATCH] refactor - migrate Slideshow to separate module (#79) --- _config/config.yml | 8 --- composer.json | 1 - phpunit.xml.dist | 2 +- src/Elements/ElementSlideshow.php | 63 ------------------- .../ElementSlideshowSlideDataExtension.php | 27 -------- .../Elements/Elements/ElementSlideshow.ss | 7 --- tests/Elements/ElementSlideshowTest.php | 41 ------------ ...showElementSlideImageDataExtensionTest.php | 26 -------- tests/fixtures.yml | 9 --- 9 files changed, 1 insertion(+), 183 deletions(-) delete mode 100644 src/Elements/ElementSlideshow.php delete mode 100644 src/Extensions/ElementSlideshowSlideDataExtension.php delete mode 100644 templates/Dynamic/Elements/Elements/ElementSlideshow.ss delete mode 100644 tests/Elements/ElementSlideshowTest.php delete mode 100644 tests/Extensions/SlideshowElementSlideImageDataExtensionTest.php diff --git a/_config/config.yml b/_config/config.yml index 51a5c30..934b9e5 100644 --- a/_config/config.yml +++ b/_config/config.yml @@ -5,14 +5,6 @@ Dynamic\Elements\Elements\ElementCustomerService: extensions: - Dynamic\SilverStripeGeocoder\AddressDataExtension -Dynamic\Elements\Elements\ElementSlideshow: - extensions: - - Dynamic\FlexSlider\ORM\FlexSlider - -Dynamic\FlexSlider\Model\SlideImage: - extensions: - - Dynamic\Elements\ORM\ElementSlideshowSlideDataExtension - Sheadawson\Linkable\Models\Link: templates: button: 'Display link as a button' diff --git a/composer.json b/composer.json index acf7f7a..8d58ba9 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,6 @@ ], "require": { "dnadesign/silverstripe-elemental": "^2@dev", - "dynamic/flexslider": "^3.0@dev", "dynamic/silverstripe-geocoder": "^1@dev", "sheadawson/silverstripe-linkable": "^2.0@dev", "silverstripe/recipe-cms": "^1.0@dev", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 17b464c..90f2cc5 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,5 @@ - + tests diff --git a/src/Elements/ElementSlideshow.php b/src/Elements/ElementSlideshow.php deleted file mode 100644 index 2726a41..0000000 --- a/src/Elements/ElementSlideshow.php +++ /dev/null @@ -1,63 +0,0 @@ - 'HTMLText', - ]; - - public function getCMSFields() - { - $this->beforeUpdateCMSFields(function (FieldList $fields) { - $fields->dataFieldByName('Content') - ->setRows(8); - }); - - return parent::getCMSFields(); - } - - /** - * @return HTMLText - */ - public function ElementSummary() - { - return DBField::create_field('HTMLText', $this->Content)->Summary(20); - } - - /** - * @return string - */ - public function getType() - { - return _t(__CLASS__.'.BlockType', 'Slideshow'); - } -} diff --git a/src/Extensions/ElementSlideshowSlideDataExtension.php b/src/Extensions/ElementSlideshowSlideDataExtension.php deleted file mode 100644 index d00d130..0000000 --- a/src/Extensions/ElementSlideshowSlideDataExtension.php +++ /dev/null @@ -1,27 +0,0 @@ - ElementSlideshow::class, - ); - - /** - * @param FieldList $fields - */ - public function updateCMSFields(FieldList $fields) - { - $fields->removeByName(array( - 'SlideshowElementID', - )); - } -} diff --git a/templates/Dynamic/Elements/Elements/ElementSlideshow.ss b/templates/Dynamic/Elements/Elements/ElementSlideshow.ss deleted file mode 100644 index 9195f47..0000000 --- a/templates/Dynamic/Elements/Elements/ElementSlideshow.ss +++ /dev/null @@ -1,7 +0,0 @@ -
- <% if $ShowTitle %>$Title<% end_if %> - <% if $Content %>$Content<% end_if %> - <% if $Slides %> - <% include FlexSlider %> - <% end_if %> -
diff --git a/tests/Elements/ElementSlideshowTest.php b/tests/Elements/ElementSlideshowTest.php deleted file mode 100644 index a9242d2..0000000 --- a/tests/Elements/ElementSlideshowTest.php +++ /dev/null @@ -1,41 +0,0 @@ -create(ElementSlideshow::class); - $this->assertInstanceOf(FieldList::class, $promo->getCMSFields()); - } - - /** - * - */ - public function testGetElementSummary() - { - $object = $this->objFromFixture(ElementSlideshow::class, 'one'); - $this->assertEquals($object->ElementSummary(), $object->dbObject('Content')->Summary(20)); - } - - /** - * - */ - public function testGetType() - { - $object = $this->objFromFixture(ElementSlideshow::class, 'one'); - $this->assertEquals($object->getType(), 'Slideshow'); - } -} diff --git a/tests/Extensions/SlideshowElementSlideImageDataExtensionTest.php b/tests/Extensions/SlideshowElementSlideImageDataExtensionTest.php deleted file mode 100644 index ce531bc..0000000 --- a/tests/Extensions/SlideshowElementSlideImageDataExtensionTest.php +++ /dev/null @@ -1,26 +0,0 @@ -objFromFixture(SlideImage::class, 'default'); - $fields = $object->getCMSFields(); - $this->assertInstanceOf(FieldList::class, $fields); - $this->assertNull($fields->dataFieldByName('SlideshowElementID')); - } -} diff --git a/tests/fixtures.yml b/tests/fixtures.yml index 1e97ba0..f24de95 100644 --- a/tests/fixtures.yml +++ b/tests/fixtures.yml @@ -107,15 +107,6 @@ Dynamic\Elements\Elements\ElementPromos: Title: "Promos Element One" Promos: =>Dynamic\Elements\Model\PromoObject.one, =>Dynamic\Elements\Model\PromoObject.two -Dynamic\FlexSlider\Model\SlideImage: - default: - Name: "Slide One" - -Dynamic\Elements\Elements\ElementSlideshow: - one: - Title: 'Slideshow' - Slides: =>Dynamic\FlexSlider\Model\SlideImage.default - DNADesign\Elemental\Models\ElementContent: default: Title: 'Content'