dynamic / foxystripe

code/form/FoxyStripeDropdownField.php

Indentation +33 added lines, -33 removed lines

@@ -50,39 +50,39 @@
  */
 class FoxyStripeDropdownField extends DropdownField{
 
-	/**
-	 * Mark certain elements as disabled,
-	 * regardless of the {@link setDisabled()} settings.
-	 *
-	 * @param array $items Collection of array keys, as defined in the $source array
-	 */
-	public function setDisabledItems($items){
-		$controller = Controller::curr();
-		$code = $controller->data()->Code;
-		$updated = [];
-		if(is_array($items) && !empty($items)){
-			foreach($items as $item){
-				array_push($updated, ProductPage::getGeneratedValue($code, $this->getName(), $item, 'value'));
-			}
-		}
-		$this->disabledItems = $updated;
-		return $this;
-	}
+    /**
+     * Mark certain elements as disabled,
+     * regardless of the {@link setDisabled()} settings.
+     *
+     * @param array $items Collection of array keys, as defined in the $source array
+     */
+    public function setDisabledItems($items){
+        $controller = Controller::curr();
+        $code = $controller->data()->Code;
+        $updated = [];
+        if(is_array($items) && !empty($items)){
+            foreach($items as $item){
+                array_push($updated, ProductPage::getGeneratedValue($code, $this->getName(), $item, 'value'));
+            }
+        }
+        $this->disabledItems = $updated;
+        return $this;
+    }
 
-	/**
-	 * @param array $source
-	 */
-	public function setSource($source) {
-		$controller = Controller::curr();
-		$code = $controller->data()->Code;
-		$updated = [];
-		if(is_array($source) && !empty($source)){
-			foreach($source as $key => $val){
-				$updated[ProductPage::getGeneratedValue($code, $this->getName(), $key, 'value')] = $val;
-			}
-		}
-		$this->source = $updated;
-		return $this;
-	}
+    /**
+     * @param array $source
+     */
+    public function setSource($source) {
+        $controller = Controller::curr();
+        $code = $controller->data()->Code;
+        $updated = [];
+        if(is_array($source) && !empty($source)){
+            foreach($source as $key => $val){
+                $updated[ProductPage::getGeneratedValue($code, $this->getName(), $key, 'value')] = $val;
+            }
+        }
+        $this->source = $updated;
+        return $this;
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
  * @package forms
  * @subpackage fields-basic
  */
-class FoxyStripeDropdownField extends DropdownField{
+class FoxyStripeDropdownField extends DropdownField {
 
 	/**
 	 * Mark certain elements as disabled,
@@ -56,12 +56,12 @@ 
 	 *
 	 * @param array $items Collection of array keys, as defined in the $source array
 	 */
-	public function setDisabledItems($items){
+	public function setDisabledItems($items) {
 		$controller = Controller::curr();
 		$code = $controller->data()->Code;
 		$updated = [];
-		if(is_array($items) && !empty($items)){
-			foreach($items as $item){
+		if (is_array($items) && !empty($items)) {
+			foreach ($items as $item) {
 				array_push($updated, ProductPage::getGeneratedValue($code, $this->getName(), $item, 'value'));
 			}
 		}
@@ -76,8 +76,8 @@ 
 		$controller = Controller::curr();
 		$code = $controller->data()->Code;
 		$updated = [];
-		if(is_array($source) && !empty($source)){
-			foreach($source as $key => $val){
+		if (is_array($source) && !empty($source)) {
+			foreach ($source as $key => $val) {
 				$updated[ProductPage::getGeneratedValue($code, $this->getName(), $key, 'value')] = $val;
 			}
 		}

code/extensions/CustomerExtension.php

Indentation +4 added lines, -4 removed lines

@@ -25,10 +25,10 @@
         $response = FoxyCart::putCustomer($this->owner);
 
         // Grab customer_id record from FoxyCart response, store in Member
-		if($response){
-        	$foxyResponse = new SimpleXMLElement($response);
-        	$this->owner->Customer_ID = (int) $foxyResponse->customer_id;
-		}
+        if($response){
+            $foxyResponse = new SimpleXMLElement($response);
+            $this->owner->Customer_ID = (int) $foxyResponse->customer_id;
+        }
     }
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class CustomerExtension extends DataExtension{
+class CustomerExtension extends DataExtension {
 
     private static $db = array(
         'Customer_ID' => 'Int'
@@ -25,9 +25,9 @@ 
         $response = FoxyCart::putCustomer($this->owner);
 
         // Grab customer_id record from FoxyCart response, store in Member
-		if($response){
+		if ($response) {
         	$foxyResponse = new SimpleXMLElement($response);
-        	$this->owner->Customer_ID = (int) $foxyResponse->customer_id;
+        	$this->owner->Customer_ID = (int)$foxyResponse->customer_id;
 		}
     }
 

tests/StoreSettingsTest.php

Indentation +15 added lines, -15 removed lines

@@ -2,30 +2,30 @@
 
 class StoreSettingsTest extends FS_Test{
 
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
-	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 +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-class StoreSettingsTest extends FS_Test{
+class StoreSettingsTest extends FS_Test {
 
 	protected static $use_draft_site = true;
 
-	function setUp(){
+	function setUp() {
 		parent::setUp();
 
 		$siteConf = SiteConfig::current_site_config();
@@ -13,7 +13,7 @@ 
 		$siteConf->write();
 	}
 
-	function testStoreKey(){
+	function testStoreKey() {
 		$pref = FoxyCart::getKeyPrefix();
 		$siteConf = SiteConfig::current_site_config();
 
@@ -22,7 +22,7 @@ 
         $this->assertEquals(substr($siteConf->StoreKey, 0, 6), $pref);
 	}
 
-	function testStoreName(){
+	function testStoreName() {
 		$siteConf = SiteConfig::current_site_config();
 
         $this->assertEquals($siteConf->StoreName, 'foxystripe');

tests/ProductPageTest.php

Braces +6 added lines, -2 removed lines

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

Indentation +145 added lines, -145 removed lines

@@ -2,242 +2,242 @@
 
 class ProductPageTest extends FS_Test{
 
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
-	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', 'default');
-		$holder = $this->objFromFixture('ProductHolder', 'default');
-		$product1 = $this->objFromFixture('ProductPage', 'product1');
+        $this->logInWithPermission('Product_CANCRUD');
+        $default = $this->objFromFixture('ProductCategory', 'default');
+        $holder = $this->objFromFixture('ProductHolder', 'default');
+        $product1 = $this->objFromFixture('ProductPage', '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', 'default');
-		$holder->doPublish();
-		$product2 = $this->objFromFixture('ProductPage', 'product2');
-		$productID = $product2->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $holder = $this->objFromFixture('ProductHolder', 'default');
+        $holder->doPublish();
+        $product2 = $this->objFromFixture('ProductPage', 'product2');
+        $productID = $product2->ID;
 
-		$product2->doPublish();
-		$this->assertTrue($product2->isPublished());
+        $product2->doPublish();
+        $this->assertTrue($product2->isPublished());
 
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
-		$versionsPostPublish = array();
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+        $versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
+        $versionsPostPublish = array();
+        foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
 
-		$product2->delete();
-		$this->assertTrue(!$product2->isPublished());
+        $product2->delete();
+        $this->assertTrue(!$product2->isPublished());
 
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
-		$versionsPostDelete = array();
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+        $versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
+        $versionsPostDelete = array();
+        foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
 
-		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
+        $this->assertTrue($versionsPostPublish == $versionsPostDelete);
 
-	}
+    }
 
-	function testProductTitleLeadingWhiteSpace(){
+    function testProductTitleLeadingWhiteSpace(){
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$holder = $this->objFromFixture('ProductHolder', 'default');
-		$holder->doPublish();
+        $holder = $this->objFromFixture('ProductHolder', 'default');
+        $holder->doPublish();
 
-		$product = $this->objFromFixture('ProductPage', 'product1');
-		$product->Title = " Test with leading space";
-		$product->doPublish();
+        $product = $this->objFromFixture('ProductPage', 'product1');
+        $product->Title = " Test with leading space";
+        $product->doPublish();
 
-		$this->assertTrue($product->Title == 'Test with leading space');
+        $this->assertTrue($product->Title == 'Test with leading space');
 
-	}
+    }
 
-	function testProductTitleTrailingWhiteSpace(){
+    function testProductTitleTrailingWhiteSpace(){
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$holder = $this->objFromFixture('ProductHolder', 'default');
-		$holder->doPublish();
+        $holder = $this->objFromFixture('ProductHolder', 'default');
+        $holder->doPublish();
 
-		$product = $this->objFromFixture('ProductPage', 'product1');
-		$product->Title = "Test with trailing space ";
-		$product->doPublish();
+        $product = $this->objFromFixture('ProductPage', 'product1');
+        $product->Title = "Test with trailing space ";
+        $product->doPublish();
 
-		$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', 'apparel');
-		$category->write();
-		$categoryID = $category->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $category = $this->objFromFixture('ProductCategory', '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', 'default');
-		$category->write();
+        $category = $this->objFromFixture('ProductCategory', 'default');
+        $category->write();
 
-		$this->assertFalse($category->canDelete());
+        $this->assertFalse($category->canDelete());
 
-		$category2 = $this->objFromFixture('ProductCategory', 'apparel');
-		$category2->write();
-		$category2ID = $category2->ID;
+        $category2 = $this->objFromFixture('ProductCategory', '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', 'size');
-		$group->write();
+        $group = $this->objFromFixture('OptionGroup', 'size');
+        $group->write();
 
-		$this->assertNotNull(OptionGroup::get()->first());
+        $this->assertNotNull(OptionGroup::get()->first());
 
-	}
+    }
 
-	function testOptionGroupDeletion(){
+    function testOptionGroupDeletion(){
 
-		$this->logInWithPermission('ADMIN');
-		$group = $this->objFromFixture('OptionGroup', 'color');
-		$group->write();
-		$groupID = $group->ID;
+        $this->logInWithPermission('ADMIN');
+        $group = $this->objFromFixture('OptionGroup', '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', 'large');
-		$option->ProductOptionGroupID = $optionGroup->ID;
-		$option->write();
+        $option = $this->objFromFixture('OptionItem', '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', 'size');
-		$optionGroup->write();
+        $optionGroup = $this->objFromFixture('OptionGroup', 'size');
+        $optionGroup->write();
 
-		$option = $this->objFromFixture('OptionItem', 'small');
-		$option->write();
+        $option = $this->objFromFixture('OptionItem', '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', 'default');//build holder page, ProductPage can't be on root level
-		$holder->doPublish();
+        $holder = $this->objFromFixture('ProductHolder', 'default');//build holder page, ProductPage can't be on root level
+        $holder->doPublish();
 
-		$product = $this->objFromFixture('ProductPage', 'product1');//build product page
-		$product->doPublish();
+        $product = $this->objFromFixture('ProductPage', 'product1');//build product page
+        $product->doPublish();
 
-		$productID = $product->ID;
+        $productID = $product->ID;
 
 
-		$optionGroup = $this->objFromFixture('OptionGroup', 'size');//build the group for the options
-		$optionGroup->write();
-		$option = $this->objFromFixture('OptionItem', 'small');//build first option
-		$option->write();
-		$option2 = $this->objFromFixture('OptionItem', 'large');//build second option
-		$option2->write();
+        $optionGroup = $this->objFromFixture('OptionGroup', 'size');//build the group for the options
+        $optionGroup->write();
+        $option = $this->objFromFixture('OptionItem', 'small');//build first option
+        $option->write();
+        $option2 = $this->objFromFixture('OptionItem', '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', 'large');
+        $testOption = $this->objFromFixture('OptionItem', '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 +33 added lines, -33 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-class ProductPageTest extends FS_Test{
+class ProductPageTest extends FS_Test {
 
 	protected static $use_draft_site = true;
 
-	function setUp(){
+	function setUp() {
 		parent::setUp();
 
 		$groupForItem = OptionGroup::create();
@@ -16,7 +16,7 @@ 
 		$productHolder->write();*/
 	}
 
-	function testProductCreation(){
+	function testProductCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$default = $this->objFromFixture('ProductCategory', 'default');
@@ -28,7 +28,7 @@ 
 
 	}
 
-	function testProductDeletion(){
+	function testProductDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$holder = $this->objFromFixture('ProductHolder', 'default');
@@ -39,22 +39,22 @@ 
 		$product2->doPublish();
 		$this->assertTrue($product2->isPublished());
 
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
+		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '.$productID);
 		$versionsPostPublish = array();
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+		foreach ($versions as $versionRow) $versionsPostPublish[] = $versionRow;
 
 		$product2->delete();
 		$this->assertTrue(!$product2->isPublished());
 
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
+		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '.$productID);
 		$versionsPostDelete = array();
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+		foreach ($versions as $versionRow) $versionsPostDelete[] = $versionRow;
 
 		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
 
 	}
 
-	function testProductTitleLeadingWhiteSpace(){
+	function testProductTitleLeadingWhiteSpace() {
 
 		$this->logInWithPermission('ADMIN');
 
@@ -69,7 +69,7 @@ 
 
 	}
 
-	function testProductTitleTrailingWhiteSpace(){
+	function testProductTitleTrailingWhiteSpace() {
 
 		$this->logInWithPermission('ADMIN');
 
@@ -84,7 +84,7 @@ 
 
 	}
 
-	function testProductCategoryCreation(){
+	function testProductCategoryCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$category = $this->objFromFixture('ProductCategory', 'apparel');
@@ -97,7 +97,7 @@ 
 
 	}
 
-	function testProductCategoryDeletion(){
+	function testProductCategoryDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 
@@ -124,11 +124,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');
 
@@ -139,7 +139,7 @@ 
 
 	}
 
-	function testOptionGroupDeletion(){
+	function testOptionGroupDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 		$group = $this->objFromFixture('OptionGroup', 'color');
@@ -158,7 +158,7 @@ 
 
 	}
 
-	function testOptionItemCreation(){
+	function testOptionItemCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 
@@ -176,7 +176,7 @@ 
 
 	}
 
-	function testOptionItemDeletion(){
+	function testOptionItemDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 
@@ -200,44 +200,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', 'default');//build holder page, ProductPage can't be on root level
+		$holder = $this->objFromFixture('ProductHolder', 'default'); //build holder page, ProductPage can't be on root level
 		$holder->doPublish();
 
-		$product = $this->objFromFixture('ProductPage', 'product1');//build product page
+		$product = $this->objFromFixture('ProductPage', 'product1'); //build product page
 		$product->doPublish();
 
 		$productID = $product->ID;
 
 
-		$optionGroup = $this->objFromFixture('OptionGroup', 'size');//build the group for the options
+		$optionGroup = $this->objFromFixture('OptionGroup', 'size'); //build the group for the options
 		$optionGroup->write();
-		$option = $this->objFromFixture('OptionItem', 'small');//build first option
+		$option = $this->objFromFixture('OptionItem', 'small'); //build first option
 		$option->write();
-		$option2 = $this->objFromFixture('OptionItem', 'large');//build second option
+		$option2 = $this->objFromFixture('OptionItem', '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', '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

code/pages/ProductHolder.php

Doc Comments +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
      * Products function.
      * 
      * @access public
-     * @return array
+     * @return PaginatedList
      */
     public function ProductList($limit = 10)
     {

Spacing +4 added lines, -4 removed lines

@@ -129,14 +129,14 @@ 
     {
         $config = SiteConfig::current_site_config();
 
-        if ($config->ProductLimit>0) {
+        if ($config->ProductLimit > 0) {
             $limit = $config->ProductLimit;
         }
 
         if ($config->MultiGroup) {
             $entries = $this->Products()->sort('SortOrder');
-        } else {
-            $filter = '"ParentID" = ' . $this->ID;
+        }else {
+            $filter = '"ParentID" = '.$this->ID;
 
             // Build a list of all IDs for ProductGroups that are children
             $holderIDs = $this->ProductGroupIDs();
@@ -147,7 +147,7 @@ 
                 if ($filter) {
                     $filter .= ' OR ';
                 }
-                $filter .= '"ParentID" IN (' . implode(',', $holderIDs) . ")";
+                $filter .= '"ParentID" IN ('.implode(',', $holderIDs).")";
             }
 
             $order = '"SiteTree"."Title" ASC';

code/objects/Order.php

Spacing +2 added lines, -2 removed lines

@@ -85,8 +85,8 @@
 
     public function getReceiptLink()
     {
-        $obj= HTMLVarchar::create();
-        $obj->setValue('<a href="' . $this->ReceiptURL . '" target="_blank" class="cms-panel-link action external-link">view</a>');
+        $obj = HTMLVarchar::create();
+        $obj->setValue('<a href="'.$this->ReceiptURL.'" target="_blank" class="cms-panel-link action external-link">view</a>');
         return $obj;
     }
 

tests/OptionGroupTest.php

Spacing +2 added lines, -2 removed lines

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

code/objects/OptionItem.php

Doc Comments +1 added lines, -1 removed lines

@@ -285,7 +285,7 @@
     }
 
     /**
-     * @return mixed|string
+     * @return string
      */
     public function getGeneratedTitle()
     {

Spacing +4 added lines, -4 removed lines

@@ -90,7 +90,7 @@ 
         $parentCode = $product->Code;
 
         // ProductOptionGroup Dropdown field w/ add new
-        $groups = function () {
+        $groups = function() {
             return OptionGroup::get()->map()->toArray();
         };
         $groupFields = singleton('OptionGroup')->getCMSFields();
@@ -224,7 +224,7 @@ 
      * @param bool $returnWithOnlyPlusMinus
      * @return string
      */
-    public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus=false)
+    public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus = false)
     {
         switch ($oma) {
             case 'Subtract':
@@ -291,7 +291,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;
     }
 
@@ -300,7 +300,7 @@ 
      */
     public function getAvailability()
     {
-        $available = ($this->Available == 1) ? true : false ;
+        $available = ($this->Available == 1) ? true : false;
 
         $this->extend('updateOptionAvailability', $available);
 

code/pages/ProductPage.php

Spacing +6 added lines, -7 removed lines

@@ -95,7 +95,7 @@ 
             'Image used throughout site to represent this product');
 
         // Cateogry Dropdown field w/ add new
-        $source = function () {
+        $source = function() {
             return ProductCategory::get()->map()->toArray();
         };
         $catField = DropdownField::create('CategoryID', _t('ProductPage.Category', 'FoxyCart Category'), $source())
@@ -139,7 +139,7 @@ 
         if (class_exists('GridFieldSortableRows')) {
             $config->addComponent(new GridFieldSortableRows('SortOrder'));
             $products = $this->ProductOptions()->sort('SortOrder');
-        } else {
+        }else {
             $products = $this->ProductOptions();
         }
         $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
@@ -195,7 +195,7 @@ 
                 ->setFolderName('Uploads/Products')
                 ->setAllowedExtensions(array('jpg', 'jpeg', 'gif', 'png'))
                 ->setAllowedMaxFileNumber(1),
-            HeaderField::create('ProductImagesHD', _t('ProductPage.ProductImagesHD' . 'Product Image Gallery'), 2),
+            HeaderField::create('ProductImagesHD', _t('ProductPage.ProductImagesHD'.'Product Image Gallery'), 2),
             $prodImagesField
                 ->setDescription(_t(
                     'ProductPage.ProductImagesDescription',
@@ -241,7 +241,7 @@ 
             $product = ProductPage::get()->byID($this->ID);
             if (isset($product->ParentID)) {
                 $origParent = $product->ParentID;
-            } else {
+            }else {
                 $origParent = null;
             }
             $currentParent = $this->ParentID;
@@ -322,14 +322,13 @@ 
     ) {
         $optionName = ($optionName !== null) ? preg_replace('/\s/', '_', $optionName) : $optionName;
         return (SiteConfig::current_site_config()->CartValidation)
-            ? FoxyCart_Helper::fc_hash_value($productCode, $optionName, $optionValue, $method, $output, $urlEncode) :
-            $optionValue;
+            ? FoxyCart_Helper::fc_hash_value($productCode, $optionName, $optionValue, $method, $output, $urlEncode) : $optionValue;
     }
 
     // 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>';
     }
 
     /**