update deps

Author: gossi

.travis.yml

@@ -6,6 +6,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - hhvm
 
 install:

composer.json

@@ -1,7 +1,7 @@
 {
 	"name" : "gossi/php-code-generator",
-	"description" : "Toolset for generating PHP code",
 	"type" : "library",
+	"description" : "Toolset for generating PHP code",
 	"license" : "Apache2",
 	"authors" : [{
 			"name" : "Thomas Gossmann",
@@ -27,18 +27,17 @@
 	"require" : {
 		"php" : ">=5.6",
 		"gossi/docblock" : "~1",
-		"symfony/options-resolver" : "^3",
+		"gossi/php-code-profiles" : "dev-master",
+		"gossi/php-code-formatter" : "dev-master",
+		"symfony/options-resolver" : "^3|^4",
 		"phootwork/file" : "~0",
 		"phootwork/tokenizer" : "~0",
-		"nikic/php-parser" : "^3|^2|^1"
+		"nikic/php-parser" : "^4|^3|^2|^1"
 	},
 	"require-dev" : {
 		"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"

phpunit.xml.dist

@@ -26,8 +26,5 @@
     		<directory suffix=".php">src/</directory>
     	</whitelist>
     </filter>
-    
-    <logging>
-		<log type="coverage-html" target="coverage"/>
-	</logging>
+   
 </phpunit>

src/parser/FileParser.php

@@ -14,26 +14,26 @@ class FileParser extends NodeVisitorAbstract {
 
 	private $visitors;
 	private $filename;
-	
+
 	public function __construct($filename) {
 		$this->filename = $filename;
 		$this->visitors = new Set();
 	}
-	
+
 	public function addVisitor(ParserVisitorInterface $visitor) {
 		$this->visitors->add($visitor);
 		return $this;
 	}
-	
+
 	public function removeVisitor(ParserVisitorInterface $visitor) {
 		$this->visitors->remove($visitor);
 		return $this;
 	}
-	
+
 	public function hasVisitor(ParserVisitorInterface $visitor) {
 		return $this->visitors->contains($visitor);
 	}
-	
+
 	/**
 	 * @throws FileNotFoundException
 	 * @return AbstractPhpStruct
@@ -50,54 +50,50 @@ public function parse() {
 		$traverser->addVisitor($this);
 		$traverser->traverse($parser->parse($file->read()));
 	}
-	
+
 	private function getParser() {
-		if (class_exists('\\PhpParser\\ParserFactory')) {
-			$factory = new \PhpParser\ParserFactory();
-			return $factory->create(\PhpParser\ParserFactory::PREFER_PHP7);
-		} else {
-			return new \PhpParser\Parser(new \PhpParser\Lexer\Emulative());
-		}
+		$factory = new \PhpParser\ParserFactory();
+		return $factory->create(\PhpParser\ParserFactory::PREFER_PHP7);
 	}
-	
+
 	public function enterNode(Node $node) {
 		foreach ($this->visitors as $visitor) {
 			switch ($node->getType()) {
 				case 'Stmt_Namespace':
 					$visitor->visitNamespace($node);
 					break;
-		
+
 				case 'Stmt_UseUse':
 					$visitor->visitUseStatement($node);
 					break;
-		
+
 				case 'Stmt_Class':
 					$visitor->visitStruct($node);
 					$visitor->visitClass($node);
 					break;
-		
+
 				case 'Stmt_Interface':
 					$visitor->visitStruct($node);
 					$visitor->visitInterface($node);
 					break;
-		
+
 				case 'Stmt_Trait':
 					$visitor->visitStruct($node);
 					$visitor->visitTrait($node);
 					break;
-		
+
 				case 'Stmt_TraitUse':
 					$visitor->visitTraitUse($node);
 					break;
-		
+
 				case 'Stmt_ClassConst':
 					$visitor->visitConstants($node);
 					break;
-		
+
 				case 'Stmt_Property':
 					$visitor->visitProperty($node);
 					break;
-		
+
 				case 'Stmt_ClassMethod':
 					$visitor->visitMethod($node);
 					break;

src/parser/visitor/MethodParserVisitor.php

@@ -11,43 +11,43 @@
 use PhpParser\Node\Stmt\ClassMethod;
 
 class MethodParserVisitor extends StructParserVisitor {
-	
+
 	use MemberParserPart;
 	use ValueParserPart;
-	
+
 	public function visitMethod(ClassMethod $node) {
 		$m = new PhpMethod($node->name);
 		$m->setAbstract($node->isAbstract());
 		$m->setFinal($node->isFinal());
 		$m->setVisibility($this->getVisibility($node));
 		$m->setStatic($node->isStatic());
 		$m->setReferenceReturned($node->returnsByRef());
-	
+
 		// docblock
 		if (($doc = $node->getDocComment()) !== null) {
 			$m->setDocblock($doc->getReformattedText());
 			$docblock = $m->getDocblock();
 			$m->setDescription($docblock->getShortDescription());
 			$m->setLongDescription($docblock->getLongDescription());
 		}
-	
+
 		// params
 		$params = $m->getDocblock()->getTags('param');
 		foreach ($node->params as $param) {
-			/* @var $param Param */
-	
+// 			/* @var $param Param */
+
 			$p = new PhpParameter();
 			$p->setName($param->name);
 			$p->setPassedByReference($param->byRef);
-	
+
 			if (is_string($param->type)) {
 				$p->setType($param->type);
 			} else if ($param->type instanceof Name) {
 				$p->setType(implode('\\', $param->type->parts));
 			}
-	
+
 			$this->parseValue($p, $param);
-	
+
 			$tag = $params->find($p, function (ParamTag $t, $p) {
 				return $t->getVariable() == '$' . $p->getName();
 			});

tests/fixtures/Entity.php

@@ -3,7 +3,7 @@
 
 /**
  * Doc Comment.
- * 
+ *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
 abstract class Entity {
@@ -20,7 +20,7 @@ private static function bar() {
 
 	/**
 	 * Another doc comment.
-	 * 
+	 *
 	 * @param $a
 	 * @param array $b
 	 * @param \stdClass $c

tests/model/DocblockTest.php

@@ -79,9 +79,9 @@ public function testClass() {
 
 		$expected = '/**
  * this is my class
- * 
+ *
  * this is my very long class
- * 
+ *
  * @author gossi <iiih@mail.me>
  */';
 		$this->assertEquals($expected, $docblock->toString());
@@ -140,9 +140,9 @@ public function testEmptyFunction() {
 	public function testConstant() {
 		$expected = '/**
  * my constant
- * 
+ *
  * my very long contstant
- * 
+ *
  * @var boolean this constant is a boolean
  */';
 		$constant = $this->getConstant();
@@ -160,9 +160,9 @@ public function testEmptyConstant() {
 	public function testProperty() {
 		$expected = '/**
  * my prop
- * 
+ *
  * my very long prop
- * 
+ *
  * @var int this prop is an integer
  */';
 		$property = $this->getProperty();
@@ -180,9 +180,9 @@ public function testEmptyProperty() {
 	public function testMethod() {
 		$expected = '/**
  * my method
- * 
+ *
  * my very long method
- * 
+ *
  * @see MyClass#myMethod see-desc
  * @param $a method-param
  * @throws \Exception when something goes wrong