diff --git a/docker-compose-test.yml b/docker-compose-test.yml index 411f3fd..2a5ce0a 100644 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -1,25 +1,18 @@ -version: '2' +version: '3' services: test-db: - platform: linux/x86_64 - image: mysql:5.7 + image: mariadb:latest environment: MYSQL_DATABASE: activitypub-test MYSQL_ROOT_PASSWORD: activitypub-test - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:3306"] - interval: 5s - timeout: 2s - retries: 5 + expose: + - "3306" test-php: build: context: . dockerfile: Dockerfile depends_on: - test-db: - condition: service_healthy - links: - test-db volumes: - .:/app diff --git a/includes/collection/class-followers.php b/includes/collection/class-followers.php index 9c4d55f..85adc6c 100644 --- a/includes/collection/class-followers.php +++ b/includes/collection/class-followers.php @@ -52,7 +52,7 @@ class Followers { return $follower_id; } - return $follower; + return $follower_id; } /** diff --git a/includes/handler/class-follow.php b/includes/handler/class-follow.php index a8d4475..43ef5c7 100644 --- a/includes/handler/class-follow.php +++ b/includes/handler/class-follow.php @@ -47,7 +47,6 @@ class Follow { // save follower $follower_id = Followers::add_follower( - $user_id, $activity['actor'] );