dynamic / foxystripe

tests/StoreSettingsTest.php

Indentation +15 added lines, -15 removed lines

@@ -10,39 +10,39 @@
     /**
      * @var bool
      */
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
     /**
      * @throws \SilverStripe\ORM\ValidationException
      */
-	function setUp(){
-		parent::setUp();
+    function setUp(){
+        parent::setUp();
 
-		$siteConf = SiteConfig::current_site_config();
-		$siteConf->StoreName = 'foxystripe';
+        $siteConf = SiteConfig::current_site_config();
+        $siteConf->StoreName = 'foxystripe';
         $siteConf->requireDefaultRecords();
-		$siteConf->write();
-	}
+        $siteConf->write();
+    }
 
     /**
      *
      */
-	function testStoreKey(){
-		$pref = FoxyCart::getKeyPrefix();
-		$siteConf = SiteConfig::current_site_config();
+    function testStoreKey(){
+        $pref = FoxyCart::getKeyPrefix();
+        $siteConf = SiteConfig::current_site_config();
 
-		$this->assertTrue(ctype_alnum($siteConf->StoreKey));
+        $this->assertTrue(ctype_alnum($siteConf->StoreKey));
         $this->assertEquals(strlen($siteConf->StoreKey), 60);
         $this->assertEquals(substr($siteConf->StoreKey, 0, 6), $pref);
-	}
+    }
 
     /**
      *
      */
