diff --git a/admin.php b/admin.php index 2c3b822..90f826f 100644 --- a/admin.php +++ b/admin.php @@ -1,8 +1,8 @@ {{table}}: create column + + +

create column

{{for:field:key:form}} @@ -48,7 +53,12 @@ // file: templates/column/created.html namespace { $_HTML['column/created'] = <<<'END_OF_HTML' -

{{table}}: create column

+ + +

create column

Created {{name}}: {{success}}

@@ -59,7 +69,12 @@ // file: templates/column/delete.html namespace { $_HTML['column/delete'] = <<<'END_OF_HTML' -

{{table}}: delete column

+ + +

delete column

You are about to delete the column named "{{name}}"

@@ -76,7 +91,12 @@ // file: templates/column/deleted.html namespace { $_HTML['column/deleted'] = <<<'END_OF_HTML' -

{{table}}: delete column

+ + +

delete column

Deleted {{name}}: {{success}}

@@ -87,20 +107,26 @@ // file: templates/column/list.html namespace { $_HTML['column/list'] = <<<'END_OF_HTML' -

{{table}}: list columns

- - - - - - - - - - - - - + + +

list columns

+ +
nametypelengthprecisionscalenullablepkfk
+ + + + + + + + + + + + {{for:column:columns}} @@ -129,88 +155,15 @@ END_OF_HTML; } -// file: templates/column/read.html -namespace { -$_HTML['column/read'] = <<<'END_OF_HTML' -

{{table}}: view column

-
nametypelengthprecisionscalenullablepkfk
edit
- - - - - - - - - - - - - - - - - - - - - - - - - - -{{endfor}} -
keyvalue
- name - - {{column.name}} -
- type - - {{column.type}} -
- length - - {{column.length|or("-")}} -
- precision - - {{column.precision|or("-")}} -
- scale - - {{column.scale|or("-")}} -
- nullable - - {{column.nullable|bool("yes","-")}} -
- pk - - {{column.pk|bool("yes","-")}} -
- fk - - {{if:column.fk}} - {{column.fk}} - {{else}} - - - {{endif}} -
- -

- Edit column - Delete column -

- -END_OF_HTML; -} - // file: templates/column/update.html namespace { $_HTML['column/update'] = <<<'END_OF_HTML' -

{{table}}: update column

+ + +

update column

{{for:field:key:form}} @@ -243,7 +196,12 @@ // file: templates/column/updated.html namespace { $_HTML['column/updated'] = <<<'END_OF_HTML' -

{{table}}: update column

+ + +

update column

Updated {{name}}: {{success}}

@@ -254,7 +212,11 @@ // file: templates/error/show.html namespace { $_HTML['error/show'] = <<<'END_OF_HTML' -

Error

+ + +

error

code:

{{code}}

@@ -280,11 +242,13 @@
-
-
-

PHP-CRUD-ADMIN

