From 9f4da8a0b361430aed36b0b1a346016e152b8552 Mon Sep 17 00:00:00 2001 From: Ilya Stepenko <38462532+VampireAotD@users.noreply.github.com> Date: Sat, 3 Aug 2024 13:24:22 +0300 Subject: [PATCH] Moved from Predis to PhpRedis --- docker/php/Dockerfile | 4 +-- src/composer.json | 1 - src/composer.lock | 63 +---------------------------------------- src/config/database.php | 2 +- 4 files changed, 4 insertions(+), 66 deletions(-) diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 5e0c1e50..80141c9d 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -20,7 +20,7 @@ ARG USER_ID=1000 RUN apk update \ && apk add --no-cache libstdc++ libpq libzip-dev gmp-dev oniguruma-dev curl git zip unzip supervisor \ && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS linux-headers brotli-dev pcre-dev pcre2-dev zlib-dev \ - && pecl install xdebug swoole uv \ + && pecl install xdebug swoole redis uv \ && docker-php-ext-install -j$(nproc) \ pcntl \ mbstring \ @@ -31,7 +31,7 @@ RUN apk update \ pdo_mysql \ zip \ gmp \ - && docker-php-ext-enable xdebug swoole \ + && docker-php-ext-enable xdebug swoole redis \ && docker-php-source delete \ && rm -rf /var/cache/apk/* /tmp/* /var/tmp/* \ && apk del .build-deps diff --git a/src/composer.json b/src/composer.json index b30cecfa..b822b9b8 100644 --- a/src/composer.json +++ b/src/composer.json @@ -25,7 +25,6 @@ "laravel/tinker": "^2.9.0", "nutgram/laravel": "^1.4.1", "opcodesio/log-viewer": "^3.10.1", - "predis/predis": "^2.2.2", "pusher/pusher-php-server": "^7.2.4", "spatie/laravel-permission": "^6.9.0", "tightenco/ziggy": "^2.2.1", diff --git a/src/composer.lock b/src/composer.lock index c026a2f2..9ef17206 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d1f90285a6d5d470811476a91088c161", + "content-hash": "ef4d2465a4ae2a410f292f055f0a4ca9", "packages": [ { "name": "aws/aws-crt-php", @@ -4312,67 +4312,6 @@ ], "time": "2024-07-20T21:41:07+00:00" }, - { - "name": "predis/predis", - "version": "v2.2.2", - "source": { - "type": "git", - "url": "https://github.com/predis/predis.git", - "reference": "b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/predis/predis/zipball/b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1", - "reference": "b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^3.3", - "phpstan/phpstan": "^1.9", - "phpunit/phpunit": "^8.0 || ~9.4.4" - }, - "suggest": { - "ext-relay": "Faster connection with in-memory caching (>=0.6.2)" - }, - "type": "library", - "autoload": { - "psr-4": { - "Predis\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Till Krüss", - "homepage": "https://till.im", - "role": "Maintainer" - } - ], - "description": "A flexible and feature-complete Redis client for PHP.", - "homepage": "http://github.com/predis/predis", - "keywords": [ - "nosql", - "predis", - "redis" - ], - "support": { - "issues": "https://github.com/predis/predis/issues", - "source": "https://github.com/predis/predis/tree/v2.2.2" - }, - "funding": [ - { - "url": "https://github.com/sponsors/tillkruss", - "type": "github" - } - ], - "time": "2023-09-13T16:42:03+00:00" - }, { "name": "psr/clock", "version": "1.0.0", diff --git a/src/config/database.php b/src/config/database.php index 0ff17cb0..a7e80e3c 100644 --- a/src/config/database.php +++ b/src/config/database.php @@ -148,7 +148,7 @@ 'options' => [ 'cluster' => env('REDIS_CLUSTER', 'redis'), - 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'), + 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'anilibrary'), '_') . '_database_'), ], 'default' => [