feat: extract unix persmission in a trait

Author: maxhelias

src/Adapter/Builder/AbstractAdapterDefinitionBuilder.php

@@ -11,8 +11,6 @@
 
 namespace League\FlysystemBundle\Adapter\Builder;
 
-use League\Flysystem\UnixVisibility\PortableVisibilityConverter;
-use League\FlysystemBundle\Exception\MissingPackageException;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -42,62 +40,4 @@ abstract protected function getRequiredPackages(): array;
     abstract protected function configureOptions(OptionsResolver $resolver);
 
     abstract protected function configureDefinition(Definition $definition, array $options, ?string $defaultVisibilityForDirectories);
-
-    protected function configureUnixOptions(OptionsResolver $resolver): void
-    {
-        $method = method_exists($resolver, 'setOptions') ? 'setOptions' : 'setDefault';
-
-        $resolver->$method('permissions', function (OptionsResolver $subResolver) use ($method) {
-            $subResolver->$method('file', function (OptionsResolver $permsResolver) {
-                $permsResolver->setDefault('public', 0644);
-                $permsResolver->setAllowedTypes('public', 'scalar');
-
-                $permsResolver->setDefault('private', 0600);
-                $permsResolver->setAllowedTypes('private', 'scalar');
-            });
-
-            $subResolver->$method('dir', function (OptionsResolver $permsResolver) {
-                $permsResolver->setDefault('public', 0755);
-                $permsResolver->setAllowedTypes('public', 'scalar');
-
-                $permsResolver->setDefault('private', 0700);
-                $permsResolver->setAllowedTypes('private', 'scalar');
-            });
-        });
-    }
-
-    protected function createUnixDefinition(array $permissions, string $defaultVisibilityForDirectories): Definition
-    {
-        return (new Definition(PortableVisibilityConverter::class))
-            ->setFactory([PortableVisibilityConverter::class, 'fromArray'])
-            ->addArgument([
-                'file' => [
-                    'public' => (int) $permissions['file']['public'],
-                    'private' => (int) $permissions['file']['private'],
-                ],
-                'dir' => [
-                    'public' => (int) $permissions['dir']['public'],
-                    'private' => (int) $permissions['dir']['private'],
-                ],
-            ])
-            ->addArgument($defaultVisibilityForDirectories)
-            ->setShared(false)
-        ;
-    }
-
-    private function ensureRequiredPackagesAvailable(): void
-    {
-        $missingPackages = [];
-        foreach ($this->getRequiredPackages() as $requiredClass => $packageName) {
-            if (!class_exists($requiredClass)) {
-                $missingPackages[] = $packageName;
-            }
-        }
-
-        if (!$missingPackages) {
-            return;
-        }
-
-        throw new MissingPackageException(sprintf("Missing package%s, to use the \"%s\" adapter, run:\n\ncomposer require %s", \count($missingPackages) > 1 ? 's' : '', $this->getName(), implode(' ', $missingPackages)));
-    }
 }

src/Adapter/Builder/FtpAdapterDefinitionBuilder.php

@@ -25,6 +25,8 @@
  */
 final class FtpAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
+    use UnixPermissionTrait;
+
     public function getName(): string
     {
         return 'ftp';

src/Adapter/Builder/LocalAdapterDefinitionBuilder.php

@@ -23,6 +23,8 @@
  */
 final class LocalAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
+    use UnixPermissionTrait;
+
     public function getName(): string
     {
         return 'local';

src/Adapter/Builder/SftpAdapterDefinitionBuilder.php

@@ -27,6 +27,8 @@
  */
 final class SftpAdapterDefinitionBuilder extends AbstractAdapterDefinitionBuilder
 {
+    use UnixPermissionTrait;
+
     public function getName(): string
     {
         return 'sftp';

src/Adapter/Builder/UnixPermissionTrait.php

@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the flysystem-bundle project.
+ *
+ * (c) Titouan Galopin <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace League\FlysystemBundle\Adapter\Builder;
+
+use League\Flysystem\UnixVisibility\PortableVisibilityConverter;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * @author Maxime Hélias <[email protected]>
+ */
+trait UnixPermissionTrait
+{
+    protected function configureUnixOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefault('permissions', function (OptionsResolver $subResolver) {
+            $subResolver->setDefault('file', function (OptionsResolver $permsResolver) {
+                $permsResolver->setDefault('public', 0644);
+                $permsResolver->setAllowedTypes('public', 'scalar');
+
+                $permsResolver->setDefault('private', 0600);
+                $permsResolver->setAllowedTypes('private', 'scalar');
+            });
+
+            $subResolver->setDefault('dir', function (OptionsResolver $permsResolver) {
+                $permsResolver->setDefault('public', 0755);
+                $permsResolver->setAllowedTypes('public', 'scalar');
+
+                $permsResolver->setDefault('private', 0700);
+                $permsResolver->setAllowedTypes('private', 'scalar');
+            });
+        });
+    }
+
+    protected function createUnixDefinition(array $permissions, string $defaultVisibilityForDirectories): Definition
+    {
+        return (new Definition(PortableVisibilityConverter::class))
+            ->setFactory([PortableVisibilityConverter::class, 'fromArray'])
+            ->addArgument([
+                'file' => [
+                    'public' => (int) $permissions['file']['public'],
+                    'private' => (int) $permissions['file']['private'],
+                ],
+                'dir' => [
+                    'public' => (int) $permissions['dir']['public'],
+                    'private' => (int) $permissions['dir']['private'],
+                ],
+            ])
+            ->addArgument($defaultVisibilityForDirectories)
+            ->setShared(false)
+        ;
+    }
+}