update deps; removed reflection parsers

gossi · gossi · commit 661fa282410d · 2017-07-01T19:12:33.000+02:00
diff --git a/.project b/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.php.composer.core.builder.buildPathManagementBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.wst.common.project.facet.core.builder</name>
 			<arguments>
diff --git a/.settings/org.eclipse.php.composer.core.prefs b/.settings/org.eclipse.php.composer.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.php.composer.corebuildpath.includes.excludes=<buildpathentry including\="tests/" kind\="src" path\="vendor"/>\n
diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-phpVersion=php5.4
+phpVersion=php5.6
 useShortTags=false
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="php.core.component" version="1"/>
+  <installed facet="php.component" version="7.1"/>
+  <installed facet="php.composer.component" version="1"/>
+</faceted-project>
diff --git a/README.md b/README.md
@@ -1,25 +1,20 @@
 # PHP Code Generator
 
-[![License](https://poser.pugx.org/gossi/php-code-generator/license)](https://packagist.org/packages/gossi/php-code-generator)
-[![Latest Stable Version](https://poser.pugx.org/gossi/php-code-generator/v/stable)](https://packagist.org/packages/gossi/php-code-generator)
-[![Total Downloads](https://poser.pugx.org/gossi/php-code-generator/downloads)](https://packagist.org/packages/gossi/php-code-generator)<br>
-[![HHVM Status](http://hhvm.h4cc.de/badge/gossi/php-code-generator.svg?style=flat)](http://hhvm.h4cc.de/package/gossi/php-code-generator)
-[![Build Status](https://travis-ci.org/gossi/php-code-generator.svg?branch=master)](https://travis-ci.org/gossi/php-code-generator)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/gossi/php-code-generator/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/gossi/php-code-generator/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/gossi/php-code-generator/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/gossi/php-code-generator/?branch=master)
+[![License](https://img.shields.io/github/license/gossi/php-code-generator.svg?style=flat-square)](https://packagist.org/packages/gossi/php-code-generator)
+[![Latest Stable Version](https://img.shields.io/packagist/v/gossi/php-code-generator.svg?style=flat-square)](https://packagist.org/packages/gossi/php-code-generator)
+[![Total Downloads](https://img.shields.io/packagist/dt/gossi/php-code-generator.svg?style=flat-square&colorB=007ec6)](https://packagist.org/packages/gossi/php-code-generator)<br>
+[![Build Status](https://img.shields.io/scrutinizer/build/g/gossi/php-code-generator.svg?style=flat-square)](https://travis-ci.org/gossi/php-code-generator)
+[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/gossi/php-code-generator.svg?style=flat-square)](https://scrutinizer-ci.com/g/gossi/php-code-generator)
+[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/gossi/php-code-generator.svg?style=flat-square)](https://scrutinizer-ci.com/g/gossi/php-code-generator)
 
 This library provides some tools that you commonly need for generating PHP code.
 
 ## Installation
 
 Install via Composer:
 
-```json
-{
-	"require": {
-		"gossi/php-code-generator": "dev-master"
-	}
-}
+```
+composer require gossi/php-code-generator
 ```
 
 ## Documentation
@@ -30,7 +25,6 @@ Documentation is available at [https://php-code-generator.readthedocs.org](https
 
 Feel free to fork and submit a pull request (don't forget the tests) and I am happy to merge.
 
-
 ## References
 
 - This project is a spin-off of the older [schmittjoh/cg-library](https://github.com/schmittjoh/cg-library) library.
diff --git a/composer.json b/composer.json
@@ -11,6 +11,9 @@
 	"keywords" : [
 		"code generation"
 	],
+	"support" : {
+		"issues" : "https://github.com/gossi/php-code-generator/issues"
+	},
 	"autoload" : {
 		"psr-4" : {
 			"gossi\\codegen\\" : "src/"
@@ -22,18 +25,22 @@
 		}
 	},
 	"require" : {
-		"php" : ">=5.4",
+		"php" : ">=5.6",
 		"gossi/docblock" : "~1",
-		"symfony/options-resolver" : "~2|~3",
+		"symfony/options-resolver" : "^3",
 		"phootwork/file" : "~0",
 		"phootwork/tokenizer" : "~0",
-		"nikic/php-parser" : "~1|~2"
+		"nikic/php-parser" : "^3|^2|^1"
 	},
 	"require-dev" : {
-		"phpunit/phpunit" : "~4",
-		"sami/sami" : "~3"
+		"phpunit/phpunit" : "^5.7",
+		"sami/sami" : "^4|^3"
 	},
 	"suggest" : {
 		"gossi/php-code-formatter" : "Formatting your generated code"
+	},
+	"scripts" : {
+		"test" : "phpunit",
+		"api" : "sami.php update sami.php"
 	}
 }
diff --git a/src/generator/CodeFileGenerator.php b/src/generator/CodeFileGenerator.php
@@ -3,7 +3,6 @@
 
 use gossi\codegen\config\CodeFileGeneratorConfig;
 use gossi\codegen\model\GenerateableInterface;
-use gossi\docblock\Docblock;
 use phootwork\lang\Text;
 
 /**
diff --git a/src/generator/builder/AbstractBuilder.php b/src/generator/builder/AbstractBuilder.php
@@ -1,11 +1,10 @@
 <?php
 namespace gossi\codegen\generator\builder;
 
+use gossi\codegen\config\CodeGeneratorConfig;
 use gossi\codegen\generator\ModelGenerator;
 use gossi\codegen\generator\utils\Writer;
 use gossi\codegen\model\AbstractModel;
-use gossi\docblock\Docblock;
-use gossi\codegen\config\CodeGeneratorConfig;
 use gossi\codegen\model\DocblockInterface;
 
 abstract class AbstractBuilder {
diff --git a/src/model/PhpClass.php b/src/model/PhpClass.php
@@ -30,17 +30,6 @@ class PhpClass extends AbstractPhpStruct implements GenerateableInterface, Trait
 	/** @var string */
 	private $parentClassName;
 
-	/**
-	 * Creates a PHP class from reflection
-	 *
-	 * @deprecated Use fromFile() instead
-	 * @param \ReflectionClass $ref
-	 * @return PhpClass
-	 */
-	public static function fromReflection(\ReflectionClass $ref) {
-		return static::fromFile($ref->getFileName());
-	}
-
 	/**
 	 * Creates a PHP class from file
 	 *
diff --git a/src/model/PhpFunction.php b/src/model/PhpFunction.php
@@ -25,7 +25,6 @@
 use gossi\codegen\model\parts\ReferenceReturnPart;
 use gossi\codegen\model\parts\TypeDocblockGeneratorPart;
 use gossi\codegen\model\parts\TypePart;
-use gossi\codegen\utils\ReflectionUtils;
 use gossi\docblock\Docblock;
 use gossi\docblock\tags\ReturnTag;
 
@@ -46,32 +45,32 @@ class PhpFunction extends AbstractModel implements GenerateableInterface, Namesp
 	use TypeDocblockGeneratorPart;
 	use TypePart;
 
-	/**
-	 * Creates a PHP function from reflection
-	 *
-	 * @deprecated will be removed in version 0.5
-	 * @param \ReflectionFunction $ref
-	 * @return PhpFunction
-	 */
-	public static function fromReflection(\ReflectionFunction $ref) {
-		$function = self::create($ref->name)
-			->setReferenceReturned($ref->returnsReference())
-			->setBody(ReflectionUtils::getFunctionBody($ref));
+// 	/**
+// 	 * Creates a PHP function from reflection
+// 	 *
+// 	 * @deprecated will be removed in version 0.5
+// 	 * @param \ReflectionFunction $ref
+// 	 * @return PhpFunction
+// 	 */
+// 	public static function fromReflection(\ReflectionFunction $ref) {
+// 		$function = self::create($ref->name)
+// 			->setReferenceReturned($ref->returnsReference())
+// 			->setBody(ReflectionUtils::getFunctionBody($ref));
 
-		$docblock = new Docblock($ref);
-		$function->setDocblock($docblock);
-		$function->setDescription($docblock->getShortDescription());
-		$function->setLongDescription($docblock->getLongDescription());
+// 		$docblock = new Docblock($ref);
+// 		$function->setDocblock($docblock);
+// 		$function->setDescription($docblock->getShortDescription());
+// 		$function->setLongDescription($docblock->getLongDescription());
 
-		foreach ($ref->getParameters() as $refParam) {
-			assert($refParam instanceof \ReflectionParameter); // hmm - assert here?
+// 		foreach ($ref->getParameters() as $refParam) {
+// 			assert($refParam instanceof \ReflectionParameter); // hmm - assert here?
 
-			$param = PhpParameter::fromReflection($refParam);
-			$function->addParameter($param);
-		}
+// 			$param = PhpParameter::fromReflection($refParam);
+// 			$function->addParameter($param);
+// 		}
 
-		return $function;
-	}
+// 		return $function;
+// 	}
 
 	/**
 	 * Creates a new PHP function
diff --git a/src/model/PhpInterface.php b/src/model/PhpInterface.php
@@ -18,17 +18,6 @@ class PhpInterface extends AbstractPhpStruct implements GenerateableInterface, C
 	use ConstantsPart;
 	use InterfacesPart;
 
-	/**
-	 * Creates a PHP interface from reflection
-	 *
-	 * @deprecated Use fromFile() instead
-	 * @param \ReflectionClass $ref
-	 * @return PhpInterface
-	 */
-	public static function fromReflection(\ReflectionClass $ref) {
-		return static::fromFile($ref->getFileName());
-	}
-
 	/**
 	 * Creates a PHP interface from file
 	 *
diff --git a/src/model/PhpMethod.php b/src/model/PhpMethod.php
@@ -22,7 +22,6 @@
 use gossi\codegen\model\parts\ParametersPart;
 use gossi\codegen\model\parts\ReferenceReturnPart;
 use gossi\codegen\model\parts\TypeDocblockGeneratorPart;
-use gossi\docblock\Docblock;
 use gossi\docblock\tags\ReturnTag;
 
 /**
diff --git a/src/model/PhpParameter.php b/src/model/PhpParameter.php
@@ -19,7 +19,6 @@
 use gossi\codegen\model\parts\NamePart;
 use gossi\codegen\model\parts\TypePart;
 use gossi\codegen\model\parts\ValuePart;
-use gossi\docblock\Docblock;
 use gossi\docblock\tags\ParamTag;
 
 /**
@@ -46,58 +45,6 @@ public static function create($name = null) {
 		return new static($name);
 	}
 
-	/**
-	 * Creates a PHP parameter from reflection
-	 *
-	 * @deprecated will be removed in version 0.5
-	 * @param \ReflectionParameter $ref
-	 * @return PhpParameter
-	 */
-	public static function fromReflection(\ReflectionParameter $ref) {
-		$parameter = new static();
-		$parameter->setName($ref->name)->setPassedByReference($ref->isPassedByReference());
-
-		if ($ref->isDefaultValueAvailable()) {
-			$value = $ref->getDefaultValue();
-			
-			if (is_string($value)
-					|| is_int($value)
-					|| is_float($value)
-					|| is_bool($value)
-					|| is_null($value)
-					|| ($value instanceof PhpConstant)) {
-				$parameter->setValue($value);
-			} else {
-				$parameter->setExpression($value);
-			}
-		}
-
-		// find type and description in docblock
-		$docblock = new Docblock($ref->getDeclaringFunction());
-
-		$params = $docblock->getTags('param');
-		$tag = $params->find($ref->name, function (ParamTag $t, $name) {
-			return $t->getVariable() == '$' . $name;
-		});
-
-		if ($tag !== null) {
-			$parameter->setType($tag->getType(), $tag->getDescription());
-		}
-
-		// set type if not found in comment
-		if ($parameter->getType() === null) {
-			if ($ref->isArray()) {
-				$parameter->setType('array');
-			} elseif ($class = $ref->getClass()) {
-				$parameter->setType($class->getName());
-			} elseif (method_exists($ref, 'isCallable') && $ref->isCallable()) {
-				$parameter->setType('callable');
-			}
-		}
-
-		return $parameter;
-	}
-
 	/**
 	 * Creates a new PHP parameter
 	 *
diff --git a/src/model/PhpProperty.php b/src/model/PhpProperty.php
@@ -18,7 +18,6 @@
 
 use gossi\codegen\model\parts\TypeDocblockGeneratorPart;
 use gossi\codegen\model\parts\ValuePart;
-use gossi\docblock\Docblock;
 use gossi\docblock\tags\VarTag;
 
 /**
diff --git a/src/model/PhpTrait.php b/src/model/PhpTrait.php
@@ -19,17 +19,6 @@ class PhpTrait extends AbstractPhpStruct implements GenerateableInterface, Trait
 	use PropertiesPart;
 	use TraitsPart;
 
-	/**
-	 * Creates a PHP trait from reflection
-	 *
-	 * @deprecated Use fromFile() instead
-	 * @param \ReflectionClass $ref
-	 * @return PhpTrait
-	 */
-	public static function fromReflection(\ReflectionClass $ref) {
-		return static::fromFile($ref->getFileName());
-	}
-
 	/**
 	 * Creates a PHP trait from a file
 	 *
diff --git a/src/model/PropertiesInterface.php b/src/model/PropertiesInterface.php
@@ -1,6 +1,9 @@
 <?php
 namespace gossi\codegen\model;
 
+use phootwork\collection\Map;
+use phootwork\collection\Set;
+
 interface PropertiesInterface {
 
 	/**
diff --git a/src/model/parts/ParametersPart.php b/src/model/parts/ParametersPart.php
@@ -3,6 +3,7 @@
 
 use gossi\codegen\model\PhpParameter;
 use gossi\docblock\tags\ParamTag;
+use gossi\docblock\Docblock;
 
 /**
  * Parameters Part
diff --git a/src/model/parts/PropertiesPart.php b/src/model/parts/PropertiesPart.php
@@ -3,6 +3,7 @@
 
 use gossi\codegen\model\PhpProperty;
 use phootwork\collection\Map;
+use phootwork\collection\Set;
 
 /**
  * Properties part
diff --git a/src/model/parts/TypeDocblockGeneratorPart.php b/src/model/parts/TypeDocblockGeneratorPart.php
@@ -2,6 +2,7 @@
 namespace gossi\codegen\model\parts;
 
 use gossi\docblock\tags\AbstractTag;
+use gossi\docblock\Docblock;
 
 /**
  * Type docblock generator part
diff --git a/src/parser/visitor/StructParserVisitor.php b/src/parser/visitor/StructParserVisitor.php
@@ -2,17 +2,16 @@
 namespace gossi\codegen\parser\visitor;
 
 use PhpParser\Comment\Doc;
-use PhpParser\Node;
 use PhpParser\Node\Const_;
-use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassConst;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Interface_;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\Property;
-use PhpParser\Node\Stmt\Trait_;
 use PhpParser\Node\Stmt\TraitUse;
+use PhpParser\Node\Stmt\Trait_;
 use PhpParser\Node\Stmt\UseUse;
 use gossi\codegen\model\AbstractPhpStruct;
 
diff --git a/src/parser/visitor/parts/StructParserPart.php b/src/parser/visitor/parts/StructParserPart.php
@@ -5,6 +5,7 @@
 use PhpParser\Node\Stmt\TraitUse;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\UseUse;
+use gossi\codegen\model\AbstractPhpStruct;
 
 trait StructParserPart {
 	
diff --git a/tests/parser/ClassParserTest.php b/tests/parser/ClassParserTest.php
diff --git a/tests/parser/FunctionParserTest.php b/tests/parser/FunctionParserTest.php
diff --git a/tests/parser/InterfaceParserTest.php b/tests/parser/InterfaceParserTest.php
diff --git a/tests/parser/ParameterParserTest.php b/tests/parser/ParameterParserTest.php
diff --git a/tests/parser/TraitParserTest.php b/tests/parser/TraitParserTest.php

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+eclipse.preferences.version=1`
	`2`	`+org.eclipse.php.composer.corebuildpath.includes.excludes=<buildpathentry including\="tests/" kind\="src" path\="vendor"/>\n`