Updating elfinder dependencies

.devcontainer/devcontainer.json

@@ -0,0 +1,38 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/php
+{
+	"name": "PHP",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/php:0-8.2",
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Configure tool-specific properties.
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			"settings": {},
+			"extensions": [
+				"streetsidesoftware.code-spell-checker"
+			]
+		}
+	},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [8000],
+
+	// Use 'portsAttributes' to set default properties for specific forwarded ports. More info: https://code.visualstudio.com/docs/remote/devcontainerjson-reference.
+	"portsAttributes": {
+		"8000": {
+			"label": "Hello Remote World",
+			"onAutoForward": "notify"
+		}
+	}
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "sudo chmod a+x \"$(pwd)\" && sudo rm -rf /var/www/html && sudo ln -s \"$(pwd)\" /var/www/html"
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.github/dependabot.yml

@@ -3,5 +3,5 @@ updates:
 - package-ecosystem: composer
   directory: "/"
   schedule:
-    interval: daily
+    interval: weekly
   open-pull-requests-limit: 10

.github/workflows/test.yaml

@@ -1,11 +1,11 @@
 # OS: Linux; Symfony: latest stable; PHP: all the commonly used versions supported by this bundle
-name: "Tests - Linux"
+name: "Tests"
 
 on:
   pull_request:
   push:
     branches:
-      - 'master'
+      - 'main'
 
 env:
   fail-fast: true
@@ -17,18 +17,18 @@ jobs:
     continue-on-error: false
     strategy:
       matrix:
-        php-version: ['7.4', '8.0']
+        php-version: ['7.4', '8.0', '8.1', '8.2']
     steps:
       - name: 'Checkout code'
-        uses: actions/checkout@v2.3.3
+        uses: actions/checkout@v3
 
       - name: 'Install PHP with extensions'
-        uses: shivammathur/setup-php@2.7.0
+        uses: shivammathur/setup-php@2.27.1
         with:
           coverage: none
           php-version: ${{ matrix.php-version }}
           tools: composer:v2
-          extensions: mbstring, intl, pdo, pdo_sqlite, sqlite3
+          extensions: mbstring, intl
           ini-values: date.timezone=UTC
 
       - name: 'Install project dependencies'

.gitignore

@@ -3,3 +3,6 @@ Tests/cache
 Tests/log
 Tests/Functional/cache
 Tests/Functional/log
+vendor
+.phpunit.result.cache
+.php-cs-fixer.cache

.php-cs-fixer.php

@@ -0,0 +1,84 @@
+<?php
+
+return (new PhpCsFixer\Config())
+    ->setRiskyAllowed(false)
+    ->setRules([
+        '@Symfony'                   => true,
+        '@PHP80Migration'            => true,
+        'array_syntax'               => ['syntax' => 'short'],
+        'combine_consecutive_unsets' => true,
+        // one should use PHPUnit methods to set up expected exception instead of annotations
+        'general_phpdoc_annotation_remove' => [
+            'annotations' => [
+                'author',
+                'package',
+                'expectedException',
+                'expectedExceptionMessage',
+                'expectedExceptionMessageRegExp',
+            ],
+        ],
+        'function_typehint_space'     => false,
+        'no_empty_phpdoc'             => true,
+        'global_namespace_import'     => ['import_classes' => true, 'import_functions' => true, 'import_constants' => true],
+        'no_superfluous_phpdoc_tags'  => ['allow_mixed' => false, 'allow_unused_params' => false],
+        'phpdoc_line_span'            => ['property' => 'single'],
+        'heredoc_to_nowdoc'           => true,
+        'list_syntax'                 => ['syntax' => 'short'],
+        'blank_line_before_statement' => ['statements' => ['if', 'break', 'continue', 'declare', 'return', 'throw', 'try', 'yield']],
+        'no_extra_blank_lines'        => [
+            'tokens' => [
+                'break',
+                'continue',
+                'extra',
+                'return',
+                'throw',
+                'use',
+                'parenthesis_brace_block',
+                'square_brace_block',
+                'curly_brace_block',
+            ],
+        ],
+        'echo_tag_syntax'                     => true,
+        'method_argument_space'               => false,
+        'no_useless_else'                     => true,
+        'no_useless_return'                   => true,
+        'ordered_class_elements'              => true,
+        'ordered_imports'                     => ['sort_algorithm' => 'alpha', 'imports_order' => ['const', 'class', 'function']],
+        'php_unit_test_class_requires_covers' => true,
+        'phpdoc_align'                         => [
+            'tags' => [
+                'param', 'return', 'throws', 'type', 'var'
+                ],
+        ],
+        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_order'                        => true,
+        'phpdoc_no_alias_tag'                 => ['replacements' => ['link' => 'website']],
+        'phpdoc_summary'                      => false,
+        'phpdoc_to_comment'                   => false,
+        'phpdoc_types_order'                  => false, // breaks psalm-specific notation sometimes!
+        'semicolon_after_instruction'         => true,
+        'single_blank_line_at_eof'            => true,
+        'single_line_throw'                   => false,
+        'types_spaces'                        => false,
+        'binary_operator_spaces'              => [
+            'default'   => 'single_space',
+            'operators' => [
+                '='   => 'align_single_space_minimal',
+                '-='  => 'align_single_space_minimal',
+                '+='  => 'align_single_space_minimal',
+                '=>'  => 'align_single_space_minimal',
+                '===' => null,
+                '??=' => 'align_single_space_minimal',
+            ],
+        ],
+        'concat_space' => [
+            'spacing' => 'one',
+        ],
+        'operator_linebreak' => ['only_booleans' => true, 'position' => 'end'],
+        'yoda_style' => false,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__ . '/src')            
+    )
+;

