Merge branch 'release/v2.1.0'

Author: octfx

.github/workflows/docker-dev.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Installing PHP
         uses: shivammathur/setup-php@master
         with:
-          php-version: '8.1'
+          php-version: '8.2'
       - name: Get Composer Cache Directory 2
         id: composer-cache
         run: |

.github/workflows/docker.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Installing PHP
         uses: shivammathur/setup-php@master
         with:
-          php-version: '8.1'
+          php-version: '8.2'
       - name: Get Composer Cache Directory 2
         id: composer-cache
         run: |

.github/workflows/phpunit.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Installing PHP
         uses: shivammathur/setup-php@master
         with:
-         php-version: '8.1'
+         php-version: '8.2'
       - name: Get Composer Cache Directory 2
         id: composer-cache
         run: |
@@ -75,7 +75,7 @@ jobs:
       - name: Installing PHP
         uses: shivammathur/setup-php@master
         with:
-          php-version: '8.1'
+          php-version: '8.2'
       - name: Get Composer Cache Directory 2
         id: composer-cache
         run: |

.gitignore

@@ -14,3 +14,5 @@ composer.phar
 /.phpunit.result.cache
 /packages
 /.php_cs.cache
+./.php-cs-fixer.cache
+./*.cache

CONTRIBUTING.md

@@ -1,5 +1,5 @@
 ### Extensions
-FROM php:8.1-apache as extensions
+FROM php:8.2-apache as extensions
 
 LABEL stage=intermediate
 
@@ -54,41 +54,48 @@ opcache.fast_shutdown=0\n\
 ' >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 
 ### Composer
-FROM php:8.1-apache as api
+FROM php:8.2-apache as api
 
 COPY --from=extensions /usr/local/etc/php/conf.d/docker-php-ext-bcmath.ini /usr/local/etc/php/conf.d/docker-php-ext-bcmath.ini
 COPY --from=extensions /usr/local/etc/php/conf.d/docker-php-ext-intl.ini /usr/local/etc/php/conf.d/docker-php-ext-intl.ini
-COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20210902/intl.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/intl.so
-COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20210902/bcmath.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/bcmath.so
+COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20220829/intl.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/intl.so
+COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20220829/bcmath.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/bcmath.so
 
 LABEL stage=intermediate
 
 WORKDIR /api
 
 # install git
-RUN apt-get update && \
+RUN set -eux; \
+    chown www-data:www-data /api; \
+	apt-get update && \
     apt-get install -y zip unzip git
 
-COPY composer.json composer.lock /api/
+COPY --chown=www-data:www-data composer.json composer.lock /api/
 
-COPY --from=composer /usr/bin/composer /usr/bin/composer
+COPY --chmod=777 --from=composer /usr/bin/composer /usr/bin/composer
 
-RUN /usr/bin/composer install --no-dev \
+USER www-data
+
+RUN set -eux; \
+	/usr/bin/composer install --no-dev \
    --ignore-platform-reqs \
    --no-ansi \
    --no-autoloader \
    --no-interaction \
    --no-scripts
 
-COPY / /api
+COPY --chown=www-data:www-data / /api
 
 RUN rm -rf storage/app/api/scunpacked-data
 RUN git clone https://github.com/StarCitizenWiki/scunpacked-data --branch=master --depth=1 storage/app/api/scunpacked-data
 
 RUN /usr/bin/composer dump-autoload --optimize --classmap-authoritative
 
 ### Final Image
-FROM php:8.1-apache
+FROM php:8.2-apache
+
+USER root
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -99,27 +106,25 @@ RUN apt-get update && \
 
 WORKDIR /var/www/html
 
-COPY --from=api /api /var/www/html
+COPY --chown=www-data:www-data --from=api /api /var/www/html
 COPY ./docker/vhost.conf /etc/apache2/sites-available/000-default.conf
-COPY ./docker/start.sh /usr/local/bin/start
+COPY --chown=www-data:www-data --chmod=770 ./docker/start.sh /usr/local/bin/start
 
 COPY --from=extensions /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/
-COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/
+COPY --from=extensions /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/
 
 RUN sed -i -e "s/extension=zip.so/;extension=zip.so/" /usr/local/etc/php/conf.d/docker-php-ext-zip.ini && \
     echo 'memory_limit = 512M' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini && \
     echo 'max_execution_time = 60' >> /usr/local/etc/php/conf.d/docker-php-executiontime.ini
 
-COPY ./docker/schedule.sh /usr/local/bin/schedule
+COPY --chown=www-data:www-data --chmod=770 ./docker/schedule.sh /usr/local/bin/schedule
 
-RUN chown -R www-data:www-data /var/www/html; \
-    chmod u+x /usr/local/bin/start; \
-    chmod -R u+w /var/www/html/storage; \
-    chmod -R g+w /var/www/html/storage; \
-    chown www-data:www-data /usr/local/bin/schedule; \
-    chmod +x /usr/local/bin/schedule; \
+RUN chmod -R u+w,g+w /var/www/html/storage; \
     a2enmod rewrite
 
-USER root
+USER www-data
+
+RUN php artisan storage:link; \
+    php artisan optimize
 
 CMD ["/usr/local/bin/start"]

Dockerfile

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Facades\DB;
+
+class CopyTranslationData extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'unpacked:copy-translations';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Copies german translations to the new sc_item_translations table.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        DB::table('sc_item_translations')->insertUsing(
+            ['locale_code', 'item_uuid', 'translation', 'updated_at', 'created_at'],
+            function (Builder $query) {
+                $query->select([
+                    'star_citizen_unpacked_item_translations.locale_code',
+                    'star_citizen_unpacked_item_translations.item_uuid',
+                    'star_citizen_unpacked_item_translations.translation',
+                    'star_citizen_unpacked_item_translations.updated_at',
+                    'star_citizen_unpacked_item_translations.created_at'
+                ])
+                    ->from('star_citizen_unpacked_item_translations')
+                    ->where('star_citizen_unpacked_item_translations.locale_code', 'de_DE')
+                    ->leftJoin(
+                        'sc_item_translations',
+                        'sc_item_translations.locale_code',
+                        '=',
+                        'star_citizen_unpacked_item_translations.locale_code'
+                    )
+                    ->whereNull('sc_item_translations.item_uuid');
+            }
+        );
+
+        return Command::SUCCESS;
+    }
+}

app/Console/Commands/CopyTranslationData.php

@@ -56,13 +56,8 @@ public function handle()
         $this->bar->advance();
 
         if (!$this->option('skipScUnpacked')) {
-            Artisan::call('unpacked:import-shop-items');
-            Artisan::call('unpacked:import-char-armor');
-            Artisan::call('unpacked:import-weapon-attachments');
-            Artisan::call('unpacked:import-weapon-personal');
-            Artisan::call('unpacked:import-ship-items');
-            Artisan::call('unpacked:import-vehicles');
-            Artisan::call('unpacked:import-clothing');
+            Artisan::call('sc:import-items');
+            Artisan::call('sc:import-shops');
         }
         $this->bar->finish();
 

app/Console/Commands/PopulateData.php

@@ -46,7 +46,7 @@ public function handle(): int
             [
                 new ImportCommLinks(-1),
             ]
-        )->dispatch($skip);
+        )->onQueue('redownload_comm_links')->dispatch($skip);
 
         return 0;
     }

app/Console/Commands/Rsi/CommLink/Download/ReDownloadCommLinks.php

@@ -9,6 +9,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Storage;
 
 class ImportCommLink extends Command
@@ -39,9 +40,10 @@ public function handle(): int
         try {
             $commLink = CommLink::query()->where('cig_id', $id)->firstOrFail();
         } catch (ModelNotFoundException $e) {
-            $this->error('Comm-Link does not exist in DB.');
-
-            return 1;
+            return Artisan::call('comm-links:download', [
+                'id' => $id,
+                '--import' => true
+            ]);
         }
 
         if (count(Storage::disk('comm_links')->files($id)) === 0) {