+
+
    @@ -318,11 +282,13 @@
    -
    -
    -

    PHP-CRUD-ADMIN

    +
    +
      @@ -346,6 +312,10 @@ // file: templates/table/create.html namespace { $_HTML['table/create'] = <<<'END_OF_HTML' + +

      create table

      @@ -374,6 +344,10 @@ // file: templates/table/created.html namespace { $_HTML['table/created'] = <<<'END_OF_HTML' + +

      create table

      Created {{name}}: {{success}}

      @@ -385,7 +359,12 @@ // file: templates/table/delete.html namespace { $_HTML['table/delete'] = <<<'END_OF_HTML' -

      {{table}}: delete table

      + + +

      delete table

      The action cannot be undone.

      @@ -400,7 +379,12 @@ // file: templates/table/deleted.html namespace { $_HTML['table/deleted'] = <<<'END_OF_HTML' -

      {{table}}: delete table

      + + +

      delete table

      Deleted {{table}}: {{success}}

      @@ -411,12 +395,17 @@ // file: templates/table/list.html namespace { $_HTML['table/list'] = <<<'END_OF_HTML' + +

      list tables

      - - - - +
      name
      + + + + {{for:table:tables}} @@ -2103,7 +2092,7 @@ public function withBody(StreamInterface $body): self return $new; } - private function setHeaders(array $headers): void + private function setHeaders(array $headers) /*:void*/ { foreach ($headers as $header => $value) { $value = $this->validateAndTrimHeader($header, $value); @@ -2303,7 +2292,7 @@ public function withUri(UriInterface $uri, $preserveHost = false): self return $new; } - private function updateHostFromUri(): void + private function updateHostFromUri() /*:void*/ { if ('' === $host = $this->uri->getHost()) { return; @@ -2341,7 +2330,7 @@ final class Response implements ResponseInterface use MessageTrait; /** @var array Map of standard HTTP status code/reason phrases */ - private const PHRASES = [ + /*private*/ const PHRASES = [ 100 => 'Continue', 101 => 'Switching Protocols', 102 => 'Processing', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 207 => 'Multi-status', 208 => 'Already Reported', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => 'Switch Proxy', 307 => 'Temporary Redirect', @@ -2605,7 +2594,7 @@ final class Stream implements StreamInterface private $size; /** @var array Hash of readable and writable stream types */ - private const READ_WRITE_HASH = [ + /*private*/ const READ_WRITE_HASH = [ 'read' => [ 'r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true, 'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true, @@ -2681,7 +2670,7 @@ public function __toString(): string } } - public function close(): void + public function close() /*:void*/ { if (isset($this->stream)) { if (\is_resource($this->stream)) { @@ -2705,7 +2694,7 @@ public function detach() return $result; } - public function getSize(): ?int + public function getSize() /*:?int*/ { if (null !== $this->size) { return $this->size; @@ -2749,7 +2738,7 @@ public function isSeekable(): bool return $this->seekable; } - public function seek($offset, $whence = \SEEK_SET): void + public function seek($offset, $whence = \SEEK_SET) /*:void*/ { if (!$this->seekable) { throw new \RuntimeException('Stream is not seekable'); @@ -2760,7 +2749,7 @@ public function seek($offset, $whence = \SEEK_SET): void } } - public function rewind(): void + public function rewind() /*:void*/ { $this->seek(0); } @@ -2843,7 +2832,7 @@ public function getMetadata($key = null) final class UploadedFile implements UploadedFileInterface { /** @var array */ - private const ERRORS = [ + /*private*/ const ERRORS = [ \UPLOAD_ERR_OK => 1, \UPLOAD_ERR_INI_SIZE => 1, \UPLOAD_ERR_FORM_SIZE => 1, @@ -2922,7 +2911,7 @@ public function __construct($streamOrFile, $size, $errorStatus, $clientFilename /** * @throws \RuntimeException if is moved or not ok */ - private function validateActive(): void + private function validateActive() /*:void*/ { if (\UPLOAD_ERR_OK !== $this->error) { throw new \RuntimeException('Cannot retrieve stream due to upload error'); @@ -2946,7 +2935,7 @@ public function getStream(): StreamInterface return Stream::create($resource); } - public function moveTo($targetPath): void + public function moveTo($targetPath) /*:void*/ { $this->validateActive(); @@ -2988,12 +2977,12 @@ public function getError(): int return $this->error; } - public function getClientFilename(): ?string + public function getClientFilename() /*:?string*/ { return $this->clientFilename; } - public function getClientMediaType(): ?string + public function getClientMediaType() /*:?string*/ { return $this->clientMediaType; } @@ -3016,11 +3005,11 @@ public function getClientMediaType(): ?string */ final class Uri implements UriInterface { - private const SCHEMES = ['http' => 80, 'https' => 443]; + /*private*/ const SCHEMES = ['http' => 80, 'https' => 443]; - private const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~'; + /*private*/ const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~'; - private const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;='; + /*private*/ const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;='; /** @var string Uri scheme. */ private $scheme = ''; @@ -3102,7 +3091,7 @@ public function getHost(): string return $this->host; } - public function getPort(): ?int + public function getPort() /*:?int*/ { return $this->port; } @@ -3270,7 +3259,7 @@ private static function isNonStandardPort(string $scheme, int $port): bool return !isset(self::SCHEMES[$scheme]) || $port !== self::SCHEMES[$scheme]; } - private function filterPort($port): ?int + private function filterPort($port) /*:?int*/ { if (null === $port) { return null; @@ -4701,14 +4690,14 @@ class ColumnController public function __construct(Router $router, Responder $responder, ReflectionService $reflection, DefinitionService $definition) { $router->register('GET', '/columns', array($this, 'getDatabase')); - $router->register('GET', '/column/*', array($this, 'getTable')); - $router->register('GET', '/column/*/*', array($this, 'getColumn')); - $router->register('PUT', '/column/*', array($this, 'updateTable')); - $router->register('PUT', '/column/*/*', array($this, 'updateColumn')); + $router->register('GET', '/columns/*', array($this, 'getTable')); + $router->register('GET', '/columns/*/*', array($this, 'getColumn')); + $router->register('PUT', '/columns/*', array($this, 'updateTable')); + $router->register('PUT', '/columns/*/*', array($this, 'updateColumn')); $router->register('POST', '/columns', array($this, 'addTable')); - $router->register('POST', '/column/*', array($this, 'addColumn')); - $router->register('DELETE', '/column/*', array($this, 'removeTable')); - $router->register('DELETE', '/column/*/*', array($this, 'removeColumn')); + $router->register('POST', '/columns/*', array($this, 'addColumn')); + $router->register('DELETE', '/columns/*', array($this, 'removeTable')); + $router->register('DELETE', '/columns/*/*', array($this, 'removeColumn')); $this->responder = $responder; $this->reflection = $reflection; $this->definition = $definition; @@ -4858,7 +4847,6 @@ class GeoJsonController { private $service; private $responder; - private $geoJsonConverter; public function __construct(Router $router, Responder $responder, GeoJsonService $service) { @@ -8699,10 +8687,10 @@ private function setPaths() /*: void*/ $path = '/columns'; break; case 'table': - $path = $operation == 'create' ? '/columns' : '/column/{table}'; + $path = $operation == 'create' ? '/columns' : '/columns/{table}'; break; case 'column': - $path = $operation == 'create' ? '/column/{table}' : '/column/{table}/{column}'; + $path = $operation == 'create' ? '/columns/{table}' : '/columns/{table}/{column}'; break; } if (strpos($path, '{table}')) { @@ -10554,7 +10542,7 @@ private function addParsedBody(ServerRequestInterface $request): ServerRequestIn { $parsedBody = $request->getParsedBody(); if ($parsedBody) { - $request = $this->applySlim3Hack($request); + $request = $this->applySlimHack($request); } else { $body = $request->getBody(); if ($body->isReadable() && $body->isSeekable()) { @@ -10569,9 +10557,10 @@ private function addParsedBody(ServerRequestInterface $request): ServerRequestIn return $request; } - private function applySlim3Hack(ServerRequestInterface $request): ServerRequestInterface + private function applySlimHack(ServerRequestInterface $request): ServerRequestInterface { - if (get_class($request) == 'Slim\Http\Request') { + $class = get_class($request); + if (in_array($class, ['Slim\Http\Request', 'Slim\Http\Request'])) { $parsedBody = $request->getParsedBody(); $contents = json_encode($parsedBody); $parsedBody = $this->parseBody($contents); @@ -11057,27 +11046,27 @@ public function readDatabase(array $args) public function readTable(string $table, array $args) { - return $this->caller->call('GET', '/column/' . rawurlencode($table), $args); + return $this->caller->call('GET', '/columns/' . rawurlencode($table), $args); } public function readColumn(string $table, string $column, array $args) { - return $this->caller->call('GET', '/column/' . rawurlencode($table) . '/' . rawurlencode($column), $args); + return $this->caller->call('GET', '/columns/' . rawurlencode($table) . '/' . rawurlencode($column), $args); } public function updateColumn(string $table, string $column, array $data) { - return $this->caller->call('PUT', '/column/' . rawurlencode($table) . '/' . rawurlencode($column), [], $data); + return $this->caller->call('PUT', '/columns/' . rawurlencode($table) . '/' . rawurlencode($column), [], $data); } public function createColumn(string $table, array $data) { - return $this->caller->call('POST', '/column/' . rawurlencode($table), [], $data); + return $this->caller->call('POST', '/columns/' . rawurlencode($table), [], $data); } public function deleteColumn(string $table, string $column) { - return $this->caller->call('DELETE', '/column/' . rawurlencode($table) . '/' . rawurlencode($column), []); + return $this->caller->call('DELETE', '/columns/' . rawurlencode($table) . '/' . rawurlencode($column), []); } public function createTable(array $data) @@ -11087,7 +11076,7 @@ public function createTable(array $data) public function deleteTable(string $table) { - return $this->caller->call('DELETE', '/column/' . rawurlencode($table), []); + return $this->caller->call('DELETE', '/columns/' . rawurlencode($table), []); } } } @@ -11261,20 +11250,6 @@ public function create(string $table, string $action, /* object */ $column): Tem return new TemplateDocument('layouts/default', 'column/created', $variables); } - public function read(string $table, string $action, string $name): TemplateDocument - { - $column = $this->definition->getColumn($table, $name); - - $variables = array( - 'table' => $table, - 'action' => $action, - 'name' => $name, - 'column' => $column, - ); - - return new TemplateDocument('layouts/default', 'column/read', $variables); - } - public function updateForm(string $table, string $action, string $name): TemplateDocument { $column = $this->definition->getColumn($table, $name); @@ -11437,7 +11412,16 @@ public function getColumn(string $tableName, string $columnName) public function getTableNames() { - return array_keys($this->database['tables']); + return array_keys(array_filter($this->database['tables'], function ($table) { + return $table['type'] == 'table'; + })); + } + + public function getViewNames() + { + return array_keys(array_filter($this->database['tables'], function ($table) { + return $table['type'] == 'view'; + })); } } }
      name
      {{table}}