Merge branch 'main' of github.com:mevdschee/php-crud-api into main

Author: mevdschee

README.md

@@ -134,8 +134,9 @@ Related projects:
   - [PHP-CRUD-UI](https://github.com/mevdschee/php-crud-ui): Single file PHP script that adds a UI to a PHP-CRUD-API project.
   - [PHP-CRUD-ADMIN](https://github.com/mevdschee/php-crud-admin): Single file PHP script that adds a database admin interface to a PHP-CRUD-API project.
   - [PHP-SP-API](https://github.com/mevdschee/php-sp-api): Single file PHP script that adds a REST API to a SQL database.
-  - [VUE-CRUD-UI](https://github.com/nlware/vue-crud-ui): Single file Vue.js script that adds a UI to a PHP-CRUD-API project.
   - [ra-data-treeql](https://github.com/nkappler/ra-data-treeql): NPM package that provides a [Data Provider](https://marmelab.com/react-admin/DataProviderIntroduction.html) for [React Admin](https://marmelab.com/react-admin/).
+  - [scriptPilot/vueuse](https://github.com/scriptPilot/vueuse/): Vue [Composables](https://vuejs.org/guide/reusability/composables.html) in addition to [VueUse.org](https://vueuse.org/) (that support PHP-CRUD-API).
+  - [VUE-CRUD-UI](https://github.com/nlware/vue-crud-ui): Single file Vue.js script that adds a UI to a PHP-CRUD-API project.
 
 There are also ports of this script in:
 

api.include.php

@@ -1515,16 +1515,18 @@ public function createStream(string $content = ''): StreamInterface
 
         public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
         {
-            if ('' === $filename) {
-                throw new \RuntimeException('Path cannot be empty');
+            try {
+                $resource = @\fopen($filename, $mode);
+            } catch (\Throwable $e) {
+                throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $filename));
             }
 
-            if (false === $resource = @\fopen($filename, $mode)) {
+            if (false === $resource) {
                 if ('' === $mode || false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'], true)) {
                     throw new \InvalidArgumentException(\sprintf('The mode "%s" is invalid.', $mode));
                 }
 
-                throw new \RuntimeException(\sprintf('The file "%s" cannot be opened: %s', $filename, \error_get_last()['message'] ?? ''));
+                throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $filename));
             }
 
             return Stream::create($resource);
@@ -2141,9 +2143,6 @@ public function getAttributes(): array
             return $this->attributes;
         }
 
-        /**
-         * @return mixed
-         */
         public function getAttribute($attribute, $default = null)
         {
             if (false === \array_key_exists($attribute, $this->attributes)) {
@@ -2359,20 +2358,16 @@ public function getSize() /*:?int*/
 
         public function tell(): int
         {
-            if (!isset($this->stream)) {
-                throw new \RuntimeException('Stream is detached');
-            }
-
-            if (false === $result = @\ftell($this->stream)) {
-                throw new \RuntimeException('Unable to determine stream position: ' . (\error_get_last()['message'] ?? ''));
+            if (false === $result = \ftell($this->stream)) {
+                throw new \RuntimeException('Unable to determine stream position');
             }
 
             return $result;
         }
 
         public function eof(): bool
         {
-            return !isset($this->stream) || \feof($this->stream);
+            return !$this->stream || \feof($this->stream);
         }
 
         public function isSeekable(): bool
@@ -2382,10 +2377,6 @@ public function isSeekable(): bool
 
         public function seek($offset, $whence = \SEEK_SET) /*:void*/
         {
-            if (!isset($this->stream)) {
-                throw new \RuntimeException('Stream is detached');
-            }
-
             if (!$this->seekable) {
                 throw new \RuntimeException('Stream is not seekable');
             }
@@ -2407,19 +2398,15 @@ public function isWritable(): bool
 
         public function write($string): int
         {
-            if (!isset($this->stream)) {
-                throw new \RuntimeException('Stream is detached');
-            }
-
             if (!$this->writable) {
                 throw new \RuntimeException('Cannot write to a non-writable stream');
             }
 
             // We can't know the size after writing anything
             $this->size = null;
 
-            if (false === $result = @\fwrite($this->stream, $string)) {
-                throw new \RuntimeException('Unable to write to stream: ' . (\error_get_last()['message'] ?? ''));
+            if (false === $result = \fwrite($this->stream, $string)) {
+                throw new \RuntimeException('Unable to write to stream');
             }
 
             return $result;
@@ -2432,16 +2419,12 @@ public function isReadable(): bool
 
         public function read($length): string
         {
-            if (!isset($this->stream)) {
-                throw new \RuntimeException('Stream is detached');
-            }
-
             if (!$this->readable) {
                 throw new \RuntimeException('Cannot read from non-readable stream');
             }
 
-            if (false === $result = @\fread($this->stream, $length)) {
-                throw new \RuntimeException('Unable to read from stream: ' . (\error_get_last()['message'] ?? ''));
+            if (false === $result = \fread($this->stream, $length)) {
+                throw new \RuntimeException('Unable to read from stream');
             }
 
             return $result;
@@ -2450,19 +2433,16 @@ public function read($length): string
         public function getContents(): string
         {
             if (!isset($this->stream)) {
-                throw new \RuntimeException('Stream is detached');
+                throw new \RuntimeException('Unable to read stream contents');
             }
 
-            if (false === $contents = @\stream_get_contents($this->stream)) {
-                throw new \RuntimeException('Unable to read stream contents: ' . (\error_get_last()['message'] ?? ''));
+            if (false === $contents = \stream_get_contents($this->stream)) {
+                throw new \RuntimeException('Unable to read stream contents');
             }
 
             return $contents;
         }
 
-        /**
-         * @return mixed
-         */
         public function getMetadata($key = null)
         {
             if (!isset($this->stream)) {
@@ -2559,7 +2539,7 @@ public function __construct($streamOrFile, $size, $errorStatus, $clientFilename
 
             if (\UPLOAD_ERR_OK === $this->error) {
                 // Depending on the value set file or stream variable.
-                if (\is_string($streamOrFile) && '' !== $streamOrFile) {
+                if (\is_string($streamOrFile)) {
                     $this->file = $streamOrFile;
                 } elseif (\is_resource($streamOrFile)) {
                     $this->stream = Stream::create($streamOrFile);
@@ -2593,11 +2573,11 @@ public function getStream(): StreamInterface
                 return $this->stream;
             }
 
-            if (false === $resource = @\fopen($this->file, 'r')) {
-                throw new \RuntimeException(\sprintf('The file "%s" cannot be opened: %s', $this->file, \error_get_last()['message'] ?? ''));
+            try {
+                return Stream::create(\fopen($this->file, 'r'));
+            } catch (\Throwable $e) {
+                throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $this->file));
             }
-
-            return Stream::create($resource);
         }
 
         public function moveTo($targetPath) /*:void*/
@@ -2609,23 +2589,20 @@ public function moveTo($targetPath) /*:void*/
             }
 
             if (null !== $this->file) {
-                $this->moved = 'cli' === \PHP_SAPI ? @\rename($this->file, $targetPath) : @\move_uploaded_file($this->file, $targetPath);
-
-                if (false === $this->moved) {
-                    throw new \RuntimeException(\sprintf('Uploaded file could not be moved to "%s": %s', $targetPath, \error_get_last()['message'] ?? ''));
-                }
+                $this->moved = 'cli' === \PHP_SAPI ? \rename($this->file, $targetPath) : \move_uploaded_file($this->file, $targetPath);
             } else {
                 $stream = $this->getStream();
                 if ($stream->isSeekable()) {
                     $stream->rewind();
                 }
 
-                if (false === $resource = @\fopen($targetPath, 'w')) {
-                    throw new \RuntimeException(\sprintf('The file "%s" cannot be opened: %s', $targetPath, \error_get_last()['message'] ?? ''));
+                try {
+                    // Copy the contents of a stream into another stream until end-of-file.
+                    $dest = Stream::create(\fopen($targetPath, 'w'));
+                } catch (\Throwable $e) {
+                    throw new \RuntimeException(\sprintf('The file "%s" cannot be opened.', $targetPath));
                 }
 
-                $dest = Stream::create($resource);
-
                 while (!$stream->eof()) {
                     if (!$dest->write($stream->read(1048576))) {
                         break;
@@ -2634,6 +2611,10 @@ public function moveTo($targetPath) /*:void*/
 
                 $this->moved = true;
             }
+
+            if (false === $this->moved) {
+                throw new \RuntimeException(\sprintf('Uploaded file could not be moved to "%s"', $targetPath));
+            }
         }
 
         public function getSize(): int
@@ -9893,6 +9874,7 @@ class OpenApiBuilder
         private $openapi;
         private $records;
         private $columns;
+        private $status;
         private $builders;
 
         public function __construct(ReflectionService $reflection, array $base, array $controllers, array $builders)