CICD tweaks

Author: BeMySlaveDarlin

.github/workflows/action.yml

@@ -7,6 +7,22 @@ on:
     branches: [ main, master ]
 
 jobs:
+  cs-check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.3'
+
+    - name: Install Dependencies
+      run: composer install --no-interaction --prefer-dist --ignore-platform-reqs
+
+    - name: Run PHP CS Fixer
+      run: vendor/bin/php-cs-fixer fix --dry-run
+
   build:
     runs-on: ubuntu-latest
     steps:
@@ -33,22 +49,15 @@ jobs:
     - name: Wait for services to be ready
       run: |
         echo "Waiting for services to start..."
-        sleep 30
+        sleep 5
         docker compose ps
 
-    - name: Run migrations
-      run: docker compose exec -T php php bin/app.php migrate --force
-
-    - name: Refresh caches
-      run: make refresh-caches
-
     - name: Cleanup
       if: always()
       run: make down
 
   test:
     runs-on: ubuntu-latest
-    needs: build
     steps:
     - uses: actions/checkout@v4
 
@@ -67,15 +76,12 @@ jobs:
     - name: Wait for services to be ready
       run: |
         echo "Waiting for services to start..."
-        sleep 30
+        sleep 5
         docker compose ps
 
     - name: Run migrations
       run: docker compose exec -T php php bin/app.php migrate --force
 
-    - name: Refresh caches
-      run: make refresh-caches
-
     - name: Install curl and jq
       run: sudo apt-get update && sudo apt-get install -y curl jq
 

Makefile

@@ -45,7 +45,7 @@ seed:
 	docker-compose exec php php bin/app.php events:seed
 
 cs-check:
-	docker compose exec php php-cs-fixer fix --dry-run --diff
+	docker compose exec php php-cs-fixer fix --dry-run
 
 cs-fix:
 	docker compose exec php php-cs-fixer fix

bin/app.php

