Flatenned directory structure

.gitignore

@@ -1,5 +1,6 @@
 composer.phar
 composer.lock
-app/cache/*.db
+cache/*
+!cache/.gitkeep
 bin/
 vendor

CHANGELOG.md

@@ -38,3 +38,11 @@
 
 2.0.8 Covered most basic functionality with tests, added a lot of documentation
  and a PHP 7.1 fix. Deprecated the `\CpChart\Factory\Factory` class.
+
+## 3.x
+
+3.0 Deleted the `\CpChart\Factory\Factory` class and everything related to it.
+ Moved drawing and cache classes outside of `Chart` namespace.
+ Moved barcode to a `Barcode` namespace.
+ Moved `cache` and `resources` directories to library root.
+ Renamed `resources\data` to `resources\barcode`.

README.md

@@ -41,9 +41,11 @@ and aims to allow the usage of it in modern applications. This was done through
 applying PSR standards to code, introducing namespaces and typehints, along with
 some basic annotations to methods.
 
-This is the `2.x` version, which aims to further update the code, but with the least
-backwards compatibility breaks possible. However if you cannot risk any of these,
-you will need to use the `1.x` branch.
+This is the `3.x` version, which removes the factory service and reorganizes the
+file structure a bit. It does not introduce any new features, but the changes are
+not compatibile with the `2.x` branch. BC compatibility with the original library
+is mostly retained, however you can still use the `1.x` version if you cannot risk
+any of these.
 
 What was done:
 
@@ -60,7 +62,7 @@ the actual logic, so most code from the original library should work.
 to methods Also, typehinting was added to methods where possible, so some backwards compatibility breaks
 may occur if you did some weird things.
 
-- Moved all constants to a single file `src/Resources/data/constants.php`. It is loaded automatically
+- Moved all constants to a [single file](constants.php). It is loaded automatically
 through Composer, so no need for manual action.
 
 License:
@@ -86,7 +88,7 @@ For composer installation, add:
 
 ```json
 "require": {
- "szymach/c-pchart": "^2.0"
+ "szymach/c-pchart": "^3.0"
 },
 ```
 
@@ -108,7 +110,7 @@ so you can compare each version and figure out how to use the current implementa
 Charts created through Image class
 ---------------------------------------
 
-Most of the basic charts are created through methods of the `CpChart\Chart\Image`
+Most of the basic charts are created through methods of the `CpChart\Image`
 class. Below you can find a full list of these charts, alongside example code.
 
 - [area](doc/area.md)

composer.json

@@ -19,7 +19,7 @@
  ],
  "autoload": {
  "psr-4": { "CpChart\\": "src/" },
- "files": ["src/Resources/data/constants.php"]
+ "files": ["constants.php"]
  },
  "autoload-dev": {
  "psr-4": { "Test\\CpChart\\": "tests/" }
@@ -38,7 +38,8 @@
  },
  "extra": {
  "branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-master": "3.0.x-dev",
+ "2.0": "2.0.x-dev"
  }
  }
 }

doc/2d_pie.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Pie;
 
 // Create and populate data

doc/2d_ring.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Pie;
 
 /* Create and populate the Data object */

doc/3d_pie.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Pie;
 
 /* Create and populate the Data object */

doc/3d_ring.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Pie;
 
 /* Create and populate the Data object */

doc/area.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 
 $data = new Data();
 for ($i = 0; $i <= 30; $i++) {

doc/bar.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 
 /* Create and populate the Data object */
 $data = new Data();

doc/barcode_128.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Barcode128;
-use CpChart\Chart\Image;
+use CpChart\Barcode\Barcode128;
+use CpChart\Image;
 
 /* Create the Image object */
 $image = new Image(700, 230);

doc/barcode_39.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Barcode39;
-use CpChart\Chart\Image;
+use CpChart\Barcode\Barcode39;
+use CpChart\Image;
 
 /* Create the Image object */
 $image = new Image(700, 230);

doc/best_fit.md

@@ -5,8 +5,8 @@
 ``` php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 
 /* Create and populate the Data object */
 $data = new Data();

doc/bubble.md

@@ -6,8 +6,8 @@
 require '/path/to/your/vendor/autoload.php';
 
 use CpChart\Chart\Bubble;
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 
 /* Create and populate the Data object */
 $data = new Data();

doc/cache.md

@@ -3,7 +3,7 @@
 [Reference](http://wiki.pchart.net/doc.pcache.pcache.html)
 
 To speed up the process of creating charts, you can store them in the cache files
-using the `CpChart\Chart\Cache` class. It will create two files - `cache.db` and
+using the `CpChart\Cache` class. It will create two files - `cache.db` and
 `index.db` in a dedicated directory (`app\cache` by default, relative to the library's
 root directory), but you can change these using the `$settings` array passed
 to the object's constructor.
@@ -16,9 +16,9 @@ how you can do that.
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Cache;
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Cache;
+use CpChart\Data;
+use CpChart\Image;
 
 // Standard chart creation
 $data = new Data();
@@ -77,7 +77,7 @@ $cache->removeOlderThan(60 * 60 * 24); // Remove data older than 24 hours
 $cache->flush();
 ```
 
-There is also the function called `CpChart\Chart\Cache::dbRemoval(array $settings)`,
+There is also the function called `CpChart\Cache::dbRemoval(array $settings)`,
 but it only covers two use cases - removing by chart hash and age. Since there
 are dedicated methods for each of them (`remove` and `removeOlderThan`, respectively),
 there is no reason to cover it any further.

doc/contour.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Surface;
 
 /* Create the Image object */

doc/filled_spline.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 
 /* Create and populate the Data object */
 $data = new Data();

doc/filled_step.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 
 /* Create and populate the Data object */
 $data = new Data();

doc/line.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 
 /* Build a dataset */
 $data = new Data();

doc/plot.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 
 /* Create and populate the Data object */
 $data = new Data();

doc/polar.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Radar;
 
 /* Create and populate the Data object */

doc/progress.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 
 $image = new Image(700, 250);
 

doc/radar.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Radar;
 
 /* Prepare some nice data & axis config */

doc/scatter_best_fit.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Scatter;
 
 /* Create the Data object */

doc/scatter_line.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Scatter;
 
 /* Create the Data object */

doc/scatter_plot.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Scatter;
 
 /* Create the Data object */

doc/scatter_spline.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Scatter;
 
 /* Create the Data object */

doc/scatter_threshold.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Scatter;
 
 /* Create the Data object */

doc/scatter_threshold_area.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Scatter;
 
 /* Create the Data object */

doc/spline.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 
 // Create and populate data
 $data = new Data([], "Serie1");

doc/split_path.md

@@ -5,8 +5,8 @@
 ```php
 require '/path/to/your/vendor/autoload.php';
 
-use CpChart\Chart\Data;
-use CpChart\Chart\Image;
+use CpChart\Data;
+use CpChart\Image;
 use CpChart\Chart\Split;
 
 /* Create the Image object */