Merge pull request #445 from HiEventsDev/develop

Author: daveearley

.github/workflows/unit-tests.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.2', '8.3']
+        php-versions: ['8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout code

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM serversideup/php:8.3-fpm-nginx-alpine
+FROM serversideup/php:8.4-fpm-nginx-alpine
 
 ENV PHP_OPCACHE_ENABLE=1
 

backend/Dockerfile.dev

@@ -1,21 +1,19 @@
-FROM webdevops/php-nginx:8.2-alpine
+FROM serversideup/php:8.4-fpm-nginx-alpine
 
-WORKDIR /app
+ENV PHP_OPCACHE_ENABLE=1
+ENV NGINX_WEBROOT=/var/www/html/public
 
-COPY . /app
+WORKDIR /var/www/html
 
-ENV WEB_DOCUMENT_ROOT /app/public
+RUN mkdir -p /var/www/html/storage /var/www/html/bootstrap/cache \
+    && chown -R www-data:www-data /var/www/html
 
-ENV PHP_DISMOD=ioncube,pdo_sqlsrv,sqlsrv,pdo_mysql,mysqli,mysqlnd,pdo_sqlite,mysqlnd,mongodb,memcached
+COPY --chown=www-data:www-data . /var/www/html
 
-COPY ./docker/supervisord/syslog.conf /opt/docker/etc/supervisor.d/syslog.conf
+# Switch to root user to install PHP extensions
+USER root
+RUN install-php-extensions intl
+USER www-data
 
-RUN chown -R application:application /app \
-    && mkdir -p /app/storage \
-    && chmod -R 755 /app/storage  \
-    && mkdir -p /app/bootstrap/cache \
-    && chmod -R 775 /app/bootstrap/cache
-
-EXPOSE 80 443
-
-CMD ["supervisord"]
+RUN chmod -R 755 /var/www/html/storage \
+    && chmod -R 775 /var/www/html/bootstrap/cache

backend/app/DomainObjects/Generated/AttendeeCheckInDomainObjectAbstract.php

@@ -15,6 +15,7 @@ abstract class AttendeeCheckInDomainObjectAbstract extends \HiEvents\DomainObjec
     final public const PRODUCT_ID = 'product_id';
     final public const ATTENDEE_ID = 'attendee_id';
     final public const EVENT_ID = 'event_id';
+    final public const ORDER_ID = 'order_id';
     final public const SHORT_ID = 'short_id';
     final public const IP_ADDRESS = 'ip_address';
     final public const DELETED_AT = 'deleted_at';
@@ -26,6 +27,7 @@ abstract class AttendeeCheckInDomainObjectAbstract extends \HiEvents\DomainObjec
     protected int $product_id;
     protected int $attendee_id;
     protected int $event_id;
+    protected ?int $order_id = null;
     protected string $short_id;
     protected string $ip_address;
     protected ?string $deleted_at = null;
@@ -40,6 +42,7 @@ public function toArray(): array
                     'product_id' => $this->product_id ?? null,
                     'attendee_id' => $this->attendee_id ?? null,
                     'event_id' => $this->event_id ?? null,
+                    'order_id' => $this->order_id ?? null,
                     'short_id' => $this->short_id ?? null,
                     'ip_address' => $this->ip_address ?? null,
                     'deleted_at' => $this->deleted_at ?? null,
@@ -103,6 +106,17 @@ public function getEventId(): int
         return $this->event_id;
     }
 
