@@ -24,107 +24,107 @@ |
||
| 24 | 24 | |
| 25 | 25 | class DialogPlugin implements PluginInterface, ResponsePluginInterface, ModalInterface, AlertInterface |
| 26 | 26 | { |
| 27 | - use ResponsePluginTrait; |
|
| 27 | +use ResponsePluginTrait; |
|
| 28 | 28 | |
| 29 | - /** |
|
| 29 | +/** |
|
| 30 | 30 | * @const The plugin name |
| 31 | 31 | */ |
| 32 | - public const NAME = 'dialog'; |
|
| 32 | +public const NAME = 'dialog'; |
|
| 33 | 33 | |
| 34 | - /** |
|
| 34 | +/** |
|
| 35 | 35 | * The constructor |
| 36 | 36 | * |
| 37 | 37 | * @param DialogCommand $xDialogCommand |
| 38 | 38 | */ |
| 39 | - public function __construct(private DialogCommand $xDialogCommand) |
|
| 40 | - {} |
|
| 39 | +public function __construct(private DialogCommand $xDialogCommand) |
|
| 40 | +{} |
|
| 41 | 41 | |
| 42 | - /** |
|
| 42 | +/** |
|
| 43 | 43 | * @inheritDoc |
| 44 | 44 | */ |
| 45 | - public function getName(): string |
|
| 46 | - { |
|
| 47 | - return self::NAME; |
|
| 48 | - } |
|
| 45 | +public function getName(): string |
|
| 46 | +{ |
|
| 47 | +return self::NAME; |
|
| 48 | +} |
|
| 49 | 49 | |
| 50 | - /** |
|
| 50 | +/** |
|
| 51 | 51 | * Initialize the plugin |
| 52 | 52 | * |
| 53 | 53 | * @return void |
| 54 | 54 | */ |
| 55 | - protected function init(): void |
|
| 56 | - {} |
|
| 55 | +protected function init(): void |
|
| 56 | +{} |
|
| 57 | 57 | |
| 58 | - /** |
|
| 58 | +/** |
|
| 59 | 59 | * Set the library to use for the next call. |
| 60 | 60 | * |
| 61 | 61 | * @param string $sLibrary The name of the library |
| 62 | 62 | * |
| 63 | 63 | * @return DialogPlugin |
| 64 | 64 | */ |
| 65 | - public function with(string $sLibrary): DialogPlugin |
|
| 66 | - { |
|
| 67 | - $this->xDialogCommand->library($sLibrary); |
|
| 68 | - return $this; |
|
| 69 | - } |
|
| 65 | +public function with(string $sLibrary): DialogPlugin |
|
| 66 | +{ |
|
| 67 | +$this->xDialogCommand->library($sLibrary); |
|
| 68 | +return $this; |
|
| 69 | +} |
|
| 70 | 70 | |
| 71 | - /** |
|
| 71 | +/** |
|
| 72 | 72 | * @inheritDoc |
| 73 | 73 | */ |
| 74 | - public function show(string $sTitle, string $sContent, array $aButtons = [], array $aOptions = []): void |
|
| 75 | - { |
|
| 76 | - // Show the modal dialog |
|
| 77 | - $this->addCommand('dialog.modal.show', |
|
| 78 | - $this->xDialogCommand->show($sTitle, $sContent, $aButtons, $aOptions)); |
|
| 79 | - } |
|
| 80 | - |
|
| 81 | - /** |
|
| 74 | +public function show(string $sTitle, string $sContent, array $aButtons = [], array $aOptions = []): void |
|
| 75 | +{ |
|
| 76 | +// Show the modal dialog |
|
| 77 | +$this->addCommand('dialog.modal.show', |
|
| 78 | +$this->xDialogCommand->show($sTitle, $sContent, $aButtons, $aOptions)); |
|
| 79 | +} |
|
| 80 | + |
|
| 81 | +/** |
|
| 82 | 82 | * @inheritDoc |
| 83 | 83 | */ |
| 84 | - public function hide(): void |
|
| 85 | - { |
|
| 86 | - // Hide the modal dialog |
|
| 87 | - $this->addCommand('dialog.modal.hide', $this->xDialogCommand->hide()); |
|
| 88 | - } |
|
| 84 | +public function hide(): void |
|
| 85 | +{ |
|
| 86 | +// Hide the modal dialog |
|
| 87 | +$this->addCommand('dialog.modal.hide', $this->xDialogCommand->hide()); |
|
| 88 | +} |
|
| 89 | 89 | |
| 90 | - /** |
|
| 90 | +/** |
|
| 91 | 91 | * @inheritDoc |
| 92 | 92 | */ |
| 93 | - public function title(string $sTitle): AlertInterface |
|
| 94 | - { |
|
| 95 | - $this->xDialogCommand->title($sTitle); |
|
| 96 | - return $this; |
|
| 97 | - } |
|
| 93 | +public function title(string $sTitle): AlertInterface |
|
| 94 | +{ |
|
| 95 | +$this->xDialogCommand->title($sTitle); |
|
| 96 | +return $this; |
|
| 97 | +} |
|
| 98 | 98 | |
| 99 | - /** |
|
| 99 | +/** |
|
| 100 | 100 | * @inheritDoc |
| 101 | 101 | */ |
| 102 | - public function success(string $sMessage, ...$aArgs): void |
|
| 103 | - { |
|
| 104 | - $this->addCommand('dialog.alert.show', $this->xDialogCommand->success($sMessage, $aArgs)); |
|
| 105 | - } |
|
| 102 | +public function success(string $sMessage, ...$aArgs): void |
|
| 103 | +{ |
|
| 104 | +$this->addCommand('dialog.alert.show', $this->xDialogCommand->success($sMessage, $aArgs)); |
|
| 105 | +} |
|
| 106 | 106 | |
| 107 | - /** |
|
| 107 | +/** |
|
| 108 | 108 | * @inheritDoc |
| 109 | 109 | */ |
| 110 | - public function info(string $sMessage, ...$aArgs): void |
|
| 111 | - { |
|
| 112 | - $this->addCommand('dialog.alert.show', $this->xDialogCommand->info($sMessage, $aArgs)); |
|
| 113 | - } |
|
| 110 | +public function info(string $sMessage, ...$aArgs): void |
|
| 111 | +{ |
|
| 112 | +$this->addCommand('dialog.alert.show', $this->xDialogCommand->info($sMessage, $aArgs)); |
|
| 113 | +} |
|
| 114 | 114 | |
| 115 | - /** |
|
| 115 | +/** |
|
| 116 | 116 | * @inheritDoc |
| 117 | 117 | */ |
| 118 | - public function warning(string $sMessage, ...$aArgs): void |
|
| 119 | - { |
|
| 120 | - $this->addCommand('dialog.alert.show', $this->xDialogCommand->warning($sMessage, $aArgs)); |
|
| 121 | - } |
|
| 118 | +public function warning(string $sMessage, ...$aArgs): void |
|
| 119 | +{ |
|
| 120 | +$this->addCommand('dialog.alert.show', $this->xDialogCommand->warning($sMessage, $aArgs)); |
|
| 121 | +} |
|
| 122 | 122 | |
| 123 | - /** |
|
| 123 | +/** |
|
| 124 | 124 | * @inheritDoc |
| 125 | 125 | */ |
| 126 | - public function error(string $sMessage, ...$aArgs): void |
|
| 127 | - { |
|
| 128 | - $this->addCommand('dialog.alert.show', $this->xDialogCommand->error($sMessage, $aArgs)); |
|
| 129 | - } |
|
| 126 | +public function error(string $sMessage, ...$aArgs): void |
|
| 127 | +{ |
|
| 128 | +$this->addCommand('dialog.alert.show', $this->xDialogCommand->error($sMessage, $aArgs)); |
|
| 129 | +} |
|
| 130 | 130 | } |
@@ -23,56 +23,56 @@ |
||
| 23 | 23 | |
| 24 | 24 | class PsrPlugin extends AbstractResponsePlugin |
| 25 | 25 | { |
| 26 | - /** |
|
| 26 | +/** |
|
| 27 | 27 | * @const The plugin name |
| 28 | 28 | */ |
| 29 | - public const NAME = 'psr'; |
|
| 29 | +public const NAME = 'psr'; |
|
| 30 | 30 | |
| 31 | - /** |
|
| 31 | +/** |
|
| 32 | 32 | * The class constructor |
| 33 | 33 | * |
| 34 | 34 | * @param Psr17Factory $xPsr17Factory |
| 35 | 35 | * @param RequestInterface $xRequest |
| 36 | 36 | */ |
| 37 | - public function __construct(private Psr17Factory $xPsr17Factory, |
|
| 38 | - private RequestInterface $xRequest) |
|
| 39 | - {} |
|
| 37 | +public function __construct(private Psr17Factory $xPsr17Factory, |
|
| 38 | +private RequestInterface $xRequest) |
|
| 39 | +{} |
|
| 40 | 40 | |
| 41 | - /** |
|
| 41 | +/** |
|
| 42 | 42 | * @inheritDoc |
| 43 | 43 | */ |
| 44 | - public function getName(): string |
|
| 45 | - { |
|
| 46 | - return self::NAME; |
|
| 47 | - } |
|
| 44 | +public function getName(): string |
|
| 45 | +{ |
|
| 46 | +return self::NAME; |
|
| 47 | +} |
|
| 48 | 48 | |
| 49 | - /** |
|
| 49 | +/** |
|
| 50 | 50 | * @inheritDoc |
| 51 | 51 | */ |
| 52 | - public function getHash(): string |
|
| 53 | - { |
|
| 54 | - // Use the version number as hash |
|
| 55 | - return '5.0.0'; |
|
| 56 | - } |
|
| 52 | +public function getHash(): string |
|
| 53 | +{ |
|
| 54 | +// Use the version number as hash |
|
| 55 | +return '5.0.0'; |
|
| 56 | +} |
|
| 57 | 57 | |
| 58 | - /** |
|
| 58 | +/** |
|
| 59 | 59 | * Convert an ajax response to a PSR7 response object |
| 60 | 60 | * |
| 61 | 61 | * @return ResponseInterface |
| 62 | 62 | */ |
| 63 | - public function ajaxResponse(): ResponseInterface |
|
| 64 | - { |
|
| 65 | - $xPsrResponse = $this->xPsr17Factory->createResponse(200); |
|
| 66 | - if($this->xRequest->getMethod() === 'GET') |
|
| 67 | - { |
|
| 68 | - $xPsrResponse = $xPsrResponse |
|
| 69 | - ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT') |
|
| 70 | - ->withHeader('Last-Modified', gmdate("D, d M Y H:i:s") . ' GMT') |
|
| 71 | - ->withHeader('Cache-Control', 'no-cache, must-revalidate') |
|
| 72 | - ->withHeader('Pragma', 'no-cache'); |
|
| 73 | - } |
|
| 74 | - return $xPsrResponse |
|
| 75 | - ->withHeader('content-type', $this->response()->getContentType()) |
|
| 76 | - ->withBody(Stream::create($this->response()->getOutput())); |
|
| 77 | - } |
|
| 63 | +public function ajaxResponse(): ResponseInterface |
|
| 64 | +{ |
|
| 65 | +$xPsrResponse = $this->xPsr17Factory->createResponse(200); |
|
| 66 | +if($this->xRequest->getMethod() === 'GET') |
|
| 67 | +{ |
|
| 68 | +$xPsrResponse = $xPsrResponse |
|
| 69 | + ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT') |
|
| 70 | + ->withHeader('Last-Modified', gmdate("D, d M Y H:i:s") . ' GMT') |
|
| 71 | + ->withHeader('Cache-Control', 'no-cache, must-revalidate') |
|
| 72 | + ->withHeader('Pragma', 'no-cache'); |
|
| 73 | +} |
|
| 74 | +return $xPsrResponse |
|
| 75 | +->withHeader('content-type', $this->response()->getContentType()) |
|
| 76 | +->withBody(Stream::create($this->response()->getOutput())); |
|
| 77 | +} |
|
| 78 | 78 | } |
@@ -18,43 +18,43 @@ |
||
| 18 | 18 | |
| 19 | 19 | abstract class AbstractCodeGenerator implements CodeGeneratorInterface |
| 20 | 20 | { |
| 21 | - /** |
|
| 21 | +/** |
|
| 22 | 22 | * @inheritDoc |
| 23 | 23 | */ |
| 24 | - public function getHash(): string |
|
| 25 | - { |
|
| 26 | - return ''; |
|
| 27 | - } |
|
| 24 | +public function getHash(): string |
|
| 25 | +{ |
|
| 26 | +return ''; |
|
| 27 | +} |
|
| 28 | 28 | |
| 29 | - /** |
|
| 29 | +/** |
|
| 30 | 30 | * @inheritDoc |
| 31 | 31 | */ |
| 32 | - public function getCss(): string |
|
| 33 | - { |
|
| 34 | - return ''; |
|
| 35 | - } |
|
| 32 | +public function getCss(): string |
|
| 33 | +{ |
|
| 34 | +return ''; |
|
| 35 | +} |
|
| 36 | 36 | |
| 37 | - /** |
|
| 37 | +/** |
|
| 38 | 38 | * @inheritDoc |
| 39 | 39 | */ |
| 40 | - public function getJs(): string |
|
| 41 | - { |
|
| 42 | - return ''; |
|
| 43 | - } |
|
| 40 | +public function getJs(): string |
|
| 41 | +{ |
|
| 42 | +return ''; |
|
| 43 | +} |
|
| 44 | 44 | |
| 45 | - /** |
|
| 45 | +/** |
|
| 46 | 46 | * @inheritDoc |
| 47 | 47 | */ |
| 48 | - public function getScript(): string |
|
| 49 | - { |
|
| 50 | - return ''; |
|
| 51 | - } |
|
| 48 | +public function getScript(): string |
|
| 49 | +{ |
|
| 50 | +return ''; |
|
| 51 | +} |
|
| 52 | 52 | |
| 53 | - /** |
|
| 53 | +/** |
|
| 54 | 54 | * @inheritDoc |
| 55 | 55 | */ |
| 56 | - public function getJsCode(): ?JsCode |
|
| 57 | - { |
|
| 58 | - return null; |
|
| 59 | - } |
|
| 56 | +public function getJsCode(): ?JsCode |
|
| 57 | +{ |
|
| 58 | +return null; |
|
| 59 | +} |
|
| 60 | 60 | } |
@@ -31,48 +31,48 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | trait ResponsePluginTrait |
| 33 | 33 | { |
| 34 | - /** |
|
| 34 | +/** |
|
| 35 | 35 | * The object used to build the response that will be sent to the client browser |
| 36 | 36 | * |
| 37 | 37 | * @var AbstractResponse |
| 38 | 38 | */ |
| 39 | - private $xResponse = null; |
|
| 39 | +private $xResponse = null; |
|
| 40 | 40 | |
| 41 | - /** |
|
| 41 | +/** |
|
| 42 | 42 | * Get a unique name to identify the plugin. |
| 43 | 43 | * |
| 44 | 44 | * @return string |
| 45 | 45 | */ |
| 46 | - abstract public function getName(): string; |
|
| 46 | +abstract public function getName(): string; |
|
| 47 | 47 | |
| 48 | - /** |
|
| 48 | +/** |
|
| 49 | 49 | * Initialize the plugin |
| 50 | 50 | * |
| 51 | 51 | * @return void |
| 52 | 52 | */ |
| 53 | - abstract protected function init(); |
|
| 53 | +abstract protected function init(); |
|
| 54 | 54 | |
| 55 | - /** |
|
| 55 | +/** |
|
| 56 | 56 | * @param AbstractResponse $xResponse The response |
| 57 | 57 | * |
| 58 | 58 | * @return static |
| 59 | 59 | */ |
| 60 | - public function initPlugin(AbstractResponse $xResponse): static |
|
| 61 | - { |
|
| 62 | - $this->xResponse = $xResponse; |
|
| 63 | - $this->init(); |
|
| 64 | - return $this; |
|
| 65 | - } |
|
| 60 | +public function initPlugin(AbstractResponse $xResponse): static |
|
| 61 | +{ |
|
| 62 | +$this->xResponse = $xResponse; |
|
| 63 | +$this->init(); |
|
| 64 | +return $this; |
|
| 65 | +} |
|
| 66 | 66 | |
| 67 | - /** |
|
| 67 | +/** |
|
| 68 | 68 | * @inheritDoc |
| 69 | 69 | */ |
| 70 | - public function response(): ?AbstractResponse |
|
| 71 | - { |
|
| 72 | - return $this->xResponse; |
|
| 73 | - } |
|
| 70 | +public function response(): ?AbstractResponse |
|
| 71 | +{ |
|
| 72 | +return $this->xResponse; |
|
| 73 | +} |
|
| 74 | 74 | |
| 75 | - /** |
|
| 75 | +/** |
|
| 76 | 76 | * Add a plugin command to the response |
| 77 | 77 | * |
| 78 | 78 | * @param string $sName The command name |
@@ -80,10 +80,10 @@ discard block |
||
| 80 | 80 | * |
| 81 | 81 | * @return Command |
| 82 | 82 | */ |
| 83 | - public function addCommand(string $sName, array|JsonSerializable $aOptions): Command |
|
| 84 | - { |
|
| 85 | - return $this->xResponse |
|
| 86 | - ->addCommand($sName, $aOptions) |
|
| 87 | - ->setOption('plugin', $this->getName()); |
|
| 88 | - } |
|
| 83 | +public function addCommand(string $sName, array|JsonSerializable $aOptions): Command |
|
| 84 | +{ |
|
| 85 | +return $this->xResponse |
|
| 86 | +->addCommand($sName, $aOptions) |
|
| 87 | +->setOption('plugin', $this->getName()); |
|
| 88 | +} |
|
| 89 | 89 | } |
@@ -17,46 +17,46 @@ |
||
| 17 | 17 | |
| 18 | 18 | interface CodeGeneratorInterface |
| 19 | 19 | { |
| 20 | - /** |
|
| 20 | +/** |
|
| 21 | 21 | * Get the value to be hashed |
| 22 | 22 | * |
| 23 | 23 | * @return string |
| 24 | 24 | */ |
| 25 | - public function getHash(): string; |
|
| 25 | +public function getHash(): string; |
|
| 26 | 26 | |
| 27 | - /** |
|
| 27 | +/** |
|
| 28 | 28 | * Get the HTML tags to include CSS code and files into the page |
| 29 | 29 | * |
| 30 | 30 | * The code must be enclosed in the appropriate HTML tags. |
| 31 | 31 | * |
| 32 | 32 | * @return string |
| 33 | 33 | */ |
| 34 | - public function getCss(): string; |
|
| 34 | +public function getCss(): string; |
|
| 35 | 35 | |
| 36 | - /** |
|
| 36 | +/** |
|
| 37 | 37 | * Get the HTML tags to include javascript code and files into the page |
| 38 | 38 | * |
| 39 | 39 | * The code must be enclosed in the appropriate HTML tags. |
| 40 | 40 | * |
| 41 | 41 | * @return string |
| 42 | 42 | */ |
| 43 | - public function getJs(): string; |
|
| 43 | +public function getJs(): string; |
|
| 44 | 44 | |
| 45 | - /** |
|
| 45 | +/** |
|
| 46 | 46 | * Get the javascript code to include into the page |
| 47 | 47 | * |
| 48 | 48 | * The code must NOT be enclosed in HTML tags. |
| 49 | 49 | * |
| 50 | 50 | * @return string |
| 51 | 51 | */ |
| 52 | - public function getScript(): string; |
|
| 52 | +public function getScript(): string; |
|
| 53 | 53 | |
| 54 | - /** |
|
| 54 | +/** |
|
| 55 | 55 | * Get the javascript codes to include into the page |
| 56 | 56 | * |
| 57 | 57 | * The code must NOT be enclosed in HTML tags. |
| 58 | 58 | * |
| 59 | 59 | * @return JsCode|null |
| 60 | 60 | */ |
| 61 | - public function getJsCode(): ?JsCode; |
|
| 61 | +public function getJsCode(): ?JsCode; |
|
| 62 | 62 | } |
@@ -28,29 +28,29 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | class CallableFunction |
| 30 | 30 | { |
| 31 | - /** |
|
| 31 | +/** |
|
| 32 | 32 | * A string or an array which defines the registered PHP function |
| 33 | 33 | * |
| 34 | 34 | * @var string|array |
| 35 | 35 | */ |
| 36 | - private $xPhpFunction; |
|
| 36 | +private $xPhpFunction; |
|
| 37 | 37 | |
| 38 | - /** |
|
| 38 | +/** |
|
| 39 | 39 | * The path and file name of the include file where the function is defined |
| 40 | 40 | * |
| 41 | 41 | * @var string |
| 42 | 42 | */ |
| 43 | - private $sInclude = ''; |
|
| 43 | +private $sInclude = ''; |
|
| 44 | 44 | |
| 45 | - /** |
|
| 45 | +/** |
|
| 46 | 46 | * An associative array containing call options that will be sent |
| 47 | 47 | * to the browser with the client script. |
| 48 | 48 | * |
| 49 | 49 | * @var array |
| 50 | 50 | */ |
| 51 | - private $aOptions = []; |
|
| 51 | +private $aOptions = []; |
|
| 52 | 52 | |
| 53 | - /** |
|
| 53 | +/** |
|
| 54 | 54 | * The constructor |
| 55 | 55 | * |
| 56 | 56 | * @param Container $di |
@@ -58,43 +58,43 @@ discard block |
||
| 58 | 58 | * @param string $sJsFunction |
| 59 | 59 | * @param string $sPhpFunction |
| 60 | 60 | */ |
| 61 | - public function __construct(private Container $di, private string $sFunction, |
|
| 62 | - private string $sJsFunction, string $sPhpFunction) |
|
| 63 | - { |
|
| 64 | - $this->xPhpFunction = $sPhpFunction; |
|
| 65 | - } |
|
| 61 | +public function __construct(private Container $di, private string $sFunction, |
|
| 62 | +private string $sJsFunction, string $sPhpFunction) |
|
| 63 | +{ |
|
| 64 | +$this->xPhpFunction = $sPhpFunction; |
|
| 65 | +} |
|
| 66 | 66 | |
| 67 | - /** |
|
| 67 | +/** |
|
| 68 | 68 | * Get the name of the function being referenced |
| 69 | 69 | * |
| 70 | 70 | * @return string |
| 71 | 71 | */ |
| 72 | - public function getName(): string |
|
| 73 | - { |
|
| 74 | - return $this->sFunction; |
|
| 75 | - } |
|
| 72 | +public function getName(): string |
|
| 73 | +{ |
|
| 74 | +return $this->sFunction; |
|
| 75 | +} |
|
| 76 | 76 | |
| 77 | - /** |
|
| 77 | +/** |
|
| 78 | 78 | * Get name of the corresponding javascript function |
| 79 | 79 | * |
| 80 | 80 | * @return string |
| 81 | 81 | */ |
| 82 | - public function getJsName(): string |
|
| 83 | - { |
|
| 84 | - return $this->sJsFunction; |
|
| 85 | - } |
|
| 82 | +public function getJsName(): string |
|
| 83 | +{ |
|
| 84 | +return $this->sJsFunction; |
|
| 85 | +} |
|
| 86 | 86 | |
| 87 | - /** |
|
| 87 | +/** |
|
| 88 | 88 | * Get the config options of the function being referenced |
| 89 | 89 | * |
| 90 | 90 | * @return array |
| 91 | 91 | */ |
| 92 | - public function getOptions(): array |
|
| 93 | - { |
|
| 94 | - return $this->aOptions; |
|
| 95 | - } |
|
| 92 | +public function getOptions(): array |
|
| 93 | +{ |
|
| 94 | +return $this->aOptions; |
|
| 95 | +} |
|
| 96 | 96 | |
| 97 | - /** |
|
| 97 | +/** |
|
| 98 | 98 | * Set call options for this instance |
| 99 | 99 | * |
| 100 | 100 | * @param string $sName The name of the configuration option |
@@ -102,20 +102,20 @@ discard block |
||
| 102 | 102 | * |
| 103 | 103 | * @return void |
| 104 | 104 | */ |
| 105 | - public function configure(string $sName, string $sValue): void |
|
| 106 | - { |
|
| 107 | - switch($sName) |
|
| 108 | - { |
|
| 109 | - case 'class': // The user function is a method in the given class |
|
| 110 | - $this->xPhpFunction = [$sValue, $this->xPhpFunction]; |
|
| 111 | - break; |
|
| 112 | - case 'include': |
|
| 113 | - $this->sInclude = $sValue; |
|
| 114 | - break; |
|
| 115 | - default: |
|
| 116 | - $this->aOptions[$sName] = $sValue; |
|
| 117 | - break; |
|
| 118 | - } |
|
| 105 | +public function configure(string $sName, string $sValue): void |
|
| 106 | +{ |
|
| 107 | +switch($sName) |
|
| 108 | +{ |
|
| 109 | +case 'class': // The user function is a method in the given class |
|
| 110 | +$this->xPhpFunction = [$sValue, $this->xPhpFunction]; |
|
| 111 | +break; |
|
| 112 | +case 'include': |
|
| 113 | +$this->sInclude = $sValue; |
|
| 114 | +break; |
|
| 115 | +default: |
|
| 116 | +$this->aOptions[$sName] = $sValue; |
|
| 117 | +break; |
|
| 118 | +} |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
@@ -19,13 +19,13 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | class ConfigReader |
| 21 | 21 | { |
| 22 | - /** |
|
| 22 | +/** |
|
| 23 | 23 | * @param ConfigSetter $xConfigSetter |
| 24 | 24 | */ |
| 25 | - public function __construct(private ConfigSetter $xConfigSetter) |
|
| 26 | - {} |
|
| 25 | +public function __construct(private ConfigSetter $xConfigSetter) |
|
| 26 | +{} |
|
| 27 | 27 | |
| 28 | - /** |
|
| 28 | +/** |
|
| 29 | 29 | * Read options from a config file to an array |
| 30 | 30 | * |
| 31 | 31 | * @param string $sConfigFile The full path to the config file |
@@ -36,29 +36,29 @@ discard block |
||
| 36 | 36 | * @throws Exception\FileContent |
| 37 | 37 | * @throws Exception\YamlExtension |
| 38 | 38 | */ |
| 39 | - public function read(string $sConfigFile): array |
|
| 40 | - { |
|
| 41 | - if(!($sConfigFile = trim($sConfigFile))) |
|
| 42 | - { |
|
| 43 | - return []; |
|
| 44 | - } |
|
| 39 | +public function read(string $sConfigFile): array |
|
| 40 | +{ |
|
| 41 | +if(!($sConfigFile = trim($sConfigFile))) |
|
| 42 | +{ |
|
| 43 | +return []; |
|
| 44 | +} |
|
| 45 | 45 | |
| 46 | - $sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION); |
|
| 47 | - switch($sExt) |
|
| 48 | - { |
|
| 49 | - case 'php': |
|
| 50 | - $aConfigOptions = Reader\PhpReader::read($sConfigFile); |
|
| 51 | - break; |
|
| 52 | - case 'yaml': |
|
| 53 | - case 'yml': |
|
| 54 | - $aConfigOptions = Reader\YamlReader::read($sConfigFile); |
|
| 55 | - break; |
|
| 56 | - case 'json': |
|
| 57 | - $aConfigOptions = Reader\JsonReader::read($sConfigFile); |
|
| 58 | - break; |
|
| 59 | - default: |
|
| 60 | - throw new Exception\FileExtension($sConfigFile); |
|
| 61 | - } |
|
| 46 | +$sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION); |
|
| 47 | +switch($sExt) |
|
| 48 | +{ |
|
| 49 | +case 'php': |
|
| 50 | +$aConfigOptions = Reader\PhpReader::read($sConfigFile); |
|
| 51 | +break; |
|
| 52 | +case 'yaml': |
|
| 53 | +case 'yml': |
|
| 54 | +$aConfigOptions = Reader\YamlReader::read($sConfigFile); |
|
| 55 | +break; |
|
| 56 | +case 'json': |
|
| 57 | +$aConfigOptions = Reader\JsonReader::read($sConfigFile); |
|
| 58 | +break; |
|
| 59 | +default: |
|
| 60 | +throw new Exception\FileExtension($sConfigFile); |
|
| 61 | +} |
|
| 62 | 62 | |
| 63 | 63 | return $aConfigOptions; |
| 64 | 64 | } |
@@ -20,50 +20,50 @@ |
||
| 20 | 20 | |
| 21 | 21 | class InputData |
| 22 | 22 | { |
| 23 | - /** |
|
| 23 | +/** |
|
| 24 | 24 | * @var ReflectionClass |
| 25 | 25 | */ |
| 26 | - private $xReflectionClass; |
|
| 26 | +private $xReflectionClass; |
|
| 27 | 27 | |
| 28 | - /** |
|
| 28 | +/** |
|
| 29 | 29 | * @param ReflectionClass|string $xClass |
| 30 | 30 | * @param array $aMethods |
| 31 | 31 | * @param array $aProperties |
| 32 | 32 | */ |
| 33 | - public function __construct(ReflectionClass|string $xClass, |
|
| 34 | - private array $aMethods = [], private array $aProperties = []) |
|
| 35 | - { |
|
| 36 | - $this->xReflectionClass = is_string($xClass) ? |
|
| 37 | - new ReflectionClass($xClass) : $xClass; |
|
| 38 | - } |
|
| 33 | +public function __construct(ReflectionClass|string $xClass, |
|
| 34 | +private array $aMethods = [], private array $aProperties = []) |
|
| 35 | +{ |
|
| 36 | +$this->xReflectionClass = is_string($xClass) ? |
|
| 37 | +new ReflectionClass($xClass) : $xClass; |
|
| 38 | +} |
|
| 39 | 39 | |
| 40 | - /** |
|
| 40 | +/** |
|
| 41 | 41 | * Get the reflection class |
| 42 | 42 | * |
| 43 | 43 | * @return ReflectionClass |
| 44 | 44 | */ |
| 45 | - public function getReflectionClass(): ReflectionClass |
|
| 46 | - { |
|
| 47 | - return $this->xReflectionClass; |
|
| 48 | - } |
|
| 45 | +public function getReflectionClass(): ReflectionClass |
|
| 46 | +{ |
|
| 47 | +return $this->xReflectionClass; |
|
| 48 | +} |
|
| 49 | 49 | |
| 50 | - /** |
|
| 50 | +/** |
|
| 51 | 51 | * The methods to check for metadata |
| 52 | 52 | * |
| 53 | 53 | * @return array |
| 54 | 54 | */ |
| 55 | - public function getMethods(): array |
|
| 56 | - { |
|
| 57 | - return $this->aMethods; |
|
| 58 | - } |
|
| 55 | +public function getMethods(): array |
|
| 56 | +{ |
|
| 57 | +return $this->aMethods; |
|
| 58 | +} |
|
| 59 | 59 | |
| 60 | - /** |
|
| 60 | +/** |
|
| 61 | 61 | * The properties to check for metadata |
| 62 | 62 | * |
| 63 | 63 | * @return array |
| 64 | 64 | */ |
| 65 | - public function getProperties(): array |
|
| 66 | - { |
|
| 67 | - return $this->aProperties; |
|
| 68 | - } |
|
| 65 | +public function getProperties(): array |
|
| 66 | +{ |
|
| 67 | +return $this->aProperties; |
|
| 68 | +} |
|
| 69 | 69 | } |
@@ -16,42 +16,42 @@ |
||
| 16 | 16 | |
| 17 | 17 | class ExcludeData extends AbstractData |
| 18 | 18 | { |
| 19 | - /** |
|
| 19 | +/** |
|
| 20 | 20 | * @var bool |
| 21 | 21 | */ |
| 22 | - private bool $bValue = true; |
|
| 22 | +private bool $bValue = true; |
|
| 23 | 23 | |
| 24 | - /** |
|
| 24 | +/** |
|
| 25 | 25 | * @return string |
| 26 | 26 | */ |
| 27 | - public function getName(): string |
|
| 28 | - { |
|
| 29 | - return 'protected'; |
|
| 30 | - } |
|
| 27 | +public function getName(): string |
|
| 28 | +{ |
|
| 29 | +return 'protected'; |
|
| 30 | +} |
|
| 31 | 31 | |
| 32 | - /** |
|
| 32 | +/** |
|
| 33 | 33 | * @return mixed |
| 34 | 34 | */ |
| 35 | - public function getValue(): mixed |
|
| 36 | - { |
|
| 37 | - return $this->bValue; |
|
| 38 | - } |
|
| 35 | +public function getValue(): mixed |
|
| 36 | +{ |
|
| 37 | +return $this->bValue; |
|
| 38 | +} |
|
| 39 | 39 | |
| 40 | - /** |
|
| 40 | +/** |
|
| 41 | 41 | * @param bool $bValue |
| 42 | 42 | * |
| 43 | 43 | * @return void |
| 44 | 44 | */ |
| 45 | - public function setValue(bool $bValue): void |
|
| 46 | - { |
|
| 47 | - $this->bValue = $bValue; |
|
| 48 | - } |
|
| 45 | +public function setValue(bool $bValue): void |
|
| 46 | +{ |
|
| 47 | +$this->bValue = $bValue; |
|
| 48 | +} |
|
| 49 | 49 | |
| 50 | - /** |
|
| 50 | +/** |
|
| 51 | 51 | * @inheritDoc |
| 52 | 52 | */ |
| 53 | - public function encode(string $sVarName): array |
|
| 54 | - { |
|
| 55 | - return ["{$sVarName}->setValue(" . ($this->bValue ? 'true' : 'false') . ");"]; |
|
| 56 | - } |
|
| 53 | +public function encode(string $sVarName): array |
|
| 54 | +{ |
|
| 55 | +return ["{$sVarName}->setValue(" . ($this->bValue ? 'true' : 'false') . ");"]; |
|
| 56 | +} |
|
| 57 | 57 | } |