feat(media): use new flextype helpers #199

flextype · Jul 30, 2021 · d3366cd · d3366cd
1 parent 469d2a7
commit d3366cd
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/src/flextype/Foundation/Media/MediaFiles.php b/src/flextype/Foundation/Media/MediaFiles.php
@@ -82,11 +82,11 @@ public function upload(array $file, string $folder)
             filesystem()->directory($uploadMetadataFolder)->create(0755, true);
         }
 
-        $acceptFileTypes = flextype('registry')->get('flextype.settings.media.accept_file_types');
-        $maxFileSize     = flextype('registry')->get('flextype.settings.media.max_file_size');
-        $safeNames       = flextype('registry')->get('flextype.settings.media.safe_names');
-        $maxImageWidth   = flextype('registry')->get('flextype.settings.media.images.max_image_width');
-        $maxImageHeight  = flextype('registry')->get('flextype.settings.media.images.max_image_height');
+        $acceptFileTypes = registry()->get('flextype.settings.media.accept_file_types');
+        $maxFileSize     = registry()->get('flextype.settings.media.max_file_size');
+        $safeNames       = registry()->get('flextype.settings.media.safe_names');
+        $maxImageWidth   = registry()->get('flextype.settings.media.images.max_image_width');
+        $maxImageHeight  = registry()->get('flextype.settings.media.images.max_image_height');
 
         $exact    = false;
         $chmod    = 0644;
@@ -154,25 +154,25 @@ public function upload(array $file, string $folder)
                                 $img = Image::make($filename);
 
                                 // now you are able to resize the instance
