Merge pull request #116 from getherbie/2.x-develop

2.x develop
getherbie · Dec 28, 2022 · 61545d3 · 61545d3
2 parents f75df2b + ddba464
commit 61545d3
Show file tree

Hide file tree

Showing 125 changed files with 2,175 additions and 2,142 deletions.
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
     "autoload": {
         "psr-4": {
             "herbie\\": "system",
-            "herbie\\sysplugin\\": "plugins"
+            "herbie\\sysplugins\\": "plugins"
         },
         "files": [
             "system/functions.php"
@@ -47,7 +47,7 @@
     "autoload-dev": {
         "psr-4": {
             "website\\site\\": "website/site",
-            "tests\\": "tests"
+            "herbie\\tests\\": "tests"
         }
     },
     "require-dev": {

diff --git a/plugins/dummy/DummyCommand.php b/plugins/dummy/DummyCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace herbie\sysplugin\dummy;
+namespace herbie\sysplugins\dummy;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -16,8 +16,7 @@ final class DummyCommand extends Command
     protected function configure(): void
     {
         $this
-            ->setHelp('This command allows you to create a user...')
-        ;
+            ->setHelp('This command allows you to create a user...');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int

diff --git a/plugins/dummy/DummySysPlugin.php b/plugins/dummy/DummySysPlugin.php
@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace herbie\sysplugin\dummy;
-
-use herbie\event\ContentRenderedEvent;
-use herbie\event\LayoutRenderedEvent;
-use herbie\event\PluginsInitializedEvent;
-use herbie\event\RenderLayoutEvent;
-use herbie\event\RenderSegmentEvent;
-use herbie\event\ResponseEmittedEvent;
-use herbie\event\ResponseGeneratedEvent;
-use herbie\event\TranslatorInitializedEvent;
-use herbie\event\TwigInitializedEvent;
+namespace herbie\sysplugins\dummy;
+
+use herbie\events\ContentRenderedEvent;
+use herbie\events\LayoutRenderedEvent;
+use herbie\events\PluginsInitializedEvent;
+use herbie\events\RenderLayoutEvent;
+use herbie\events\RenderSegmentEvent;
+use herbie\events\ResponseEmittedEvent;
+use herbie\events\ResponseGeneratedEvent;
+use herbie\events\TranslatorInitializedEvent;
+use herbie\events\TwigInitializedEvent;
 use herbie\PluginInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -109,11 +109,6 @@ public function twigTests(): array
         ];
     }
 
-    private function wrapHtmlBlock(string $class, string $content): string
-    {
-        return "<div class='$class' style='display:none'>" . $content . "</div>";
-    }
-
     public function onRenderLayout(RenderLayoutEvent $event): void
     {
         $this->logger->debug(__METHOD__);
@@ -125,6 +120,11 @@ public function onRenderLayout(RenderLayoutEvent $event): void
         $event->setContent($content);
     }
 
+    private function wrapHtmlBlock(string $class, string $content): string
+    {
+        return "<div class='$class' style='display:none'>" . $content . "</div>";
+    }
+
     public function onRenderSegment(RenderSegmentEvent $event): void
     {
         $this->logger->debug(__METHOD__);
@@ -171,9 +171,11 @@ public function onTwigInitialized(TwigInitializedEvent $event): void
     public function onTwigInitializedAddFilter(TwigInitializedEvent $event): void
     {
         $this->logger->debug(__METHOD__);
-        $event->getEnvironment()->addFilter(new TwigFilter('dummy_dynamic', function (string $content): string {
-            return $content . 'Dummy Filter Dynamic';
-        }));
+        $event->getEnvironment()->addFilter(
+            new TwigFilter('dummy_dynamic', function (string $content): string {
+                return $content . 'Dummy Filter Dynamic';
+            })
+        );
     }
 
     public function appMiddleware(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface

diff --git a/plugins/dummy/config.php b/plugins/dummy/config.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use herbie\sysplugin\dummy\DummySysPlugin;
+use herbie\sysplugins\dummy\DummySysPlugin;
 
 return [
     'apiVersion' => 2,

diff --git a/plugins/imagine/ImagineSysPlugin.php b/plugins/imagine/ImagineSysPlugin.php
@@ -2,18 +2,19 @@
 
 declare(strict_types=1);
 
-namespace herbie\sysplugin\imagine;
+namespace herbie\sysplugins\imagine;
 
 use herbie\Alias;
 use herbie\Config;
 use herbie\Plugin;
+use Imagine\Filter\Advanced\RelativeResize;
+use Imagine\Filter\Basic\Resize;
 use Imagine\Gd\Imagine;
-use Imagine\Image\ImageInterface;
 use Imagine\Image\Box;
 use Imagine\Image\Color;
+use Imagine\Image\ImageInterface;
 use Imagine\Image\Point;
-use Imagine\Filter\Advanced\RelativeResize;
-use Imagine\Filter\Basic\Resize;
+use InvalidArgumentException;
 use Twig\Markup;
 
 use function herbie\str_trailing_slash;
@@ -92,27 +93,16 @@ private function getTransparentOnePixelSrc(): string
     {
         // see http://png-pixel.com
         return 'data:image/png;'
-        . 'base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
+            . 'base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
     }
 
-    /**
-     * Gets the browser path for the image and filter to apply.
-     */
-    public function imagineFilter(string $path, string $collection = 'default'): Markup
+    protected function buildHtmlAttributes(array $htmlOptions = []): string
     {
-        $absolutePath = $this->alias->get('@media/' . $path);
-
-        if (!is_file($absolutePath)) {
-            $dataSrc = $this->getTransparentOnePixelSrc();
-            return new Markup($dataSrc, 'utf8');
+        $attributes = '';
+        foreach ($htmlOptions as $key => $value) {
+            $attributes .= ' ' . $key . '="' . $value . '"';
         }
-
-        $sanitizedFilterSet = $this->sanitizeFilterName($collection);
-
-        return new Markup(
-            $this->basePath . $this->applyFilterSet($path, $sanitizedFilterSet),
-            'utf8'
-        );
+        return rtrim($attributes);
     }
 
     private function sanitizeFilterName(string $filterSet): string
@@ -125,18 +115,6 @@ private function sanitizeFilterName(string $filterSet): string
         return $filterSet;
     }
 
-    private function getImageSize(string $cachePath): array
-    {
-        if (!is_file($cachePath)) {
-            return [];
-        }
-        $size = getimagesize($cachePath);
-        if ($size === false) {
-            return [0, 0];
-        }
-        return [$size[0], $size[1]];
-    }
-
     protected function applyFilterSet(string $relpath, string $filterSet): string
     {
         $path = $this->alias->get('@media/' . $relpath);
@@ -202,6 +180,38 @@ protected function resolveCachePath(string $path, string $filter): string
         );
     }
 
+    private function getImageSize(string $cachePath): array
+    {
+        if (!is_file($cachePath)) {
+            return [];
+        }
+        $size = getimagesize($cachePath);
+        if ($size === false) {
+            return [0, 0];
+        }
+        return [$size[0], $size[1]];
+    }
+
+    /**
+     * Gets the browser path for the image and filter to apply.
+     */
+    public function imagineFilter(string $path, string $collection = 'default'): Markup
+    {
+        $absolutePath = $this->alias->get('@media/' . $path);
+
+        if (!is_file($absolutePath)) {
+            $dataSrc = $this->getTransparentOnePixelSrc();
+            return new Markup($dataSrc, 'utf8');
+        }
+
+        $sanitizedFilterSet = $this->sanitizeFilterName($collection);
+
+        return new Markup(
+            $this->basePath . $this->applyFilterSet($path, $sanitizedFilterSet),
+            'utf8'
+        );
+    }
+
     protected function applyResizeFilter(ImageInterface $image, array $options): ImageInterface
     {
         // Defaults
@@ -302,7 +312,7 @@ protected function applyColorizeFilter(ImageInterface $image, array $options): I
     protected function applyRotateFilter(ImageInterface $image, array $options): ImageInterface
     {
         if (isset($options['angle'])) {
-            $angle = (int) $options['angle'];
+            $angle = (int)$options['angle'];
             $image->rotate($angle);
         }
         return $image;
@@ -326,7 +336,7 @@ protected function applyFlipVerticallyFilter(ImageInterface $image): ImageInterf
     protected function applyUpscaleFilter(ImageInterface $image, array $options): ImageInterface
     {
         if (!isset($options['min'])) {
-            throw new \InvalidArgumentException('Missing min option.');
+            throw new InvalidArgumentException('Missing min option.');
         }
 
         [$width, $height] = $options['min'];
@@ -356,13 +366,4 @@ protected function applyRelativeResizeFilter(ImageInterface $image, array $optio
         $filter = new RelativeResize($method, $parameter);
         return $filter->apply($image);
     }
-
-    protected function buildHtmlAttributes(array $htmlOptions = []): string
-    {
-        $attributes = '';
-        foreach ($htmlOptions as $key => $value) {
-            $attributes .= ' ' . $key . '="' . $value . '"';
-        }
-        return rtrim($attributes);
-    }
 }
diff --git a/plugins/imagine/config.php b/plugins/imagine/config.php
@@ -1,6 +1,6 @@
 <?php
 
-use herbie\sysplugin\imagine\ImagineSysPlugin;
+use herbie\sysplugins\imagine\ImagineSysPlugin;
 
 return [
     'apiVersion' => 2,

diff --git a/plugins/markdown/MarkdownSysPlugin.php b/plugins/markdown/MarkdownSysPlugin.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace herbie\sysplugin\markdown;
+namespace herbie\sysplugins\markdown;
 
 use herbie\Config;
-use herbie\event\RenderSegmentEvent;
+use herbie\events\RenderSegmentEvent;
 use herbie\Plugin;
 use Parsedown;
 use ParsedownExtra;

diff --git a/plugins/markdown/config.php b/plugins/markdown/config.php
@@ -1,6 +1,6 @@
 <?php
 
-use herbie\sysplugin\markdown\MarkdownSysPlugin;
+use herbie\sysplugins\markdown\MarkdownSysPlugin;
 
 return [
     'apiVersion' => 2,

diff --git a/plugins/rest/RestSysPlugin.php b/plugins/rest/RestSysPlugin.php
@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace herbie\sysplugin\rest;
+namespace herbie\sysplugins\rest;
 
+use Doctrine\RST\Parser;
 use herbie\Config;
-use herbie\event\RenderSegmentEvent;
+use herbie\events\RenderSegmentEvent;
 use herbie\Plugin;
 
 final class RestSysPlugin extends Plugin
@@ -61,7 +62,7 @@ public function parseRest(string $string): string
         if (!$this->parserClassExists) {
             return $string;
         }
-        $parser = new \Doctrine\RST\Parser();
+        $parser = new Parser();
         $document = $parser->parse($string);
         return $document->render();
     }

diff --git a/plugins/rest/config.php b/plugins/rest/config.php
@@ -1,6 +1,6 @@
 <?php
 
-use herbie\sysplugin\rest\RestSysPlugin;
+use herbie\sysplugins\rest\RestSysPlugin;
 
 return [
     'apiVersion' => 2,

diff --git a/plugins/textile/TextileSysPlugin.php b/plugins/textile/TextileSysPlugin.php
@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace herbie\sysplugin\textile;
+namespace herbie\sysplugins\textile;
 
 use herbie\Config;
-use herbie\event\RenderSegmentEvent;
+use herbie\events\RenderSegmentEvent;
 use herbie\Plugin;
 use Netcarver\Textile\Parser;
 use Psr\Log\LoggerInterface;
+use Throwable;
 
 final class TextileSysPlugin extends Plugin
 {
@@ -67,7 +68,7 @@ public function parseTextile(string $value): string
         try {
             $parser = new Parser();
             return $parser->parse($value);
-        } catch (\Throwable $t) {
+        } catch (Throwable $t) {
             return $value;
         }
     }

diff --git a/plugins/textile/config.php b/plugins/textile/config.php
@@ -1,6 +1,6 @@
 <?php
 
-use herbie\sysplugin\textile\TextileSysPlugin;
+use herbie\sysplugins\textile\TextileSysPlugin;
 
 return [
     'apiVersion' => 2,