Commit f50098ec authored by Yassine Doghri's avatar Yassine Doghri
Browse files

feat(image): add image size's width and height 

escape plugin description + replace codeigniter-icons with php-icons v1.2
parent 77e55835

app/Config/Autoload.php

+1 −1
Original line number Diff line number Diff line
@@ -109,5 +109,5 @@ class Autoload extends AutoloadConfig 
     *

     * @var list<string>

     */

    public $helpers = ['auth', 'setting', 'icons', 'plugins'];

    public $helpers = ['auth', 'setting', 'plugins'];

}

composer.json

+5 −6
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
    "php": "^8.3",

    "adaures/ipcat-php": "^v1.0.0",

    "adaures/podcast-persons-taxonomy": "^v1.0.1",

    "aws/aws-sdk-php": "^3.324.6",

    "aws/aws-sdk-php": "^3.325.2",

    "chrisjean/php-ico": "^1.0.4",

    "cocur/slugify": "^v4.6.0",

    "codeigniter4/framework": "v4.5.5",
@@ -27,18 +27,17 @@ 
    "phpseclib/phpseclib": "~2.0.47",

    "vlucas/phpdotenv": "v5.6.1",

    "whichbrowser/parser": "^v2.1.8",

    "yassinedoghri/codeigniter-icons": "^v1.0.1",

    "yassinedoghri/php-icons": "^v1.1.0",

    "yassinedoghri/php-icons": "^v1.2.0",

    "yassinedoghri/podcast-feed": "dev-main"

  },

  "require-dev": {

    "captainhook/captainhook": "^5.23.5",

    "captainhook/captainhook": "^5.23.6",

    "codeigniter/phpstan-codeigniter": "v1.4.3",

    "mikey179/vfsstream": "^v1.6.12",

    "phpstan/extension-installer": "^1.4.3",

    "phpstan/phpstan": "^1.12.7",

    "phpunit/phpunit": "^10.5.37",

    "rector/rector": "^1.2.8",

    "phpunit/phpunit": "^10.5.38",

    "rector/rector": "^1.2.9",

    "symplify/coding-standard": "^12.2.3",

    "symplify/easy-coding-standard": "^12.3.6"

  },

composer.lock

+112 −171

File changed.

Preview size limit exceeded, changes collapsed.

modules/Media/Entities/Image.php

+4 −0
Original line number Diff line number Diff line
@@ -45,10 +45,14 @@ class Image extends BaseMedia 
        foreach ($this->sizes as $name => $size) {

            $extension = array_key_exists('extension', $size) ? $size['extension'] : $this->file_extension;

            $mimetype = array_key_exists('mimetype', $size) ? $size['mimetype'] : $this->file_mimetype;

            $width = array_key_exists('width', $size) ? $size['width'] : 0;

            $height = array_key_exists('height', $size) ? $size['height'] : 0;



            $this->{$name . '_key'} = change_file_path($this->file_key, '_' . $name, $extension);

            $this->{$name . '_url'} = service('file_manager')->getUrl($this->{$name . '_key'});

            $this->{$name . '_mimetype'} = $mimetype;

            $this->{$name . '_width'} = $width;

            $this->{$name . '_height'} = $height;

        }



        return true;

modules/Plugins/Core/BasePlugin.php

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ abstract class BasePlugin implements PluginInterface 
        $description = lang($key);



        if ($description === $key) {

            return $this->manifest->description;

            return esc($this->manifest->description);

        }



        return $description;