Issue 107 namespaces and autoloading adjustment

.gitignore

@@ -1,3 +1,4 @@
 composer.lock
 vendor/
+.phpunit.result.cache
 

README.md

@@ -1,59 +1,44 @@
 # DataCoder
 
-[![Build Status](https://travis-ci.org/ExOrg/php-data-coder.svg?branch=master)](https://travis-ci.org/ExOrg/php-data-coder)
+![example workflow](https://github.com/ExOrg/php-data-coder/actions/workflows/php.yml/badge.svg)
 
-Extendable set of data and datafile encoders and decoders. It allows to transfer PHP arrays into data strings and datafiles and vice versa with chosen format like YAML and JSON. It provides encapsulation of various decoding and encoding mechanisms, unifies interface and exceptions handling.
+Extendable set of data and data file encoders and decoders. It allows to transfer PHP arrays into data strings and datafiles and vice versa with chosen format like YAML and JSON. It provides encapsulation of various decoding and encoding mechanisms, unifies interface and exceptions handling.
 
 There are various groups of decoders and encoders
 
-* With predefined data format - e.g. *JsonDataDecoder*, *YamlDatafileEncoder*
-* With configurable data format - e.g. *DataDecoder*, *DatafileEncoder*
-* For raw data - e.g. *JsonDataDecoder*, *DataEncoder*
-* For data in the file - e.g. *YamlDatafileEncoder*, *DatafileDecoder*
+* With predefined data format - e.g. *Coder\Json\Data\Decoder*, *Coder\Yaml\Datafile\Encoder*
+* With configurable data format - e.g. *Coder\Data\Decoder*, *Coder\Datafile\Encoder*
+* For raw data - e.g. *Coder\Json\Data\Decoder*, *Coder\Data\Encoder*
+* For data in the file - e.g. *Coder\Yaml\Datafile\Encoder*, *Coder\Datafile\Decoder*
 
 ## Getting Started
 
 ### Prerequisities
 
-* PHP 8.0+
-* [Composer](https://getcomposer.org/) 2.5.0+
+* [PHP](https://www.php.net/) 8.1 - 8.3
+* [Git](https://git-scm.com/) 2.25.1+
+* [Composer](https://getcomposer.org/) 2.6.0+
 
-### Installation
+The instruction assumes using the Linux operating system or compatible tools for other operating systems.
 
-The recommended way to install DataCoder into the source code of the project is to handle it as code dependency by [Composer](http://getcomposer.org).
+### Installation
 
-#### cURL, php8.0-cli and Git
+#### php8.*-cli, Git and Composer required
 
-The command line tool cURL will be used to to download *Composer* installer and *php8.0-cli* for and running it to install Composer. Git is needed by to downloading dependencies by the Composer.
+The recommended way to install DataCoder into the source code of the project is to handle it as code dependency by [Composer](http://getcomposer.org). [Git](https://git-scm.com/) is needed to fetch packages from version control repositories.
 
-#### Composer
+The *php8.\*-cli* is needed for installing Composer.
 
-The common way to intall Composer is downloading installer via *curl* tool and call the PHP interpreter to run it. 
+#### DataCoder installation
 
-```bash
-curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer
-```
-Now composer is available as the command line tool and can be run by typing `composer` with appropriate parameters.
-
-#### DataCoder
-
-Add to your **composer.json** file following entry in the *require* section
-```
-{
-    "require": {
-        "exorg/data-coder": "^1.0.0"
-    }
-}
-```
-You can do it manually or by running the following command
+Add to your **composer.json** file appropriate entry by running the following command
 ```bash
 composer require exorg/data-coder
 ```
 If it's project set-up stage and no one dependency have been installed yet, run
 ```bash
 composer install
 ```
-
 If another dependencies have been intalled previously, run
 ```bash
 composer update
@@ -65,14 +50,12 @@ The simplest way to autoload all needed files in executable file is attaching *a
 
 ```php
 require_once (__DIR__ . '/vendor/autoload.php');
-
 ```
 
 ### Data Encoders with predefined format
 
 ```php
-
-use Exorg\DataCoder\JsonDataEncoder;
+use ExOrg\DataCoder\Coder\Json\Data\Encoder;
 
 $data = [
     "firstName" => "John",
@@ -85,7 +68,7 @@ $data = [
     ],
 ];
 
-$encoder = new JsonDataEncoder();
+$encoder = new Encoder();
 $result = $encoder->encodeData($data);
 
 print($result);
@@ -107,22 +90,19 @@ print($result);
 ### Data Decoders with predefined format
 
 ```php
-
-use Exorg\DataCoder\YamlDataDecoder;
+use ExOrg\DataCoder\Coder\Yaml\Data\Decoder;
 
 $data = '
----
 firstName: John
 lastName: Smith
 address:
   streetAddress: 21 2nd Street
   city: New York
   state: NY
   postalCode: 10021-3100
-...
 ';
 
-$decoder = new YamlDataDecoder();
+$decoder = new Decoder();
 $result = $decoder->decodeData($data);
 
 print_r($result);
@@ -147,7 +127,7 @@ Array
 ### Data Encoder with configurable format
 
 ```php
-use Exorg\DataCoder\DataEncoder;
+use ExOrg\DataCoder\Coder\Data\Encoder;
 
 $data = [
     "firstName" => "John",
@@ -160,30 +140,28 @@ $data = [
     ],
 ];
 
-$encoder = new DataEncoder();
+$encoder = new Encoder();
 $encoder->setDataFormat('yaml');
 $result = $encoder->encodeData($data);
 
 print($result);
 ```
 ---
 ```
----
 firstName: John
 lastName: Smith
 address:
-  streetAddress: 21 2nd Street
-  city: New York
-  state: NY
-  postalCode: 10021-3100
-...
+    streetAddress: '21 2nd Street'
+    city: 'New York'
+    state: NY
+    postalCode: 10021-3100
 
 ```
 
 ### Data Decoder with configurable format
 
 ```php
-use Exorg\DataCoder\DataDecoder;
+use ExOrg\DataCoder\Coder\Data\Decoder;
 
 $data = '
 {
@@ -199,7 +177,7 @@ $data = '
 }
 ';
 
-$decoder = new DataDecoder();
+$decoder = new Decoder();
 $decoder->setDataFormat('json');
 $result = $decoder->decodeData($data);
 
@@ -225,16 +203,16 @@ Array
 
 ### Datafile Encoders and Decoders
 
-Datafile Encoders and Decoders usage is similar to the Data Encoders and Decoders. There are coders with predefined data format like **JsonDatafileEncoder** or **YamlDatafileDecoder** and those, where data format can be chosen by function *setDataFormat*, just like in examples above - **DatafileEncoder** and **DatafileDecoder**.
+Datafile Encoders and Decoders usage is similar to the Data Encoders and Decoders. There are coders with predefined data format like **Coder\Json\Datafile\Encoder** or **Coder\Yaml\Datafile\Decoder** and those, where data format can be chosen by function *setDataFormat*, just like in examples above - **Code\Datafile\Encoder** and **Code\Datafile\Decoder**.
 
 #### Data format recognizing by file extension
 
-Datafile coders with configurable data format - **DatafileEncoder** and **DatafileDecoder** - can recognize data format by file extension. In that case, there is no need to set data format manually.
+Datafile coders with configurable data format - **Coder\Datafile\Encoder** and **Coder\Datafile\Decoder** - can recognize data format by file extension. In that case, there is no need to set data format manually.
 
-##### DatafileEncoder
+##### Datafile Encoder
 
 ```php
-use Exorg\DataCoder\DatafileEncoder;
+use ExOrg\DataCoder\Coder\Datafile\Encoder;
 
 $data = [
     "firstName" => "John",
@@ -249,7 +227,7 @@ $data = [
 
 $datafilePath = 'data.json';
 
-$encoder = new DatafileEncoder();
+$encoder = new Encoder();
 $encoder->encodeFile($data, $datafilePath);
 
 print file_get_contents($datafilePath);
@@ -268,31 +246,29 @@ print file_get_contents($datafilePath);
 }
 ```
 
-##### DatafileDecoder
+##### Datafile Decoder
 
 ```php
-use Exorg\DataCoder\DatafileDecoder;
+use ExOrg\DataCoder\Coder\Datafile\Decoder;
 
 $datafilePath = 'data.yaml';
 
 print file_get_contents($datafilePath);
 
-$decoder = new DatafileDecoder();
+$decoder = new Decoder();
 $data = $decoder->decodeFile($datafilePath);
 
 print_r($data);
 ```
 ---
 ```
----
 firstName: John
 lastName: Smith
 address:
-  streetAddress: 21 2nd Street
-  city: New York
-  state: NY
-  postalCode: 10021-3100
-...
+    streetAddress: '21 2nd Street'
+    city: 'New York'
+    state: NY
+    postalCode: 10021-3100
 Array
 (
     [firstName] => John
@@ -328,7 +304,7 @@ composer test
 
 ### Code style tests
 
-This code follows [PSR-1](http://www.php-fig.org/psr/psr-1/) and [PSR-2](http://www.php-fig.org/psr/psr-2/) standards.
+This code follows [PSR-1](http://www.php-fig.org/psr/psr-1/) and [PSR-12](http://www.php-fig.org/psr/psr-12/) standards.
 
 To run tests for code style write the following command in your command line inside the main DataCoder project directory
 
@@ -355,13 +331,13 @@ composer check
 * [Remarkable](https://remarkableapp.github.io/)
 * [PHPUnit](https://phpunit.de/)
 * [PHPCodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer)
+* [Composer](https://getcomposer.org/)
 * [Git](https://git-scm.com/)
 * [GitHub](https://github.com/)
-* [Travis](https://travis-ci.com/)
 
 ## Versioning
 
-This project is versioning according to [SemVer](http://semver.org/)  versioning standars. All available [releases](https://github.com/ExOrg/php-data-coder/releases) are [tagged](https://github.com/ExOrg/php-data-coder/tags). 
+This project is versioning according to [SemVer](http://semver.org/)  versioning standars. All available [releases](https://github.com/ExOrg/php-data-coder/releases) are [tagged](https://github.com/ExOrg/php-data-coder/tags).
 
 ## Contributing
 

composer.json

@@ -28,38 +28,16 @@
     },
     "autoload": {
         "psr-4": {
-            "Exorg\\DataCoder\\": [
-            	"src/",
-            	"src/coders",
-            	"src/coders/data_coders/",
-            	"src/coders/data_coders/data_encoders/",
-            	"src/coders/data_coders/data_decoders/",
-            	"src/coders/datafile_coders/",
-            	"src/coders/datafile_coders/datafile_encoders/",
-            	"src/coders/datafile_coders/datafile_decoders/",
-            	"src/data_format/",
-            	"src/coder_builder/",
-            	"src/file/"
+            "ExOrg\\DataCoder\\": [
+                "src/"
             ]
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Exorg\\DataCoder\\": [
-            	"tests/",
-            	"tests/testing_environment/",
-            	"tests/testing_environment/helpers/",
-            	"tests/testing_environment/classes/",
-            	"tests/unit_tests/coders/",
-            	"tests/unit_tests/coders/data_coders/",
-            	"tests/unit_tests/coders/data_coders/data_encoders/",
-            	"tests/unit_tests/coders/data_coders/data_decoders/",
-            	"tests/unit_tests/coders/datafile_coders/",
-            	"tests/unit_tests/coders/datafile_coders/datafile_encoders/",
-            	"tests/unit_tests/coders/datafile_coders/datafile_decoders/",
-            	"tests/unit_tests/data_format/",
-            	"tests/unit_tests/coder_builder/",
-            	"tests/unit_tests/file/"
+            "ExOrg\\DataCoder\\": [
+                "tests/unit_tests/",
+                "tests/fixtures/classes/"
             ]
         }
     },

phpcs.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ruleset name="Exorg_PHP_DataCoder">
+<ruleset name="ExOrg_PHP_DataCoder">
  <description>The coding standard for PHPDataCoder.</description>
 
  <file>./src</file>

src/coders/data_coders/data_decoders/AbstractDataDecoder.php → src/Coder/Data/AbstractDecoder.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Exorg\DataCoder;
+namespace ExOrg\DataCoder\Coder\Data;
 
 /**
- * AbstractDataDecoder.
+ * Abstract Data Decoder.
  * Abstract class for Data Decoder
  * for concrete data format.
  *
@@ -22,7 +22,7 @@
  * @license http://opensource.org/licenses/MIT MIT License
  * @link https://github.com/ExOrg/php-data-coder
  */
-abstract class AbstractDataDecoder
+abstract class AbstractDecoder
 {
     /**
      * Validate data.

src/coders/data_coders/data_encoders/AbstractDataEncoder.php → src/Coder/Data/AbstractEncoder.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Exorg\DataCoder;
+namespace ExOrg\DataCoder\Coder\Data;
 
 /**
  * AbstractDataEncoder.
@@ -22,7 +22,7 @@
  * @license http://opensource.org/licenses/MIT MIT License
  * @link https://github.com/ExOrg/php-data-coder
  */
-abstract class AbstractDataEncoder
+abstract class AbstractEncoder
 {
     /**
      * Validate data.

src/coders/data_coders/data_decoders/DataDecoder.php → src/Coder/Data/Decoder.php

@@ -9,7 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Exorg\DataCoder;
+namespace ExOrg\DataCoder\Coder\Data;
+
+use ExOrg\DataCoder\Coder\Data\DecodingStrategyInterface;
+use ExOrg\DataCoder\CoderBuilder\CoderBuildingTrait;
+use ExOrg\DataCoder\DataFormat\DataFormatConfigurableTrait;
 
 /**
  * DataDecoder.
@@ -22,7 +26,7 @@
  * @license http://opensource.org/licenses/MIT MIT License
  * @link https://github.com/ExOrg/php-data-coder
  */
-class DataDecoder
+class Decoder implements DecodingStrategyInterface
 {
     use DataFormatConfigurableTrait;
     use CoderBuildingTrait;