Ship new release 3.0.0

.github/workflows/license-check.yml

@@ -12,7 +12,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.3"
           - "8.4"
         dependencies: [ highest ]
         operating-system: [ ubuntu-latest]

.github/workflows/php-cs-fixer.yml

@@ -12,7 +12,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.3"
           - "8.4"
         dependencies: [ highest ]
         operating-system: [ ubuntu-latest]

.github/workflows/phpstan.yml

@@ -12,7 +12,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.3"
           - "8.4"
         dependencies: [ highest ]
         operating-system: [ ubuntu-latest]

.github/workflows/phpunit.yml

@@ -16,7 +16,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.3"
           - "8.4"
         dependencies: [ highest ]
         operating-system: [ ubuntu-latest, windows-2022]

.github/workflows/rector.yml

@@ -16,7 +16,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.3"
           - "8.4"
         dependencies: [ highest ]
         operating-system: [ ubuntu-latest]

.php-cs-fixer.php

@@ -18,12 +18,15 @@
     ->in(__DIR__ . '/src/Services/CRM/Documentgenerator/Numerator/')
     ->in(__DIR__ . '/src/Services/Entity/Section/')
     ->in(__DIR__ . '/src/Services/Department/')
+    ->in(__DIR__ . '/src/Services/Landing/')
     ->in(__DIR__ . '/src/Services/Paysystem/')
     ->in(__DIR__ . '/src/Services/Sale/')
     ->in(__DIR__ . '/src/Services/Task/')
     ->in(__DIR__ . '/src/Services/Sale/')
     ->in(__DIR__ . '/src/Services/Disk/')
     ->in(__DIR__ . '/src/Services/Calendar/')
+    ->in(__DIR__ . '/src/Services/Lists/')
+    ->in(__DIR__ . '/src/Services/SonetGroup/')
     ->name('*.php')
     ->exclude(['vendor', 'storage', 'docker', 'docs']) // Exclude directories
     ->ignoreDotFiles(true)

.vscode/tasks.json

@@ -1,16 +1,4 @@
 {
 	"version": "2.0.0",
-	"tasks": [
-		{
-			"label": "Run integration tests for Sale scope",
-			"type": "shell",
-			"command": "make test-integration-scope-sale",
-			"args": [],
-			"isBackground": false,
-			"problemMatcher": [
-				"$gcc"
-			],
-			"group": "build"
-		}
-	]
+	"tasks": []
 }

Makefile

@@ -58,12 +58,30 @@ help:
 	@echo "test-integration-sale-delivery - run Delivery integration tests"
 	@echo "test-integration-sale-delivery-extra-service - run DeliveryExtraService integration tests"
 	@echo "test-integration-scope-paysystem - run Payment System integration tests"
+	@echo "test-integration-scope-im-open-lines-connector - run IMOpenLines Connector integration tests"
 	@echo "test-integration-sale-payment-item-basket - run PaymentItemBasket integration tests"
 	@echo "test-integration-sale-payment-item-shipment - run PaymentItemShipment integration tests"
 	@echo "test-integration-sale-property-relation - run PropertyRelation integration tests"
+	@echo "test-integration-landing-page - run Landing Page integration tests"
+	@echo "test-integration-landing-syspage - run Landing SysPage integration tests"
+	@echo "test-integration-landing-repo - run Landing Repo integration tests"
+	@echo "test-integration-landing-demos - run Landing Demos integration tests"
+	@echo "test-integration-landing-role - run Landing Role integration tests"
+	@echo "test-integration-scope-landing-template - run Landing Template integration tests"
+	@echo "test-integration-im-open-lines-config - run IMOpenLines Config integration tests"
+	@echo "test-integration-im-open-lines-crm-chat - run IMOpenLines CRMChat integration tests"
+	@echo "test-integration-im-open-lines-session - run IMOpenLines Session integration tests"
+	@echo "test-integration-im-open-lines-operator - run IMOpenLines Operator integration tests"
+	@echo "test-integration-scope-lists - run Lists integration tests"
+	@echo "test-integration-lists-service - run Lists Service integration tests"
+	@echo "test-integration-lists-field - run Lists Field integration tests"
+	@echo "test-integration-lists-section - run Lists Section integration tests"
+	@echo "test-integration-lists-element - run Lists Element integration tests"
+
+t:
+	docker-compose run --rm php-cli sh
+.PHONY: t
 
-
-.PHONY: docker-init
 docker-init:
 	@echo "remove all containers"
 	docker-compose down --remove-orphans
@@ -120,6 +138,12 @@ composer-dumpautoload:
 composer:
 	docker-compose run --rm php-cli composer $(filter-out $@,$(MAKECMDGOALS))
 
+# dev utilites
+
+build-oa-schema:
+	docker-compose run --rm php-cli php bin/console b24-dev:build-schema --webhook=$(BITRIX24_WEBHOOK)
+.PHONY: build-oa-schema
+
 # linters and tests
 .PHONY: lint-allowed-licenses
 lint-allowed-licenses:
