NGSTACK-921 add download target type

.github/workflows/coding-standards.yml

@@ -0,0 +1,29 @@
+name: PHP-CS-Fixer
+
+on:
+  push:
+    branches:
+      - 'master'
+      - '[0-9].[0-9]+'
+  pull_request: ~
+
+jobs:
+  php-cs-fixer:
+    name: PHP CS Fixer
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          tools: composer
+
+      - name: Install dependencies
+        run: composer install --no-interaction --prefer-dist
+
+      - name: Run PHP CS Fixer
+        run: vendor/bin/php-cs-fixer fix --diff --dry-run

.github/workflows/tests.yml

@@ -0,0 +1,51 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - 'master'
+      - '[0-9].[0-9]+'
+  pull_request: ~
+
+jobs:
+  tests:
+    name: PHP ${{ matrix.php }} / ${{ matrix.phpunit }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['8.1']
+        phpunit: ['phpunit.xml', 'phpunit-integration-legacy.xml']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+
+      - run: composer --version
+      - run: composer validate
+
+      - 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@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-php${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php${{ matrix.php }}-composer-
+
+      - name: Install dependencies
+        run: composer update --prefer-dist
+
+      - name: Run tests
+        run: vendor/bin/phpunit -c ${{ matrix.phpunit }} --colors=always
+

.php-cs-fixer.php

@@ -32,6 +32,9 @@
         'yoda_style' => false,
         'php_unit_strict' => false,
         'php_unit_test_annotation' => false,
+        'php_unit_data_provider_static' => false,
+        'php_unit_data_provider_name' => false,
+        'php_unit_data_provider_return_type' => false,
 
         // Additional rules
         'return_assignment' => false,

bundle/Form/Field/FieldValueType.php

@@ -6,6 +6,7 @@
 
 use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException;
 use Ibexa\Contracts\Core\Repository\FieldTypeService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
@@ -48,7 +49,7 @@ public function getBlockPrefix(): string
     }
 
     /**
-     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws NotFoundException
      */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
@@ -161,15 +162,15 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     }
 
     /**
-     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws NotFoundException
      */
     public function finishView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['relations'] = [];
         $view->vars['default_location'] = $options['default_location'];
         $view->vars['root_default_location'] = $options['root_default_location'];
 
-        /** @var \Netgen\IbexaFieldTypeEnhancedLink\FieldType\Value $data */
+        /** @var Value $data */
         $data = $form->getData();
 
         if (!$data instanceof Value || null === $data->reference || $data->isTypeExternal()) {

bundle/Form/FieldDefinition/FormMapper.php

@@ -82,6 +82,8 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field
                 'field_definition.ngenhancedlink.target.' . Type::TARGET_LINK_IN_NEW_TAB => Type::TARGET_LINK_IN_NEW_TAB,
                 'field_definition.ngenhancedlink.target.' . Type::TARGET_EMBED => Type::TARGET_EMBED,
                 'field_definition.ngenhancedlink.target.' . Type::TARGET_MODAL => Type::TARGET_MODAL,
+                'field_definition.ngenhancedlink.target.' . Type::TARGET_DOWNLOAD_LINK => Type::TARGET_DOWNLOAD_LINK,
+                'field_definition.ngenhancedlink.target.' . Type::TARGET_DOWNLOAD_INLINE => Type::TARGET_DOWNLOAD_INLINE,
             ],
             'property_path' => 'fieldSettings[allowedTargetsInternal]',
             'label' => /* @Desc("Allowed Targets Internal") */ 'field_definition.ngenhancedlink.selection_allowed_targets.internal',

bundle/NetgenIbexaFieldTypeEnhancedLinkBundle.php

@@ -9,7 +9,5 @@
 
 class NetgenIbexaFieldTypeEnhancedLinkBundle extends Bundle
 {
-    public function build(ContainerBuilder $container): void
-    {
-    }
+    public function build(ContainerBuilder $container): void {}
 }

bundle/Resources/translations/content_type.en.yaml

@@ -11,6 +11,8 @@ field_definition.ngenhancedlink.target.link: "Link"
 field_definition.ngenhancedlink.target.link_new_tab: "Link in new tab"
 field_definition.ngenhancedlink.target.embed: "Embed"
 field_definition.ngenhancedlink.target.modal: "Modal"
+field_definition.ngenhancedlink.target.download: "Download"
+field_definition.ngenhancedlink.target.download_inline: "Download inline"
 field_definition.ngenhancedlink.link_type.internal: "Internal"
 field_definition.ngenhancedlink.link_type.external: "External"
 field_definition.ngenhancedlink.link_type.all: "All"

bundle/Resources/translations/field_edit.en.yaml