@@ -1,5 +1,5 @@
 {
-  "name": "app/analytics",
+  "name": "bemyslavedarlin/collider",
   "type": "project",
   "description": "RESTful API on Spiral Framework with Swoole",
   "require": {

composer.json

@@ -1,36 +1,12 @@
-FROM php:8.3-cli AS php_base
+FROM bemyslavedarlin/collider:1.0 AS php_base
 
 ARG APP_PORT=9501
 ARG TIMEZONE=UTC
 
-RUN apt-get update && apt-get install -y \
-    zlib1g-dev libpq-dev libzip-dev libbrotli-dev \
-    libonig-dev libxslt1-dev libicu-dev libpq-dev \
-    mc nano make git curl wget unzip \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN ln -snf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime && echo ${TIMEZONE} > /etc/timezone \
-    && printf '[PHP]\ndate.timezone = "%s"\n', ${TIMEZONE} > $PHP_INI_DIR/conf.d/tzone.ini
-
-RUN docker-php-ext-install \
-    pdo pdo_pgsql pgsql sockets \
-    zip pcntl mbstring bcmath
-
-RUN pecl update-channels \
-    && pecl install swoole redis \
-    && docker-php-ext-enable swoole redis
-
 ENV COMPOSER_ALLOW_SUPERUSER=1
 ENV COMPOSER_HOME=/tmp
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
 ENV PATH=/usr/local/bin:/app/vendor/bin:/app/bin:${PATH}
 
-COPY . /app
-
-RUN chmod +x /app/bin/app.php \
-    && chmod +x /app/bin/http.php
-
 WORKDIR /app
 
 EXPOSE ${APP_PORT}

docker/php/Dockerfile

@@ -0,0 +1,55 @@
+FROM php:8.3-cli AS php_base
+
+ARG APP_PORT=9501
+ARG TIMEZONE=UTC
+
+RUN apt-get update && apt-get install -y \
+    zlib1g-dev libpq-dev libzip-dev \
+    libbrotli-dev libonig-dev libpq-dev \
+    mc nano make git curl wget unzip \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN ln -snf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime && echo ${TIMEZONE} > /etc/timezone \
+    && printf '[PHP]\ndate.timezone = "%s"\n', ${TIMEZONE} > $PHP_INI_DIR/conf.d/tzone.ini
+
+RUN docker-php-ext-install \
+    pdo pdo_pgsql pgsql sockets \
+    zip pcntl mbstring
+
+RUN pecl update-channels \
+    && pecl install swoole redis \
+    && docker-php-ext-enable swoole redis
+
+ENV COMPOSER_ALLOW_SUPERUSER=1
+ENV COMPOSER_HOME=/tmp
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+ENV PATH=/usr/local/bin:/app/vendor/bin:/app/bin:${PATH}
+
+WORKDIR /app
+
+EXPOSE ${APP_PORT}
+
+FROM php_base AS php_dev
+
+ENV APP_ENV=dev
+
+RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
+COPY docker/php/conf.d/php.dev.ini $PHP_INI_DIR/conf.d/99-app.ini
+
+FROM php_base AS php_prod
+
+ENV APP_ENV=prod
+
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+COPY docker/php/conf.d/php.prod.ini $PHP_INI_DIR/conf.d/99-app.ini
+
+FROM php_base AS composer_dev
+
+CMD composer install \
+    && composer dump-autoload --classmap-authoritative
+
+FROM php_base AS composer_prod
+
+CMD composer install --no-dev --optimize-autoloader \
+    && composer dump-autoload --classmap-authoritative --no-dev

docker/php/Dockerfile-full

@@ -13,8 +13,6 @@
 use Spiral\Interceptors\HandlerInterface;
 use Swoole\Runtime;
 
-use function extension_loaded;
-
 final class AppBootloader extends DomainBootloader
 {
     protected const array SINGLETONS = [HandlerInterface::class => [self::class, 'domainCore']];
@@ -41,7 +39,7 @@ public function defineSingletons(): array
      */
     public function init(Container $container, EnvironmentInterface $env): void
     {
-        if (!extension_loaded('swoole')) {
+        if (!\extension_loaded('swoole')) {
             throw new ErrorException('Swoole extension is required but not loaded');
         }
 

src/Application/Bootloader/AppBootloader.php

@@ -24,7 +24,7 @@ public function findByUserId(int $uid, int $limit = 1000): array
     {
         return $this->cache->remember(
             "events:uid:{$uid}",
-            fn() => $this->repository->findByUserId($uid, $limit),
+            fn () => $this->repository->findByUserId($uid, $limit),
             self::DEFAULT_TTL
         );
     }
@@ -33,7 +33,7 @@ public function findWithPagination(int $limit, int $offset): array
     {
         return $this->cache->remember(
             "events:page:{$limit}:{$offset}",
-            fn() => $this->repository->findWithPagination($limit, $offset),
+            fn () => $this->repository->findWithPagination($limit, $offset),
             self::DEFAULT_TTL
         );
     }
@@ -42,7 +42,7 @@ public function findBeforeDate(DateTimeInterface $date): int
     {
         return $this->cache->remember(
             "events:before:{$date->getTimestamp()}",
-            fn() => $this->repository->findBeforeDate($date),
+            fn () => $this->repository->findBeforeDate($date),
             self::DEFAULT_TTL
         );
     }
@@ -57,16 +57,16 @@ public function getStats(
 
         return $this->cache->remember(
             "events:stats:{$suffix}",
-            fn() => $this->repository->getStats($limit, $from, $to, $eventTypeId),
+            fn () => $this->repository->getStats($limit, $from, $to, $eventTypeId),
             self::DEFAULT_TTL
         );
     }
 
     public function countAll(): int
     {
         return $this->cache->remember(
-            "events:count:all",
-            fn() => $this->repository->countAll(),
+            'events:count:all',
+            fn () => $this->repository->countAll(),
             self::DEFAULT_TTL
         );
     }
@@ -91,6 +91,6 @@ public function delete(Event $event): void
 
     public function invalidateCache(): void
     {
-        $this->cache->deleteBatch("events:*");
+        $this->cache->deleteBatch('events:*');
     }
 }

src/Domain/UserAnalytics/Repository/CachedEventRepository.php

@@ -25,7 +25,7 @@ public function findById(int $id): ?EventTypeEntityInterface
     {
         return $this->cache->remember(
             "event_type:id:{$id}",
-            fn() => $this->repository->findById($id),
+            fn () => $this->repository->findById($id),
             self::DEFAULT_TTL,
             [$this, 'typeFromArray']
         );
@@ -35,7 +35,7 @@ public function findByName(string $name): ?EventTypeEntityInterface
     {
         return $this->cache->remember(
             "event_type:name:{$name}",
-            fn() => $this->repository->findByName($name),
+            fn () => $this->repository->findByName($name),
             self::DEFAULT_TTL,
             [$this, 'typeFromArray']
         );

src/Domain/UserAnalytics/Repository/CachedEventTypeRepository.php

@@ -25,7 +25,7 @@ public function findById(int $id): ?UserEntityInterface
     {
         return $this->cache->remember(
             "user:id:{$id}",
-            fn() => $this->repository->findById($id),
+            fn () => $this->repository->findById($id),
             self::DEFAULT_TTL,
             [$this, 'userFromArray']
         );
@@ -35,7 +35,7 @@ public function findByName(string $name): ?UserEntityInterface
     {
         return $this->cache->remember(
             "user:name:{$name}",
-            fn() => $this->repository->findByName($name),
+            fn () => $this->repository->findByName($name),
             self::DEFAULT_TTL,
             [$this, 'userFromArray']
         );