dynamic / foxystripe

tests/StoreSettingsTest.php

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');

Indentation +14 added lines, -14 removed lines

@@ -2,28 +2,28 @@
 
 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(){
-		$siteConf = SiteConfig::current_site_config();
+    function testStoreKey(){
+        $siteConf = SiteConfig::current_site_config();
 
-		$this->assertTrue(ctype_alnum($siteConf->StoreKey));
+        $this->assertTrue(ctype_alnum($siteConf->StoreKey));
         $this->assertEquals(strlen($siteConf->StoreKey), 60);
-	}
+    }
 
-	function testStoreName(){
-		$siteConf = SiteConfig::current_site_config();
+    function testStoreName(){
+        $siteConf = SiteConfig::current_site_config();
 
         $this->assertEquals($siteConf->StoreName, 'foxystripe');
-	}
+    }
 
 }

tests/ProductDiscountTierTest.php

Spacing +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-class ProductDiscountTierTest extends FS_Test{
+class ProductDiscountTierTest extends FS_Test {
 
 	protected static $use_draft_site = true;
 
-	function setUp(){
+	function setUp() {
 		parent::setUp();
 
 		$productHolder = ProductHolder::create();
@@ -16,7 +16,7 @@ 
 		$product->write();
 	}
 
-	public function testProductDiscountTierCreation(){
+	public function testProductDiscountTierCreation() {
 		$this->logInWithPermission('Product_CANCRUD');
 
 		$discount = ProductPage::get()->first();
@@ -34,7 +34,7 @@ 
 		$this->logOut();
 	}
 
-	public function testProductDiscountTierEdit(){
+	public function testProductDiscountTierEdit() {
 		$this->logInWithPermission('ADMIN');
 
 		$discount = ProductPage::get()->first();
@@ -57,7 +57,7 @@ 
 		$this->logOut();
 	}
 
-	public function testProductDiscountTierDeletion(){
+	public function testProductDiscountTierDeletion() {
 		$this->logInWithPermission('ADMIN');
 
 		$discount = ProductPage::get()->first();

Indentation +51 added lines, -51 removed lines

@@ -2,79 +2,79 @@
 
 class ProductDiscountTierTest extends FS_Test{
 
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
-	function setUp(){
-		parent::setUp();
+    function setUp(){
+        parent::setUp();
 
-		$productHolder = ProductHolder::create();
-		$productHolder->Title = 'Product Holder';
-		$productHolder->write();
+        $productHolder = ProductHolder::create();
+        $productHolder->Title = 'Product Holder';
+        $productHolder->write();
 
-		$product = $this->objFromFixture('ShippableProduct', 'product1');
-		$product->ParentID = $productHolder->ID;
-		$product->write();
-	}
+        $product = $this->objFromFixture('ShippableProduct', 'product1');
+        $product->ParentID = $productHolder->ID;
+        $product->write();
+    }
 
-	public function testProductDiscountTierCreation(){
-		$this->logInWithPermission('Product_CANCRUD');
+    public function testProductDiscountTierCreation(){
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$discount = ShippableProduct::get()->first();
+        $discount = ShippableProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->ShippableProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->ShippableProductID = $discount->ID;
+        $tier->write();
+        $tierID = $tier->ID;
 
-		$checkTier = ProductDiscountTier::get()->byID($tierID);
+        $checkTier = ProductDiscountTier::get()->byID($tierID);
 
-		$this->assertEquals($checkTier->Quantity, 5);
-		$this->assertEquals($checkTier->Percentage, 10);
+        $this->assertEquals($checkTier->Quantity, 5);
+        $this->assertEquals($checkTier->Percentage, 10);
 
-		$this->logOut();
-	}
+        $this->logOut();
+    }
 
-	public function testProductDiscountTierEdit(){
-		$this->logInWithPermission('ADMIN');
+    public function testProductDiscountTierEdit(){
+        $this->logInWithPermission('ADMIN');
 
-		$discount = ShippableProduct::get()->first();
+        $discount = ShippableProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->ShippableProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
-		$this->logInWithPermission('Product_CANCRUD');
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->ShippableProductID = $discount->ID;
+        $tier->write();
+        $tierID = $tier->ID;
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$tier->Quantity = 2;
-		$tier->Percentage = 5;
-		$tier->write();
+        $tier->Quantity = 2;
+        $tier->Percentage = 5;
+        $tier->write();
 
-		$checkTier = ProductDiscountTier::get()->byID($tierID);
+        $checkTier = ProductDiscountTier::get()->byID($tierID);
 
-		$this->assertEquals($checkTier->Quantity, 2);
-		$this->assertEquals($checkTier->Percentage, 5);
+        $this->assertEquals($checkTier->Quantity, 2);
+        $this->assertEquals($checkTier->Percentage, 5);
 
-		$this->logOut();
-	}
+        $this->logOut();
+    }
 
-	public function testProductDiscountTierDeletion(){
-		$this->logInWithPermission('ADMIN');
+    public function testProductDiscountTierDeletion(){
+        $this->logInWithPermission('ADMIN');
 
-		$discount = ShippableProduct::get()->first();
+        $discount = ShippableProduct::get()->first();
 
-		$tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
-		$tier->ShippableProductID = $discount->ID;
-		$tier->write();
-		$tierID = $tier->ID;
+        $tier = $this->objFromFixture('ProductDiscountTier', 'fiveforten');
+        $tier->ShippableProductID = $discount->ID;
+        $tier->write();
+        $tierID = $tier->ID;
 
-		$this->logOut();
+        $this->logOut();
 
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$tier->delete();
-		$this->assertTrue(!ProductDiscountTier::get()->byID($tierID));
+        $tier->delete();
+        $this->assertTrue(!ProductDiscountTier::get()->byID($tierID));
 
-		$this->logOut();
-	}
+        $this->logOut();
+    }
 
 }

code/form/FoxyStripePurchaseForm.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     private $product;
 
     /**
-     * @param $siteConfig
+     * @param SiteConfig|null $siteConfig
      * @return $this
      */
     public function setSiteConfig($siteConfig)

Spacing +4 added lines, -4 removed lines

@@ -120,7 +120,7 @@ 
             $fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'product_id',
                 $this->product->ID))->setValue($this->product->ID));
             $fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'price',
-                $this->product->Price))->setValue($this->product->Price));//can't override id
+                $this->product->Price))->setValue($this->product->Price)); //can't override id
             $fields->push(HiddenField::create(ProductPage::getGeneratedValue($code, 'weight',
                 $this->product->Weight))->setValue($this->product->Weight));
             if ($this->DiscountTitle && $this->ProductDiscountTiers()->exists()) {
@@ -151,11 +151,11 @@ 
 
             $fields->push(DropdownField::create('quantity', 'Quantity', $quantity));
 
-            $fields->push(HeaderField::create('submitPrice', '$' . $this->product->Price, 4));
+            $fields->push(HeaderField::create('submitPrice', '$'.$this->product->Price, 4));
 
 
             $this->extend('updatePurchaseFormFields', $fields);
-        } else {
+        }else {
             $fields->push(HeaderField::create('submitPrice', 'Currently Out of Stock'), 4);
         }
 
