Merge branch 'release/2.0.0'

Author: mikaelcom

.docker/Dockerfile

@@ -0,0 +1,9 @@
+FROM php:7.1-apache
+
+RUN apt-get update \
+    && apt-get install -y git zip
+
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+COPY . /var/www/html
+
+WORKDIR /var/www/html

.gitignore

@@ -1,4 +1,4 @@
 vendor/
 composer.lock
 phpunit.xml
-
+.idea

.php_cs

@@ -2,17 +2,19 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->exclude('vendor')
-    ->exclude('tests')
     ->in(__DIR__);
 
 return PhpCsFixer\Config::create()
 	->setUsingCache(false)
-    ->setRules(array(
+    ->setRules([
         '@PSR2' => true,
+        'array_syntax' => [
+            'syntax' => 'short',
+        ],
         'binary_operator_spaces' => true,
         'no_whitespace_in_blank_line' => true,
         'ternary_operator_spaces' => true,
         'cast_spaces' => true,
         'trailing_comma_in_multiline_array' => true
-	))
+	])
     ->setFinder($finder);

.travis.yml

@@ -3,15 +3,12 @@ language: php
 sudo: false
 
 php:
-    - 5.3
-    - 5.4
-    - 5.5
-    - 5.6
-    - 7.0
-    - 7.1
+  - 7.1
+  - 7.2
 
-before_install:
-    - composer self-update
+cache:
+  directories:
+    - $HOME/.composer/cache
 
 install:
     - composer install

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 2.0.0
+- Use PHP 7.1 features
+- Refactore code
+- Fix typos
+
 ## 1.2.1
 - Review filemode, add SensioLabs Insight badge
 

README.md

