zicht · 7ochem · May 26, 2025 · Apr 26, 2023
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.github export-ignore
+/tests/ export-ignore
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-22.04
         strategy:
             matrix:
-                php: [ '7.4', '8.1' ]
+                php: [ '8.1', '8.3' ]
         name: PHP ${{ matrix.php }}
         steps:
             -   uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added|Changed|Deprecated|Removed|Fixed|Security
 Nothing so far
 
+## 10.0.0 - 2025-05-26
+### Added
+- Support for Symfony 6
+- Support for Doctrine Persistence v3
+### Removed
+- Support for Symfony 5
+- Support for PHP 7.4
+- Support for Twig 2
+
 ## 9.1.0 - 2025-05-26
 ### Added
 - Attribute implementation of File annotation

diff --git a/composer.json b/composer.json
@@ -9,24 +9,23 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8",
         "doctrine/orm": "^2 || ^3",
         "doctrine/doctrine-bundle": "^2",
-        "doctrine/persistence": "^2",
+        "doctrine/persistence": "^2.13 || ^3",
         "jms/metadata": "^2.1",
-        "symfony/config": "^5.4",
-        "symfony/console": "^5.4",
-        "symfony/dependency-injection": "^5.4",
-        "symfony/form": "^5.4",
-        "symfony/http-kernel": "^5.4",
-        "symfony/translation": "^5.4",
-        "symfony/framework-bundle": "^5.4",
-        "twig/twig": "^2.7 || ^3",
+        "symfony/config": "^6",
+        "symfony/console": "^6",
+        "symfony/dependency-injection": "^6",
+        "symfony/form": "^6",
+        "symfony/http-kernel": "^6",
+        "symfony/translation": "^6",
+        "symfony/framework-bundle": "^6",
+        "twig/twig": "^3",
         "zicht/util": "^2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8 || ^9",
-        "zicht/standards-php": "^4"
+        "phpunit/phpunit": "^9.6"
     },
     "autoload": {
         "psr-4": {
@@ -41,17 +40,13 @@
     "minimum-stability": "stable",
     "license": "MIT",
     "scripts": {
-        "lint": [
-            "phpcs --standard=vendor/zicht/standards-php/phpcs.xml src/ tests/"
-        ],
-        "lint-no-warn": [
-            "phpcs -n --standard=vendor/zicht/standards-php/phpcs.xml src/ tests/"
-        ],
-        "lint-fix": [
-            "phpcbf --standard=vendor/zicht/standards-php/phpcs.xml src/ tests/"
-        ],
         "test": [
             "phpunit tests/"
         ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-feature-symfony-6": "10.x-dev"
+        }
     }
 }
diff --git a/res/doc/README.md b/res/doc/README.md
@@ -8,30 +8,26 @@ entity's 'avatar' field would become public/media/user/avatar/thefile.jpg.
 ## Installing ##
 
 * Include zicht/filemanager-bundle in your composer.json configuration
-* Add the bundle to your AppKernel
-* Use the annotation in your model and annotate your property with it:
+* Add the bundle to your bundles.php
+* Use the attribute in your model and annotate your property with it:
 
-        use Zicht\Bundle\FileManagerBundle\Annotation\File;
+        use Zicht\Bundle\FileManagerBundle\Attribute\File;
 
         // ....
-        /**
-         * @File
-         * @ORM\Column(type="string", nullable=true)
-         */
+        #[File]
+        #[ORM\Column(type: 'string', nullable: true)]
         protected $file;
 
 ## Doctrine ##
 
-In your entity, specify the @File annotation (`Zicht\Bundle\FileManagerBundle\Doctrine\Annotation\File`) for a field:
+In your entity, specify the @File attribute (`Zicht\Bundle\FileManagerBundle\Doctrine\Attribute\File`) for a field:
 
     // ...
-    use Zicht\Bundle\FileManagerBundle\Doctrine\Annotation\File;
+    use Zicht\Bundle\FileManagerBundle\Doctrine\Attribute\File;
     // ...
 
-    /**
-     * @ORM\Column(type="string", nullable=true)
-     * @File
-     */
+    #[File]
+    #[ORM\Column(type: 'string', nullable: true)]
     protected $photo = null;
 
 
@@ -57,9 +53,9 @@ You can refer files with the file_url() function. This function ignores the base
 an imagine_filter. For regular files, you should an asset() function:
 
     <img src="{{ file_url(user, 'avatar')|imagine_filter("avatar") }}" width="50" height="50" class="avatar">
-    
+
     <a href="{{ asset(file_url(document, 'file')) }}">Download this file</a>
- 
+
 ## Using files as fixtures ##
 
 If you're using datafixtures, you can use files as fixtures by wrapping them in the FixtureFile object. This object

diff --git a/src/Command/CreateMimeFileCommand.php b/src/Command/CreateMimeFileCommand.php
@@ -1,29 +1,20 @@
 <?php
-/**
- * @copyright Zicht Online <http://www.zicht.nl>
- */
 
 namespace Zicht\Bundle\FileManagerBundle\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Yaml\Dumper;
 
+#[AsCommand('zicht:filemanager:create:mime')]
 class CreateMimeFileCommand extends Command
 {
-    protected static $defaultName = 'zicht:filemanager:create:mime';
+    /** mime types */
+    private const MIME_FILE = '/etc/mime.types';
 
-    /**
-     * mime types
-     */
-    const MIME_FILE = '/etc/mime.types';
-
-    /**
-     * {@inheritDoc}
-     */
     public function configure()
     {
         $this
@@ -37,11 +28,7 @@ public function configure()
             );
     }
 
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $dryRun = $input->getOption('dry-run');
         $force = $input->getOption('force');
@@ -76,5 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } elseif ($dryRun) {
             echo $ymlDump;
         }
