Implement PHP 7.0 features

.php_cs

@@ -0,0 +1,16 @@
+<?php
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        'declare_strict_types' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'blank_line_after_opening_tag' => true,
+        'single_blank_line_before_namespace' => true,
+        'no_unused_imports' => true
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__ . '/src')
+            ->in(__DIR__ . '/tests')
+    )->setRiskyAllowed(true)
+    ->setUsingCache(false);

composer.json

@@ -24,7 +24,8 @@
         "openlss/lib-array2xml": "~0.0.9"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0"
+        "phpunit/phpunit": "^6.0",
+        "friendsofphp/php-cs-fixer": "^2.4"
     },
     "autoload": {
         "psr-4": {

src/AST/Expander.php

@@ -1,56 +1,37 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\AST;
 
 final class Expander implements Node
 {
-    /**
-     * @var
-     */
     private $name;
 
-    /**
-     * @var array
-     */
     private $arguments;
 
-    /**
-     * @param $name
-     */
-    public function __construct($name)
+    public function __construct(string $name)
     {
         $this->name = $name;
-        $this->arguments = array();
+        $this->arguments = [];
     }
 
-    /**
-     * @return mixed
-     */
-    public function getName()
+    public function getName() : string
     {
         return $this->name;
     }
 
-    /**
-     * @param $argument
-     */
     public function addArgument($argument)
     {
         $this->arguments[] = $argument;
     }
 
-    /**
-     * @return bool
-     */
-    public function hasArguments()
+    public function hasArguments() : bool
     {
         return (boolean) count($this->arguments);
     }
 
-    /**
-     * @return array
-     */
-    public function getArguments()
+    public function getArguments() : array
     {
         return $this->arguments;
     }

src/AST/Node.php

@@ -1,8 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\AST;
 
 interface Node
 {
-
 }

src/AST/Pattern.php

@@ -1,55 +1,39 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\AST;
 
 final class Pattern implements Node
 {
-    /**
-     * @var Type
-     */
     private $type;
 
-    /**
-     * @var Expander[]|array
-     */
     private $expanders;
 
-    /**
-     * @param Type $type
-     */
     public function __construct(Type $type)
     {
-        $this->expanders = array();
+        $this->expanders = [];
         $this->type = $type;
     }
 
-    /**
-     * @return Type
-     */
-    public function getType()
+    public function getType() : Type
     {
         return $this->type;
     }
 
-    /**
-     * @return bool
-     */
-    public function hasExpanders()
+    public function hasExpanders() : bool
     {
         return (boolean) count($this->expanders);
     }
 
     /**
-     * @return Expander[]|array
+     * @return Expander[]
      */
-    public function getExpanders()
+    public function getExpanders() : array
     {
         return $this->expanders;
     }
 
-    /**
-     * @param Expander $expander
-     */
     public function addExpander(Expander $expander)
     {
         $this->expanders[] = $expander;

src/AST/Type.php

@@ -1,23 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\AST;
 
 final class Type implements Node
 {
-    /**
-     * @var string
-     */
     private $type;
 
-    /**
-     * @param string $type
-     */
-    public function __construct($type)
+    public function __construct(string $type)
     {
         $this->type = $type;
     }
 
-    public function __toString()
+    public function __toString() : string
     {
         return $this->type;
     }

src/Exception/Exception.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\Exception;
 
 class Exception extends \Exception

src/Exception/InvalidArgumentException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\Exception;
 
 class InvalidArgumentException extends Exception

src/Exception/InvalidExpanderTypeException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\Exception;
 
 class InvalidExpanderTypeException extends Exception

src/Exception/PatternException.php

@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\Exception;
 
 class PatternException extends Exception
 {
-    public static function syntaxError($message, $previous = null)
+    public static function syntaxError(string $message, Exception $previous = null)
     {
         return new self('[Syntax Error] ' . $message, 0, $previous);
     }

src/Exception/UnknownExpanderClassException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\Exception;
 
 class UnknownExpanderClassException extends Exception

src/Exception/UnknownExpanderException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\Exception;
 
 class UnknownExpanderException extends Exception

src/Exception/UnknownTypeException.php

@@ -1,21 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\Exception;
 
 class UnknownTypeException extends Exception
 {
     private $type;
 
-    public function __construct($type)
+    public function __construct(string $type)
     {
         $this->type = "@" . $type . "@";
         parent::__construct(sprintf("Type pattern \"%s\" is not supported.", $this->type), 0, null);
     }
 
-    /**
-     * @return mixed
-     */
-    public function getType()
+    public function getType() : string
     {
         return $this->type;
     }

src/Factory.php

@@ -1,11 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher;
 
 interface Factory
 {
-    /**
-     * @return Matcher
-     */
-    public function createMatcher();
+    public function createMatcher() : Matcher;
 }

src/Factory/SimpleFactory.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Coduo\PHPMatcher\Factory;
 
 use Coduo\PHPMatcher\Factory;
@@ -9,64 +11,55 @@
 
 class SimpleFactory implements Factory
 {
-    /**
-     * @return Matcher
-     */
-    public function createMatcher()
+    public function createMatcher() : Matcher
     {
         return new Matcher($this->buildMatchers());
     }
 
-    /**
-     * @return Matcher\ChainMatcher
-     */
-    protected function buildMatchers()
+    protected function buildMatchers() : Matcher\ChainMatcher
     {
         $scalarMatchers = $this->buildScalarMatchers();
         $orMatcher = $this->buildOrMatcher();
 
-        $chainMatcher = new Matcher\ChainMatcher(array(
+        $chainMatcher = new Matcher\ChainMatcher([
             $scalarMatchers,
             $orMatcher,
             new Matcher\JsonMatcher($orMatcher),
             new Matcher\XmlMatcher($orMatcher),
             new Matcher\TextMatcher($scalarMatchers, $this->buildParser())
-        ));
+        ]);
 
         return $chainMatcher;
     }
 
-    /**
-     * @return Matcher\ChainMatcher
-     */
-    protected function buildOrMatcher()
+    protected function buildOrMatcher() : Matcher\ChainMatcher
     {
         $scalarMatchers = $this->buildScalarMatchers();
         $orMatcher = new Matcher\OrMatcher($scalarMatchers);
         $arrayMatcher = new Matcher\ArrayMatcher(
-            new Matcher\ChainMatcher(array(
+            new Matcher\ChainMatcher([
                 $orMatcher,
                 $scalarMatchers
-            )),
+            ]),
             $this->buildParser()
         );
 
-        $chainMatcher = new Matcher\ChainMatcher(array(
+        $chainMatcher = new Matcher\ChainMatcher([
             $orMatcher,
             $arrayMatcher,
-        ));
+        ]);
 
         return $chainMatcher;
     }
 
     /**
      * @return Matcher\ChainMatcher
      */
-    protected function buildScalarMatchers()
+    protected function buildScalarMatchers() : Matcher\ChainMatcher
     {
         $parser = $this->buildParser();
 
-        return new Matcher\ChainMatcher(array(
+        return new Matcher\ChainMatcher([
             new Matcher\CallbackMatcher(),
             new Matcher\ExpressionMatcher(),
             new Matcher\NullMatcher(),
@@ -78,13 +71,10 @@ protected function buildScalarMatchers()
             new Matcher\ScalarMatcher(),
             new Matcher\WildcardMatcher(),
             new Matcher\UuidMatcher(),
-        ));
+        ]);
     }
 
-    /**
-     * @return Parser
-     */
-    protected function buildParser()
+    protected function buildParser() : Parser
     {
         return new Parser(new Lexer(), new Parser\ExpanderInitializer());
     }