DTO standalone

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-present Mark Scherer
+Copyright (c) 2019-present Mark Scherer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,4 @@
-# CakePHP DTO plugin
+# DTO Generator for PHP
 
 [![Build Status](https://travis-ci.org/dereuromark/cakephp-dto.svg?branch=master)](https://travis-ci.org/dereuromark/cakephp-dto)
 [![codecov](https://img.shields.io/codecov/c/github/dereuromark/cakephp-dto/master.svg)](https://codecov.io/gh/dereuromark/cakephp-dto)
@@ -26,7 +26,7 @@ For more see [Motivation and Background](/docs/Motivation.md).
 
 This plugin will provide you with a tool to quickly generate custom and optimized DTOs for your special use cases.
 
-This branch is for use with **CakePHP 4.0+**.
+This branch is for use with **PHP 7.2+**.
 
 ## Examples
 
@@ -44,15 +44,9 @@ You can install this plugin into your CakePHP application using [Composer](https
 The recommended way to install is:
 
 ```
-composer require dereuromark/cakephp-dto
+composer require dereuromark/dto
 ```
 
-Then load the plugin with the following command:
-```
-bin/cake plugin load CakeDto -b
-```
-The bootstrap is needed for the TwigView events to be set up. If you already included TwigView, you might not need the bootstrap.
-
 
 ## Usage
 

composer.json

@@ -1,9 +1,9 @@
 {
 	"name": "dereuromark/cakephp-dto",
-	"description": "CakePHP DTO Plugin",
-	"type": "cakephp-plugin",
-	"keywords": ["cakephp", "dto", "plugin"],
-	"homepage": "https://github.com/dereuromark/cakephp-dto/",
+	"description": "DTO Generator for PHP",
+	"type": "library",
+	"keywords": ["php", "dto", "generator"],
+	"homepage": "https://github.com/dereuromark/dto/",
 	"license": "MIT",
 	"authors": [
 		{
@@ -18,40 +18,39 @@
 		},
 		{
 			"name": "Other contributors",
-			"homepage": "https://github.com/dereuromark/cakephp-dto/graphs/contributors",
+			"homepage": "https://github.com/dereuromark/dto/graphs/contributors",
 			"role": "Developer"
 		}
 	],
 	"support": {
-		"issues": "https://github.com/dereuromark/cakephp-dto/issues",
-		"source": "https://github.com/dereuromark/cakephp-dto/"
+		"issues": "https://github.com/dereuromark/dto/issues",
+		"source": "https://github.com/dereuromark/dto/"
 	},
 	"require": {
+		"ext-json": "*",
 		"php": ">=7.2",
-		"cakephp/cakephp": "4.x-dev as 4.0.0",
-		"wyrihaximus/twig-view": "dev-master",
+		"twig/twig": "^2.10",
 		"sebastian/diff": "^3.0"
 	},
 	"require-dev": {
 		"ext-dom": "*",
 		"ext-libxml": "*",
 		"nette/neon": "^2.4",
+		"cakephp/collection": "4.x-dev as 4.0.0",
 		"fig-r/psr2r-sniffer": "dev-master"
 	},
 	"suggest": {
 		"nette/neon": "^2.4 if you want to add a NEON file engine instead of XML."
 	},
 	"autoload": {
 		"psr-4": {
-			"CakeDto\\": "src/"
+			"Dto\\": "src/"
 		}
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"CakeDto\\Test\\": "tests/",
-			"Cake\\Test\\": "vendor/cakephp/cakephp/tests/",
-			"TestApp\\": "tests/test_app/src/",
-			"Sandbox\\": "tests/test_app/plugins/Sandbox/src/"
+			"Dto\\Test\\": "tests/",
+			"TestApp\\": "tests/test_app/src/"
 		}
 	},
 	"scripts": {

config/bootstrap.php

@@ -3,5 +3,5 @@
 use WyriHaximus\TwigView\Event\ExtensionsListener;
 use WyriHaximus\TwigView\Event\TokenParsersListener;
 
-EventManager::instance()->on(new ExtensionsListener());
-EventManager::instance()->on(new TokenParsersListener());
+//EventManager::instance()->on(new ExtensionsListener());
+//EventManager::instance()->on(new TokenParsersListener());

docs/README.md

@@ -276,7 +276,7 @@ Objects, which are not DTOs or Collections, can get lost here.
 If you have value objects (especially immutable ones), implement the `FromArrayToArrayInterface` here:
 
 ```php
-use CakeDto\Dto\FromArrayToArrayInterface;
+use Dto\Dto\FromArrayToArrayInterface;
 
 final class Paint implements FromArrayToArrayInterface {}
 ```

phpunit.xml.dist

@@ -15,7 +15,7 @@
 
     <!-- Add any additional test suites you want to run here -->
     <testsuites>
-        <testsuite name="cake-dto">
+        <testsuite name="dto">
             <directory>tests/TestCase/</directory>
         </testsuite>
     </testsuites>

src/Console/Io.php

@@ -1,5 +1,5 @@
 <?php
-namespace CakeDto\Console;
+namespace Dto\Console;
 
 use Cake\Console\ConsoleIo;
 use Cake\Console\Exception\StopException;

src/Dto/AbstractDto.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace CakeDto\Dto;
+namespace Dto\Dto;
 
-use CakeDto\View\Json;
+use Dto\View\Json;
 use RuntimeException;
 
 abstract class AbstractDto extends Dto {

src/Dto/AbstractImmutableDto.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace CakeDto\Dto;
+namespace Dto\Dto;
 
-use CakeDto\View\Json;
+use Dto\View\Json;
 use RuntimeException;
 
 abstract class AbstractImmutableDto extends Dto {

src/Dto/Dto.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace CakeDto\Dto;
+namespace Dto\Dto;
 
 use ArrayAccess;
-use CakeDto\View\Json;
+use Dto\View\Json;
 use Cake\Collection\Collection;
 use Countable;
 use InvalidArgumentException;
@@ -137,11 +137,11 @@ public function toArray($type = self::TYPE_DEFAULT, array $fields = null, $touch
 				} elseif ($value instanceof Countable && $value->count()) {
 					$values = $this->transformCollectiontoArray($value, $values, $key, $touched ? 'touchedToArray' : 'toArray', $type);
 				} elseif ($this->_metadata[$field]['serializable']) {
-					/** @var \CakeDto\Dto\FromArrayToArrayInterface $value */
+					/** @var \Dto\Dto\FromArrayToArrayInterface $value */
 					$values[$key] = $value->toArray();
 				} elseif ($this->_metadata[$field]['toArray']) {
 					// This will not be transformable in the other direction
-					/** @var \CakeDto\Dto\FromArrayToArrayInterface $value */
+					/** @var \Dto\Dto\FromArrayToArrayInterface $value */
 					$values[$key] = $value->toArray();
 				} else {
 					$values[$key] = $value;
@@ -278,15 +278,15 @@ protected function createCakeCollection($elementType, $arrayObject, $ignoreMissi
 			}
 
 			if (array_values($arrayElement) !== $arrayElement) {
-				/** @var \CakeDto\Dto\Dto $dto */
+				/** @var \Dto\Dto\Dto $dto */
 				$dto = new $elementType($arrayElement, $ignoreMissing, $type);
 				$collection = $collection->appendItem($dto);
 
 				continue;
 			}
 
 			foreach ($arrayElement as $arrayElementItem) {
-				/** @var \CakeDto\Dto\Dto $dto */
+				/** @var \Dto\Dto\Dto $dto */
 				$dto = new $elementType($arrayElementItem, $ignoreMissing, $type);
 				$collection = $collection->appendItem($dto);
 			}
@@ -301,10 +301,10 @@ protected function createCakeCollection($elementType, $arrayObject, $ignoreMissi
 	 * @param bool $ignoreMissing
 	 * @param string $type
 	 *
-	 * @return \CakeDto\Dto\Dto
+	 * @return \Dto\Dto\Dto
 	 */
 	protected function createDto($field, $value, $ignoreMissing, $type) {
-		/** @var \CakeDto\Dto\AbstractDto $dto */
+		/** @var \Dto\Dto\AbstractDto $dto */
 		$className = $this->_metadata[$field]['type'];
 
 		if (is_array($value)) {
@@ -318,10 +318,10 @@ protected function createDto($field, $value, $ignoreMissing, $type) {
 	 * @param string $field
 	 * @param mixed $value
 	 *
-	 * @return \CakeDto\Dto\Dto
+	 * @return \Dto\Dto\Dto
 	 */
 	protected function createObject($field, $value) {
-		/** @var \CakeDto\Dto\FromArrayToArrayInterface $className */
+		/** @var \Dto\Dto\FromArrayToArrayInterface $className */
 		$className = $this->_metadata[$field]['type'];
 
 		if (is_array($value)) {
@@ -350,15 +350,15 @@ protected function createCollection($collectionType, $elementType, $arrayObject,
 			}
 
 			if (array_values($arrayElement) !== $arrayElement) {
-				/** @var \CakeDto\Dto\Dto $dto */
+				/** @var \Dto\Dto\Dto $dto */
 				$dto = new $elementType($arrayElement, $ignoreMissing, $type);
 				$collection->append($dto);
 
 				continue;
 			}
 
 			foreach ($arrayElement as $arrayElementItem) {
-				/** @var \CakeDto\Dto\Dto $dto */
+				/** @var \Dto\Dto\Dto $dto */
 				$dto = new $elementType($arrayElementItem, $ignoreMissing, $type);
 				$collection->append($dto);
 			}
@@ -385,15 +385,15 @@ protected function createArrayCollection($elementType, $arrayObject, $ignoreMiss
 			}
 
 			if (array_values($arrayElement) !== $arrayElement) {
-				/** @var \CakeDto\Dto\Dto $dto */
+				/** @var \Dto\Dto\Dto $dto */
 				$dto = new $elementType($arrayElement, $ignoreMissing, $type);
 				$collection = $this->addValueToArrayCollection($collection, $dto, $arrayElement, $index, $key);
 
 				continue;
 			}
 
 			foreach ($arrayElement as $arrayElementItem) {
-				/** @var \CakeDto\Dto\Dto $dto */
+				/** @var \Dto\Dto\Dto $dto */
 				$dto = new $elementType($arrayElementItem, $ignoreMissing, $type);
 				$collection = $this->addValueToArrayCollection($collection, $dto, $arrayElement, $index, $key);
 			}

src/Dto/FromArrayToArrayInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CakeDto\Dto;
+namespace Dto\Dto;
 
 /**
  * Implement this interface for your VOs that should be fromArray()/toArray() safe.

src/Engine/EngineInterface.php

@@ -1,5 +1,5 @@
 <?php
-namespace CakeDto\Engine;
+namespace Dto\Engine;
 
 interface EngineInterface {
 

src/Engine/NeonEngine.php

@@ -1,5 +1,5 @@
 <?php
-namespace CakeDto\Engine;
+namespace Dto\Engine;
 
 use InvalidArgumentException;
 use Nette\Neon\Exception;

src/Engine/XmlEngine.php

@@ -1,5 +1,5 @@
 <?php
-namespace CakeDto\Engine;
+namespace Dto\Engine;
 
 use Cake\Utility\Xml;
 

src/Engine/XmlValidator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CakeDto\Engine;
+namespace Dto\Engine;
 
 use Cake\Core\Plugin;
 use DOMDocument;

src/Engine/YamlEngine.php

@@ -1,5 +1,5 @@
 <?php
-namespace CakeDto\Engine;
+namespace Dto\Engine;
 
 use InvalidArgumentException;
 

src/Generator/Builder.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace CakeDto\Generator;
+namespace Dto\Generator;
 
-use CakeDto\Dto\FromArrayToArrayInterface;
-use CakeDto\Engine\EngineInterface;
+use Dto\Dto\FromArrayToArrayInterface;
+use Dto\Engine\EngineInterface;
 use Cake\Core\Configure;
 use Cake\Core\InstanceConfigTrait;
 use Cake\Utility\Inflector;

src/Generator/DiffHelperTrait.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CakeDto\Generator;
+namespace Dto\Generator;
 
 use Cake\Console\Shell;
 use SebastianBergmann\Diff\Differ;

src/Generator/Finder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CakeDto\Generator;
+namespace Dto\Generator;
 
 use DirectoryIterator;
 use InvalidArgumentException;

src/Generator/Generator.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace CakeDto\Generator;
+namespace Dto\Generator;
 
-use CakeDto\Console\Io;
-use CakeDto\View\Renderer;
+use Dto\Console\Io;
+use Dto\View\Renderer;
 use Cake\Console\Shell;
 use Exception;
 use RecursiveDirectoryIterator;

src/Shell/DtoShell.php

@@ -1,12 +1,12 @@
 <?php
-namespace CakeDto\Shell;
-
-use CakeDto\Console\Io;
-use CakeDto\Engine\EngineInterface;
-use CakeDto\Engine\XmlEngine;
-use CakeDto\Generator\Builder;
-use CakeDto\Generator\Generator;
-use CakeDto\View\Renderer;
+namespace Dto\Shell;
+
+use Dto\Console\Io;
+use Dto\Engine\EngineInterface;
+use Dto\Engine\XmlEngine;
+use Dto\Generator\Builder;
+use Dto\Generator\Generator;
+use Dto\View\Renderer;
 use Cake\Console\ConsoleOptionParser;
 use Cake\Console\Shell;
 use Cake\Core\Configure;

src/TestSuite/DebugMemory.php

@@ -11,7 +11,7 @@
  * @since         DebugKit 2.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace CakeDto\TestSuite;
+namespace Dto\TestSuite;
 
 use Cake\Error\Debugger;