Feature/558 add catalog.product property section

.php-cs-fixer.php

@@ -29,6 +29,7 @@
     ->in(__DIR__ . '/src/Services/SonetGroup/')
     ->in(__DIR__ . '/src/Services/IMOpenLines/')
     ->in(__DIR__ . '/src/Services/Landing/')
+    ->in(__DIR__ . '/src/Services/Catalog/')
     ->name('*.php')
     ->exclude(['vendor', 'storage', 'docker', 'docs']) // Exclude directories
     ->ignoreDotFiles(true)

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ### Added
 
+- Added service `Services\Catalog\ProductPropertySection` with support for
+  `catalog.productPropertySection.*` methods,
+  see [catalog.productPropertySection.* methods](https://apidocs.bitrix24.com/api-reference/catalog/product-property-section/index.html) ([#558](https://github.com/bitrix24/b24phpsdk/issues/558)):
+    - `get` returns the section settings of a product property or variation by property ID
+    - `list` returns a list of section settings for product properties/variations by filter
+    - `set` sets or updates the section settings of a product property or variation
 - Added service `Services\Landing\Site\Service\Site` with support methods,
   see [landing.site.* methods](https://github.com/bitrix24/b24phpsdk/issues/267):
     - `add` adds a site

Makefile

@@ -492,6 +492,10 @@ test-integration-landing-role:
 test-integration-landing-repowidget:
 	docker compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_landing_repowidget
 
+.PHONY: test-integration-scope-catalog-product-property-section
+test-integration-scope-catalog-product-property-section:
+	docker compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_catalog_product_property_section
+
 # work dev environment
 .PHONY: php-dev-server-up
 php-dev-server-up:

phpunit.xml.dist

@@ -262,6 +262,10 @@
         <testsuite name="integration_tests_landing_repowidget">
             <directory>./tests/Integration/Services/Landing/RepoWidget/</directory>
         </testsuite>
+        <testsuite name="integration_tests_scope_catalog_product_property_section">
+            <file>./tests/Integration/Services/Catalog/ProductPropertySection/Service/ProductPropertySectionTest.php</file>
+            <file>./tests/Integration/Services/Catalog/ProductPropertySection/Result/ProductPropertySectionItemResultTest.php</file>
+        </testsuite>
     </testsuites>
     <source>
         <include>

src/Services/Catalog/Catalog/Result/CatalogItemResult.php

@@ -29,4 +29,4 @@
  */
 class CatalogItemResult extends AbstractCatalogItem
 {
-}
+}

src/Services/Catalog/Catalog/Result/CatalogResult.php

@@ -21,4 +21,4 @@ public function catalog(): CatalogItemResult
     {
         return new CatalogItemResult($this->getCoreResponse()->getResponseData()->getResult()['catalog']);
     }
-}
+}

src/Services/Catalog/Catalog/Result/CatalogsResult.php

@@ -32,4 +32,4 @@ public function getCatalogs(): array
 
         return $res;
     }
-}
+}

src/Services/Catalog/Catalog/Service/Catalog.php

@@ -82,4 +82,4 @@ public function fields(): FieldsResult
     {
         return new FieldsResult($this->core->call('catalog.catalog.getFields'));
     }
-}
+}

src/Services/Catalog/CatalogServiceBuilder.php

@@ -17,6 +17,7 @@
 use Bitrix24\SDK\Core\Credentials\Scope;
 use Bitrix24\SDK\Services\AbstractServiceBuilder;
 use Bitrix24\SDK\Services\Catalog;
+
 #[ApiServiceBuilderMetadata(new Scope(['catalog']))]
 class CatalogServiceBuilder extends AbstractServiceBuilder
 {
@@ -44,4 +45,16 @@ public function catalog(): Catalog\Catalog\Service\Catalog
 
         return $this->serviceCache[__METHOD__];
     }
-}
+
+    public function productPropertySection(): Catalog\ProductPropertySection\Service\ProductPropertySection
+    {
+        if (!isset($this->serviceCache[__METHOD__])) {
+            $this->serviceCache[__METHOD__] = new Catalog\ProductPropertySection\Service\ProductPropertySection(
+                $this->core,
+                $this->log
+            );
+        }
+
+        return $this->serviceCache[__METHOD__];
+    }
+}

src/Services/Catalog/Common/ProductType.php

@@ -20,4 +20,4 @@ enum ProductType: int
     case SKU = 3;
     case productOffer = 4;
     case genericOffer = 5;
-}
+}

src/Services/Catalog/Common/Result/AbstractCatalogItem.php

@@ -109,4 +109,4 @@ protected function getKeyWithUserfieldByFieldName(string $fieldName)
 
         return $this->$fieldName;
     }
-}
+}

src/Services/Catalog/Product/Result/ProductItemResult.php

@@ -52,4 +52,4 @@
  */
 class ProductItemResult extends AbstractCatalogItem
 {
-}
+}

src/Services/Catalog/Product/Result/ProductResult.php

@@ -26,4 +26,4 @@ public function product(): ProductItemResult
 
         return new ProductItemResult($this->getCoreResponse()->getResponseData()->getResult()['product']);
     }
-}
+}

src/Services/Catalog/Product/Result/ProductsResult.php

@@ -31,4 +31,4 @@ public function getProducts(): array
 
         return $res;
     }
-}
+}

