chore: remove predis

Grafikart · Nov 1, 2024 · 6ef39cf · 6ef39cf
1 parent 06246e3
commit 6ef39cf
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 71 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,6 @@
 REDIS_URL=redis://redis
+REDIS_POOL=grafikart_cache
+
 TYPESENSE_KEY=typesensekey
 TYPESENSE_HOST=typesense:8108
 

diff --git a/Makefile b/Makefile
@@ -30,6 +30,9 @@ help: ## Affiche cette aide
 deploy: ## Déploie une nouvelle version du site
 	ssh -A $(server) 'cd $(domain) && git pull origin master && make install'
 
+devdeploy: ## Déploie une nouvelle version du site
+	ssh -A $(server) 'cd dev.$(domain) && git pull origin develop && make install'
+
 sync: ## Récupère les données depuis le serveur
 	rsync -avz --ignore-existing --progress --exclude=avatars grafikart:/home/grafikart/grafikart.fr/public/uploads/ ./public/uploads/
 

diff --git a/composer.json b/composer.json
@@ -35,7 +35,6 @@
     "paypal/paypal-checkout-sdk": "^1.0",
     "phpdocumentor/reflection-docblock": "^5.0",
     "phpstan/phpdoc-parser": "^1.2",
-    "predis/predis": "^2.0",
     "spatie/flysystem-dropbox": "^2.0",
     "stripe/stripe-php": "^7.31",
     "symfony/asset": "7.1.*",

diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/cache.yaml b/config/packages/cache.yaml
@@ -16,7 +16,7 @@ services:
       $redis: '@Redis'
       $defaultLifetime: 604800
     tags:
-      - { name: 'cache.pool', namespace: 'grafikart_cache' }
+      - { name: 'cache.pool', namespace: '%env(resolve:REDIS_POOL)%' }
 
 when@prod:
   framework:

diff --git a/config/services.yaml b/config/services.yaml
@@ -32,9 +32,10 @@ services:
       tags: ['app.breadcrumb']
 
   Redis:
-    class: \Predis\Client
-    arguments:
-      - '%env(REDIS_URL)%'
+    class: \Redis
+    calls:
+      - connect:
+          - '%env(REDIS_URL)%'
 
   Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler:
     arguments:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -44,6 +44,8 @@ services:
   redis:
     restart: unless-stopped
     image: redis:7-alpine
+    ports:
+      - 6379:6379
   meilisearch:
     restart: unless-stopped
     image: getmeili/meilisearch:v1.0

diff --git a/public/index.php b/public/index.php
@@ -4,6 +4,8 @@
 
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 
+
 return function (array $context) {
-    return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
+    return new Kernel('prod', true);
+    // return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
 };
diff --git a/symfony.lock b/symfony.lock
@@ -386,9 +386,6 @@
             "tests/bootstrap.php"
         ]
     },
-    "predis/predis": {
-        "version": "v1.1.1"
-    },
     "psr/cache": {
         "version": "1.0.1"
     },