@@ -1,11 +1,12 @@
-# WsdlToPhp Php Generator, a Real PHP source code generator
+# PhpGenerator, a Real PHP source code generator
+
+> PhpGenerator helps generating PHP source code
+
 [![License](https://poser.pugx.org/wsdltophp/phpgenerator/license)](https://packagist.org/packages/wsdltophp/phpgenerator)
 [![Latest Stable Version](https://poser.pugx.org/wsdltophp/phpgenerator/version.png)](https://packagist.org/packages/wsdltophp/phpgenerator)
 [![Build Status](https://api.travis-ci.org/WsdlToPhp/PhpGenerator.svg)](https://travis-ci.org/WsdlToPhp/PhpGenerator)
-[![PHP 7 ready](http://php7ready.timesplinter.ch/WsdlToPhp/PhpGenerator/badge.svg)](https://travis-ci.org/WsdlToPhp/PhpGenerator)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/WsdlToPhp/PhpGenerator/badges/quality-score.png)](https://scrutinizer-ci.com/g/WsdlToPhp/PhpGenerator/)
 [![Code Coverage](https://scrutinizer-ci.com/g/WsdlToPhp/PhpGenerator/badges/coverage.png)](https://scrutinizer-ci.com/g/WsdlToPhp/PhpGenerator/)
-[![Dependency Status](https://www.versioneye.com/user/projects/5571b32b6634650018000011/badge.svg)](https://www.versioneye.com/user/projects/5571b32b6634650018000011)
 [![StyleCI](https://styleci.io/repos/36832375/shield)](https://styleci.io/repos/36832375)
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/e55e9115-5a3f-4d37-bfd5-b01c8de579f9/mini.png)](https://insight.sensiolabs.com/projects/e55e9115-5a3f-4d37-bfd5-b01c8de579f9)
 
@@ -14,15 +15,15 @@ Even if this project is yet another PHP source code generator, its main goal is
 Rest assured that it is not tweaked for the purpose of the [PackageGenerator](https://github.com/WsdlToPhp/PackageGenerator) project.
 
 ## Main features
-This projet contains two main features:
+This project contains two main features:
 
 - [Element](src/Element/README.md): generate basic elements
 - [Component](src/Component/README.md): generate structured complex elements
 
 ## Unit tests
 You can run the unit tests with the following command:
 ```
-    $ cd /path/to/src/WsdlToPhp/PhpGenerator/
-    $ composer install
-    $ phpunit
+$ cd /path/to/src/WsdlToPhp/PhpGenerator/
+$ composer install
+$ composer test
 ```

composer.json

@@ -1,29 +1,42 @@
 {
     "name" : "wsdltophp/phpgenerator",
     "description" : "Generate php source file",
+    "license" : "MIT",
+    "keywords" : [ "php", "generator" ],
+    "type" : "library",
+    "support" : {
+        "email" : "[email protected]"
+    },
+    "homepage" : "https://github.com/WsdlToPhp/PhpGenerator",
+    "authors" : [
+        {
+            "name" : "Mikaël DELSOL",
+            "email" : "[email protected]",
+            "role" : "Owner"
+        }
+    ],
+    "scripts": {
+        "test": "vendor/bin/phpunit",
+        "lint": "vendor/bin/php-cs-fixer fix --ansi --diff --verbose"
+    },
     "require" : {
-        "php" : ">=5.3.3"
+        "php" : ">=7.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2.0",
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "^4.8 || ^6.0"
     },
-    "license" : "MIT",
-    "keywords" : [ "php", "generator" ],
     "autoload" : {
         "psr-4" : {
-            "WsdlToPhp\\PhpGenerator\\" : "src",
-            "WsdlToPhp\\PhpGenerator\\Tests\\" : "tests"
+            "WsdlToPhp\\PhpGenerator\\" : "src"
         }
     },
-    "type" : "library",
-    "support" : {
-        "email" : "[email protected]"
+    "autoload-dev": {
+        "psr-4": {
+            "WsdlToPhp\\PhpGenerator\\Tests\\": "tests"
+        }
     },
-    "homepage" : "https://github.com/WsdlToPhp/PhpGenerator",
-    "authors" : [ {
-        "name" : "Mikaël DELSOL",
-        "email" : "[email protected]",
-        "role" : "Owner"
-    } ]
+    "config": {
+        "sort-packages": true
+    }
 }

docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3.4'
+
+services:
+  php:
+    build:
+      context: .
+      dockerfile: .docker/Dockerfile
+    volumes:
+      - .:/var/www/html:rw
+    container_name: php_generator

src/Component/AbstractComponent.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace WsdlToPhp\PhpGenerator\Component;
 
 use WsdlToPhp\PhpGenerator\Element\AbstractElement;
@@ -8,19 +10,19 @@
 use WsdlToPhp\PhpGenerator\Element\PhpConstant as PhpConstantElement;
 use WsdlToPhp\PhpGenerator\Element\PhpAnnotationBlock as PhpAnnotationBlockElement;
 
-abstract class AbstractComponent implements GenerableInterface
+abstract class AbstractComponent implements GenerateableInterface
 {
     /**
      * @var PhpFileElement|PhpClassElement
      */
     protected $mainElement;
     /**
-     * @see \WsdlToPhp\PhpGenerator\Component\GenerableInterface::toString()
+     * @see \WsdlToPhp\PhpGenerator\Component\GenerateableInterface::toString()
      * @return string
      */
-    public function toString()
+    public function toString(): string
     {
-        $content = array();
+        $content = [];
         foreach ($this->getElements() as $element) {
             $content[] = $this->getElementString($element);
         }
@@ -29,13 +31,13 @@ public function toString()
     /**
      * @return AbstractElement[]|string[]
      */
-    abstract public function getElements();
+    abstract public function getElements(): array;
     /**
      * @throws \InvalidArgumentException
      * @param AbstractElement $element
-     * @return \WsdlToPhp\PhpGenerator\Component\AbstractComponent
+     * @return AbstractComponent
      */
-    public function setMainElement(AbstractElement $element)
+    public function setMainElement(AbstractElement $element): AbstractComponent
     {
         if ($element instanceof PhpFileElement || $element instanceof PhpClassElement) {
             $this->mainElement = $element;
@@ -47,7 +49,7 @@ public function setMainElement(AbstractElement $element)
     /**
      * @return PhpFileElement|PhpClassElement
      */
-    public function getMainElement()
+    public function getMainElement(): AbstractElement
     {
         return $this->mainElement;
     }
@@ -56,7 +58,7 @@ public function getMainElement()
      * @param string|AbstractElement $element
      * @return string
      */
-    protected function getElementString($element)
+    protected function getElementString($element): string
     {
         $string = '';
         if (is_scalar($element)) {
@@ -70,7 +72,7 @@ protected function getElementString($element)
      * @param PhpConstantElement $constant
      * @return AbstractComponent
      */
-    public function addConstantElement(PhpConstantElement $constant)
+    public function addConstantElement(PhpConstantElement $constant): AbstractComponent
     {
         if (!$constant->getClass() instanceof PhpClassElement && $this->mainElement instanceof PhpClassElement) {
             $constant->setClass($this->mainElement);
@@ -85,15 +87,15 @@ public function addConstantElement(PhpConstantElement $constant)
      * @param PhpClassElement $class
      * @return AbstractComponent
      */
-    public function addConstant($name, $value = null, PhpClassElement $class = null)
+    public function addConstant($name, $value = null, PhpClassElement $class = null): AbstractComponent
     {
         return $this->addConstantElement(new PhpConstantElement($name, $value, $class));
     }
     /**
      * @param PhpAnnotationBlockElement $annotationBlock
      * @return AbstractComponent
      */
-    public function addAnnotationBlockElement(PhpAnnotationBlockElement $annotationBlock)
+    public function addAnnotationBlockElement(PhpAnnotationBlockElement $annotationBlock): AbstractComponent
     {
         $this->mainElement->addChild($annotationBlock);
         return $this;
@@ -103,10 +105,10 @@ public function addAnnotationBlockElement(PhpAnnotationBlockElement $annotationB
      * @param array|string|PhpAnnotationElement $annotations
      * @return AbstractComponent
      */
-    public function addAnnotationBlock($annotations)
+    public function addAnnotationBlock($annotations): AbstractComponent
     {
-        return $this->addAnnotationBlockElement(new PhpAnnotationBlockElement(is_array($annotations) ? $annotations : array(
+        return $this->addAnnotationBlockElement(new PhpAnnotationBlockElement(is_array($annotations) ? $annotations : [
             $annotations,
-        )));
+        ]));
     }
 }

src/Component/GenerableInterface.php renamed to src/Component/GenerateableInterface.php

@@ -1,8 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace WsdlToPhp\PhpGenerator\Component;
 
-interface GenerableInterface
+interface GenerateableInterface
 {
     /**
      * @var string
@@ -12,5 +14,5 @@ interface GenerableInterface
      * Must return the strict representation for the current element
      * @return string
      */
-    public function toString();
+    public function toString(): string;
 }