Merge pull request #50 from mesilov/dev

Fix errors in integration scenario

Author: mesilov

.env

@@ -12,7 +12,15 @@
 #
 # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
-DATABASE_HOST=
-DATABASE_USER=
-DATABASE_PASSWORD=
-DATABASE_NAME=
+
+# Database configuration for functional tests
+DATABASE_HOST=database
+DATABASE_USER=b24phpLibTest
+DATABASE_PASSWORD=b24phpLibTest
+DATABASE_NAME=b24phpLibTest
+
+# PostgreSQL Docker configuration (aligned with docker-compose.yaml defaults)
+POSTGRES_VERSION=16
+POSTGRES_DB=b24phpLibTest
+POSTGRES_USER=b24phpLibTest
+POSTGRES_PASSWORD=b24phpLibTest

.env.example

@@ -0,0 +1,21 @@
+# Example environment configuration for bitrix24-php-lib
+# Copy this file to .env and adjust values as needed
+
+# Database configuration for functional tests
+# These values should match your Docker Compose PostgreSQL service
+DATABASE_HOST=database
+DATABASE_USER=b24phpLibTest
+DATABASE_PASSWORD=b24phpLibTest
+DATABASE_NAME=b24phpLibTest
+
+# PostgreSQL Docker configuration (aligned with docker-compose.yaml defaults)
+POSTGRES_VERSION=16
+POSTGRES_DB=b24phpLibTest
+POSTGRES_USER=b24phpLibTest
+POSTGRES_PASSWORD=b24phpLibTest
+
+# For local development, you can override these values:
+# DATABASE_HOST=localhost
+# DATABASE_USER=your_local_user
+# DATABASE_PASSWORD=your_local_password
+# DATABASE_NAME=your_local_db

CHANGELOG.md

