dynamic / foxystripe

tests/ProductPageTest.php

Indentation +126 added lines, -126 removed lines

@@ -2,194 +2,194 @@
 
 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->Title = 'Product Holder';
-		$productHolder->write();
-	}
+        $productHolder = ProductHolder::create();
+        $productHolder->Title = 'Product Holder';
+        $productHolder->write();
+    }
 
-	function testProductCreation(){
+    function testProductCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$default = $this->objFromFixture('ProductCategory', 'default');
-		$default->write();
-		$product1 = $this->objFromFixture('ProductPage', 'product1');
-		$product1->ParentID = ProductHolder::get()->first()->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $default = $this->objFromFixture('ProductCategory', 'default');
+        $default->write();
+        $product1 = $this->objFromFixture('ProductPage', 'product1');
+        $product1->ParentID = ProductHolder::get()->first()->ID;
 
-		$product1->doPublish();
-		$this->assertTrue($product1->isPublished());
+        $product1->doPublish();
+        $this->assertTrue($product1->isPublished());
 
-	}
+    }
 
-	function testProductDeletion(){
+    function testProductDeletion(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$product2 = $this->objFromFixture('ProductPage', 'product2');
-		$product2->ParentID = ProductHolder::get()->first()->ID;
-		$productID = $product2->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $product2 = $this->objFromFixture('ProductPage', 'product2');
+        $product2->ParentID = ProductHolder::get()->first()->ID;
+        $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');
-		$product = $this->objFromFixture('ProductPage', 'product1');
-		$product->Title = " Test with leading space";
-		$product->ParentID = ProductHolder::get()->first()->ID;
-		$product->doPublish();
+        $this->logInWithPermission('ADMIN');
+        $product = $this->objFromFixture('ProductPage', 'product1');
+        $product->Title = " Test with leading space";
+        $product->ParentID = ProductHolder::get()->first()->ID;
+        $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');
-		$product = $this->objFromFixture('ProductPage', 'product1');
-		$product->Title = "Test with trailing space ";
-		$product->ParentID = ProductHolder::get()->first()->ID;
-		$product->doPublish();
+        $this->logInWithPermission('ADMIN');
+        $product = $this->objFromFixture('ProductPage', 'product1');
+        $product->Title = "Test with trailing space ";
+        $product->ParentID = ProductHolder::get()->first()->ID;
+        $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');
-		$category = $this->objFromFixture('ProductCategory', 'default');
-		$category->write();
+        $this->logInWithPermission('Product_CANCRUD');
+        $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');
-		$group = $this->objFromFixture('OptionGroup', 'size');
-		$group->write();
+        $this->logInWithPermission('Product_CANCRUD');
+        $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');
-		$optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
-		$option = $this->objFromFixture('OptionItem', 'large');
-		$option->ProductOptionGroupID = $optionGroup->ID;
-		$option->write();
-		$optionID = $option->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
+        $option = $this->objFromFixture('OptionItem', 'large');
+        $option->ProductOptionGroupID = $optionGroup->ID;
+        $option->write();
+        $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');
-		$optionGroup = (OptionGroup::get()->first())
-			? OptionGroup::get()->first()
-			: OptionGroup::create();
-		if($optionGroup->ID == 0){
-			$optionGroup->Title = 'Size';
-			$optionGroup->write();
-		}
-		$option = $this->objFromFixture('OptionItem', 'small');
-		$option->ProductOptionGroupID = $optionGroup->ID;
-		$option->write();
-		$optionID = $option->ID;
+        $this->logInWithPermission('ADMIN');
+        $optionGroup = (OptionGroup::get()->first())
+            ? OptionGroup::get()->first()
+            : OptionGroup::create();
+        if($optionGroup->ID == 0){
+            $optionGroup->Title = 'Size';
+            $optionGroup->write();
+        }
+        $option = $this->objFromFixture('OptionItem', 'small');
+        $option->ProductOptionGroupID = $optionGroup->ID;
+        $option->write();
+        $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')));
 
-	}
+    }
 
 }

