Completed
Pull Request — master (#52)
by Jason
02:30
created
code/FlexSlider.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -2,57 +2,57 @@
 block discarded – undo
2 2
 
3 3
 class FlexSlider extends DataExtension
4 4
 {
5
-    public static $db = array(
6
-        'Animation' => "Enum('slide, fade', 'slide')",
7
-        'Loop' => 'Boolean',
8
-        'Animate' => 'Boolean',
9
-        'ThumbnailNav' => 'Boolean',
10
-    );
5
+	public static $db = array(
6
+		'Animation' => "Enum('slide, fade', 'slide')",
7
+		'Loop' => 'Boolean',
8
+		'Animate' => 'Boolean',
9
+		'ThumbnailNav' => 'Boolean',
10
+	);
11 11
 
12
-    public static $has_many = array(
13
-        'Slides' => 'SlideImage',
14
-    );
12
+	public static $has_many = array(
13
+		'Slides' => 'SlideImage',
14
+	);
15 15
 
16
-    public static $defaults = array(
17
-        'Loop' => '1',
18
-        'Animate' => '1',
19
-    );
16
+	public static $defaults = array(
17
+		'Loop' => '1',
18
+		'Animate' => '1',
19
+	);
20 20
 
21
-    public function populateDefaults()
22
-    {
23
-        parent::populateDefaults();
24
-        $this->Loop = 1;
25
-        $this->Animate = 1;
26
-    }
21
+	public function populateDefaults()
22
+	{
23
+		parent::populateDefaults();
24
+		$this->Loop = 1;
25
+		$this->Animate = 1;
26
+	}
27 27
 
28
-    public function updateCMSFields(FieldList $fields)
29
-    {
30
-        // Slides
31
-        if ($this->owner->ID) {
32
-            $config = GridFieldConfig_RecordEditor::create();
33
-            if (class_exists('GridFieldSortableRows')) {
34
-                $config->addComponent(new GridFieldSortableRows('SortOrder'));
35
-            }
36
-            $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
37
-            $config->removeComponentsByType('GridFieldDeleteAction');
38
-            $config->addComponent(new GridFieldDeleteAction(false));
39
-            $SlidesField = GridField::create('Slides', 'Slides', $this->owner->Slides()->sort('SortOrder'), $config);
28
+	public function updateCMSFields(FieldList $fields)
29
+	{
30
+		// Slides
31
+		if ($this->owner->ID) {
32
+			$config = GridFieldConfig_RecordEditor::create();
33
+			if (class_exists('GridFieldSortableRows')) {
34
+				$config->addComponent(new GridFieldSortableRows('SortOrder'));
35
+			}
36
+			$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
37
+			$config->removeComponentsByType('GridFieldDeleteAction');
38
+			$config->addComponent(new GridFieldDeleteAction(false));
39
+			$SlidesField = GridField::create('Slides', 'Slides', $this->owner->Slides()->sort('SortOrder'), $config);
40 40
 
41
-            $fields->addFieldsToTab('Root.Slides', array(
42
-                HeaderField::create('SliderHD', 'Slides', 3),
43
-                $SlidesField,
44
-                ToggleCompositeField::create('ConfigHD', 'Slider Settings', array(
45
-                    CheckboxField::create('Animate', 'Animate automatically'),
46
-                    DropdownField::create('Animation', 'Animation option', $this->owner->dbObject('Animation')->enumValues()),
47
-                    CheckboxField::create('Loop', 'Loop the carousel'),
48
-                    //CheckboxField::create('ThumbnailNav', 'Thumbnail Navigation'),
49
-                )),
50
-            ));
51
-        }
52
-    }
41
+			$fields->addFieldsToTab('Root.Slides', array(
42
+				HeaderField::create('SliderHD', 'Slides', 3),
43
+				$SlidesField,
44
+				ToggleCompositeField::create('ConfigHD', 'Slider Settings', array(
45
+					CheckboxField::create('Animate', 'Animate automatically'),
46
+					DropdownField::create('Animation', 'Animation option', $this->owner->dbObject('Animation')->enumValues()),
47
+					CheckboxField::create('Loop', 'Loop the carousel'),
48
+					//CheckboxField::create('ThumbnailNav', 'Thumbnail Navigation'),
49
+				)),
50
+			));
51
+		}
52
+	}
53 53
 
54
-    public function SlideShow()
55
-    {
56
-        return $this->owner->Slides()->filter(array('ShowSlide' => 1))->sort('SortOrder');
57
-    }
54
+	public function SlideShow()
55
+	{
56
+		return $this->owner->Slides()->filter(array('ShowSlide' => 1))->sort('SortOrder');
57
+	}
58 58
 }
Please login to merge, or discard this patch.
tests/SlideImageTest.php 1 patch
Indentation   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -2,95 +2,95 @@
 block discarded – undo
2 2
 
3 3
 class SlideImageTest extends FlexSliderTest
4 4
 {
5
-    protected static $use_draft_site = true;
5
+	protected static $use_draft_site = true;
6 6
 
7
-    public function setUp()
8
-    {
9
-        parent::setUp();
10
-    }
7
+	public function setUp()
8
+	{
9
+		parent::setUp();
10
+	}
11 11
 
12
-    public function testValidateName()
13
-    {
14
-        $object = $this->objFromFixture('SlideImage', 'slide1');
15
-        $object->Name = '';
16
-        $this->setExpectedException('ValidationException');
17
-        $object->write();
18
-    }
12
+	public function testValidateName()
13
+	{
14
+		$object = $this->objFromFixture('SlideImage', 'slide1');
15
+		$object->Name = '';
16
+		$this->setExpectedException('ValidationException');
17
+		$object->write();
18
+	}
19 19
 
20
-    public function testValidateImage()
21
-    {
22
-        $object = $this->objFromFixture('SlideImage', 'slide1');
23
-        $object->ImageID = '';
24
-        $this->setExpectedException('ValidationException');
25
-        $object->write();
26
-    }
20
+	public function testValidateImage()
21
+	{
22
+		$object = $this->objFromFixture('SlideImage', 'slide1');
23
+		$object->ImageID = '';
24
+		$this->setExpectedException('ValidationException');
25
+		$object->write();
26
+	}
27 27
 
28
-    public function testCanView()
29
-    {
30
-        $object = $this->objFromFixture('SlideImage', 'slide1');
31
-        $image = $this->objFromFixture('Image', 'image1');
32
-        $object->ImageID = $image->ID;
33
-        $object->write();
34
-        $this->logInWithPermission('ADMIN');
35
-        $this->assertTrue($object->canView());
36
-        $this->logOut();
37
-        $nullMember = Member::create();
38
-        $nullMember->write();
39
-        $this->assertTrue($object->canView($nullMember));
40
-        $nullMember->delete();
41
-    }
28
+	public function testCanView()
29
+	{
30
+		$object = $this->objFromFixture('SlideImage', 'slide1');
31
+		$image = $this->objFromFixture('Image', 'image1');
32
+		$object->ImageID = $image->ID;
33
+		$object->write();
34
+		$this->logInWithPermission('ADMIN');
35
+		$this->assertTrue($object->canView());
36
+		$this->logOut();
37
+		$nullMember = Member::create();
38
+		$nullMember->write();
39
+		$this->assertTrue($object->canView($nullMember));
40
+		$nullMember->delete();
41
+	}
42 42
 
43
-    public function testCanEdit()
44
-    {
45
-        $object = $this->objFromFixture('SlideImage', 'slide1');
46
-        $image = $this->objFromFixture('Image', 'image1');
47
-        $object->ImageID = $image->ID;
48
-        $object->write();
49
-        $objectID = $object->ID;
50
-        $this->logInWithPermission('ADMIN');
51
-        $originalName = $object->Name;
52
-        $this->assertEquals($originalName, 'Hello World');
53
-        $this->assertTrue($object->canEdit());
54
-        $object->Name = 'Changed Name';
55
-        $object->write();
56
-        $testEdit = SlideImage::get()->byID($objectID);
57
-        $this->assertEquals($testEdit->Name, 'Changed Name');
58
-        $this->logOut();
59
-    }
43
+	public function testCanEdit()
44
+	{
45
+		$object = $this->objFromFixture('SlideImage', 'slide1');
46
+		$image = $this->objFromFixture('Image', 'image1');
47
+		$object->ImageID = $image->ID;
48
+		$object->write();
49
+		$objectID = $object->ID;
50
+		$this->logInWithPermission('ADMIN');
51
+		$originalName = $object->Name;
52
+		$this->assertEquals($originalName, 'Hello World');
53
+		$this->assertTrue($object->canEdit());
54
+		$object->Name = 'Changed Name';
55
+		$object->write();
56
+		$testEdit = SlideImage::get()->byID($objectID);
57
+		$this->assertEquals($testEdit->Name, 'Changed Name');
58
+		$this->logOut();
59
+	}
60 60
 
61
-    public function testCanDelete()
62
-    {
63
-        $object = $this->objFromFixture('SlideImage', 'slide1');
64
-        $image = $this->objFromFixture('Image', 'image1');
65
-        $object->ImageID = $image->ID;
66
-        $object->write();
67
-        $this->logInWithPermission('ADMIN');
68
-        $this->assertTrue($object->canDelete());
69
-        $checkObject = $object;
70
-        $object->delete();
71
-        $this->assertEquals($checkObject->ID, 0);
72
-    }
61
+	public function testCanDelete()
62
+	{
63
+		$object = $this->objFromFixture('SlideImage', 'slide1');
64
+		$image = $this->objFromFixture('Image', 'image1');
65
+		$object->ImageID = $image->ID;
66
+		$object->write();
67
+		$this->logInWithPermission('ADMIN');
68
+		$this->assertTrue($object->canDelete());
69
+		$checkObject = $object;
70
+		$object->delete();
71
+		$this->assertEquals($checkObject->ID, 0);
72
+	}
73 73
 
74
-    public function testCanCreate()
75
-    {
76
-        $object = singleton('SlideImage');
77
-        $this->logInWithPermission('ADMIN');
78
-        $this->assertTrue($object->canCreate());
79
-        $this->logOut();
80
-        $nullMember = Member::create();
81
-        $nullMember->write();
82
-        $this->assertFalse($object->canCreate($nullMember));
83
-        $nullMember->delete();
84
-    }
74
+	public function testCanCreate()
75
+	{
76
+		$object = singleton('SlideImage');
77
+		$this->logInWithPermission('ADMIN');
78
+		$this->assertTrue($object->canCreate());
79
+		$this->logOut();
80
+		$nullMember = Member::create();
81
+		$nullMember->write();
82
+		$this->assertFalse($object->canCreate($nullMember));
83
+		$nullMember->delete();
84
+	}
85 85
 
86
-    public function testProvidePermissions()
87
-    {
88
-        $object = singleton('SlideImage');
89
-        $expected = array(
90
-            'Slide_EDIT' => 'Edit a Slide',
91
-            'Slide_DELETE' => 'Delete a Slide',
92
-            'Slide_CREATE' => 'Create a Slide',
93
-        );
94
-        $this->assertEquals($expected, $object->providePermissions());
95
-    }
86
+	public function testProvidePermissions()
87
+	{
88
+		$object = singleton('SlideImage');
89
+		$expected = array(
90
+			'Slide_EDIT' => 'Edit a Slide',
91
+			'Slide_DELETE' => 'Delete a Slide',
92
+			'Slide_CREATE' => 'Create a Slide',
93
+		);
94
+		$this->assertEquals($expected, $object->providePermissions());
95
+	}
96 96
 }
Please login to merge, or discard this patch.
tests/FlexSliderDataExtensionTest.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -2,31 +2,31 @@
 block discarded – undo
2 2
 
3 3
 class FlexSliderDataExtensionTest extends FlexSliderTest
4 4
 {
5
-    public function testUpdateCMSFields()
6
-    {
7
-        $extension = new FlexSlider();
8
-        $object = Page::create();
9
-        $fields = $object->getCMSFields();
10
-        $extension->updateCMSFields($fields);
11
-        $this->assertNull($fields->dataFieldByName('Slides'));
5
+	public function testUpdateCMSFields()
6
+	{
7
+		$extension = new FlexSlider();
8
+		$object = Page::create();
9
+		$fields = $object->getCMSFields();
10
+		$extension->updateCMSFields($fields);
11
+		$this->assertNull($fields->dataFieldByName('Slides'));
12 12
 
13
-        $object->write();
14
-        $fields = $object->getCMSFields();
15
-        $extension->updateCMSFields($fields);
16
-        $this->assertNotNull($fields->dataFieldbyName('Slides'));
17
-    }
13
+		$object->write();
14
+		$fields = $object->getCMSFields();
15
+		$extension->updateCMSFields($fields);
16
+		$this->assertNotNull($fields->dataFieldbyName('Slides'));
17
+	}
18 18
 
19
-    public function testGetSlideshow()
20
-    {
21
-        $object = singleton('Page');
22
-        $object->write();
23
-        $slide1 = $this->objFromFixture('SlideImage', 'slide1');
24
-        $image = $this->objFromFixture('Image', 'image1');
25
-        $slide1->ImageID = $image->ID;
26
-        $object->Slides()->add($slide1);
27
-        $slides = $object->Slides();
28
-        $this->assertTrue(is_a($slides, 'DataList'));
29
-    }
19
+	public function testGetSlideshow()
20
+	{
21
+		$object = singleton('Page');
22
+		$object->write();
23
+		$slide1 = $this->objFromFixture('SlideImage', 'slide1');
24
+		$image = $this->objFromFixture('Image', 'image1');
25
+		$slide1->ImageID = $image->ID;
26
+		$object->Slides()->add($slide1);
27
+		$slides = $object->Slides();
28
+		$this->assertTrue(is_a($slides, 'DataList'));
29
+	}
30 30
 }
31 31
 
32 32
 
Please login to merge, or discard this patch.