@@ -174,6 +198,10 @@ test-integration-scope-placement:
 test-integration-scope-paysystem:
 	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_paysystem
 
+.PHONY: test-integration-scope-im-open-lines-connector
+test-integration-scope-im-open-lines-connector:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_im_open_lines_connector
+
 .PHONY: test-integration-paysystem-service
 test-integration-paysystem-service:
 	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_paysystem_service
@@ -186,6 +214,42 @@ test-integration-paysystem-settings:
 test-integration-scope-im-open-lines:
 	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_im_open_lines
 
+.PHONY: test-integration-im-open-lines-config
+test-integration-im-open-lines-config:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_im_open_lines_config
+
+.PHONY: test-integration-im-open-lines-crm-chat
+test-integration-im-open-lines-crm-chat:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_im_open_lines_crm_chat
+
+.PHONY: test-integration-im-open-lines-session
+test-integration-im-open-lines-session:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_im_open_lines_session
+
+.PHONY: test-integration-im-open-lines-operator
+test-integration-im-open-lines-operator:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_im_open_lines_operator
+
+.PHONY: test-integration-scope-lists
+test-integration-scope-lists:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_lists
+
+.PHONY: test-integration-lists-service
+test-integration-lists-service:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_lists_service
+
+.PHONY: test-integration-lists-field
+test-integration-lists-field:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_lists_field
+
+.PHONY: test-integration-lists-section
+test-integration-lists-section:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_lists_section
+
+.PHONY: test-integration-lists-element
+test-integration-lists-element:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_lists_element
+
 .PHONY: test-integration-scope-user
 test-integration-scope-user:
 	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_user
@@ -197,7 +261,7 @@ test-integration-scope-user-consent:
 .PHONY: test-integration-core
 test-integration-core:
 	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_core
-	
+
 .PHONY: test-integration-core-list
 test-integration-core-list:
 	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_core-list
@@ -218,6 +282,46 @@ test-integration-scope-log:
 test-integration-scope-sale:
 	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_sale
 
+.PHONY: test-integration-scope-landing
+test-integration-scope-landing:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_landing
+
+.PHONY: test-integration-scope-landing-template
+test-integration-scope-landing-template:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_landing_template
+
+.PHONY: test-integration-landing-block
+test-integration-landing-block:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_landing_block
+
+.PHONY: test-integration-landing-site
+test-integration-landing-site:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_landing_site
+
+.PHONY: test-integration-landing-page
+test-integration-landing-page:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_landing_page
+
+.PHONY: test-integration-landing-syspage
+test-integration-landing-syspage:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_landing_syspage
+
+.PHONY: test-integration-landing-repo
+test-integration-landing-repo:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_landing_repo
+
+.PHONY: test-integration-landing-demos
+test-integration-landing-demos:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_landing_demos
+
+.PHONY: test-integration-landing-role
+test-integration-landing-role:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_landing_role
+
+.PHONY: test-integration-scope-sonet-group
+test-integration-scope-sonet-group:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_sonet_group
+
 .PHONY: test-integration-scope-disk
 test-integration-scope-disk:
 	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_disk

README.md

@@ -30,6 +30,11 @@ If You work on Windows:
 
 Or add `"bitrix24/b24phpsdk": "1.9.*"` to `composer.json` of your application.
 
+## Branch status  
+
+- `main`: current default version, use default API-endpints and datastructures, major version `1.*`.
+- `v3`: **new** version of REST-API with **breaking** changes of endpoints and datastructures, major version `3.*`.  
+
 ## B24PhpSdk ✨FEATURES✨
 
 Support both auth modes:

bin/console

@@ -13,6 +13,7 @@
 use Bitrix24\SDK\Attributes\Services\AttributesParser;
 use Bitrix24\SDK\Deprecations\DeprecatedMethods;
 use Bitrix24\SDK\Infrastructure\Console\Commands\ShowFieldsDescriptionCommand;
+use Bitrix24\SDK\OpenApi\Infrastructure\Console\SchemaBuilder;
 use Bitrix24\SDK\Services\ServiceBuilderFactory;
 use Bitrix24\SDK\Tools\Commands\CopyPropertyValues;
 use Bitrix24\SDK\Tools\Commands\GenerateContactsCommand;
