Merge tag '2.2.0'

Stable release 2.2.0
This brings full Contao 4.9 support.

Additionally there have been performance improvements
and various bugfixes.

- Support manual file sorting
- now works with the "picture factory" - this supports lazy-loading of picture settings
- option "read only" (readonly) is now possible
- Restriction of selection to "files only" has been extended to "folders only" - default remains files and folders
- image size support for a lightbox with values from layout settings
- a placeholder image can be selected
- option whether a download link is protected via the session or not; for backward compatibility reasons the value is set via a migration if the "Download link" checkbox is on; if the protection is deactivated, no cookie is set by the function and the page can be cached

Author: baumannsven

.check-author.yml

@@ -10,3 +10,7 @@ mapping:
     - 'cogizz <[email protected]>'
     - 'cboelter <[email protected]>'
     - 'Christopher Boelter <[email protected]>'
+  'Ingolf Steinhardt <[email protected]>':
+    - 'zonky2 <[email protected]>'
+    - 'Ingolf Steinhardt <[email protected]>'
+    - 'Ingolf Steinhardt <[email protected]>'

.github/workflows/diagnostics.yml

@@ -0,0 +1,52 @@
+name: MetaModels attribute_file
+
+on:
+  push:
+    branches-ignore:
+      - '**-translation'
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: [7.4]
+        contao: [~4.9.0]
+
+    steps:
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Pull source
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      # see https://github.com/shivammathur/setup-php
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Setup PHP.
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache composer cache directory
+        uses: actions/cache@v1
+        env:
+          cache-name: composer-cache-dir
+        with:
+          path: ~/.cache/composer
+          key: ${{ runner.os }}-build-${{ env.cache-name }}
+
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache vendor directory
+        uses: actions/cache@v1
+        env:
+          cache-name: composer-vendor
+        with:
+          path: vendor
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Install composer dependencies
+        run: composer update --prefer-dist --no-interaction --no-suggest
+
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Run tests
+        run: ant -keep-going

.gitignore

@@ -17,3 +17,4 @@ vendor/
 # build
 build/
 /composer.lock
+.phpunit.result.cache

.travis.yml

@@ -1,9 +1,9 @@
-[![Build Status](https://travis-ci.org/MetaModels/attribute_file.svg)](https://travis-ci.org/MetaModels/attribute_file/branches)
+[![Build Status](https://github.com/MetaModels/attribute_file/actions/workflows/diagnostics.yml/badge.svg)](https://github.com/MetaModels/attribute_file/actions)
 [![Latest Version tagged](http://img.shields.io/github/tag/MetaModels/attribute_file.svg)](https://github.com/MetaModels/attribute_file/tags)
 [![Latest Version on Packagist](http://img.shields.io/packagist/v/MetaModels/attribute_file.svg)](https://packagist.org/packages/MetaModels/attribute_file)
 [![Installations via composer per month](http://img.shields.io/packagist/dm/MetaModels/attribute_file.svg)](https://packagist.org/packages/MetaModels/attribute_file)
 
 File
 ====
 
-The file attribute
+The file attribute.

README.md

@@ -8,4 +8,5 @@
 phpcs.standard=${basedir}/vendor/phpcq/coding-standard/phpcs/PhpCodeQuality/ruleset.xml
 phpmd.ruleset=${basedir}/vendor/phpcq/coding-standard/phpmd/ruleset.xml
 
-phpcs.excluded=src/Resources/contao/languages
+phpcs.excluded=src/Resources/contao/languages*\
+               ,src/Resources/contao/dca*

build.default.properties

@@ -9,13 +9,13 @@
     "nontranslatable"
   ],
   "type": "contao-bundle",
-  "homepage": "http://now.metamodel.me/",
+  "homepage": "https://now.metamodel.me/",
   "license": "LGPL-3.0-or-later",
   "authors": [
     {
       "name": "Christian Schiffler",
       "email": "[email protected]",
-      "homepage": "http://www.cyberspectrum.de",
+      "homepage": "https://www.cyberspectrum.de",
       "role": "Developer"
     },
     {
@@ -27,21 +27,26 @@
   "support": {
     "email": "[email protected]",
     "issues": "https://github.com/MetaModels/attribute_file/issues",
-    "wiki": "http://de.contaowiki.org/MetaModels",
+    "wiki": "https://de.contaowiki.org/MetaModels",
     "irc": "irc://irc.freenode.org/contao.mm",
     "source": "https://github.com/MetaModels/attribute_file"
   },
   "require": {
-    "php": "^7.1",
-    "contao-community-alliance/dc-general": "^2.1.3",
-    "contao/core-bundle": "^4.4.8",
-    "metamodels/core": "^2.1.1",
-    "symfony/dependency-injection": "^3.3 || ^4.0",
-    "symfony/http-kernel": "^3.3 || ^4.0",
-    "ext-pdo": "*"
+    "php": "^7.4",
+    "ext-pdo": "*",
+    "cache/array-adapter": "^1.0",
+    "cache/doctrine-adapter": "^1.0",
+    "contao-community-alliance/dc-general": "^2.2",
+    "contao/core-bundle": "^4.9.0, <4.13.0",
+    "metamodels/core": "^2.2",
+    "psr/simple-cache": "^1.0",
+    "symfony/dependency-injection": "^4.4.6",
+    "symfony/event-dispatcher": "^4.4.6",
+    "symfony/http-kernel": "~4.4.13"
   },
   "require-dev": {
     "contao/manager-plugin": "^2.1",
+    "metamodels/contao-frontend-editing": "^2.1",
     "menatwork/contao-multicolumnwizard-bundle": "^3.4",
     "phpcq/all-tasks": "^1.2"
   },
@@ -61,10 +66,14 @@
   "extra": {
     "contao-manager-plugin": "MetaModels\\AttributeFileBundle\\ContaoManager\\Plugin",
     "branch-alias": {
-      "dev-master": "2.1.x-dev"
+      "dev-feature/2.2.0": "2.2.x-dev"
     }
   },
   "config": {
+    "allow-plugins": {
+      "contao-components/installer": false,
+      "contao/manager-plugin": false
+    },
     "sort-packages": true
   }
 }

composer.json

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          colors="true"
          forceCoversAnnotation="true"
          failOnRisky="true"
@@ -17,9 +17,9 @@
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>