.symfony.bundle.yaml

@@ -1,6 +1,6 @@
-branches: ["master"]
-maintained_branches: ["master"]
-current_branch: "master"
-dev_branch: "master"
+branches: ["main"]
+maintained_branches: ["main"]
+current_branch: "main"
+dev_branch: "main"
 dev_branch_alias: "12.x"
 doc_dir: "docs/"

composer.json

@@ -26,14 +26,15 @@
         "symfony/twig-bundle":                 "^4.4 || ^5.0 || ^5.2 || ^6.0",
         "symfony/form":                        "^4.4 || ^5.0 || ^5.2 || ^6.0",
         "symfony/asset":                       "^4.4 || ^5.0 || ^5.2 || ^6.0",
-        "studio-42/elfinder":                  "~2.1"
+        "studio-42/elfinder":                  "~2.1.62"
     },
     "require-dev" : {
-        "symfony/phpunit-bridge": "^4.1 || ^5.0 || ^5.2 || ^6.0",
-        "matthiasnoback/symfony-config-test":  "^4.0",
+        "symfony/phpunit-bridge":                           "^4.1 || ^5.0 || ^5.2 || ^6.0",
+        "matthiasnoback/symfony-config-test":               "^4.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
-        "symfony/finder": "^4.4 || ^5.0 || ^5.2 || ^6.0",
-        "php-coveralls/php-coveralls": "^2.0"
+        "symfony/finder":                                   "^4.4 || ^5.0 || ^5.2 || ^6.0",
+        "php-coveralls/php-coveralls":                      "^2.0",
+        "friendsofphp/php-cs-fixer":                        "dev-master"
     },
     "suggest": {
         "helios-ag/fm-tinymce-bundle": "FMTinyMCEBundle WYSIWYG Editor Bundle",

phpunit.xml.dist

@@ -1,41 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        bootstrap="tests/autoload.php"
-        colors="true"                                
-        xsi:noNamespaceSchemaLocation="../vendor/phpunit/phpunit/phpunit.xsd"
->
-
-    <php>
-        <server name="KERNEL_DIR" value="./tests/Functional" />
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
-    <testsuites>
-        <testsuite name="FMElfinderBundle test suite">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>./</directory>
-            <exclude>
-                <directory>./src/Controller</directory>
-                <directory>./src/Resources</directory>
-                <directory>./tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-    <logging>
-        <!-- and this is where your report will be written -->
-        <log type="coverage-clover" target="./clover.xml"/>
-    </logging>
+  <phpunit 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    bootstrap="tests/autoload.php" 
+    colors="true" 
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+  >
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./src/Controller</directory>
+      <directory>./src/Resources</directory>
+      <directory>./tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+    <report>
+      <clover outputFile="./clover.xml"/>
+    </report>
+  </coverage>
+  <php>
+    <server name="KERNEL_DIR" value="./tests/Functional"/>
+    <ini name="error_reporting" value="-1"/>
+  </php>
+  <listeners>
+    <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+  </listeners>
+  <testsuites>
+    <testsuite name="FMElfinderBundle test suite">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <!-- and this is where your report will be written -->
+  </logging>
 </phpunit>