Merge branch 'release/1.4.0'

Author: turegjorup

.github/workflows/php_upgrade.yaml

@@ -51,44 +51,6 @@ jobs:
       - name: Normalize composer files
         run: composer normalize --dry-run
 
-  php-cs-fixer:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ["8.2"]
-    name: PHP Coding Standards Fixer (PHP ${{ matrix.php }})
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php}}
-          extensions: apcu, ctype, iconv, imagick, json, redis, soap, xmlreader, zip
-          coverage: none
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ matrix.php }}-composer-
-
-      - name: Update Dependencies
-        run: composer update --ignore-platform-reqs
-
-      - name: Install Dependencies
-        run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist --ignore-platform-reqs
-
-      - name: php-cs-fixer
-        run: PHP_CS_FIXER_IGNORE_ENV=true phpdbg -qrr ./vendor/bin/php-cs-fixer fix --dry-run
-
   phpunit:
     runs-on: ubuntu-latest
     services:

.gitignore

@@ -16,6 +16,8 @@
 node_modules
 
 public/media/*
+!public/media/thumbnail_video.png
+!public/media/thumbnail_other.png
 
 ###> phpunit/phpunit ###
 /phpunit.xml
@@ -31,3 +33,7 @@ launch.json
 
 # Allow local docker-compose overrides
 docker-compose.override.yml
+
+###> liip/imagine-bundle ###
+/public/media/cache/
+###< liip/imagine-bundle ###

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.4.0] - 2023-09-14
+- [#160](https://github.com/os2display/display-api-service/pull/160)
+  Added app:feed:list-feed-source command. Removed listing from app:feed:remove-feed-source command.
+- [#159](https://github.com/os2display/display-api-service/pull/159)
+  Fixed sprintf issue.
+- [#158](https://github.com/os2display/display-api-service/pull/158)
+  Added thumbnails for image resources
+
 ## [1.3.2] - 2023-07-11
 - [#157](https://github.com/os2display/display-api-service/pull/157)
   Fix question input on create user command

composer.json

@@ -7,6 +7,7 @@
         "php": ">=8.0",
         "ext-ctype": "*",
         "ext-fileinfo": "*",
+        "ext-gd": "*",
         "ext-iconv": "*",
         "api-platform/core": "2.6.*",
         "composer/package-versions-deprecated": "^1.11",
@@ -20,6 +21,7 @@
         "justinrainbow/json-schema": "^5.2",
         "kubawerlos/php-cs-fixer-custom-fixers": "^3.11",
         "lexik/jwt-authentication-bundle": "^2.14",
+        "liip/imagine-bundle": "^2.11",
         "nelmio/cors-bundle": "^2.1",
         "phpdocumentor/reflection-docblock": "^5.2",
         "rlanvin/php-rrule": "^2.2",
@@ -122,6 +124,10 @@
         "fixtures-load": [
             "bin/console hautelook:fixtures:load --no-interaction"
         ],
+        "prepare-code": [
+            "@coding-standards-apply",
+            "@tests"
+        ],
         "tests": [
             "bin/console --env=test doctrine:database:drop --if-exists --force --quiet",
             "bin/console --env=test doctrine:database:create --no-interaction --if-not-exists --quiet",

composer.lock

@@ -19,4 +19,5 @@
     ItkDev\OpenIdConnectBundle\ItkDevOpenIdConnectBundle::class => ['all' => true],
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
     Gesdinet\JWTRefreshTokenBundle\GesdinetJWTRefreshTokenBundle::class => ['all' => true],
+    Liip\ImagineBundle\LiipImagineBundle::class => ['all' => true],
 ];

config/bundles.php

@@ -0,0 +1,18 @@
+# Documentation on how to configure the bundle can be found at: https://symfony.com/doc/current/bundles/LiipImagineBundle/basic-usage.html
+liip_imagine:
+    # valid drivers options include "gd" or "gmagick" or "imagick"
+    driver: "gd"
+
+    resolvers:
+        default:
+            web_path: ~
+
+    filter_sets:
+        cache: ~
+
+        thumbnail:
+            quality: 75
+            filters:
+                scale:
+                    # Max 400 width, 400 height.
+                    dim: [ 400, 400 ]

config/packages/liip_imagine.yaml

@@ -0,0 +1,2 @@
+_liip_imagine:
+    resource: "@LiipImagineBundle/Resources/config/routing.yaml"

config/routes/liip_imagine.yaml

@@ -6852,6 +6852,10 @@
                         "items": {
                             "type": "string"
                         }
+                    },
+                    "thumbnail": {
+                        "type": "string",
+                        "nullable": true
                     }
                 }
             },
@@ -6925,6 +6929,10 @@
                         "items": {
                             "type": "string"
                         }
+                    },
+                    "thumbnail": {
+                        "type": "string",
+                        "nullable": true
                     }
                 }
             },

public/api-spec-v1.json

@@ -4887,6 +4887,9 @@ components:
           type: array
           items:
             type: string
+        thumbnail:
+          type: string
+          nullable: true
     Media.Media.jsonld:
       type: object
       description: ''
@@ -4936,6 +4939,9 @@ components:
           type: array
           items:
             type: string
+        thumbnail:
+          type: string
+          nullable: true
     Playlist.Playlist:
       type: object
       description: ''