src/Services/Catalog/Product/Service/Batch.php

@@ -25,7 +25,7 @@
 {
     public function __construct(
         protected BatchOperationsInterface $batch,
-        protected LoggerInterface          $log)
-    {
+        protected LoggerInterface          $log
+    ) {
     }
-}
+}

src/Services/Catalog/Product/Service/Product.php

@@ -25,7 +25,6 @@
 use Bitrix24\SDK\Services\Catalog\Common\ProductType;
 use Bitrix24\SDK\Services\Catalog\Product\Result\ProductResult;
 use Bitrix24\SDK\Services\Catalog\Product\Result\ProductsResult;
-
 use Psr\Log\LoggerInterface;
 
 #[ApiServiceMetadata(new Scope(['catalog']))]
@@ -35,8 +34,7 @@ public function __construct(
         public Batch           $batch,
         CoreInterface   $core,
         LoggerInterface $logger
-    )
-    {
+    ) {
         parent::__construct($core, $logger);
     }
 
@@ -71,7 +69,9 @@ public function get(int $productId): ProductResult
     )]
     public function add(array $productFields): ProductResult
     {
-        return new ProductResult($this->core->call('catalog.product.add', [
+        return new ProductResult($this->core->call(
+            'catalog.product.add',
+            [
                 'fields' => $productFields
             ]
         ));
@@ -140,4 +140,4 @@ public function fieldsByFilter(int $iblockId, ProductType $productType, ?array $
 
         return new FieldsResult($this->core->call('catalog.product.getFieldsByFilter', ['filter' => $filter]));
     }
-}
+}

src/Services/Catalog/ProductPropertySection/ProductPropertySectionDisplayType.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of the bitrix24-php-sdk package.
+ *
+ * © Dmitriy Ignatenko <algonexys@gmail.com>
+ *
+ * For the full copyright and license information, please view the MIT-LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Bitrix24\SDK\Services\Catalog\ProductPropertySection;
+
+enum ProductPropertySectionDisplayType: string
+{
+    case checkboxes = 'F';
+    case radioButtons = 'K';
+    case dropdownList = 'P';
+}

src/Services/Catalog/ProductPropertySection/Result/ProductPropertySectionItemResult.php

@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * This file is part of the bitrix24-php-sdk package.
+ *
+ * © Dmitriy Ignatenko <algonexys@gmail.com>
+ *
+ * For the full copyright and license information, please view the MIT-LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Bitrix24\SDK\Services\Catalog\ProductPropertySection\Result;
+
+use Bitrix24\SDK\Core\Result\AbstractItem;
+use Bitrix24\SDK\Services\Catalog\ProductPropertySection\ProductPropertySectionDisplayType;
+
+/**
+ * @property-read int $propertyId
+ * @property-read bool $smartFilter
+ * @property-read ProductPropertySectionDisplayType $displayType
+ * @property-read bool $displayExpanded
+ * @property-read string $filterHint
+ * @property-read int $iblockId
+ * @property-read int $sectionId
+ */
+class ProductPropertySectionItemResult extends AbstractItem
+{
+    /**
+     * @param int|string $offset
+     *
+     * @return bool|int|ProductPropertySectionDisplayType|string|null
+     */
+    public function __get($offset)
+    {
+        return match ($offset) {
+            'smartFilter', 'displayExpanded' => $this->data[$offset] === 'Y',
+            'displayType' => ProductPropertySectionDisplayType::from($this->data[$offset]),
+            'propertyId', 'iblockId', 'sectionId' => (int)$this->data[$offset],
+            'filterHint' => (string)$this->data[$offset],
+            default => $this->data[$offset] ?? null,
+        };
+    }
+}

src/Services/Catalog/ProductPropertySection/Result/ProductPropertySectionResult.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the bitrix24-php-sdk package.
+ *
+ * © Dmitriy Ignatenko <algonexys@gmail.com>
+ *
+ * For the full copyright and license information, please view the MIT-LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Bitrix24\SDK\Services\Catalog\ProductPropertySection\Result;
+
+use Bitrix24\SDK\Core\Result\AbstractResult;
+
+class ProductPropertySectionResult extends AbstractResult
+{
+    public function productPropertySection(): ProductPropertySectionItemResult
+    {
+        return new ProductPropertySectionItemResult(
+            $this->getCoreResponse()->getResponseData()->getResult()['productPropertySection']
+        );
+    }
+}

src/Services/Catalog/ProductPropertySection/Result/ProductPropertySectionsResult.php

@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * This file is part of the bitrix24-php-sdk package.
+ *
+ * © Dmitriy Ignatenko <algonexys@gmail.com>
+ *
+ * For the full copyright and license information, please view the MIT-LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Bitrix24\SDK\Services\Catalog\ProductPropertySection\Result;
+
+use Bitrix24\SDK\Core\Exceptions\BaseException;
+use Bitrix24\SDK\Core\Result\AbstractResult;
+
+class ProductPropertySectionsResult extends AbstractResult
+{
+    /**
+     * @return ProductPropertySectionItemResult[]
+     * @throws BaseException
+     */
+    public function getProductPropertySections(): array
+    {
+        $res = [];
+        foreach ($this->getCoreResponse()->getResponseData()->getResult()['productPropertySections'] as $item) {
+            $res[] = new ProductPropertySectionItemResult($item);
+        }
+
+        return $res;
+    }
+}