@@ -192,7 +192,7 @@ 
     protected function getProductOptionSet()
     {
 
-        $assignAvailable = function ($self) {
+        $assignAvailable = function($self) {
             $this->extend('updateFoxyStripePurchaseForm', $form);
             $self->Available = ($self->getAvailability()) ? true : false;
         };

code/pages/ProductHolder.php

Braces +3 added lines, -1 removed lines

@@ -81,7 +81,9 @@
     {
         if ($children = $this->AllChildren()) {
             foreach ($children as $child) {
-                if (in_array($child->ID, $idList)) continue;
+                if (in_array($child->ID, $idList)) {
+                    continue;
+                }
 
                 if ($child instanceof ProductHolder) {
                     $idList[] = $child->ID;

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/FoxyStripeProductTest.php

Braces +6 added lines, -2 removed lines

@@ -55,14 +55,18 @@
 
         $versions = DB::query('Select * FROM "FoxyStripeProduct_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 "FoxyStripeProduct_versions" WHERE "RecordID" = ' . $productID);
         $versionsPostDelete = array();
-        foreach ($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+        foreach ($versions as $versionRow) {
+            $versionsPostDelete[] = $versionRow;
+        }
 
         $this->assertEquals($versionsPostPublish, $versionsPostDelete);
 

Spacing +2 added lines, -2 removed lines

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

code/objects/products/FoxyStripeProduct.php

Braces +6 added lines, -2 removed lines

@@ -141,11 +141,15 @@
                             Settings > FoxyStripe > Categories
                         </a>'
             ));
-        if (class_exists('QuickAddNewExtension')) $catField->useAddNew('FoxyCartProductCategory', $source);
+        if (class_exists('QuickAddNewExtension')) {
+            $catField->useAddNew('FoxyCartProductCategory', $source);
+        }
 
         // Product Images gridfield
         $config = GridFieldConfig_RelationEditor::create();
-        if (class_exists('GridFieldSortableRows')) $config->addComponent(new GridFieldSortableRows('SortOrder'));
+        if (class_exists('GridFieldSortableRows')) {
+            $config->addComponent(new GridFieldSortableRows('SortOrder'));
+        }
         if (class_exists('GridFieldBulkImageUpload')) {
             $config->addComponent(new GridFieldBulkUpload());
             $config->getComponentByType('GridFieldBulkUpload')->setUfConfig('folderName', 'Uploads/ProductImages');

Spacing +5 added lines, -6 removed lines

@@ -122,7 +122,7 @@ 
         $previewDescription = ($this->stat('customPreviewDescription')) ? $this->stat('customPreviewDescription') : _t('ProductPage.PreviewImageDescription', 'Image used throughout site to represent this product');
 
         // Cateogry Dropdown field w/ add new
-        $source = function () {
+        $source = function() {
             return FoxyCartProductCategory::get()->map()->toArray();
         };
         $catField = DropdownField::create('CategoryID', _t('ProductPage.Category', 'FoxyCart Category'), $source())
@@ -159,7 +159,7 @@ 
         if (class_exists('GridFieldSortableRows')) {
             $config->addComponent(new GridFieldSortableRows('SortOrder'));
             $products = $this->ProductOptions()->sort('SortOrder');
-        } else {
+        }else {
             $products = $this->ProductOptions();
         }
         $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
@@ -215,7 +215,7 @@ 
                 ->setFolderName('Uploads/Products')
                 ->setAllowedExtensions(['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',
@@ -273,7 +273,7 @@ 
             $product = ProductPage::get()->byID($this->ID);
             if (isset($product->ParentID)) {
                 $origParent = $product->ParentID;
-            } else {
+            }else {
                 $origParent = null;
             }
             $currentParent = $this->ParentID;
@@ -348,8 +348,7 @@ 
     {
         $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;
     }
 
     /**

code/objects/OrderDetail.php

Indentation +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         'Price' => 'Currency'
     );
 
-	private static $has_one = array(
+    private static $has_one = array(
         'Product' => 'FoxyStripeProduct',
         'Order' => 'Order'
     );

code/objects/OptionItem.php

Doc Comments +3 added lines

@@ -181,6 +181,9 @@
         return $result;
     }
 
+    /**
+     * @param string $oma
+     */
     public static function getOptionModifierActionSymbol($oma, $returnWithOnlyPlusMinus = false)
     {
         switch ($oma) {

Spacing +9 added lines, -9 removed lines

@@ -72,7 +72,7 @@ 
         $parentCode = $product->Code;
 
         // ProductOptionGroup Dropdown field w/ add new
-        $groups = function () {
+        $groups = function() {
             return OptionGroup::get()->map()->toArray();
         };
         $groupFields = singleton('OptionGroup')->getCMSFields();
@@ -198,17 +198,17 @@ 
 
     public function getWeightModifierWithSymbol()
     {
-        return self::getOptionModifierActionSymbol($this->WeightModifierAction) . $this->WeightModifier;
+        return self::getOptionModifierActionSymbol($this->WeightModifierAction).$this->WeightModifier;
     }
 
     public function getPriceModifierWithSymbol()
     {
-        return self::getOptionModifierActionSymbol($this->PriceModifierAction) . $this->PriceModifier;
+        return self::getOptionModifierActionSymbol($this->PriceModifierAction).$this->PriceModifier;
     }
 
     public function getCodeModifierWithSymbol()
     {
-        return self::getOptionModifierActionSymbol($this->CodeModifierAction) . $this->CodeModifier;
+        return self::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
     }
 
     public function getProductOptionGroupTitle()
@@ -219,18 +219,18 @@ 
     public function getGeneratedValue()
     {
         $modPrice = ($this->PriceModifier) ? (string)$this->PriceModifier : '0';
-        $modPriceWithSymbol = OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction) . $modPrice;
+        $modPriceWithSymbol = OptionItem::getOptionModifierActionSymbol($this->PriceModifierAction).$modPrice;
         $modWeight = ($this->WeightModifier) ? (string)$this->WeightModifier : '0';
-        $modWeight = OptionItem::getOptionModifierActionSymbol($this->WeightModifierAction) . $modWeight;
-        $modCode = OptionItem::getOptionModifierActionSymbol($this->CodeModifierAction) . $this->CodeModifier;
-        return $this->Title . '{p' . $modPriceWithSymbol . '|w' . $modWeight . '|c' . $modCode . '}';
+        $modWeight = OptionItem::getOptionModifierActionSymbol($this->WeightModifierAction).$modWeight;
+        $modCode = OptionItem::getOptionModifierActionSymbol($this->CodeModifierAction).$this->CodeModifier;
+        return $this->Title.'{p'.$modPriceWithSymbol.'|w'.$modWeight.'|c'.$modCode.'}';
     }
 
     public function getGeneratedTitle()
     {
         $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;
     }
 

Braces +3 added lines, -1 removed lines

@@ -79,7 +79,9 @@
         $groupField = DropdownField::create('ProductOptionGroupID', _t("OptionItem.Group", "Group"), $groups())
             ->setEmptyString('')
             ->setDescription(_t('OptionItem.GroupDescription', 'Name of this group of options. Managed in <a href="admin/settings">Settings > FoxyStripe > Option Groups</a>'));
-        if (class_exists('QuickAddNewExtension')) $groupField->useAddNew('OptionGroup', $groups, $groupFields);
+        if (class_exists('QuickAddNewExtension')) {
+            $groupField->useAddNew('OptionGroup', $groups, $groupFields);
+        }
 
         $fields->addFieldsToTab('Root.Main', array(
             HeaderField::create('DetailsHD', _t("OptionItem.DetailsHD", "Product Option Details"), 2),