@@ -55,7 +56,7 @@ if ($_SERVER['APP_DEBUG']) {
     umask(0000);
 
     if (class_exists(
-        Debug::class
+            Debug::class
     )) {
         Debug::enable();
     }
@@ -68,40 +69,41 @@ $log->pushProcessor(new MemoryUsageProcessor(true, true));
 $attributesParser = new AttributesParser(TyphoonReflector::build(), new Symfony\Component\Filesystem\Filesystem());
 
 $application = new Application();
-$application->add(new GenerateContactsCommand($log));
-$application->add(new ListCommand($log));
-$application->add(
-    new ShowFieldsDescriptionCommand(
-        new Commands\SplashScreen(),
-        $log
-    )
+$application->addCommand(new SchemaBuilder(new Symfony\Component\Filesystem\Filesystem(), new Commands\SplashScreen(), $log));
+$application->addCommand(new GenerateContactsCommand($log));
+$application->addCommand(new ListCommand($log));
+$application->addCommand(
+        new ShowFieldsDescriptionCommand(
+                new Commands\SplashScreen(),
+                $log
+        )
 );
-$application->add(new CopyPropertyValues($log));
-$application->add(
-    new Commands\Documentation\GenerateCoverageDocumentationCommand(
-        $attributesParser,
-        new ServiceBuilderFactory(new EventDispatcher(), $log),
-        new Symfony\Component\Finder\Finder(),
-        new Symfony\Component\Filesystem\Filesystem(),
-        $log
-    )
+$application->addCommand(new CopyPropertyValues($log));
+$application->addCommand(
+        new Commands\Documentation\GenerateCoverageDocumentationCommand(
+                $attributesParser,
+                new ServiceBuilderFactory(new EventDispatcher(), $log),
+                new Symfony\Component\Finder\Finder(),
+                new Symfony\Component\Filesystem\Filesystem(),
+                $log
+        )
 );
-$application->add(
-    new Commands\Documentation\GenerateExamplesForDocumentationCommand(
-        TyphoonReflector::build(),
-        $attributesParser,
-        new Symfony\Component\Filesystem\Filesystem(),
-        $log
-    )
+$application->addCommand(
+        new Commands\Documentation\GenerateExamplesForDocumentationCommand(
+                TyphoonReflector::build(),
+                $attributesParser,
+                new Symfony\Component\Filesystem\Filesystem(),
+                $log
+        )
 );
-$application->add(
-    new Commands\Documentation\ShowCoverageStatisticsCommand(
-        $attributesParser,
-        new ServiceBuilderFactory(new EventDispatcher(), $log),
-        new Symfony\Component\Finder\Finder(),
-        new Commands\SplashScreen(),
-        new DeprecatedMethods(),
-        $log
-    )
+$application->addCommand(
+        new Commands\Documentation\ShowCoverageStatisticsCommand(
+                $attributesParser,
+                new ServiceBuilderFactory(new EventDispatcher(), $log),
+                new Symfony\Component\Finder\Finder(),
+                new Commands\SplashScreen(),
+                new DeprecatedMethods(),
+                $log
+        )
 );
 $application->run($input);

composer.json

@@ -25,7 +25,7 @@
     }
   },
   "require": {
-    "php": "8.2.* || 8.3.* || 8.4.*",
+    "php": "8.4.* || 8.5.*",
     "ext-json": "*",
     "ext-curl": "*",
     "ext-intl": "*",
@@ -36,16 +36,16 @@
     "nesbot/carbon": "^3",
     "moneyphp/money": "^3 || ^4",
     "mesilov/moneyphp-percentage": "^0.2",
-    "symfony/http-client": "^6 || ^7",
-    "symfony/console": "^6 || ^7",
-    "symfony/dotenv": "^6 || ^7",
-    "symfony/filesystem": "^6 || ^7",
-    "symfony/mime": "^6 || ^7",
-    "symfony/finder": "^6 || ^7",
+    "symfony/http-client": "^7||^8",
+    "symfony/console": "^7||^8",
+    "symfony/dotenv": "^7||^8",
+    "symfony/filesystem": "^7||^8",
+    "symfony/mime": "^7||^8",
+    "symfony/finder": "^7||^8",
     "symfony/http-client-contracts": "^2 || ^3",
-    "symfony/http-foundation": "^6 || ^7",
-    "symfony/event-dispatcher": "^6 || ^7",
-    "symfony/uid": "^6 || ^7"
+    "symfony/http-foundation": "^7||^8",
+    "symfony/event-dispatcher": "^7||^8",
+    "symfony/uid": "^7||^8"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2",
@@ -59,12 +59,12 @@
     "phpunit/phpunit": "^10 || ^11|| ^12",
     "rector/rector": "^1",
     "roave/security-advisories": "dev-master",
-    "symfony/debug-bundle": "^6 || ^7",
-    "symfony/process": "^6 || ^7",
-    "symfony/stopwatch": "^6 || ^7",
-    "symfony/var-dumper": "^6 || ^7",
+    "symfony/debug-bundle": "^7||^8",
+    "symfony/process": "^7||^8",
+    "symfony/stopwatch": "^7||^8",
+    "symfony/var-dumper": "^7||^8",
     "typhoon/reflection": "^0.4",
-    "sentry/sentry":"^4"
+    "sentry/sentry": "^4"
   },
   "autoload": {
     "psr-4": {

docker-compose.yaml

@@ -5,3 +5,4 @@ services:
     volumes:
       - .:/var/www/html
     working_dir: /var/www/html
+    tty: true

docs/open-api/.gitignore

@@ -0,0 +1 @@
+openapi.json