@@ -0,0 +1,26 @@
+## 0.1.1
+### Added
+- Change php version requirements — [#44](https://github.com/mesilov/bitrix24-php-lib/pull/44)
+
+## 0.1.0
+
+### By [@mesilov](https://github.com/mesilov)
+- Add initial project setup with CI configuration — [#2](https://github.com/mesilov/bitrix24-php-lib/pull/2)
+- Fix incorrect annotation syntax from `#[\Override]` to `#[Override]` — [#3](https://github.com/mesilov/bitrix24-php-lib/pull/3)
+- Rename package and namespaces to `bitrix24-php-lib` — [#4](https://github.com/mesilov/bitrix24-php-lib/pull/4)
+- Add docker structure — [#13](https://github.com/mesilov/bitrix24-php-lib/pull/13)
+- Add application install — [#43](https://github.com/mesilov/bitrix24-php-lib/pull/43)
+
+---
+
+### By [@KarlsonComplete](https://github.com/KarlsonComplete)
+- Add docker containers — [#12](https://github.com/mesilov/bitrix24-php-lib/pull/12)
+- Add docker structure —  [#14](https://github.com/mesilov/bitrix24-php-lib/pull/14), [#15](https://github.com/mesilov/bitrix24-php-lib/pull/15),   [#16](https://github.com/mesilov/bitrix24-php-lib/pull/16), [#17](https://github.com/mesilov/bitrix24-php-lib/pull/17),  [#19](https://github.com/mesilov/bitrix24-php-lib/pull/19), [#27](https://github.com/mesilov/bitrix24-php-lib/pull/27),   [#29](https://github.com/mesilov/bitrix24-php-lib/pull/29), [#32](https://github.com/mesilov/bitrix24-php-lib/pull/32),   [#34](https://github.com/mesilov/bitrix24-php-lib/pull/34), [#36](https://github.com/mesilov/bitrix24-php-lib/pull/36),   [#37](https://github.com/mesilov/bitrix24-php-lib/pull/37),  [#38](https://github.com/mesilov/bitrix24-php-lib/pull/38)
+- Added mapping, fixing functional tests — [#18](https://github.com/mesilov/bitrix24-php-lib/pull/18)
+- Removed attributes in the account — [#20](https://github.com/mesilov/bitrix24-php-lib/pull/20)
+- Fixed some errors in functional tests — [#21](https://github.com/mesilov/bitrix24-php-lib/pull/21)
+- Added fetcher test and removed more comments — [#22](https://github.com/mesilov/bitrix24-php-lib/pull/22)
+- Fixes — [#23](https://github.com/mesilov/bitrix24-php-lib/pull/23)
+- Fixes for scope — [#24](https://github.com/mesilov/bitrix24-php-lib/pull/24)
+- Update fetcher and flusher — [#25](https://github.com/mesilov/bitrix24-php-lib/pull/25)
+- Add application install — [#40](https://github.com/mesilov/bitrix24-php-lib/pull/40)  

CLAUDE.md

@@ -0,0 +1,124 @@
+# Claude Code Knowledge Base - bitrix24-php-lib
+
+## Project Overview
+PHP library for rapid Bitrix24 application development using PostgreSQL and Doctrine ORM.
+
+## Architecture
+- **Domain-Driven Design** with bounded contexts
+- **CQRS** pattern (Command/Handler)
+- **Event-driven** architecture
+- **Clean Architecture** principles
+
+## Tech Stack
+- **PHP 8.3** (strict requirements)
+- **Doctrine ORM 3** for database operations
+- **Symfony** components (Console, Cache, Event Dispatcher, Serializer, UID, etc.)
+- **PostgreSQL** as primary database
+- **Docker** for development environment
+
+## Development Tools
+- **PHPStan** (level 5) - static analysis
+- **PHPUnit** - testing framework
+- **Rector** - code refactoring
+- **PHP-CS-Fixer** - code formatting
+- **Composer** - dependency management
+
+## Key Commands
+```bash
+# Development environment
+make init                    # Initialize project
+make up                     # Start containers
+make down                   # Stop containers
+
+# Code quality
+make lint-phpstan           # Run PHPStan analysis
+make lint-cs-fixer         # Check code style
+make lint-cs-fixer-fix     # Fix code style
+make lint-rector           # Check for refactoring opportunities
+make lint-rector-fix       # Apply Rector refactoring
+
+# Testing
+make test-run-unit         # Run unit tests
+make test-run-functional   # Run functional tests (requires DB)
+
+# Database operations
+make schema-drop           # Drop database schema
+make schema-create         # Create database schema
+```
+
+## Project Structure
+```
+src/
+├── Bitrix24Accounts/          # Account management bounded context
+│   ├── Entity/                # Domain entities
+│   ├── Infrastructure/        # Infrastructure layer (repositories)
+│   ├── UseCase/              # CQRS commands/handlers
+│   └── ValueObjects/         # Value objects
+├── ApplicationInstallations/  # Installation management bounded context
+│   ├── Entity/
+│   ├── Infrastructure/
+│   └── UseCase/
+├── Services/                 # Shared services
+└── Resources/config/         # Configuration files
+```
+
+## Bounded Contexts
+1. **Bitrix24Accounts** - Bitrix24 account and access token management
+2. **ApplicationInstallations** - Application installation tracking
+3. **ContactPersons** - Contact person management
+4. **Bitrix24Partners** - Partner management
+
+## Code Standards
+- Strict typing (`declare(strict_types=1)`)
+- Readonly classes for commands
+- Comprehensive validation in command constructors
+- Interface-based dependencies
+- PSR-4 autoloading
+- Namespace: `Bitrix24\Lib\`
+
+## Testing Strategy
+- **Unit tests** for business logic
+- **Functional tests** with real database
+- Test builders for entity creation
+- Separate test database configuration
+
+## Database Configuration
+- Uses Doctrine ORM with XML mapping
+- Entity mappings in `config/xml/`
+- Migration support via Doctrine Migrations
+
+## Development Workflow
+1. Always run linters before committing
+2. Ensure all tests pass
+3. Follow DDD principles
+4. Use CQRS for write operations
+5. Validate all inputs in command constructors
+
+## Git Workflow
+- Main branch: `main`
+- Feature branches: `feature/issue-number-description`
+- Current branch: `feature/46-fix-errors`
+
+## Docker Setup
+- PHP CLI container for development
+- PostgreSQL database
+- All commands run through Docker Compose
+
+## Dependencies
+- Core: `bitrix24/b24phpsdk` (dev-dev branch)
+- Framework: Symfony components
+- Database: Doctrine ORM 3
+- Utilities: Carbon, Money, LibPhoneNumber, IP handling
+
+## Environment Variables
+Located in `.env` and `.env.local` files for database configuration.
+
+### Default Configuration for Functional Tests
+The `.env` file contains default values that work out-of-the-box with Docker Compose:
+- `DATABASE_HOST=database` (Docker service name)
+- `DATABASE_USER=b24phpLibTest`
+- `DATABASE_PASSWORD=b24phpLibTest`
+- `DATABASE_NAME=b24phpLibTest`
+- `POSTGRES_VERSION=16`
+
+These defaults allow running functional tests immediately after `make up` without additional configuration.

Makefile

@@ -66,11 +66,11 @@ down-clear:
 
 restart: down up
 
-# работа с контейнерами
+# container operations
 php-cli-bash:
 	docker-compose run --rm php-cli sh $(filter-out $@,$(MAKECMDGOALS))
 
-# работа с composer
+# composer operations
 composer-install:
 	@echo "install dependencies…"
 	docker-compose run --rm php-cli composer install
@@ -81,8 +81,8 @@ composer-update:
 
 composer-dumpautoload:
 	docker-compose run --rm php-cli composer dumpautoload
-# вызов composer с любыми параметрами
-# Примеры:
+# composer call with any parameters
+# Examples:
 # make composer install
 # make composer "install --no-dev"
 composer:
@@ -114,7 +114,7 @@ test-run-functional: debug-print-env
 	docker-compose run --rm php-cli php bin/doctrine orm:schema-tool:update --dump-sql
 	docker-compose run --rm php-cli php vendor/bin/phpunit --testsuite=functional_tests --display-warnings --testdox
 
-# Запустить один функциональный тест с дебагером
+# Run one functional test with debugger
 run-one-functional-test: debug-print-env
 	docker-compose run --rm php-cli php -dxdebug.start_with_request=yes vendor/bin/phpunit --filter 'testChangeDomainUrlWithHappyPath' tests/Functional/Bitrix24Accounts/UseCase/ChangeDomainUrl/HandlerTest.php
 

README.md

@@ -2,50 +2,50 @@
 
 PHP lib for Bitrix24 application development
 
-## Область применения
+## Application Domain
 
-Библиотека предназначена для быстрой разработки приложений для Битркис24. Предоставляет слой хранения данных в СУБД
-[PostgreSQL](https://www.postgresql.org/), использует [Doctrine ORM](https://www.doctrine-project.org/).
+The library is designed for rapid development of Bitrix24 applications. Provides data storage layer in
+[PostgreSQL](https://www.postgresql.org/) database using [Doctrine ORM](https://www.doctrine-project.org/).
 
-Реализует [контракты](https://github.com/mesilov/bitrix24-php-sdk/tree/master/src/Application/Contracts) из
+Implements [contracts](https://github.com/mesilov/bitrix24-php-sdk/tree/master/src/Application/Contracts) from
 bitrix24-php-sdk.
 
-## Поддерживаемые контракты
+## Supported Contracts
 
 ### Bitrix24Accounts
 
-Отвечает за
-хранение [аккаунтов Битрикс24](https://github.com/mesilov/bitrix24-php-sdk/tree/master/src/Application/Contracts/Bitrix24Accounts)
-с токенами доступа к порталу.
+Responsible for
+storing [Bitrix24 accounts](https://github.com/mesilov/bitrix24-php-sdk/tree/master/src/Application/Contracts/Bitrix24Accounts)
+with portal access tokens.
 
 ### ApplicationInstallations
 
-Отвечает за
-хранение [фактов установок](https://github.com/mesilov/bitrix24-php-sdk/tree/master/src/Application/Contracts/ApplicationInstallations)
-приложения на конкретный портал Битркис24
+Responsible for
+storing [installation facts](https://github.com/mesilov/bitrix24-php-sdk/tree/master/src/Application/Contracts/ApplicationInstallations)
+of applications on specific Bitrix24 portals
 
 ### ContactPersons
 
-Отвечает за
-хранение [контактных лиц](https://github.com/mesilov/bitrix24-php-sdk/tree/master/src/Application/Contracts/ContactPersons),
-которые произвели установку приложения
+Responsible for
+storing [contact persons](https://github.com/mesilov/bitrix24-php-sdk/tree/master/src/Application/Contracts/ContactPersons)
+who performed application installation
 
 ### Bitrix24Partners
 
-Отвечает за
-хранение [партнёра](https://github.com/mesilov/bitrix24-php-sdk/tree/master/src/Application/Contracts/Bitrix24Partners) Битрикс24, который произвёл установку или обслуживает портал
+Responsible for
+storing [Bitrix24 partners](https://github.com/mesilov/bitrix24-php-sdk/tree/master/src/Application/Contracts/Bitrix24Partners) who performed installation or service the portal
 
-## Архитектура
+## Architecture
 
-### Слои и уровни абстракции
+### Layers and Abstraction Levels
 ```
-bitrix24-app-laravel-skeleton – шаблон приложения на Laravel
-bitrix24-app-symfony-skeleton – шаблон приложения на Symfony    
-bitrix24-php-lib – работа с сущностями приложения и их хранение в СУБД
-bitrix24-php-sdk – транспортный слой + события транспорта (протух токен, переименовали портал)
+bitrix24-app-laravel-skeleton – Laravel application template
+bitrix24-app-symfony-skeleton – Symfony application template    
+bitrix24-php-lib – application entities work and their storage in database
+bitrix24-php-sdk – transport layer + transport events (expired token, portal renamed)
 ```
 
-### Структура папок bounded context
+### Bounded Context Folder Structure
 ```
 src/
     Bitrix24Accounts
@@ -66,13 +66,42 @@ src/
 ```
 
 
-## Инфраструктура
-- библиотека делается cloud-agnostic
+## Quick Start
 
+### Prerequisites
+- Docker and Docker Compose
+- Make
 
-## Правила разработки
-1. Используем линтеры
-2. Библиотека покрыта тестами
-3. Вся работа строится через issues
-4. Процессы разработки - remote first
-5. Думаем и обсуждаем — потом пишем
+### Running Tests
+```bash
+# Initialize and start services
+make up
+
+# Run functional tests (uses default database configuration)
+make test-run-functional
+
+# Run linters
+make lint-phpstan
+make lint-cs-fixer
+make lint-rector
+```
+
+### Database Configuration
+Default database credentials are pre-configured in `.env`:
+- Host: `database` (Docker service)
+- Database: `b24phpLibTest`
+- User: `b24phpLibTest`
+- Password: `b24phpLibTest`
+
+No additional configuration needed for running tests.
+
+## Infrastructure
+- library is made cloud-agnostic
+
+
+## Development Rules
+1. We use linters
+2. Library is covered with tests
+3. All work is organized through issues
+4. Development processes are remote first
+5. Think and discuss — then write

composer.json

@@ -34,7 +34,7 @@
     }
   },
   "require": {
-    "php": "8.3.*",
+    "php": "^8.3",
     "ext-json": "*",
     "ext-curl": "*",
     "ext-bcmath": "*",

docker/php-cli/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3-cli-alpine
+FROM php:8.4-cli-alpine
 
 RUN apk add unzip libpq-dev git icu-dev autoconf build-base linux-headers \
     && docker-php-ext-install bcmath pdo pdo_pgsql intl \