+
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Command/FileCheckCommand.php b/src/Command/FileCheckCommand.php
@@ -1,10 +1,8 @@
 <?php
-/**
- * @copyright Zicht Online <http://zicht.nl>
- */
 
 namespace Zicht\Bundle\FileManagerBundle\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
@@ -17,21 +15,14 @@
 /**
  * A command to check if the files in the database are in sync with the files on disk or vice versa.
  */
+#[AsCommand('zicht:filemanager:check')]
 class FileCheckCommand extends Command
 {
-    protected static $defaultName = 'zicht:filemanager:check';
-    /**
-     * @var DatabaseChecker
-     */
-    private $databaseChecker;
-    /**
-     * @var FilesystemChecker
-     */
-    private $filesystemChecker;
-    /**
-     * @var EntityHelper
-     */
-    private $entityHelper;
+    private DatabaseChecker $databaseChecker;
+
+    private FilesystemChecker $filesystemChecker;
+
+    private EntityHelper $entityHelper;
 
     public function __construct(DatabaseChecker $databaseChecker, FilesystemChecker $filesystemChecker, EntityHelper $entityHelper, string $name = null)
     {
@@ -41,9 +32,6 @@ public function __construct(DatabaseChecker $databaseChecker, FilesystemChecker
         $this->entityHelper = $entityHelper;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function configure()
     {
         $this
@@ -59,10 +47,7 @@ public function configure()
             );
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($input->getOption('inverse')) {
             $checker = $this->databaseChecker;
@@ -90,5 +75,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln("Checking entity {$entityClass}");
             $checker->check($entityClass);
         }
+
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Controller/ImagineController.php b/src/Controller/ImagineController.php
@@ -1,7 +1,4 @@
 <?php
-/**
- * @copyright Zicht Online <http://www.zicht.nl>
- */
 
 namespace Zicht\Bundle\FileManagerBundle\Controller;
 
@@ -16,19 +13,14 @@
  */
 class ImagineController extends AbstractController
 {
-    public static function getSubscribedServices()
+    public static function getSubscribedServices(): array
     {
         return ['liip_imagine.cache.manager' => CacheManager::class] + parent::getSubscribedServices();
     }
 
-    /**
-     * Remove thumbnail for given path
-     *
-     * @param Request $request
-     * @return JsonResponse
-     * @Route("/clear-thumbnail")
-     */
-    public function clearThumbnailAction(Request $request)
+    /** Remove thumbnail for given path */
+    #[Route('/clear-thumbnail')]
+    public function clearThumbnailAction(Request $request): JsonResponse
     {
         $path = $request->get('path');
         $filter = $request->get('filter');

diff --git a/src/DependencyInjection/CompilerPass/SetOptionalDepsPass.php b/src/DependencyInjection/CompilerPass/SetOptionalDepsPass.php
@@ -1,7 +1,5 @@
 <?php
-/**
- * @copyright Zicht Online <http://zicht.nl>
- */
+
 namespace Zicht\Bundle\FileManagerBundle\DependencyInjection\CompilerPass;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -13,9 +11,6 @@
  */
 class SetOptionalDepsPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritDoc}
-     */
     public function process(ContainerBuilder $container)
     {
         if ($container->hasDefinition('event_dispatcher') || $container->hasAlias('event_dispatcher')) {

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -1,7 +1,4 @@
 <?php
-/**
- * @copyright Zicht Online <http://www.zicht.nl>
- */
 
 namespace Zicht\Bundle\FileManagerBundle\DependencyInjection;
 
@@ -21,7 +18,7 @@ public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('zicht_file_manager');
         $rootNode = $treeBuilder->getRootNode();
-        
+
         $rootNode->children()
             // Default behaviour is to lower case file names
             ->scalarNode('case_preservation')->defaultFalse();

diff --git a/src/DependencyInjection/ZichtFileManagerExtension.php b/src/DependencyInjection/ZichtFileManagerExtension.php
@@ -1,7 +1,4 @@
 <?php
-/**
- * @copyright Zicht Online <http://zicht.nl>
- */
 
 namespace Zicht\Bundle\FileManagerBundle\DependencyInjection;
 
@@ -19,9 +16,6 @@
  */
 class ZichtFileManagerExtension extends DIExtension
 {
-    /**
-     * {@inheritDoc}
-     */
     public function load(array $config, ContainerBuilder $container)
     {
         $configuration = new Configuration();

diff --git a/src/Doctrine/EntityHelper.php b/src/Doctrine/EntityHelper.php
@@ -1,7 +1,5 @@
 <?php
-/**
- * @copyright Zicht Online <http://zicht.nl>
- */
+
 namespace Zicht\Bundle\FileManagerBundle\Doctrine;
 
 use Doctrine\Bundle\DoctrineBundle\Registry;

diff --git a/src/Doctrine/FileManagerSubscriber.php b/src/Doctrine/FileManagerSubscriber.php
@@ -1,7 +1,4 @@
 <?php
-/**
- * @copyright Zicht Online <http://zicht.nl>
- */
 
 namespace Zicht\Bundle\FileManagerBundle\Doctrine;
 
@@ -58,7 +55,7 @@ public function getSubscribedEvents()
      */
     public function preUpdate($eventArgs)
     {
-        $entity = $eventArgs->getEntity();
+        $entity = $eventArgs->getObject();
         $changeset = $eventArgs->getEntityChangeSet();
 
         foreach ($this->metadata->getManagedFields($entity) as $field) {
@@ -102,7 +99,7 @@ function (FileManager $fm) use ($filepath) {
      */
     public function preRemove($eventArgs)
     {
-        $entity = $eventArgs->getEntity();
+        $entity = $eventArgs->getObject();
         foreach ($this->metadata->getManagedFields($entity) as $field) {
             $file = PropertyHelper::getValue($entity, $field);
 
@@ -125,7 +122,7 @@ public function preRemove($eventArgs)
      */
     public function prePersist($eventArgs)
     {
-        $entity = $eventArgs->getEntity();
+        $entity = $eventArgs->getObject();
 
         foreach ($this->metadata->getManagedFields($entity) as $field) {
             $value = PropertyHelper::getValue($entity, $field);