From 0adc94d7e0407a49b77c334e7694df9ab5f648a1 Mon Sep 17 00:00:00 2001 From: David Remer Date: Tue, 1 Sep 2020 10:24:10 +0300 Subject: [PATCH] add ppcp admin notices module --- .../ppcp-admin-notices/extensions.php | 8 +- modules.local/ppcp-admin-notices/module.php | 7 +- modules.local/ppcp-admin-notices/services.php | 23 +++--- .../ppcp-admin-notices/src/AdminNotices.php | 37 --------- .../ppcp-admin-notices/src/Entity/Message.php | 34 -------- .../src/Entity/class-message.php | 77 +++++++++++++++++++ .../src/Renderer/Renderer.php | 31 -------- .../src/Renderer/RendererInterface.php | 11 --- .../src/Renderer/class-renderer.php | 53 +++++++++++++ .../src/Renderer/class-rendererinterface.php | 23 ++++++ .../src/Repository/Repository.php | 26 ------- .../src/Repository/RepositoryInterface.php | 16 ---- .../src/Repository/class-repository.php | 37 +++++++++ .../Repository/class-repositoryinterface.php | 26 +++++++ .../src/class-adminnotices.php | 48 ++++++++++++ 15 files changed, 290 insertions(+), 167 deletions(-) delete mode 100644 modules.local/ppcp-admin-notices/src/AdminNotices.php delete mode 100644 modules.local/ppcp-admin-notices/src/Entity/Message.php create mode 100644 modules.local/ppcp-admin-notices/src/Entity/class-message.php delete mode 100644 modules.local/ppcp-admin-notices/src/Renderer/Renderer.php delete mode 100644 modules.local/ppcp-admin-notices/src/Renderer/RendererInterface.php create mode 100644 modules.local/ppcp-admin-notices/src/Renderer/class-renderer.php create mode 100644 modules.local/ppcp-admin-notices/src/Renderer/class-rendererinterface.php delete mode 100644 modules.local/ppcp-admin-notices/src/Repository/Repository.php delete mode 100644 modules.local/ppcp-admin-notices/src/Repository/RepositoryInterface.php create mode 100644 modules.local/ppcp-admin-notices/src/Repository/class-repository.php create mode 100644 modules.local/ppcp-admin-notices/src/Repository/class-repositoryinterface.php create mode 100644 modules.local/ppcp-admin-notices/src/class-adminnotices.php diff --git a/modules.local/ppcp-admin-notices/extensions.php b/modules.local/ppcp-admin-notices/extensions.php index 1f6a841dc..a834f4f2a 100644 --- a/modules.local/ppcp-admin-notices/extensions.php +++ b/modules.local/ppcp-admin-notices/extensions.php @@ -1,6 +1,10 @@ static function (ContainerInterface $container): RendererInterface { +return array( + 'admin-notices.renderer' => static function ( ContainerInterface $container ): RendererInterface { - $repository = $container->get('admin-notices.repository'); - return new Renderer($repository); - }, - 'admin-notices.repository' => static function (ContainerInterface $container): RepositoryInterface { + $repository = $container->get( 'admin-notices.repository' ); + return new Renderer( $repository ); + }, + 'admin-notices.repository' => static function ( ContainerInterface $container ): RepositoryInterface { - return new Repository(); - }, -]; + return new Repository(); + }, +); diff --git a/modules.local/ppcp-admin-notices/src/AdminNotices.php b/modules.local/ppcp-admin-notices/src/AdminNotices.php deleted file mode 100644 index 436fe118a..000000000 --- a/modules.local/ppcp-admin-notices/src/AdminNotices.php +++ /dev/null @@ -1,37 +0,0 @@ -get('admin-notices.renderer'); - $renderer->render(); - } - ); - } -} \ No newline at end of file diff --git a/modules.local/ppcp-admin-notices/src/Entity/Message.php b/modules.local/ppcp-admin-notices/src/Entity/Message.php deleted file mode 100644 index 4c8ddad8c..000000000 --- a/modules.local/ppcp-admin-notices/src/Entity/Message.php +++ /dev/null @@ -1,34 +0,0 @@ -type = $type; - $this->message = $message; - $this->dismissable = $dismissable; - } - - public function message(): string - { - return $this->message; - } - - public function type(): string - { - return $this->type; - } - - public function isDismissable(): bool - { - return $this->dismissable; - } -} diff --git a/modules.local/ppcp-admin-notices/src/Entity/class-message.php b/modules.local/ppcp-admin-notices/src/Entity/class-message.php new file mode 100644 index 000000000..3cd7c0329 --- /dev/null +++ b/modules.local/ppcp-admin-notices/src/Entity/class-message.php @@ -0,0 +1,77 @@ +type = $type; + $this->message = $message; + $this->dismissable = $dismissable; + } + + /** + * Returns the message text. + * + * @return string + */ + public function message(): string { + return $this->message; + } + + /** + * Returns the message type. + * + * @return string + */ + public function type(): string { + return $this->type; + } + + /** + * Returns whether the message is dismissable. + * + * @return bool + */ + public function is_dismissable(): bool { + return $this->dismissable; + } +} diff --git a/modules.local/ppcp-admin-notices/src/Renderer/Renderer.php b/modules.local/ppcp-admin-notices/src/Renderer/Renderer.php deleted file mode 100644 index 3aa864500..000000000 --- a/modules.local/ppcp-admin-notices/src/Renderer/Renderer.php +++ /dev/null @@ -1,31 +0,0 @@ -repository = $repository; - } - - public function render(): bool - { - $messages = $this->repository->currentMessages(); - foreach ($messages as $message) { - printf( - '

%s

', - $message->type(), - ($message->isDismissable()) ? 'is-dismissible' : '', - wp_kses_post($message->message()) - ); - } - - return (bool) count($messages); - } -} \ No newline at end of file diff --git a/modules.local/ppcp-admin-notices/src/Renderer/RendererInterface.php b/modules.local/ppcp-admin-notices/src/Renderer/RendererInterface.php deleted file mode 100644 index d43cc7d14..000000000 --- a/modules.local/ppcp-admin-notices/src/Renderer/RendererInterface.php +++ /dev/null @@ -1,11 +0,0 @@ -repository = $repository; + } + + /** + * Renders the current messages. + * + * @return bool + */ + public function render(): bool { + $messages = $this->repository->current_message(); + foreach ( $messages as $message ) { + printf( + '

%s

', + $message->type(), + ( $message->is_dismissable() ) ? 'is-dismissible' : '', + wp_kses_post( $message->message() ) + ); + } + + return (bool) count( $messages ); + } +} diff --git a/modules.local/ppcp-admin-notices/src/Renderer/class-rendererinterface.php b/modules.local/ppcp-admin-notices/src/Renderer/class-rendererinterface.php new file mode 100644 index 000000000..55ff86926 --- /dev/null +++ b/modules.local/ppcp-admin-notices/src/Renderer/class-rendererinterface.php @@ -0,0 +1,23 @@ +get( 'admin-notices.renderer' ); + $renderer->render(); + } + ); + } +}