Spacing +18 added lines, -18 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');
@@ -29,7 +29,7 @@ 
 
 	}
 
-	function testProductDeletion(){
+	function testProductDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$product2 = $this->objFromFixture('ProductPage', 'product2');
@@ -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');
 		$product = $this->objFromFixture('ProductPage', 'product1');
@@ -66,7 +66,7 @@ 
 
 	}
 
-	function testProductTitleTrailingWhiteSpace(){
+	function testProductTitleTrailingWhiteSpace() {
 
 		$this->logInWithPermission('ADMIN');
 		$product = $this->objFromFixture('ProductPage', 'product1');
@@ -78,7 +78,7 @@ 
 
 	}
 
-	function testProductCategoryCreation(){
+	function testProductCategoryCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$category = $this->objFromFixture('ProductCategory', 'apparel');
@@ -91,7 +91,7 @@ 
 
 	}
 
-	function testProductCategoryDeletion(){
+	function testProductCategoryDeletion() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$category = $this->objFromFixture('ProductCategory', 'default');
@@ -117,11 +117,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');
 		$group = $this->objFromFixture('OptionGroup', 'size');
@@ -131,7 +131,7 @@ 
 
 	}
 
-	function testOptionGroupDeletion(){
+	function testOptionGroupDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 		$group = $this->objFromFixture('OptionGroup', 'color');
@@ -150,7 +150,7 @@ 
 
 	}
 
-	function testOptionItemCreation(){
+	function testOptionItemCreation() {
 
 		$this->logInWithPermission('Product_CANCRUD');
 		$optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
@@ -165,13 +165,13 @@ 
 
 	}
 
-	function testOptionItemDeletion(){
+	function testOptionItemDeletion() {
 
 		$this->logInWithPermission('ADMIN');
 		$optionGroup = (OptionGroup::get()->first())
 			? OptionGroup::get()->first()
 			: OptionGroup::create();
-		if($optionGroup->ID == 0){
+		if ($optionGroup->ID == 0) {
 			$optionGroup->Title = 'Size';
 			$optionGroup->write();
 		}

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

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>';
     }
 
     /**

code/model/FoxyStripeClient.php

Spacing +8 added lines, -8 removed lines

@@ -127,7 +127,7 @@ 
                 }
             }
             if (count($errors)) {
-                \SS_Log::log('setCurrentStore errors - ' . json_encode($errors), \SS_Log::WARN);
+                \SS_Log::log('setCurrentStore errors - '.json_encode($errors), \SS_Log::WARN);
             }
         }
     }
@@ -142,7 +142,7 @@ 
 
         $errors = array_merge($errors, $client->getErrors($result));
         if (count($errors)) {
-            \SS_Log::log('updateStore errors - ' . json_encode($errors), \SS_Log::WARN);
+            \SS_Log::log('updateStore errors - '.json_encode($errors), \SS_Log::WARN);
         }
     }
 
@@ -169,7 +169,7 @@ 
 
         $errors = array_merge($errors, $client->getErrors($result));
         if (count($errors)) {
-            \SS_Log::log('setItemCategoriesURL errors - ' . json_encode($errors), \SS_Log::WARN);
+            \SS_Log::log('setItemCategoriesURL errors - '.json_encode($errors), \SS_Log::WARN);
         }
     }
 
@@ -194,7 +194,7 @@ 
 
         $errors = array_merge($errors, $client->getErrors($result));
         if (count($errors)) {
-            \SS_Log::log('setItemCategories errors - ' . json_encode($errors), \SS_Log::WARN);
+            \SS_Log::log('setItemCategories errors - '.json_encode($errors), \SS_Log::WARN);
         }
     }
 
@@ -217,7 +217,7 @@ 
                 }
                 $errors = array_merge($errors, $client->getErrors($result));
                 if (count($errors)) {
-                    \SS_Log::log('getCategory errors - ' . json_encode($errors), \SS_Log::WARN);
+                    \SS_Log::log('getCategory errors - '.json_encode($errors), \SS_Log::WARN);
                 }
             }
         }
@@ -234,12 +234,12 @@ 
 
         if ($category = $this->getCategory($data['code'])) {
             $result = $client->patch($category, $data);
-        } else {
+        }else {
             $result = $client->post($this->getItemCategoriesURL(), $data);
         }
         $errors = array_merge($errors, $client->getErrors($result));
         if (count($errors)) {
-            \SS_Log::log('putCategory errors - ' . json_encode($errors), \SS_Log::WARN);
+            \SS_Log::log('putCategory errors - '.json_encode($errors), \SS_Log::WARN);
         }
     }
 
@@ -256,7 +256,7 @@ 
 
             $errors = array_merge($errors, $client->getErrors($result));
             if (count($errors)) {
-                \SS_Log::log('deleteCategory errors - ' . json_encode($errors), \SS_Log::WARN);
+                \SS_Log::log('deleteCategory errors - '.json_encode($errors), \SS_Log::WARN);
             }
         }
     }

code/extensions/FoxyStripeSiteConfig.php

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
 
 use Dynamic\FoxyStripe\Model\FoxyStripeClient;
 
-class FoxyStripeSiteConfig extends DataExtension{
+class FoxyStripeSiteConfig extends DataExtension {
 
 	private static $db = array(
 	    'StoreTitle' => 'Varchar(255)',
@@ -27,7 +27,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'));
@@ -83,7 +83,7 @@ 
         ));
 
         // configuration warning
-		if(FoxyCart::store_name_warning()!==null){
+		if (FoxyCart::store_name_warning() !== null) {
 			$fields->insertBefore(LiteralField::create(
                 "StoreSubDomainHeaderWarning",
                 _t(
@@ -174,14 +174,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');
         }
     }
 
@@ -227,7 +227,7 @@ 
 
                 $errors = array_merge($errors, $client->getErrors($result));
                 if (count($errors)) {
-                    \SS_Log::log('FoxyStripeSiteConfig::onBeforeWrite errors - ' . json_encode($errors), \SS_Log::WARN);
+                    \SS_Log::log('FoxyStripeSiteConfig::onBeforeWrite errors - '.json_encode($errors), \SS_Log::WARN);
                 }
             }
         }

Indentation +44 added lines, -44 removed lines

@@ -4,9 +4,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)',
@@ -24,21 +24,21 @@ 
         'UseSingleSignOn' => 'Boolean',
         'AllowMultiship' => 'Boolean',
         'StoreTimezone' => 'TimeZone',
-		'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'));
@@ -46,17 +46,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')),
@@ -91,7 +91,7 @@ 
             CheckboxField::create('AllowMultiship', 'Allow multiple shipments per order')
 
 
-			// Advanced Settings
+            // Advanced Settings
             /*
 			HeaderField::create('AdvanceHeader', _t('FoxyStripeSiteConfig.AdvancedHeader', 'Advanced Settings'), 3),
 			LiteralField::create('AdvancedIntro', _t(
@@ -115,72 +115,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'),
@@ -189,7 +189,7 @@ 
             TextField::create('refresh_token', 'FoxyCart Refresh Token'),
         ]);
 
-	}
+    }
 
     private static function getSSOLink() {
         return Director::absoluteBaseURL()."foxystripe/sso/";

tests/FS_Test.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
     protected static $disable_themes = true;
     protected static $use_draft_site = false;
 
-    public function setUp(){
+    public function setUp() {
         parent::setUp();
 
         ini_set('display_errors', 1);
@@ -14,10 +14,10 @@ 
         error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
     }
 
-    public function logOut(){
+    public function logOut() {
         $this->session()->clear('loggedInAs');
     }
 
-    public function testProductPage(){}
+    public function testProductPage() {}
 
 }