-                                if (flextype('registry')->get('flextype.settings.media.images.image_width') > 0 && flextype('registry')->get('flextype.settings.media.images.image_height') > 0) {
-                                    $img->resize(flextype('registry')->get('flextype.settings.media.images.image_width'), flextype('registry')->get('flextype.settings.media.images.image_height'), static function ($constraint): void {
+                                if (registry()->get('flextype.settings.media.images.image_width') > 0 && registry()->get('flextype.settings.media.images.image_height') > 0) {
+                                    $img->resize(registry()->get('flextype.settings.media.images.image_width'), registry()->get('flextype.settings.media.images.image_height'), static function ($constraint): void {
                                         $constraint->aspectRatio();
                                         $constraint->upsize();
                                     });
-                                } elseif (flextype('registry')->get('flextype.settings.media.images.image_width') > 0) {
-                                    $img->resize(flextype('registry')->get('flextype.settings.media.images.image_width'), null, static function ($constraint): void {
+                                } elseif (registry()->get('flextype.settings.media.images.image_width') > 0) {
+                                    $img->resize(registry()->get('flextype.settings.media.images.image_width'), null, static function ($constraint): void {
                                         $constraint->aspectRatio();
                                         $constraint->upsize();
                                     });
-                                } elseif (flextype('registry')->get('flextype.settings.media.images.image_height') > 0) {
-                                    $img->resize(null, flextype('registry')->get('flextype.settings.media.images.image_height'), static function ($constraint): void {
+                                } elseif (registry()->get('flextype.settings.media.images.image_height') > 0) {
+                                    $img->resize(null, registry()->get('flextype.settings.media.images.image_height'), static function ($constraint): void {
                                         $constraint->aspectRatio();
                                         $constraint->upsize();
                                     });
                                 }
 
                                 // finally we save the image as a new file
-                                $img->save($filename, flextype('registry')->get('flextype.settings.media.images.image_quality'));
+                                $img->save($filename, registry()->get('flextype.settings.media.images.image_quality'));
 
                                 // destroy
                                 $img->destroy();
@@ -202,7 +202,7 @@ public function upload(array $file, string $folder)
 
                             filesystem()
                                 ->file($uploadMetadataFolder . basename($filename) . '.yaml')
-                                ->put(flextype('serializers')->yaml()->encode($metadata));
+                                ->put(serializers()->yaml()->encode($metadata));
 
                             // Return new file path
                             return $filename;
@@ -228,7 +228,7 @@ public function upload(array $file, string $folder)
     public function fetch(string $id, array $options = []): Arrays
     {
         // Run event: onEntriesFetch
-        flextype('emitter')->emit('onMediaFilesFetch');
+        emitter()->emit('onMediaFilesFetch');
 
         if (
             isset($options['collection']) &&
@@ -240,15 +240,15 @@ public function fetch(string $id, array $options = []): Arrays
             foreach (filesystem()->find()->files()->depth(0)->in(flextype('media')->folders()->meta()->getDirectoryMetaLocation($id)) as $file) {
                 $basename = $file->getBasename('.' . $file->getExtension());
 
-                $result[$basename]              = flextype('serializers')->yaml()->decode(filesystem()->file($file->getPathname())->get());
+                $result[$basename]              = serializers()->yaml()->decode(filesystem()->file($file->getPathname())->get());
                 $result[$basename]['filename']  = pathinfo(str_replace('/.meta', '', flextype('media')->files()->meta()->getFileMetaLocation($basename)))['filename'];
                 $result[$basename]['basename']  = explode('.', basename(flextype('media')->files()->meta()->getFileMetaLocation($basename)))[0];
                 $result[$basename]['extension'] = ltrim(strstr($basename, '.'), '.');
                 $result[$basename]['dirname']   = pathinfo(str_replace('/.meta', '', $file->getPathname()))['dirname'];
                 $result[$basename]['url']       = 'project/media/' . $id . '/' . $basename;
 
-                if (flextype('registry')->has('flextype.settings.url') && flextype('registry')->get('flextype.settings.url') !== '') {
-                    $fullUrl = flextype('registry')->get('flextype.settings.url');
+                if (registry()->has('flextype.settings.url') && registry()->get('flextype.settings.url') !== '') {
+                    $fullUrl = registry()->get('flextype.settings.url');
                 } else {
                     $fullUrl = Uri::createFromEnvironment(new Environment($_SERVER))->getBaseUrl();
                 }
@@ -266,7 +266,7 @@ public function fetch(string $id, array $options = []): Arrays
         $result = [];
 
         if (filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($id))->exists()) {
-            $result = flextype('serializers')->yaml()->decode(filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($id))->get());
+            $result = serializers()->yaml()->decode(filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($id))->get());
 
             $result['filename']  = pathinfo(str_replace('/.meta', '', flextype('media')->files()->meta()->getFileMetaLocation($id)))['filename'];
             $result['basename']  = explode('.', basename(flextype('media')->files()->meta()->getFileMetaLocation($id)))[0];
@@ -276,8 +276,8 @@ public function fetch(string $id, array $options = []): Arrays
             $result['url']  = 'project/media/' . $id;
             $result['path'] = $id;
 
-            if (flextype('registry')->has('flextype.settings.url') && flextype('registry')->get('flextype.settings.url') !== '') {
-                $fullUrl = flextype('registry')->get('flextype.settings.url');
+            if (registry()->has('flextype.settings.url') && registry()->get('flextype.settings.url') !== '') {
+                $fullUrl = registry()->get('flextype.settings.url');
             } else {
                 $fullUrl = Uri::createFromEnvironment(new Environment($_SERVER))->getBaseUrl();
             }

diff --git a/src/flextype/Foundation/Media/MediaFilesMeta.php b/src/flextype/Foundation/Media/MediaFilesMeta.php
@@ -32,12 +32,12 @@ class MediaFilesMeta
      */
     public function update(string $id, string $field, string $value): bool
     {
-        $fileData = flextype('serializers')->yaml()->decode(filesystem()->file($this->getFileMetaLocation($id))->get());
+        $fileData = serializers()->yaml()->decode(filesystem()->file($this->getFileMetaLocation($id))->get());
 
         if (arrays($fileData)->has($field)) {
             $fileData = arrays($fileData)->set($field, $value);
 
-            return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(flextype('serializers')->yaml()->encode($fileData->toArray()));
+            return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(serializers()->yaml()->encode($fileData->toArray()));
         }
 
         return false;
@@ -56,12 +56,12 @@ public function update(string $id, string $field, string $value): bool
      */
     public function add(string $id, string $field, string $value): bool
     {
-        $fileData = flextype('serializers')->yaml()->decode(filesystem()->file($this->getFileMetaLocation($id))->get());
+        $fileData = serializers()->yaml()->decode(filesystem()->file($this->getFileMetaLocation($id))->get());
 
         if (! arrays($fileData)->has($field)) {
             $fileData = arrays($fileData)->set($field, $value);
 
-            return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(flextype('serializers')->yaml()->encode($fileData->toArray()));
+            return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(serializers()->yaml()->encode($fileData->toArray()));
         }
 
         return false;
@@ -79,12 +79,12 @@ public function add(string $id, string $field, string $value): bool
      */
     public function delete(string $id, string $field): bool
     {
-        $fileData = flextype('serializers')->yaml()->decode(filesystem()->file($this->getFileMetaLocation($id))->get());
+        $fileData = serializers()->yaml()->decode(filesystem()->file($this->getFileMetaLocation($id))->get());
 
         if (arrays($fileData)->has($field)) {
             $fileData = arrays($fileData)->delete($field);
 
-            return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(flextype('serializers')->yaml()->encode($fileData->toArray()));
+            return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(serializers()->yaml()->encode($fileData->toArray()));
         }
 
         return false;

diff --git a/src/flextype/Foundation/Media/MediaFolders.php b/src/flextype/Foundation/Media/MediaFolders.php
@@ -46,7 +46,7 @@ public function meta(): MediaFoldersMeta
     public function fetch(string $id, array $options = []): Arrays
     {
         // Run event: onEntriesFetch
-        flextype('emitter')->emit('onMediaFoldersFetch');
+        emitter()->emit('onMediaFoldersFetch');
 
         // Single fetch helper
         $single = static function ($id, $options) {
@@ -62,8 +62,8 @@ public function fetch(string $id, array $options = []): Arrays
                 $result['full_path'] = str_replace('/.meta', '', flextype('media')->folders()->meta()->getDirectoryMetaLocation($id));
                 $result['url']       = 'project/media/' . $id;
 
-                if (flextype('registry')->has('flextype.settings.url') && flextype('registry')->get('flextype.settings.url') !== '') {
-                    $fullUrl = flextype('registry')->get('flextype.settings.url');
+                if (registry()->has('flextype.settings.url') && registry()->get('flextype.settings.url') !== '') {
+                    $fullUrl = registry()->get('flextype.settings.url');
                 } else {
                     $fullUrl = Uri::createFromEnvironment(new Environment($_SERVER))->getBaseUrl();
                 }