Merge pull request #3 from NONstop5/feature-3_add_redis

feature-3_add_redis

Author: NONstop5

.dockerignore

@@ -11,9 +11,5 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.txt]
-trim_trailing_whitespace = false
-insert_final_newline = false
-
 [Makefile]
 indent_style = tab

.editorconfig

@@ -40,6 +40,8 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 MAILER_DSN=null://null
 ###< symfony/mailer ###
 
-# Настройки Xdebug
-XDEBUG_CLIENT_HOST=host.docker.internal
-XDEBUG_IDEKEY=PHPSTORM
+###> redis ###
+REDIS_HOST=redis
+REDIS_PORT=6379
+REDIS_DB=0
+###< redis ###

.env

@@ -41,4 +41,6 @@ phpstan.neon
 ###> IDE files ###
 /docker/pgdata
 /docker/.env
+/docker/.env.*
+docker-compose.override.yml
 ###> IDE files ###

.gitignore

@@ -31,7 +31,10 @@
         'blank_line_between_import_groups' => false,
         'concat_space' => ['spacing' => 'one'],
         'yoda_style' => false,
+        'global_namespace_import' => true,
+        'native_function_invocation' => false,
+        'native_constant_invocation' => false,
     ])
     ->setFinder($finder)
-    ->setCacheFile(__DIR__.'/var/.php-cs-fixer.cache')
+    ->setCacheFile(__DIR__ . '/var/.php-cs-fixer.cache')
 ;

.php-cs-fixer.dist.php

@@ -15,7 +15,7 @@ phpcsfixer-fix:
 	vendor/bin/php-cs-fixer fix
 
 phpstan:
-	vendor/bin/phpstan analyse
+	vendor/bin/phpstan analyse --memory-limit=512M
 
 phpstan-baseline:
 	vendor/bin/phpstan analyse src tests --generate-baseline
@@ -31,5 +31,16 @@ docker-down:
 
 docker-build:
 	docker-compose --env-file ./docker/.env build
+	docker-compose --env-file ./docker/.env up -d
+
+docker-rebuild:
+	docker-compose --env-file ./docker/.env build --no-cache
+	docker-compose --env-file ./docker/.env up -d
+
+docker-config:
+	docker-compose --env-file ./docker/.env config
+
+shell:
+	docker-compose exec php bash
 
 .PHONY: tests

Makefile

@@ -4,7 +4,7 @@
 ## IndigoLab test project
 
 ### Requirements
-- PHP >= 8.4
+- PHP >= 8.3
 - Composer >= 2
 - Make >= 4
 - Docker

README.md

@@ -15,6 +15,7 @@
         "doctrine/orm": "^3.3",
         "phpdocumentor/reflection-docblock": "^5.6",
         "phpstan/phpdoc-parser": "^2.1",
+        "predis/predis": "^2.3",
         "symfony/asset": "7.2.*",
         "symfony/asset-mapper": "7.2.*",
         "symfony/console": "7.2.*",

composer.json

@@ -22,3 +22,15 @@ services:
 
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
+
+    # Конфиг Redis клиента
+    Predis\Client:
+        arguments:
+            - scheme: 'tcp'
+              host: '%env(REDIS_HOST)%'
+              port: '%env(REDIS_PORT)%'
+              database: '%env(REDIS_DB)%'
+    # Redis сервис
+    App\Service\RedisService:
+        arguments:
+            $redisClient: '@Predis\Client'