-	function testStoreName(){
-		$siteConf = SiteConfig::current_site_config();
+    function testStoreName(){
+        $siteConf = SiteConfig::current_site_config();
 
         $this->assertEquals($siteConf->StoreName, 'foxystripe');
-	}
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
     /**
      * @throws \SilverStripe\ORM\ValidationException
      */
-	function setUp(){
+	function setUp() {
 		parent::setUp();
 
 		$siteConf = SiteConfig::current_site_config();
@@ -27,7 +27,7 @@ 
     /**
      *
      */
-	function testStoreKey(){
+	function testStoreKey() {
 		$pref = FoxyCart::getKeyPrefix();
 		$siteConf = SiteConfig::current_site_config();
 
@@ -39,7 +39,7 @@ 
     /**
      *
      */
-	function testStoreName(){
+	function testStoreName() {
 		$siteConf = SiteConfig::current_site_config();
 
         $this->assertEquals($siteConf->StoreName, 'foxystripe');

tests/OptionGroupTest.php

Spacing +2 added lines, -2 removed lines

@@ -32,11 +32,11 @@
     {
         $object = $this->objFromFixture(OptionGroup::class, 'size');
         $orig = $object->Title;
-        $object->Title = '2' . $orig;
+        $object->Title = '2'.$orig;
         $this->expectException(ValidationException::class);
         $object->write();
 
-        $object->Title = $orig . '&';
+        $object->Title = $orig.'&';
         $this->expectException(ValidationException::class);
         $object->write();
     }

tests/ProductPageTest.php

Indentation +145 added lines, -145 removed lines

@@ -13,251 +13,251 @@
 class ProductPageTest extends FS_Test
 {
 
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
     /**
      * @throws \SilverStripe\ORM\ValidationException
      */
-	function setUp(){
-		parent::setUp();
+    function setUp(){
+        parent::setUp();
 
-		$groupForItem = OptionGroup::create();
-		$groupForItem->Title = 'Sample-Group';
-		$groupForItem->write();
+        $groupForItem = OptionGroup::create();
+        $groupForItem->Title = 'Sample-Group';
+        $groupForItem->write();
 
-		/*$productHolder = ProductHolder::create();
+        /*$productHolder = ProductHolder::create();
 		$productHolder->Title = 'Product Holder';
 		$productHolder->write();*/
-	}
+    }
 
-	function testProductCreation(){
+    function testProductCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$default = $this->objFromFixture(ProductCategory::class, 'default');
-		$holder = $this->objFromFixture(ProductHolder::class, 'default');
-		$product1 = $this->objFromFixture(ProductPage::class, 'product1');
+        $this->logInWithPermission('Product_CANCRUD');
+        $default = $this->objFromFixture(ProductCategory::class, 'default');
+        $holder = $this->objFromFixture(ProductHolder::class, 'default');
+        $product1 = $this->objFromFixture(ProductPage::class, 'product1');
 
-		$product1->doPublish();
-		$this->assertTrue($product1->isPublished());
+        $product1->doPublish();
+        $this->assertTrue($product1->isPublished());
 
-	}
+    }
 
-	function testProductDeletion(){
+    function testProductDeletion(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$holder = $this->objFromFixture(ProductHolder::class, 'default');
-		$holder->write();
-		$product2 = $this->objFromFixture(ProductPage::class, 'product2');
-		$productID = $product2->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $holder = $this->objFromFixture(ProductHolder::class, 'default');
+        $holder->write();
+        $product2 = $this->objFromFixture(ProductPage::class, 'product2');
+        $productID = $product2->ID;
 
-		$product2->write();
-		$this->assertTrue($product2->exists());
+        $product2->write();
+        $this->assertTrue($product2->exists());
 
-		$versions = DB::query('Select * FROM "FS_ProductPage_versions" WHERE "RecordID" = '. $productID);
-		$versionsPostPublish = array();
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+        $versions = DB::query('Select * FROM "FS_ProductPage_versions" WHERE "RecordID" = '. $productID);
+        $versionsPostPublish = array();
+        foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
 
-		$product2->delete();
-		$this->assertTrue(!$product2->exists());
+        $product2->delete();
+        $this->assertTrue(!$product2->exists());
 
-		$versions = DB::query('Select * FROM "FS_ProductPage_versions" WHERE "RecordID" = '. $productID);
-		$versionsPostDelete = array();
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+        $versions = DB::query('Select * FROM "FS_ProductPage_versions" WHERE "RecordID" = '. $productID);
+        $versionsPostDelete = array();
+        foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
 
-		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
+        $this->assertTrue($versionsPostPublish == $versionsPostDelete);
 
-	}
+    }
 
     /**
      * @throws \SilverStripe\ORM\ValidationException
      */
-	function testProductTitleLeadingWhiteSpace(){
+    function testProductTitleLeadingWhiteSpace(){
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$holder = $this->objFromFixture(ProductHolder::class, 'default');
-		$holder->write();
+        $holder = $this->objFromFixture(ProductHolder::class, 'default');
+        $holder->write();
 
-		$product = $this->objFromFixture(ProductPage::class, 'product1');
-		$product->Title = " Test with leading space";
-		$product->write();
+        $product = $this->objFromFixture(ProductPage::class, 'product1');
+        $product->Title = " Test with leading space";
+        $product->write();
 
-		$this->assertTrue($product->Title == 'Test with leading space');
+        $this->assertTrue($product->Title == 'Test with leading space');
 
-	}
+    }
 
     /**
      * @throws \SilverStripe\ORM\ValidationException
      */
-	function testProductTitleTrailingWhiteSpace(){
+    function testProductTitleTrailingWhiteSpace(){
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$holder = $this->objFromFixture(ProductHolder::class, 'default');
-		$holder->write();
+        $holder = $this->objFromFixture(ProductHolder::class, 'default');
+        $holder->write();
 
-		$product = $this->objFromFixture(ProductPage::class, 'product1');
-		$product->Title = "Test with trailing space ";
-		$product->write();
+        $product = $this->objFromFixture(ProductPage::class, 'product1');
+        $product->Title = "Test with trailing space ";
+        $product->write();
 
-		$this->assertTrue($product->Title == 'Test with trailing space');
+        $this->assertTrue($product->Title == 'Test with trailing space');
 
-	}
+    }
 
-	function testProductCategoryCreation(){
+    function testProductCategoryCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$category = $this->objFromFixture(ProductCategory::class, 'apparel');
-		$category->write();
-		$categoryID = $category->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $category = $this->objFromFixture(ProductCategory::class, 'apparel');
+        $category->write();
+        $categoryID = $category->ID;
 
-		$productCategory = ProductCategory::get()->filter(array('Code'=>'APPAREL'))->first();
+        $productCategory = ProductCategory::get()->filter(array('Code'=>'APPAREL'))->first();
 
-		$this->assertTrue($categoryID == $productCategory->ID);
+        $this->assertTrue($categoryID == $productCategory->ID);
 
-	}
+    }
 
-	function testProductCategoryDeletion(){
+    function testProductCategoryDeletion(){
 
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$category = $this->objFromFixture(ProductCategory::class, 'default');
-		$category->write();
+        $category = $this->objFromFixture(ProductCategory::class, 'default');
+        $category->write();
 
-		$this->assertFalse($category->canDelete());
+        $this->assertFalse($category->canDelete());
 
-		$category2 = $this->objFromFixture(ProductCategory::class, 'apparel');
-		$category2->write();
-		$category2ID = $category2->ID;
+        $category2 = $this->objFromFixture(ProductCategory::class, 'apparel');
+        $category2->write();
+        $category2ID = $category2->ID;
 
-		$this->assertTrue($category2->canDelete());
+        $this->assertTrue($category2->canDelete());
 
-		$this->logOut();
+        $this->logOut();
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$this->assertFalse($category->canDelete());
-		$this->assertTrue($category2->canDelete());
+        $this->assertFalse($category->canDelete());
+        $this->assertTrue($category2->canDelete());
 
-		$this->logOut();
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logOut();
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$category2->delete();
+        $category2->delete();
 
-		$this->assertFalse(in_array($category2ID,ProductCategory::get()->column('ID')));
+        $this->assertFalse(in_array($category2ID,ProductCategory::get()->column('ID')));
 
-	}
+    }
 
-	function testOptionGroupCreation(){
+    function testOptionGroupCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$group = $this->objFromFixture(OptionGroup::class, 'size');
-		$group->write();
+        $group = $this->objFromFixture(OptionGroup::class, 'size');
+        $group->write();
 
-		$this->assertNotNull(OptionGroup::get()->first());
+        $this->assertNotNull(OptionGroup::get()->first());
 
-	}
+    }
 
-	function testOptionGroupDeletion(){
+    function testOptionGroupDeletion(){
 
-		$this->logInWithPermission('ADMIN');
-		$group = $this->objFromFixture(OptionGroup::class, 'color');
-		$group->write();
-		$groupID = $group->ID;
+        $this->logInWithPermission('ADMIN');
+        $group = $this->objFromFixture(OptionGroup::class, 'color');
+        $group->write();
+        $groupID = $group->ID;
 
-		$this->assertTrue($group->canDelete());
+        $this->assertTrue($group->canDelete());
 
-		$this->logOut();
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logOut();
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$this->assertTrue($group->canDelete());
-		$group->delete();
+        $this->assertTrue($group->canDelete());
+        $group->delete();
 
-		$this->assertFalse(in_array($groupID, OptionGroup::get()->column('ID')));
+        $this->assertFalse(in_array($groupID, OptionGroup::get()->column('ID')));
 
-	}
+    }
 
-	function testOptionItemCreation(){
+    function testOptionItemCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
+        $optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
 
-		$option = $this->objFromFixture(OptionItem::class, 'large');
-		$option->ProductOptionGroupID = $optionGroup->ID;
-		$option->write();
+        $option = $this->objFromFixture(OptionItem::class, 'large');
+        $option->ProductOptionGroupID = $optionGroup->ID;
+        $option->write();
 
-		$optionID = $option->ID;
+        $optionID = $option->ID;
 
-		$optionItem = OptionItem::get()->filter(array('ProductOptionGroupID' => $optionGroup->ID))->first();
+        $optionItem = OptionItem::get()->filter(array('ProductOptionGroupID' => $optionGroup->ID))->first();
 
-		$this->assertEquals($optionID, $optionItem->ID);
+        $this->assertEquals($optionID, $optionItem->ID);
 
-	}
+    }
 
-	function testOptionItemDeletion(){
+    function testOptionItemDeletion(){
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$optionGroup = $this->objFromFixture(OptionGroup::class, 'size');
-		$optionGroup->write();
+        $optionGroup = $this->objFromFixture(OptionGroup::class, 'size');
+        $optionGroup->write();
 
-		$option = $this->objFromFixture(OptionItem::class, 'small');
-		$option->write();
+        $option = $this->objFromFixture(OptionItem::class, 'small');
+        $option->write();
 
-		$optionID = $option->ID;
+        $optionID = $option->ID;
 
-		$this->assertTrue($option->canDelete());
+        $this->assertTrue($option->canDelete());
 
-		$this->logOut();
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logOut();
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$this->assertTrue($option->canDelete());
-		$option->delete();
+        $this->assertTrue($option->canDelete());
+        $option->delete();
 
-		$this->assertFalse(in_array($optionID, OptionItem::get()->column('ID')));
+        $this->assertFalse(in_array($optionID, OptionItem::get()->column('ID')));
 
-	}
+    }
 
-	public function testProductDraftOptionDeletion(){
+    public function testProductDraftOptionDeletion(){
 
-		self::$use_draft_site = false;//make sure we can publish
+        self::$use_draft_site = false;//make sure we can publish
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$holder = $this->objFromFixture(ProductHolder::class, 'default');//build holder page, ProductPage can't be on root level
-		$holder->doPublish();
+        $holder = $this->objFromFixture(ProductHolder::class, 'default');//build holder page, ProductPage can't be on root level
+        $holder->doPublish();
 
-		$product = $this->objFromFixture(ProductPage::class, 'product1');//build product page
-		$product->doPublish();
+        $product = $this->objFromFixture(ProductPage::class, 'product1');//build product page
+        $product->doPublish();
 
-		$productID = $product->ID;
+        $productID = $product->ID;
 
 
-		$optionGroup = $this->objFromFixture(OptionGroup::class, 'size');//build the group for the options
-		$optionGroup->write();
-		$option = $this->objFromFixture(OptionItem::class, 'small');//build first option
-		$option->write();
-		$option2 = $this->objFromFixture(OptionItem::class, 'large');//build second option
-		$option2->write();
+        $optionGroup = $this->objFromFixture(OptionGroup::class, 'size');//build the group for the options
+        $optionGroup->write();
+        $option = $this->objFromFixture(OptionItem::class, 'small');//build first option
+        $option->write();
+        $option2 = $this->objFromFixture(OptionItem::class, 'large');//build second option
+        $option2->write();
 
-		$this->assertTrue($product->isPublished());//check that product is published
+        $this->assertTrue($product->isPublished());//check that product is published
 
-		$product->deleteFromStage('Stage');//remove product from draft site
+        $product->deleteFromStage('Stage');//remove product from draft site
 
-		$this->assertTrue($product->isPublished());//check product is still published
+        $this->assertTrue($product->isPublished());//check product is still published
 
-		$testOption = $this->objFromFixture(OptionItem::class, 'large');
+        $testOption = $this->objFromFixture(OptionItem::class, 'large');
 
-		$this->assertThat($testOption->ID, $this->logicalNot($this->equalTo(0)));//make sure the first option still exists
+        $this->assertThat($testOption->ID, $this->logicalNot($this->equalTo(0)));//make sure the first option still exists
 
-		$product->doRestoreToStage();//restore page to draft site
-		$product->doUnpublish();//unpublish page
-		$product->deleteFromStage('Stage');//remove product from draft site
+        $product->doRestoreToStage();//restore page to draft site
+        $product->doUnpublish();//unpublish page
+        $product->deleteFromStage('Stage');//remove product from draft site
 
-		$checkDeleted = OptionItem::get()->filter(array('Title' => 'Large', 'ProductID' => $productID))->first();//query same option as above
+        $checkDeleted = OptionItem::get()->filter(array('Title' => 'Large', 'ProductID' => $productID))->first();//query same option as above
 
-		$this->assertEquals($checkDeleted->ID, 0);//check that the ID is 0 (empty object/non-existent)
-	}
+        $this->assertEquals($checkDeleted->ID, 0);//check that the ID is 0 (empty object/non-existent)
+    }
 }
\ No newline at end of file

Spacing +32 added lines, -32 removed lines

@@ -18,7 +18,7 @@ 
     /**
      * @throws \SilverStripe\ORM\ValidationException
      */
-	function setUp(){
+	function setUp() {
 		parent::setUp();
 
 		$groupForItem = OptionGroup::create();
@@ -30,7 +30,7 @@ 
 		$productHolder->write();*/
 	}
 
-	function testProductCreation(){
+	function testProductCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$default = $this->objFromFixture(ProductCategory::class, 'default');
@@ -42,7 +42,7 @@ 
 
 	}
 
-	function testProductDeletion(){
+	function testProductDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$holder = $this->objFromFixture(ProductHolder::class, 'default');
@@ -53,16 +53,16 @@ 
 		$product2->write();
 		$this->assertTrue($product2->exists());
 
-		$versions = DB::query('Select * FROM "FS_ProductPage_versions" WHERE "RecordID" = '. $productID);
+		$versions = DB::query('Select * FROM "FS_ProductPage_versions" WHERE "RecordID" = '.$productID);
 		$versionsPostPublish = array();
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+		foreach ($versions as $versionRow) $versionsPostPublish[] = $versionRow;
 
 		$product2->delete();
 		$this->assertTrue(!$product2->exists());
 
-		$versions = DB::query('Select * FROM "FS_ProductPage_versions" WHERE "RecordID" = '. $productID);
+		$versions = DB::query('Select * FROM "FS_ProductPage_versions" WHERE "RecordID" = '.$productID);
 		$versionsPostDelete = array();
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+		foreach ($versions as $versionRow) $versionsPostDelete[] = $versionRow;
 
 		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
 
@@ -71,7 +71,7 @@ 
     /**
      * @throws \SilverStripe\ORM\ValidationException
      */
-	function testProductTitleLeadingWhiteSpace(){
+	function testProductTitleLeadingWhiteSpace() {
 
 		$this->logInWithPermission('ADMIN');
 
@@ -89,7 +89,7 @@ 
     /**
      * @throws \SilverStripe\ORM\ValidationException
      */
-	function testProductTitleTrailingWhiteSpace(){
+	function testProductTitleTrailingWhiteSpace() {
 
 		$this->logInWithPermission('ADMIN');
 
@@ -104,7 +104,7 @@ 
 
 	}
 
-	function testProductCategoryCreation(){
+	function testProductCategoryCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$category = $this->objFromFixture(ProductCategory::class, 'apparel');
@@ -117,7 +117,7 @@ 
 
 	}
 
-	function testProductCategoryDeletion(){
+	function testProductCategoryDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 
@@ -144,11 +144,11 @@ 
 
 		$category2->delete();
 
-		$this->assertFalse(in_array($category2ID,ProductCategory::get()->column('ID')));
+		$this->assertFalse(in_array($category2ID, ProductCategory::get()->column('ID')));
 
 	}
 
-	function testOptionGroupCreation(){
+	function testOptionGroupCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 
@@ -159,7 +159,7 @@ 
 
 	}
 
-	function testOptionGroupDeletion(){
+	function testOptionGroupDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 		$group = $this->objFromFixture(OptionGroup::class, 'color');
@@ -178,7 +178,7 @@ 
 
 	}
 
-	function testOptionItemCreation(){
+	function testOptionItemCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 
@@ -196,7 +196,7 @@ 
 
 	}
 
-	function testOptionItemDeletion(){
+	function testOptionItemDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 
@@ -220,44 +220,44 @@ 
 
 	}
 
-	public function testProductDraftOptionDeletion(){
+	public function testProductDraftOptionDeletion() {
 
-		self::$use_draft_site = false;//make sure we can publish
+		self::$use_draft_site = false; //make sure we can publish
 
 		$this->logInWithPermission('ADMIN');
 
-		$holder = $this->objFromFixture(ProductHolder::class, 'default');//build holder page, ProductPage can't be on root level
+		$holder = $this->objFromFixture(ProductHolder::class, 'default'); //build holder page, ProductPage can't be on root level
 		$holder->doPublish();
 
-		$product = $this->objFromFixture(ProductPage::class, 'product1');//build product page
+		$product = $this->objFromFixture(ProductPage::class, 'product1'); //build product page
 		$product->doPublish();
 
 		$productID = $product->ID;
 
 
-		$optionGroup = $this->objFromFixture(OptionGroup::class, 'size');//build the group for the options
+		$optionGroup = $this->objFromFixture(OptionGroup::class, 'size'); //build the group for the options
 		$optionGroup->write();
-		$option = $this->objFromFixture(OptionItem::class, 'small');//build first option
+		$option = $this->objFromFixture(OptionItem::class, 'small'); //build first option
 		$option->write();
-		$option2 = $this->objFromFixture(OptionItem::class, 'large');//build second option
+		$option2 = $this->objFromFixture(OptionItem::class, 'large'); //build second option
 		$option2->write();
 
-		$this->assertTrue($product->isPublished());//check that product is published
+		$this->assertTrue($product->isPublished()); //check that product is published
 
-		$product->deleteFromStage('Stage');//remove product from draft site
+		$product->deleteFromStage('Stage'); //remove product from draft site
 
-		$this->assertTrue($product->isPublished());//check product is still published
+		$this->assertTrue($product->isPublished()); //check product is still published
 
 		$testOption = $this->objFromFixture(OptionItem::class, 'large');
 
-		$this->assertThat($testOption->ID, $this->logicalNot($this->equalTo(0)));//make sure the first option still exists
+		$this->assertThat($testOption->ID, $this->logicalNot($this->equalTo(0))); //make sure the first option still exists
 
-		$product->doRestoreToStage();//restore page to draft site
-		$product->doUnpublish();//unpublish page
-		$product->deleteFromStage('Stage');//remove product from draft site
+		$product->doRestoreToStage(); //restore page to draft site
+		$product->doUnpublish(); //unpublish page
+		$product->deleteFromStage('Stage'); //remove product from draft site
 
-		$checkDeleted = OptionItem::get()->filter(array('Title' => 'Large', 'ProductID' => $productID))->first();//query same option as above
+		$checkDeleted = OptionItem::get()->filter(array('Title' => 'Large', 'ProductID' => $productID))->first(); //query same option as above
 
-		$this->assertEquals($checkDeleted->ID, 0);//check that the ID is 0 (empty object/non-existent)
+		$this->assertEquals($checkDeleted->ID, 0); //check that the ID is 0 (empty object/non-existent)
 	}
 }
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -55,14 +55,18 @@
 
 		$versions = DB::query('Select * FROM "FS_ProductPage_versions" WHERE "RecordID" = '. $productID);
 		$versionsPostPublish = array();
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+		foreach($versions as $versionRow) {
+		    $versionsPostPublish[] = $versionRow;
+		}
 
 		$product2->delete();
 		$this->assertTrue(!$product2->exists());
 
 		$versions = DB::query('Select * FROM "FS_ProductPage_versions" WHERE "RecordID" = '. $productID);
 		$versionsPostDelete = array();
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+		foreach($versions as $versionRow) {
+		    $versionsPostDelete[] = $versionRow;
+		}
 
 		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
 

src/ORM/FoxyStripePageExtension.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
     // get FoxyCart Store Name for JS call
     public function getCartScript() {
-        return '<script src="https://cdn.foxycart.com/' . FoxyCart::getFoxyCartStoreName() . '/loader.js" async defer></script>';
+        return '<script src="https://cdn.foxycart.com/'.FoxyCart::getFoxyCartStoreName().'/loader.js" async defer></script>';
     }
 
 }
\ No newline at end of file

src/ORM/FoxyStripeSiteConfig.php

Indentation +44 added lines, -44 removed lines

@@ -28,9 +28,9 @@ 
 class FoxyStripeSiteConfig extends DataExtension
 {
 
-	private static $db = array(
-	    'StoreTitle' => 'Varchar(255)',
-		'StoreName' => 'Varchar(255)',
+    private static $db = array(
+        'StoreTitle' => 'Varchar(255)',
+        'StoreName' => 'Varchar(255)',
         'StoreURL' => 'Varchar(255)',
         'ReceiptURL' => 'Varchar(255)',
         'StoreEmail' => 'Varchar(255)',
@@ -48,21 +48,21 @@ 
         'UseSingleSignOn' => 'Boolean',
         'AllowMultiship' => 'Boolean',
         'StoreTimezone' => 'Varchar(100)',
-		'MultiGroup' => 'Boolean',
-		'ProductLimit' => 'Int',
-		'MaxQuantity' => 'Int',
+        'MultiGroup' => 'Boolean',
+        'ProductLimit' => 'Int',
+        'MaxQuantity' => 'Int',
         'client_id' => 'Varchar(255)',
         'client_secret' => 'Varchar(255)',
         'access_token' => 'Varchar(255)',
         'refresh_token' => 'Varchar(255)',
-	);
+    );
 
     // Set Default values
     private static $defaults = array(
         'ProductLimit' => 10
     );
 
-	public function updateCMSFields(FieldList $fields){
+    public function updateCMSFields(FieldList $fields){
 
         // set TabSet names to avoid spaces from camel case
         $fields->addFieldToTab('Root', new TabSet('FoxyStripe', 'FoxyStripe'));
@@ -70,17 +70,17 @@ 
         // settings tab
         $fields->addFieldsToTab('Root.FoxyStripe.Settings', array(
             // Store Details
-			HeaderField::create('StoreDetails', _t('FoxyStripeSiteConfig.StoreDetails', 'Store Settings'), 3),
-			LiteralField::create('DetailsIntro', _t(
-				'FoxyStripeSiteConfig.DetailsIntro',
+            HeaderField::create('StoreDetails', _t('FoxyStripeSiteConfig.StoreDetails', 'Store Settings'), 3),
+            LiteralField::create('DetailsIntro', _t(
+                'FoxyStripeSiteConfig.DetailsIntro',
                 '<p>Maps to data in your <a href="https://admin.foxycart.com/admin.php?ThisAction=EditStore" target="_blank">FoxyCart store settings</a>.'
             )),
             TextField::create('StoreTitle')
                 ->setTitle(_t('FoxyStripeSiteConfig.StoreTitle', 'Store Name'))
                 ->setDescription(_t('FoxyStripeSiteConfig.StoreTitleDescription', 'The name of your store as you\'d like it displayed to your customers')),
-			TextField::create('StoreName')
-				->setTitle(_t('FoxyStripeSiteConfig.StoreName', 'Store Domain'))
-				->setDescription(_t('FoxyStripeSiteConfig.StoreNameDescription', 'This is a unique FoxyCart subdomain for your cart, checkout, and receipt')),
+            TextField::create('StoreName')
+                ->setTitle(_t('FoxyStripeSiteConfig.StoreName', 'Store Domain'))
+                ->setDescription(_t('FoxyStripeSiteConfig.StoreNameDescription', 'This is a unique FoxyCart subdomain for your cart, checkout, and receipt')),
             TextField::create('StoreURL')
                 ->setTitle(_t('FoxyStripeSiteConfig.StoreURL', 'Store URL'))
                 ->setDescription(_t('FoxyStripeSiteConfig.StoreURLDescription', 'The URL of your online store')),
@@ -102,7 +102,7 @@ 
             TextField::create('StoreLogoURL', 'Logo URL')
                 ->setAttribute('placeholder', 'http://')
 
-			// Advanced Settings
+            // Advanced Settings
             /*
 			HeaderField::create('AdvanceHeader', _t('FoxyStripeSiteConfig.AdvancedHeader', 'Advanced Settings'), 3),
 			LiteralField::create('AdvancedIntro', _t(
@@ -146,72 +146,72 @@ 
         ]);
 
         // configuration warning
-		if(FoxyCart::store_name_warning()!==null){
-			$fields->insertBefore(LiteralField::create(
+        if(FoxyCart::store_name_warning()!==null){
+            $fields->insertBefore(LiteralField::create(
                 "StoreSubDomainHeaderWarning",
                 _t(
                     'FoxyStripeSiteConfig.StoreSubDomainHeadingWarning',
                     "<p class=\"message error\">Store sub-domain must be entered in the <a href=\"/admin/settings/\">site settings</a></p>"
                 )
             ), 'StoreDetails');
-		}
+        }
 
         // products tab
-		$fields->addFieldsToTab('Root.FoxyStripe.Products', array(
-			HeaderField::create('ProductHeader', _t('FoxyStripeSiteConfig.ProductHeader', 'Products'), 3),
-			CheckboxField::create('MultiGroup')
-				->setTitle(_t('FoxyStripeSiteConfig.MultiGroup', 'Multiple Groups'))
-				->setDescription(_t(
+        $fields->addFieldsToTab('Root.FoxyStripe.Products', array(
+            HeaderField::create('ProductHeader', _t('FoxyStripeSiteConfig.ProductHeader', 'Products'), 3),
+            CheckboxField::create('MultiGroup')
+                ->setTitle(_t('FoxyStripeSiteConfig.MultiGroup', 'Multiple Groups'))
+                ->setDescription(_t(
                     'FoxyStripeSiteConfig.MultiGroupDescription',
                     'Allows products to be shown in multiple Product Groups'
                 )),
-			HeaderField::create('ProductGroupHD', _t('FoxyStripeSiteConfig.ProductGroupHD', 'Product Groups'), 3),
-			NumericField::create('ProductLimit')
-				->setTitle(_t('FoxyStripeSiteConfig.ProductLimit', 'Products per Page'))
-				->setDescription(_t(
+            HeaderField::create('ProductGroupHD', _t('FoxyStripeSiteConfig.ProductGroupHD', 'Product Groups'), 3),
+            NumericField::create('ProductLimit')
+                ->setTitle(_t('FoxyStripeSiteConfig.ProductLimit', 'Products per Page'))
+                ->setDescription(_t(
                     'FoxyStripeSiteConfig.ProductLimitDescription',
                     'Number of Products to show per page on a Product Group'
                 )),
-			HeaderField::create('ProductQuantityHD', _t('FoxyStripeSiteConfig.ProductQuantityHD', 'Product Form Max Quantity'), 3),
-			NumericField::create('MaxQuantity')
-				->setTitle(_t('FoxyStripeSiteConfig.MaxQuantity', 'Max Quantity'))
-				->setDescription(_t(
+            HeaderField::create('ProductQuantityHD', _t('FoxyStripeSiteConfig.ProductQuantityHD', 'Product Form Max Quantity'), 3),
+            NumericField::create('MaxQuantity')
+                ->setTitle(_t('FoxyStripeSiteConfig.MaxQuantity', 'Max Quantity'))
+                ->setDescription(_t(
                     'FoxyStripeSiteConfig.MaxQuantityDescription',
                     'Sets max quantity for product form dropdown (add to cart form - default 10)'
                 ))
-		));
+        ));
 
         // categories tab
-		$fields->addFieldsToTab('Root.FoxyStripe.Categories', array(
-			HeaderField::create('CategoryHD', _t('FoxyStripeSiteConfig.CategoryHD', 'FoxyStripe Categories'), 3),
-			LiteralField::create('CategoryDescrip', _t(
+        $fields->addFieldsToTab('Root.FoxyStripe.Categories', array(
+            HeaderField::create('CategoryHD', _t('FoxyStripeSiteConfig.CategoryHD', 'FoxyStripe Categories'), 3),
+            LiteralField::create('CategoryDescrip', _t(
                 'FoxyStripeSiteConfig.CategoryDescrip',
                 '<p>FoxyCart Categories offer a way to give products additional behaviors that cannot be accomplished by product options alone, including category specific coupon codes, shipping and handling fees, and email receipts. <a href="https://wiki.foxycart.com/v/2.0/categories" target="_blank">Learn More</a></p><p>Categories you\'ve created in FoxyStripe must also be created in your <a href="https://admin.foxycart.com/admin.php?ThisAction=ManageProductCategories" target="_blank">FoxyCart Categories</a> admin panel.</p>'
             )),
-			GridField::create(
+            GridField::create(
                 'ProductCategory',
                 _t('FoxyStripeSiteConfig.ProductCategory', 'FoxyCart Categories'),
                 ProductCategory::get(),
                 GridFieldConfig_RecordEditor::create()
             )
-		));
+        ));
 
         // option groups tab
-		$fields->addFieldsToTab('Root.FoxyStripe.Groups', array(
-			HeaderField::create('OptionGroupsHead', _t('FoxyStripeSiteConfig', 'Product Option Groups'), 3),
-			LiteralField::create('OptionGroupsDescrip', _t(
+        $fields->addFieldsToTab('Root.FoxyStripe.Groups', array(
+            HeaderField::create('OptionGroupsHead', _t('FoxyStripeSiteConfig', 'Product Option Groups'), 3),
+            LiteralField::create('OptionGroupsDescrip', _t(
                 'FoxyStripeSiteConfig.OptionGroupsDescrip',
                 '<p>Product Option Groups allow you to name a set of product options.</p>'
             )),
-			GridField::create(
+            GridField::create(
                 'OptionGroup',
                 _t('FoxyStripeSiteConfig.OptionGroup', 'Product Option Groups'),
                 OptionGroup::get(),
                 GridFieldConfig_RecordEditor::create()
             )
-		));
+        ));
 
-		// api tab
+        // api tab
         $fields->addFieldsToTab('Root.FoxyStripe.API', [
             HeaderField::create('APIHD', 'FoxyCart API Settings', 3),
             TextField::create('client_id', 'FoxyCart Client ID'),
@@ -220,7 +220,7 @@ 
             TextField::create('refresh_token', 'FoxyCart Refresh Token'),
         ]);
 
-	}
+    }
 
     /**
      * @return string

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
         'ProductLimit' => 10
     );
 
-	public function updateCMSFields(FieldList $fields){
+	public function updateCMSFields(FieldList $fields) {
 
         // set TabSet names to avoid spaces from camel case
         $fields->addFieldToTab('Root', new TabSet('FoxyStripe', 'FoxyStripe'));
@@ -146,7 +146,7 @@ 
         ]);
 
         // configuration warning
-		if(FoxyCart::store_name_warning()!==null){
+		if (FoxyCart::store_name_warning() !== null) {
 			$fields->insertBefore(LiteralField::create(
                 "StoreSubDomainHeaderWarning",
                 _t(
@@ -247,14 +247,14 @@ 
 
         $siteConfig = SiteConfig::current_site_config();
 
-        if(!$siteConfig->StoreKey) {
+        if (!$siteConfig->StoreKey) {
             $key = FoxyCart::setStoreKey();
-            while(!ctype_alnum($key)){
+            while (!ctype_alnum($key)) {
                 $key = FoxyCart::setStoreKey();
             }
             $siteConfig->StoreKey = $key;
             $siteConfig->write();
-            DB::alteration_message($siteConfig->ClassName.": created FoxyCart Store Key " . $key, 'created');
+            DB::alteration_message($siteConfig->ClassName.": created FoxyCart Store Key ".$key, 'created');
         }
     }
 

src/ORM/CustomerExtension.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         // Grab customer_id record from FoxyCart response, store in Member
         if ($response) {
             $foxyResponse = new \SimpleXMLElement($response);
-            $this->owner->Customer_ID = (int) $foxyResponse->customer_id;
+            $this->owner->Customer_ID = (int)$foxyResponse->customer_id;
         }
     }
 }

src/Model/Order.php

Indentation +5 added lines, -5 removed lines

@@ -326,18 +326,18 @@
      * @param bool $member
      * @return bool|int
      */
-	public function canView($member = false) {
-		return Permission::check('Product_ORDERS', 'any', $member);
-	}
+    public function canView($member = false) {
+        return Permission::check('Product_ORDERS', 'any', $member);
+    }
 
     /**
      * @param null $member
      * @return bool
      */
-	public function canEdit($member = null) {
+    public function canEdit($member = null) {
         return false;
         //return Permission::check('Product_ORDERS', 'any', $member);
-	}
+    }
 
     /**
      * @param null $member

Spacing +29 added lines, -29 removed lines

@@ -145,8 +145,8 @@ 
      */
     public function getReceiptLink()
     {
-        $obj= DBHTMLVarchar::create();
-        $obj->setValue('<a href="' . $this->ReceiptURL . '" target="_blank" class="cms-panel-link action external-link">view</a>');
+        $obj = DBHTMLVarchar::create();
+        $obj->setValue('<a href="'.$this->ReceiptURL.'" target="_blank" class="cms-panel-link action external-link">view</a>');
         return $obj;
     }
 
@@ -185,7 +185,7 @@ 
 
             return true;
 
-        } else {
+        }else {
 
             return false;
 
@@ -200,14 +200,14 @@ 
         foreach ($response->transactions->transaction as $transaction) {
 
             // Record transaction data from FoxyCart Datafeed:
-            $this->Store_ID = (int) $transaction->store_id;
-            $this->TransactionDate = (string) $transaction->transaction_date;
-            $this->ProductTotal = (float) $transaction->product_total;
-            $this->TaxTotal = (float) $transaction->tax_total;
-            $this->ShippingTotal = (float) $transaction->shipping_total;
-            $this->OrderTotal = (float) $transaction->order_total;
-            $this->ReceiptURL = (string) $transaction->receipt_url;
-            $this->OrderStatus = (string) $transaction->status;
+            $this->Store_ID = (int)$transaction->store_id;
+            $this->TransactionDate = (string)$transaction->transaction_date;
+            $this->ProductTotal = (float)$transaction->product_total;
+            $this->TaxTotal = (float)$transaction->tax_total;
+            $this->ShippingTotal = (float)$transaction->shipping_total;
+            $this->OrderTotal = (float)$transaction->order_total;
+            $this->ReceiptURL = (string)$transaction->receipt_url;
+            $this->OrderStatus = (string)$transaction->status;
 
             $this->extend('handleOrderInfo', $order, $response);
         }
@@ -224,24 +224,24 @@ 
             if (isset($transaction->customer_email) && $transaction->is_anonymous == 0) {
 
                 // if Customer is existing member, associate with current order
-                if(Member::get()->filter('Email', $transaction->customer_email)->First()) {
+                if (Member::get()->filter('Email', $transaction->customer_email)->First()) {
 
                     $customer = Member::get()->filter('Email', $transaction->customer_email)->First();
 
                     // if new customer, create account with data from FoxyCart
-                } else {
+                }else {
 
                     // set PasswordEncryption to 'none' so imported, encrypted password is not encrypted again
                     Config::inst()->update('Security', 'password_encryption_algorithm', 'none');
 
                     // create new Member, set password info from FoxyCart
                     $customer = Member::create();
-                    $customer->Customer_ID = (int) $transaction->customer_id;
-                    $customer->FirstName = (string) $transaction->customer_first_name;
-                    $customer->Surname = (string) $transaction->customer_last_name;
-                    $customer->Email = (string) $transaction->customer_email;
-                    $customer->Password = (string) $transaction->customer_password;
-                    $customer->Salt = (string) $transaction->customer_password_salt;
+                    $customer->Customer_ID = (int)$transaction->customer_id;
+                    $customer->FirstName = (string)$transaction->customer_first_name;
+                    $customer->Surname = (string)$transaction->customer_last_name;
+                    $customer->Email = (string)$transaction->customer_email;
+                    $customer->Password = (string)$transaction->customer_password;
+                    $customer->Salt = (string)$transaction->customer_password_salt;
                     $customer->PasswordEncryption = 'none';
 
                     // record member record
@@ -278,11 +278,11 @@ 
 
                 $OrderDetail = OrderDetail::create();
 
-                $OrderDetail->Quantity = (int) $detail->product_quantity;
-                $OrderDetail->ProductName = (string) $detail->product_name;
-                $OrderDetail->ProductCode = (string) $detail->product_code;
-                $OrderDetail->ProductImage = (string) $detail->image;
-                $OrderDetail->ProductCategory = (string) $detail->category_code;
+                $OrderDetail->Quantity = (int)$detail->product_quantity;
+                $OrderDetail->ProductName = (string)$detail->product_name;
+                $OrderDetail->ProductCode = (string)$detail->product_code;
+                $OrderDetail->ProductImage = (string)$detail->image;
+                $OrderDetail->ProductCategory = (string)$detail->category_code;
                 $priceModifier = 0;
 
                 // parse OrderOptions
@@ -292,14 +292,14 @@ 
                     if ($option->product_option_name == 'product_id') {
 
                         // if product is found, set relation to OrderDetail
-                        $OrderProduct = ProductPage::get()->byID((int) $option->product_option_value);
+                        $OrderProduct = ProductPage::get()->byID((int)$option->product_option_value);
                         if ($OrderProduct) $OrderDetail->ProductID = $OrderProduct->ID;
 
-                    } else {
+                    }else {
 
                         $OrderOption = OrderOption::create();
-                        $OrderOption->Name = (string) $option->product_option_name;
-                        $OrderOption->Value = (string) $option->product_option_value;
+                        $OrderOption->Name = (string)$option->product_option_name;
+                        $OrderOption->Value = (string)$option->product_option_value;
                         $OrderOption->write();
                         $OrderDetail->OrderOptions()->add($OrderOption);
 
@@ -308,7 +308,7 @@ 
 
                 }
 
-                $OrderDetail->Price = (float) $detail->product_price + (float) $priceModifier;
+                $OrderDetail->Price = (float)$detail->product_price + (float)$priceModifier;
 
                 // extend OrderDetail parsing, allowing for recording custom fields from FoxyCart
                 $this->extend('handleOrderItem', $order, $response, $OrderDetail);

Braces +3 added lines, -1 removed lines

@@ -211,7 +211,9 @@
 
                         // if product is found, set relation to OrderDetail
                         $OrderProduct = ProductPage::get()->byID((int) $option->product_option_value);
-                        if ($OrderProduct) $OrderDetail->ProductID = $OrderProduct->ID;
+                        if ($OrderProduct) {
+                            $OrderDetail->ProductID = $OrderProduct->ID;
+                        }
 
                     } else {
 

src/Model/OptionItem.php

Spacing +4 added lines, -4 removed lines

@@ -110,7 +110,7 @@ 
         $parentCode = $product->Code;
 
         // ProductOptionGroup Dropdown field w/ add new
-        $groups = function () {
+        $groups = function() {
             return OptionGroup::get()->map()->toArray();
         };
         $groupFields = singleton(OptionGroup::class)->getCMSFields();
@@ -241,7 +241,7 @@ 
      * @param bool $returnWithOnlyPlusMinus
      * @return string
      */
-    public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus=false)
+    public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus = false)
     {
         switch ($oma) {
             case 'Subtract':
@@ -308,7 +308,7 @@ 
     {
         $modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
         $title = $this->Title;
-        $title .= ($this->PriceModifier != 0) ? ': ('.OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus=true).'$'.$modPrice.')' : '';
+        $title .= ($this->PriceModifier != 0) ? ': ('.OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction, $returnWithOnlyPlusMinus = true).'$'.$modPrice.')' : '';
         return $title;
     }
 
@@ -317,7 +317,7 @@ 
      */
     public function getAvailability()
     {
-        $available = ($this->Available == 1) ? true : false ;
+        $available = ($this->Available == 1) ? true : false;
 
         $this->extend('updateOptionAvailability', $available);
 

src/Model/FoxyCart.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
         $strLength = strlen($charset);
         $str = '';
         while ($count < $length) {
-            $str .= $charset[mt_rand(0, $strLength-1)];
+            $str .= $charset[mt_rand(0, $strLength - 1)];
             $count++;
         }
         return self::getKeyPrefix().substr(base64_encode($str), 0, $length);
@@ -55,7 +55,7 @@ 
     public static function store_name_warning()
     {
         $warning = null;
-        if (self::getFoxyCartStoreName()===null) {
+        if (self::getFoxyCartStoreName() === null) {
             $warning = 'Must define FoxyCart Store Name in your site settings in the cms';
         }
         return $warning;
@@ -97,7 +97,7 @@ 
             $foxyData["api_token"] = FoxyCart::getStoreKey();
 
             $ch = curl_init();
-            curl_setopt($ch, CURLOPT_URL, "https://" . $foxy_domain . "/api");
+            curl_setopt($ch, CURLOPT_URL, "https://".$foxy_domain."/api");
             curl_setopt($ch, CURLOPT_POSTFIELDS, $foxyData);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
             curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
@@ -150,7 +150,7 @@ 
     public static function putCustomer($Member = null)
     {
         // throw error if no $Member Object
-        if (!isset($Member)) ;//trigger_error('No Member set', E_USER_ERROR);
+        if (!isset($Member)); //trigger_error('No Member set', E_USER_ERROR);
 
         // send updated customer record from API
         $foxyData = array();