code style

composer.json

@@ -31,14 +31,15 @@
         "contao/image": "^1.2",
         "symfony/config": "^5.4 || ^6.4 || ^7.1",
         "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.1",
+        "symfony/filesystem": "^5.4 || ^6.4 || ^7.1",
         "symfony/http-foundation": "^5.4 || ^6.4 || ^7.1",
         "symfony/http-kernel": "^5.4 || ^6.4 || ^7.1",
         "symfony/security-core": "^5.4 || ^6.4 || ^7.1",
-        "webmozart/path-util": "^2.3",
         "symfony/service-contracts": "^2.5 || ^3.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.0"
+        "contao/easy-coding-standard": "^6.0",
+        "contao/rector": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -51,7 +52,8 @@
     "config": {
         "allow-plugins": {
             "contao-components/installer": true,
-            "php-http/discovery": false
+            "php-http/discovery": false,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     }
 }

contao/dca/tl_files.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */

contao/dca/tl_member.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */

contao/languages/de/modules.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */

contao/languages/de/tl_files.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */

contao/languages/de/tl_member.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */

contao/languages/en/modules.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */

contao/languages/en/tl_files.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */

contao/languages/en/tl_member.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */

src/ContaoFileAccessBundle.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */

src/ContaoManager/Plugin.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */
@@ -24,11 +24,8 @@
 /**
  * Plugin for the Contao Manager.
  */
-class ContaoManagerPlugin implements BundlePluginInterface, RoutingPluginInterface
+class Plugin implements BundlePluginInterface, RoutingPluginInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getBundles(ParserInterface $parser)
     {
         return [
@@ -37,9 +34,6 @@ public function getBundles(ParserInterface $parser)
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRouteCollection(LoaderResolverInterface $resolver, KernelInterface $kernel)
     {
         return $resolver

src/Controller/AbstractFilesController.php

@@ -99,7 +99,7 @@ protected function setRootPage(Request $request): void
     {
         $root = $this->findFirstPublishedRootByHostAndLanguage($request->getHost(), $request->getLocale());
 
-        if (null !== $root) {
+        if ($root) {
             $root->loadDetails();
             $request->attributes->set('pageModel', $root);
             $GLOBALS['objPage'] = $root;
@@ -130,7 +130,7 @@ protected function tokenChecker(): TokenChecker
         return $this->container->get(__METHOD__);
     }
 
-    private function findFirstPublishedRootByHostAndLanguage(string $host, string $language): ?PageModel
+    private function findFirstPublishedRootByHostAndLanguage(string $host, string $language): PageModel|null
     {
         $t = PageModel::getTable();
         $columns = ["$t.type='root' AND ($t.dns=? OR $t.dns='') AND ($t.language=? OR $t.fallback='1')"];

src/Controller/FilesController.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */
@@ -16,21 +16,16 @@
 use Contao\CoreBundle\Framework\ContaoFramework;
 use Contao\Dbafs;
 use Contao\FilesModel;
-use Contao\PageModel;
+use Symfony\Component\Filesystem\Path;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Session\Session;
-use Webmozart\PathUtil\Path;
 
 class FilesController extends AbstractFilesController
 {
-    protected $framework;
-    protected $projectDir;
-
-    public function __construct(ContaoFramework $framework, string $projectDir)
-    {
-        $this->framework = $framework;
-        $this->projectDir = $projectDir;
+    public function __construct(
+        private readonly ContaoFramework $framework,
+        private readonly string $projectDir,
+    ) {
     }
 
     public function fileAction(Request $request, string $file): BinaryFileResponse
@@ -43,7 +38,7 @@ public function fileAction(Request $request, string $file): BinaryFileResponse
         }
 
         // Initialize the Contao framework
-        $this->framework->initialize(true);
+        $this->framework->initialize();
 
         // Set the root page for the domain as the pageModel attribute
         $this->setRootPage($request);

src/Controller/ProtectedImagesController.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */
@@ -22,37 +22,22 @@
 use Contao\Image\DeferredResizerInterface;
 use Contao\Image\Exception\FileNotExistsException;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Filesystem\Path;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Webmozart\PathUtil\Path;
 
 class ProtectedImagesController extends AbstractFilesController
 {
-    private ImageFactoryInterface $imageFactory;
-    private DeferredResizerInterface $resizer;
-    private DeferredImageStorageInterface $deferredImageStorage;
-    private Filesystem $filesystem;
-    private ContaoFramework $framework;
-    private string $targetDir;
-    private string $projectDir;
-
     public function __construct(
-        ImageFactoryInterface $imageFactory,
-        DeferredResizerInterface $resizer,
-        DeferredImageStorageInterface $deferredImageStorage,
-        Filesystem $filesystem,
-        ContaoFramework $framework,
-        string $targetDir,
-        string $projectDir
+        private readonly ImageFactoryInterface $imageFactory,
+        private readonly DeferredResizerInterface $resizer,
+        private readonly DeferredImageStorageInterface $deferredImageStorage,
+        private readonly Filesystem $filesystem,
+        private readonly ContaoFramework $framework,
+        private readonly string $targetDir,
+        private readonly string $projectDir,
     ) {
-        $this->imageFactory = $imageFactory;
-        $this->resizer = $resizer;
-        $this->deferredImageStorage = $deferredImageStorage;
-        $this->filesystem = $filesystem;
-        $this->framework = $framework;
-        $this->targetDir = $targetDir;
-        $this->projectDir = $projectDir;
     }
 
     public function __invoke(Request $request, string $path): Response
@@ -66,7 +51,7 @@ public function __invoke(Request $request, string $path): Response
         $filePath = Path::join($this->targetDir, $config['path']);
 
         // Initialize the Contao framework
-        $this->framework->initialize(true);
+        $this->framework->initialize();
 
         // Set the root page for the domain as the pageModel attribute
         $this->setRootPage($request);

src/DataContainer/FilesCallbacks.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */
@@ -19,15 +19,12 @@
 use Contao\FilesModel;
 use Contao\Folder;
 use Contao\Input;
-use Webmozart\PathUtil\Path;
+use Symfony\Component\Filesystem\Path;
 
 class FilesCallbacks
 {
-    private $projectDir;
-
-    public function __construct(string $projectDir)
+    public function __construct(private readonly string $projectDir)
     {
-        $this->projectDir = $projectDir;
     }
 
     /**

src/DependencyInjection/Compiler/AdjustProtectedResizerServicePass.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */

src/DependencyInjection/Compiler/AdjustResizerServicePass.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */

src/DependencyInjection/Configuration.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */
@@ -14,15 +14,12 @@
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Webmozart\PathUtil\Path;
+use Symfony\Component\Filesystem\Path;
 
 class Configuration implements ConfigurationInterface
 {
-    private string $projectDir;
-
-    public function __construct(string $projectDir)
+    public function __construct(private readonly string $projectDir)
     {
-        $this->projectDir = $projectDir;
     }
 
     public function getConfigTreeBuilder(): TreeBuilder

src/DependencyInjection/ContaoFileAccessExtension.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 /*
- * This file is part of the ContaoFileAccessBundle.
+ * This file is part of the Contao File Access extension.
  *
- * (c) inspiredminds
+ * (c) INSPIRED MINDS
  *
  * @license LGPL-3.0-or-later
  */