From e66d3ca35c4e5dd92c7f2e966d1386e970127114 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 17 May 2014 00:57:00 +0200 Subject: [PATCH] Opps, had 2 Streamable interfaces ... MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...{class_Streamable.php => class_Stream.php} | 2 +- .../crypto/class_EncryptableStream.php | 2 +- ...utStreamable.php => class_InputStream.php} | 4 ++-- ...tStreamable.php => class_OutputStream.php} | 4 ++-- .../main/class_BaseFrameworkSystem.php | 24 +++++++++---------- .../{io_handler => io_stream}/.htaccess | 0 .../class_FileIoStream.php | 0 inc/classes/main/streams/class_ | 2 +- inc/classes/main/streams/input/class_ | 2 +- inc/classes/main/streams/output/class_ | 2 +- .../middleware/io/class_FileIoHandler.php | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) rename inc/classes/interfaces/streams/{class_Streamable.php => class_Stream.php} (95%) rename inc/classes/interfaces/streams/input/{class_InputStreamable.php => class_InputStream.php} (92%) rename inc/classes/interfaces/streams/output/{class_OutputStreamable.php => class_OutputStream.php} (91%) rename inc/classes/main/file_directories/{io_handler => io_stream}/.htaccess (100%) rename inc/classes/main/file_directories/{io_handler => io_stream}/class_FileIoStream.php (100%) diff --git a/inc/classes/interfaces/streams/class_Streamable.php b/inc/classes/interfaces/streams/class_Stream.php similarity index 95% rename from inc/classes/interfaces/streams/class_Streamable.php rename to inc/classes/interfaces/streams/class_Stream.php index 46eac25c..ba88ae88 100644 --- a/inc/classes/interfaces/streams/class_Streamable.php +++ b/inc/classes/interfaces/streams/class_Stream.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface Streamable extends FrameworkInterface { +interface Stream extends FrameworkInterface { /** * Streams the data and maybe does something to it * diff --git a/inc/classes/interfaces/streams/crypto/class_EncryptableStream.php b/inc/classes/interfaces/streams/crypto/class_EncryptableStream.php index a908f9b2..9a7e94e2 100644 --- a/inc/classes/interfaces/streams/crypto/class_EncryptableStream.php +++ b/inc/classes/interfaces/streams/crypto/class_EncryptableStream.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface EncryptableStream extends Streamable { +interface EncryptableStream extends Stream { /** * Encrypt the string with fixed salt * diff --git a/inc/classes/interfaces/streams/input/class_InputStreamable.php b/inc/classes/interfaces/streams/input/class_InputStream.php similarity index 92% rename from inc/classes/interfaces/streams/input/class_InputStreamable.php rename to inc/classes/interfaces/streams/input/class_InputStream.php index 6e213e86..149f63c2 100644 --- a/inc/classes/interfaces/streams/input/class_InputStreamable.php +++ b/inc/classes/interfaces/streams/input/class_InputStream.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface InputStreamable extends Streamable { +interface InputStream extends Stream { } // [EOF] diff --git a/inc/classes/interfaces/streams/output/class_OutputStreamable.php b/inc/classes/interfaces/streams/output/class_OutputStream.php similarity index 91% rename from inc/classes/interfaces/streams/output/class_OutputStreamable.php rename to inc/classes/interfaces/streams/output/class_OutputStream.php index 68382195..2d2dba57 100644 --- a/inc/classes/interfaces/streams/output/class_OutputStreamable.php +++ b/inc/classes/interfaces/streams/output/class_OutputStream.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface OutputStreamable extends Streamable { +interface OutputStream extends Stream { } // [EOF] diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index abcefc8c..0bd39092 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -144,12 +144,12 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { private $sourceInstance = NULL; /** - * An instance of a InputStreamable class + * An instance of a InputStream class */ private $inputStreamInstance = NULL; /** - * An instance of a OutputStreamable class + * An instance of a OutputStream class */ private $outputStreamInstance = NULL; @@ -1090,40 +1090,40 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } /** - * Getter for a InputStreamable instance + * Getter for a InputStream instance * - * @param $inputStreamInstance The InputStreamable instance + * @param $inputStreamInstance The InputStream instance */ protected final function getInputStreamInstance () { return $this->inputStreamInstance; } /** - * Setter for a InputStreamable instance + * Setter for a InputStream instance * - * @param $inputStreamInstance The InputStreamable instance + * @param $inputStreamInstance The InputStream instance * @return void */ - protected final function setInputStreamInstance (InputStreamable $inputStreamInstance) { + protected final function setInputStreamInstance (InputStream $inputStreamInstance) { $this->inputStreamInstance = $inputStreamInstance; } /** - * Getter for a OutputStreamable instance + * Getter for a OutputStream instance * - * @param $outputStreamInstance The OutputStreamable instance + * @param $outputStreamInstance The OutputStream instance */ protected final function getOutputStreamInstance () { return $this->outputStreamInstance; } /** - * Setter for a OutputStreamable instance + * Setter for a OutputStream instance * - * @param $outputStreamInstance The OutputStreamable instance + * @param $outputStreamInstance The OutputStream instance * @return void */ - protected final function setOutputStreamInstance (OutputStreamable $outputStreamInstance) { + protected final function setOutputStreamInstance (OutputStream $outputStreamInstance) { $this->outputStreamInstance = $outputStreamInstance; } diff --git a/inc/classes/main/file_directories/io_handler/.htaccess b/inc/classes/main/file_directories/io_stream/.htaccess similarity index 100% rename from inc/classes/main/file_directories/io_handler/.htaccess rename to inc/classes/main/file_directories/io_stream/.htaccess diff --git a/inc/classes/main/file_directories/io_handler/class_FileIoStream.php b/inc/classes/main/file_directories/io_stream/class_FileIoStream.php similarity index 100% rename from inc/classes/main/file_directories/io_handler/class_FileIoStream.php rename to inc/classes/main/file_directories/io_stream/class_FileIoStream.php diff --git a/inc/classes/main/streams/class_ b/inc/classes/main/streams/class_ index 5cc8474d..d7e24e2d 100644 --- a/inc/classes/main/streams/class_ +++ b/inc/classes/main/streams/class_ @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ???Stream extends BaseStream implements Streamable { +class ???Stream extends BaseStream implements Stream { /** * Protected constructor * diff --git a/inc/classes/main/streams/input/class_ b/inc/classes/main/streams/input/class_ index 108f48f2..0bae09ff 100644 --- a/inc/classes/main/streams/input/class_ +++ b/inc/classes/main/streams/input/class_ @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ???InputStream extends BaseStream implements InputStreamable { +class ???InputStream extends BaseStream implements InputStream { /** * Protected constructor * diff --git a/inc/classes/main/streams/output/class_ b/inc/classes/main/streams/output/class_ index ce5dda25..10b3c722 100644 --- a/inc/classes/main/streams/output/class_ +++ b/inc/classes/main/streams/output/class_ @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ???OutputStream extends BaseStream implements OutputStreamable { +class ???OutputStream extends BaseStream implements OutputStream { /** * Protected constructor * diff --git a/inc/classes/middleware/io/class_FileIoHandler.php b/inc/classes/middleware/io/class_FileIoHandler.php index 8e5559b0..e7578348 100644 --- a/inc/classes/middleware/io/class_FileIoHandler.php +++ b/inc/classes/middleware/io/class_FileIoHandler.php @@ -119,8 +119,8 @@ class FileIoHandler extends BaseMiddleware implements IoHandler { * Saves streamed (that are mostly serialized objects) data to files or * external servers. * - * @param $fileName The local file's name including full path - * @param $dataArray Array containing the compressor's extension and streamed data + * @param $fileName The local file's name including full path + * @param $dataArray Array containing the compressor's extension and streamed data * @return void * @throws UnsupportedOperationException If this method is called */ -- 2.39.5