Generate PHP 7 type annotations

easysoft · Apr 28, 2017 · a32e379 · a32e379
1 parent e5fbdd6
commit a32e379
Show file tree

Hide file tree

Showing 145 changed files with 326 additions and 326 deletions.
diff --git a/lib/PhpParser/Autoloader.php b/lib/PhpParser/Autoloader.php
@@ -15,7 +15,7 @@ class Autoloader
      *
      * @param bool $prepend Whether to prepend the autoloader instead of appending
      */
-    static public function register($prepend = false) {
+    static public function register(bool $prepend = false) {
         if (self::$registered === true) {
             return;
         }
@@ -29,7 +29,7 @@ static public function register($prepend = false) {
      *
      * @param string $class A class name.
      */
-    static public function autoload($class) {
+    static public function autoload(string $class) {
         if (0 === strpos($class, 'PhpParser\\')) {
             $fileName = __DIR__ . strtr(substr($class, 9), '\\', '/') . '.php';
             if (file_exists($fileName)) {

diff --git a/lib/PhpParser/Builder.php b/lib/PhpParser/Builder.php
@@ -9,5 +9,5 @@ interface Builder
      *
      * @return Node The built node
      */
-    public function getNode();
+    public function getNode() : Node;
 }
diff --git a/lib/PhpParser/Builder/Class_.php b/lib/PhpParser/Builder/Class_.php
@@ -25,7 +25,7 @@ class Class_ extends Declaration
      *
      * @param string $name Name of the class
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -111,7 +111,7 @@ public function addStmt($stmt) {
      *
      * @return Stmt\Class_ The built class node
      */
-    public function getNode() {
+    public function getNode() : PhpParser\Node {
         return new Stmt\Class_($this->name, array(
             'flags' => $this->flags,
             'extends' => $this->extends,

diff --git a/lib/PhpParser/Builder/Function_.php b/lib/PhpParser/Builder/Function_.php
@@ -17,7 +17,7 @@ class Function_ extends FunctionLike
      *
      * @param string $name Name of the function
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -39,7 +39,7 @@ public function addStmt($stmt) {
      *
      * @return Stmt\Function_ The built function node
      */
-    public function getNode() {
+    public function getNode() : Node {
         return new Stmt\Function_($this->name, array(
             'byRef'      => $this->returnByRef,
             'params'     => $this->params,

diff --git a/lib/PhpParser/Builder/Interface_.php b/lib/PhpParser/Builder/Interface_.php
@@ -19,7 +19,7 @@ class Interface_ extends Declaration
      *
      * @param string $name Name of the interface
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -72,7 +72,7 @@ public function addStmt($stmt) {
      *
      * @return Stmt\Interface_ The built interface node
      */
-    public function getNode() {
+    public function getNode() : PhpParser\Node {
         return new Stmt\Interface_($this->name, array(
             'extends' => $this->extends,
             'stmts' => array_merge($this->constants, $this->methods),

diff --git a/lib/PhpParser/Builder/Method.php b/lib/PhpParser/Builder/Method.php
@@ -20,7 +20,7 @@ class Method extends FunctionLike
      *
      * @param string $name Name of the method
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -117,7 +117,7 @@ public function addStmt($stmt) {
      *
      * @return Stmt\ClassMethod The built method node
      */
-    public function getNode() {
+    public function getNode() : Node {
         return new Stmt\ClassMethod($this->name, array(
             'flags'      => $this->flags,
             'byRef'      => $this->returnByRef,

diff --git a/lib/PhpParser/Builder/Namespace_.php b/lib/PhpParser/Builder/Namespace_.php
@@ -54,7 +54,7 @@ public function addStmts(array $stmts) {
      *
      * @return Node The built node
      */
-    public function getNode() {
+    public function getNode() : Node {
         return new Stmt\Namespace_($this->name, $this->stmts);
     }
 }
diff --git a/lib/PhpParser/Builder/Param.php b/lib/PhpParser/Builder/Param.php
@@ -24,7 +24,7 @@ class Param implements PhpParser\Builder
      *
      * @param string $name Name of the parameter
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -84,7 +84,7 @@ public function makeVariadic() {
      *
      * @return Node\Param The built parameter node
      */
-    public function getNode() {
+    public function getNode() : Node {
         return new Node\Param(
             new Node\Expr\Variable($this->name),
             $this->default, $this->type, $this->byRef, $this->variadic

diff --git a/lib/PhpParser/Builder/Property.php b/lib/PhpParser/Builder/Property.php
@@ -19,7 +19,7 @@ class Property implements PhpParser\Builder
      *
      * @param string $name Name of the property
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -100,7 +100,7 @@ public function setDocComment($docComment) {
      *
      * @return Stmt\Property The built property node
      */
-    public function getNode() {
+    public function getNode() : PhpParser\Node {
         return new Stmt\Property(
             $this->flags !== 0 ? $this->flags : Stmt\Class_::MODIFIER_PUBLIC,
             array(

diff --git a/lib/PhpParser/Builder/Trait_.php b/lib/PhpParser/Builder/Trait_.php
@@ -17,7 +17,7 @@ class Trait_ extends Declaration
      *
      * @param string $name Name of the interface
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -47,7 +47,7 @@ public function addStmt($stmt) {
      *
      * @return Stmt\Trait_ The built interface node
      */
-    public function getNode() {
+    public function getNode() : PhpParser\Node {
         return new Stmt\Trait_(
             $this->name, array(
                 'stmts' => array_merge($this->properties, $this->methods)

diff --git a/lib/PhpParser/Builder/Use_.php b/lib/PhpParser/Builder/Use_.php
@@ -21,7 +21,7 @@ class Use_ implements Builder {
      * @param Node\Name|string $name Name of the entity (namespace, class, function, constant) to alias
      * @param int              $type One of the Stmt\Use_::TYPE_* constants
      */
-    public function __construct($name, $type) {
+    public function __construct($name, int $type) {
         $this->name = BuilderHelpers::normalizeName($name);
         $this->type = $type;
     }
@@ -33,7 +33,7 @@ public function __construct($name, $type) {
      *
      * @return $this The builder instance (for fluid interface)
      */
-    protected function as_($alias) {
+    protected function as_(string $alias) {
         $this->alias = $alias;
         return $this;
     }
@@ -50,7 +50,7 @@ public function __call($name, $args) {
      *
      * @return Node The built node
      */
-    public function getNode() {
+    public function getNode() : Node {
         return new Stmt\Use_(array(
             new Stmt\UseUse($this->name, $this->alias)
         ), $this->type);

diff --git a/lib/PhpParser/BuilderFactory.php b/lib/PhpParser/BuilderFactory.php
@@ -29,7 +29,7 @@ class BuilderFactory
      *
      * @return Builder\Namespace_ The created namespace builder
      */
-    protected function _namespace($name) {
+    protected function _namespace($name) : Builder\Namespace_ {
         return new Builder\Namespace_($name);
     }
 
@@ -40,7 +40,7 @@ protected function _namespace($name) {
      *
      * @return Builder\Class_ The created class builder
      */
-    protected function _class($name) {
+    protected function _class(string $name) : Builder\Class_ {
         return new Builder\Class_($name);
     }
 
@@ -51,7 +51,7 @@ protected function _class($name) {
      *
      * @return Builder\Interface_ The created interface builder
      */
-    protected function _interface($name) {
+    protected function _interface(string $name) : Builder\Interface_ {
         return new Builder\Interface_($name);
     }
 
@@ -62,7 +62,7 @@ protected function _interface($name) {
      *
      * @return Builder\Trait_ The created trait builder
      */
-    protected function _trait($name) {
+    protected function _trait(string $name) : Builder\Trait_ {
         return new Builder\Trait_($name);
     }
 
@@ -73,7 +73,7 @@ protected function _trait($name) {
      *
      * @return Builder\Method The created method builder
      */
-    public function method($name) {
+    public function method(string $name) : Builder\Method {
         return new Builder\Method($name);
     }
 
@@ -84,7 +84,7 @@ public function method($name) {
      *
      * @return Builder\Param The created parameter builder
      */
-    public function param($name) {
+    public function param(string $name) : Builder\Param {
         return new Builder\Param($name);
     }
 
@@ -95,7 +95,7 @@ public function param($name) {
      *
      * @return Builder\Property The created property builder
      */
-    public function property($name) {
+    public function property(string $name) : Builder\Property {
         return new Builder\Property($name);
     }
 
@@ -106,7 +106,7 @@ public function property($name) {
      *
      * @return Builder\Function_ The created function builder
      */
-    protected function _function($name) {
+    protected function _function(string $name) : Builder\Function_ {
         return new Builder\Function_($name);
     }
 
@@ -117,7 +117,7 @@ protected function _function($name) {
      *
      * @return Builder\Use_ The create use builder
      */
-    protected function _use($name) {
+    protected function _use($name) : Builder\Use_ {
         return new Builder\Use_($name, Use_::TYPE_NORMAL);
     }
 
@@ -128,7 +128,7 @@ protected function _use($name) {
      *
      * @return Expr
      */
-    public function val($value) {
+    public function val($value) : Expr {
         return BuilderHelpers::normalizeValue($value);
     }
 
@@ -141,7 +141,7 @@ public function val($value) {
      *
      * @return Arg[]
      */
-    public function args(array $args) {
+    public function args(array $args) : array {
         $normalizedArgs = [];
         foreach ($args as $arg) {
             if ($arg instanceof Arg) {
@@ -160,7 +160,7 @@ public function args(array $args) {
      *
      * @return Concat
      */
-    public function concat(...$exprs) {
+    public function concat(...$exprs) : Concat {
         $numExprs = count($exprs);
         if ($numExprs < 2) {
             throw new \LogicException('Expected at least two expressions');

diff --git a/lib/PhpParser/BuilderHelpers.php b/lib/PhpParser/BuilderHelpers.php
@@ -23,7 +23,7 @@ final class BuilderHelpers {
      *
      * @return Node The normalized node
      */
-    public static function normalizeNode($node) {
+    public static function normalizeNode($node) : Node {
         if ($node instanceof Builder) {
             return $node->getNode();
         } elseif ($node instanceof Node) {
@@ -42,7 +42,7 @@ public static function normalizeNode($node) {
      *
      * @return Stmt The normalized statement node
      */
-    public static function normalizeStmt($node) {
+    public static function normalizeStmt($node) : Stmt {
         $node = self::normalizeNode($node);
         if ($node instanceof Stmt) {
             return $node;
@@ -62,7 +62,7 @@ public static function normalizeStmt($node) {
      *
      * @return Name The normalized name
      */
-    public static function normalizeName($name) {
+    public static function normalizeName($name) : Name {
         if ($name instanceof Name) {
             return $name;
         } elseif (is_string($name)) {
@@ -134,7 +134,7 @@ public static function normalizeType($type) {
      *
      * @return Expr The normalized value
      */
-    public static function normalizeValue($value) {
+    public static function normalizeValue($value) : Expr {
         if ($value instanceof Node\Expr) {
             return $value;
         } elseif (is_null($value)) {
@@ -182,7 +182,7 @@ public static function normalizeValue($value) {
      *
      * @return Comment\Doc The normalized doc comment
      */
-    public static function normalizeDocComment($docComment) {
+    public static function normalizeDocComment($docComment) : Comment\Doc {
         if ($docComment instanceof Comment\Doc) {
             return $docComment;
         } else if (is_string($docComment)) {
@@ -200,7 +200,7 @@ public static function normalizeDocComment($docComment) {
      *
      * @return int New modifiers
      */
-    public static function addModifier($modifiers, $modifier) {
+    public static function addModifier(int $modifiers, int $modifier) : int {
         Stmt\Class_::verifyModifier($modifiers, $modifier);
         return $modifiers | $modifier;
     }