@@ -11,3 +11,5 @@ ngenhancedlink.url: 'URL'
 ngenhancedlink.target.link_new_tab: 'Link in new tab'
 ngenhancedlink.target.embed: 'Embed'
 ngenhancedlink.target.modal: 'Modal'
+ngenhancedlink.target.download: 'Download'
+ngenhancedlink.target.download_inline: 'Download inline'

bundle/Resources/translations/field_view.en.yaml

@@ -2,3 +2,10 @@ ngenhancedlink.single_relation: "Enhanced link"
 ngenhancedlink.name: "Name"
 ngenhancedlink.content_type: "Content type"
 ngenhancedlink.created: "Created"
+
+ngenhancedlink.target.link: "Link"
+ngenhancedlink.target.link_new_tab: "Link in new tab"
+ngenhancedlink.target.embed: "Embed"
+ngenhancedlink.target.modal: "Modal"
+ngenhancedlink.target.download: "Download"
+ngenhancedlink.target.download_inline: "Download inline"

bundle/Resources/translations/ibexa_content_type.en.yaml

@@ -11,6 +11,8 @@ field_definition.ngenhancedlink.target.link: "Link"
 field_definition.ngenhancedlink.target.link_new_tab: "Link in new tab"
 field_definition.ngenhancedlink.target.embed: "Embed"
 field_definition.ngenhancedlink.target.modal: "Modal"
+field_definition.ngenhancedlink.target.download: "Download"
+field_definition.ngenhancedlink.target.download_inline: "Download inline"
 field_definition.ngenhancedlink.link_type.internal: "Internal"
 field_definition.ngenhancedlink.link_type.external: "External"
 field_definition.ngenhancedlink.link_type.all: "All"

bundle/Resources/views/themes/admin/ngenhancedlink/field_view.html.twig

@@ -27,7 +27,7 @@
                 {% endembed %}
                 <p>Type: internal</p>
                 <p>Label: {{ field.value.label }}</p>
-                <p>Target: {{ field.value.target }}</p>
+                <p>Target: {{ ('ngenhancedlink.target.' ~ field.value.target)|trans }}</p>
                 <p>Suffix: {{ field.value.suffix }}</p>
             {% endif %}
             {% if field.value.isTypeExternal %}

bundle/Templating/Twig/Extension/FieldTypeExtension.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\IbexaFieldTypeEnhancedLinkBundle\Templating\Twig\Extension;
 
 use Twig\Extension\AbstractExtension;
@@ -8,7 +10,7 @@
 class FieldTypeExtension extends AbstractExtension
 {
     /**
-     * @return \Twig\TwigFunction[]
+     * @return TwigFunction[]
      */
     public function getFunctions(): array
     {

bundle/Templating/Twig/Extension/FieldTypeRuntime.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\IbexaFieldTypeEnhancedLinkBundle\Templating\Twig\Extension;
 
 use Ibexa\Contracts\Core\Repository\Repository;
@@ -15,8 +17,9 @@ public function __construct(Repository $repository)
 
     public function hasLocation(int $reference): bool
     {
-        return $this->repository->sudo(
-            fn (): bool => $this->repository->getContentService()->loadContentInfo($reference)->mainLocationId !== null
-        );
+        /** @var bool $callback */
+        $callback = fn (): bool => $this->repository->getContentService()->loadContentInfo($reference)->mainLocationId !== null;
+
+        return $this->repository->sudo($callback);
     }
 }

bundle/View/ParameterProvider.php

@@ -10,6 +10,7 @@
 use Ibexa\Contracts\Core\Repository\FieldTypeService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use Ibexa\Core\MVC\Symfony\FieldType\View\ParameterProviderInterface;
+use Netgen\IbexaFieldTypeEnhancedLink\FieldType\Value;
 
 final class ParameterProvider implements ParameterProviderInterface
 {
@@ -33,7 +34,7 @@ public function getViewParameters(Field $field): array
 
     private function isLinkAvailable(Field $field): bool
     {
-        /** @var \Netgen\IbexaFieldTypeEnhancedLink\FieldType\Value $value */
+        /** @var Value $value */
         $value = $field->value;
 
         if ($this->fieldTypeService->getFieldType($field->fieldTypeIdentifier)->isEmptyValue($value)) {

composer.json

@@ -19,7 +19,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "symfony/phpunit-bridge": "^6.1"
+        "symfony/phpunit-bridge": "^6.1",
+        "friendsofphp/php-cs-fixer": "^3.7.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -43,5 +44,10 @@
     },
     "scripts": {
         "test": "@php vendor/bin/phpunit --colors=always"
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": false
+        }
     }
 }