+    public function setOrderId(?int $order_id): self
+    {
+        $this->order_id = $order_id;
+        return $this;
+    }
+
+    public function getOrderId(): ?int
+    {
+        return $this->order_id;
+    }
+
     public function setShortId(string $short_id): self
     {
         $this->short_id = $short_id;

backend/app/DomainObjects/Generated/PersonalAccessTokenDomainObjectAbstract.php

@@ -11,7 +11,6 @@ abstract class PersonalAccessTokenDomainObjectAbstract extends \HiEvents\DomainO
     final public const SINGULAR_NAME = 'personal_access_token';
     final public const PLURAL_NAME = 'personal_access_tokens';
     final public const ID = 'id';
-    final public const ACCOUNT_ID = 'account_id';
     final public const TOKENABLE_TYPE = 'tokenable_type';
     final public const TOKENABLE_ID = 'tokenable_id';
     final public const NAME = 'name';
@@ -23,7 +22,6 @@ abstract class PersonalAccessTokenDomainObjectAbstract extends \HiEvents\DomainO
     final public const UPDATED_AT = 'updated_at';
 
     protected int $id;
-    protected int $account_id;
     protected string $tokenable_type;
     protected int $tokenable_id;
     protected string $name;
@@ -38,7 +36,6 @@ public function toArray(): array
     {
         return [
                     'id' => $this->id ?? null,
-                    'account_id' => $this->account_id ?? null,
                     'tokenable_type' => $this->tokenable_type ?? null,
                     'tokenable_id' => $this->tokenable_id ?? null,
                     'name' => $this->name ?? null,
@@ -62,17 +59,6 @@ public function getId(): int
         return $this->id;
     }
 
-    public function setAccountId(int $account_id): self
-    {
-        $this->account_id = $account_id;
-        return $this;
-    }
-
-    public function getAccountId(): int
-    {
-        return $this->account_id;
-    }
-
     public function setTokenableType(string $tokenable_type): self
     {
         $this->tokenable_type = $tokenable_type;

backend/app/Resources/Attendee/AttendeeWithCheckInPublicResource.php

@@ -24,6 +24,7 @@ public function toArray(Request $request): array
             'product_price_id' => $this->getProductPriceId(),
             'status' => $this->getStatus(),
             'locale' => $this->getLocale(),
+            'order_id' => $this->getOrderId(),
             $this->mergeWhen($this->getCheckIn() !== null, [
                 'check_in' => new AttendeeCheckInPublicResource($this->getCheckIn()),
             ]),

backend/app/Resources/CheckInList/AttendeeCheckInPublicResource.php

@@ -18,6 +18,7 @@ public function toArray($request): array
             'check_in_list_id' => $this->getCheckInListId(),
             'attendee_id' => $this->getAttendeeId(),
             'checked_in_at' => $this->getCreatedAt(),
+            'order_id' => $this->getOrderId(),
         ];
     }
 }

backend/app/Services/Domain/CheckInList/CreateAttendeeCheckInService.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use HiEvents\DataTransferObjects\ErrorBagDTO;
+use HiEvents\DomainObjects\AttendeeCheckInDomainObject;
 use HiEvents\DomainObjects\AttendeeDomainObject;
 use HiEvents\DomainObjects\CheckInListDomainObject;
 use HiEvents\DomainObjects\Enums\AttendeeCheckInActionType;
@@ -250,9 +251,10 @@ private function createCheckIn(
         AttendeeDomainObject    $attendee,
         CheckInListDomainObject $checkInList,
         string                  $checkInUserIpAddress
-    ): object
+    ): AttendeeCheckInDomainObject
     {
         return $this->attendeeCheckInRepository->create([
+            AttendeeCheckInDomainObjectAbstract::ORDER_ID => $attendee->getOrderId(),
             AttendeeCheckInDomainObjectAbstract::ATTENDEE_ID => $attendee->getId(),
             AttendeeCheckInDomainObjectAbstract::CHECK_IN_LIST_ID => $checkInList->getId(),
             AttendeeCheckInDomainObjectAbstract::IP_ADDRESS => $checkInUserIpAddress,

backend/app/Services/Infrastructure/DomainObjectGenerator/ClassGenerator.php

@@ -40,7 +40,9 @@ class ClassGenerator
     private array $defaultIgnoreProperties = [];
 
     private array $ignoredTables = [
-        'migrations'
+        'migrations',
+        'job_batches',
+        'failed_jobs',
     ];
 
     private AbstractSchemaManager $schemaManager;

backend/composer.json

@@ -11,10 +11,10 @@
         "barryvdh/laravel-dompdf": "^3.0",
         "brick/money": "^0.8.0",
         "doctrine/dbal": "^3.6",
-        "druc/laravel-langscanner": "^2.2",
+        "druc/laravel-langscanner": "dev-l12-compatibility",
         "ezyang/htmlpurifier": "^4.17",
         "guzzlehttp/guzzle": "^7.2",
-        "laravel/framework": "^11.0",
+        "laravel/framework": "^12.0",
         "laravel/sanctum": "^4.0",
         "laravel/tinker": "^2.8",
         "laravel/vapor-core": "^2.37",
@@ -35,7 +35,7 @@
         "laravel/sail": "^1.22",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^8.1",
-        "phpunit/phpunit": "^10.1",
+        "phpunit/phpunit": "^11.0",
         "spatie/laravel-ignition": "^2.0"
     },
     "autoload": {
@@ -80,5 +80,11 @@
         }
     },
     "minimum-stability": "stable",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/laravel-shift/laravel-langscanner.git"
+        }
+    ]
 }